Horis 3 лет назад
Родитель
Сommit
f93bc0841d

+ 3 - 3
app/src/main/java/io/legado/app/ui/association/FileAssociationActivity.kt

@@ -107,15 +107,15 @@ class FileAssociationActivity :
         intent.data?.let { data ->
             if (data.isContentScheme()) {
                 viewModel.dispatchIndent(data)
-            } else if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.Q) {
+            } else {
                 PermissionsCompat.Builder(this)
                     .addPermissions(*Permissions.Group.STORAGE)
                     .rationale(R.string.tip_perm_request_storage)
                     .onGranted {
                         viewModel.dispatchIndent(data)
+                    }.onDenied {
+                        toastOnUi("请求存储权限失败。")
                     }.request()
-            } else {
-                toastOnUi("由于安卓系统限制,请使用系统文件管理重新打开。")
             }
         }
     }

+ 3 - 1
app/src/main/java/io/legado/app/ui/book/read/ReadBookActivity.kt

@@ -1304,7 +1304,9 @@ class ReadBookActivity : BaseReadBookActivity(),
         popupAction.dismiss()
         binding.readView.onDestroy()
         ReadBook.msg = null
-        ReadBook.callBack = null
+        if (ReadBook.callBack === this) {
+            ReadBook.callBack = null
+        }
         if (!BuildConfig.DEBUG) {
             Backup.autoBack(this)
         }