From 5110cc276672386e12958feae3b54105e17f2352 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 29 Nov 2023 14:12:38 +0100
Subject: [PATCH] fix npc banner handling

---
 .../java/com/habitrpg/android/habitica/data/UserRepository.kt | 2 +-
 .../com/habitrpg/android/habitica/helpers/AppConfigManager.kt | 4 ++--
 .../habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt      | 4 ++--
 .../com/habitrpg/android/habitica/ui/views/NPCBannerView.kt   | 4 ++--
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
index 85372fe6f..7ff6508aa 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/UserRepository.kt
@@ -60,7 +60,7 @@ interface UserRepository : BaseRepository {
 
     suspend fun updateLanguage(languageCode: String): User?
 
-    suspend fun resetAccount(): User?
+    suspend fun resetAccount(password: String): User?
     suspend fun deleteAccount(password: String): Void?
 
     suspend fun sendPasswordResetEmail(email: String): Void?
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
index 3aa66d09a..d17af4f02 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/helpers/AppConfigManager.kt
@@ -35,8 +35,8 @@ class AppConfigManager(contentRepository: ContentRepository?) : com.habitrpg.com
 
     private val remoteConfig = FirebaseRemoteConfig.getInstance()
 
-    fun shopSpriteSuffix(): String {
-        return worldState?.npcImageSuffix ?: remoteConfig.getString("shopSpriteSuffix")
+    fun shopSpriteSuffix(): String? {
+        return worldState?.npcImageSuffix
     }
 
     fun maxChatLength(): Long {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
index 868d0ca2b..4988bb700 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt
@@ -42,7 +42,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
 
     var changeClassEvents: ((String) -> Unit)? = null
 
-    var shopSpriteSuffix: String = ""
+    var shopSpriteSuffix: String? = null
         set(value) {
             field = value
             if (items.size > 0) {
@@ -274,7 +274,7 @@ class ShopRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<Vi
             binding.descriptionView.movementMethod = LinkMovementMethod.getInstance()
         }
 
-        fun bind(shop: Shop, shopSpriteSuffix: String) {
+        fun bind(shop: Shop, shopSpriteSuffix: String?) {
             binding.npcBannerView.shopSpriteSuffix = shopSpriteSuffix
             binding.npcBannerView.identifier = shop.identifier
 
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
index 2513dd9be..c8e184b66 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/views/NPCBannerView.kt
@@ -19,9 +19,9 @@ import kotlin.math.roundToInt
 class NPCBannerView(context: Context, attrs: AttributeSet?) : FrameLayout(context, attrs) {
     private val binding = NpcBannerBinding.inflate(context.layoutInflater, this)
 
-    var shopSpriteSuffix: String = ""
+    var shopSpriteSuffix: String? = null
         set(value) {
-            field = if (value.isEmpty() || value.startsWith("_")) {
+            field = if (value == null || value.isEmpty() || value.startsWith("_")) {
                 value
             } else {
                 "_$value"