From 4a42797d834f8703b02ec353902d2f511dd1eba0 Mon Sep 17 00:00:00 2001
From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com>
Date: Mon, 23 May 2022 18:33:28 +0100
Subject: [PATCH] android: fix notifications to open correct chat (#692)

* android: fix notifications to open correct chat

* remove optimization
---
 .../src/main/java/chat/simplex/app/MainActivity.kt  | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt b/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt
index 11ef98ff29..5f301f0fa8 100644
--- a/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt
+++ b/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt
@@ -40,6 +40,7 @@ class MainActivity: ComponentActivity() {
   override fun onCreate(savedInstanceState: Bundle?) {
     super.onCreate(savedInstanceState)
 //    testJson()
+    processNotificationIntent(intent, vm.chatModel)
     setContent {
       SimpleXTheme {
         Surface(
@@ -105,11 +106,11 @@ fun MainPage(chatModel: ChatModel) {
   }
 }
 
-fun processIntent(intent: Intent?, chatModel: ChatModel) {
+fun processNotificationIntent(intent: Intent?, chatModel: ChatModel) {
   when (intent?.action) {
     NtfManager.OpenChatAction -> {
       val chatId = intent.getStringExtra("chatId")
-      Log.d(TAG, "processIntent: OpenChatAction $chatId")
+      Log.d(TAG, "processNotificationIntent: OpenChatAction $chatId")
       if (chatId != null) {
         val cInfo = chatModel.getChat(chatId)?.chatInfo
         chatModel.clearOverlays.value = true
@@ -117,9 +118,15 @@ fun processIntent(intent: Intent?, chatModel: ChatModel) {
       }
     }
     NtfManager.ShowChatsAction -> {
-      Log.d(TAG, "processIntent: ShowChatsAction")
+      Log.d(TAG, "processNotificationIntent: ShowChatsAction")
+      chatModel.chatId.value = null
       chatModel.clearOverlays.value = true
     }
+  }
+}
+
+fun processIntent(intent: Intent?, chatModel: ChatModel) {
+  when (intent?.action) {
     "android.intent.action.VIEW" -> {
       val uri = intent.data
       if (uri != null) connectIfOpenedViaUri(uri, chatModel)