Merge pull request #25 from FuckBoilerplate/feature/#23-avoid_ask_for_permissions

Avoid ask for external storage permissions if internal storage is use…

Author: miguelbcr

rx_paparazzo/src/main/java/com/fuck_boilerplate/rx_paparazzo/interactors/GrantPermissions.java

@@ -37,6 +37,10 @@ public GrantPermissions with(String... permissions) {
     }
 
     @Override public Observable<Void> react() {
+        if (permissions.length == 0) {
+            return Observable.just(null);
+        }
+
         return RxPermissions.getInstance(targetUi.activity())
                 .request(permissions)
                 .flatMap(new Func1<Boolean, Observable<Void>>() {

rx_paparazzo/src/main/java/com/fuck_boilerplate/rx_paparazzo/internal/di/ApplicationComponentImpl.java

@@ -38,8 +38,8 @@ public ApplicationComponentImpl(TargetUi ui, Config config) {
         grantPermissions = new GrantPermissions(ui);
         pickImages = new PickImages(startIntent);
         pickImage = new PickImage(startIntent, ui);
-        camera = new Camera(takePhoto, cropImage, saveImage, grantPermissions, ui);
-        gallery = new Gallery(grantPermissions, pickImages, pickImage, cropImage, saveImage, ui);
+        camera = new Camera(takePhoto, cropImage, saveImage, grantPermissions, ui, config);
+        gallery = new Gallery(grantPermissions, pickImages, pickImage, cropImage, saveImage, ui, config);
     }
 
     @Override

rx_paparazzo/src/main/java/com/fuck_boilerplate/rx_paparazzo/workers/Camera.java

@@ -20,6 +20,7 @@
 import android.app.Activity;
 import android.net.Uri;
 
+import com.fuck_boilerplate.rx_paparazzo.entities.Config;
 import com.fuck_boilerplate.rx_paparazzo.entities.Response;
 import com.fuck_boilerplate.rx_paparazzo.entities.TargetUi;
 import com.fuck_boilerplate.rx_paparazzo.interactors.CropImage;
@@ -36,22 +37,20 @@ public final class Camera extends Worker {
     private final SaveImage saveImage;
     private final GrantPermissions grantPermissions;
     private final TargetUi targetUi;
+    private final Config config;
 
-    public Camera(TakePhoto takePhoto, CropImage cropImage, SaveImage saveImage, GrantPermissions grantPermissions, TargetUi targetUi) {
+    public Camera(TakePhoto takePhoto, CropImage cropImage, SaveImage saveImage, GrantPermissions grantPermissions, TargetUi targetUi, Config config) {
         super(targetUi);
         this.takePhoto = takePhoto;
         this.cropImage = cropImage;
         this.saveImage = saveImage;
         this.grantPermissions = grantPermissions;
         this.targetUi = targetUi;
+        this.config = config;
     }
 
     public <T> Observable<Response<T, String>> takePhoto() {
-        String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                Manifest.permission.READ_EXTERNAL_STORAGE,
-                Manifest.permission.CAMERA};
-
-        return grantPermissions.with(permissions).react()
+        return grantPermissions.with(permissions()).react()
                 .flatMap(new Func1<Void, Observable<Uri>>() {
                     @Override
                     public Observable<Uri> call(Void granted) {
@@ -78,4 +77,14 @@ public Response<T, String> call(String path) {
                 })
                 .compose(this.<Response<T, String>>applyOnError());
     }
+
+    private String[] permissions() {
+        if (config.useInternalStorage()) {
+            return new String[] {Manifest.permission.CAMERA};
+        } else {
+            return new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                    Manifest.permission.READ_EXTERNAL_STORAGE,
+                    Manifest.permission.CAMERA};
+        }
+    }
 }

rx_paparazzo/src/main/java/com/fuck_boilerplate/rx_paparazzo/workers/Gallery.java

@@ -20,6 +20,7 @@
 import android.app.Activity;
 import android.net.Uri;
 
+import com.fuck_boilerplate.rx_paparazzo.entities.Config;
 import com.fuck_boilerplate.rx_paparazzo.entities.Response;
 import com.fuck_boilerplate.rx_paparazzo.entities.TargetUi;
 import com.fuck_boilerplate.rx_paparazzo.interactors.CropImage;
@@ -40,15 +41,17 @@ public final class Gallery extends Worker {
     private final CropImage cropImage;
     private final SaveImage saveImage;
     private final TargetUi targetUi;
+    private final Config config;
 
-    public Gallery(GrantPermissions grantPermissions, PickImages pickImages, PickImage pickImage, CropImage cropImage, SaveImage saveImage, TargetUi targetUi) {
+    public Gallery(GrantPermissions grantPermissions, PickImages pickImages, PickImage pickImage, CropImage cropImage, SaveImage saveImage, TargetUi targetUi, Config config) {
         super(targetUi);
         this.grantPermissions = grantPermissions;
         this.pickImages = pickImages;
         this.pickImage = pickImage;
         this.cropImage = cropImage;
         this.saveImage = saveImage;
         this.targetUi = targetUi;
+        this.config = config;
     }
 
     public <T> Observable<Response<T, String>> pickImage() {
@@ -117,8 +120,11 @@ public Response<T, List<String>> call(List<String> paths) {
     }
 
     private String[] permissions() {
-        String[] permissions = {Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE};
-        return permissions;
+        if (config.useInternalStorage()) {
+            return new String[] {};
+        } else {
+            return new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE, Manifest.permission.READ_EXTERNAL_STORAGE};
+        }
     }
 
 }