Download database when connecting iCloud

prof18 · Jul 29, 2024 · a7c26b8 · a7c26b8
1 parent 3cfd3fd
commit a7c26b8
Show file tree

Hide file tree

Showing 4 changed files with 50 additions and 46 deletions.
diff --git a/iosApp/FeedFlow.xcodeproj/project.pbxproj b/iosApp/FeedFlow.xcodeproj/project.pbxproj
@@ -977,7 +977,7 @@
 					shared,
 					"-lsqlite3",
 				);
-				PRODUCT_BUNDLE_IDENTIFIER = com.prof18.feedflow.debug;
+				PRODUCT_BUNDLE_IDENTIFIER = com.prof18.feedflow.dev;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
 				SUPPORTS_MACCATALYST = NO;

diff --git a/iosApp/Info.plist b/iosApp/Info.plist
@@ -27,8 +27,21 @@
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
 	<string>VERSION_NAME</string>
+	<key>CFBundleURLTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleURLName</key>
+			<string></string>
+			<key>CFBundleURLSchemes</key>
+			<array>
+				<string>$(DROPBOX_URL_SCHEME)</string>
+			</array>
+		</dict>
+	</array>
 	<key>CFBundleVersion</key>
 	<string>VERSION_CODE</string>
+	<key>DropboxApiKey</key>
+	<string>$(DROPBOX_API_KEY)</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<false/>
 	<key>LSApplicationQueriesSchemes</key>
@@ -39,8 +52,8 @@
 		<string>brave</string>
 		<string>googlechromes</string>
 		<string>firefox-focus</string>
-        <string>dbapi-8-emm</string>
-        <string>dbapi-2</string>
+		<string>dbapi-8-emm</string>
+		<string>dbapi-2</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
@@ -49,6 +62,18 @@
 		<key>NSAllowsArbitraryLoads</key>
 		<true/>
 	</dict>
+	<key>NSUbiquitousContainers</key>
+	<dict>
+		<key>iCloud.com.prof18.feedflow</key>
+		<dict>
+			<key>NSUbiquitousContainerIsDocumentScopePublic</key>
+			<true/>
+			<key>NSUbiquitousContainerName</key>
+			<string>FeedFlow</string>
+			<key>NSUbiquitousContainerSupportedFolderLevels</key>
+			<string>Any</string>
+		</dict>
+	</dict>
 	<key>UIApplicationSceneManifest</key>
 	<dict>
 		<key>UIApplicationSupportsMultipleScenes</key>
@@ -73,30 +98,5 @@
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
 	</array>
-    <key>CFBundleURLTypes</key>
-    <array>
-        <dict>
-            <key>CFBundleURLSchemes</key>
-            <array>
-                <string>$(DROPBOX_URL_SCHEME)</string>
-            </array>
-            <key>CFBundleURLName</key>
-            <string></string>
-        </dict>
-    </array>
-    <key>DropboxApiKey</key>
-    <string>$(DROPBOX_API_KEY)</string>
-    <key>NSUbiquitousContainers</key>
-      <dict>
-          <key>iCloud.com.prof18.feedflow</key>
-          <dict>
-              <key>NSUbiquitousContainerIsDocumentScopePublic</key>
-              <true/>
-              <key>NSUbiquitousContainerName</key>
-              <string>FeedFlow</string>
-              <key>NSUbiquitousContainerSupportedFolderLevels</key>
-              <string>Any</string>
-          </dict>
-      </dict>
 </dict>
 </plist>
diff --git a/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/di/KoinIOS.kt b/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/di/KoinIOS.kt
@@ -126,6 +126,7 @@ internal actual fun getPlatformModule(appEnvironment: AppEnvironment): Module =
             accountsRepository = get(),
             feedSyncMessageQueue = get(),
             feedSyncRepository = get(),
+            feedRetrieverRepository = get(),
         )
     }
 }

diff --git a/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/presentation/ICloudSyncViewModel.kt b/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/presentation/ICloudSyncViewModel.kt
@@ -4,6 +4,7 @@ import com.prof18.feedflow.core.model.AccountConnectionUiState
 import com.prof18.feedflow.core.model.AccountSyncUIState
 import com.prof18.feedflow.feedsync.icloud.ICloudSettings
 import com.prof18.feedflow.shared.domain.DateFormatter
+import com.prof18.feedflow.shared.domain.feed.retriever.FeedRetrieverRepository
 import com.prof18.feedflow.shared.domain.feedsync.AccountsRepository
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncMessageQueue
 import com.prof18.feedflow.shared.domain.feedsync.FeedSyncRepository
@@ -20,6 +21,7 @@ class ICloudSyncViewModel internal constructor(
     private val dateFormatter: DateFormatter,
     private val accountsRepository: AccountsRepository,
     private val feedSyncRepository: FeedSyncRepository,
+    private val feedRetrieverRepository: FeedRetrieverRepository,
     feedSyncMessageQueue: FeedSyncMessageQueue,
 ) : BaseViewModel() {
 
@@ -38,20 +40,20 @@ class ICloudSyncViewModel internal constructor(
     }
 
     fun setICloudAuth() {
-        iCloudSettings.setUseICloud(true)
-        accountsRepository.setICloudAccount()
-        iCloudSyncUiMutableState.update {
-            AccountConnectionUiState.Linked(
-                syncState = getSyncState(),
-            )
+        scope.launch {
+            iCloudSettings.setUseICloud(true)
+            accountsRepository.setICloudAccount()
+            iCloudSyncUiMutableState.update {
+                AccountConnectionUiState.Linked(
+                    syncState = getSyncState(),
+                )
+            }
+            emitSyncLoading()
+            accountsRepository.setICloudAccount()
+            feedSyncRepository.firstSync()
+            feedRetrieverRepository.fetchFeeds()
+            emitLastSyncUpdate()
         }
-        /*
-        emitSyncLoading()
-                accountsRepository.setDropboxAccount()
-                feedSyncRepository.firstSync()
-                feedRetrieverRepository.fetchFeeds()
-                emitLastSyncUpdate()
-         */
     }
 
     fun triggerBackup() {
@@ -63,11 +65,12 @@ class ICloudSyncViewModel internal constructor(
     }
 
     fun unlink() {
-        iCloudSettings.setUseICloud(false)
-//        feedSyncRepository.deleteAll()
-        accountsRepository.clearAccount()
-        iCloudSyncUiMutableState.update {
-            AccountConnectionUiState.Unlinked
+        scope.launch {
+            iCloudSyncUiMutableState.update { AccountConnectionUiState.Loading }
+            iCloudSettings.setUseICloud(false)
+            feedSyncRepository.deleteAll()
+            accountsRepository.clearAccount()
+            iCloudSyncUiMutableState.update { AccountConnectionUiState.Unlinked }
         }
     }