Merge remote-tracking branch 'origin/develop' into feature/people-man…

…agement-sync
wordpress-mobile · May 5, 2016 · 4fad089 · 4fad089
2 parents cfb9b6e + 81c3fe1
commit 4fad089
Showing 1 changed file with 45 additions and 0 deletions.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/PermissionUtils.java b/WordPressUtils/src/main/java/org/wordpress/android/util/PermissionUtils.java
@@ -2,7 +2,10 @@
 
 import android.Manifest.permission;
 import android.app.Activity;
+import android.app.Fragment;
+import android.content.Context;
 import android.content.pm.PackageManager;
+import android.support.v13.app.FragmentCompat;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
 
@@ -30,23 +33,65 @@ private static boolean checkAndRequestPermissions(Activity activity, int request
         return true;
     }
 
+    /**
+     * Check for permissions, request them if they're not granted.
+     *
+     * @return true if permissions are already granted, else request them and return false.
+     */
+    private static boolean checkAndRequestPermissions(Fragment fragment, int requestCode, String[] permissionList) {
+        List<String> toRequest = new ArrayList<>();
+        for (String permission : permissionList) {
+            Context context = fragment.getActivity();
+            if (context != null && ContextCompat.checkSelfPermission(context, permission) != PackageManager
+                    .PERMISSION_GRANTED) {
+                toRequest.add(permission);
+            }
+        }
+        if (toRequest.size() > 0) {
+            String[] requestedPermissions = toRequest.toArray(new String[toRequest.size()]);
+            FragmentCompat.requestPermissions(fragment, requestedPermissions, requestCode);
+            return false;
+        }
+        return true;
+    }
+
     public static boolean checkAndRequestCameraAndStoragePermissions(Activity activity, int requestCode) {
         return checkAndRequestPermissions(activity, requestCode, new String[]{
                 permission.WRITE_EXTERNAL_STORAGE,
                 permission.CAMERA
         });
     }
 
+    public static boolean checkAndRequestCameraAndStoragePermissions(Fragment fragment, int requestCode) {
+        return checkAndRequestPermissions(fragment, requestCode, new String[]{
+                permission.WRITE_EXTERNAL_STORAGE,
+                permission.CAMERA
+        });
+    }
+
     public static boolean checkAndRequestStoragePermission(Activity activity, int requestCode) {
         return checkAndRequestPermissions(activity, requestCode, new String[]{
                 permission.WRITE_EXTERNAL_STORAGE
         });
     }
 
+    public static boolean checkAndRequestStoragePermission(Fragment fragment, int requestCode) {
+        return checkAndRequestPermissions(fragment, requestCode, new String[]{
+                permission.WRITE_EXTERNAL_STORAGE
+        });
+    }
+
     public static boolean checkLocationPermissions(Activity activity, int requestCode) {
         return checkAndRequestPermissions(activity, requestCode, new String[]{
                 permission.ACCESS_FINE_LOCATION,
                 permission.ACCESS_COARSE_LOCATION
         });
     }
+
+    public static boolean checkLocationPermissions(Fragment fragment, int requestCode) {
+        return checkAndRequestPermissions(fragment, requestCode, new String[]{
+                permission.ACCESS_FINE_LOCATION,
+                permission.ACCESS_COARSE_LOCATION
+        });
+    }
 }