Fix: CMM 754 bug when loading bog images in high res

WordPress/src/main/java/org/wordpress/android/ui/reader/ReaderPhotoViewerFragment.java

@@ -88,7 +88,7 @@ private void showImage() {
         if (isAdded() && !TextUtils.isEmpty(mImageUrl)) {
             // use max of width/height so image is cached the same regardless of orientation
             Rect pt = DisplayUtils.getWindowSize(requireActivity());
-            int hiResWidth = Math.max(pt.height(), pt.width());
+            int hiResWidth = (int) (Math.max(pt.height(), pt.width()) * 0.8);
             // don't use AT media proxy here
             mPhotoView.setImageUrl(mImageUrl, hiResWidth, mIsPrivate, false, mPhotoViewListener);
         }

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

@@ -33,6 +33,11 @@ public interface PhotoViewListener {
         void onTapPhotoView();
     }
 
+    private String mImageUrl;
+    private int mHiResWidth;
+    private boolean mIsPrivate;
+    private boolean mIsPrivateAtSite;
+
     private PhotoViewListener mPhotoViewListener;
     private String mLoResImageUrl;
     private String mHiResImageUrl;
@@ -75,6 +80,11 @@ public void setImageUrl(String imageUrl,
                             boolean isPrivate,
                             boolean isPrivateAtSite,
                             PhotoViewListener listener) {
+        mImageUrl = imageUrl;
+        mHiResWidth = hiResWidth;
+        mIsPrivate = isPrivate;
+        mIsPrivateAtSite = isPrivateAtSite;
+
         int loResWidth = (int) (hiResWidth * 0.10f);
         mLoResImageUrl = ReaderUtils
                 .getResizedImageUrl(imageUrl, loResWidth, 0, isPrivate, isPrivateAtSite, PhotonUtils.Quality.LOW);
@@ -110,11 +120,16 @@ private void loadImage() {
 
         mImageManager
                 .loadWithResultListener(mImageView, ImageType.IMAGE, mHiResImageUrl, ScaleType.CENTER, mLoResImageUrl,
-                new RequestListener<Drawable>() {
+                new RequestListener<>() {
                     @Override
                     public void onLoadFailed(@Nullable Exception e, @Nullable Object model) {
                         if (e != null) {
                             AppLog.e(AppLog.T.READER, e);
+                            // A timeout could happen but there's no way to know it because the exception here is
+                            // always a GlideException. So let's try to reload the image with a lower res
+                            mImageView.post(
+                                    () -> loadFallbackImage()
+                            );
                         }
                         boolean lowResNotLoadedYet = isLoading();
                         if (lowResNotLoadedYet) {
@@ -130,6 +145,35 @@ public void onResourceReady(@NonNull Drawable resource, @Nullable Object model)
                 });
     }
 
+    private void loadFallbackImage() {
+        if (!hasLayout()) {
+            return;
+        }
+        String resImageUrl = ReaderUtils.getResizedImageUrl(mImageUrl, (int) (mHiResWidth * 0.5), 0, mIsPrivate,
+                mIsPrivateAtSite, PhotonUtils.Quality.MEDIUM);
+
+        mImageManager
+                .loadWithResultListener(mImageView, ImageType.IMAGE, resImageUrl, ScaleType.CENTER, mLoResImageUrl,
+                        new RequestListener<>() {
+                            @Override
+                            public void onLoadFailed(@Nullable Exception e, @Nullable Object model) {
+                                if (e != null) {
+                                    AppLog.e(AppLog.T.READER, e);
+                                }
+                                boolean lowResNotLoadedYet = isLoading();
+                                if (lowResNotLoadedYet) {
+                                    hideProgress();
+                                    showError();
+                                }
+                            }
+
+                            @Override
+                            public void onResourceReady(@NonNull Drawable resource, @Nullable Object model) {
+                                handleResponse();
+                            }
+                        });
+    }
+
     private void handleResponse() {
         hideProgress();
         hideError();

WordPress/src/main/java/org/wordpress/android/util/image/ImageManager.kt

@@ -41,6 +41,7 @@ import com.bumptech.glide.request.target.ViewTarget
 import com.bumptech.glide.request.transition.Transition
 import com.bumptech.glide.signature.ObjectKey
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.time.withTimeout
 import org.wordpress.android.WordPress
 import org.wordpress.android.networking.MShot
 import org.wordpress.android.ui.media.VideoLoader
@@ -294,6 +295,7 @@ class ImageManager @Inject constructor(
         if (!context.isAvailable()) return
         Glide.with(context)
             .load(imgUrl.toUri())
+            .timeout(5000)
             .addFallback(imageType)
             .addPlaceholder(imageType)
             .addThumbnail(context, thumbnailUrl, requestListener)