diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 48e9c91d4..68f847f0d 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,8 +2,8 @@ diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Item.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Item.java index d5a1b2055..d5b13d133 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Item.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/inventory/Item.java @@ -51,6 +51,9 @@ public abstract class Item extends BaseModel { } public Integer getOwned() { + if (owned == null) { + return 0; + } return owned; }