Migrate to Coil 3

app/build.gradle

@@ -124,6 +124,8 @@ ext {
 
     leakCanaryVersion = '2.12'
     stethoVersion = '1.6.0'
+
+    coilVersion = '3.0.3'
 }
 
 configurations {
@@ -207,7 +209,7 @@ dependencies {
     // This works thanks to JitPack: https://jitpack.io/
     implementation 'com.github.TeamNewPipe:nanojson:1d9e1aea9049fc9f85e68b43ba39fe7be1c1f751'
     // WORKAROUND: v0.24.2 can't be resolved by jitpack -> use git commit hash instead
-    implementation 'com.github.TeamNewPipe:NewPipeExtractor:176da72cb4c3ec4679211339b0e59f6b01bf2f52'
+    implementation 'com.github.TeamNewPipe:NewPipeExtractor:d3d5f2b3f03a5f2b479b9f6fdf1c2555cbb9de0e'
     implementation 'com.github.TeamNewPipe:NoNonsense-FilePicker:5.0.0'
 
 /** Checkstyle **/
@@ -272,7 +274,8 @@ dependencies {
     implementation "com.github.lisawray.groupie:groupie-viewbinding:${groupieVersion}"
 
     // Image loading
-    implementation 'io.coil-kt:coil-compose:2.7.0'
+    implementation "io.coil-kt.coil3:coil-compose:${coilVersion}"
+    implementation "io.coil-kt.coil3:coil-network-okhttp:${coilVersion}"
 
     // Markdown library for Android
     implementation "io.noties.markwon:core:${markwonVersion}"

app/src/main/java/org/schabi/newpipe/MainActivity.java

@@ -166,7 +166,7 @@ protected void onCreate(final Bundle savedInstanceState) {
             NotificationWorker.initialize(this);
         }
         if (!UpdateSettingsFragment.wasUserAskedForConsent(this)
-                && !App.getApp().isFirstRun()
+                && !App.getInstance().isFirstRun()
                 && ReleaseVersionUtil.INSTANCE.isReleaseApk()) {
             UpdateSettingsFragment.askForConsentToUpdateChecks(this);
         }
@@ -176,7 +176,7 @@ protected void onCreate(final Bundle savedInstanceState) {
     protected void onPostCreate(final Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
 
-        final App app = App.getApp();
+        final App app = App.getInstance();
         final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(app);
 
         if (prefs.getBoolean(app.getString(R.string.update_app_key), false)

app/src/main/java/org/schabi/newpipe/fragments/detail/VideoDetailFragment.java

@@ -127,7 +127,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 
-import coil.util.CoilUtils;
+import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
 import io.reactivex.rxjava3.disposables.Disposable;

app/src/main/java/org/schabi/newpipe/fragments/list/channel/ChannelFragment.java

@@ -60,7 +60,7 @@
 import java.util.Queue;
 import java.util.concurrent.TimeUnit;
 
-import coil.util.CoilUtils;
+import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;

app/src/main/java/org/schabi/newpipe/fragments/list/playlist/PlaylistFragment.java

@@ -62,7 +62,7 @@
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
 
-import coil.util.CoilUtils;
+import coil3.util.CoilUtils;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Flowable;
 import io.reactivex.rxjava3.core.Single;

app/src/main/java/org/schabi/newpipe/info_list/dialog/InfoItemDialog.java

@@ -346,7 +346,7 @@ public InfoItemDialog create() {
 
         public static void reportErrorDuringInitialization(final Throwable throwable,
                                                            final InfoItem item) {
-            ErrorUtil.showSnackbar(App.getApp().getBaseContext(), new ErrorInfo(
+            ErrorUtil.showSnackbar(App.getInstance().getBaseContext(), new ErrorInfo(
                     throwable,
                     UserAction.OPEN_INFO_ITEM_DIALOG,
                     "none",

app/src/main/java/org/schabi/newpipe/local/feed/FeedViewModel.kt

@@ -165,7 +165,7 @@ class FeedViewModel(
         fun getFactory(context: Context, groupId: Long) = viewModelFactory {
             initializer {
                 FeedViewModel(
-                    App.getApp(),
+                    App.instance,
                     groupId,
                     // Read initial value from preferences
                     getShowPlayedItemsFromPreferences(context.applicationContext),

app/src/main/java/org/schabi/newpipe/player/Player.java

@@ -46,21 +46,20 @@
 import static org.schabi.newpipe.util.ListHelper.getResolutionIndex;
 import static org.schabi.newpipe.util.Localization.assureCorrectAppLanguage;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static coil3.Image_androidKt.toBitmap;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
-import android.graphics.drawable.Drawable;
 import android.media.AudioManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.core.graphics.drawable.DrawableKt;
 import androidx.core.math.MathUtils;
 import androidx.preference.PreferenceManager;
 
@@ -125,7 +124,7 @@
 import java.util.Optional;
 import java.util.stream.IntStream;
 
-import coil.target.Target;
+import coil3.target.Target;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.disposables.CompositeDisposable;
@@ -193,7 +192,7 @@ public final class Player implements PlaybackListener, Listener {
     @Nullable
     private Bitmap currentThumbnail;
     @Nullable
-    private coil.request.Disposable thumbnailDisposable;
+    private coil3.request.Disposable thumbnailDisposable;
 
     /*//////////////////////////////////////////////////////////////////////////
     // Player
@@ -789,27 +788,26 @@ private void loadCurrentThumbnail(final List<Image> thumbnails) {
         // scale down the notification thumbnail for performance
         final var thumbnailTarget = new Target() {
             @Override
-            public void onError(@Nullable final Drawable error) {
+            public void onError(@Nullable final coil3.Image error) {
                 Log.e(TAG, "Thumbnail - onError() called");
                 // there is a new thumbnail, so e.g. the end screen thumbnail needs to change, too.
                 onThumbnailLoaded(null);
             }
 
             @Override
-            public void onStart(@Nullable final Drawable placeholder) {
+            public void onStart(@Nullable final coil3.Image placeholder) {
                 if (DEBUG) {
                     Log.d(TAG, "Thumbnail - onStart() called");
                 }
             }
 
             @Override
-            public void onSuccess(@NonNull final Drawable result) {
+            public void onSuccess(@NonNull final coil3.Image result) {
                 if (DEBUG) {
                     Log.d(TAG, "Thumbnail - onSuccess() called with: drawable = [" + result + "]");
                 }
                 // there is a new thumbnail, so e.g. the end screen thumbnail needs to change, too.
-                onThumbnailLoaded(DrawableKt.toBitmapOrNull(result, result.getIntrinsicWidth(),
-                        result.getIntrinsicHeight(), null));
+                onThumbnailLoaded(toBitmap(result));
             }
         };
         thumbnailDisposable = CoilHelper.INSTANCE

app/src/main/java/org/schabi/newpipe/player/helper/PlayerHolder.java

@@ -16,8 +16,8 @@
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.MainActivity;
 import org.schabi.newpipe.extractor.stream.StreamInfo;
-import org.schabi.newpipe.player.PlayerService;
 import org.schabi.newpipe.player.Player;
+import org.schabi.newpipe.player.PlayerService;
 import org.schabi.newpipe.player.PlayerType;
 import org.schabi.newpipe.player.event.PlayerServiceEventListener;
 import org.schabi.newpipe.player.event.PlayerServiceExtendedEventListener;
@@ -116,7 +116,7 @@ public void setListener(@Nullable final PlayerServiceExtendedEventListener newLi
     // helper to handle context in common place as using the same
     // context to bind/unbind a service is crucial
     private Context getCommonContext() {
-        return App.getApp();
+        return App.getInstance();
     }
 
     public void startService(final boolean playAfterConnect,

app/src/main/java/org/schabi/newpipe/player/seekbarpreview/SeekbarPreviewThumbnailHolder.java

@@ -179,7 +179,7 @@ private Bitmap getBitMapFrom(final String url) {
 
             // Gets the bitmap within the timeout of 15 seconds imposed by default by OkHttpClient
             // Ensure that you are not running on the main thread, otherwise this will hang
-            final var bitmap = CoilHelper.INSTANCE.loadBitmapBlocking(App.getApp(), url);
+            final var bitmap = CoilHelper.INSTANCE.loadBitmapBlocking(App.getInstance(), url);
 
             if (sw != null) {
                 Log.d(TAG, "Download of bitmap for seekbarPreview from '" + url + "' took "

app/src/main/java/org/schabi/newpipe/settings/ContentSettingsFragment.java

@@ -15,7 +15,7 @@
 import org.schabi.newpipe.util.image.ImageStrategy;
 import org.schabi.newpipe.util.image.PreferredImageQuality;
 
-import coil.Coil;
+import coil3.SingletonImageLoader;
 
 public class ContentSettingsFragment extends BasePreferenceFragment {
     private String youtubeRestrictedModeEnabledKey;
@@ -41,7 +41,7 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
                 (preference, newValue) -> {
                     ImageStrategy.setPreferredImageQuality(PreferredImageQuality
                             .fromPreferenceKey(requireContext(), (String) newValue));
-                    final var loader = Coil.imageLoader(preference.getContext());
+                    final var loader =  SingletonImageLoader.get(preference.getContext());
                     loader.getMemoryCache().clear();
                     loader.getDiskCache().clear();
                     Toast.makeText(preference.getContext(),

app/src/main/java/org/schabi/newpipe/settings/NewPipeSettings.java

@@ -156,7 +156,7 @@ private static void disableMediaTunnelingIfNecessary(@NonNull final Context cont
                 prefs.getInt(disabledTunnelingAutomaticallyKey, -1) == 0
                         && !prefs.getBoolean(disabledTunnelingKey, false);
 
-        if (App.getApp().isFirstRun()
+        if (App.getInstance().isFirstRun()
                 || (wasDeviceBlacklistUpdated && !wasMediaTunnelingEnabledByUser)) {
             setMediaTunneling(context);
         }

app/src/main/java/org/schabi/newpipe/settings/SettingMigrations.java

@@ -1,5 +1,7 @@
 package org.schabi.newpipe.settings;
 
+import static org.schabi.newpipe.MainActivity.DEBUG;
+
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.util.Log;
@@ -18,8 +20,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import static org.schabi.newpipe.MainActivity.DEBUG;
-
 /**
  * In order to add a migration, follow these steps, given P is the previous version:<br>
  * - in the class body add a new {@code MIGRATION_P_P+1 = new Migration(P, P+1) { ... }} and put in
@@ -171,7 +171,7 @@ public static void runMigrationsIfNeeded(@NonNull final Context context) {
         final int lastPrefVersion = sp.getInt(lastPrefVersionKey, 0);
 
         // no migration to run, already up to date
-        if (App.getApp().isFirstRun()) {
+        if (App.getInstance().isFirstRun()) {
             sp.edit().putInt(lastPrefVersionKey, VERSION).apply();
             return;
         } else if (lastPrefVersion == VERSION) {

app/src/main/java/org/schabi/newpipe/ui/components/items/playlist/PlaylistThumbnail.kt

@@ -18,7 +18,7 @@ import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.playlist.PlaylistInfoItem
 import org.schabi.newpipe.util.Localization

app/src/main/java/org/schabi/newpipe/ui/components/items/stream/StreamThumbnail.kt

@@ -22,7 +22,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.stream.StreamInfoItem
 import org.schabi.newpipe.util.Localization

app/src/main/java/org/schabi/newpipe/ui/components/video/comment/Comment.kt

@@ -41,7 +41,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.tooling.preview.datasource.CollectionPreviewParameterProvider
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.Page
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem

app/src/main/java/org/schabi/newpipe/ui/components/video/comment/CommentRepliesHeader.kt

@@ -28,7 +28,7 @@ import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.tooling.preview.datasource.LoremIpsum
 import androidx.compose.ui.unit.dp
-import coil.compose.AsyncImage
+import coil3.compose.AsyncImage
 import org.schabi.newpipe.R
 import org.schabi.newpipe.extractor.comments.CommentsInfoItem
 import org.schabi.newpipe.extractor.stream.Description

app/src/main/java/org/schabi/newpipe/util/DeviceUtils.java

@@ -130,7 +130,7 @@ public static boolean isFireTv() {
         }
 
         isFireTV =
-                App.getApp().getPackageManager().hasSystemFeature(AMAZON_FEATURE_FIRE_TV);
+                App.getInstance().getPackageManager().hasSystemFeature(AMAZON_FEATURE_FIRE_TV);
         return isFireTV;
     }
 
@@ -139,7 +139,7 @@ public static boolean isTv(final Context context) {
             return isTV;
         }
 
-        final PackageManager pm = App.getApp().getPackageManager();
+        final PackageManager pm = App.getInstance().getPackageManager();
 
         // from doc: https://developer.android.com/training/tv/start/hardware.html#runtime-check
         boolean isTv = ContextCompat.getSystemService(context, UiModeManager.class)

app/src/main/java/org/schabi/newpipe/util/ReleaseVersionUtil.kt

@@ -21,7 +21,7 @@ object ReleaseVersionUtil {
         val certificates = mapOf(
             RELEASE_CERT_PUBLIC_KEY_SHA256.hexToByteArray() to PackageManager.CERT_INPUT_SHA256
         )
-        val app = App.getApp()
+        val app = App.instance
         try {
             PackageInfoCompat.hasSignatures(app.packageManager, app.packageName, certificates, false)
         } catch (e: PackageManager.NameNotFoundException) {

app/src/main/java/org/schabi/newpipe/util/external_communication/ShareUtils.java

@@ -1,6 +1,7 @@
 package org.schabi.newpipe.util.external_communication;
 
 import static org.schabi.newpipe.MainActivity.DEBUG;
+import static coil3.Image_androidKt.toBitmap;
 
 import android.content.ActivityNotFoundException;
 import android.content.ClipData;
@@ -31,9 +32,9 @@
 import java.util.Collections;
 import java.util.List;
 
-import coil.Coil;
-import coil.disk.DiskCache;
-import coil.memory.MemoryCache;
+import coil3.SingletonImageLoader;
+import coil3.disk.DiskCache;
+import coil3.memory.MemoryCache;
 
 public final class ShareUtils {
     private static final String TAG = ShareUtils.class.getSimpleName();
@@ -377,13 +378,13 @@ private static ClipData generateClipDataForImagePreview(
             // Save the image in memory to the application's cache because we need a URI to the
             // image to generate a ClipData which will show the share sheet, and so an image file
             final Context applicationContext = context.getApplicationContext();
-            final var loader = Coil.imageLoader(context);
+            final var loader = SingletonImageLoader.get(context);
             final var value = loader.getMemoryCache()
                     .get(new MemoryCache.Key(thumbnailUrl, Collections.emptyMap()));
 
             final Bitmap cachedBitmap;
             if (value != null) {
-                cachedBitmap = value.getBitmap();
+                cachedBitmap = toBitmap(value.getImage());
             } else {
                 try (var snapshot = loader.getDiskCache().openSnapshot(thumbnailUrl)) {
                     if (snapshot != null) {