Refactor drafts to save both Messages & Replies to Room Storage

app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt

@@ -57,6 +57,7 @@ class ChatBlocksDaoTest {
             val account1 = usersDao.getUserWithUserId("account1").blockingGet()
 
             conversationsDao.upsertConversations(
+                account1.id,
                 listOf(
                     createConversationEntity(
                         accountId = account1.id,
@@ -182,6 +183,7 @@ class ChatBlocksDaoTest {
             val account1 = usersDao.getUserWithUserId("account1").blockingGet()
 
             conversationsDao.upsertConversations(
+                account1.id,
                 listOf(
                     createConversationEntity(
                         accountId = account1.id,

app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt

@@ -66,6 +66,7 @@ class ChatMessagesDaoTest {
             // Problem: lets say we want to update the conv list -> We don#t know the primary keys!
             // with account@token that would be easier!
             conversationsDao.upsertConversations(
+                account1.id,
                 listOf(
                     createConversationEntity(
                         accountId = account1.id,

app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt

@@ -35,7 +35,6 @@ import android.widget.LinearLayout
 import android.widget.PopupMenu
 import android.widget.RelativeLayout
 import android.widget.SeekBar
-import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.content.res.AppCompatResources
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.content.ContextCompat
@@ -81,15 +80,17 @@ import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew
 import com.nextcloud.talk.utils.message.MessageUtils
 import com.nextcloud.talk.utils.text.Spans
 import com.otaliastudios.autocomplete.Autocomplete
-import com.stfalcon.chatkit.commons.models.IMessage
 import com.vanniktech.emoji.EmojiPopup
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.flow.collect
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import java.util.Objects
 import javax.inject.Inject
 
-@Suppress("LongParameterList", "TooManyFunctions")
+@Suppress("LongParameterList", "TooManyFunctions", "LargeClass", "LongMethod")
 @AutoInjector(NextcloudTalkApplication::class)
 class MessageInputFragment : Fragment() {
 
@@ -161,18 +162,12 @@ class MessageInputFragment : Fragment() {
         return binding.root
     }
 
-    override fun onPause() {
-        super.onPause()
-        saveState()
-    }
-
     override fun onDestroyView() {
         super.onDestroyView()
         if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) {
             mentionAutocomplete?.dismissPopup()
         }
         clearEditUI()
-        cancelReply()
     }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
@@ -183,7 +178,13 @@ class MessageInputFragment : Fragment() {
     private fun initObservers() {
         Log.d(TAG, "LifeCyclerOwner is: ${viewLifecycleOwner.lifecycle}")
         chatActivity.messageInputViewModel.getReplyChatMessage.observe(viewLifecycleOwner) { message ->
-            message?.let { replyToMessage(message) }
+            (message as ChatMessage?)?.let {
+                chatActivity.chatViewModel.messageDraft.quotedMessageText = message.text
+                chatActivity.chatViewModel.messageDraft.quotedDisplayName = message.actorDisplayName
+                chatActivity.chatViewModel.messageDraft.quotedImageUrl = message.imageUrl
+                chatActivity.chatViewModel.messageDraft.quotedJsonId = message.jsonMessageId
+                replyToMessage(message.text, message.actorDisplayName, message.imageUrl, message.jsonMessageId)
+            }
         }
 
         chatActivity.messageInputViewModel.getEditChatMessage.observe(viewLifecycleOwner) { message ->
@@ -299,33 +300,25 @@ class MessageInputFragment : Fragment() {
     }
 
     private fun restoreState() {
-        if (binding.fragmentMessageInputView.inputEditText.text.isEmpty()) {
-            requireContext().getSharedPreferences(chatActivity.localClassName, AppCompatActivity.MODE_PRIVATE).apply {
-                val text = getString(chatActivity.roomToken, "")
-                val cursor = getInt(chatActivity.roomToken + CURSOR_KEY, 0)
-                binding.fragmentMessageInputView.messageInput.setText(text)
-                binding.fragmentMessageInputView.messageInput.setSelection(cursor)
-            }
-        }
-    }
+        CoroutineScope(Dispatchers.IO).launch {
+            chatActivity.chatViewModel.updateMessageDraft()
+
+            withContext(Dispatchers.Main) {
+                val draft = chatActivity.chatViewModel.messageDraft
+                binding.fragmentMessageInputView.messageInput.setText(draft.messageText)
+                binding.fragmentMessageInputView.messageInput.setSelection(draft.messageCursor)
+                if (draft.messageText != "") {
+                    binding.fragmentMessageInputView.messageInput.requestFocus()
+                }
 
-    private fun saveState() {
-        val text = binding.fragmentMessageInputView.messageInput.text.toString()
-        val cursor = binding.fragmentMessageInputView.messageInput.selectionStart
-        val previous = requireContext().getSharedPreferences(
-            chatActivity.localClassName,
-            AppCompatActivity
-                .MODE_PRIVATE
-        ).getString(chatActivity.roomToken, "null")
-
-        if (text != previous) {
-            requireContext().getSharedPreferences(
-                chatActivity.localClassName,
-                AppCompatActivity.MODE_PRIVATE
-            ).edit().apply {
-                putString(chatActivity.roomToken, text)
-                putInt(chatActivity.roomToken + CURSOR_KEY, cursor)
-                apply()
+                if (isInReplyState()) {
+                    replyToMessage(
+                        chatActivity.chatViewModel.messageDraft.quotedMessageText,
+                        chatActivity.chatViewModel.messageDraft.quotedDisplayName,
+                        chatActivity.chatViewModel.messageDraft.quotedImageUrl,
+                        chatActivity.chatViewModel.messageDraft.quotedJsonId ?: 0
+                    )
+                }
             }
         }
     }
@@ -388,7 +381,10 @@ class MessageInputFragment : Fragment() {
             }
 
             override fun afterTextChanged(s: Editable) {
-                // unused atm
+                val cursor = binding.fragmentMessageInputView.messageInput.selectionStart
+                val text = binding.fragmentMessageInputView.messageInput.text.toString()
+                chatActivity.chatViewModel.messageDraft.messageCursor = cursor
+                chatActivity.chatViewModel.messageDraft.messageText = text
             }
         })
 
@@ -615,7 +611,7 @@ class MessageInputFragment : Fragment() {
                     }
                 }
             }
-            v?.onTouchEvent(event) ?: true
+            v?.onTouchEvent(event) != false
         }
     }
 
@@ -717,52 +713,54 @@ class MessageInputFragment : Fragment() {
         }
     }
 
-    private fun replyToMessage(message: IMessage?) {
+    private fun replyToMessage(
+        quotedMessageText: String?,
+        quotedActorDisplayName: String?,
+        quotedImageUrl: String?,
+        quotedJsonId: Int
+    ) {
         Log.d(TAG, "Reply")
-        val chatMessage = message as ChatMessage?
-        chatMessage?.let {
-            val view = binding.fragmentMessageInputView
-            view.findViewById<ImageButton>(R.id.attachmentButton)?.visibility =
-                View.GONE
-            view.findViewById<ImageButton>(R.id.cancelReplyButton)?.visibility =
-                View.VISIBLE
-
-            val quotedMessage = view.findViewById<EmojiTextView>(R.id.quotedMessage)
-
-            quotedMessage?.maxLines = 2
-            quotedMessage?.ellipsize = TextUtils.TruncateAt.END
-            quotedMessage?.text = it.text
-            view.findViewById<EmojiTextView>(R.id.quotedMessageAuthor)?.text =
-                it.actorDisplayName ?: requireContext().getText(R.string.nc_nick_guest)
-
-            chatActivity.conversationUser?.let {
-                val quotedMessageImage = view.findViewById<ImageView>(R.id.quotedMessageImage)
-                chatMessage.imageUrl?.let { previewImageUrl ->
-                    quotedMessageImage?.visibility = View.VISIBLE
-
-                    val px = TypedValue.applyDimension(
-                        TypedValue.COMPLEX_UNIT_DIP,
-                        QUOTED_MESSAGE_IMAGE_MAX_HEIGHT,
-                        resources.displayMetrics
-                    )
-
-                    quotedMessageImage?.maxHeight = px.toInt()
-                    val layoutParams = quotedMessageImage?.layoutParams as FlexboxLayout.LayoutParams
-                    layoutParams.flexGrow = 0f
-                    quotedMessageImage.layoutParams = layoutParams
-                    quotedMessageImage.load(previewImageUrl) {
-                        addHeader("Authorization", chatActivity.credentials!!)
-                    }
-                } ?: run {
-                    view.findViewById<ImageView>(R.id.quotedMessageImage)?.visibility = View.GONE
+        val view = binding.fragmentMessageInputView
+        view.findViewById<ImageButton>(R.id.attachmentButton)?.visibility =
+            View.GONE
+        view.findViewById<ImageButton>(R.id.cancelReplyButton)?.visibility =
+            View.VISIBLE
+
+        val quotedMessage = view.findViewById<EmojiTextView>(R.id.quotedMessage)
+
+        quotedMessage?.maxLines = 2
+        quotedMessage?.ellipsize = TextUtils.TruncateAt.END
+        quotedMessage?.text = quotedMessageText
+        view.findViewById<EmojiTextView>(R.id.quotedMessageAuthor)?.text =
+            quotedActorDisplayName ?: requireContext().getText(R.string.nc_nick_guest)
+
+        chatActivity.conversationUser?.let {
+            val quotedMessageImage = view.findViewById<ImageView>(R.id.quotedMessageImage)
+            quotedImageUrl?.let { previewImageUrl ->
+                quotedMessageImage?.visibility = View.VISIBLE
+
+                val px = TypedValue.applyDimension(
+                    TypedValue.COMPLEX_UNIT_DIP,
+                    QUOTED_MESSAGE_IMAGE_MAX_HEIGHT,
+                    resources.displayMetrics
+                )
+
+                quotedMessageImage?.maxHeight = px.toInt()
+                val layoutParams = quotedMessageImage?.layoutParams as FlexboxLayout.LayoutParams
+                layoutParams.flexGrow = 0f
+                quotedMessageImage.layoutParams = layoutParams
+                quotedMessageImage.load(previewImageUrl) {
+                    addHeader("Authorization", chatActivity.credentials!!)
                 }
+            } ?: run {
+                view.findViewById<ImageView>(R.id.quotedMessageImage)?.visibility = View.GONE
             }
-
-            val quotedChatMessageView =
-                view.findViewById<RelativeLayout>(R.id.quotedChatMessageView)
-            quotedChatMessageView?.tag = message?.jsonMessageId
-            quotedChatMessageView?.visibility = View.VISIBLE
         }
+
+        val quotedChatMessageView =
+            view.findViewById<RelativeLayout>(R.id.quotedChatMessageView)
+        quotedChatMessageView?.tag = quotedJsonId
+        quotedChatMessageView?.visibility = View.VISIBLE
     }
 
     fun updateOwnTypingStatus(typedText: CharSequence) {
@@ -1051,5 +1049,15 @@ class MessageInputFragment : Fragment() {
         quote.tag = null
         binding.fragmentMessageInputView.findViewById<ImageButton>(R.id.attachmentButton)?.visibility = View.VISIBLE
         chatActivity.messageInputViewModel.reply(null)
+
+        chatActivity.chatViewModel.messageDraft.quotedMessageText = null
+        chatActivity.chatViewModel.messageDraft.quotedDisplayName = null
+        chatActivity.chatViewModel.messageDraft.quotedImageUrl = null
+        chatActivity.chatViewModel.messageDraft.quotedJsonId = null
+    }
+
+    private fun isInReplyState(): Boolean {
+        val jsonId = chatActivity.chatViewModel.messageDraft.quotedJsonId
+        return jsonId != null
     }
 }

app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt

@@ -27,6 +27,7 @@ import com.nextcloud.talk.conversationlist.data.OfflineConversationsRepository
 import com.nextcloud.talk.data.user.model.User
 import com.nextcloud.talk.extensions.toIntOrZero
 import com.nextcloud.talk.jobs.UploadAndShareFilesWorker
+import com.nextcloud.talk.models.MessageDraft
 import com.nextcloud.talk.models.domain.ConversationModel
 import com.nextcloud.talk.models.domain.ReactionAddedModel
 import com.nextcloud.talk.models.domain.ReactionDeletedModel
@@ -89,6 +90,8 @@ class ChatViewModel @Inject constructor(
     val disposableSet = mutableSetOf<Disposable>()
     var mediaPlayerDuration = mediaPlayerManager.mediaPlayerDuration
     val mediaPlayerPosition = mediaPlayerManager.mediaPlayerPosition
+    var chatRoomToken: String = ""
+    var messageDraft: MessageDraft = MessageDraft()
 
     fun getChatRepository(): ChatMessageRepository = chatRepository
 
@@ -108,6 +111,14 @@ class ChatViewModel @Inject constructor(
         mediaRecorderManager.handleOnPause()
         chatRepository.handleOnPause()
         mediaPlayerManager.handleOnPause()
+
+        CoroutineScope(Dispatchers.IO).launch {
+            val model = conversationRepository.getLocallyStoredConversation(chatRoomToken)
+            model?.let {
+                it.messageDraft = messageDraft
+                conversationRepository.updateConversation(it)
+            }
+        }
     }
 
     override fun onStop(owner: LifecycleOwner) {
@@ -283,6 +294,7 @@ class ChatViewModel @Inject constructor(
 
     fun initData(credentials: String, urlForChatting: String, roomToken: String, threadId: Long?) {
         chatRepository.initData(credentials, urlForChatting, roomToken, threadId)
+        chatRoomToken = roomToken
     }
 
     fun updateConversation(currentConversation: ConversationModel) {
@@ -889,6 +901,13 @@ class ChatViewModel @Inject constructor(
         }
     }
 
+    suspend fun updateMessageDraft() {
+        val model = conversationRepository.getLocallyStoredConversation(chatRoomToken)
+        model?.messageDraft?.let {
+            messageDraft = it
+        }
+    }
+
     companion object {
         private val TAG = ChatViewModel::class.simpleName
         const val JOIN_ROOM_RETRY_COUNT: Long = 3

app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt

@@ -2216,6 +2216,7 @@ class ConversationsListActivity :
         const val UNREAD_BUBBLE_DELAY = 2500
         const val BOTTOM_SHEET_DELAY: Long = 2500
         private const val KEY_SEARCH_QUERY = "ConversationsListActivity.searchQuery"
+        private const val CHAT_ACTIVITY_LOCAL_NAME = "com.nextcloud.talk.chat.ChatActivity"
         const val SEARCH_DEBOUNCE_INTERVAL_MS = 300
         const val SEARCH_MIN_CHARS = 1
         const val HTTP_UNAUTHORIZED = 401

app/src/main/java/com/nextcloud/talk/conversationlist/data/OfflineConversationsRepository.kt

@@ -36,4 +36,8 @@ interface OfflineConversationsRepository {
      * to be handled asynchronously.
      */
     fun getRoom(roomToken: String): Job
+
+    suspend fun updateConversation(conversationModel: ConversationModel)
+
+    suspend fun getLocallyStoredConversation(roomToken: String): ConversationModel?
 }

app/src/main/java/com/nextcloud/talk/conversationlist/data/network/OfflineFirstConversationsRepository.kt

@@ -98,12 +98,22 @@ class OfflineFirstConversationsRepository @Inject constructor(
                         runBlocking {
                             _conversationFlow.emit(model)
                             val entityList = listOf(model.asEntity())
-                            dao.upsertConversations(entityList)
+                            dao.upsertConversations(user.id!!, entityList)
                         }
                     }
                 })
         }
 
+    override suspend fun updateConversation(conversationModel: ConversationModel) {
+        val entity = conversationModel.asEntity()
+        dao.updateConversation(entity)
+    }
+
+    override suspend fun getLocallyStoredConversation(roomToken: String): ConversationModel? {
+        val id = user.id!!
+        return getConversation(id, roomToken)
+    }
+
     @Suppress("Detekt.TooGenericExceptionCaught")
     private suspend fun getRoomsFromServer(): List<ConversationEntity>? {
         var conversationsFromSync: List<ConversationEntity>? = null
@@ -126,7 +136,7 @@ class OfflineFirstConversationsRepository @Inject constructor(
             }
 
             deleteLeftConversations(conversationsFromSync)
-            dao.upsertConversations(conversationsFromSync)
+            dao.upsertConversations(user.id!!, conversationsFromSync)
         } catch (e: Exception) {
             Log.e(TAG, "Something went wrong when fetching conversations", e)
         }