From 93dcaf9f99d16a68a88fc2d57ff1554360842cad Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Thu, 13 Oct 2016 14:17:48 +0200
Subject: [PATCH] gem purchase screen improvements

---
 Habitica/AndroidManifest.xml                              | 4 ++--
 .../android/habitica/ui/activities/MainActivity.java      | 6 ++++++
 .../android/habitica/ui/menu/MainDrawerBuilder.java       | 8 +++++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml
index f07ab4fa3..7b92ee775 100644
--- a/Habitica/AndroidManifest.xml
+++ b/Habitica/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="com.habitrpg.android.habitica"
-    android:versionCode="125"
-    android:versionName="0.0.34.1"
+    android:versionCode="128"
+    android:versionName="0.0.34.2"
     android:screenOrientation="portrait"
     android:installLocation="auto" >
 
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 ebf8df46c..dda073eb5 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
@@ -173,6 +173,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
         TaskScoringCallback.OnTaskScored, TutorialView.OnTutorialReaction {
 
     public static final int SELECT_CLASS_RESULT = 11;
+    public static final int GEM_PURCHASE_REQUEST = 111;
     public static final int MIN_LEVEL_FOR_SKILLS = 11;
     @Inject
     public APIHelper apiHelper;
@@ -867,6 +868,11 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
                         .subscribe(new HabitRPGUserCallback(this), throwable -> {
                         });
             }
+        } else if (requestCode == GEM_PURCHASE_REQUEST) {
+            this.apiHelper.retrieveUser(true)
+                    .compose(apiHelper.configureApiCallObserver())
+                    .subscribe(new HabitRPGUserCallback(this), throwable -> {
+                    });
         }
         super.onActivityResult(requestCode, resultCode, data);
     }
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java
index 176a29295..55c9702ae 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java
@@ -30,6 +30,8 @@ import android.app.Activity;
 import android.content.Intent;
 import android.support.v7.widget.Toolbar;
 
+import static com.habitrpg.android.habitica.ui.activities.MainActivity.GEM_PURCHASE_REQUEST;
+
 public class MainDrawerBuilder {
 
     // Change the identificationIDs to the position IDs so that its easier to set the selected entry
@@ -178,7 +180,11 @@ public class MainDrawerBuilder {
                     if (newActivityClass != null) {
                         Intent passUserId = new Intent(activity, newActivityClass);
                         passUserId.putExtra("userId", activity.getUserID());
-                        activity.startActivity(passUserId);
+                        if (identifier == SIDEBAR_PURCHASE) {
+                            activity.startActivityForResult(passUserId, GEM_PURCHASE_REQUEST);
+                        } else {
+                            activity.startActivity(passUserId);
+                        }
                         return false;
                     }