Merge pull request #6031 from nextcloud/chore/noid/roomEditComposable

⚒️🎨 Migrate room info edit to Composable

Author: AndyScherzinger

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

@@ -102,13 +102,14 @@ class ChatMessagesDaoTest {
             // Having a conversation token, we can also get a conversation directly
             val conversation1GotByToken = conversationsDao.getConversationForUser(
                 account1.id,
-                conversation1.token!!
+                conversation1.token
             ).first()
 
             assertEquals(conversation1, conversation1GotByToken)
 
             // Lets insert some messages to the conversations
             chatMessagesDao.upsertChatMessagesAndDeleteTemp(
+                conversation1.internalId,
                 listOf(
                     createChatMessageEntity(conversation1.internalId, "hello"),
                     createChatMessageEntity(conversation1.internalId, "here"),
@@ -118,6 +119,7 @@ class ChatMessagesDaoTest {
                 )
             )
             chatMessagesDao.upsertChatMessagesAndDeleteTemp(
+                conversation2.internalId,
                 listOf(
                     createChatMessageEntity(conversation2.internalId, "first message in conversation 2")
                 )

app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt

@@ -294,6 +294,9 @@ interface NcApiCoroutines {
         @Query("threadId") threadId: Int?
     ): ChatOverall
 
+    @GET
+    suspend fun getRoom(@Header("Authorization") authorization: String, @Url url: String): RoomOverall
+
     @GET
     suspend fun getNoteToSelfRoom(@Header("Authorization") authorization: String, @Url url: String): RoomOverall
 

app/src/main/java/com/nextcloud/talk/conversation/RenameConversationDialogFragment.kt

@@ -20,7 +20,10 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AlertDialog
 import androidx.core.content.res.ResourcesCompat
 import androidx.fragment.app.DialogFragment
+import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.ViewModelProvider
+import androidx.lifecycle.lifecycleScope
+import androidx.lifecycle.repeatOnLifecycle
 import autodagger.AutoInjector
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.snackbar.Snackbar
@@ -33,6 +36,7 @@ import com.nextcloud.talk.databinding.DialogRenameConversationBinding
 import com.nextcloud.talk.events.ConversationsListFetchDataEvent
 import com.nextcloud.talk.ui.theme.ViewThemeUtils
 import com.vanniktech.emoji.EmojiPopup
+import kotlinx.coroutines.launch
 import org.greenrobot.eventbus.EventBus
 import javax.inject.Inject
 
@@ -168,15 +172,15 @@ class RenameConversationDialogFragment : DialogFragment() {
     }
 
     private fun setupStateObserver() {
-        viewModel.renameRoomUiState.observe(viewLifecycleOwner) { state ->
-            when (state) {
-                is ConversationInfoEditViewModel.RenameRoomUiState.None -> {
-                }
-                is ConversationInfoEditViewModel.RenameRoomUiState.Success -> {
-                    handleSuccess()
-                }
-                is ConversationInfoEditViewModel.RenameRoomUiState.Error -> {
-                    showError()
+        viewLifecycleOwner.lifecycleScope.launch {
+            viewLifecycleOwner.repeatOnLifecycle(Lifecycle.State.STARTED) {
+                viewModel.uiState.collect { state ->
+                    if (state.navigateBack) {
+                        handleSuccess()
+                    } else if (state.userMessage != null) {
+                        showError()
+                        viewModel.messageShown()
+                    }
                 }
             }
         }

app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt

@@ -178,6 +178,14 @@ class ConversationInfoActivity : BaseActivity() {
         }
     }
 
+    private val editConversationResult = registerForActivityResult(
+        ActivityResultContracts.StartActivityForResult()
+    ) { result ->
+        if (result.resultCode == RESULT_OK) {
+            viewModel.getRoom(conversationUser, conversationToken)
+        }
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this)
@@ -558,7 +566,7 @@ class ConversationInfoActivity : BaseActivity() {
 
             val intent = Intent(this, ConversationInfoEditActivity::class.java)
             intent.putExtras(bundle)
-            startActivity(intent)
+            editConversationResult.launch(intent)
         }
         return true
     }