From 2215cb462119a4521a879f30adb555d63ab3a2a0 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Wed, 7 Apr 2021 09:08:14 +0200
Subject: [PATCH] Glide cache improvement for non encrypted files

---
 app/src/main/java/org/linphone/utils/DataBindingUtils.kt | 7 +++----
 app/src/main/java/org/linphone/utils/FileUtils.kt        | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
index 5d12c054a..972ff29d7 100644
--- a/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DataBindingUtils.kt
@@ -321,7 +321,7 @@ fun loadAvatarWithGlideFallback(imageView: ImageView, path: String?) {
 @BindingAdapter("glidePath")
 fun loadImageWithGlide(imageView: ImageView, path: String) {
     if (path.isNotEmpty() && FileUtils.isExtensionImage(path)) {
-        if (corePreferences.vfsEnabled) {
+        if (corePreferences.vfsEnabled && path.endsWith(FileUtils.VFS_PLAIN_FILE_EXTENSION)) {
             GlideApp.with(imageView)
                 .load(path)
                 .diskCacheStrategy(DiskCacheStrategy.NONE)
@@ -347,9 +347,8 @@ fun loadAvatarWithGlide(imageView: ImageView, path: String?) {
             .with(imageView)
             .load(path)
             .signature(ObjectKey(coreContext.contactsManager.latestContactFetch))
-            .apply(RequestOptions.circleCropTransform()).listener(
-            object :
-                RequestListener<Drawable?> {
+            .apply(RequestOptions.circleCropTransform())
+            .listener(object : RequestListener<Drawable?> {
                 override fun onLoadFailed(
                     e: GlideException?,
                     model: Any?,
diff --git a/app/src/main/java/org/linphone/utils/FileUtils.kt b/app/src/main/java/org/linphone/utils/FileUtils.kt
index f3a034345..e71a1c57e 100644
--- a/app/src/main/java/org/linphone/utils/FileUtils.kt
+++ b/app/src/main/java/org/linphone/utils/FileUtils.kt
@@ -43,7 +43,7 @@ import org.linphone.core.tools.Log
 
 class FileUtils {
     companion object {
-        private const val VFS_PLAIN_FILE_EXTENSION = ".bctbx_evfs_plain"
+        const val VFS_PLAIN_FILE_EXTENSION = ".bctbx_evfs_plain"
 
         fun getNameFromFilePath(filePath: String): String {
             var name = filePath