Reset bookmarks sync timestamp after migrating to FFS favorites

DuckDuckGo/AppDelegate/AppDelegate.swift

@@ -316,6 +316,9 @@ final class AppDelegate: NSObject, NSApplicationDelegate, FileDownloadManagerDel
         let environment = defaultEnvironment
 #endif
         let syncDataProviders = SyncDataProviders(bookmarksDatabase: BookmarkDatabase.shared.db)
+        if bookmarksManager.didMigrateToFormFactorSpecificFavorites {
+            syncDataProviders.bookmarksAdapter.shouldResetBookmarksSyncTimestamp = true
+        }
         let syncService = DDGSync(dataProvidersSource: syncDataProviders, errorEvents: SyncErrorHandler(), log: OSLog.sync, environment: environment)
         syncService.initializeIfNeeded()
         syncDataProviders.setUpDatabaseCleaners(syncService: syncService)

DuckDuckGo/Bookmarks/Model/BookmarkManager.swift

@@ -46,6 +46,7 @@ protocol BookmarkManager: AnyObject {
     func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarkImportResult
 
     func handleFavoritesAfterDisablingSync()
+    var didMigrateToFormFactorSpecificFavorites: Bool { get }
 
     // Wrapper definition in a protocol is not supported yet
     var listPublisher: Published<BookmarkList?>.Publisher { get }
@@ -81,6 +82,10 @@ final class LocalBookmarkManager: BookmarkManager {
     @Published private(set) var list: BookmarkList?
     var listPublisher: Published<BookmarkList?>.Publisher { $list }
 
+    var didMigrateToFormFactorSpecificFavorites: Bool {
+        bookmarkStore.didMigrateToFormFactorSpecificFavorites
+    }
+
     private lazy var bookmarkStore: BookmarkStore = LocalBookmarkStore(bookmarkDatabase: BookmarkDatabase.shared)
     private lazy var faviconManagement: FaviconManagement = FaviconManager.shared
 

DuckDuckGo/Bookmarks/Services/BookmarkStore.swift

@@ -60,4 +60,5 @@ protocol BookmarkStore {
     func importBookmarks(_ bookmarks: ImportedBookmarks, source: BookmarkImportSource) -> BookmarkImportResult
 
     func handleFavoritesAfterDisablingSync()
+    var didMigrateToFormFactorSpecificFavorites: Bool { get }
 }

DuckDuckGo/Bookmarks/Services/LocalBookmarkStore.swift

@@ -59,6 +59,7 @@ final class LocalBookmarkStore: BookmarkStore {
     }
 
     private(set) var favoritesDisplayMode: FavoritesDisplayMode
+    private(set) var didMigrateToFormFactorSpecificFavorites: Bool = false
 
     private let contextProvider: () -> NSManagedObjectContext
 
@@ -214,6 +215,7 @@ final class LocalBookmarkStore: BookmarkStore {
 
                 if context.hasChanges {
                     try context.save(onErrorFire: .bookmarksMigrationCouldNotPrepareMultipleFavoriteFolders)
+                    didMigrateToFormFactorSpecificFavorites = true
                 }
             } catch {
                 Thread.sleep(forTimeInterval: 1)

DuckDuckGo/Sync/SyncBookmarksAdapter.swift

@@ -27,6 +27,11 @@ final class SyncBookmarksAdapter {
 
     private(set) var provider: BookmarksProvider?
     let databaseCleaner: BookmarkDatabaseCleaner
+    var shouldResetBookmarksSyncTimestamp: Bool = false {
+        willSet {
+            assert(provider == nil, "Setting this value has no effect after provider has been instantiated")
+        }
+    }
 
     init(
         database: CoreDataDatabase,
@@ -63,6 +68,9 @@ final class SyncBookmarksAdapter {
             metadataStore: metadataStore,
             syncDidUpdateData: LocalBookmarkManager.shared.loadBookmarks
         )
+        if shouldResetBookmarksSyncTimestamp {
+            provider.lastSyncTimestamp = nil
+        }
 
         syncErrorCancellable = provider.syncErrorPublisher
             .sink { error in

UnitTests/Bookmarks/Services/BookmarkStoreMock.swift

@@ -111,4 +111,5 @@ final class BookmarkStoreMock: BookmarkStore {
 
     func applyFavoritesDisplayMode(_ configuration: FavoritesDisplayMode) {}
     func handleFavoritesAfterDisablingSync() {}
+    var didMigrateToFormFactorSpecificFavorites: Bool = false
 }

UnitTests/HomePage/Mocks/MockBookmarkManager.swift

@@ -87,6 +87,8 @@ class MockBookmarkManager: BookmarkManager {
 
     func handleFavoritesAfterDisablingSync() {}
 
+    var didMigrateToFormFactorSpecificFavorites: Bool = false
+
     @Published var list: BookmarkList?
 
     var listPublisher: Published<BookmarkList?>.Publisher { $list }