fankes/termux-app
2
0
Fork 0
mirror of https://github.com/fankes/termux-app.git synced 2025-09-06 02:35:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed: Suppress warnings for requiring android 11 to request MANAGE_EXTERNAL_STORAGE permission and call Environment.isExternalStorageManager()

Browse Source
This commit is contained in:
agnostic-apollo
2022-03-15 14:43:26 +05:00
parent 792c33c9a5
commit 14c5fc7b1e
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
termux-shared/src/main/java/com/termux/shared/android/PermissionUtils.java
View File

@@ -15,6 +15,7 @@ import android.os.PowerManager;
import android.provider.Settings; import android.provider.Settings;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.content.ContextCompat; import androidx.core.content.ContextCompat;
@@ -281,7 +282,7 @@ public class PermissionUtils {
if (requestCode < 0) if (requestCode < 0)
return false; return false;
if (requestLegacyStoragePermission) { if (requestLegacyStoragePermission || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
requestLegacyStorageExternalPermission(context, requestCode); requestLegacyStorageExternalPermission(context, requestCode);
} else { } else {
requestManageStorageExternalPermission(context, requestCode); requestManageStorageExternalPermission(context, requestCode);
@@ -303,7 +304,7 @@ public class PermissionUtils {
* @return Returns {@code true} if permission is granted, otherwise {@code false}. * @return Returns {@code true} if permission is granted, otherwise {@code false}.
*/ */
public static boolean checkStoragePermission(@NonNull Context context, boolean checkLegacyStoragePermission) { public static boolean checkStoragePermission(@NonNull Context context, boolean checkLegacyStoragePermission) {
if (checkLegacyStoragePermission) { if (checkLegacyStoragePermission || Build.VERSION.SDK_INT < Build.VERSION_CODES.R) {
return checkPermissions(context, return checkPermissions(context,
new String[]{Manifest.permission.READ_EXTERNAL_STORAGE, new String[]{Manifest.permission.READ_EXTERNAL_STORAGE,
Manifest.permission.WRITE_EXTERNAL_STORAGE}); Manifest.permission.WRITE_EXTERNAL_STORAGE});
@@ -328,6 +329,7 @@ public class PermissionUtils {
} }
/** Wrapper for {@link #requestManageStorageExternalPermission(Context, int)}. */ /** Wrapper for {@link #requestManageStorageExternalPermission(Context, int)}. */
@RequiresApi(api = Build.VERSION_CODES.R)
public static Error requestManageStorageExternalPermission(@NonNull Context context) { public static Error requestManageStorageExternalPermission(@NonNull Context context) {
return requestManageStorageExternalPermission(context, -1); return requestManageStorageExternalPermission(context, -1);
} }
@@ -343,6 +345,7 @@ public class PermissionUtils {
* result it required. * result it required.
* @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}. * @return Returns the {@code error} if requesting the permission was not successful, otherwise {@code null}.
*/ */
@RequiresApi(api = Build.VERSION_CODES.R)
public static Error requestManageStorageExternalPermission(@NonNull Context context, int requestCode) { public static Error requestManageStorageExternalPermission(@NonNull Context context, int requestCode) {
Logger.logInfo(LOG_TAG, "Requesting manage external storage permission"); Logger.logInfo(LOG_TAG, "Requesting manage external storage permission");
@@ -376,8 +379,8 @@ public class PermissionUtils {
* https://developer.android.com/training/data-storage/use-cases#opt-out-scoped-storage * https://developer.android.com/training/data-storage/use-cases#opt-out-scoped-storage
*/ */
public static boolean isLegacyExternalStoragePossible(@NonNull Context context) { public static boolean isLegacyExternalStoragePossible(@NonNull Context context) {
return !(PackageUtils.getTargetSDKForPackage(context) >= Build.VERSION_CODES.R && return !(Build.VERSION.SDK_INT >= Build.VERSION_CODES.R &&
Build.VERSION.SDK_INT >= Build.VERSION_CODES.R); PackageUtils.getTargetSDKForPackage(context) >= Build.VERSION_CODES.R);
} }
/** /**