norohind/vanilla
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

do not request WRITE permission since android 11 won't grant it to us anyway using native file IO

Browse Source
This commit is contained in:
Adrian Ulrich 2021-02-07 19:13:45 +01:00
parent 2df6fc57bf
commit d1f99e5566
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/ch/blinkenlights/android/vanilla/PermissionRequestActivity.java
View File

@ -33,10 +33,6 @@ import android.os.Bundle;
public class PermissionRequestActivity extends Activity {
/**
* 'dangerous' permissions not granted by the manifest on versions >= M
*/
private static final String[] NEEDED_PERMISSIONS = { Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE };
/**
* The intent to start after acquiring the required permissions
*/
@ -48,7 +44,7 @@ public class PermissionRequestActivity extends Activity {
super.onCreate(savedInstanceState);
mCallbackIntent = getIntent().getExtras().getParcelable("callbackIntent");
requestPermissions(NEEDED_PERMISSIONS, 0);
requestPermissions(getNeededPermissions(), 0);
}
/**
@ -131,7 +127,7 @@ public class PermissionRequestActivity extends Activity {
*/
public static boolean havePermissions(Context context) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
for (String permission : NEEDED_PERMISSIONS) {
for (String permission : getNeededPermissions()) {
if (context.checkSelfPermission(permission) != PackageManager.PERMISSION_GRANTED) {
return false;
}
@ -140,4 +136,11 @@ public class PermissionRequestActivity extends Activity {
return true;
}
private static String[] getNeededPermissions() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
return new String[] { Manifest.permission.READ_EXTERNAL_STORAGE };
}
return new String[] { Manifest.permission.READ_EXTERNAL_STORAGE, Manifest.permission.WRITE_EXTERNAL_STORAGE };
}
}