Browse Source

android: move calendar permission handling to the SDK

Since this is a feature implemented in the SDK, it makes sense that all the
plumbing required to make it work it's in the SDK itself.
master
Saúl Ibarra Corretgé 7 years ago
parent
commit
f3d623e0ca

+ 0
- 18
android/app/src/main/java/org/jitsi/meet/MainActivity.java View File

27
 import org.jitsi.meet.sdk.invite.InviteController;
27
 import org.jitsi.meet.sdk.invite.InviteController;
28
 import org.jitsi.meet.sdk.invite.InviteControllerListener;
28
 import org.jitsi.meet.sdk.invite.InviteControllerListener;
29
 
29
 
30
-import com.calendarevents.CalendarEventsPackage;
31
 import com.facebook.react.bridge.UiThreadUtil;
30
 import com.facebook.react.bridge.UiThreadUtil;
32
 
31
 
33
 import java.util.ArrayList;
32
 import java.util.ArrayList;
34
-import java.util.HashMap;
35
 import java.util.List;
33
 import java.util.List;
36
 import java.util.Map;
34
 import java.util.Map;
37
 
35
 
229
             addPeopleController.endAddPeople();
227
             addPeopleController.endAddPeople();
230
         }
228
         }
231
     }
229
     }
232
-
233
-    @Override
234
-    public void onRequestPermissionsResult(
235
-            int requestCode,
236
-            String[] permissions,
237
-            int[] grantResults) {
238
-        CalendarEventsPackage.onRequestPermissionsResult(
239
-            requestCode,
240
-            permissions,
241
-            grantResults);
242
-
243
-        super.onRequestPermissionsResult(
244
-            requestCode,
245
-            permissions,
246
-            grantResults);
247
-    }
248
 }
230
 }

+ 4
- 0
android/sdk/src/main/java/org/jitsi/meet/sdk/ReactActivityLifecycleCallbacks.java View File

148
         final int requestCode,
148
         final int requestCode,
149
         final String[] permissions,
149
         final String[] permissions,
150
         final int[] grantResults) {
150
         final int[] grantResults) {
151
+        CalendarEventsPackage.onRequestPermissionsResult(
152
+            requestCode,
153
+            permissions,
154
+            grantResults);
151
         permissionsCallback = new Callback() {
155
         permissionsCallback = new Callback() {
152
             @Override
156
             @Override
153
             public void invoke(Object... args) {
157
             public void invoke(Object... args) {

Loading…
Cancel
Save