Handle FileNotFoundException

miguelbcr · Jan 25, 2017 · e495243 · e495243
1 parent 3c7c70d
commit e495243
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo2/interactors/DownloadImage.java b/rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo2/interactors/DownloadImage.java
@@ -24,6 +24,7 @@
 import io.reactivex.schedulers.Schedulers;
 import java.io.BufferedInputStream;
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.InputStream;
 import java.net.URL;
 import java.net.URLConnection;
@@ -50,16 +51,18 @@ public DownloadImage with(Uri uri) {
   private Observable<String> getObservableDownloadFile() {
     return Observable.create(new ObservableOnSubscribe<String>() {
       @Override public void subscribe(ObservableEmitter<String> subscriber) throws Exception {
-        try {
-          if ("content".equalsIgnoreCase(uri.getScheme())) {
-            subscriber.onNext(getContent());
-          } else {
-            subscriber.onNext(downloadFile());
-          }
+        if (!subscriber.isDisposed()) {
+          try {
+            if ("content".equalsIgnoreCase(uri.getScheme())) {
+              subscriber.onNext(getContent());
+            } else {
+              subscriber.onNext(downloadFile());
+            }
 
-          subscriber.onComplete();
-        } catch (Exception e) {
-          subscriber.onError(e);
+            subscriber.onComplete();
+          } catch (FileNotFoundException e) {
+            subscriber.onError(e);
+          }
         }
       }
     }).subscribeOn(Schedulers.io());
@@ -77,7 +80,7 @@ private String downloadFile() throws Exception {
     return file.getAbsolutePath();
   }
 
-  private String getContent() throws Exception {
+  private String getContent() throws FileNotFoundException {
     InputStream inputStream = targetUi.getContext().getContentResolver().openInputStream(uri);
     String filename = getFilename(uri);
     filename += imageUtils.getFileExtension(uri);

diff --git a/rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo2/interactors/PickImage.java b/rx_paparazzo/src/main/java/com/miguelbcr/ui/rx_paparazzo2/interactors/PickImage.java
@@ -20,7 +20,11 @@
 import android.content.Intent;
 import android.net.Uri;
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import io.reactivex.Observable;
+import io.reactivex.ObservableSource;
+import io.reactivex.exceptions.Exceptions;
+import io.reactivex.functions.Consumer;
 import io.reactivex.functions.Function;
 import io.reactivex.schedulers.Schedulers;
 import java.io.File;
@@ -66,7 +70,8 @@ public Observable<String> response(int responseCode, @Nullable final Intent inte
                   intent.setData(Uri.fromFile(new File(filePath)));
                   return filePath;
                 }
-              });
+              })
+              .onErrorReturnItem("");
         } else {
           return Observable.just("");
         }