feat: Force sync if not done yet

Mail/Views/SplitView.swift

@@ -27,6 +27,7 @@ import MailCoreUI
 import MailResources
 import MyKSuite
 import NavigationBackport
+import OSLog
 import RealmSwift
 import SwiftModalPresentation
 import SwiftUI
@@ -134,7 +135,11 @@ struct SplitView: View {
         }
         .discoveryPresenter(isPresented: $mainViewState.isShowingSyncDiscovery) {
             DiscoveryView(item: .syncDiscovery) {
-                UserDefaults.shared.shouldPresentSyncDiscovery = false
+                guard UserDefaults.shared.showSyncCounter < 3 else {
+                    UserDefaults.shared.shouldPresentSyncDiscovery = false
+                    return
+                }
+                UserDefaults.shared.nextShowSync = appLaunchCounter.value + Constants.nextOpeningBeforeSync
             } completionHandler: { willSync in
                 guard willSync else { return }
                 if willSync {
@@ -250,7 +255,7 @@ struct SplitView: View {
                 try await mailboxManager.refreshAllSignatures()
             }
             guard !platformDetector.isDebug else { return }
-            mainViewState.isShowingSyncDiscovery = platformDetector.isMac ? false : shouldShowSync()
+            mainViewState.isShowingSyncDiscovery = platformDetector.isMac ? false : await shouldShowSync()
         }
     }
 
@@ -296,17 +301,31 @@ struct SplitView: View {
         }
     }
 
-    private func shouldShowSync() -> Bool {
+    private func shouldShowSync() async -> Bool {
+        guard UserDefaults.shared.shouldPresentSyncDiscovery else { return false }
+
         guard !mainViewState.isShowingUpdateAvailable else {
             // We don't want to show both DiscoveryView at the same time
             return false
         }
-        guard UserDefaults.shared.shouldPresentSyncDiscovery,
-              !appLaunchCounter.isFirstLaunch else {
+
+        guard UserDefaults.shared.nextShowSync <= appLaunchCounter.value else {
             return false
         }
 
-        return appLaunchCounter.value > Constants.minimumOpeningBeforeSync
+        do {
+            let syncDate = try await mailboxManager.apiFetcher.lastSyncDate()
+            if syncDate == nil {
+                UserDefaults.shared.nextShowSync = appLaunchCounter.value + Constants.nextOpeningBeforeSync
+                UserDefaults.shared.showSyncCounter += 1
+                return true
+            } else {
+                UserDefaults.shared.shouldPresentSyncDiscovery = false
+            }
+        } catch {
+            Logger.general.error("Error while fetching last sync date: \(error)")
+        }
+        return false
     }
 
     private func handleOpenUrl(_ url: URL) {

Mail/Views/Sync Profile/SyncInstallProfileTutorialView.swift

@@ -138,9 +138,6 @@ struct SyncInstallProfileTutorialView: View {
                 }
             }
         }
-        .onAppear {
-            UserDefaults.shared.shouldPresentSyncDiscovery = false
-        }
     }
 }
 

MailCore/API/Endpoint.swift

@@ -25,6 +25,10 @@ public extension ApiEnvironment {
     var mailHost: String {
         return "mail.\(host)"
     }
+
+    var calendarHost: String {
+        return "calendar.\(host)"
+    }
 }
 
 // MARK: - Endpoints
@@ -297,4 +301,12 @@ public extension Endpoint {
     static func share(messageResource: String) -> Endpoint {
         return .resource(messageResource).appending(path: "/share")
     }
+
+    static func lastSyncDate() -> Endpoint {
+        return Endpoint(
+            hostKeypath: \.calendarHost,
+            path: "/api/sync-connection",
+            queryItems: [URLQueryItem(name: "os", value: "ios")]
+        )
+    }
 }

MailCore/API/MailApiFetcher/MailApiFetcher+Extended.swift

@@ -183,4 +183,8 @@ public extension MailApiFetcher {
             method: .delete
         ))
     }
+
+    func lastSyncDate() async throws -> String? {
+        return try await perform(request: authenticatedRequest(.lastSyncDate()))
+    }
 }

MailCore/Utils/Constants.swift

@@ -193,6 +193,7 @@ public enum Constants {
     ]
 
     public static let minimumOpeningBeforeSync = 2
+    public static let nextOpeningBeforeSync = 50
 
     /// A count limit for the Contact cache in Extension mode, where we have strong memory constraints.
     public static let contactCacheExtensionMaxCount = 50

MailCore/Utils/MailUserDefaults+Extension.swift

@@ -55,6 +55,8 @@ public extension UserDefaults.Keys {
     static let sentryAuthorized = UserDefaults.Keys(rawValue: "sentryAuthorized")
     static let lastScheduleInterval = UserDefaults.Keys(rawValue: "lastCustomSchedule")
     static let nextShowQuotasAlert = UserDefaults.Keys(rawValue: "nextShowQuotasAlert")
+    static let nextShowSync = UserDefaults.Keys(rawValue: "nextShowSync")
+    static let showSyncCounter = UserDefaults.Keys(rawValue: "showSyncCounter")
 }
 
 public extension UserDefaults {
@@ -326,4 +328,25 @@ public extension UserDefaults {
             set(newValue, forKey: key(.nextShowQuotasAlert))
         }
     }
+
+    var nextShowSync: Int {
+        get {
+            if object(forKey: key(.nextShowSync)) == nil {
+                set(Constants.minimumOpeningBeforeSync, forKey: key(.nextShowSync))
+            }
+            return integer(forKey: key(.nextShowSync))
+        }
+        set {
+            set(newValue, forKey: key(.nextShowSync))
+        }
+    }
+
+    var showSyncCounter: Int {
+        get {
+            return integer(forKey: key(.showSyncCounter))
+        }
+        set {
+            set(newValue, forKey: key(.showSyncCounter))
+        }
+    }
 }

Tuist/Package.resolved

@@ -41,8 +41,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Infomaniak/ios-core",
       "state" : {
-        "revision" : "ac5eb96798ebb687f814d681f66fb3d163e69d21",
-        "version" : "15.0.1"
+        "revision" : "17a022ee4c2342ebaa54bfae7509dd459df0b380",
+        "version" : "15.1.0"
       }
     },
     {
@@ -77,8 +77,8 @@
       "kind" : "remoteSourceControl",
       "location" : "https://github.com/Infomaniak/ios-features",
       "state" : {
-        "revision" : "697e75d70a5039cf8a86fef75b9e237b17e6cae4",
-        "version" : "1.0.5"
+        "revision" : "ecce060d82d76bc99c24678050a0ee04a996dbf5",
+        "version" : "1.0.6"
       }
     },
     {