Merge pull request #5928 from Stypox/picasso

Replace UniversalImageLoader with Picasso

app/build.gradle

@@ -246,7 +246,8 @@ dependencies {
     // Circular ImageView
     implementation "de.hdodenhof:circleimageview:3.1.0"
     // Image loading
-    implementation "com.nostra13.universalimageloader:universal-image-loader:1.9.5"
+    //noinspection GradleDependency --> 2.8 is the last version, not 2.71828!
+    implementation "com.squareup.picasso:picasso:2.8"
 
     // Markdown library for Android
     implementation "io.noties.markwon:core:${markwonVersion}"

app/src/debug/java/org/schabi/newpipe/settings/DebugSettingsFragment.java

@@ -5,6 +5,7 @@
 import androidx.preference.Preference;
 
 import org.schabi.newpipe.R;
+import org.schabi.newpipe.util.PicassoHelper;
 
 import leakcanary.LeakCanary;
 
@@ -15,17 +16,25 @@ public void onCreatePreferences(final Bundle savedInstanceState, final String ro
 
         final Preference showMemoryLeaksPreference
                 = findPreference(getString(R.string.show_memory_leaks_key));
+        final Preference showImageIndicatorsPreference
+                = findPreference(getString(R.string.show_image_indicators_key));
         final Preference crashTheAppPreference
                 = findPreference(getString(R.string.crash_the_app_key));
 
         assert showMemoryLeaksPreference != null;
+        assert showImageIndicatorsPreference != null;
         assert crashTheAppPreference != null;
 
         showMemoryLeaksPreference.setOnPreferenceClickListener(preference -> {
             startActivity(LeakCanary.INSTANCE.newLeakDisplayActivityIntent());
             return true;
         });
 
+        showImageIndicatorsPreference.setOnPreferenceChangeListener((preference, newValue) -> {
+            PicassoHelper.setIndicatorsEnabled((Boolean) newValue);
+            return true;
+        });
+
         crashTheAppPreference.setOnPreferenceClickListener(preference -> {
             throw new RuntimeException();
         });

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

@@ -11,10 +11,6 @@
 import androidx.multidex.MultiDexApplication;
 import androidx.preference.PreferenceManager;
 
-import com.nostra13.universalimageloader.cache.memory.impl.LRULimitedMemoryCache;
-import com.nostra13.universalimageloader.core.ImageLoader;
-import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
-
 import org.acra.ACRA;
 import org.acra.config.ACRAConfigurationException;
 import org.acra.config.CoreConfiguration;
@@ -28,6 +24,7 @@
 import org.schabi.newpipe.ktx.ExceptionUtils;
 import org.schabi.newpipe.settings.NewPipeSettings;
 import org.schabi.newpipe.util.Localization;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.ServiceHelper;
 import org.schabi.newpipe.util.StateSaver;
 
@@ -65,9 +62,9 @@
  */
 
 public class App extends MultiDexApplication {
-    protected static final String TAG = App.class.toString();
-    private static App app;
     public static final String PACKAGE_NAME = BuildConfig.APPLICATION_ID;
+    private static final String TAG = App.class.toString();
+    private static App app;
 
     @Nullable
     private Disposable disposable = null;
@@ -103,7 +100,12 @@ public void onCreate() {
         ServiceHelper.initServices(this);
 
         // Initialize image loader
-        ImageLoader.getInstance().init(getImageLoaderConfigurations(10, 50));
+        final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        PicassoHelper.init(this);
+        PicassoHelper.setShouldLoadImages(
+                prefs.getBoolean(getString(R.string.download_thumbnail_key), true));
+        PicassoHelper.setIndicatorsEnabled(MainActivity.DEBUG
+                && prefs.getBoolean(getString(R.string.show_image_indicators_key), false));
 
         configureRxJavaErrorHandler();
 
@@ -117,6 +119,7 @@ public void onTerminate() {
             disposable.dispose();
         }
         super.onTerminate();
+        PicassoHelper.terminate();
     }
 
     protected Downloader getDownloader() {
@@ -201,15 +204,6 @@ private void reportException(@NonNull final Throwable throwable) {
         });
     }
 
-    private ImageLoaderConfiguration getImageLoaderConfigurations(final int memoryCacheSizeMb,
-                                                                  final int diskCacheSizeMb) {
-        return new ImageLoaderConfiguration.Builder(this)
-                .memoryCache(new LRULimitedMemoryCache(memoryCacheSizeMb * 1024 * 1024))
-                .diskCacheSize(diskCacheSizeMb * 1024 * 1024)
-                .imageDownloader(new ImageDownloader(getApplicationContext()))
-                .build();
-    }
-
     /**
      * Called in {@link #attachBaseContext(Context)} after calling the {@code super} method.
      * Should be overridden if MultiDex is enabled, since it has to be initialized before ACRA.

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

@@ -10,14 +10,11 @@
 import androidx.fragment.app.Fragment;
 import androidx.fragment.app.FragmentManager;
 
-import com.nostra13.universalimageloader.core.ImageLoader;
-
 import icepick.Icepick;
 import icepick.State;
 import leakcanary.AppWatcher;
 
 public abstract class BaseFragment extends Fragment {
-    public static final ImageLoader IMAGE_LOADER = ImageLoader.getInstance();
     protected final String TAG = getClass().getSimpleName() + "@" + Integer.toHexString(hashCode());
     protected final boolean DEBUG = MainActivity.DEBUG;
     protected AppCompatActivity activity;

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

@@ -17,7 +17,6 @@
 import org.schabi.newpipe.util.TLSSocketFactoryCompat;
 
 import java.io.IOException;
-import java.io.InputStream;
 import java.security.KeyManagementException;
 import java.security.KeyStore;
 import java.security.KeyStoreException;
@@ -194,36 +193,6 @@ public long getContentLength(final String url) throws IOException {
         }
     }
 
-    public InputStream stream(final String siteUrl) throws IOException {
-        try {
-            final okhttp3.Request.Builder requestBuilder = new okhttp3.Request.Builder()
-                    .method("GET", null).url(siteUrl)
-                    .addHeader("User-Agent", USER_AGENT);
-
-            final String cookies = getCookies(siteUrl);
-            if (!cookies.isEmpty()) {
-                requestBuilder.addHeader("Cookie", cookies);
-            }
-
-            final okhttp3.Request request = requestBuilder.build();
-            final okhttp3.Response response = client.newCall(request).execute();
-            final ResponseBody body = response.body();
-
-            if (response.code() == 429) {
-                throw new ReCaptchaException("reCaptcha Challenge requested", siteUrl);
-            }
-
-            if (body == null) {
-                response.close();
-                return null;
-            }
-
-            return body.byteStream();
-        } catch (final ReCaptchaException e) {
-            throw new IOException(e.getMessage(), e.getCause());
-        }
-    }
-
     @Override
     public Response execute(@NonNull final Request request)
             throws IOException, ReCaptchaException {

app/src/main/java/org/schabi/newpipe/about/AboutActivity.kt

@@ -162,6 +162,10 @@ class AboutActivity : AppCompatActivity() {
                 "OkHttp", "2019", "Square, Inc.",
                 "https://square.github.io/okhttp/", StandardLicenses.APACHE2
             ),
+            SoftwareComponent(
+                "Picasso", "2013", "Square, Inc.",
+                "https://square.github.io/picasso/", StandardLicenses.APACHE2
+            ),
             SoftwareComponent(
                 "PrettyTime", "2012 - 2020", "Lincoln Baxter, III",
                 "https://github.com/ocpsoft/prettytime", StandardLicenses.APACHE2
@@ -177,11 +181,6 @@ class AboutActivity : AppCompatActivity() {
             SoftwareComponent(
                 "RxJava", "2016 - 2020", "RxJava Contributors",
                 "https://github.com/ReactiveX/RxJava", StandardLicenses.APACHE2
-            ),
-            SoftwareComponent(
-                "Universal Image Loader", "2011 - 2015", "Sergey Tarasevich",
-                "https://github.com/nostra13/Android-Universal-Image-Loader",
-                StandardLicenses.APACHE2
             )
         )
         private const val POS_ABOUT = 0

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

@@ -48,9 +48,7 @@
 import com.google.android.material.appbar.AppBarLayout;
 import com.google.android.material.bottomsheet.BottomSheetBehavior;
 import com.google.android.material.tabs.TabLayout;
-import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.listener.ImageLoadingListener;
-import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
+import com.squareup.picasso.Callback;
 
 import org.schabi.newpipe.App;
 import org.schabi.newpipe.R;
@@ -90,14 +88,14 @@
 import org.schabi.newpipe.util.Constants;
 import org.schabi.newpipe.util.DeviceUtils;
 import org.schabi.newpipe.util.ExtractorHelper;
-import org.schabi.newpipe.util.ImageDisplayConstants;
-import org.schabi.newpipe.util.external_communication.KoreUtils;
 import org.schabi.newpipe.util.ListHelper;
 import org.schabi.newpipe.util.Localization;
 import org.schabi.newpipe.util.NavigationHelper;
 import org.schabi.newpipe.util.PermissionHelper;
-import org.schabi.newpipe.util.external_communication.ShareUtils;
+import org.schabi.newpipe.util.PicassoHelper;
 import org.schabi.newpipe.util.ThemeHelper;
+import org.schabi.newpipe.util.external_communication.KoreUtils;
+import org.schabi.newpipe.util.external_communication.ShareUtils;
 
 import java.util.ArrayList;
 import java.util.Iterator;
@@ -151,6 +149,8 @@ public final class VideoDetailFragment
     private static final String DESCRIPTION_TAB_TAG = "DESCRIPTION TAB";
     private static final String EMPTY_TAB_TAG = "EMPTY TAB";
 
+    private static final String PICASSO_VIDEO_DETAILS_TAG = "PICASSO_VIDEO_DETAILS_TAG";
+
     // tabs
     private boolean showComments;
     private boolean showRelatedItems;
@@ -686,33 +686,24 @@ private View.OnTouchListener getOnControlsTouchListener() {
     }
 
     private void initThumbnailViews(@NonNull final StreamInfo info) {
-        binding.detailThumbnailImageView.setImageResource(R.drawable.dummy_thumbnail_dark);
-
-        if (!isEmpty(info.getThumbnailUrl())) {
-            final ImageLoadingListener onFailListener = new SimpleImageLoadingListener() {
-                @Override
-                public void onLoadingFailed(final String imageUri, final View view,
-                                            final FailReason failReason) {
-                    showSnackBarError(new ErrorInfo(failReason.getCause(), UserAction.LOAD_IMAGE,
-                            imageUri, info));
-                }
-            };
-
-            IMAGE_LOADER.displayImage(info.getThumbnailUrl(), binding.detailThumbnailImageView,
-                    ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS, onFailListener);
-        }
+        PicassoHelper.loadThumbnail(info.getThumbnailUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.detailThumbnailImageView, new Callback() {
+                    @Override
+                    public void onSuccess() {
+                        // nothing to do, the image was loaded correctly into the thumbnail
+                    }
 
-        if (!isEmpty(info.getSubChannelAvatarUrl())) {
-            IMAGE_LOADER.displayImage(info.getSubChannelAvatarUrl(),
-                    binding.detailSubChannelThumbnailView,
-                    ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
-        }
+                    @Override
+                    public void onError(final Exception e) {
+                        showSnackBarError(new ErrorInfo(e, UserAction.LOAD_IMAGE,
+                                info.getThumbnailUrl(), info));
+                    }
+                });
 
-        if (!isEmpty(info.getUploaderAvatarUrl())) {
-            IMAGE_LOADER.displayImage(info.getUploaderAvatarUrl(),
-                    binding.detailUploaderThumbnailView,
-                    ImageDisplayConstants.DISPLAY_AVATAR_OPTIONS);
-        }
+        PicassoHelper.loadAvatar(info.getSubChannelAvatarUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.detailSubChannelThumbnailView);
+        PicassoHelper.loadAvatar(info.getUploaderAvatarUrl()).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.detailUploaderThumbnailView);
     }
 
     /*//////////////////////////////////////////////////////////////////////////
@@ -1446,8 +1437,7 @@ public void showLoading() {
             }
         }
 
-        IMAGE_LOADER.cancelDisplayTask(binding.detailThumbnailImageView);
-        IMAGE_LOADER.cancelDisplayTask(binding.detailSubChannelThumbnailView);
+        PicassoHelper.cancelTag(PICASSO_VIDEO_DETAILS_TAG);
         binding.detailThumbnailImageView.setImageBitmap(null);
         binding.detailSubChannelThumbnailView.setImageBitmap(null);
     }
@@ -2278,10 +2268,8 @@ private void updateOverlayData(@Nullable final String overlayTitle,
         binding.overlayTitleTextView.setText(isEmpty(overlayTitle) ? "" : overlayTitle);
         binding.overlayChannelTextView.setText(isEmpty(uploader) ? "" : uploader);
         binding.overlayThumbnail.setImageResource(R.drawable.dummy_thumbnail_dark);
-        if (!isEmpty(thumbnailUrl)) {
-            IMAGE_LOADER.displayImage(thumbnailUrl, binding.overlayThumbnail,
-                    ImageDisplayConstants.DISPLAY_THUMBNAIL_OPTIONS, null);
-        }
+        PicassoHelper.loadThumbnail(thumbnailUrl).tag(PICASSO_VIDEO_DETAILS_TAG)
+                .into(binding.overlayThumbnail);
     }
 
     private void setOverlayPlayPauseImage(final boolean playerIsPlaying) {