Explorar el Código

android: handle onActivityResult Activity lifecycle method

It may be called in the Activity instead of in the Fragment. Handle both.
master
Saúl Ibarra Corretgé hace 6 años
padre
commit
4591b36c3e

+ 1
- 1
android/app/src/main/java/org/jitsi/meet/MainActivity.java Ver fichero

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

+ 5
- 0
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java Ver fichero

@@ -143,6 +143,11 @@ public class JitsiMeetActivity extends FragmentActivity
143 143
     // Activity lifecycle methods
144 144
     //
145 145
 
146
+    @Override
147
+    public void onActivityResult(int requestCode, int resultCode, Intent data) {
148
+        JitsiMeetActivityDelegate.onActivityResult(this, requestCode, resultCode, data);
149
+    }
150
+
146 151
     @Override
147 152
     public void onBackPressed() {
148 153
         JitsiMeetActivityDelegate.onBackPressed();

+ 0
- 2
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java Ver fichero

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

Loading…
Cancelar
Guardar