fix #258

Curzibn · Jun 22, 2018 · a9c10e0 · a9c10e0
1 parent f5c646a
commit a9c10e0
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 11 deletions.
diff --git a/example/src/main/java/top/zibin/luban/example/MainActivity.java b/example/src/main/java/top/zibin/luban/example/MainActivity.java
@@ -75,7 +75,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
 
     switch (item.getItemId()) {
       case R.id.sync_files:
-        withRx(assetsToFiles());
+        List<File> list = new ArrayList<>();
+        list.add(new File("/data/user/0/1529400069961674"));
+        originPhotos.addAll(list);
+        withRx(list);
         break;
       case R.id.sync_uris:
         withRx(assetsToUri());
@@ -143,6 +146,13 @@ public List<File> apply(@NonNull List<T> list) throws Exception {
           }
         })
         .observeOn(AndroidSchedulers.mainThread())
+        .doOnError(new Consumer<Throwable>() {
+          @Override
+          public void accept(Throwable throwable) {
+            Log.e(TAG, throwable.getMessage());
+          }
+        })
+        .onErrorResumeNext(Flowable.<List<File>>empty())
         .subscribe(new Consumer<List<File>>() {
           @Override
           public void accept(@NonNull List<File> list) {

diff --git a/library/src/main/java/top/zibin/luban/Checker.java b/library/src/main/java/top/zibin/luban/Checker.java
@@ -155,19 +155,24 @@ && pack(jpeg, offset + 6, 2, false) == 0) {
     return 0;
   }
 
-  String extSuffix(InputStreamProvider input) throws IOException {
-    Bitmap bitmap = BitmapFactory.decodeStream(input.open(), null, new BitmapFactory.Options());
-    String suffix = TextUtils.isEmpty(input.getPath()) ? "" : input.getPath().substring(input.getPath().lastIndexOf("."), input.getPath().length());
+  String extSuffix(InputStreamProvider input) {
+    try {
+      Bitmap bitmap = BitmapFactory.decodeStream(input.open(), null, new BitmapFactory.Options());
+      String suffix = TextUtils.isEmpty(input.getPath()) ? "" :
+          input.getPath().substring(input.getPath().lastIndexOf("."), input.getPath().length());
+
+      if (bitmap.hasAlpha()) {
+        return PNG;
+      } else if (TextUtils.isEmpty(suffix)) {
+        return JPG;
+      } else if (!format.contains(suffix)) {
+        return JPG;
+      }
 
-    if (bitmap.hasAlpha()) {
-      return PNG;
-    } else if (TextUtils.isEmpty(suffix)) {
-      return JPG;
-    } else if (!format.contains(suffix)) {
+      return suffix;
+    } catch (Exception e) {
       return JPG;
     }
-
-    return suffix;
   }
 
   boolean needCompress(int leastCompressSize, String path) {