From 1a7ff616afe84ea72c150f4f42f1dd1779640eab Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Mon, 22 Apr 2019 12:13:49 +0200
Subject: [PATCH] Fix pet/mount display

---
 .../habitica/ui/adapter/inventory/StableRecyclerAdapter.kt  | 2 +-
 .../android/habitica/utils/OwnedMountListDeserializer.kt    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
index 535e52faa..04d5dae18 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.kt
@@ -87,7 +87,7 @@ class StableRecyclerAdapter : androidx.recyclerview.widget.RecyclerView.Adapter<
                 "Mount_Icon_" + item.key
             }
             this.ownedTextView.text = animal?.numberOwned?.toString()
-            ownedTextView.visibility = View.GONE
+            ownedTextView.visibility = if (animal?.numberOwned == 0) View.GONE else View.VISIBLE
             imageView.background = null
             DataBindingUtils.loadImage(imageName) {
                 val drawable = BitmapDrawable(context?.resources, if (item.numberOwned > 0) it else it.extractAlpha())
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt
index 49e08171d..e3c291d98 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/utils/OwnedMountListDeserializer.kt
@@ -15,7 +15,11 @@ class OwnedMountListDeserializer : JsonDeserializer<List<OwnedMount>> {
             for (entry in entrySet) {
                 val item = OwnedMount()
                 item.key = entry.key
-                item.owned = entry.value.asBoolean
+                if (entry.value.isJsonNull) {
+                    item.owned = false
+                } else {
+                    item.owned = entry.value.asBoolean
+                }
                 ownedItems.add(item)
             }
         }