Fix database sync error

prof18 · Jul 11, 2024 · 870d8ef · 870d8ef
1 parent 1459a4e
commit 870d8ef
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 11 deletions.
diff --git a/.../src/commonMain/kotlin/com/prof18/feedflow/feedsync/database/data/SyncedDatabaseHelper.kt b/.../src/commonMain/kotlin/com/prof18/feedflow/feedsync/database/data/SyncedDatabaseHelper.kt
@@ -148,7 +148,7 @@ class SyncedDatabaseHelper(
     suspend fun insertFeedItems(feedItems: List<SyncedFeedItem>) =
         getDbRef().transactionWithContext(backgroundDispatcher) {
             feedItems.forEach { feedItem ->
-                getDbRef().syncedFeedItemQueries.insertOrReplaceSyncedFeedItem(
+                getDbRef().syncedFeedItemQueries.insertOrIgnoreSyncedFeedItem(
                     url_hash = feedItem.id,
                     is_read = feedItem.isRead,
                     is_bookmarked = feedItem.isBookmarked,
@@ -171,6 +171,11 @@ class SyncedDatabaseHelper(
 
     suspend fun setFeedItemAsRead(feedItemId: FeedItemId, isRead: Boolean) =
         getDbRef().transactionWithContext(backgroundDispatcher) {
+            getDbRef().syncedFeedItemQueries.insertOrIgnoreSyncedFeedItem(
+                url_hash = feedItemId.id,
+                is_read = isRead,
+                is_bookmarked = false,
+            )
             getDbRef().syncedFeedItemQueries.updateIsRead(
                 isRead = isRead,
                 urlHash = feedItemId.id,
@@ -180,6 +185,11 @@ class SyncedDatabaseHelper(
 
     suspend fun setFeedItemAsBookmarked(feedItemId: FeedItemId, isBookmarked: Boolean) =
         getDbRef().transactionWithContext(backgroundDispatcher) {
+            getDbRef().syncedFeedItemQueries.insertOrIgnoreSyncedFeedItem(
+                url_hash = feedItemId.id,
+                is_read = false,
+                is_bookmarked = isBookmarked,
+            )
             getDbRef().syncedFeedItemQueries.updateIsBookmarked(
                 isBookmarked = isBookmarked,
                 urlHash = feedItemId.id,

diff --git a/...base/src/commonMain/sqldelight/com/prof18/feedflow/feedsync/database/db/SyncedFeedItem.sq b/...base/src/commonMain/sqldelight/com/prof18/feedflow/feedsync/database/db/SyncedFeedItem.sq
@@ -6,8 +6,8 @@ CREATE TABLE synced_feed_item(
     is_bookmarked INTEGER AS Boolean NOT NULL DEFAULT 0
 );
 
-insertOrReplaceSyncedFeedItem:
-INSERT OR REPLACE INTO synced_feed_item(url_hash, is_read, is_bookmarked)
+insertOrIgnoreSyncedFeedItem:
+INSERT OR IGNORE INTO synced_feed_item(url_hash, is_read, is_bookmarked)
 VALUES (?, ?,?);
 
 deleteSyncedFeedItem:

diff --git a/...base/src/commonMain/sqldelight/com/prof18/feedflow/feedsync/database/db/SyncedMetadata.sq b/...base/src/commonMain/sqldelight/com/prof18/feedflow/feedsync/database/db/SyncedMetadata.sq
@@ -19,7 +19,7 @@ WITH table_counts AS (
 )
 SELECT
     CASE
-        WHEN item_count = 0 AND source_count = 0 AND category_count = 0 THEN 0
+        WHEN item_count = 0 OR source_count = 0 OR category_count = 0 THEN 0
         ELSE 1
     END AS is_database_empty
 FROM table_counts;
diff --git a/iosApp/Source/Accounts/Dropbox/Data/DropboxDataSourceIos.swift b/iosApp/Source/Accounts/Dropbox/Data/DropboxDataSourceIos.swift
@@ -70,6 +70,7 @@ class DropboxDataSourceIos: DropboxDataSource {
 
                     } else if let error = error {
                         print(error)
+                        KotlinDependencies.shared.getLogger(tag: "DropboxDataSourceIos").e(messageString: error.localizedDescription)
                         completionHandler(nil, DropboxErrors.downloadError(reason: error.description))
                     }
                 }
@@ -101,6 +102,7 @@ class DropboxDataSourceIos: DropboxDataSource {
                     completionHandler(uploadResult, nil)
                 } else if let error = error {
                     print(error)
+                    KotlinDependencies.shared.getLogger(tag: "DropboxDataSourceIos").e(messageString: error.localizedDescription)
                     completionHandler(nil, DropboxErrors.uploadError(reason: error.description))
                 }
             }

diff --git a/iosApp/Source/Accounts/Dropbox/DropboxSyncScreenContent.swift b/iosApp/Source/Accounts/Dropbox/DropboxSyncScreenContent.swift
@@ -142,7 +142,7 @@ struct DropboxSyncScreenContent: View {
         VStack {
             Form {
                 Section {
-                    VStack {
+                    VStack(alignment: .leading) {
                         Text(feedFlowStrings.dropboxSyncCommonDescription)
                             .font(.body)
 
@@ -165,6 +165,16 @@ struct DropboxSyncScreenContent: View {
     }
 }
 
+#Preview("Unlinked") {
+    DropboxSyncScreenContent(
+        connectionState: DropboxConnectionUiState.Unlinked(),
+        onDropboxAuthSuccess: {},
+        onBackupClick: {},
+        onDisconnectClick: {}
+    )
+}
+
+
 #Preview("Loading") {
     DropboxSyncScreenContent(
         connectionState: DropboxConnectionUiState.Linked(syncState: DropboxSyncUIState.Loading()),

diff --git a/iosApp/Source/Settings/ImportExport/ImportExportScreenContent.swift b/iosApp/Source/Settings/ImportExport/ImportExportScreenContent.swift
@@ -124,7 +124,7 @@ struct ImportExportContent: View {
             .padding(.horizontal, Spacing.medium)
 
             Spacer()
-        }
+        }.frame(maxWidth: .infinity)
     }
 
     @ViewBuilder
@@ -138,6 +138,7 @@ struct ImportExportContent: View {
                 .multilineTextAlignment(.center)
             Spacer()
         }
+        .frame(maxWidth: .infinity)
     }
 
     @ViewBuilder

diff --git a/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncer.kt b/shared/src/commonMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncer.kt
@@ -14,11 +14,6 @@ internal class FeedSyncer(
     private val appDatabaseHelper: DatabaseHelper,
     private val logger: Logger,
 ) {
-    suspend fun performSync() {
-        syncFeedSourceCategory()
-        syncFeedSource()
-        syncFeedItem()
-    }
 
     suspend fun populateSyncDbIfEmpty() {
         if (syncedDatabaseHelper.isDatabaseEmpty()) {