Merge pull request #14823 from nextcloud/handle-sample-bitmap-decoding-better

Handle Sample Bitmap Decoding Better

Author: tobiasKaminsky

app/src/main/java/com/owncloud/android/utils/BitmapUtils.java

@@ -35,15 +35,16 @@
 import com.owncloud.android.lib.resources.users.StatusType;
 import com.owncloud.android.ui.StatusDrawable;
 
-
 import java.io.File;
+import java.io.IOException;
 import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.Locale;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
 import androidx.core.graphics.drawable.RoundedBitmapDrawable;
 import androidx.core.graphics.drawable.RoundedBitmapDrawableFactory;
 import androidx.exifinterface.media.ExifInterface;
@@ -75,6 +76,28 @@ public static Bitmap addColorFilter(Bitmap originalBitmap, int filterColor, int
         return resultBitmap;
     }
 
+    @Nullable
+    @RequiresApi(Build.VERSION_CODES.P)
+    private static Bitmap decodeSampledBitmapViaImageDecoder(@NonNull File file, int reqWidth, int reqHeight) {
+        try {
+            Log_OC.i(TAG, "Decoding Bitmap via ImageDecoder");
+
+            final var imageDecoderSource = ImageDecoder.createSource(file);
+
+            final var onDecoderListener = new ImageDecoder.OnHeaderDecodedListener() {
+                @Override
+                public void onHeaderDecoded(@NonNull ImageDecoder decoder, @NonNull ImageDecoder.ImageInfo info, @NonNull ImageDecoder.Source source) {
+                    decoder.setTargetSize(reqWidth, reqHeight);
+                }
+            };
+
+            return ImageDecoder.decodeBitmap(imageDecoderSource, onDecoderListener);
+        } catch (IOException exception) {
+            Log_OC.w(TAG, "Decoding Bitmap via ImageDecoder failed, BitmapFactory.decodeFile will be used");
+            return null;
+        }
+    }
+
     /**
      * Decodes a bitmap from a file containing it minimizing the memory use, known that the bitmap will be drawn in a
      * surface of reqWidth x reqHeight
@@ -84,19 +107,23 @@ public static Bitmap addColorFilter(Bitmap originalBitmap, int filterColor, int
      * @param reqHeight Height of the surface where the Bitmap will be drawn on, in pixels.
      * @return decoded bitmap
      */
+    @Nullable
     public static Bitmap decodeSampledBitmapFromFile(String srcPath, int reqWidth, int reqHeight) {
+        final var file = new File(srcPath);
+        if (!file.exists()) {
+            Log_OC.e(TAG, "File does not exists, returning null");
+            return null;
+        }
+
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
-            // For API 28 and above, use ImageDecoder
-            try {
-                return ImageDecoder.decodeBitmap(ImageDecoder.createSource(new File(srcPath)),
-                                                 (decoder, info, source) -> {
-                                                     // Set the target size
-                                                     decoder.setTargetSize(reqWidth, reqHeight);
-                                                 });
-            } catch (Exception exception) {
-                Log_OC.e("BitmapUtil", "Error decoding the bitmap from file: " + srcPath + ", exception: " + exception.getMessage());
+            final var result = decodeSampledBitmapViaImageDecoder(file, reqWidth, reqHeight);
+            if (result != null) {
+                return result;
             }
         }
+
+        Log_OC.i(TAG, "Decoding Bitmap via BitmapFactory.decodeFile");
+
         // set desired options that will affect the size of the bitmap
         final Options options = new Options();
 
@@ -134,8 +161,10 @@ public static Bitmap retrieveBitmapFromFile(String storagePath, int minWidth, in
             originalHeight = tempWidth;
         }
 
-        var bitmapResult = decodeSampledBitmapFromFile(
-            storagePath, originalWidth, originalHeight);
+        var bitmapResult = decodeSampledBitmapFromFile(storagePath, originalWidth, originalHeight);
+        if (bitmapResult == null) {
+            return null;
+        }
 
         // Calculate the scaling factors based on screen dimensions
         var widthScaleFactor = (float) minWidth/ bitmapResult.getWidth();