From cc1873c5b0dbd9942c37862cdf1b8e5823676139 Mon Sep 17 00:00:00 2001 From: Franze Jr Date: Wed, 16 Dec 2015 19:11:27 -0300 Subject: [PATCH] Fix #277 - Validate Presence of user before notify --- .../android/habitica/MainActivity.java | 20 ++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java index d9ba87e00..fb5f81ea9 100644 --- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java +++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java @@ -591,13 +591,23 @@ public class MainActivity extends AppCompatActivity implements HabitRPGUserCallb @Override public void onTaskDataReceived(TaskDirectionData data, Task task) { if (task.type.equals("reward")) { + showSnackbar(task.getText() + " successfully purchased!"); + } else { - notifyUser(data.getExp(), data.getHp(), data.getGp(), data.getLvl(), data.getDelta()); - if (data.get_tmp() != null) { - if (data.get_tmp().getDrop() != null) { - this.showSnackbar(data.get_tmp().getDrop().getDialog(), MainActivity.SnackbarDisplayType.DROP); - } + + if(user != null){ + notifyUser(data.getExp(), data.getHp(), data.getGp(), data.getLvl(), data.getDelta()); + } + + showSnackBarForDataReceived(data); + } + } + + private void showSnackBarForDataReceived(TaskDirectionData data) { + if (data.get_tmp() != null) { + if (data.get_tmp().getDrop() != null) { + this.showSnackbar(data.get_tmp().getDrop().getDialog(), SnackbarDisplayType.DROP); } } }