fix fall back issues

HabitRPG · Jun 10, 2024 · 18c106f · 18c106f
1 parent 2505bcf
commit 18c106f
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 6 deletions.
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.kt
@@ -247,7 +247,7 @@ abstract class HabiticaBaseApplication : Application(), Application.ActivityLife
         val remoteConfig = FirebaseRemoteConfig.getInstance()
         val configSettings =
             FirebaseRemoteConfigSettings.Builder()
-                .setMinimumFetchIntervalInSeconds(if (BuildConfig.DEBUG) 0 else 3600)
+                .setMinimumFetchIntervalInSeconds(if (BuildConfig.DEBUG) 0 else 1800)
                 .build()
         remoteConfig.setConfigSettingsAsync(configSettings)
         remoteConfig.setDefaultsAsync(R.xml.remote_config_defaults)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
@@ -190,7 +190,6 @@ class AppConfigManager(contentRepository: ContentRepository) :
     }
 
     fun enableCustomizationShop(): Boolean {
-        if (BuildConfig.DEBUG) return true
         return remoteConfig.getBoolean("enableCustomizationShop")
     }
 }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/shops/PurchaseDialog.kt
@@ -23,6 +23,7 @@ import com.habitrpg.android.habitica.extensions.addCancelButton
 import com.habitrpg.android.habitica.extensions.addCloseButton
 import com.habitrpg.android.habitica.extensions.getShortRemainingString
 import com.habitrpg.android.habitica.helpers.Analytics
+import com.habitrpg.android.habitica.helpers.AppConfigManager
 import com.habitrpg.android.habitica.helpers.EventCategory
 import com.habitrpg.android.habitica.helpers.HapticFeedbackManager
 import com.habitrpg.android.habitica.helpers.HitType
@@ -74,6 +75,7 @@ class PurchaseDialog(
     private val inventoryRepository: InventoryRepository
     private val userRepository: UserRepository
     private val soundManager: SoundManager
+    private val configManager: AppConfigManager
 
     private val customHeader: View by lazy {
         DialogPurchaseShopitemHeaderBinding.inflate(context.layoutInflater).root
@@ -176,21 +178,23 @@ class PurchaseDialog(
 
     @EntryPoint
     @InstallIn(SingletonComponent::class)
-    interface InsufficientGemsDialogEntryPoint {
+    interface PurchaseDialogEntryPoint {
         fun inventoryRepository(): InventoryRepository
         fun userRepository(): UserRepository
         fun soundManager(): SoundManager
+        fun configManager(): AppConfigManager
     }
 
     init {
         val hiltEntryPoint =
             EntryPointAccessors.fromApplication(
                 context,
-                InsufficientGemsDialogEntryPoint::class.java,
+                PurchaseDialogEntryPoint::class.java,
             )
         inventoryRepository = hiltEntryPoint.inventoryRepository()
         userRepository = hiltEntryPoint.userRepository()
         soundManager = hiltEntryPoint.soundManager()
+        configManager = hiltEntryPoint.configManager()
 
         findSnackBarActivity(context)?.let {
             (it as? Activity)?.let { activity -> setOwnerActivity(activity) }
@@ -455,7 +459,11 @@ class PurchaseDialog(
         } else if (shopItem.purchaseType == "background" || shopItem.purchaseType == "backgrounds") {
             observable = { userRepository.unlockPath(item.unlockPath ?: "${item.pinType}.${item.key}", item.value) }
         } else if (shopItem.purchaseType == "customization" || shopItem.purchaseType == "customizationSet") {
-            observable = { userRepository.unlockPath(item.path ?: item.unlockPath ?: "${item.pinType}.${item.key}", item.value) }
+            if (configManager.enableCustomizationShop()) {
+                observable = { userRepository.unlockPath(item.path ?: item.unlockPath ?: "${item.pinType}.${item.key}", item.value) }
+            } else {
+                observable = { userRepository.unlockPath(item.unlockPath ?: "${item.pinType}.${item.key}", item.value) }
+            }
         } else if (shopItem.purchaseType == "debuffPotion") {
             observable = { userRepository.useSkill(shopItem.key, null) }
         } else if (shopItem.purchaseType == "card") {

diff --git a/version.properties b/version.properties
@@ -1,2 +1,2 @@
 NAME=4.4
-CODE=7931
+CODE=7920