fix: Scene deeplink navigation (#1436)

Infomaniak · Feb 18, 2025 · d5cc76a · d5cc76a
2 parents 040f015 + 20f001c
commit d5cc76a
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 19 deletions.
diff --git a/kDrive/SceneDelegate.swift b/kDrive/SceneDelegate.swift
@@ -32,6 +32,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, AccountManagerDel
     @LazyInjectService var backgroundTasksService: BackgroundTasksServiceable
     @LazyInjectService var appNavigable: AppNavigable
     @LazyInjectService var appRestorationService: AppRestorationServiceable
+    @LazyInjectService var deeplinkParser: DeeplinkParsable
 
     var shortcutItemToProcess: UIApplicationShortcutItem?
 
@@ -68,20 +69,26 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, AccountManagerDel
             return
         }
 
-        guard userActivity.activityType == SceneActivityIdentifier.mainSceneActivityType else {
-            Log.sceneDelegate("unsupported user activity type:\(userActivity.activityType)")
-            return
-        }
+        Task {
+            guard await !continueWebActivityIfPossible(scene, userActivity: userActivity) else {
+                return
+            }
 
-        scene.userActivity = userActivity
+            guard userActivity.activityType == SceneActivityIdentifier.mainSceneActivityType else {
+                Log.sceneDelegate("unsupported user activity type:\(userActivity.activityType)")
+                return
+            }
 
-        guard let userInfo = userActivity.userInfo else {
-            Log.sceneDelegate("activity has no metadata to process")
-            return
-        }
+            scene.userActivity = userActivity
+
+            guard let userInfo = userActivity.userInfo else {
+                Log.sceneDelegate("activity has no metadata to process")
+                return
+            }
 
-        Log.sceneDelegate("restore from \(userActivity.activityType)")
-        Log.sceneDelegate("selectedIndex:\(userInfo[SceneRestorationKeys.selectedIndex.rawValue])")
+            Log.sceneDelegate("restore from \(userActivity.activityType)")
+            Log.sceneDelegate("selectedIndex:\(userInfo[SceneRestorationKeys.selectedIndex.rawValue])")
+        }
     }
 
     private func prepareWindowScene(_ windowScene: UIWindowScene) {
@@ -217,11 +224,22 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, AccountManagerDel
         }
 
         Task {
-            let success = await DeeplinkParser().parse(url: url)
+            let success = await deeplinkParser.parse(url: url)
             Log.sceneDelegate("scene open url: \(url) success: \(success)")
         }
     }
 
+    @discardableResult
+    private func continueWebActivityIfPossible(_ scene: UIScene, userActivity: NSUserActivity) async -> Bool {
+        guard userActivity.activityType == NSUserActivityTypeBrowsingWeb,
+              let incomingURL = userActivity.webpageURL else {
+            Log.sceneDelegate("the scene continue userActivity - is not NSUserActivityTypeBrowsingWeb", level: .error)
+            return false
+        }
+
+        return await deeplinkParser.parse(url: incomingURL)
+    }
+
     // MARK: - Handoff support
 
     func scene(_ scene: UIScene, willContinueUserActivityWithType userActivityType: String) {
@@ -231,13 +249,7 @@ final class SceneDelegate: UIResponder, UIWindowSceneDelegate, AccountManagerDel
     func scene(_ scene: UIScene, continue userActivity: NSUserActivity) {
         Log.sceneDelegate("scene continue userActivity")
         Task {
-            guard userActivity.activityType == NSUserActivityTypeBrowsingWeb,
-                  let incomingURL = userActivity.webpageURL else {
-                Log.sceneDelegate("scene continue userActivity - invalid activity", level: .error)
-                return
-            }
-
-            await UniversalLinksHelper.handleURL(incomingURL)
+            await continueWebActivityIfPossible(scene, userActivity: userActivity)
         }
     }
 

diff --git a/kDriveCore/DI/FactoryService.swift b/kDriveCore/DI/FactoryService.swift
@@ -76,6 +76,9 @@ public enum FactoryService {
             },
             Factory(type: DeeplinkServiceable.self) { _, _ in
                 DeeplinkService()
+            },
+            Factory(type: DeeplinkParsable.self) { _, _ in
+                DeeplinkParser()
             }
         ]
         return services

diff --git a/kDriveCore/Utils/DeeplinkParser.swift b/kDriveCore/Utils/DeeplinkParser.swift
@@ -40,6 +40,10 @@ public struct DeeplinkParser: DeeplinkParsable {
     }
 
     public func parse(url: URL) async -> Bool {
+        guard await !UniversalLinksHelper.handleURL(url) else {
+            return true
+        }
+
         guard let components = URLComponents(url: url, resolvingAgainstBaseURL: true),
               let params = components.queryItems else {
             Log.sceneDelegate("Failed to open URL: Invalid URL", level: .error)