From df396f5abdcb3e6956018ff01f673f8876b489d7 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Tue, 14 Jun 2022 10:38:50 +0200
Subject: [PATCH] Set conference chat room without any participant as read-only
 + replaced deprecated function

---
 .../activities/main/chat/data/ChatMessageContentData.kt     | 2 +-
 .../main/chat/fragments/DetailChatRoomFragment.kt           | 2 +-
 .../main/chat/viewmodels/ChatMessageSendingViewModel.kt     | 2 +-
 .../activities/main/files/fragments/TopBarFragment.kt       | 2 +-
 .../activities/main/files/viewmodels/FileViewerViewModel.kt | 2 +-
 .../java/org/linphone/compatibility/Api23Compatibility.kt   | 6 +++---
 .../java/org/linphone/compatibility/Api29Compatibility.kt   | 6 +++---
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
index 8a1d67403..ec9df1a41 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/data/ChatMessageContentData.kt
@@ -233,7 +233,7 @@ class ChatMessageContentData(
         if (content.isFile || (content.isFileTransfer && chatMessage.isOutgoing)) {
             val path = if (isFileEncrypted) {
                 Log.i("[Content] Content is encrypted, requesting plain file path")
-                content.plainFilePath
+                content.exportPlainFile()
             } else {
                 content.filePath ?: ""
             }
diff --git a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
index 912ff99ad..ab7879208 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/fragments/DetailChatRoomFragment.kt
@@ -1107,7 +1107,7 @@ class DetailChatRoomFragment : MasterFragment<ChatRoomDetailFragmentBinding, Cha
                 dialog.dismiss()
                 lifecycleScope.launch {
                     Log.w("[Chat Room] Content is encrypted, requesting plain file path")
-                    val plainFilePath = content.plainFilePath
+                    val plainFilePath = content.exportPlainFile()
                     Log.i("[Cht Room] Making a copy of [$plainFilePath] to the cache directory before exporting it")
                     val cacheCopyPath = FileUtils.copyFileToCache(plainFilePath)
                     if (cacheCopyPath != null) {
diff --git a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
index 558066f3f..d2c4d8b90 100644
--- a/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/chat/viewmodels/ChatMessageSendingViewModel.kt
@@ -128,7 +128,7 @@ class ChatMessageSendingViewModel(private val chatRoom: ChatRoom) : ViewModel()
 
         attachFileEnabled.value = true
         sendMessageEnabled.value = false
-        isReadOnly.value = chatRoom.isReadOnly
+        isReadOnly.value = chatRoom.isReadOnly || (chatRoom.hasCapability(ChatRoomCapabilities.Conference.toInt()) && chatRoom.participants.isEmpty())
 
         val recorderParams = coreContext.core.createRecorderParams()
         if (corePreferences.voiceMessagesFormatMkv) {
diff --git a/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt b/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
index c74b5a844..288a257ff 100644
--- a/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
+++ b/app/src/main/java/org/linphone/activities/main/files/fragments/TopBarFragment.kt
@@ -137,7 +137,7 @@ class TopBarFragment : GenericFragment<FileViewerTopBarFragmentBinding>() {
                 if (mediaStoreFilePath.isEmpty()) {
                     Log.w("[File Viewer] Media store file path is empty, media store export failed?")
 
-                    val filePath = content.plainFilePath.orEmpty()
+                    val filePath = content.exportPlainFile().orEmpty()
                     plainFilePath = filePath.ifEmpty { content.filePath.orEmpty() }
                     Log.i("[File Viewer] Plain file path is: $plainFilePath")
                     if (plainFilePath.isNotEmpty()) {
diff --git a/app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt b/app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt
index 3903bedf9..af9991d79 100644
--- a/app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt
+++ b/app/src/main/java/org/linphone/activities/main/files/viewmodels/FileViewerViewModel.kt
@@ -34,7 +34,7 @@ open class FileViewerViewModel(val content: Content) : ViewModel() {
     init {
         filePath = if (deleteAfterUse) {
             Log.i("[File Viewer] Content is encrypted, requesting plain file path")
-            content.plainFilePath
+            content.exportPlainFile()
         } else {
             content.filePath.orEmpty()
         }
diff --git a/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
index 77b46fbdd..6f73dab31 100644
--- a/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api23Compatibility.kt
@@ -147,7 +147,7 @@ class Api23Compatibility {
                 return false
             }
 
-            val plainFilePath = content.plainFilePath.orEmpty()
+            val plainFilePath = content.exportPlainFile().orEmpty()
             val isVfsEncrypted = plainFilePath.isNotEmpty()
             Log.w("[Media Store] Content is encrypted, requesting plain file path")
             val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@@ -185,7 +185,7 @@ class Api23Compatibility {
                 return false
             }
 
-            val plainFilePath = content.plainFilePath.orEmpty()
+            val plainFilePath = content.exportPlainFile().orEmpty()
             val isVfsEncrypted = plainFilePath.isNotEmpty()
             Log.w("[Media Store] Content is encrypted, requesting plain file path")
             val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@@ -224,7 +224,7 @@ class Api23Compatibility {
                 return false
             }
 
-            val plainFilePath = content.plainFilePath.orEmpty()
+            val plainFilePath = content.exportPlainFile().orEmpty()
             val isVfsEncrypted = plainFilePath.isNotEmpty()
             Log.w("[Media Store] Content is encrypted, requesting plain file path")
             val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
diff --git a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt b/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
index 9bb62eedc..70d64f6d8 100644
--- a/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
+++ b/app/src/main/java/org/linphone/compatibility/Api29Compatibility.kt
@@ -99,7 +99,7 @@ class Api29Compatibility {
         }
 
         suspend fun addImageToMediaStore(context: Context, content: Content): Boolean {
-            val plainFilePath = content.plainFilePath.orEmpty()
+            val plainFilePath = content.exportPlainFile().orEmpty()
             val isVfsEncrypted = plainFilePath.isNotEmpty()
             Log.w("[Media Store] Content is encrypted, requesting plain file path")
             val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@@ -135,7 +135,7 @@ class Api29Compatibility {
         }
 
         suspend fun addVideoToMediaStore(context: Context, content: Content): Boolean {
-            val plainFilePath = content.plainFilePath.orEmpty()
+            val plainFilePath = content.exportPlainFile().orEmpty()
             val isVfsEncrypted = plainFilePath.isNotEmpty()
             Log.w("[Media Store] Content is encrypted, requesting plain file path")
             val filePath = if (isVfsEncrypted) plainFilePath else content.filePath
@@ -172,7 +172,7 @@ class Api29Compatibility {
         }
 
         suspend fun addAudioToMediaStore(context: Context, content: Content): Boolean {
-            val plainFilePath = content.plainFilePath.orEmpty()
+            val plainFilePath = content.exportPlainFile().orEmpty()
             val isVfsEncrypted = plainFilePath.isNotEmpty()
             Log.w("[Media Store] Content is encrypted, requesting plain file path")
             val filePath = if (isVfsEncrypted) plainFilePath else content.filePath