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, ApiClient { @Override public Observable 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, ApiClient { @Override public Observable 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