Update libpdfviewer & Fix FFmpeg build & onBackPressed deprecation in…

… AddVolumeActivity
hardcore-sushi · Oct 8, 2022 · 25dbcca · 25dbcca
1 parent 545275d
commit 25dbcca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         minSdkVersion 21
         //noinspection ExpiredTargetSdkVersion
         targetSdkVersion 29
-        versionCode 28
-        versionName "2.0.0-alpha1"
+        versionCode 29
+        versionName "2.0.0-alpha2"
 
         ndk {
             abiFilters "x86", "x86_64", "armeabi-v7a", "arm64-v8a"

diff --git a/app/ffmpeg/build.sh b/app/ffmpeg/build.sh
@@ -63,6 +63,7 @@ else
 			--disable-sndio \
 			--disable-schannel \
 			--disable-securetransport \
+			--disable-vulkan \
 			--disable-xlib \
 			--disable-zlib \
 			--disable-cuvid \

diff --git a/app/src/main/java/sushi/hardcore/droidfs/add_volume/AddVolumeActivity.kt b/app/src/main/java/sushi/hardcore/droidfs/add_volume/AddVolumeActivity.kt
@@ -2,6 +2,7 @@ package sushi.hardcore.droidfs.add_volume
 
 import android.os.Bundle
 import android.view.MenuItem
+import androidx.activity.addCallback
 import sushi.hardcore.droidfs.*
 import sushi.hardcore.droidfs.content_providers.RestrictedFileProvider
 import sushi.hardcore.droidfs.databinding.ActivityAddVolumeBinding
@@ -38,6 +39,12 @@ class AddVolumeActivity: BaseActivity() {
                 )
                 .commit()
         }
+        onBackPressedDispatcher.addCallback(this) {
+            setResult(RESULT_USER_BACK)
+            shouldCloseVolume = false
+            isEnabled = false
+            onBackPressedDispatcher.onBackPressed()
+        }
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
@@ -53,12 +60,6 @@ class AddVolumeActivity: BaseActivity() {
         return super.onOptionsItemSelected(item)
     }
 
-    override fun onBackPressed() {
-        setResult(RESULT_USER_BACK)
-        shouldCloseVolume = false
-        super.onBackPressed()
-    }
-
     fun onFragmentLoaded(selectPathFragment: Boolean) {
         title = getString(
             if (selectPathFragment) {

diff --git a/libpdfviewer b/libpdfviewer