Fix sync database name issue

rros · Jul 8, 2024 · d007fbf · d007fbf
1 parent 952ce8c
commit d007fbf
Show file tree

Hide file tree

Showing 7 changed files with 23 additions and 9 deletions.
diff --git a/desktopApp/build.gradle.kts b/desktopApp/build.gradle.kts
@@ -141,6 +141,7 @@ val macExtraPlistKeys: String
           <string>de</string>
           <string>sk</string>
           <string>pt-BR</string>
+          <string>es</string>
         </array>
     """.trimIndent()
 

diff --git a/...atabase/src/jvmMain/kotlin/com/prof18/feedflow/feedsync/database/DatabaseDriverFactory.kt b/...atabase/src/jvmMain/kotlin/com/prof18/feedflow/feedsync/database/DatabaseDriverFactory.kt
@@ -17,7 +17,12 @@ internal fun createDatabaseDriver(
 ): SqlDriver {
     val appPath = AppDataPathBuilder.getAppDataPath(appEnvironment)
 
-    val databasePath = File(appPath, "/${SyncedDatabaseHelper.SYNC_DATABASE_NAME_PROD}.db")
+    val databaseName = if (appEnvironment.isDebug()) {
+        SyncedDatabaseHelper.SYNC_DATABASE_NAME_DEBUG
+    } else {
+        SyncedDatabaseHelper.SYNC_DATABASE_NAME_PROD
+    }
+    val databasePath = File(appPath, "/$databaseName.db")
 
     val driver = JdbcSqliteDriver(JdbcSqliteDriver.IN_MEMORY + databasePath.absolutePath, Properties())
 

diff --git a/i18n/src/commonMain/kotlin/com/prof18/feedflow/i18n/Locales.kt b/i18n/src/commonMain/kotlin/com/prof18/feedflow/i18n/Locales.kt
@@ -16,4 +16,4 @@ expect fun String.format(vararg args: Any): String
 
 @Suppress("UnusedPrivateProperty")
 // This is a trick to be sure that KSP re-generates the strings when there's no code updates
-private const val StringsVersion = 33
+private const val StringsVersion = 34
diff --git a/iosApp/FeedFlow.xcodeproj/project.pbxproj b/iosApp/FeedFlow.xcodeproj/project.pbxproj
@@ -583,6 +583,7 @@
 				sk,
 				Base,
 				"pt-BR",
+				es,
 			);
 			mainGroup = 7555FF72242A565900829871;
 			packageReferences = (

diff --git a/...rc/androidMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncAndroidWorker.kt b/...rc/androidMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncAndroidWorker.kt
@@ -9,6 +9,7 @@ import co.touchlab.kermit.Logger
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.core.utils.DispatcherProvider
 import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper.Companion.SYNC_DATABASE_NAME_DEBUG
+import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper.Companion.SYNC_DATABASE_NAME_PROD
 import com.prof18.feedflow.feedsync.dropbox.DropboxDataSource
 import com.prof18.feedflow.feedsync.dropbox.DropboxDownloadParam
 import com.prof18.feedflow.feedsync.dropbox.DropboxSettings
@@ -149,19 +150,19 @@ internal class FeedSyncAndroidWorker(
         return if (appEnvironment.isDebug()) {
             SYNC_DATABASE_NAME_DEBUG
         } else {
-            SYNC_DATABASE_NAME_DEBUG
+            SYNC_DATABASE_NAME_PROD
         }
     }
 
     private suspend fun restoreDropboxClient() {
         if (!dropboxDataSource.isClientSet()) {
             val stringCredentials = dropboxSettings.getDropboxData()
-            if (stringCredentials != null) {
+            if (!stringCredentials.isNullOrEmpty()) {
                 dropboxDataSource.restoreAuth(DropboxStringCredentials(stringCredentials))
             }
 
             if (!dropboxDataSource.isClientSet()) {
-                logger.d { "Dropbox client is null" }
+                logger.e { "Dropbox client is null" }
                 emitErrorMessage()
             }
         }

diff --git a/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncIosWorker.kt b/shared/src/iosMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncIosWorker.kt
@@ -4,6 +4,7 @@ import co.touchlab.kermit.Logger
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.core.utils.DispatcherProvider
 import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper.Companion.SYNC_DATABASE_NAME_DEBUG
+import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper.Companion.SYNC_DATABASE_NAME_PROD
 import com.prof18.feedflow.feedsync.dropbox.DropboxDataSource
 import com.prof18.feedflow.feedsync.dropbox.DropboxDownloadParam
 import com.prof18.feedflow.feedsync.dropbox.DropboxSettings
@@ -159,7 +160,7 @@ internal class FeedSyncIosWorker(
         return if (appEnvironment.isDebug()) {
             SYNC_DATABASE_NAME_DEBUG
         } else {
-            SYNC_DATABASE_NAME_DEBUG
+            SYNC_DATABASE_NAME_PROD
         }
     }
 

diff --git a/shared/src/jvmMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncJvmWorker.kt b/shared/src/jvmMain/kotlin/com/prof18/feedflow/shared/domain/feedsync/FeedSyncJvmWorker.kt
@@ -4,8 +4,8 @@ import co.touchlab.kermit.Logger
 import com.prof18.feedflow.core.utils.AppDataPathBuilder
 import com.prof18.feedflow.core.utils.AppEnvironment
 import com.prof18.feedflow.core.utils.DispatcherProvider
-import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper
 import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper.Companion.SYNC_DATABASE_NAME_DEBUG
+import com.prof18.feedflow.feedsync.database.data.SyncedDatabaseHelper.Companion.SYNC_DATABASE_NAME_PROD
 import com.prof18.feedflow.feedsync.dropbox.DropboxDataSource
 import com.prof18.feedflow.feedsync.dropbox.DropboxDownloadParam
 import com.prof18.feedflow.feedsync.dropbox.DropboxSettings
@@ -36,7 +36,12 @@ internal class FeedSyncJvmWorker(
     private val scope = CoroutineScope(SupervisorJob() + Dispatchers.IO)
 
     private val appPath = AppDataPathBuilder.getAppDataPath(appEnvironment)
-    private val databaseFile = File(appPath, "/${SyncedDatabaseHelper.SYNC_DATABASE_NAME_PROD}.db")
+    private val databaseName = if (appEnvironment.isDebug()) {
+        SYNC_DATABASE_NAME_DEBUG
+    } else {
+        SYNC_DATABASE_NAME_PROD
+    }
+    private val databaseFile = File(appPath, "/$databaseName.db")
 
     override suspend fun uploadImmediate() {
         logger.d { "Start Immediate upload" }
@@ -136,7 +141,7 @@ internal class FeedSyncJvmWorker(
         return if (appEnvironment.isDebug()) {
             SYNC_DATABASE_NAME_DEBUG
         } else {
-            SYNC_DATABASE_NAME_DEBUG
+            SYNC_DATABASE_NAME_PROD
         }
     }