Feature: Thumbnail Loading Fix & Caching Improvements

Author: zerox80

opencloudApp/src/main/java/eu/opencloud/android/presentation/thumbnails/ThumbnailsRequester.kt

@@ -21,6 +21,7 @@
 package eu.opencloud.android.presentation.thumbnails
 
 import android.accounts.Account
+import android.accounts.AccountManager
 import android.net.Uri
 import coil.ImageLoader
 import coil.disk.DiskCache
@@ -53,18 +54,48 @@ object ThumbnailsRequester : KoinComponent {
     private val clientManager: ClientManager by inject()
 
     private const val SPACE_SPECIAL_PREVIEW_URI = "%s?scalingup=0&a=1&x=%d&y=%d&c=%s&preview=1"
-    private const val FILE_PREVIEW_URI = "%s%s?x=%d&y=%d&c=%s&preview=1&id=%s"
+    private const val FILE_PREVIEW_URI = "%s/remote.php/webdav%s?x=%d&y=%d&c=%s&preview=1"
 
-    private const val DISK_CACHE_SIZE: Long = 1024 * 1024 * 10 // 10MB
+    private const val DISK_CACHE_SIZE: Long = 1024 * 1024 * 100 // 100MB
 
     private var imageLoader: ImageLoader? = null
     private var currentAccountName: String? = null
 
+    fun getAvatarUri(account: Account): String {
+        val accountManager = AccountManager.get(appContext)
+        val baseUrl = accountManager.getUserData(account, eu.opencloud.android.lib.common.accounts.AccountUtils.Constants.KEY_OC_BASE_URL)
+        val username = AccountUtils.getUsernameOfAccount(account.name)
+        return "$baseUrl/index.php/avatar/${android.net.Uri.encode(username)}/384"
+    }
+
+    fun getPreviewUriForFile(file: OCFile, account: Account, etag: String? = null): String {
+        return getPreviewUri(file.remotePath, etag ?: file.etag, account)
+    }
+
+    fun getPreviewUriForFile(fileWithSyncInfo: OCFileWithSyncInfo, account: Account): String {
+        return getPreviewUriForFile(fileWithSyncInfo.file, account)
+    }
+
+    fun getPreviewUriForSpaceSpecial(spaceSpecial: SpaceSpecial): String {
+        return String.format(Locale.US, SPACE_SPECIAL_PREVIEW_URI, spaceSpecial.webDavUrl, 1024, 1024, spaceSpecial.eTag)
+    }
+
+    private fun getPreviewUri(remotePath: String?, etag: String?, account: Account): String {
+        val accountManager = AccountManager.get(appContext)
+        val baseUrl = accountManager.getUserData(account, eu.opencloud.android.lib.common.accounts.AccountUtils.Constants.KEY_OC_BASE_URL)
+        
+        val path = if (remotePath?.startsWith("/") == true) remotePath else "/$remotePath"
+        val encodedPath = Uri.encode(path, "/")
+        
+        return String.format(Locale.US, FILE_PREVIEW_URI, baseUrl, encodedPath, 1024, 1024, etag)
+    }
+
     fun getCoilImageLoader(): ImageLoader {
         val accountName = AccountUtils.getCurrentOpenCloudAccount(appContext).name
         if (imageLoader == null || currentAccountName != accountName) {
+            imageLoader?.shutdown()
             currentAccountName = accountName
-            val openCloudClient = getOpenCloudClient()
+            val openCloudClient = clientManager.getClientForCoilThumbnails(accountName)
 
             val coilRequestHeaderInterceptor = CoilRequestHeaderInterceptor(
                 requestHeaders = hashMapOf(
@@ -89,7 +120,11 @@ object ThumbnailsRequester : KoinComponent {
                         .directory(appContext.cacheDir.resolve("thumbnails_coil_cache"))
                         .maxSizeBytes(DISK_CACHE_SIZE)
                         .build()
-            spacesThumbnailSize,
+                }
+                .build()
+        }
+        return imageLoader!!
+    }
 
     private class CoilRequestHeaderInterceptor(
         private val requestHeaders: HashMap<String, String>
@@ -99,7 +134,7 @@ object ThumbnailsRequester : KoinComponent {
             val request = chain.request().newBuilder()
             requestHeaders.toHeaders().forEach { request.addHeader(it.first, it.second) }
             return chain.proceed(request.build()).newBuilder().removeHeader("Cache-Control")
-                .addHeader("Cache-Control", "max-age=5000 , must-revalidate, value").build().also { Timber.d("Header :" + it.headers) }
+                .addHeader("Cache-Control", "max-age=5000, must-revalidate").build().also { Timber.d("Header :" + it.headers) }
         }
     }
 }

opencloudApp/src/main/java/eu/opencloud/android/ui/adapter/ReceiveExternalFilesAdapter.java

@@ -158,6 +158,12 @@ public View getView(int position, View convertView, ViewGroup parent) {
                     .build();
             imageLoader.enqueue(request);
         } else {
+            ImageLoader imageLoader = ThumbnailsRequester.INSTANCE.getCoilImageLoader();
+            coil.request.ImageRequest request = new coil.request.ImageRequest.Builder(mContext)
+                    .data(null)
+                    .target(fileIcon)
+                    .build();
+            imageLoader.enqueue(request);
             fileIcon.setImageResource(
                     MimetypeIconUtil.getFileTypeIconId(file.getMimeType(), file.getFileName())
             );