From 3e39633313bf39eb82f4136ee4059b3cb56e889a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 8 Nov 2017 19:05:42 +0100
Subject: [PATCH] fix owned count in shops. Fixes #874

---
 .../implementation/RealmInventoryLocalRepository.java     | 8 ++++----
 .../habitica/ui/adapter/inventory/ShopRecyclerAdapter.kt  | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
index b8b7ee099..8b458aadc 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.java
@@ -120,16 +120,16 @@ public class RealmInventoryLocalRepository extends RealmContentLocalRepository i
                 (Func4<RealmResults<? extends Item>, RealmResults<? extends Item>, RealmResults<? extends Item>, RealmResults<? extends Item>, Map<String, Item>>) (eggs, hatchingPotions, food, quests) -> {
                     Map<String, Item> items = new HashMap<>();
                     for (Item item : eggs) {
-                        items.put(item.getKey(), item);
+                        items.put(item.getKey()+"-"+item.getType(), item);
                     }
                     for (Item item : hatchingPotions) {
-                        items.put(item.getKey(), item);
+                        items.put(item.getKey()+"-"+item.getType(), item);
                     }
                     for (Item item : food) {
-                        items.put(item.getKey(), item);
+                        items.put(item.getKey()+"-"+item.getType(), item);
                     }
                     for (Item item : quests) {
-                        items.put(item.getKey(), item);
+                        items.put(item.getKey()+"-"+item.getType(), item);
                     }
                     return items;
                 }
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 57550b422..2b448e3a1 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
@@ -148,8 +148,8 @@ class ShopRecyclerAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
                 ShopItem::class.java -> {
                     val item = obj as ShopItem
                     (holder as ShopItemViewHolder).bind(item, item.canAfford(user))
-                    if (ownedItems.containsKey(item.key)) {
-                        holder.itemCount = ownedItems[item.key]?.owned ?: 0
+                    if (ownedItems.containsKey(item.key+"-"+item.pinType)) {
+                        holder.itemCount = ownedItems[item.key+"-"+item.pinType]?.owned ?: 0
                     }
                     holder.isPinned = pinnedItemKeys.contains(item.key)
                 }