From 11776db13c5f44b1cc13bb09ad02822ae2fbc508 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 5 Jan 2023 10:58:55 +0100
Subject: [PATCH] Allow transfered files through chat to be automatically
 exported to native gallery

---
 .../main/settings/viewmodels/ChatSettingsViewModel.kt        | 5 -----
 app/src/main/java/org/linphone/core/CoreContext.kt           | 2 ++
 app/src/main/res/layout/settings_chat_fragment.xml           | 2 +-
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
index 2c38d9045..e7a563ad0 100644
--- a/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/settings/viewmodels/ChatSettingsViewModel.kt
@@ -50,11 +50,6 @@ class ChatSettingsViewModel : GenericSettingsViewModel() {
             core.maxSizeForAutoDownloadIncomingFiles = maxSize
             autoDownloadMaxSize.value = maxSize
             updateAutoDownloadIndexFromMaxSize(maxSize)
-
-            // Auto download isn't compatible with making downloaded images public
-            if (position > 0 && downloadedMediaPublic.value == true) {
-                downloadedMediaPublic.value = false
-            }
         }
     }
     val autoDownloadIndex = MutableLiveData<Int>()
diff --git a/app/src/main/java/org/linphone/core/CoreContext.kt b/app/src/main/java/org/linphone/core/CoreContext.kt
index 68b6fcc3b..5f3aa20f6 100644
--- a/app/src/main/java/org/linphone/core/CoreContext.kt
+++ b/app/src/main/java/org/linphone/core/CoreContext.kt
@@ -838,6 +838,7 @@ class CoreContext(
     /* Coroutine related */
 
     private fun exportFileInMessage(message: ChatMessage) {
+        // Only do it if auto download feature isn't disabled, otherwise it's done in the user-initiated download process
         if (core.maxSizeForAutoDownloadIncomingFiles != -1) {
             var hasFile = false
             for (content in message.contents) {
@@ -869,6 +870,7 @@ class CoreContext(
         if (PermissionHelper.get().hasWriteExternalStoragePermission()) {
             for (content in message.contents) {
                 if (content.isFile && content.filePath != null && content.userData == null) {
+                    Log.i("[Context] Trying to export file [${content.name}] to MediaStore")
                     addContentToMediaStore(content)
                 }
             }
diff --git a/app/src/main/res/layout/settings_chat_fragment.xml b/app/src/main/res/layout/settings_chat_fragment.xml
index a7d9f5399..0f99bb55f 100644
--- a/app/src/main/res/layout/settings_chat_fragment.xml
+++ b/app/src/main/res/layout/settings_chat_fragment.xml
@@ -98,7 +98,7 @@
                 <include
                     layout="@layout/settings_widget_switch"
                     linphone:title="@{@string/chat_settings_downloaded_media_public_title}"
-                    linphone:enabled="@{!viewModel.vfs &amp;&amp; viewModel.autoDownloadIndex != 1}"
+                    linphone:enabled="@{!viewModel.vfs}"
                     linphone:subtitle="@{@string/chat_settings_downloaded_media_public_summary}"
                     linphone:listener="@{viewModel.downloadedMediaPublicListener}"
                     linphone:checked="@={viewModel.downloadedMediaPublic}"/>