mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Tidy up onRequestPermissionsResult()

Browse source
This commit is contained in:
misaochan 2018-05-15 20:25:42 +10:00
parent c22d4ce071
commit e62022ab55
1 changed files with 5 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

35
app/src/main/java/fr/free/nrw/commons/upload/ShareActivity.java
View file

@ -387,11 +387,11 @@ public class ShareActivity
}
});
}
/**
* Function to display the zoom and map FAB
*/
private void showFABMenu(){
private void showFABMenu() {
isFABOpen=true;
if( imageObj != null && imageObj.imageCoordsExists == true)
@ -445,42 +445,18 @@ public class ShareActivity
public void onRequestPermissionsResult(int requestCode,
@NonNull String[] permissions, @NonNull int[] grantResults) {
switch (requestCode) {
case REQUEST_PERM_ON_CREATE_STORAGE: {
if (grantResults.length >= 1
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
backgroundImageView.setImageURI(mediaUri);
storagePermitted = true;
performPreUploadProcessingOfFile();
}
return;
}
case REQUEST_PERM_ON_CREATE_LOCATION: {
if (grantResults.length >= 1
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
locationPermitted = true;
performPreUploadProcessingOfFile();
}
return;
}
case REQUEST_PERM_ON_CREATE_STORAGE_AND_LOCATION: {
if (grantResults.length >= 2
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
backgroundImageView.setImageURI(mediaUri);
storagePermitted = true;
performPreUploadProcessingOfFile();
}
if (grantResults.length >= 2
&& grantResults[1] == PackageManager.PERMISSION_GRANTED) {
if (grantResults.length >= 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
locationPermitted = true;
performPreUploadProcessingOfFile();
}
return;
}
// Storage (from submit button) - this needs to be separate from (1) because only the
// submit button should bring user to next screen
case REQUEST_PERM_ON_SUBMIT_STORAGE: {
if (grantResults.length >= 1
&& grantResults[0] == PackageManager.PERMISSION_GRANTED) {
if (grantResults.length >= 1 && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
//It is OK to call this at both (1) and (4) because if perm had been granted at
//snackbar, user should not be prompted at submit button
performPreUploadProcessingOfFile();
@ -489,7 +465,6 @@ public class ShareActivity
uploadBegins();
snackbar.dismiss();
}
return;
}
}
}