gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-07-26 22:25:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix bug cause im an idiot

Browse Source 
Signed-off-by: rapterjet2004 <juliuslinus1@gmail.com>
This commit is contained in:
rapterjet2004 2025-07-14 12:28:41 -05:00
parent 71bd381828
commit af65208a6c
No known key found for this signature in database
GPG Key ID: 3AA5FDFED7944099
3 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -113,7 +113,7 @@ class ChatViewModel @Inject constructor(
chatRepository.handleOnPause() chatRepository.handleOnPause()
mediaPlayerManager.handleOnPause() mediaPlayerManager.handleOnPause()
runBlocking { runBlocking(Dispatchers.IO) {
val model = conversationRepository.getLocallyStoredConversation(chatRoomToken) val model = conversationRepository.getLocallyStoredConversation(chatRoomToken)
model?.let { model?.let {
it.messageDraft = messageDraft it.messageDraft = messageDraft
@ -903,7 +903,9 @@ class ChatViewModel @Inject constructor(
suspend fun updateMessageDraft() { suspend fun updateMessageDraft() {
val model = conversationRepository.getLocallyStoredConversation(chatRoomToken) val model = conversationRepository.getLocallyStoredConversation(chatRoomToken)
messageDraft = model?.messageDraft!! model?.messageDraft?.let {
messageDraft = it
}
} }
companion object { companion object {

11
app/src/main/java/com/nextcloud/talk/data/database/dao/ConversationsDao.kt
View File

@ -29,9 +29,6 @@ interface ConversationsDao {
@Upsert() @Upsert()
fun upsertConversations(conversationEntities: List<ConversationEntity>) fun upsertConversations(conversationEntities: List<ConversationEntity>)
@Insert(onConflict = REPLACE)
suspend fun insertOrUpdate(item: ConversationEntity)
@Transaction @Transaction
suspend fun upsertConversations(accountId: Long, serverItems: List<ConversationEntity>) { suspend fun upsertConversations(accountId: Long, serverItems: List<ConversationEntity>) {
serverItems.forEach { serverItem -> serverItems.forEach { serverItem ->
@ -39,10 +36,9 @@ interface ConversationsDao {
if (existingItem != null) { if (existingItem != null) {
val mergedItem = serverItem val mergedItem = serverItem
mergedItem.messageDraft = existingItem.messageDraft mergedItem.messageDraft = existingItem.messageDraft
insertOrUpdate(mergedItem) updateConversation(mergedItem)
} else { } else {
// Insert new item directly (local-only fields will be default) insertConversation(serverItem)
insertOrUpdate(serverItem)
} }
} }
} }
@ -61,6 +57,9 @@ interface ConversationsDao {
@Update(onConflict = REPLACE) @Update(onConflict = REPLACE)
fun updateConversation(conversationEntity: ConversationEntity) fun updateConversation(conversationEntity: ConversationEntity)
@Insert(onConflict = REPLACE)
fun insertConversation(conversation: ConversationEntity)
@Query( @Query(
""" """
DELETE FROM Conversations DELETE FROM Conversations

6
app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt
View File

@ -194,14 +194,12 @@ class DummyConversationDaoImpl : ConversationsDao {
override fun upsertConversations(conversationEntities: List<ConversationEntity>) { /* */ } override fun upsertConversations(conversationEntities: List<ConversationEntity>) { /* */ }
override suspend fun insertOrUpdate(item: ConversationEntity) {
/**/
}
override fun deleteConversations(conversationIds: List<String>) { /* */ } override fun deleteConversations(conversationIds: List<String>) { /* */ }
override fun updateConversation(conversationEntity: ConversationEntity) { /* */ } override fun updateConversation(conversationEntity: ConversationEntity) { /* */ }
override fun insertConversation(conversation: ConversationEntity) { /* */ }
override fun clearAllConversationsForUser(accountId: Long) { /* */ } override fun clearAllConversationsForUser(accountId: Long) { /* */ }
} }