From 60f3c7ce067c19251926f9a7a427f278a03b52c3 Mon Sep 17 00:00:00 2001 From: Aayush Gupta Date: Sun, 2 Jun 2024 14:56:39 +0530 Subject: [PATCH] AuthViewModel: Fix issue with google play version code being -1 * Migrate existing users to default version code if they have -1 set * Also add issue IDs infront of migrations if available Signed-off-by: Aayush Gupta --- .../com/aurora/store/data/receiver/MigrationReceiver.kt | 8 ++++++-- .../java/com/aurora/store/viewmodel/auth/AuthViewModel.kt | 5 ++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/com/aurora/store/data/receiver/MigrationReceiver.kt b/app/src/main/java/com/aurora/store/data/receiver/MigrationReceiver.kt index d68927f5a..d5265ab08 100644 --- a/app/src/main/java/com/aurora/store/data/receiver/MigrationReceiver.kt +++ b/app/src/main/java/com/aurora/store/data/receiver/MigrationReceiver.kt @@ -12,6 +12,7 @@ import com.aurora.store.util.Preferences.PREFERENCE_DISPENSER_URLS import com.aurora.store.util.Preferences.PREFERENCE_INTRO import com.aurora.store.util.Preferences.PREFERENCE_MIGRATION_VERSION import com.aurora.store.util.Preferences.PREFERENCE_THEME_ACCENT +import com.aurora.store.util.Preferences.PREFERENCE_VENDING_VERSION import com.aurora.store.util.save import dagger.hilt.android.AndroidEntryPoint @@ -43,9 +44,12 @@ class MigrationReceiver: BroadcastReceiver() { // 58 -> 59 if (currentVersion == 0) { - CacheWorker.scheduleAutomatedCacheCleanup(context) + CacheWorker.scheduleAutomatedCacheCleanup(context) // !1089 if (isSAndAbove()) context.save(PREFERENCE_THEME_ACCENT, 0) - context.save(PREFERENCE_DISPENSER_URLS, setOf(Constants.URL_DISPENSER)) + context.save(PREFERENCE_DISPENSER_URLS, setOf(Constants.URL_DISPENSER)) // !1117 + if (Preferences.getInteger(context, PREFERENCE_VENDING_VERSION) == -1) { + context.save(PREFERENCE_VENDING_VERSION, 0) // !1049 + } currentVersion++ } diff --git a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt index f441408ac..e93d420e4 100644 --- a/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt +++ b/app/src/main/java/com/aurora/store/viewmodel/auth/AuthViewModel.kt @@ -290,9 +290,8 @@ class AuthViewModel @Inject constructor( authData.locale = Locale.getDefault() } - val versionId = - Preferences.getInteger(context, Preferences.PREFERENCE_VENDING_VERSION) - if (versionId != 0) { + val versionId = Preferences.getInteger(context, Preferences.PREFERENCE_VENDING_VERSION) + if (versionId > 0) { val resources = context.resources authData.deviceInfoProvider?.properties?.let {