From f435587754b73bfc0be94d54e8a8566d196fc63c Mon Sep 17 00:00:00 2001 From: obaidgini Date: Mon, 7 Apr 2025 15:41:24 +0200 Subject: [PATCH] fix(capture-sdk): Fixed the crash, showing black image if the bitmap is null for any reason. PM-150 --- .../net/gini/android/capture/camera/PhotoThumbnail.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java b/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java index bb256d9005..6ffcfead54 100644 --- a/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java +++ b/capture-sdk/sdk/src/main/java/net/gini/android/capture/camera/PhotoThumbnail.java @@ -112,8 +112,9 @@ private void resetImageView(@NonNull final ImageView imageView) { private static void setBitmapOrBlack(@NonNull final ImageView imageView, @Nullable final ThumbnailBitmap stackBitmap) { - if (stackBitmap != null) { - imageView.setImageBitmap(stackBitmap.getRotatedBitmap()); + Bitmap bitmap = (stackBitmap != null) ? stackBitmap.getRotatedBitmap() : null; + if (bitmap != null) { + imageView.setImageBitmap(bitmap); } else { imageView.setImageBitmap(null); imageView.setBackgroundColor(Color.BLACK); @@ -132,7 +133,7 @@ static class ThumbnailBitmap { } final Bitmap getRotatedBitmap() { - if (rotatedBitmap == null) { + if (rotatedBitmap == null && bitmap != null) { Matrix matrix = new Matrix(); matrix.postRotate(rotation); rotatedBitmap = Bitmap.createBitmap(bitmap, 0, 0, bitmap.getWidth(), bitmap.getHeight(), matrix, true);