소스 검색

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>
Marcel Hibbe 3 년 전
부모
커밋
03913b40a2

+ 15 - 5
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()
+            }
         }
     }
 

+ 1 - 1
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;