mirror/AuroraStore
1
0
Fork 0
mirror of https://github.com/whyorean/AuroraStore.git synced 2026-06-16 03:31:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Add a safeguard to ESM/ESA access prompt

Browse Source
This commit is contained in:
Rahul Patel
2024-07-25 01:22:32 +05:30
parent 02e1c9845a
commit 894e7a629f
4 changed files with 26 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/java/com/aurora/store/util/PackageUtil.kt
View File

@@ -124,11 +124,15 @@ object PackageUtil {
}
@RequiresApi(Build.VERSION_CODES.R)
fun getStorageManagerIntent(): Intent {
return Intent(
Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
Uri.parse("package:${BuildConfig.APPLICATION_ID}")
)
fun getStorageManagerIntent(safe: Boolean = false): Intent {
return if (safe) {
Intent(Settings.ACTION_MANAGE_ALL_FILES_ACCESS_PERMISSION)
} else {
Intent(
Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION,
Uri.parse("package:${BuildConfig.APPLICATION_ID}")
)
}
}
@Throws(Exception::class)

8
app/src/main/java/com/aurora/store/view/ui/details/AppDetailsFragment.kt
View File

@@ -562,9 +562,11 @@ class AppDetailsFragment : BaseFragment<FragmentDetailsBinding>() {
if (PathUtil.needsStorageManagerPerm(app.fileList)) {
if (isRAndAbove()) {
if (!Environment.isExternalStorageManager()) {
startForStorageManagerResult.launch(
PackageUtil.getStorageManagerIntent()
)
try {
startForStorageManagerResult.launch(PackageUtil.getStorageManagerIntent())
} catch (_: ActivityNotFoundException) {
startForStorageManagerResult.launch(PackageUtil.getStorageManagerIntent(true))
}
} else {
viewModel.download(app)
}

9
app/src/main/java/com/aurora/store/view/ui/onboarding/PermissionsFragment.kt
View File

@@ -21,6 +21,7 @@
package com.aurora.store.view.ui.onboarding
import android.Manifest
import android.content.ActivityNotFoundException
import android.content.Context
import android.content.Intent
import android.content.pm.PackageManager
@@ -216,9 +217,11 @@ class PermissionsFragment : BaseFragment<FragmentOnboardingPermissionsBinding>()
private fun requestStorageManagerPermission() {
if (isRAndAbove()) {
if (canInstallPackages()) {
startForStorageManagerResult.launch(
PackageUtil.getStorageManagerIntent()
)
try {
startForStorageManagerResult.launch(PackageUtil.getStorageManagerIntent())
} catch (_: ActivityNotFoundException) {
startForStorageManagerResult.launch(PackageUtil.getStorageManagerIntent(true))
}
} else {
toast(R.string.toast_permission_installer_required)
}

9
app/src/main/java/com/aurora/store/view/ui/updates/UpdatesFragment.kt
View File

@@ -20,6 +20,7 @@
package com.aurora.store.view.ui.updates
import android.Manifest
import android.content.ActivityNotFoundException
import android.content.pm.PackageManager
import android.os.Bundle
import android.os.Environment
@@ -205,9 +206,11 @@ class UpdatesFragment : BaseFragment<FragmentUpdatesBinding>() {
if (PathUtil.needsStorageManagerPerm(update.fileList)) {
if (isRAndAbove()) {
if (!Environment.isExternalStorageManager()) {
startForStorageManagerResult.launch(
PackageUtil.getStorageManagerIntent()
)
try {
startForStorageManagerResult.launch(PackageUtil.getStorageManagerIntent())
} catch (_: ActivityNotFoundException) {
startForStorageManagerResult.launch(PackageUtil.getStorageManagerIntent(true))
}
} else {
viewModel.download(update)
}