소스 검색

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é 6 년 전
부모
커밋
4591b36c3e

+ 1
- 1
android/app/src/main/java/org/jitsi/meet/MainActivity.java 파일 보기

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

+ 5
- 0
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetActivity.java 파일 보기

143
     // Activity lifecycle methods
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
     @Override
151
     @Override
147
     public void onBackPressed() {
152
     public void onBackPressed() {
148
         JitsiMeetActivityDelegate.onBackPressed();
153
         JitsiMeetActivityDelegate.onBackPressed();

+ 0
- 2
android/sdk/src/main/java/org/jitsi/meet/sdk/JitsiMeetFragment.java 파일 보기

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

Loading…
취소
저장