From 8b4adfbe21d0568caaef29453ecac60ec9067e7a Mon Sep 17 00:00:00 2001
From: Hardcore Sushi <hardcore.sushi@disroot.org>
Date: Mon, 20 Dec 2021 14:44:58 +0100
Subject: [PATCH] Update dependencies

---
 app/build.gradle                                | 12 ++++++------
 app/libgocryptfs                                |  2 +-
 .../sushi/hardcore/droidfs/CameraActivity.kt    | 17 ++++++++---------
 3 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 138fe05..1daec8b 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -58,26 +58,26 @@ dependencies {
     implementation fileTree(dir: "libs", include: ["*.jar"])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.7.0'
-    implementation "androidx.appcompat:appcompat:1.3.1"
-    implementation "androidx.constraintlayout:constraintlayout:2.1.1"
+    implementation "androidx.appcompat:appcompat:1.4.0"
+    implementation "androidx.constraintlayout:constraintlayout:2.1.2"
 
-    implementation "androidx.sqlite:sqlite-ktx:2.1.0"
+    implementation "androidx.sqlite:sqlite-ktx:2.2.0"
     implementation "androidx.preference:preference-ktx:1.1.1"
     implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
     implementation 'com.google.android.material:material:1.4.0'
     implementation "com.github.bumptech.glide:glide:4.12.0"
     implementation "androidx.biometric:biometric:1.1.0"
 
-    def exoplayer_version = "2.16.0"
+    def exoplayer_version = "2.16.1"
     implementation "com.google.android.exoplayer:exoplayer-core:$exoplayer_version"
     implementation "com.google.android.exoplayer:exoplayer-ui:$exoplayer_version"
 
     implementation "androidx.concurrent:concurrent-futures:1.1.0"
 
-    def camerax_v1 = "1.1.0-alpha10"
+    def camerax_v1 = "1.1.0-alpha12"
     implementation "androidx.camera:camera-camera2:$camerax_v1"
     implementation "androidx.camera:camera-lifecycle:$camerax_v1"
-    def camerax_v2 = "1.0.0-alpha30"
+    def camerax_v2 = "1.0.0-alpha32"
     implementation "androidx.camera:camera-view:$camerax_v2"
     implementation "androidx.camera:camera-extensions:$camerax_v2"
 }
diff --git a/app/libgocryptfs b/app/libgocryptfs
index 1973153..b232bb7 160000
--- a/app/libgocryptfs
+++ b/app/libgocryptfs
@@ -1 +1 @@
-Subproject commit 19731536027d0b64c19742846bf8dda6920110ba
+Subproject commit b232bb782605eb0c6b23aef5f7ea56fd5bd3b7fd
diff --git a/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt
index 158d94f..c2b9885 100644
--- a/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt
+++ b/app/src/main/java/sushi/hardcore/droidfs/CameraActivity.kt
@@ -110,13 +110,12 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
         ProcessCameraProvider.getInstance(this).apply {
             addListener({
                 cameraProvider = get()
-                setupCamera()
-            }, executor)
-        }
-        ExtensionsManager.getInstance(this).apply {
-            addListener({
-                extensionsManager = get()
-                setupCamera()
+                ExtensionsManager.getInstanceAsync(this@CameraActivity, cameraProvider).apply {
+                    addListener({
+                        extensionsManager = get()
+                        setupCamera()
+                    }, executor)
+                }
             }, executor)
         }
 
@@ -318,8 +317,8 @@ class CameraActivity : BaseActivity(), SensorOrientationListener.Listener {
             }.build()
 
             cameraSelector = if (isBackCamera){ CameraSelector.DEFAULT_BACK_CAMERA } else { CameraSelector.DEFAULT_FRONT_CAMERA }
-            if (extensionsManager.isExtensionAvailable(cameraProvider, cameraSelector, ExtensionMode.HDR)) {
-                cameraSelector = extensionsManager.getExtensionEnabledCameraSelector(cameraProvider, cameraSelector, ExtensionMode.HDR)
+            if (extensionsManager.isExtensionAvailable(cameraSelector, ExtensionMode.HDR)) {
+                cameraSelector = extensionsManager.getExtensionEnabledCameraSelector(cameraSelector, ExtensionMode.HDR)
             }
 
             cameraProvider.unbindAll()