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

fix(android) avoid crashes if view is null 

This may happen due to API misuse, but also in complex applications where
activity lifetimes are not straightforward.
This commit is contained in:
Saúl Ibarra Corretgé 2020-12-22 11:04:34 +01:00 committed by Saúl Ibarra Corretgé
parent 687a6c31ee
commit a01e3e9d8a
1 changed files with 20 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java
View File

@ -107,7 +107,7 @@ public class JitsiMeetActivity extends FragmentActivity
protected JitsiMeetView getJitsiView() {
JitsiMeetFragment fragment
= (JitsiMeetFragment) getSupportFragmentManager().findFragmentById(R.id.jitsiFragment);
return fragment.getJitsiView();
return fragment != null ? fragment.getJitsiView() : null;
}
public void join(@Nullable String url) {
@ -119,11 +119,23 @@ public class JitsiMeetActivity extends FragmentActivity
}
public void join(JitsiMeetConferenceOptions options) {
getJitsiView().join(options);
JitsiMeetView view = getJitsiView();
if (view != null) {
view.join(options);
} else {
JitsiMeetLogger.w("Cannot join, view is null");
}
}
public void leave() {
getJitsiView().leave();
JitsiMeetView view = getJitsiView();
if (view != null) {
view.leave();
} else {
JitsiMeetLogger.w("Cannot leave, view is null");
}
}
private @Nullable JitsiMeetConferenceOptions getConferenceOptions(Intent intent) {
@ -191,7 +203,11 @@ public class JitsiMeetActivity extends FragmentActivity
@Override
protected void onUserLeaveHint() {
getJitsiView().enterPictureInPicture();
JitsiMeetView view = getJitsiView();
if (view != null) {
view.enterPictureInPicture();
}
}
// JitsiMeetActivityInterface