forked from hardcoresushi/DroidFS
Update libpdfviewer & Fix FFmpeg build & onBackPressed deprecation in AddVolumeActivity
This commit is contained in:
parent
545275dabc
commit
25dbcca854
@ -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"
|
||||
|
@ -63,6 +63,7 @@ else
|
||||
--disable-sndio \
|
||||
--disable-schannel \
|
||||
--disable-securetransport \
|
||||
--disable-vulkan \
|
||||
--disable-xlib \
|
||||
--disable-zlib \
|
||||
--disable-cuvid \
|
||||
|
@ -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) {
|
||||
|
@ -1 +1 @@
|
||||
Subproject commit 06e54dbb03098c0d0d113ed7b3fc93d74050f590
|
||||
Subproject commit 2766000ebc893b31ced030050b4cc81d87c5175c
|
Loading…
Reference in New Issue
Block a user