Various fixes & improvements

app/src/main/java/org/linphone/ui/main/chat/fragment/ConversationFragment.kt

@@ -110,6 +110,8 @@ class ConversationFragment : SlidingPaneChildFragment() {
 
     private lateinit var bottomSheetAdapter: MessageBottomSheetAdapter
 
+    private var messageLongPressDialog: Dialog? = null
+
     private val args: ConversationFragmentArgs by navArgs()
 
     private val pickMedia = registerForActivityResult(
@@ -518,20 +520,15 @@ class ConversationFragment : SlidingPaneChildFragment() {
 
         viewModel.fileToDisplayEvent.observe(viewLifecycleOwner) {
             it.consume { file ->
+                if (messageLongPressDialog != null) return@consume
                 Log.i("$TAG User clicked on file [$file], let's display it in file viewer")
                 goToFileViewer(file)
             }
         }
 
-        viewModel.isGroup.observe(viewLifecycleOwner) { group ->
-            if (group) {
-                Log.i("$TAG Adding text observer to message sending area")
-                binding.sendArea.messageToSend.addTextChangedListener(textObserver)
-            }
-        }
-
         viewModel.conferenceToJoinEvent.observe(viewLifecycleOwner) {
             it.consume { conferenceUri ->
+                if (messageLongPressDialog != null) return@consume
                 Log.i("$TAG Requesting to go to waiting room for conference URI [$conferenceUri]")
                 sharedViewModel.goToMeetingWaitingRoomEvent.value = Event(conferenceUri)
             }
@@ -539,6 +536,7 @@ class ConversationFragment : SlidingPaneChildFragment() {
 
         viewModel.openWebBrowserEvent.observe(viewLifecycleOwner) {
             it.consume { url ->
+                if (messageLongPressDialog != null) return@consume
                 Log.i("$TAG Requesting to open web browser on page [$url]")
                 try {
                     val browserIntent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
@@ -553,12 +551,20 @@ class ConversationFragment : SlidingPaneChildFragment() {
 
         viewModel.contactToDisplayEvent.observe(viewLifecycleOwner) {
             it.consume { friendRefKey ->
+                if (messageLongPressDialog != null) return@consume
                 Log.i("$TAG Navigating to contact with ref key [$friendRefKey]")
                 sharedViewModel.navigateToContactsEvent.value = Event(true)
                 sharedViewModel.showContactEvent.value = Event(friendRefKey)
             }
         }
 
+        viewModel.isGroup.observe(viewLifecycleOwner) { group ->
+            if (group) {
+                Log.i("$TAG Adding text observer to message sending area")
+                binding.sendArea.messageToSend.addTextChangedListener(textObserver)
+            }
+        }
+
         viewModel.showRedToastEvent.observe(viewLifecycleOwner) {
             it.consume { pair ->
                 val message = pair.first
@@ -850,6 +856,11 @@ class ConversationFragment : SlidingPaneChildFragment() {
         popupWindow.showAsDropDown(view, 0, 0, Gravity.BOTTOM)
     }
 
+    private fun dismissDialog() {
+        messageLongPressDialog?.dismiss()
+        messageLongPressDialog = null
+    }
+
     private fun showChatMessageLongPressMenu(chatMessageModel: MessageModel) {
         Compatibility.setBlurRenderEffect(binding.root)
 
@@ -864,13 +875,13 @@ class ConversationFragment : SlidingPaneChildFragment() {
         )
 
         layout.root.setOnClickListener {
-            dialog.dismiss()
+            dismissDialog()
         }
 
         layout.setDeleteClickListener {
             Log.i("$TAG Deleting message")
             viewModel.deleteChatMessage(chatMessageModel)
-            dialog.dismiss()
+            dismissDialog()
         }
 
         layout.setCopyClickListener {
@@ -880,7 +891,7 @@ class ConversationFragment : SlidingPaneChildFragment() {
             val label = "Message"
             clipboard.setPrimaryClip(ClipData.newPlainText(label, text))
 
-            dialog.dismiss()
+            dismissDialog()
         }
 
         layout.setPickEmojiClickListener {
@@ -892,7 +903,7 @@ class ConversationFragment : SlidingPaneChildFragment() {
         layout.setResendClickListener {
             Log.i("$TAG Re-sending message in error state")
             chatMessageModel.resend()
-            dialog.dismiss()
+            dismissDialog()
         }
 
         layout.setForwardClickListener {
@@ -901,14 +912,14 @@ class ConversationFragment : SlidingPaneChildFragment() {
             // as we don't want to forward it in this chat room
             sharedViewModel.messageToForwardEvent.removeObservers(viewLifecycleOwner)
             sharedViewModel.messageToForwardEvent.postValue(Event(chatMessageModel))
-            dialog.dismiss()
+            dismissDialog()
             goBack()
         }
 
         layout.setReplyClickListener {
             Log.i("$TAG Updating sending area to reply to selected message")
             sendMessageViewModel.replyToMessage(chatMessageModel)
-            dialog.dismiss()
+            dismissDialog()
 
             // Open keyboard & focus edit text
             binding.sendArea.messageToSend.showKeyboard()
@@ -916,7 +927,7 @@ class ConversationFragment : SlidingPaneChildFragment() {
 
         layout.model = chatMessageModel
         chatMessageModel.dismissLongPressMenuEvent.observe(viewLifecycleOwner) {
-            dialog.dismiss()
+            dismissDialog()
         }
 
         dialog.setContentView(layout.root)
@@ -935,6 +946,7 @@ class ConversationFragment : SlidingPaneChildFragment() {
         d.alpha = 102
         dialog.window?.setBackgroundDrawable(d)
         dialog.show()
+        messageLongPressDialog = dialog
     }
 
     @UiThread

app/src/main/java/org/linphone/ui/main/chat/fragment/MediaListViewerFragment.kt

@@ -129,7 +129,7 @@ class MediaListViewerFragment : SlidingPaneChildFragment() {
                 index
             }
             viewPager.setCurrentItem(position, false)
-            viewPager.offscreenPageLimit = 2
+            viewPager.offscreenPageLimit = 1
 
             (view.parent as? ViewGroup)?.doOnPreDraw {
                 startPostponedEnterTransition()
@@ -168,7 +168,7 @@ class MediaListViewerFragment : SlidingPaneChildFragment() {
             val currentItem = binding.mediaViewPager.currentItem
             val model = if (currentItem >= 0 && currentItem < list.size) list[currentItem] else null
             if (model != null) {
-                val filePath = FileUtils.getProperFilePath(model.file)
+                val filePath = model.file
                 lifecycleScope.launch {
                     withContext(Dispatchers.IO) {
                         Log.i("$TAG Export file [$filePath] to Android's MediaStore")

app/src/main/java/org/linphone/ui/main/chat/model/ConversationModel.kt

@@ -269,7 +269,7 @@ class ConversationModel @WorkerThread constructor(
     }
 
     @WorkerThread
-    private fun updateLastMessage() {
+    fun updateLastMessage() {
         lastMessage?.removeListener(chatMessageListener)
         lastMessage = null
 
@@ -305,7 +305,7 @@ class ConversationModel @WorkerThread constructor(
     }
 
     @WorkerThread
-    private fun computeParticipants() {
+    fun computeParticipants() {
         val friends = arrayListOf<Friend>()
         val address = if (chatRoom.hasCapability(Capabilities.Basic.toInt())) {
             Log.d("$TAG Conversation [$id] is 'Basic'")

app/src/main/java/org/linphone/ui/main/chat/viewmodel/ConversationsListViewModel.kt

@@ -97,7 +97,10 @@ class ConversationsListViewModel @UiThread constructor() : AbstractTopBarViewMod
         @WorkerThread
         override fun onContactsLoaded() {
             Log.i("$TAG Contacts have been (re)loaded, updating list")
-            computeChatRoomsList(currentFilter)
+            for (model in conversations.value.orEmpty()) {
+                model.computeParticipants()
+                model.updateLastMessage()
+            }
         }
     }
 

app/src/main/java/org/linphone/utils/FileUtils.kt

@@ -162,7 +162,6 @@ class FileUtils {
         @AnyThread
         fun getFileStorageCacheDir(fileName: String, overrideExisting: Boolean = false): File {
             val path = coreContext.context.cacheDir
-            Log.i("$TAG Cache directory is: $path")
 
             var file = File(path, fileName)
             if (!overrideExisting) {
@@ -308,7 +307,7 @@ class FileUtils {
             return false
         }
 
-        suspend fun copyFileTo(filePath: String, outputStream: OutputStream?): Boolean {
+        private suspend fun copyFileTo(filePath: String, outputStream: OutputStream?): Boolean {
             if (outputStream == null) {
                 Log.e("$TAG Can't copy file [$filePath] to given null output stream")
                 return false