From 39bd3214927c86438042ce32e2a2c8579ff9a14a Mon Sep 17 00:00:00 2001 From: Kirils Puskarjovs Date: Wed, 18 Jul 2018 22:09:23 +0300 Subject: [PATCH] fix#987 --- .../habitrpg/android/habitica/ui/activities/MainActivity.kt | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) mode change 100644 => 100755 Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt old mode 100644 new mode 100755 index 3225f69c2..ae5a64d19 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.kt @@ -526,9 +526,13 @@ open class MainActivity : BaseActivity(), TutorialView.OnTutorialReaction { .subscribe(Consumer { buyResponse -> var snackbarMessage = getString(R.string.successful_purchase, event.Reward.text) if (event.Reward.id == "armoire") { + var dropArticle = buyResponse.armoire["dropArticle"] + if (buyResponse.armoire["dropArticle"] == null || buyResponse.armoire["dropArticle"].equals("null",true)) { + dropArticle = "" + } snackbarMessage = when { buyResponse.armoire["type"] == "gear" -> applicationContext.getString(R.string.armoireEquipment, buyResponse.armoire["dropText"]) - buyResponse.armoire["type"] == "food" -> applicationContext.getString(R.string.armoireFood, buyResponse.armoire["dropArticle"], buyResponse.armoire["dropText"]) + buyResponse.armoire["type"] == "food" -> applicationContext.getString(R.string.armoireFood, dropArticle, buyResponse.armoire["dropText"]) else -> applicationContext.getString(R.string.armoireExp) } soundManager.loadAndPlayAudio(SoundManager.SoundItemDrop)