Fix: CMM-754 bug when loading big images in high res

WordPress/src/main/java/org/wordpress/android/networking/GlideRequestFactory.kt

@@ -1,5 +1,6 @@
 package org.wordpress.android.networking
 
+import com.android.volley.DefaultRetryPolicy
 import com.android.volley.Request
 import com.android.volley.Request.Priority
 import com.bumptech.glide.integration.volley.VolleyRequestFactory
@@ -12,6 +13,9 @@ import java.io.InputStream
 import javax.inject.Inject
 import javax.inject.Singleton
 
+// Timeout in milliseconds for loading complex images at server side (private, heavy...)
+private const val TIMEOUT = 15_000
+
 /**
  * RequestFactory which adds authorization headers to all Glide requests and makes sure requests to WPcom endpoints
  * use https.
@@ -27,7 +31,18 @@ class GlideRequestFactory @Inject constructor(
         headers: Map<String, String>
     ): Request<ByteArray>? {
         val httpsUrl: String = convertWPcomUrlToHttps(url)
-        return VolleyStreamFetcher.GlideRequest(httpsUrl, callback, priority, addAuthHeaders(url, headers))
+        return VolleyStreamFetcher.GlideRequest(
+            httpsUrl,
+            callback,
+            priority,
+            addAuthHeaders(url, headers)
+        ).apply {
+            retryPolicy = DefaultRetryPolicy(
+                TIMEOUT,
+                DefaultRetryPolicy.DEFAULT_MAX_RETRIES,
+                DefaultRetryPolicy.DEFAULT_BACKOFF_MULT
+            )
+        }
     }
 
     private fun convertWPcomUrlToHttps(url: String): String {

WordPress/src/main/java/org/wordpress/android/ui/reader/views/ReaderPhotoView.java

@@ -43,6 +43,9 @@ public interface PhotoViewListener {
     private boolean mIsInitialLayout = true;
     private final ImageManager mImageManager;
 
+    // Used to determine when the low res placeholder is loaded, so we, at least, show something to the user
+    private boolean mLowResImageLoaded = false;
+
     public ReaderPhotoView(Context context) {
         this(context, null);
     }
@@ -107,7 +110,7 @@ private void loadImage() {
         }
 
         showProgress();
-
+        mLowResImageLoaded = false;
         mImageManager
                 .loadWithResultListener(mImageView, ImageType.IMAGE, mHiResImageUrl, ScaleType.CENTER, mLoResImageUrl,
                 new RequestListener<Drawable>() {
@@ -116,27 +119,29 @@ public void onLoadFailed(@Nullable Exception e, @Nullable Object model) {
                         if (e != null) {
                             AppLog.e(AppLog.T.READER, e);
                         }
-                        boolean lowResNotLoadedYet = isLoading();
-                        if (lowResNotLoadedYet) {
-                            hideProgress();
+                        hideProgress();
+                        // Show error only when there's not low res image loaded
+                        if (!mLowResImageLoaded) {
                             showError();
                         }
                     }
 
                     @Override
                     public void onResourceReady(@NonNull Drawable resource, @Nullable Object model) {
-                        handleResponse();
+                        // Do not hide progress if this is the placeholder loader
+                        boolean isLoResImageUrlLoaded = model instanceof String && model.equals(mLoResImageUrl);
+                        if (!isLoResImageUrlLoaded) {
+                            hideProgress();
+                            hideError();
+                        } else {
+                            mLowResImageLoaded = true;
+                        }
+                        // attach the pinch/zoom handler
+                        setupOnTapListeners();
                     }
                 });
     }
 
-    private void handleResponse() {
-        hideProgress();
-        hideError();
-        // attach the pinch/zoom handler
-        setupOnTapListeners();
-    }
-
     private void setupOnTapListeners() {
         PhotoViewAttacher attacher = mImageView.getAttacher();
         attacher.setOnPhotoTapListener((view, v, v2) -> {

WordPress/src/main/res/layout/reader_photo_view.xml

@@ -24,9 +24,13 @@
 
     <ProgressBar
         android:id="@+id/progress_loading"
-        android:layout_width="wrap_content"
+        style="?android:attr/progressBarStyleHorizontal"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:visibility="gone"
+        android:layout_alignParentBottom="true"
+        android:indeterminate="true"
+        android:indeterminateOnly="true"
+        android:indeterminateTint="@color/primary"
+        android:visibility="visible"
         tools:visibility="visible" />
 </merge>