add fixes from json / purchasetoken: http://stackoverflow.com/questions/12002788/subscription-sample-missing-json-parsing-of-purchasetoken

tito · tito · commit 783407f1e545 · 2012-10-05T16:17:45.000+02:00
diff --git a/src/src/org/renpy/android/billing/BillingService.java b/src/src/org/renpy/android/billing/BillingService.java
@@ -214,7 +214,7 @@ public CheckBillingSupported(String itemType) {
             super(-1);
             mProductType = itemType;
         }
-        
+
         @Override
         protected long run() throws RemoteException {
             Bundle request = makeRequestBundle("CHECK_BILLING_SUPPORTED");
@@ -570,13 +570,18 @@ private void purchaseStateChanged(int startId, String signedData, String signatu
             return;
         }
 
+		if (Consts.DEBUG) {
+			Log.d(TAG, "purchaseStateChanged: " + signedData);
+		}
+
         ArrayList<String> notifyList = new ArrayList<String>();
         for (VerifiedPurchase vp : purchases) {
             if (vp.notificationId != null) {
                 notifyList.add(vp.notificationId);
             }
             ResponseHandler.purchaseResponse(this, vp.purchaseState, vp.productId,
-                    vp.orderId, vp.purchaseTime, vp.developerPayload);
+                    vp.orderId, vp.purchaseTime, vp.developerPayload,
+					vp.purchaseToken, vp.packageName);
         }
         if (!notifyList.isEmpty()) {
             String[] notifyIds = notifyList.toArray(new String[notifyList.size()]);
diff --git a/src/src/org/renpy/android/billing/ResponseHandler.java b/src/src/org/renpy/android/billing/ResponseHandler.java
@@ -107,7 +107,8 @@ public static void buyPageIntentResponse(PendingIntent pendingIntent, Intent int
      */
     public static void purchaseResponse(
             final Context context, final PurchaseState purchaseState, final String productId,
-            final String orderId, final long purchaseTime, final String developerPayload) {
+            final String orderId, final long purchaseTime, final String developerPayload,
+			final String purchaseToken, final String packageName) {
 
         // Update the database with the purchase state. We shouldn't do that
         // from the main thread so we do the work in a background thread.
diff --git a/src/src/org/renpy/android/billing/Security.java b/src/src/org/renpy/android/billing/Security.java
@@ -68,15 +68,20 @@ public static class VerifiedPurchase {
         public String orderId;
         public long purchaseTime;
         public String developerPayload;
+		public String purchaseToken;
+		public String packageName;
 
         public VerifiedPurchase(PurchaseState purchaseState, String notificationId,
-                String productId, String orderId, long purchaseTime, String developerPayload) {
+                String productId, String orderId, long purchaseTime, String developerPayload,
+				String purchaseToken, String packageName) {
             this.purchaseState = purchaseState;
             this.notificationId = notificationId;
             this.productId = productId;
             this.orderId = orderId;
             this.purchaseTime = purchaseTime;
             this.developerPayload = developerPayload;
+			this.purchaseToken = purchaseToken;
+			this.packageName = packageName;
         }
     }
 
@@ -176,14 +181,15 @@ public static ArrayList<VerifiedPurchase> verifyPurchase(String signedData, Stri
                     notifyId = jElement.getString("notificationId");
                 }
                 String developerPayload = jElement.optString("developerPayload", null);
+				String purchaseToken = jElement.optString("purchaseToken", null);
 
                 // If the purchase state is PURCHASED, then we require a
                 // verified nonce.
                 if (purchaseState == PurchaseState.PURCHASED && !verified) {
                     continue;
                 }
                 purchases.add(new VerifiedPurchase(purchaseState, notifyId, productId,
-                        orderId, purchaseTime, developerPayload));
+                        orderId, purchaseTime, developerPayload, purchaseToken, packageName));
             }
         } catch (JSONException e) {
             Log.e(TAG, "JSON exception: ", e);
