resolve error after main build success

opensrp · Feb 19, 2024 · 561dca2 · 561dca2
1 parent 9fe6a7e
commit 561dca2
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 7 deletions.
diff --git a/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt b/android/engine/src/main/java/org/smartregister/fhircore/engine/util/SharedPreferenceKey.kt
@@ -32,4 +32,5 @@ enum class SharedPreferenceKey {
   USER_INFO,
   CARE_TEAM,
   ORGANIZATION,
+  DATA_MIGRATION
 }
diff --git a/android/engine/src/main/res/values-fr/strings.xml b/android/engine/src/main/res/values-fr/strings.xml
@@ -11,7 +11,7 @@
     <string name="app_logo">Logo de l’application</string>
     <string name="powered_by">Alimenté par</string>
     <string name="app_version">Version de l\'application %1$d (%2$s)</string>
-    <string name="data_migration_version">migration de données %1$d</string>
+    <string name="data_migration_version">migration de données %1$s</string>
     <string name="last_sync">Dernière synchronisation %1$s</string>
     <string name="login_text">Connexion</string>
     <string name="login_call_fail_error_message">Impossible de vérifier les informations d’identification à partir du serveur. Vérifiez votre connexion Internet</string>

diff --git a/android/engine/src/main/res/values-sw/strings.xml b/android/engine/src/main/res/values-sw/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_version">Toleo %1$d(%2$s)</string>
-    <string name="data_migration_version">uhamiaji wa data %1$d</string>
+    <string name="data_migration_version">uhamiaji wa data %1$s</string>
     <string name="last_sync">Usawazishaji wa mwisho %1$s</string>
     <string name="language">Lugha</string>
     <string name="empty_client_list_message_title">Hakuna Matokeo</string>

diff --git a/android/engine/src/main/res/values/strings.xml b/android/engine/src/main/res/values/strings.xml
@@ -12,7 +12,7 @@
     <string name="app_logo">Application logo</string>
     <string name="powered_by">Powered By</string>
     <string name="app_version">App version %1$d(%2$s)</string>
-    <string name="data_migration_version">Migration Version %1$d</string>
+    <string name="data_migration_version">Migration Version %1$s</string>
     <string name="last_sync">Last sync %1$s</string>
     <string name="login_text">LOGIN</string>
     <string name="login_call_fail_error_message">Failed to verify credentials from the server. Check your internet connection</string>

diff --git a/android/quest/src/main/java/org/smartregister/fhircore/quest/data/DataMigration.kt b/android/quest/src/main/java/org/smartregister/fhircore/quest/data/DataMigration.kt
@@ -40,6 +40,7 @@ import org.smartregister.fhircore.engine.domain.model.RepositoryResourceData
 import org.smartregister.fhircore.engine.domain.model.RuleConfig
 import org.smartregister.fhircore.engine.rulesengine.ResourceDataRulesExecutor
 import org.smartregister.fhircore.engine.util.DispatcherProvider
+import org.smartregister.fhircore.engine.util.SharedPreferenceKey
 import org.smartregister.fhircore.engine.util.extension.encodeResourceToString
 import org.smartregister.fhircore.engine.util.extension.filterByFhirPathExpression
 import org.smartregister.fhircore.engine.util.extension.showToast
@@ -148,6 +149,7 @@ constructor(
         ),
       )
     }
+    defaultRepository.sharedPreferencesHelper.write(SharedPreferenceKey.DATA_MIGRATION.name, previousVersion)
     val maxVersion = migrationConfigs?.maxOfOrNull { it.version } ?: previousVersion
     migrationConfigs?.forEach { migrationConfig ->
       try {
@@ -220,6 +222,7 @@ constructor(
       }
     }
     preferenceDataStore.write(PreferenceDataStore.MIGRATION_VERSION, maxVersion)
+    defaultRepository.sharedPreferencesHelper.write(SharedPreferenceKey.DATA_MIGRATION.name, maxVersion)
     withContext(dispatcherProvider.main()) {
       context.showToast(
         context.getString(

diff --git a/.../quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingScreen.kt b/.../quest/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingScreen.kt
@@ -123,7 +123,7 @@ fun UserSettingScreen(
   mainNavController: NavController,
   appVersionPair: Pair<Int, String>? = null,
   allowP2PSync: Boolean,
-  dataMigrationVersion: Int,
+  dataMigrationVersion: String,
   lastSyncTime: String?,
   showProgressIndicatorFlow: MutableStateFlow<Boolean>,
 ) {
@@ -502,7 +502,7 @@ fun UserSettingPreview() {
     mainNavController = rememberNavController(),
     appVersionPair = Pair(1, "1.0.1"),
     allowP2PSync = true,
-    dataMigrationVersion = 0,
+    dataMigrationVersion = "0",
     lastSyncTime = "05:30 PM, Mar 3",
     showProgressIndicatorFlow = MutableStateFlow(false),
   )

diff --git a/...est/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingViewModel.kt b/...est/src/main/java/org/smartregister/fhircore/quest/ui/usersetting/UserSettingViewModel.kt
@@ -101,8 +101,8 @@ constructor(
 
   fun retrieveCareTeam() = sharedPreferencesHelper.read(SharedPreferenceKey.CARE_TEAM.name, null)
 
-  fun retrieveDataMigrationVersion(): Int =
-    sharedPreferencesHelper.read(SharedPreferenceKey.MIGRATION_VERSION.name, "0")!!.toInt()
+  fun retrieveDataMigrationVersion(): String =
+    sharedPreferencesHelper.read(SharedPreferenceKey.DATA_MIGRATION.name, "0").toString()
 
   fun retrieveLastSyncTimestamp(): String? =
     sharedPreferencesHelper.read(SharedPreferenceKey.LAST_SYNC_TIMESTAMP.name, null)