diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 57770fd05..1d5bea92c 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index 9cfdbde55..a6dcd5465 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java @@ -877,7 +877,7 @@ public class MainActivity extends BaseActivity implements Action1, Ha } else { observable = apiHelper.apiService.purchaseHourglassItem(event.item.purchaseType, event.item.key); } - } else if (event.item.purchaseType.equals("quests")) { + } else if (event.item.purchaseType.equals("quests") && event.item.getCurrency().equals("gold")) { observable = apiHelper.apiService.purchaseQuest(event.item.key); } else { observable = apiHelper.apiService.purchaseItem(event.item.purchaseType, event.item.key); diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java index 50e336499..d844cc194 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/ShopItem.java @@ -96,9 +96,9 @@ public class ShopItem { public boolean canBuy(HabitRPGUser user) { if (getCurrency().equals("gold")) { - return getValue() < user.getStats().getGp(); + return getValue() <= user.getStats().getGp(); } else if (getCurrency().equals("gems")) { - return getValue() < (user.getBalance()*4); + return getValue() <= (user.getBalance()*4); } else { return false; }