DirectUpload: Replace nested conditionals with guard clauses

Author: domdomegg

app/src/main/java/fr/free/nrw/commons/nearby/DirectUpload.java

@@ -9,7 +9,6 @@
 import fr.free.nrw.commons.R;
 import fr.free.nrw.commons.contributions.ContributionController;
 import fr.free.nrw.commons.utils.PermissionUtils;
-import timber.log.Timber;
 
 import static android.Manifest.permission.READ_EXTERNAL_STORAGE;
 import static android.Manifest.permission.WRITE_EXTERNAL_STORAGE;
@@ -34,31 +33,39 @@ class DirectUpload {
      * Do not use requestCode 1 as it will conflict with NearbyFragment's requestCodes.
      */
     void initiateGalleryUpload() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            Activity parentActivity = fragment.getActivity();
-            if (parentActivity != null) {
-                if (ContextCompat.checkSelfPermission(parentActivity, READ_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
-                    if (fragment.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) {
-                        new AlertDialog.Builder(parentActivity)
-                                .setMessage(parentActivity.getString(R.string.read_storage_permission_rationale))
-                                .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                                    Timber.d("Requesting permissions for read external storage");
-                                    parentActivity.requestPermissions (new String[]{READ_EXTERNAL_STORAGE}, PermissionUtils.GALLERY_PERMISSION_FROM_NEARBY_MAP);
-                                    dialog.dismiss();
-                                })
-                                .setNegativeButton(android.R.string.cancel, null)
-                                .create()
-                                .show();
-                    } else {
+        // Only need to handle permissions for Marshmallow and above
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return;
+        }
+
+        Activity parentActivity = fragment.getActivity();
+        if (parentActivity == null) {
+            controller.startSingleGalleryPick();
+            return;
+        }
+
+        // If we have permission, go ahead
+        if (ContextCompat.checkSelfPermission(parentActivity, READ_EXTERNAL_STORAGE) == PERMISSION_GRANTED) {
+            controller.startSingleGalleryPick();
+            return;
+        }
+
+        // If we don't have permission, and we need to show the rationale, show the rationale
+        if (fragment.shouldShowRequestPermissionRationale(READ_EXTERNAL_STORAGE)) {
+            new AlertDialog.Builder(parentActivity)
+                    .setMessage(parentActivity.getString(R.string.read_storage_permission_rationale))
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
                         parentActivity.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, PermissionUtils.GALLERY_PERMISSION_FROM_NEARBY_MAP);
-                    }
-                } else {
-                    controller.startSingleGalleryPick();
-                }
-            } else {
-                controller.startSingleGalleryPick();
-            }
+                        dialog.dismiss();
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create()
+                    .show();
+            return;
         }
+
+        // If we don't have permission, and we don't need to show rationale just request permission
+        parentActivity.requestPermissions(new String[]{READ_EXTERNAL_STORAGE}, PermissionUtils.GALLERY_PERMISSION_FROM_NEARBY_MAP);
     }
 
     /**
@@ -67,29 +74,38 @@ void initiateGalleryUpload() {
      * Do not use requestCode 1 as it will conflict with NearbyFragment's requestCodes.
      */
     void initiateCameraUpload() {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            Activity parentActivity = fragment.getActivity();
-            if (parentActivity != null) {
-                if (ContextCompat.checkSelfPermission(parentActivity, WRITE_EXTERNAL_STORAGE) != PERMISSION_GRANTED) {
-                    if (fragment.shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) {
-                        new AlertDialog.Builder(parentActivity)
-                                .setMessage(parentActivity.getString(R.string.write_storage_permission_rationale))
-                                .setPositiveButton(android.R.string.ok, (dialog, which) -> {
-                                    parentActivity.requestPermissions (new String[]{WRITE_EXTERNAL_STORAGE}, PermissionUtils.CAMERA_PERMISSION_FROM_NEARBY_MAP);
-                                    dialog.dismiss();
-                                })
-                                .setNegativeButton(android.R.string.cancel, null)
-                                .create()
-                                .show();
-                    } else {
+        // Only need to handle permissions for Marshmallow and above
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
+            return;
+        }
+
+        Activity parentActivity = fragment.getActivity();
+        if (parentActivity == null) {
+            controller.startCameraCapture();
+            return;
+        }
+
+        // If we have permission, go ahead
+        if (ContextCompat.checkSelfPermission(parentActivity, WRITE_EXTERNAL_STORAGE) == PERMISSION_GRANTED) {
+            controller.startCameraCapture();
+            return;
+        }
+
+        // If we don't have permission, and we need to show the rationale, show the rationale
+        if (fragment.shouldShowRequestPermissionRationale(WRITE_EXTERNAL_STORAGE)) {
+            new AlertDialog.Builder(parentActivity)
+                    .setMessage(parentActivity.getString(R.string.write_storage_permission_rationale))
+                    .setPositiveButton(android.R.string.ok, (dialog, which) -> {
                         parentActivity.requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, PermissionUtils.CAMERA_PERMISSION_FROM_NEARBY_MAP);
-                    }
-                } else {
-                    controller.startCameraCapture();
-                }
-            } else {
-                controller.startCameraCapture();
-            }
+                        dialog.dismiss();
+                    })
+                    .setNegativeButton(android.R.string.cancel, null)
+                    .create()
+                    .show();
+            return;
         }
+
+        // If we don't have permission, and we don't need to show rationale just request permission
+        parentActivity.requestPermissions(new String[]{WRITE_EXTERNAL_STORAGE}, PermissionUtils.CAMERA_PERMISSION_FROM_NEARBY_MAP);
     }
 }