From 4591b36c3eb5ea1c23542b181bb5ba20129bb4bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= Date: Tue, 18 Jun 2019 12:50:52 +0200 Subject: [PATCH] android: handle onActivityResult Activity lifecycle method It may be called in the Activity instead of in the Fragment. Handle both. --- android/app/src/main/java/org/jitsi/meet/MainActivity.java | 2 +- .../src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java | 5 +++++ .../src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java | 2 -- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/android/app/src/main/java/org/jitsi/meet/MainActivity.java b/android/app/src/main/java/org/jitsi/meet/MainActivity.java index 0c2b3369f2..e9e1baf145 100644 --- a/android/app/src/main/java/org/jitsi/meet/MainActivity.java +++ b/android/app/src/main/java/org/jitsi/meet/MainActivity.java @@ -107,7 +107,7 @@ public class MainActivity extends JitsiMeetActivity { // @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 && canRequestOverlayPermission()) { if (Settings.canDrawOverlays(this)) { diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java index b058e42d4d..1edc8510ff 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java @@ -143,6 +143,11 @@ public class JitsiMeetActivity extends FragmentActivity // Activity lifecycle methods // + @Override + public void onActivityResult(int requestCode, int resultCode, Intent data) { + JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data); + } + @Override public void onBackPressed() { JitsiMeetActivityDelegate.onBackPressed(); diff --git a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java index 4ed6689e53..0efa3e4889 100644 --- a/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java +++ b/android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java @@ -26,8 +26,6 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import java.net.URL; - /** * Base {@link Fragment} for applications integrating Jitsi Meet at a higher level. It * contains all the required wiring between the {@code JitsiMeetView} and