android: remove notification when chat marked as read from the context menu (#691)

* android: remove notification when chat marked as read from the context menu

* remove chat notifications when chat is cleared or deleted

apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt

@@ -34,7 +34,7 @@ import kotlin.concurrent.thread
 
 typealias ChatCtrl = Long
 
-open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: NtfManager, val appContext: Context) {
+open class ChatController(private val ctrl: ChatCtrl, val ntfManager: NtfManager, val appContext: Context) {
   var chatModel = ChatModel(this)
   private val sharedPreferences: SharedPreferences = appContext.getSharedPreferences(SHARED_PREFS_ID, Context.MODE_PRIVATE)
 
@@ -85,10 +85,6 @@ open class ChatController(private val ctrl: ChatCtrl, private val ntfManager: Nt
     return false
   }
 
-  fun cancelNotificationsForChat(chatId: String) {
-    ntfManager.cancelNotificationsForChat(chatId)
-  }
-
   suspend fun sendCmd(cmd: CC): CR {
     return withContext(Dispatchers.IO) {
       val c = cmd.cmdString

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt

@@ -35,7 +35,7 @@ fun ChatInfoView(chatModel: ChatModel, close: () -> Unit) {
   }
 }
 
-fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: () -> Unit) {
+fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
   AlertManager.shared.showAlertMsg(
     title = generalGetString(R.string.delete_contact__question),
     text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
@@ -46,14 +46,15 @@ fun deleteContactDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: () -> U
         if (r) {
           chatModel.removeChat(chatInfo.id)
           chatModel.chatId.value = null
-          close()
+          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
+          close?.invoke()
         }
       }
     }
   )
 }
 
-fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: () -> Unit) {
+fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: (() -> Unit)? = null) {
   AlertManager.shared.showAlertMsg(
     title = generalGetString(R.string.clear_chat_question),
     text = generalGetString(R.string.clear_chat_warning),
@@ -63,7 +64,8 @@ fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel, close: () -> Unit)
         val updatedChatInfo = chatModel.controller.apiClearChat(chatInfo.chatType, chatInfo.apiId)
         if (updatedChatInfo != null) {
           chatModel.clearChat(updatedChatInfo)
-          close()
+          chatModel.controller.ntfManager.cancelNotificationsForChat(chatInfo.id)
+          close?.invoke()
         }
       }
     }

apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt

@@ -59,7 +59,7 @@ fun ChatView(chatModel: ChatModel) {
       delay(750L)
       if (chat.chatItems.isNotEmpty()) {
         chatModel.markChatItemsRead(chat.chatInfo)
-        chatModel.controller.cancelNotificationsForChat(chat.id)
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
         withApi {
           chatModel.controller.apiChatRead(
             chat.chatInfo.chatType,

apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt

@@ -16,6 +16,8 @@ import androidx.compose.ui.unit.dp
 import chat.simplex.app.R
 import chat.simplex.app.model.*
 import chat.simplex.app.ui.theme.SimpleXTheme
+import chat.simplex.app.views.chat.clearChatDialog
+import chat.simplex.app.views.chat.deleteContactDialog
 import chat.simplex.app.views.chat.item.ItemAction
 import chat.simplex.app.views.helpers.*
 import kotlinx.coroutines.delay
@@ -90,6 +92,7 @@ fun ContactMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Bo
       Icons.Outlined.Check,
       onClick = {
         markChatRead(chat, chatModel)
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
         showMenu.value = false
       }
     )
@@ -121,6 +124,7 @@ fun GroupMenuItems(chat: Chat, chatModel: ChatModel, showMenu: MutableState<Bool
       Icons.Outlined.Check,
       onClick = {
         markChatRead(chat, chatModel)
+        chatModel.controller.ntfManager.cancelNotificationsForChat(chat.id)
         showMenu.value = false
       }
     )
@@ -180,39 +184,6 @@ fun markChatRead(chat: Chat, chatModel: ChatModel) {
   }
 }
 
-fun deleteContactDialog(contact: ChatInfo.Direct, chatModel: ChatModel) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.delete_contact__question),
-    text = generalGetString(R.string.delete_contact_all_messages_deleted_cannot_undo_warning),
-    confirmText = generalGetString(R.string.delete_verb),
-    onConfirm = {
-      withApi {
-        val r = chatModel.controller.apiDeleteChat(contact.chatType, contact.apiId)
-        if (r) {
-          chatModel.removeChat(contact.id)
-          chatModel.chatId.value = null
-        }
-      }
-    }
-  )
-}
-
-fun clearChatDialog(chatInfo: ChatInfo, chatModel: ChatModel) {
-  AlertManager.shared.showAlertMsg(
-    title = generalGetString(R.string.clear_chat_question),
-    text = generalGetString(R.string.clear_chat_warning),
-    confirmText = generalGetString(R.string.clear_verb),
-    onConfirm = {
-      withApi {
-        val updatedChatInfo = chatModel.controller.apiClearChat(chatInfo.chatType, chatInfo.apiId)
-        if (updatedChatInfo != null) {
-          chatModel.clearChat(updatedChatInfo)
-        }
-      }
-    }
-  )
-}
-
 fun contactRequestAlertDialog(contactRequest: ChatInfo.ContactRequest, chatModel: ChatModel) {
   AlertManager.shared.showAlertDialog(
     title = generalGetString(R.string.accept_connection_request__question),

apps/android/app/src/main/res/values-ru/strings.xml

@@ -169,10 +169,10 @@
     <string name="reject_contact_button">Отклонить</string>
 
     <!-- Clear Chat - ChatListNavLinkView.kt -->
-    <string name="clear_chat_question">Очистить разговор?</string>
+    <string name="clear_chat_question">Очистить чат?</string>
     <string name="clear_chat_warning">Все сообщения будут удалены - это действие нельзя отменить! Сообщения будут удалены только для вас.</string>
     <string name="clear_verb">Очистить</string>
-    <string name="clear_chat_button">Очистить разговор</string>
+    <string name="clear_chat_button">Очистить чат</string>
     <string name="mark_read">Прочитано</string>
 
     <!-- Pending contact connection alert dialogues -->

apps/android/app/src/main/res/values/strings.xml

@@ -170,10 +170,10 @@
   <string name="reject_contact_button">Reject</string>
 
   <!-- Clear Chat - ChatListNavLinkView.kt -->
-  <string name="clear_chat_question">Clear conversation?</string>
+  <string name="clear_chat_question">Clear chat?</string>
   <string name="clear_chat_warning">All messages will be deleted - this cannot be undone! The messages will be deleted ONLY for you.</string>
   <string name="clear_verb">Clear</string>
-  <string name="clear_chat_button">Clear conversation</string>
+  <string name="clear_chat_button">Clear chat</string>
   <string name="mark_read">Mark read</string>
 
   <!-- Pending contact connection alert dialogues -->