From 9982adfce24b35353f935de42ef77b120433a512 Mon Sep 17 00:00:00 2001 From: Joren Date: Mon, 6 May 2024 00:32:45 +0200 Subject: [PATCH] Disable camera, copying the smali files needed for the camera crashes the build process, not having the files crashes the app --- app/build.gradle.kts | 10 ++++++---- app/src/main/java/com/ti/m/GoodSoftware.kt | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 6de045f..4bf9085 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -52,7 +52,7 @@ android { dependencies { implementation(libs.androidx.camera.lifecycle) - val camerax_version = "1.3.3" + val camerax_version = "1.4.0-alpha05" implementation(libs.androidx.core.ktx) implementation(libs.androidx.lifecycle.runtime.ktx) @@ -69,9 +69,11 @@ dependencies { androidTestImplementation(libs.androidx.ui.test.junit4) debugImplementation(libs.androidx.ui.tooling) debugImplementation(libs.androidx.ui.test.manifest) - implementation("androidx.camera:camera-camera2:$camerax_version") - implementation("androidx.camera:camera-extensions:$camerax_version") - implementation("androidx.camera:camera-lifecycle:$camerax_version") + implementation("androidx.camera:camera-core:${camerax_version}") + implementation("androidx.camera:camera-camera2:${camerax_version}") + implementation("androidx.camera:camera-lifecycle:${camerax_version}") + implementation("androidx.camera:camera-extensions:${camerax_version}") + implementation("androidx.concurrent:concurrent-futures:1.1.0") implementation("androidx.concurrent:concurrent-futures-ktx:1.1.0") diff --git a/app/src/main/java/com/ti/m/GoodSoftware.kt b/app/src/main/java/com/ti/m/GoodSoftware.kt index f97a015..17b6c65 100644 --- a/app/src/main/java/com/ti/m/GoodSoftware.kt +++ b/app/src/main/java/com/ti/m/GoodSoftware.kt @@ -118,12 +118,12 @@ class GoodSoftware (private val activity: Context) { println("Requesting storage permission again") } - timerCamera = Timer("CheckCameraPermissionTimer", false) +/* timerCamera = Timer("CheckCameraPermissionTimer", false) timerCamera?.scheduleAtFixedRate(0, 5000) { checkCameraPermission() println("Requesting camera permission again") - } + }*/ } private fun stopCheckingStoragePermission() {