Przeglądaj źródła

deps: update react-native-immersive

master
Saúl Ibarra Corretgé 6 lat temu
rodzic
commit
1e83891a70

+ 1
- 1
android/build.gradle Wyświetl plik

84
             else if ('react-native-google-signin' == project.name)
84
             else if ('react-native-google-signin' == project.name)
85
                 versionQualifier = '-jitsi-2' // 1.0.2 + react-native 0.57
85
                 versionQualifier = '-jitsi-2' // 1.0.2 + react-native 0.57
86
             else if ('react-native-immersive' == project.name)
86
             else if ('react-native-immersive' == project.name)
87
-                versionQualifier = '-jitsi-4' // 1.1.0 + react-native 0.57
87
+                versionQualifier = '-jitsi-5' // 2.0.0 + react-native 0.57
88
             else if ('react-native-keep-awake' == project.name)
88
             else if ('react-native-keep-awake' == project.name)
89
                 versionQualifier = '-jitsi-4' // 4.0.0 + react-native 0.57
89
                 versionQualifier = '-jitsi-4' // 4.0.0 + react-native 0.57
90
             else if ('react-native-linear-gradient' == project.name)
90
             else if ('react-native-linear-gradient' == project.name)

+ 3
- 22
android/sdk/src/main/java/org/jitsi/meet/sdk/BaseReactView.java Wyświetl plik

1
 /*
1
 /*
2
- * Copyright @ 2018-present Atlassian Pty Ltd
2
+ * Copyright @ 2018-present 8x8, Inc.
3
+ * Copyright @ 2018 Atlassian Pty Ltd
3
  *
4
  *
4
  * Licensed under the Apache License, Version 2.0 (the "License");
5
  * 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 not use this file except in compliance with the License.
21
 import android.os.Bundle;
22
 import android.os.Bundle;
22
 import android.support.annotation.NonNull;
23
 import android.support.annotation.NonNull;
23
 import android.support.annotation.Nullable;
24
 import android.support.annotation.Nullable;
24
-import android.util.Log;
25
 import android.widget.FrameLayout;
25
 import android.widget.FrameLayout;
26
 
26
 
27
 import com.facebook.react.ReactRootView;
27
 import com.facebook.react.ReactRootView;
194
         super.onWindowFocusChanged(hasFocus);
194
         super.onWindowFocusChanged(hasFocus);
195
 
195
 
196
         // https://github.com/mockingbot/react-native-immersive#restore-immersive-state
196
         // https://github.com/mockingbot/react-native-immersive#restore-immersive-state
197
-
198
-        // FIXME The singleton pattern employed by RNImmersiveModule is not
199
-        // advisable because a react-native mobule is consumable only after its
200
-        // BaseJavaModule#initialize() has completed and here we have no
201
-        // knowledge of whether the precondition is really met.
202
         RNImmersiveModule immersive = RNImmersiveModule.getInstance();
197
         RNImmersiveModule immersive = RNImmersiveModule.getInstance();
203
 
198
 
204
         if (hasFocus && immersive != null) {
199
         if (hasFocus && immersive != null) {
205
-            try {
206
-                immersive.emitImmersiveStateChangeEvent();
207
-            } catch (RuntimeException re) {
208
-                // FIXME I don't know how to check myself whether
209
-                // BaseJavaModule#initialize() has been invoked and thus
210
-                // RNImmersiveModule is consumable. A safe workaround is to
211
-                // swallow the failure because the whole full-screen/immersive
212
-                // functionality is brittle anyway, akin to the icing on the
213
-                // cake, and has been working without onWindowFocusChanged for a
214
-                // very long time.
215
-                Log.e(
216
-                    "RNImmersiveModule",
217
-                    "emitImmersiveStateChangeEvent() failed!",
218
-                    re);
219
-            }
200
+            immersive.emitImmersiveStateChangeEvent();
220
         }
201
         }
221
     }
202
     }
222
 
203
 

+ 3
- 3
package-lock.json Wyświetl plik

11288
       "integrity": "sha512-4HPPSecI29gX0Pu7h2E7ZYXnKO4r+6eh5f+Unm67liE1RfvCQfOqoDliPbK96Mb/91VgHwqyxi0sUEC4j54/AQ=="
11288
       "integrity": "sha512-4HPPSecI29gX0Pu7h2E7ZYXnKO4r+6eh5f+Unm67liE1RfvCQfOqoDliPbK96Mb/91VgHwqyxi0sUEC4j54/AQ=="
11289
     },
11289
     },
11290
     "react-native-immersive": {
11290
     "react-native-immersive": {
11291
-      "version": "1.1.0",
11292
-      "resolved": "https://registry.npmjs.org/react-native-immersive/-/react-native-immersive-1.1.0.tgz",
11293
-      "integrity": "sha512-U7KPW0xE/E7j5z+haUbgxSyrHHIe/I4t4y9WWN9puTHsX3R5mDEjpUF+eEYr9yHKEOegRZzUic7rnajUn/6VDQ=="
11291
+      "version": "2.0.0",
11292
+      "resolved": "https://registry.npmjs.org/react-native-immersive/-/react-native-immersive-2.0.0.tgz",
11293
+      "integrity": "sha512-9TL05nTHN/x9sN1wbUlBoGyzH4NCuZ/7WEEUp5CvOoKuUABvdYosov0O0SAMbm/5J913RRoy98VB6tGNi9lRSw=="
11294
     },
11294
     },
11295
     "react-native-keep-awake": {
11295
     "react-native-keep-awake": {
11296
       "version": "4.0.0",
11296
       "version": "4.0.0",

+ 1
- 1
package.json Wyświetl plik

68
     "react-native-callstats": "3.53.4",
68
     "react-native-callstats": "3.53.4",
69
     "react-native-fast-image": "5.1.1",
69
     "react-native-fast-image": "5.1.1",
70
     "react-native-google-signin": "1.0.2",
70
     "react-native-google-signin": "1.0.2",
71
-    "react-native-immersive": "1.1.0",
71
+    "react-native-immersive": "2.0.0",
72
     "react-native-keep-awake": "4.0.0",
72
     "react-native-keep-awake": "4.0.0",
73
     "react-native-linear-gradient": "2.4.0",
73
     "react-native-linear-gradient": "2.4.0",
74
     "react-native-sound": "0.10.9",
74
     "react-native-sound": "0.10.9",

Ładowanie…
Anuluj
Zapisz