fix: consider com.android.documentsui

aliernfrog · Sep 5, 2024 · c945f10 · c945f10
1 parent 111c677
commit c945f10
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -88,6 +88,7 @@
     </application>
 
     <queries>
+        <package android:name="com.android.documentsui"/>
         <package android:name="com.google.android.documentsui"/>
         <package android:name="moe.shizuku.privileged.api"/>
     </queries>

diff --git a/app/src/main/java/com/aliernfrog/lactool/util/staticutil/GeneralUtil.kt b/app/src/main/java/com/aliernfrog/lactool/util/staticutil/GeneralUtil.kt
@@ -3,6 +3,7 @@ package com.aliernfrog.lactool.util.staticutil
 import android.app.Activity
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageInfo
 import android.net.ConnectivityManager
 import android.net.Uri
 import android.os.Build
@@ -20,8 +21,18 @@ class GeneralUtil {
     companion object {
         fun filesAppRestrictsAndroidData(context: Context): Boolean {
             if (!hasAndroidDataRestrictions) return false
-            val packageInfo = context.packageManager.getPackageInfo(documentsUIPackageName, 0)
-            return packageInfo.longVersionCode >= 340916000
+            val packageInfo: PackageInfo? = try {
+              context.packageManager.getPackageInfo(documentsUIPackageName, 0)
+            } catch (_: Exception) {
+              try {
+                context.packageManager.getPackageInfo("com.android.documentsui", 0)
+              } catch (_: Exception) {
+                null
+              }
+            }
+            return packageInfo?.let {
+                it.longVersionCode >= 340916000
+            } ?: false
         }
 
         fun getAppVersionName(context: Context): String {