From af8522b121380e9f65087435d473f9e774c30f16 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <phillip@habitica.com>
Date: Wed, 2 Jun 2021 13:50:40 +0200
Subject: [PATCH] purchase fix

---
 Habitica/build.gradle                                     | 4 ++--
 .../local/implementation/RealmInventoryLocalRepository.kt | 8 +++++++-
 .../android/habitica/ui/views/shops/PurchaseDialog.kt     | 3 +--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 4f036ef2d..1a26c1a0e 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -149,8 +149,8 @@ android {
         buildConfigField "String", "TESTING_LEVEL", "\"production\""
         resConfigs "en", "bg", "de", "en-rGB", "es", "fr", "hr-rHR", "in", "it", "iw", "ja", "ko", "lt", "nl", "pl", "pt-rBR", "pt-rPT", "ru", "tr", "zh", "zh-rTW"
 
-        versionCode 2956
-        versionName "3.2.4"
+        versionCode 2960
+        versionName "3.2.4.1"
     }
 
     buildFeatures {
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
index acc382508..0b0309884 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/RealmInventoryLocalRepository.kt
@@ -14,6 +14,7 @@ import io.realm.Realm
 import io.realm.RealmObject
 import io.realm.RealmResults
 import io.realm.Sort
+import java.text.SimpleDateFormat
 import java.util.*
 import kotlin.collections.HashMap
 
@@ -351,7 +352,12 @@ class RealmInventoryLocalRepository(realm: Realm) : RealmContentLocalRepository(
                 .findAll()
                 .asFlowable()
                 .filter { it.isLoaded && it.size > 0}
-                .map { it.first() })
+                .map {
+                    val format = SimpleDateFormat("yyyyMM", Locale.US)
+                    it.first {
+                        it.key?.contains(format.format(Date())) == true
+                    }
+                })
     }
 
     override fun soldItem(userID: String, updatedUser: User): User {
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
index 7e005950b..6be1f4c4d 100644
--- 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
@@ -467,6 +467,7 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                     .doOnComplete {
                         if (!shouldWarn) {
                             onResult(-1)
+                            return@doOnComplete
                         }
                         val remaining = totalCount - ownedCount
                         onResult(max(0, remaining))
@@ -490,8 +491,6 @@ class PurchaseDialog(context: Context, component: UserComponent?, val item: Shop
                                 ownedCount += if (pet.trained > 0) 1 else 0
                             }
                         }
-                        val remaining = totalCount - ownedCount
-                        onResult(max(0, remaining))
                     }, RxErrorHandler.handleEmptyError())
         } else {
             onResult(-1)