From 8937347afd1d5f7156c4eaeb2fb4aa2e65f58d97 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Wed, 19 Apr 2017 11:35:11 +0200
Subject: [PATCH] fix issue with gem purchases

---
 .../data/implementation/ApiClientImpl.java         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
index 21befd0d3..6c36fb390 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
@@ -502,7 +502,12 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
     @Override
     public Observable<Void> validateSubscription(SubscriptionValidationRequest request) {
-        return apiService.validateSubscription(request).compose(configureApiCallObserver());
+        return apiService.validateSubscription(request).map(habitResponse -> {
+            if (habitResponse.notifications != null) {
+                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
+            }
+            return habitResponse.getData();
+        });
     }
 
     @Override
@@ -753,7 +758,12 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
 
     @Override
     public Observable<PurchaseValidationResult> validatePurchase(PurchaseValidationRequest request) {
-        return apiService.validatePurchase(request).compose(configureApiCallObserver());
+        return apiService.validatePurchase(request).map(habitResponse -> {
+            if (habitResponse.notifications != null) {
+                popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
+            }
+            return habitResponse.getData();
+        });
     }
 
     @Override