Merge pull request #889 from Infomaniak/fix-activity-url

fix(UserActivityController): Create URL without Endpoint struct to prevent encode issues
Infomaniak · Jul 19, 2023 · d5ed5c8 · d5ed5c8
2 parents 8831e3e + 34e7c45
commit d5ed5c8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/MailCore/API/Endpoint.swift b/MailCore/API/Endpoint.swift
@@ -49,10 +49,6 @@ public extension Endpoint {
         return Endpoint(hostKeypath: \.mailHost, path: "/api")
     }
 
-    static func currentUserActivity(mailboxIndex: Int, folder: Folder) -> Endpoint {
-        return Endpoint(hostKeypath: \.mailHost, path: "/\(mailboxIndex);fid=\(folder.id)")
-    }
-
     static var mailboxes: Endpoint {
         return .base.appending(
             path: "/mailbox",

diff --git a/MailCore/Utils/UserActivityController.swift b/MailCore/Utils/UserActivityController.swift
@@ -36,7 +36,7 @@ public class UserActivityController {
 
         currentActivity?.invalidate()
         currentActivity = activity
-        currentActivity?.webpageURL = Endpoint.currentUserActivity(mailboxIndex: mailboxIndex, folder: folder).url
+        currentActivity?.webpageURL = URL(string: "https://\(ApiEnvironment.current.mailHost)/\(mailboxIndex);fid=\(folder.id)")
         currentActivity?.becomeCurrent()
     }