From 03913b40a23ab1785ab5290b4e7393e15ec0e8f5 Mon Sep 17 00:00:00 2001
From: Marcel Hibbe <dev@mhibbe.de>
Date: Wed, 27 Oct 2021 12:47:45 +0200
Subject: [PATCH] fix to enable pip for CallNotification Controller

methods to update UI are not yet implemented. maybe it's better to make two Activities: one for Call and one for CallNotification...

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
---
 .../talk/activities/MagicCallActivity.kt      | 20 ++++++++++++++-----
 .../CallNotificationController.java           |  2 +-
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
index 5be79df36..c9220d7ba 100644
--- a/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
+++ b/app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
@@ -76,6 +76,7 @@ class MagicCallActivity : BaseActivity() {
                     RouterTransaction.with(CallNotificationController(intent.extras))
                         .pushChangeHandler(HorizontalChangeHandler())
                         .popChangeHandler(HorizontalChangeHandler())
+                        .tag(CallNotificationController.TAG)
                 )
             } else {
                 router!!.setRoot(
@@ -153,11 +154,20 @@ class MagicCallActivity : BaseActivity() {
         super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
         isInPipMode = isInPictureInPictureMode
 
-        val callController = router?.getControllerWithTag(CallController.TAG) as CallController
-        if (isInPictureInPictureMode) {
-            callController.updateUiForPipMode()
-        } else {
-            callController.updateUiForNormalMode()
+        if (router?.getControllerWithTag(CallNotificationController.TAG) != null) {
+            val callNotificationController = router?.getControllerWithTag(CallNotificationController.TAG) as CallNotificationController
+            if (isInPictureInPictureMode) {
+                // callNotificationController.updateUiForPipMode()
+            } else {
+                // callNotificationController.updateUiForNormalMode()
+            }
+        } else if (router?.getControllerWithTag(CallController.TAG) != null) {
+            val callController = router?.getControllerWithTag(CallController.TAG) as CallController
+            if (isInPictureInPictureMode) {
+                callController.updateUiForPipMode()
+            } else {
+                callController.updateUiForNormalMode()
+            }
         }
     }
 
diff --git a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
index 5ac497949..a013f25a5 100644
--- a/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
+++ b/app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
@@ -101,7 +101,7 @@ import okhttp3.Cache;
 @AutoInjector(NextcloudTalkApplication.class)
 public class CallNotificationController extends BaseController {
 
-    private static final String TAG = "CallNotificationController";
+    public static final String TAG = "CallNotificationController";
 
     @Inject
     NcApi ncApi;