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

android: handle onActivityResult Activity lifecycle method 

It may be called in the Activity instead of in the Fragment. Handle both.
This commit is contained in:
Saúl Ibarra Corretgé 2019-06-18 12:50:52 +02:00 committed by Saúl Ibarra Corretgé
parent db862b5b3b
commit 4591b36c3e
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/app/src/main/java/org/jitsi/meet/MainActivity.java
View File

@ -107,7 +107,7 @@ public class MainActivity extends JitsiMeetActivity {
// //
@Override @Override
protected void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE if (requestCode == OVERLAY_PERMISSION_REQUEST_CODE
&& canRequestOverlayPermission()) { && canRequestOverlayPermission()) {
if (Settings.canDrawOverlays(this)) { if (Settings.canDrawOverlays(this)) {

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

@ -143,6 +143,11 @@ public class JitsiMeetActivity extends FragmentActivity
// Activity lifecycle methods // Activity lifecycle methods
// //
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data);
}
@Override @Override
public void onBackPressed() { public void onBackPressed() {
JitsiMeetActivityDelegate.onBackPressed(); JitsiMeetActivityDelegate.onBackPressed();

2
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java
View File

@ -26,8 +26,6 @@ import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import java.net.URL;
/** /**
* Base {@link Fragment} for applications integrating Jitsi Meet at a higher level. It * Base {@link Fragment} for applications integrating Jitsi Meet at a higher level. It
* contains all the required wiring between the {@code JitsiMeetView} and * contains all the required wiring between the {@code JitsiMeetView} and