Merge pull request #60 from IlyaGulya/bugfix-nullpointer-getpath

Fix NullPointerException in PickImage (Close #59)
miguelbcr · Feb 2, 2017 · 7a2c7fa · 7a2c7fa
2 parents eff1732 + 60b36a4
commit 7a2c7fa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo/interactors/PickImage.java b/rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo/interactors/PickImage.java
@@ -20,10 +20,10 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.Nullable;
+
 import java.io.File;
+
 import rx.Observable;
-import rx.exceptions.Exceptions;
-import rx.functions.Action1;
 import rx.functions.Func1;
 import rx.schedulers.Schedulers;
 import rx_activity_result.OnPreResult;
@@ -59,7 +59,8 @@ private OnPreResult getOnPreResultProcessing() {
     return new OnPreResult() {
       @Override
       public Observable<String> response(int responseCode, @Nullable final Intent intent) {
-        if (responseCode == Activity.RESULT_OK) {
+        final boolean dataExists = intent != null && intent.getData() != null;
+        if (responseCode == Activity.RESULT_OK && dataExists) {
           return getPath.with(intent.getData())
               .react()
               .subscribeOn(Schedulers.io())