Migrate openURL and performActionForShortcutItem to UIScene

Author: wutschel

XBMC Remote/AppDelegate.m

@@ -163,40 +163,6 @@ - (NSDictionary*)getServerHTTPHeaders {
 
 #pragma mark - Helper
 
-- (BOOL)connectToServerFromList:(NSString*)host {
-    if (!host.length) {
-        return NO;
-    }
-    
-    // Host name needs ".local." at the end
-    if ([host hasSuffix:@".local"]) {
-        host = [host stringByAppendingString:@"."];
-    }
-    
-    // Try to map server name or IP address to the list of Kodi servers
-    NSInteger index = [self.arrayServerList indexOfObjectPassingTest:^BOOL(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
-        return [host isEqualToString:obj[@"serverDescription"]] || [host isEqualToString:obj[@"serverIP"]];
-    }];
-    
-    // We want to connect to the desired server only. If this is not present, disconnect from any active server.
-    BOOL result = NO;
-    NSIndexPath *serverIndexPath;
-    NSDictionary *params;
-    if (index != NSNotFound) {
-        serverIndexPath = [NSIndexPath indexPathForRow:index inSection:0];
-        params = @{@"index": @(index)};
-        result = YES;
-    }
-    
-    // Case 1: App just starts. Set the last active server before readKodiServerParameters is called
-    [Utilities saveLastServerIndex:serverIndexPath];
-    
-    // Case 2: App already runs. Send a notification to select the server via its index.
-    [NSNotificationCenter.defaultCenter postNotificationName:@"SelectKodiServer" object:nil userInfo:params];
-    
-    return result;
-}
-
 - (void)sendWOL:(NSString*)MAC withPort:(NSInteger)WOLport {
     CFSocketRef     WOLsocket;
     WOLsocket = CFSocketCreate(kCFAllocatorDefault, PF_INET, SOCK_DGRAM, IPPROTO_UDP, 0, NULL, NULL);
@@ -272,16 +238,6 @@ - (void)sendWOL:(NSString*)MAC withPort:(NSInteger)WOLport {
     }
 }
 
-- (BOOL)application:(UIApplication*)app openURL:(NSURL*)url options:(NSDictionary<UIApplicationOpenURLOptionsKey,id>*)options {
-    // Use URL host to map to server list and connect the server.
-    return [self connectToServerFromList:url.host.stringByRemovingPercentEncoding];
-}
-
-- (void)application:(UIApplication*)application performActionForShortcutItem:(UIApplicationShortcutItem*)shortcutItem completionHandler:(void(^)(BOOL))completionHandler {
-    // Use shortcut title (= server description) to map to server list and connect the server.
-    [self connectToServerFromList:shortcutItem.localizedTitle];
-}
-
 - (void)applicationDidReceiveMemoryWarning:(UIApplication*)application {
     [[SDImageCache sharedImageCache] clearMemory];
 }

XBMC Remote/SceneDelegate.h

@@ -8,7 +8,10 @@
 
 @import UIKit;
 
-@interface SceneDelegate : UIResponder <UIWindowSceneDelegate> {}
+@interface SceneDelegate : UIResponder <UIWindowSceneDelegate> {
+    UIApplicationShortcutItem *launchShortcutItem;
+    id launchURLContexts;
+}
 
 @property (strong, nonatomic) UIWindow *window;
 

XBMC Remote/SceneDelegate.m

@@ -24,6 +24,10 @@ - (void)scene:(UIScene*)scene willConnectToSession:(UISceneSession*)session opti
 
     // Set interface style for window
     [self setInterfaceStyleFromUserDefaults];
+    
+    // Store launch options
+    launchShortcutItem = connectionOptions.shortcutItem;
+    launchURLContexts = connectionOptions.URLContexts;
 }
 
 - (void)sceneWillEnterForeground:(UIScene*)scene {
@@ -37,6 +41,17 @@ - (void)sceneDidBecomeActive:(UIScene*)scene {
         LocalNetworkAlertClass *localNetworkAlert = [LocalNetworkAlertClass new];
         [localNetworkAlert triggerLocalNetworkPrivacyAlert];
     });
+    
+    // As per Apple documentation
+    // https://developer.apple.com/documentation/uikit/menus_and_shortcuts/add_home_screen_quick_actions
+    if (launchShortcutItem) {
+        [self windowScene:(UIWindowScene*)scene performActionForShortcutItem:launchShortcutItem completionHandler:nil];
+        launchShortcutItem = nil;
+    }
+    if (launchURLContexts) {
+        [self scene:scene openURLContexts:launchURLContexts];
+        launchURLContexts = nil;
+    }
 }
 
 - (void)sceneDidEnterBackground:(UIScene*)scene {
@@ -54,6 +69,54 @@ - (void)sceneDidEnterBackground:(UIScene*)scene {
     UIApplication.sharedApplication.shortcutItems = items;
 }
 
+- (void)windowScene:(UIWindowScene*)windowScene performActionForShortcutItem:(UIApplicationShortcutItem*)shortcutItem completionHandler:(void(^)(BOOL))completionHandler {
+    // Use shortcut title (= server description) to map to server list and connect the server.
+    [self connectToServerFromList:shortcutItem.localizedTitle];
+}
+
+- (void)scene:(UIScene*)scene openURLContexts:(NSSet<UIOpenURLContext*>*)URLContexts {
+    // Use URL host to map to server list and connect the server.
+    UIOpenURLContext *urlContext = URLContexts.allObjects.firstObject;
+    NSURL *url = urlContext.URL;
+    [self connectToServerFromList:url.host.stringByRemovingPercentEncoding];
+}
+
+#pragma mark - Helper
+
+- (BOOL)connectToServerFromList:(NSString*)host {
+    if (!host.length) {
+        return NO;
+    }
+    
+    // Host name needs ".local." at the end
+    if ([host hasSuffix:@".local"]) {
+        host = [host stringByAppendingString:@"."];
+    }
+    
+    // Try to map server name or IP address to the list of Kodi servers
+    NSInteger index = [AppDelegate.instance.arrayServerList indexOfObjectPassingTest:^BOOL(NSDictionary *obj, NSUInteger idx, BOOL *stop) {
+        return [host isEqualToString:obj[@"serverDescription"]] || [host isEqualToString:obj[@"serverIP"]];
+    }];
+    
+    // We want to connect to the desired server only. If this is not present, disconnect from any active server.
+    BOOL result = NO;
+    NSIndexPath *serverIndexPath;
+    NSDictionary *params;
+    if (index != NSNotFound) {
+        serverIndexPath = [NSIndexPath indexPathForRow:index inSection:0];
+        params = @{@"index": @(index)};
+        result = YES;
+    }
+    
+    // Case 1: App just starts. Set the last active server before readKodiServerParameters is called
+    [Utilities saveLastServerIndex:serverIndexPath];
+    
+    // Case 2: App already runs. Send a notification to select the server via its index.
+    [NSNotificationCenter.defaultCenter postNotificationName:@"SelectKodiServer" object:nil userInfo:params];
+    
+    return result;
+}
+
 - (void)setInterfaceStyleFromUserDefaults {
     NSUserDefaults *userDefaults = [NSUserDefaults standardUserDefaults];
     NSString *mode = [userDefaults stringForKey:@"theme_mode"];