commit 9702a7f2dc897cfd42607afc0e677c63c87383ca
parent 51be6a213ec062dbc5576c31103f5e93ef67bcad
Author: t3sserakt <t3ss@posteo.de>
Date: Wed, 13 May 2026 19:37:59 +0200
utils error fix
Diffstat:
1 file changed, 0 insertions(+), 37 deletions(-)
diff --git a/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/MainActivity.kt b/GNUnetMessenger/app/src/main/java/org/gnunet/gnunetmessenger/MainActivity.kt
@@ -279,14 +279,6 @@ class MainActivity : AppCompatActivity() {
)
}
viewModel?.addMessage(displayMessage)
-
- val acctName = currentAccount?.name ?: ""
- val chatKey = stableChatKey(chatContext)
- if (acctName.isNotEmpty() && chatKey != null) {
- viewModel?.messages?.value?.let { msgs ->
- org.gnunet.gnunetmessenger.utils.MessageStorage.saveMessages(this, acctName, chatKey, msgs)
- }
- }
}
MessageKind.CONTACT,
@@ -320,14 +312,6 @@ class MainActivity : AppCompatActivity() {
if (localChatContext != null) {
viewModel?.addMessage(chatMessage)
chatOverviewViewModel.updateChatMessage(localChatContext, chatMessage)
-
- val acctName = currentAccount?.name ?: ""
- val chatKey = stableChatKey(chatContext)
- if (acctName.isNotEmpty() && chatKey != null) {
- viewModel?.messages?.value?.let { msgs ->
- org.gnunet.gnunetmessenger.utils.MessageStorage.saveMessages(this, acctName, chatKey, msgs)
- }
- }
}
}
@@ -375,17 +359,6 @@ class MainActivity : AppCompatActivity() {
val key = stableChatKey(chatContext) ?: return null
val isNew = key !in chatViewModels
val vm = chatViewModels.getOrPut(key) { ChatViewModel(chatContext) }
-
- if (isNew) {
- val accountName = currentAccount?.name ?: ""
- if (accountName.isNotEmpty()) {
- val msgs = org.gnunet.gnunetmessenger.utils.MessageStorage.loadMessages(this, accountName, key)
- if (msgs.isNotEmpty()) {
- vm.setMessages(msgs)
- }
- }
- }
-
Log.d(TAG, "getChatViewModel key=$key isNew=$isNew msgCount=${vm.messages.value?.size ?: 0}")
return vm
}
@@ -397,16 +370,6 @@ class MainActivity : AppCompatActivity() {
}
}
- fun saveChatMessages(chatContext: ChatContext, viewModel: ChatViewModel) {
- val acctName = currentAccount?.name ?: ""
- val chatKey = stableChatKey(chatContext)
- if (acctName.isNotEmpty() && chatKey != null) {
- viewModel.messages.value?.let { msgs ->
- org.gnunet.gnunetmessenger.utils.MessageStorage.saveMessages(this, acctName, chatKey, msgs)
- }
- }
- }
-
fun loadChats() {
lifecycleScope.launch {
try {