App crashes on Selfie video widget if microphone permissions are not …

…set (getodk#2566)
Ejeus · Sep 21, 2018 · dc0d08b · dc0d08b
1 parent e3c901d
commit dc0d08b
Show file tree

Hide file tree

Showing 3 changed files with 67 additions and 12 deletions.
diff --git a/...pp/src/main/java/org/odk/collect/android/activities/CaptureSelfieVideoActivityNewApi.java b/...pp/src/main/java/org/odk/collect/android/activities/CaptureSelfieVideoActivityNewApi.java
@@ -26,7 +26,7 @@
 import org.odk.collect.android.fragments.Camera2VideoFragment;
 import org.odk.collect.android.utilities.ToastUtils;
 
-import static org.odk.collect.android.utilities.PermissionUtils.checkIfCameraPermissionGranted;
+import static org.odk.collect.android.utilities.PermissionUtils.checkIfCameraAndRecordAudioPermissionsGranted;
 
 @TargetApi(Build.VERSION_CODES.LOLLIPOP)
 public class CaptureSelfieVideoActivityNewApi extends Activity {
@@ -35,7 +35,7 @@ public class CaptureSelfieVideoActivityNewApi extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        if (!checkIfCameraPermissionGranted(this)) {
+        if (!checkIfCameraAndRecordAudioPermissionsGranted(this)) {
             finish();
             return;
         }

diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/PermissionUtils.java b/collect_app/src/main/java/org/odk/collect/android/utilities/PermissionUtils.java
@@ -190,6 +190,39 @@ public void onPermissionRationaleShouldBeShown(PermissionRequest permission, Per
                 .check();
     }
 
+    public static void requestCameraAndRecordAudioPermissions(@NonNull Activity activity, @NonNull PermissionListener action) {
+        MultiplePermissionsListener multiplePermissionsListener = new MultiplePermissionsListener() {
+            @Override
+            public void onPermissionsChecked(MultiplePermissionsReport report) {
+                if (report.areAllPermissionsGranted()) {
+                    action.granted();
+                } else {
+                    AlertDialog.Builder builder = new AlertDialog.Builder(activity, R.style.Theme_AppCompat_Light_Dialog);
+
+                    builder.setTitle(R.string.camera_runtime_permission_denied_title)
+                            .setMessage(R.string.camera_runtime_permission_denied_desc)
+                            .setPositiveButton(android.R.string.ok, (dialogInterface, i) -> action.denied())
+                            .setCancelable(false)
+                            .setIcon(R.drawable.ic_photo_camera)
+                            .show();
+                }
+            }
+
+            @Override
+            public void onPermissionRationaleShouldBeShown(List<PermissionRequest> permissions, PermissionToken token) {
+                token.continuePermissionRequest();
+            }
+        };
+
+        Dexter.withActivity(activity)
+                .withPermissions(
+                        Manifest.permission.CAMERA,
+                        Manifest.permission.RECORD_AUDIO
+                ).withListener(multiplePermissionsListener)
+                .withErrorListener(error -> Timber.i(error.name()))
+                .check();
+    }
+
     public static void requestGetAccountsPermission(@NonNull Activity activity, @NonNull PermissionListener action) {
         com.karumi.dexter.listener.single.PermissionListener permissionListener = new com.karumi.dexter.listener.single.PermissionListener() {
             @Override
@@ -312,6 +345,14 @@ public static boolean checkIfLocationPermissionsGranted(Context context) {
                 && accessCoarseLocation == PackageManager.PERMISSION_GRANTED;
     }
 
+    public static boolean checkIfCameraAndRecordAudioPermissionsGranted(Context context) {
+        int cameraPermission = ContextCompat.checkSelfPermission(context, Manifest.permission.CAMERA);
+        int recordAudioPermission = ContextCompat.checkSelfPermission(context, Manifest.permission.RECORD_AUDIO);
+
+        return cameraPermission == PackageManager.PERMISSION_GRANTED
+                && recordAudioPermission == PackageManager.PERMISSION_GRANTED;
+    }
+
     public static boolean checkIfGetAccountsPermissionGranted(Context context) {
         return ContextCompat.checkSelfPermission(context, Manifest.permission.GET_ACCOUNTS) == PackageManager.PERMISSION_GRANTED;
     }

diff --git a/collect_app/src/main/java/org/odk/collect/android/widgets/VideoWidget.java b/collect_app/src/main/java/org/odk/collect/android/widgets/VideoWidget.java
@@ -58,6 +58,7 @@
 
 import static android.os.Build.MODEL;
 import static org.odk.collect.android.utilities.ApplicationConstants.RequestCodes;
+import static org.odk.collect.android.utilities.PermissionUtils.requestCameraAndRecordAudioPermissions;
 import static org.odk.collect.android.utilities.PermissionUtils.requestCameraPermission;
 
 /**
@@ -321,16 +322,29 @@ public void cancelLongPress() {
     public void onButtonClick(int id) {
         switch (id) {
             case R.id.capture_video:
-                requestCameraPermission((FormEntryActivity) getContext(), new PermissionListener() {
-                    @Override
-                    public void granted() {
-                        captureVideo();
-                    }
-
-                    @Override
-                    public void denied() {
-                    }
-                });
+                if (selfie) {
+                    requestCameraAndRecordAudioPermissions((FormEntryActivity) getContext(), new PermissionListener() {
+                        @Override
+                        public void granted() {
+                            captureVideo();
+                        }
+
+                        @Override
+                        public void denied() {
+                        }
+                    });
+                } else {
+                    requestCameraPermission((FormEntryActivity) getContext(), new PermissionListener() {
+                        @Override
+                        public void granted() {
+                            captureVideo();
+                        }
+
+                        @Override
+                        public void denied() {
+                        }
+                    });
+                }
                 break;
             case R.id.choose_video:
                 chooseVideo();