From 4a92a2c214dc420a2673f2ef09dc043b0be6426a Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 5 Apr 2017 22:00:07 +0200
Subject: [PATCH] fix notifications for task completion

---
 Habitica/AndroidManifest.xml                          |  2 +-
 .../habitica/interactors/NotifyUserUseCase.java       |  8 ++++----
 .../android/habitica/ui/activities/MainActivity.java  | 11 ++++++++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index 7843cd88d..337d119f5 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="165"
+    android:versionCode="166"
     android:versionName="1.0"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
index 72135ef9a..4b05ee563 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/interactors/NotifyUserUseCase.java
@@ -18,7 +18,7 @@ import rx.functions.Action0;
 import static com.habitrpg.android.habitica.helpers.MathHelper.round;
 import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar;
 
-public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues, Void> {
+public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues, Stats> {
 
     public static final int MIN_LEVEL_FOR_SKILLS = 11;
     private LevelUpUseCase levelUpUseCase;
@@ -31,8 +31,8 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
     }
 
     @Override
-    protected Observable<Void> buildUseCaseObservable(RequestValues r) {
-        return Observable.from(() -> {
+    protected Observable<Stats> buildUseCaseObservable(RequestValues r) {
+        return Observable.defer(() -> {
             Stats stats = r.user.getStats();
 
             if (r.lvl > stats.getLvl()) {
@@ -49,7 +49,7 @@ public class NotifyUserUseCase extends UseCase<NotifyUserUseCase.RequestValues,
                 showSnackbar(r.context, r.snackbarTargetView, pair.first, pair.second);
             }
 
-            return null;
+            return Observable.just(stats);
         });
     }
 
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 c82cc69c1..30014e12d 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
@@ -1280,6 +1280,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
     @Override
     public void onTaskDataReceived(TaskDirectionData data, Task task) {
+
         if (task.type.equals("reward")) {
 
             showSnackbar(this, floatingMenuWrapper, getString(R.string.notification_purchase, task.getText()), SnackbarDisplayType.NORMAL);
@@ -1288,12 +1289,20 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
 
             if (user != null) {
                 notifyUserUseCase.observable(new NotifyUserUseCase.RequestValues(this, floatingMenuWrapper, this::retrieveUser,
-                        user, data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl()));
+                        user, data.getExp(), data.getHp(), data.getGp(), data.getMp(), data.getLvl()))
+                        .subscribe(aVoid -> {
+                            user.getStats().hp = data.getHp();
+                            user.getStats().exp = data.getExp();
+                            user.getStats().mp = data.getMp();
+                            user.getStats().gp = data.getGp();
+                            setUserData(true);
+                        }, throwable -> {});
             }
 
             displayItemDropUseCase.observable(new DisplayItemDropUseCase.RequestValues(data, this, floatingMenuWrapper))
                     .subscribe(aVoid -> {}, throwable -> {});
         }
+
     }