From d05db4de8e0e58e7a558e1d825fb76c9ef110cab Mon Sep 17 00:00:00 2001
From: Konstantin Zaitsev <konstantin.zaitsev@xored.com>
Date: Wed, 27 Jun 2018 13:39:13 +0700
Subject: Fix possible NullPointerException crash on cancel payment

---
 .../godotengine/godot/payments/HandlePurchaseTask.java   | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'platform/android/java/src')

diff --git a/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java b/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java
index 766989f953..aaf18c74bf 100644
--- a/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java
+++ b/platform/android/java/src/org/godotengine/godot/payments/HandlePurchaseTask.java
@@ -58,17 +58,15 @@ abstract public class HandlePurchaseTask {
 
 	public void handlePurchaseRequest(int resultCode, Intent data) {
 		//Log.d("XXX", "Handling purchase response");
-		//int responseCode = data.getIntExtra("RESPONSE_CODE", 0);
-		PaymentsCache pc = new PaymentsCache(context);
-
-		String purchaseData = data.getStringExtra("INAPP_PURCHASE_DATA");
-		//Log.d("XXX", "Purchase data:" + purchaseData);
-		String dataSignature = data.getStringExtra("INAPP_DATA_SIGNATURE");
-		//Log.d("XXX", "Purchase signature:" + dataSignature);
-
 		if (resultCode == Activity.RESULT_OK) {
-
 			try {
+				//int responseCode = data.getIntExtra("RESPONSE_CODE", 0);
+				PaymentsCache pc = new PaymentsCache(context);
+
+				String purchaseData = data.getStringExtra("INAPP_PURCHASE_DATA");
+				//Log.d("XXX", "Purchase data:" + purchaseData);
+				String dataSignature = data.getStringExtra("INAPP_DATA_SIGNATURE");
+				//Log.d("XXX", "Purchase signature:" + dataSignature);
 				//Log.d("SARLANGA", purchaseData);
 
 				JSONObject jo = new JSONObject(purchaseData);
-- 
cgit v1.2.3