fix(gallery): video thumbnail and overlay

app/src/main/java/com/nextcloud/client/jobs/gallery/GalleryImageGenerationJob.kt

@@ -8,11 +8,16 @@
 package com.nextcloud.client.jobs.gallery
 
 import android.graphics.Bitmap
+import android.media.ThumbnailUtils
+import android.os.Build
+import android.provider.MediaStore
+import android.util.Size
 import android.widget.ImageView
 import androidx.core.content.ContextCompat
 import com.nextcloud.client.account.User
 import com.nextcloud.utils.allocationKilobyte
 import com.nextcloud.utils.extensions.isPNG
+import com.nextcloud.utils.extensions.toFile
 import com.owncloud.android.MainApp
 import com.owncloud.android.R
 import com.owncloud.android.datamodel.FileDataStorageManager
@@ -29,6 +34,7 @@ import kotlinx.coroutines.withContext
 import java.util.Collections
 import java.util.WeakHashMap
 
+@Suppress("DEPRECATION", "TooGenericExceptionCaught", "ReturnCount")
 class GalleryImageGenerationJob(private val user: User, private val storageManager: FileDataStorageManager) {
     companion object {
         private const val TAG = "GalleryImageGenerationJob"
@@ -83,7 +89,6 @@ class GalleryImageGenerationJob(private val user: User, private val storageManag
         }
     }
 
-    @Suppress("TooGenericExceptionCaught")
     suspend fun run(file: OCFile, imageView: ImageView, listener: GalleryImageGenerationListener) {
         try {
             var newImage = false
@@ -117,22 +122,69 @@ class GalleryImageGenerationJob(private val user: User, private val storageManag
 
     private suspend fun getBitmap(file: OCFile, onThumbnailGeneration: () -> Unit): Bitmap? =
         withContext(Dispatchers.IO) {
-            val key = file.remoteId
-            val cachedThumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
+            if (MimeTypeUtil.isVideo(file)) {
+                getVideoBitmap(file, onThumbnailGeneration)
+            } else {
+                getResizedImageBitmap(file, onThumbnailGeneration)
+            }
+        }
+
+    private fun getVideoBitmap(file: OCFile, onThumbnailGeneration: () -> Unit): Bitmap? {
+        val key = ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.remoteId
+        val cached = ThumbnailsCacheManager.getBitmapFromDiskCache(key)
+
+        if (cached != null && !file.isUpdateThumbnailNeeded) {
+            return ThumbnailsCacheManager.addVideoOverlay(cached, MainApp.getAppContext())
+        }
+
+        onThumbnailGeneration()
+        var bitmap: Bitmap? = null
+        if (file.isDown) {
+            bitmap = createVideoThumbnail(file.storagePath)
+        }
+
+        if (bitmap == null) {
+            bitmap = ThumbnailsCacheManager.getBitmapFromDiskCache(
                 ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + file.remoteId
             )
-            if (cachedThumbnail != null && !file.isUpdateThumbnailNeeded) {
-                Log_OC.d(TAG, "cached thumbnail is used for: ${file.fileName}")
-                return@withContext getThumbnailFromCache(file, cachedThumbnail, key)
-            }
+        }
 
-            Log_OC.d(TAG, "generating new thumbnail for: ${file.fileName}")
+        if (bitmap != null) {
+            ThumbnailsCacheManager.addBitmapToCache(key, bitmap)
+            return ThumbnailsCacheManager.addVideoOverlay(bitmap, MainApp.getAppContext())
+        }
+        return null
+    }
 
-            onThumbnailGeneration()
-            semaphore.withPermit {
-                return@withContext getThumbnailFromServerAndAddToCache(file, cachedThumbnail)
-            }
+    private fun createVideoThumbnail(storagePath: String): Bitmap? {
+        val file = storagePath.toFile() ?: return null
+        val size = ThumbnailsCacheManager.getThumbnailDimension()
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
+            try {
+                ThumbnailUtils.createVideoThumbnail(file, Size(size, size), null)
+            } catch (e: Exception) {
+                Log_OC.e(TAG, "Failed to create video thumbnail: ${e.message}")
+                null
+            }
+        } else {
+            @Suppress("DEPRECATION")
+            ThumbnailUtils.createVideoThumbnail(storagePath, MediaStore.Images.Thumbnails.MINI_KIND)
         }
+    }
+
+    private suspend fun getResizedImageBitmap(file: OCFile, onThumbnailGeneration: () -> Unit): Bitmap? {
+        val key = file.remoteId
+        val cachedThumbnail = ThumbnailsCacheManager.getBitmapFromDiskCache(
+            ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + key
+        )
+        if (cachedThumbnail != null && !file.isUpdateThumbnailNeeded) {
+            return getThumbnailFromCache(file, cachedThumbnail, key)
+        }
+        onThumbnailGeneration()
+        semaphore.withPermit {
+            return getThumbnailFromServerAndAddToCache(file, cachedThumbnail)
+        }
+    }
 
     private suspend fun setThumbnail(
         bitmap: Bitmap,
@@ -168,18 +220,15 @@ class GalleryImageGenerationJob(private val user: User, private val storageManag
 
     private fun getThumbnailFromCache(file: OCFile, thumbnail: Bitmap, key: String): Bitmap {
         var result = thumbnail
-        if (MimeTypeUtil.isVideo(file)) {
-            result = ThumbnailsCacheManager.addVideoOverlay(thumbnail, MainApp.getAppContext())
-        }
-
         if (thumbnail.allocationKilobyte() > ThumbnailsCacheManager.THUMBNAIL_SIZE_IN_KB) {
             result = ThumbnailsCacheManager.getScaledThumbnailAfterSave(result, key)
         }
-
+        if (MimeTypeUtil.isVideo(file)) {
+            result = ThumbnailsCacheManager.addVideoOverlay(thumbnail, MainApp.getAppContext())
+        }
         return result
     }
 
-    @Suppress("DEPRECATION", "TooGenericExceptionCaught")
     private suspend fun getThumbnailFromServerAndAddToCache(file: OCFile, thumbnail: Bitmap?): Bitmap? {
         var thumbnail = thumbnail
         try {

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

@@ -1092,10 +1092,12 @@ public static Bitmap addVideoOverlay(Bitmap thumbnail, Context context) {
 
         c.drawBitmap(thumbnail, 0, 0, null);
 
+        float left = (thumbnail.getWidth() - px) / 2f;
+        float top = (thumbnail.getHeight() - px) / 2f;
+
         Paint p = new Paint();
         p.setAlpha(230);
-
-        c.drawBitmap(resizedPlayButton, px, px, p);
+        c.drawBitmap(resizedPlayButton, left, top, p);
 
         return resultBitmap;
     }
@@ -1325,4 +1327,12 @@ public static Bitmap doResizedImageInBackground(OCFile file, FileDataStorageMana
 
         return thumbnail;
     }
+
+    public static String getCacheKey(@NonNull OCFile file) {
+        if (MimeTypeUtil.isVideo(file)) {
+            return ThumbnailsCacheManager.PREFIX_THUMBNAIL + file.getRemoteId();
+        } else {
+            return ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + file.getRemoteId();
+        }
+    }
 }

app/src/main/java/com/owncloud/android/ui/adapter/OCFileListDelegate.kt

@@ -36,6 +36,7 @@ import com.owncloud.android.ui.fragment.SearchType
 import com.owncloud.android.ui.interfaces.OCFileListFragmentInterface
 import com.owncloud.android.utils.DisplayUtils
 import com.owncloud.android.utils.EncryptionUtils
+import com.owncloud.android.utils.MimeTypeUtil
 import com.owncloud.android.utils.overlay.OverlayManager
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import kotlinx.coroutines.CoroutineScope
@@ -113,11 +114,15 @@ class OCFileListDelegate(
         imageView.tag = file.fileId
 
         // set placeholder before async job
-        val cached = ThumbnailsCacheManager.getBitmapFromDiskCache(
-            ThumbnailsCacheManager.PREFIX_RESIZED_IMAGE + file.remoteId
-        )
-        if (cached != null) {
-            imageView.setImageBitmap(cached)
+        val cacheKey = ThumbnailsCacheManager.getCacheKey(file)
+        val cachedBitmap = ThumbnailsCacheManager.getBitmapFromDiskCache(cacheKey)
+        if (cachedBitmap != null) {
+            val overlay = if (MimeTypeUtil.isVideo(file)) {
+                ThumbnailsCacheManager.addVideoOverlay(cachedBitmap, context)
+            } else {
+                cachedBitmap
+            }
+            imageView.setImageBitmap(overlay)
         } else {
             imageView.setImageDrawable(OCFileUtils.getMediaPlaceholder(file, imageDimension))
         }