From a76266c21288831504cff6ffbd43fb516bef54b0 Mon Sep 17 00:00:00 2001
From: Rahul Patel <whyorean@gmail.com>
Date: Wed, 24 Jul 2024 23:40:33 +0530
Subject: [PATCH] Fix storage access issue for API Level 33 & above

---
 .../java/com/aurora/store/util/PackageUtil.kt   | 17 +++++++----------
 .../store/view/ui/details/AppDetailsFragment.kt |  2 +-
 .../view/ui/onboarding/PermissionsFragment.kt   |  2 +-
 .../store/view/ui/updates/UpdatesFragment.kt    |  2 +-
 4 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/aurora/store/util/PackageUtil.kt b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
index bd2766f7c..0dfb0cb45 100644
--- a/app/src/main/java/com/aurora/store/util/PackageUtil.kt
+++ b/app/src/main/java/com/aurora/store/util/PackageUtil.kt
@@ -124,15 +124,11 @@ object PackageUtil {
     }
 
     @RequiresApi(Build.VERSION_CODES.R)
-    fun getStorageManagerIntent(context: Context): Intent {
-        return if (isTv(context)) {
-            Intent(
-                Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
-                Uri.parse("package:${BuildConfig.APPLICATION_ID}")
-            )
-        } else {
-            Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
-        }
+    fun getStorageManagerIntent(): Intent {
+        return Intent(
+            Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
+            Uri.parse("package:${BuildConfig.APPLICATION_ID}")
+        )
     }
 
     @Throws(Exception::class)
@@ -222,7 +218,8 @@ object PackageUtil {
         if (isAuroraOnlyUpdateEnabled) {
             packageInfoList = packageInfoList
                 .filter {
-                    val packageInstaller = packageManager.getInstallerPackageNameCompat(it.packageName)
+                    val packageInstaller =
+                        packageManager.getInstallerPackageNameCompat(it.packageName)
                     listOf(
                         "com.aurora.store",
                         "com.aurora.store.debug",
diff --git a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
index 64488b962..71f66665e 100644
--- a/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
@@ -563,7 +563,7 @@ class AppDetailsFragment : BaseFragment<FragmentDetailsBinding>() {
             if (isRAndAbove()) {
                 if (!Environment.isExternalStorageManager()) {
                     startForStorageManagerResult.launch(
-                        PackageUtil.getStorageManagerIntent(requireContext())
+                        PackageUtil.getStorageManagerIntent()
                     )
                 } else {
                     viewModel.download(app)
diff --git a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt
index 638343fac..b8156e06a 100644
--- a/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt
@@ -206,7 +206,7 @@ class PermissionsFragment : BaseFragment<FragmentOnboardingPermissionsBinding>()
     private fun requestStorageManagerPermission() {
         if (isRAndAbove()) {
             startForStorageManagerResult.launch(
-                PackageUtil.getStorageManagerIntent(requireContext())
+                PackageUtil.getStorageManagerIntent()
             )
         }
     }
diff --git a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
index 1393ecacd..feca559ef 100644
--- a/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
+++ b/app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
@@ -206,7 +206,7 @@ class UpdatesFragment : BaseFragment<FragmentUpdatesBinding>() {
             if (isRAndAbove()) {
                 if (!Environment.isExternalStorageManager()) {
                     startForStorageManagerResult.launch(
-                        PackageUtil.getStorageManagerIntent(requireContext())
+                        PackageUtil.getStorageManagerIntent()
                     )
                 } else {
                     viewModel.download(update)