From 5ff6574b171b2f826205ee47e1f9e9691a6fa900 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 11 Sep 2023 15:09:43 +0200
Subject: [PATCH] fix duplicate items

---
 .../data/implementation/TaskRepositoryImpl.kt      | 14 +++++++-------
 .../data/implementation/UserRepositoryImpl.kt      |  3 ++-
 .../common/habitica/extensions/DataBindingUtils.kt |  4 ++--
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
index 2e9f31ad0..37d577185 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/TaskRepositoryImpl.kt
@@ -178,15 +178,15 @@ class TaskRepositoryImpl(
                     item.key = key
                     item.itemType = type
                     item.userID = user.id
+
+                    when (type) {
+                        "eggs" -> bgUser.items?.eggs?.add(item)
+                        "food" -> bgUser.items?.food?.add(item)
+                        "hatchingPotions" -> bgUser.items?.hatchingPotions?.add(item)
+                        "quests" -> bgUser.items?.quests?.add(item)
+                    }
                 }
                 item.numberOwned += 1
-                when (type) {
-                    "eggs" -> bgUser.items?.eggs?.add(item)
-                    "food" -> bgUser.items?.food?.add(item)
-                    "hatchingPotions" -> bgUser.items?.hatchingPotions?.add(item)
-                    "quests" -> bgUser.items?.quests?.add(item)
-                    else -> ""
-                }
             }
 
             bgUser.stats?.hp = res.hp
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
index 0631e7810..e440be0bc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/UserRepositoryImpl.kt
@@ -99,7 +99,8 @@ class UserRepositoryImpl(
     }
 
     override suspend fun revive(): User? {
-        apiClient.revive()
+        val revivedUser = apiClient.revive()
+
         return retrieveUser(false, true)
     }
 
diff --git a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
index b7c93dc0e..ad5f6d3f6 100644
--- a/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
+++ b/common/src/main/java/com/habitrpg/common/habitica/extensions/DataBindingUtils.kt
@@ -75,8 +75,8 @@ object DataBindingUtils {
             imageName.startsWith("handleless") -> "chair_$imageName"
             else -> imageName
         }
-        return name + if (imageFormat == null && FILEFORMAT_MAP.containsKey(name)) {
-            "." + FILEFORMAT_MAP[name]
+        return name + if (imageFormat == null && FILEFORMAT_MAP.containsKey(imageName)) {
+            "." + FILEFORMAT_MAP[imageName]
         } else {
             ".${imageFormat ?: "png"}"
         }