From c945f1040c2b728a36c94223d92d522642753b41 Mon Sep 17 00:00:00 2001 From: alieRN <45766489+aliernfrog@users.noreply.github.com> Date: Thu, 5 Sep 2024 09:58:34 +0300 Subject: [PATCH] fix: consider com.android.documentsui --- app/src/main/AndroidManifest.xml | 1 + .../lactool/util/staticutil/GeneralUtil.kt | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9371c981..2829d8ab 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -88,6 +88,7 @@ + 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 index dbc98394..767e105c 100644 --- 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 {