chore(fc): handle room name changes more efficiently

Signed-off-by: Brandon McAnsh <[email protected]>

Author: bmc08gt

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/extensions/Conversation.kt

@@ -0,0 +1,28 @@
+package xyz.flipchat.services.extensions
+
+import com.getcode.util.resources.ResourceHelper
+import xyz.flipchat.services.chat.R
+import xyz.flipchat.services.domain.model.chat.Conversation
+
+fun Conversation.titleOrFallback(resources: ResourceHelper): String {
+    if (title.startsWith("Room")) {
+        return title
+    }
+
+    if (title.startsWith("#")) {
+        return title
+    }
+
+    return if (title.isEmpty()) {
+        resources.getString(
+            R.string.title_implicitRoomTitle,
+            roomNumber
+        )
+    } else {
+        resources.getString(
+            R.string.title_explicitRoomTitle,
+            roomNumber,
+            title
+        )
+    }
+}

services/flipchat/chat/src/main/kotlin/xyz/flipchat/services/internal/db/ConversationDao.kt

@@ -113,9 +113,7 @@ interface ConversationDao {
 
     suspend fun setDisplayName(id: String, displayName: String) {
         val conversation = findConversation(id)?.conversation ?: return
-        val roomNumber = conversation.roomNumber
-        val name = "#$roomNumber: $displayName"
-        upsertConversations(conversation.copy(title = name))
+        upsertConversations(conversation.copy(title = displayName))
     }
 
     suspend fun setDisplayName(id: ID, displayName: String) {

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/chat/RoomController.kt

@@ -17,6 +17,7 @@ import com.getcode.model.chat.MessageContent
 import com.getcode.model.chat.MessageStatus
 import com.getcode.model.uuid
 import com.getcode.services.model.chat.OutgoingMessageContent
+import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.base58
 import com.getcode.utils.timestamp
 import kotlinx.coroutines.CoroutineScope
@@ -29,10 +30,10 @@ import xyz.flipchat.notifications.getRoomNotifications
 import xyz.flipchat.services.data.ChatIdentifier
 import xyz.flipchat.services.domain.mapper.ConversationMessageMapper
 import xyz.flipchat.services.domain.model.chat.ConversationMember
-import xyz.flipchat.services.domain.model.chat.ConversationMessage
 import xyz.flipchat.services.domain.model.chat.ConversationMessageWithMemberAndContent
 import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastPointers
 import xyz.flipchat.services.domain.model.query.QueryOptions
+import xyz.flipchat.services.extensions.titleOrFallback
 import xyz.flipchat.services.internal.data.mapper.ConversationMemberMapper
 import xyz.flipchat.services.internal.network.repository.chat.ChatRepository
 import xyz.flipchat.services.internal.network.repository.messaging.MessagingRepository
@@ -46,6 +47,7 @@ class RoomController @Inject constructor(
     private val conversationMessageMapper: ConversationMessageMapper,
     private val notificationManager: NotificationManagerCompat,
     private val userManager: UserManager,
+    private val resources: ResourceHelper,
 ) {
     private val db: FcAppDatabase
         get() = FcAppDatabase.requireInstance()
@@ -213,7 +215,11 @@ class RoomController @Inject constructor(
     suspend fun setDisplayName(conversationId: ID, displayName: String): Result<Unit> {
         return chatRepository.setDisplayName(conversationId, displayName)
             .onSuccess {
-                db.conversationDao().setDisplayName(conversationId, displayName)
+                val conversation = db.conversationDao().findConversation(conversationId)?.conversation?.copy(title = displayName)
+                if (conversation != null) {
+                    val title = conversation.titleOrFallback(resources)
+                    db.conversationDao().setDisplayName(conversationId, title)
+                }
             }
     }
 

services/flipchat/sdk/src/main/kotlin/xyz/flipchat/controllers/ChatsController.kt

@@ -12,6 +12,7 @@ import androidx.room.paging.util.ThreadSafeInvalidationObserver
 import androidx.room.withTransaction
 import com.getcode.model.ID
 import com.getcode.model.Kin
+import com.getcode.util.resources.ResourceHelper
 import com.getcode.utils.TraceType
 import com.getcode.utils.base58
 import com.getcode.utils.trace
@@ -32,6 +33,7 @@ import xyz.flipchat.services.domain.model.chat.ConversationWithMembersAndLastMes
 import xyz.flipchat.services.domain.model.chat.db.ConversationMemberUpdate
 import xyz.flipchat.services.domain.model.chat.db.ConversationUpdate
 import xyz.flipchat.services.domain.model.query.QueryOptions
+import xyz.flipchat.services.extensions.titleOrFallback
 import xyz.flipchat.services.internal.data.mapper.ConversationMemberMapper
 import xyz.flipchat.services.internal.network.repository.chat.ChatRepository
 import xyz.flipchat.services.internal.network.repository.messaging.MessagingRepository
@@ -47,6 +49,7 @@ class ChatsController @Inject constructor(
     private val chatRepository: ChatRepository,
     private val messagingRepository: MessagingRepository,
     private val userManager: UserManager,
+    private val resources: ResourceHelper,
 ) {
     private val db: FcAppDatabase
         get() = FcAppDatabase.requireInstance()
@@ -101,7 +104,12 @@ class ChatsController @Inject constructor(
                                         db.conversationDao().updateCoverCharge(update.roomId, update.amount)
                                     }
                                     is ConversationUpdate.DisplayName -> {
-                                        db.conversationDao().setDisplayName(update.roomId, update.name)
+                                        val conversation = db.conversationDao().findConversationRaw(update.roomId)?.copy(title = update.name)
+                                        if (conversation != null) {
+                                            val newTitle = conversation.titleOrFallback(resources = resources)
+                                            db.conversationDao()
+                                                .setDisplayName(update.roomId, newTitle)
+                                        }
                                     }
                                     is ConversationUpdate.LastActivity -> {
                                         val conversation = db.conversationDao().findConversationRaw(update.roomId)