Przeglądaj źródła

android: remove ReactContextUtils

In practice, we are never going to be in a position where we don't have a
ReactContext but we do have some React Native code running. So let's not expect
the impossible.
efficient_tiling
Saúl Ibarra Corretgé 6 lat temu
rodzic
commit
53722fd2e6

+ 2
- 4
android/sdk/src/main/java/org/jitsi/meet/sdk/ConnectionService.java Wyświetl plik

@@ -332,8 +332,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
332 332
             Log.d(TAG, "onDisconnect " + getCallUUID());
333 333
             WritableNativeMap data = new WritableNativeMap();
334 334
             data.putString("callUUID", getCallUUID());
335
-            ReactContextUtils.emitEvent(
336
-                    null,
335
+            ReactInstanceManagerHolder.emitEvent(
337 336
                     "org.jitsi.meet:features/connection_service#disconnect",
338 337
                     data);
339 338
             // The JavaScript side will not go back to the native with
@@ -353,8 +352,7 @@ public class ConnectionService extends android.telecom.ConnectionService {
353 352
             Log.d(TAG, "onAbort " + getCallUUID());
354 353
             WritableNativeMap data = new WritableNativeMap();
355 354
             data.putString("callUUID", getCallUUID());
356
-            ReactContextUtils.emitEvent(
357
-                    null,
355
+            ReactInstanceManagerHolder.emitEvent(
358 356
                     "org.jitsi.meet:features/connection_service#abort",
359 357
                     data);
360 358
             // The JavaScript side will not go back to the native with

+ 0
- 43
android/sdk/src/main/java/org/jitsi/meet/sdk/ReactContextUtils.java Wyświetl plik

@@ -1,43 +0,0 @@
1
-/*
2
- * Copyright @ 2017-present Atlassian Pty Ltd
3
- *
4
- * Licensed under the Apache License, Version 2.0 (the "License");
5
- * you may not use this file except in compliance with the License.
6
- * You may obtain a copy of the License at
7
- *
8
- *     http://www.apache.org/licenses/LICENSE-2.0
9
- *
10
- * Unless required by applicable law or agreed to in writing, software
11
- * distributed under the License is distributed on an "AS IS" BASIS,
12
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
- * See the License for the specific language governing permissions and
14
- * limitations under the License.
15
- */
16
-
17
-package org.jitsi.meet.sdk;
18
-
19
-import android.support.annotation.Nullable;
20
-
21
-import com.facebook.react.bridge.ReactContext;
22
-import com.facebook.react.modules.core.DeviceEventManagerModule;
23
-
24
-public class ReactContextUtils {
25
-    public static boolean emitEvent(
26
-            ReactContext reactContext,
27
-            String eventName,
28
-            @Nullable Object data) {
29
-        if (reactContext == null) {
30
-            // XXX If no ReactContext is specified, emit through the
31
-            // ReactContext of ReactInstanceManager. ReactInstanceManager
32
-            // cooperates with ReactContextUtils i.e. ReactInstanceManager will
33
-            // not invoke ReactContextUtils without a ReactContext.
34
-            return ReactInstanceManagerHolder.emitEvent(eventName, data);
35
-        }
36
-
37
-        reactContext
38
-            .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
39
-            .emit(eventName, data);
40
-
41
-        return true;
42
-    }
43
-}

+ 8
- 6
android/sdk/src/main/java/org/jitsi/meet/sdk/ReactInstanceManagerHolder.java Wyświetl plik

@@ -24,6 +24,7 @@ import com.facebook.react.bridge.NativeModule;
24 24
 import com.facebook.react.bridge.ReactContext;
25 25
 import com.facebook.react.bridge.ReactApplicationContext;
26 26
 import com.facebook.react.common.LifecycleState;
27
+import com.facebook.react.modules.core.DeviceEventManagerModule;
27 28
 
28 29
 import java.util.ArrayList;
29 30
 import java.util.Arrays;
@@ -81,12 +82,13 @@ class ReactInstanceManagerHolder {
81 82
             ReactContext reactContext
82 83
                 = reactInstanceManager.getCurrentReactContext();
83 84
 
84
-            return
85
-                reactContext != null
86
-                    && ReactContextUtils.emitEvent(
87
-                        reactContext,
88
-                        eventName,
89
-                        data);
85
+            if (reactContext != null) {
86
+                reactContext
87
+                    .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
88
+                    .emit(eventName, data);
89
+
90
+                return true;
91
+            }
90 92
         }
91 93
 
92 94
         return false;

Ładowanie…
Anuluj
Zapisz