From 71ff37b17076c106d4e4834b4810cb6715eeb755 Mon Sep 17 00:00:00 2001 From: Hardcore Sushi Date: Sun, 10 Sep 2023 19:12:51 +0200 Subject: [PATCH] Fixes --- app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt | 3 ++- app/src/main/java/sushi/hardcore/droidfs/VolumeDatabase.kt | 2 +- .../sushi/hardcore/droidfs/widgets/CircleClipTapView.kt | 6 +++--- libpdfviewer | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt index f3f27c5..0c7977f 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt +++ b/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt @@ -18,6 +18,7 @@ import androidx.annotation.RequiresApi import androidx.camera.core.AspectRatio import androidx.camera.core.Camera import androidx.camera.core.CameraSelector +import androidx.camera.core.DynamicRange import androidx.camera.core.FocusMeteringAction import androidx.camera.core.ImageCapture import androidx.camera.core.ImageCaptureException @@ -414,7 +415,7 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener { refreshVideoCapture() camera = cameraProvider.bindToLifecycle(this, cameraSelector, cameraPreview, videoCapture) if (qualities == null) { - qualities = QualitySelector.getSupportedQualities(camera!!.cameraInfo) + qualities = SucklessRecorder.getVideoCapabilities(camera!!.cameraInfo).getSupportedQualities(DynamicRange.UNSPECIFIED) } videoCapture } else { diff --git a/app/src/main/java/sushi/hardcore/droidfs/VolumeDatabase.kt b/app/src/main/java/sushi/hardcore/droidfs/VolumeDatabase.kt index ae29df2..36de73c 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/VolumeDatabase.kt +++ b/app/src/main/java/sushi/hardcore/droidfs/VolumeDatabase.kt @@ -161,7 +161,7 @@ class VolumeDatabase(private val context: Context): SQLiteOpenHelper(context, Co put(COLUMN_TYPE, byteArrayOf(volume.type)) put(COLUMN_HASH, volume.encryptedHash) put(COLUMN_IV, volume.iv) - }) == 1.toLong()) + }) >= 0.toLong()) } return false } diff --git a/app/src/main/java/sushi/hardcore/droidfs/widgets/CircleClipTapView.kt b/app/src/main/java/sushi/hardcore/droidfs/widgets/CircleClipTapView.kt index 3ba31bb..38bbb52 100644 --- a/app/src/main/java/sushi/hardcore/droidfs/widgets/CircleClipTapView.kt +++ b/app/src/main/java/sushi/hardcore/droidfs/widgets/CircleClipTapView.kt @@ -189,10 +189,10 @@ internal class CircleClipTapView(context: Context, attrs: AttributeSet): View(co super.onDraw(canvas) // Background - canvas?.clipPath(shapePath) - canvas?.drawPath(shapePath, backgroundPaint) + canvas.clipPath(shapePath) + canvas.drawPath(shapePath, backgroundPaint) // Circle - canvas?.drawCircle(cX, cY, currentRadius, circlePaint) + canvas.drawCircle(cX, cY, currentRadius, circlePaint) } } \ No newline at end of file diff --git a/libpdfviewer b/libpdfviewer index 59973a6..2296593 160000 --- a/libpdfviewer +++ b/libpdfviewer @@ -1 +1 @@ -Subproject commit 59973a6b42485b0c430123c8be649fb24689b9f3 +Subproject commit 22965932759f232328810eadf3f02671b5c6ff99