fix video preview

Signed-off-by: alperozturk96 <alper_ozturk@proton.me>

Author: alperozturk96

app/src/main/java/com/nextcloud/utils/extensions/OwnCloudClientExtensions.kt

@@ -28,11 +28,9 @@ fun OwnCloudClient.getPreviewEndpoint(localFileId: Long, x: Int, y: Int): String
     "&x=" + (x / 2) + "&y=" + (y / 2) +
     "&a=1&mode=cover&forceIcon=0"
 
-fun OwnCloudClient.getVideoPreviewEndpoint(localFileId: Long): String = baseUri
+fun OwnCloudClient.getVideoPreviewEndpoint(localFileId: Long, size: Int): String = baseUri
     .toString() +
     "/index.php/core/preview?fileId=" +
     localFileId +
-    "&x=" + VIDEO_PREVIEW_SIZE + "&y=" + VIDEO_PREVIEW_SIZE +
+    "&x=" + size + "&y=" + size +
     "&a=1&forceIcon=0"
-
-private const val VIDEO_PREVIEW_SIZE = 1024

app/src/main/java/com/owncloud/android/datamodel/ThumbnailsCacheManager.java

@@ -89,6 +89,7 @@
  */
 public final class ThumbnailsCacheManager {
     private static final int READ_TIMEOUT = 40000;
+    private static final int[] VIDEO_PREVIEW_SIZES = {1024, 512, 256, 128, 64};
     private static final int CONNECTION_TIMEOUT = 5000;
 
     /** Cache key prefix {@code <prefix><remoteId>}; sized from {@link #getScreenDimension()}. */
@@ -1271,6 +1272,52 @@ public static void generateThumbnailFromOCFile(OCFile file, User user, Context c
         }
     }
 
+    private static Bitmap downloadVideoPreview(OCFile file) {
+        for (int size : VIDEO_PREVIEW_SIZES) {
+            Bitmap preview = downloadPreview(file,
+                                             OwnCloudClientExtensionsKt.getVideoPreviewEndpoint(mClient,
+                                                                                                file.getLocalId(),
+                                                                                                size));
+            if (preview != null) {
+                return preview;
+            }
+        }
+
+        return null;
+    }
+
+    private static Bitmap downloadPreview(OCFile file, String uri) {
+        Log_OC.d(TAG, "generating resized image: " + file.getFileName() + " URI: " + uri);
+
+        GetMethod getMethod = null;
+
+        try {
+            getMethod = new GetMethod(uri);
+            getMethod.getParams().setSoTimeout(READ_TIMEOUT);
+
+            int status = mClient.executeMethod(getMethod);
+            if (status != HttpStatus.SC_OK) {
+                Log_OC.e(TAG, "cannot generate thumbnail not supported file type, status: " + status
+                    + " file: " + file.getRemotePath());
+                mClient.exhaustResponse(getMethod.getResponseBodyAsStream());
+                return null;
+            }
+
+            try (InputStream inputStream = getMethod.getResponseBodyAsStream()) {
+                Bitmap preview = BitmapFactory.decodeStream(inputStream);
+                Log_OC.d(TAG, "resized image generated");
+                return preview;
+            }
+        } catch (Exception e) {
+            Log_OC.e(TAG, "doResizedBitmap: ", e);
+            return null;
+        } finally {
+            if (getMethod != null) {
+                getMethod.releaseConnection();
+            }
+        }
+    }
+
     @VisibleForTesting
     public static void clearCache() {
         synchronized (mThumbnailsDiskCacheLock) {
@@ -1310,41 +1357,20 @@ public static Bitmap doResizedImageInBackground(OCFile file, FileDataStorageMana
                 file.setUpdateThumbnailNeeded(false);
             }
         } else if (mClient != null) {
-            GetMethod getMethod = null;
-
-            try {
-                String uri = MimeTypeUtil.isVideo(file)
-                    ? OwnCloudClientExtensionsKt.getVideoPreviewEndpoint(mClient, file.getLocalId())
-                    : OwnCloudClientExtensionsKt.getPreviewEndpoint(mClient, file.getLocalId(), pxW, pxH);
-                Log_OC.d(TAG, "generating resized image: " + file.getFileName() + " URI: " + uri);
-
-                getMethod = new GetMethod(uri);
-                getMethod.getParams().setSoTimeout(READ_TIMEOUT);
-
-                int status = mClient.executeMethod(getMethod);
-                if (status == HttpStatus.SC_OK) {
-                    try (InputStream inputStream = getMethod.getResponseBodyAsStream()) {
-                        thumbnail = BitmapFactory.decodeStream(inputStream);
-                        Log_OC.d(TAG, "resized image generated");
-                    }
-                } else {
-                    Log_OC.e(TAG, "cannot generate thumbnail not supported file type, status: " + status + " file: " + file.getRemotePath());
-                    mClient.exhaustResponse(getMethod.getResponseBodyAsStream());
-                }
-
-                if (thumbnail != null && PNG_MIMETYPE.equalsIgnoreCase(file.getMimeType())) {
-                    thumbnail = handlePNG(thumbnail, thumbnail.getWidth(), thumbnail.getHeight());
-                }
+            thumbnail = MimeTypeUtil.isVideo(file)
+                ? downloadVideoPreview(file)
+                : downloadPreview(file,
+                                  OwnCloudClientExtensionsKt.getPreviewEndpoint(mClient,
+                                                                                file.getLocalId(),
+                                                                                pxW,
+                                                                                pxH));
+
+            if (thumbnail != null && PNG_MIMETYPE.equalsIgnoreCase(file.getMimeType())) {
+                thumbnail = handlePNG(thumbnail, thumbnail.getWidth(), thumbnail.getHeight());
+            }
 
-                if (thumbnail != null) {
-                    addBitmapToCache(imageKey, thumbnail);
-                }
-            } catch (Exception e) {
-                Log_OC.e(TAG, "doResizedBitmap: ", e);
-            } finally {
-                if (getMethod != null) {
-                    getMethod.releaseConnection();
-                }
+            if (thumbnail != null) {
+                addBitmapToCache(imageKey, thumbnail);
             }
         }