gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-07 22:51:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix NPE when call is joined by notification

Browse Source 
add ability to have PIP mode for calls joined by notification

Signed-off-by: Marcel Hibbe <dev@mhibbe.de>
This commit is contained in:
Marcel Hibbe 2021-10-26 20:20:18 +02:00
parent 51b86b5a88
commit 0d1e0af9d1
No known key found for this signature in database
GPG Key ID: C793F8B59F43CE7B
3 changed files with 5 additions and 4 deletions
app/src/main/java/com/nextcloud/talk
activities
MagicCallActivity.kt
controllers
CallController.javaCallNotificationController.java

4
app/src/main/java/com/nextcloud/talk/activities/MagicCallActivity.kt
View File

@ -82,7 +82,7 @@ class MagicCallActivity : BaseActivity() {
RouterTransaction.with(CallController(intent.extras)) RouterTransaction.with(CallController(intent.extras))
.pushChangeHandler(HorizontalChangeHandler()) .pushChangeHandler(HorizontalChangeHandler())
.popChangeHandler(HorizontalChangeHandler()) .popChangeHandler(HorizontalChangeHandler())
.tag("CallController") .tag(CallController.TAG)
) )
} }
} }
@ -153,7 +153,7 @@ class MagicCallActivity : BaseActivity() {
super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig) super.onPictureInPictureModeChanged(isInPictureInPictureMode, newConfig)
isInPipMode = isInPictureInPictureMode isInPipMode = isInPictureInPictureMode
val callController = router?.getControllerWithTag("CallController") as CallController val callController = router?.getControllerWithTag(CallController.TAG) as CallController
if (isInPictureInPictureMode) { if (isInPictureInPictureMode) {
callController.updateUiForPipMode() callController.updateUiForPipMode()
} else { } else {

2
app/src/main/java/com/nextcloud/talk/controllers/CallController.java
View File

@ -161,7 +161,7 @@ import pub.devrel.easypermissions.AfterPermissionGranted;
@AutoInjector(NextcloudTalkApplication.class) @AutoInjector(NextcloudTalkApplication.class)
public class CallController extends BaseController { public class CallController extends BaseController {
private static final String TAG = "CallController"; public static final String TAG = "CallController";
private static final String[] PERMISSIONS_CALL = { private static final String[] PERMISSIONS_CALL = {
android.Manifest.permission.CAMERA, android.Manifest.permission.CAMERA,

3
app/src/main/java/com/nextcloud/talk/controllers/CallNotificationController.java
View File

@ -200,7 +200,8 @@ public class CallNotificationController extends BaseController {
getRouter().replaceTopController(RouterTransaction.with(new CallController(originalBundle)) getRouter().replaceTopController(RouterTransaction.with(new CallController(originalBundle))
.popChangeHandler(new HorizontalChangeHandler()) .popChangeHandler(new HorizontalChangeHandler())
.pushChangeHandler(new HorizontalChangeHandler())); .pushChangeHandler(new HorizontalChangeHandler())
.tag(CallController.TAG));
} }
private void checkIfAnyParticipantsRemainInRoom() { private void checkIfAnyParticipantsRemainInRoom() {