Use BitmapCompat.createScaledBitmap().

TeamNewPipe · Aug 1, 2022 · 867d641 · 867d641
1 parent 35a118a
commit 867d641
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/...src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java b/...src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHelper.java
@@ -8,6 +8,7 @@
 
 import androidx.annotation.IntDef;
 import androidx.annotation.NonNull;
+import androidx.core.graphics.BitmapCompat;
 import androidx.core.math.MathUtils;
 import androidx.preference.PreferenceManager;
 
@@ -91,8 +92,8 @@ public static void tryResizeAndSetSeekbarPreviewThumbnail(
             final float scaleFactor = (float) newWidth / srcWidth;
             final int newHeight = (int) (srcBitmap.getHeight() * scaleFactor);
 
-            currentSeekbarPreviewThumbnail.setImageBitmap(
-                    Bitmap.createScaledBitmap(srcBitmap, newWidth, newHeight, true));
+            currentSeekbarPreviewThumbnail.setImageBitmap(BitmapCompat.createScaledBitmap(srcBitmap,
+                    newWidth, newHeight, null, true));
         } catch (final Exception ex) {
             Log.e(TAG, "Failed to resize and set seekbar preview thumbnail", ex);
             currentSeekbarPreviewThumbnail.setVisibility(View.GONE);

diff --git a/app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java b/app/src/main/java/org/schabi/newpipe/util/PicassoHelper.java
@@ -8,6 +8,7 @@
 import android.graphics.drawable.Drawable;
 
 import androidx.annotation.Nullable;
+import androidx.core.graphics.BitmapCompat;
 
 import com.squareup.picasso.Cache;
 import com.squareup.picasso.LruCache;
@@ -133,28 +134,18 @@ public Bitmap transform(final Bitmap source) {
                                         .getDimension(R.dimen.player_notification_thumbnail_width),
                                 source.getWidth());
 
-                        final Bitmap result = Bitmap.createScaledBitmap(
+                        final Bitmap result = BitmapCompat.createScaledBitmap(
                                 source,
                                 (int) notificationThumbnailWidth,
                                 (int) (source.getHeight()
                                         / (source.getWidth() / notificationThumbnailWidth)),
+                                null,
                                 true);
 
-                        if (result == source) {
-                            // create a new mutable bitmap to prevent strange crashes on some
-                            // devices (see #4638)
-                            final Bitmap copied = Bitmap.createScaledBitmap(
-                                    source,
-                                    (int) notificationThumbnailWidth - 1,
-                                    (int) (source.getHeight() / (source.getWidth()
-                                            / (notificationThumbnailWidth - 1))),
-                                    true);
+                        if (result != source) {
                             source.recycle();
-                            return copied;
-                        } else {
-                            source.recycle();
-                            return result;
                         }
+                        return result;
                     }
 
                     @Override