scratchfoundation/scratchjr
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratchjr.git synced 2025-02-17 17:01:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor permission request

Browse source
This commit is contained in:
Chris Garrity 2020-09-30 09:57:26 -04:00
parent b3d800ec3e
commit 4826fc0b1e
1 changed files with 26 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
android/ScratchJr/app/src/main/java/org/scratchjr/android/ScratchJrActivity.java
View file

@ -40,6 +40,8 @@ import java.io.ByteArrayOutputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.util.Arrays;
import java.util.Vector;
/** /**
* Main activity for Scratch Jr., consisting of a full-screen landscape WebView. * Main activity for Scratch Jr., consisting of a full-screen landscape WebView.
@ -103,6 +105,7 @@ public class ScratchJrActivity
private final int SCRATCHJR_CAMERA_MIC_PERMISSION = 1; private final int SCRATCHJR_CAMERA_MIC_PERMISSION = 1;
public int cameraPermissionResult = PackageManager.PERMISSION_DENIED; public int cameraPermissionResult = PackageManager.PERMISSION_DENIED;
public int micPermissionResult = PackageManager.PERMISSION_DENIED; public int micPermissionResult = PackageManager.PERMISSION_DENIED;
public int readExtPermissionResult = PackageManager.PERMISSION_DENIED;
/* Firebase analytics tracking */ /* Firebase analytics tracking */
private FirebaseAnalytics _FirebaseAnalytics; private FirebaseAnalytics _FirebaseAnalytics;
@ -172,34 +175,33 @@ public class ScratchJrActivity
requestPermissions(); requestPermissions();
} }
private void requestExtStoragePermissions() { /*
int readExtPermissionResult = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE); Ask for all permissions when ScratchJr is first launched so that we are not asking a 5-7 year old to give permission
if (readExtPermissionResult != PackageManager.PERMISSION_GRANTED) { */
int requestCode = 2;
ActivityCompat.requestPermissions(this,
new String[]{Manifest.permission.READ_EXTERNAL_STORAGE}, requestCode);
}
}
public void requestPermissions() { public void requestPermissions() {
requestExtStoragePermissions();
cameraPermissionResult = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA); cameraPermissionResult = ContextCompat.checkSelfPermission(this, Manifest.permission.CAMERA);
micPermissionResult = ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO); micPermissionResult = ContextCompat.checkSelfPermission(this, Manifest.permission.RECORD_AUDIO);
readExtPermissionResult = ContextCompat.checkSelfPermission(this, Manifest.permission.READ_EXTERNAL_STORAGE);
String[] desiredPermissions; if (cameraPermissionResult == PackageManager.PERMISSION_GRANTED
if (cameraPermissionResult != PackageManager.PERMISSION_GRANTED && micPermissionResult == PackageManager.PERMISSION_GRANTED
&& micPermissionResult != PackageManager.PERMISSION_GRANTED) { && readExtPermissionResult == PackageManager.PERMISSION_GRANTED) {
desiredPermissions = new String[]{
Manifest.permission.CAMERA, Manifest.permission.RECORD_AUDIO
};
} else if (cameraPermissionResult != PackageManager.PERMISSION_GRANTED) {
desiredPermissions = new String[]{Manifest.permission.CAMERA};
} else if (micPermissionResult != PackageManager.PERMISSION_GRANTED) {
desiredPermissions = new String[]{Manifest.permission.RECORD_AUDIO};
} else {
return; return;
} }
Vector<String> tmp = new Vector<String>(3);
if (cameraPermissionResult != PackageManager.PERMISSION_GRANTED) {
tmp.add(Manifest.permission.CAMERA);
}
if (micPermissionResult != PackageManager.PERMISSION_GRANTED) {
tmp.add(Manifest.permission.RECORD_AUDIO);
}
if (readExtPermissionResult != PackageManager.PERMISSION_GRANTED) {
tmp.add(Manifest.permission.READ_EXTERNAL_STORAGE);
}
Object[] tmpArray = tmp.toArray();
String[] desiredPermissions = Arrays.copyOf(tmpArray, tmpArray.length, String[].class);
ActivityCompat.requestPermissions(this, ActivityCompat.requestPermissions(this,
desiredPermissions, desiredPermissions,
SCRATCHJR_CAMERA_MIC_PERMISSION); SCRATCHJR_CAMERA_MIC_PERMISSION);
@ -217,6 +219,9 @@ public class ScratchJrActivity
if (permission.equals(Manifest.permission.RECORD_AUDIO)) { if (permission.equals(Manifest.permission.RECORD_AUDIO)) {
micPermissionResult = grantResults[permissionId]; micPermissionResult = grantResults[permissionId];
} }
if (permission.equals(Manifest.permission.READ_EXTERNAL_STORAGE)) {
readExtPermissionResult = grantResults[permissionId];
}
permissionId++; permissionId++;
} }
} }