Merge tag 'Ent_TestFlight_8.8.2203'

ReseauEntourage · Oct 4, 2023 · d88d170 · d88d170
2 parents dc809fe + 95d7012
commit d88d170
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 9 deletions.
diff --git a/entourage/AppDelegate.swift b/entourage/AppDelegate.swift
@@ -191,8 +191,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
         Logger.print("***** Instance : \(instance) - id : \(instanceId)")
         let postId = extras["post_id"] as? Int
         Logger.print("***** post id : \(postId) ")
-        let stage = extras["stage"]
-        let notifData = NotificationPushData(instanceName: instance, instanceId: instanceId, postId: postId, stage: stage as! String)
+        let notifData = NotificationPushData(instanceName: instance, instanceId: instanceId, postId: postId)
 
         if isFromBackground {
             DeepLinkManager.presentAction(notification: notifData)

diff --git a/entourage/Managers/WebLinkManager.swift b/entourage/Managers/WebLinkManager.swift
@@ -16,14 +16,16 @@ struct WebLinkManager {
 
     static func openUrl(url:URL?, openInApp:Bool, presenterViewController:UIViewController?, safariDelegate:SFSafariViewControllerDelegate? = nil) {
         if let _url = url {
-            let isOurPattern = _url.absoluteString.contains(prodURL) || _url.absoluteString.contains(prodURL2) || _url.absoluteString.contains(stagingURL) || _url.absoluteString.contains(stagingURL2)
+            var isOurPattern = _url.absoluteString.contains(prodURL) || _url.absoluteString.contains(prodURL2) || _url.absoluteString.contains(stagingURL) || _url.absoluteString.contains(stagingURL2)
+            if _url.absoluteString.contains("action"){
+               isOurPattern = false
+            }
             if isOurPattern {
                 let components = URLComponents(url: _url, resolvingAgainstBaseURL: false)!
                 UniversalLinkManager.handleUniversalLink(components:components)
                 return
             }
         }
-
         if openInApp {
             openUrlInApp(url: url?.checkAndAddScheme, presenterViewController: presenterViewController,safariDelegate: safariDelegate)
             return

diff --git a/entourage/Models/NotifInApp.swift b/entourage/Models/NotifInApp.swift
@@ -29,7 +29,7 @@ struct NotifInApp:Codable {
 
 
     func getNotificationPushData() -> NotificationPushData {
-        return NotificationPushData(instanceName: instanceString, instanceId: instanceId ?? 0, postId:postId, stage: "")
+        return NotificationPushData(instanceName: instanceString, instanceId: instanceId ?? 0, postId:postId)
     }
 
 

diff --git a/entourage/Models/NotificationPushData.swift b/entourage/Models/NotificationPushData.swift
@@ -14,15 +14,13 @@ struct NotificationPushData {
     var postId:Int? = nil
     var welcome: Bool? = false
     //value = h1, j2, j8, j11
-    var stage: String? = nil
     var url: String? = nil
+    var stage:String? = nil
 
-
-    init(instanceName:String, instanceId:Int, postId:Int?, stage:String?) {
+    init(instanceName:String, instanceId:Int, postId:Int?) {
         self.instanceType = InstanceType.getFromString(key: instanceName)
         self.instanceId = instanceId
         self.postId = postId
-        self.stage = stage
     }
 }