From c54db8337d500e77f17a9f93fed207a9d18a6743 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sa=C3=BAl=20Ibarra=20Corretg=C3=A9?= <s@saghul.net>
Date: Fri, 28 Sep 2018 21:54:09 +0200
Subject: [PATCH] [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.
---
 ios/README.md               |  2 ++
 ios/sdk/src/JitsiMeetView.h |  2 +-
 ios/sdk/src/JitsiMeetView.m | 23 +++++++++++------------
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/ios/README.md b/ios/README.md
index fbad16faa..942852c94 100644
--- a/ios/README.md
+++ b/ios/README.md
@@ -154,6 +154,8 @@ or
 }
 ```
 
+NOTE: The latter is deprecated.
+
 ### JitsiMeetViewDelegate
 
 This delegate is optional, and can be set on the `JitsiMeetView` instance using
diff --git a/ios/sdk/src/JitsiMeetView.h b/ios/sdk/src/JitsiMeetView.h
index 37a351271..26c409c5f 100644
--- a/ios/sdk/src/JitsiMeetView.h
+++ b/ios/sdk/src/JitsiMeetView.h
@@ -46,7 +46,7 @@
 + (BOOL)application:(UIApplication * _Nonnull)application
             openURL:(NSURL * _Nonnull)URL
   sourceApplication:(NSString * _Nullable)sourceApplication
-         annotation:(id _Nullable)annotation;
+         annotation:(id _Nullable)annotation __deprecated;
 
 - (void)loadURL:(NSURL * _Nullable)url;
 
diff --git a/ios/sdk/src/JitsiMeetView.m b/ios/sdk/src/JitsiMeetView.m
index 5e81e0e96..75f05932d 100644
--- a/ios/sdk/src/JitsiMeetView.m
+++ b/ios/sdk/src/JitsiMeetView.m
@@ -198,15 +198,10 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
 + (BOOL)application:(UIApplication *)app
             openURL:(NSURL *)url
             options:(NSDictionary<UIApplicationOpenURLOptionsKey,id> *)options {
-    return
-        [Dropbox application:app openURL:url options:options]
-            || [RCTLinkingManager application:app openURL:url options:options];
-}
+    if ([Dropbox application:app openURL:url options:options]) {
+        return YES;
+    }
 
-+ (BOOL)application:(UIApplication *)application
-            openURL:(NSURL *)url
-  sourceApplication:(NSString *)sourceApplication
-         annotation:(id)annotation {
     // XXX At least twice we received bug reports about malfunctioning loadURL
     // in the Jitsi Meet SDK while the Jitsi Meet app seemed to functioning as
     // expected in our testing. But that was to be expected because the app does
@@ -216,10 +211,14 @@ static NSMapTable<NSString *, JitsiMeetView *> *views;
         return YES;
     }
 
-    return [RCTLinkingManager application:application
-                                  openURL:url
-                        sourceApplication:sourceApplication
-                               annotation:annotation];
+    return [RCTLinkingManager application:app openURL:url options:options];
+}
+
++ (BOOL)application:(UIApplication *)application
+            openURL:(NSURL *)url
+  sourceApplication:(NSString *)sourceApplication
+         annotation:(id)annotation {
+    return [self application:application openURL:url options:@{}];
 }
 
 #pragma mark Initializers