haskal
/
jiti-meet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(PictureInPictureModule): catch the RuntimeException 

Activity.enterPictureInPictureMode can fail for a couple of reasons
mentioned in the JSDoc:

"The system may disallow entering picture-in-picture in various cases,
including when the activity is not visible, if the screen is locked or
if the user has an activity pinned."

It seems to be safe to assume that those cases will be caught by
a RuntimeException handler (only RuntimeExceptions can be left without
explicit catch block).

Anyway the root cause for problems is the fact that the current process
for going to the picture in picture mode is not synchronised with
Activity's lifecycle. On Activity's "userLeaveHint" callback we dispatch
async task to the JS code which only then after dispatching some more
stuff eventually call native method that enter PiP. In case we spend too
much time on the JS side and the Activity goes to PAUSED state the call
will fail with IllegalStatException: "activity is not visible",
"activity is paused" etc. This means with this fix the app will not
crash, but we'll see it sometimes not go to the PiP mode as expected.
This commit is contained in:
paweldomas 2018-04-17 13:06:57 -05:00 committed by Lyubo Marinov
parent 2c4a3b0f60
commit 9cbcbf6e26
2 changed files with 21 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
android/sdk/src/main/java/org/jitsi/meet/sdk/PictureInPictureModule.java
View File

@ -44,14 +44,26 @@ public class PictureInPictureModule extends ReactContextBaseJavaModule {
PictureInPictureParams.Builder builder
= new PictureInPictureParams.Builder()
.setAspectRatio(new Rational(1, 1));
boolean r
= currentActivity.enterPictureInPictureMode(builder.build());
Throwable error;
if (r) {
// https://developer.android.com/reference/android/app/Activity.html#enterPictureInPictureMode(android.app.PictureInPictureParams)
//
// The system may disallow entering picture-in-picture in various
// cases, including when the activity is not visible, if the screen
// is locked or if the user has an activity pinned.
try {
error
= currentActivity.enterPictureInPictureMode(builder.build())
? null
: new Exception("Failed to enter Picture-in-Picture");
} catch (RuntimeException re) {
error = re;
}
if (error == null) {
promise.resolve(null);
} else {
promise.reject(
new Exception("Failed to enter Picture-in-Picture"));
promise.reject(error);
}
return;

4
react/features/mobile/picture-in-picture/actions.js
View File

@ -23,6 +23,10 @@ export function enterPictureInPicture() {
return (dispatch: Dispatch, getState: Function) => {
const state = getState();
const { app } = state['features/app'];
// FIXME We want to be able to enter Picture-in-Picture as soon as we
// are on the Conference page i.e. even before `joining` was set in the
// reducer.
const { conference, joining } = state['features/base/conference'];
if (app