From 1e76b45fb4e55824998669fc8fc754c15c0e68eb Mon Sep 17 00:00:00 2001
From: Dariusz Olszewski <starypatyk@users.noreply.github.com>
Date: Thu, 10 Mar 2022 21:55:41 +0100
Subject: [PATCH 1/3] Switch to chat w/o animation when app opened from
 notification

Signed-off-by: Dariusz Olszewski <starypatyk@users.noreply.github.com>
---
 .../nextcloud/talk/activities/MainActivity.kt |  2 +-
 .../talk/utils/ConductorRemapping.kt          | 22 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
index c46d755e8..4c825f1ee 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt
@@ -349,7 +349,7 @@ class MainActivity : BaseActivity(), ActionBarProvider {
             } else {
                 remapChatController(
                     router!!, intent.getParcelableExtra<UserEntity>(KEY_USER_ENTITY)!!.id,
-                    intent.getStringExtra(KEY_ROOM_TOKEN)!!, intent.extras!!, false
+                    intent.getStringExtra(KEY_ROOM_TOKEN)!!, intent.extras!!, false, true
                 )
             }
         }
diff --git a/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt b/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt
index 0f64722e2..972488949 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt
@@ -24,15 +24,28 @@ import android.os.Bundle
 import com.bluelinelabs.conductor.Router
 import com.bluelinelabs.conductor.RouterTransaction
 import com.bluelinelabs.conductor.changehandler.HorizontalChangeHandler
+import com.bluelinelabs.conductor.changehandler.SimpleSwapChangeHandler
 import com.nextcloud.talk.controllers.ChatController
 
 object ConductorRemapping {
+
     fun remapChatController(
         router: Router,
         internalUserId: Long,
         roomTokenOrId: String,
         bundle: Bundle,
         replaceTop: Boolean
+    ) {
+        remapChatController(router, internalUserId, roomTokenOrId, bundle, replaceTop, false)
+    }
+
+    fun remapChatController(
+        router: Router,
+        internalUserId: Long,
+        roomTokenOrId: String,
+        bundle: Bundle,
+        replaceTop: Boolean,
+        pushImmediately: Boolean
     ) {
         val tag = "$internalUserId@$roomTokenOrId"
         if (router.getControllerWithTag(tag) != null) {
@@ -49,16 +62,21 @@ object ConductorRemapping {
             backstack.add(routerTransaction)
             router.setBackstack(backstack, HorizontalChangeHandler())
         } else {
+            var pushChangeHandler = if (pushImmediately) {
+                SimpleSwapChangeHandler()
+            } else {
+                HorizontalChangeHandler()
+            }
             if (!replaceTop) {
                 router.pushController(
                     RouterTransaction.with(ChatController(bundle))
-                        .pushChangeHandler(HorizontalChangeHandler())
+                        .pushChangeHandler(pushChangeHandler)
                         .popChangeHandler(HorizontalChangeHandler()).tag(tag)
                 )
             } else {
                 router.replaceTopController(
                     RouterTransaction.with(ChatController(bundle))
-                        .pushChangeHandler(HorizontalChangeHandler())
+                        .pushChangeHandler(pushChangeHandler)
                         .popChangeHandler(HorizontalChangeHandler()).tag(tag)
                 )
             }

From 60e4ec9086c0a8a1410ab51c753da6693cda1887 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Mon, 14 Mar 2022 13:37:30 +0100
Subject: [PATCH 2/3] Use 'val' for never modified variables
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 .../main/java/com/nextcloud/talk/utils/ConductorRemapping.kt    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt b/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt
index 972488949..992473a85 100644
--- a/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt
+++ b/app/src/main/java/com/nextcloud/talk/utils/ConductorRemapping.kt
@@ -62,7 +62,7 @@ object ConductorRemapping {
             backstack.add(routerTransaction)
             router.setBackstack(backstack, HorizontalChangeHandler())
         } else {
-            var pushChangeHandler = if (pushImmediately) {
+            val pushChangeHandler = if (pushImmediately) {
                 SimpleSwapChangeHandler()
             } else {
                 HorizontalChangeHandler()

From 2bc5ac1461dfaf8822621ec33519c93a651119af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim=20Kr=C3=BCger?= <t@timkrueger.me>
Date: Mon, 14 Mar 2022 14:53:11 +0100
Subject: [PATCH 3/3] Allow one more detekt issue
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The source are the six parameters in
'ConductorRemapping#remapChatController". But since we're planning to
get rid of Conductor we will live with that a while.

Signed-off-by: Tim Krüger <t@timkrueger.me>
---
 detekt.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/detekt.yml b/detekt.yml
index 7465a5835..9d94c131c 100644
--- a/detekt.yml
+++ b/detekt.yml
@@ -1,5 +1,5 @@
 build:
-  maxIssues: 149
+  maxIssues: 150
   weights:
     # complexity: 2
     # LongParameterList: 1