Merge pull request #6185 from nextcloud/feat/6181/convo-list-swipe

🔁  Add swipe actions to conversation list items

Author: AndyScherzinger

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

@@ -462,9 +462,6 @@ class ConversationsListActivity : BaseActivity() {
             conversationsListViewModel.readUnreadState.collect { state ->
                 when (state) {
                     is ConversationsListViewModel.ConversationReadUnreadUiState.Success -> {
-                        fetchRooms()
-                        val resId = if (state.isMarkedRead) R.string.marked_as_read else R.string.marked_as_unread
-                        showSnackbar(String.format(resources.getString(resId), state.conversationDisplayName))
                         conversationsListViewModel.resetReadUnreadState()
                     }
                     is ConversationsListViewModel.ConversationReadUnreadUiState.Error -> {
@@ -475,6 +472,21 @@ class ConversationsListActivity : BaseActivity() {
                 }
             }
         }
+
+        lifecycleScope.launch {
+            conversationsListViewModel.favoriteState.collect { state ->
+                when (state) {
+                    is ConversationsListViewModel.FavoriteUiState.Success -> {
+                        conversationsListViewModel.resetFavoriteState()
+                    }
+                    is ConversationsListViewModel.FavoriteUiState.Error -> {
+                        showSnackbar(resources.getString(R.string.nc_common_error_sorry))
+                        conversationsListViewModel.resetFavoriteState()
+                    }
+                    ConversationsListViewModel.FavoriteUiState.None -> { /* no-op */ }
+                }
+            }
+        }
     }
 
     private fun handleNoteToSelfShortcut(noteToSelfAvailable: Boolean, noteToSelfToken: String) {
@@ -1096,38 +1108,12 @@ class ConversationsListActivity : BaseActivity() {
         }
     }
 
-    @Suppress("Detekt.TooGenericExceptionCaught", "TooGenericExceptionCaught")
     private fun addConversationToFavorites(conversation: ConversationModel) {
-        val apiVersion = ApiUtils.getConversationApiVersion(currentUser!!, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V1))
-        val url = ApiUtils.getUrlForRoomFavorite(apiVersion, currentUser?.baseUrl!!, conversation.token)
-        lifecycleScope.launch {
-            try {
-                withContext(Dispatchers.IO) { ncApiCoroutines.addConversationToFavorites(credentials!!, url) }
-                fetchRooms()
-                showSnackbar(
-                    String.format(resources.getString(R.string.added_to_favorites), conversation.displayName)
-                )
-            } catch (e: Exception) {
-                showSnackbar(resources.getString(R.string.nc_common_error_sorry))
-            }
-        }
+        conversationsListViewModel.addConversationToFavorites(conversation)
     }
 
-    @Suppress("Detekt.TooGenericExceptionCaught", "TooGenericExceptionCaught")
     private fun removeConversationFromFavorites(conversation: ConversationModel) {
-        val apiVersion = ApiUtils.getConversationApiVersion(currentUser!!, intArrayOf(ApiUtils.API_V4, ApiUtils.API_V1))
-        val url = ApiUtils.getUrlForRoomFavorite(apiVersion, currentUser?.baseUrl!!, conversation.token)
-        lifecycleScope.launch {
-            try {
-                withContext(Dispatchers.IO) { ncApiCoroutines.removeConversationFromFavorites(credentials!!, url) }
-                fetchRooms()
-                showSnackbar(
-                    String.format(resources.getString(R.string.removed_from_favorites), conversation.displayName)
-                )
-            } catch (e: Exception) {
-                showSnackbar(resources.getString(R.string.nc_common_error_sorry))
-            }
-        }
+        conversationsListViewModel.removeConversationFromFavorites(conversation)
     }
 
     private fun markConversationAsUnread(conversation: ConversationModel) {

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

@@ -44,6 +44,8 @@ interface OfflineConversationsRepository {
 
     suspend fun updateConversation(conversationModel: ConversationModel)
 
+    suspend fun updateConversationLocallyAndEmit(user: User, conversation: ConversationModel)
+
     @Deprecated("use observeConversation")
     suspend fun getLocallyStoredConversation(user: User, roomToken: String): ConversationModel?
 

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

@@ -127,6 +127,12 @@ class OfflineFirstConversationsRepository @Inject constructor(
         dao.updateConversation(entity)
     }
 
+    override suspend fun updateConversationLocallyAndEmit(user: User, conversation: ConversationModel) {
+        dao.updateConversation(conversation.asEntity())
+        val updatedList = getListOfConversations(user.id!!)
+        _roomListFlow.emit(updatedList)
+    }
+
     override suspend fun getLocallyStoredConversation(user: User, roomToken: String): ConversationModel? {
         val id = user.id!!
         return getConversation(id, roomToken)