Bläddra i källkod

[iOS] Unify openURL methods and mark the old one deprecated (#3489)

Make sure both methods offer the same behavior and mark the old one as
deprecated so SDK users get a warning.
master
Saúl Ibarra Corretgé 6 år sedan
förälder
incheckning
c54db8337d
3 ändrade filer med 14 tillägg och 13 borttagningar
  1. 2
    0
      ios/README.md
  2. 1
    1
      ios/sdk/src/JitsiMeetView.h
  3. 11
    12
      ios/sdk/src/JitsiMeetView.m

+ 2
- 0
ios/README.md Visa fil

@@ -154,6 +154,8 @@ or
154 154
 }
155 155
 ```
156 156
 
157
+NOTE: The latter is deprecated.
158
+
157 159
 ### JitsiMeetViewDelegate
158 160
 
159 161
 This delegate is optional, and can be set on the `JitsiMeetView` instance using

+ 1
- 1
ios/sdk/src/JitsiMeetView.h Visa fil

@@ -46,7 +46,7 @@
46 46
 + (BOOL)application:(UIApplication * _Nonnull)application
47 47
             openURL:(NSURL * _Nonnull)URL
48 48
   sourceApplication:(NSString * _Nullable)sourceApplication
49
-         annotation:(id _Nullable)annotation;
49
+         annotation:(id _Nullable)annotation __deprecated;
50 50
 
51 51
 - (void)loadURL:(NSURL * _Nullable)url;
52 52
 

+ 11
- 12
ios/sdk/src/JitsiMeetView.m Visa fil

@@ -198,15 +198,10 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
198 198
 + (BOOL)application:(UIApplication *)app
199 199
             openURL:(NSURL *)url
200 200
             options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
201
-    return
202
-        [Dropbox application:app openURL:url options:options]
203
-            || [RCTLinkingManager application:app openURL:url options:options];
204
-}
201
+    if ([Dropbox application:app openURL:url options:options]) {
202
+        return YES;
203
+    }
205 204
 
206
-+ (BOOL)application:(UIApplication *)application
207
-            openURL:(NSURL *)url
208
-  sourceApplication:(NSString *)sourceApplication
209
-         annotation:(id)annotation {
210 205
     // XXX At least twice we received bug reports about malfunctioning loadURL
211 206
     // in the Jitsi Meet SDK while the Jitsi Meet app seemed to functioning as
212 207
     // expected in our testing. But that was to be expected because the app does
@@ -216,10 +211,14 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
216 211
         return YES;
217 212
     }
218 213
 
219
-    return [RCTLinkingManager application:application
220
-                                  openURL:url
221
-                        sourceApplication:sourceApplication
222
-                               annotation:annotation];
214
+    return [RCTLinkingManager application:app openURL:url options:options];
215
+}
216
+
217
++ (BOOL)application:(UIApplication *)application
218
+            openURL:(NSURL *)url
219
+  sourceApplication:(NSString *)sourceApplication
220
+         annotation:(id)annotation {
221
+    return [self application:application openURL:url options:@{}];
223 222
 }
224 223
 
225 224
 #pragma mark Initializers

Laddar…
Avbryt
Spara