getting receipts

Hasufel · Jul 26, 2013 · 6e2de9d · 6e2de9d
1 parent f7e395a
commit 6e2de9d
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/src/Main.hx b/src/Main.hx
@@ -62,8 +62,10 @@ class IAP_Handler
 
 	public var initCall:Dynamic;
 	public var requestProductListCall:Dynamic;
-	public var requestPurchaseCall:Dynamic;
+	public var getProductListIDsCall:Dynamic;
 	public var requestReceiptsCall:Dynamic;
+	public var getReceiptProductIDsCall:Dynamic;
+	public var requestPurchaseCall:Dynamic;
 	public var ouyaFacadeObject:Dynamic;
 
 	public function new( ouyaFacadeObject:Dynamic )
@@ -81,10 +83,14 @@ class IAP_Handler
 			//										   (Lorg/haxe/nme/HaxeObject;Ltv/ouya/console/api/OuyaFacade;[B)V
 		requestProductListCall = openfl.utils.JNI.createStaticMethod
 			("com.jarnik.iaptest.OUYA_IAP", "requestProductList", "([Ljava/lang/String;)V", true);
+		getProductListIDsCall = openfl.utils.JNI.createStaticMethod
+			("com.jarnik.iaptest.OUYA_IAP", "getProductListIDs", "()Ljava/lang/String;", true);
 		requestPurchaseCall = openfl.utils.JNI.createStaticMethod
 			("com.jarnik.iaptest.OUYA_IAP", "requestPurchase", "(Ljava/lang/String;)V", true);
 		requestReceiptsCall = openfl.utils.JNI.createStaticMethod
 			("com.jarnik.iaptest.OUYA_IAP", "requestReceipts", "()V", true);
+		getReceiptProductIDsCall = openfl.utils.JNI.createStaticMethod
+			("com.jarnik.iaptest.OUYA_IAP", "getReceiptProductIDs", "()Ljava/lang/String;", true);
 		trace("=================== JNI linked!");
 		var appKey:ByteArray =  Assets.getBytes("assets/key.der");
 
@@ -116,11 +122,12 @@ class IAP_Handler
 
 	// ==================================== CALLBACKS ======================= 
 
-	public function onProductListReceived(products:String)
+	public function onProductListReceived()
 	{
-		//trace("=== onProductListReceived! "+products.join(" "));
-		var p:Array<String> = products.split(" ");
-		trace("=== onProductListReceived! "+products+" >> "+p.join("x"));
+		var p:Array<String> = getProductListIDsCall().split(" ");
+		trace("=== onProductListReceived! >> " + p.join("x"));
+
+		requestReceipts();
 	}
 	public function onProductListFailed(error:String)
 	{
@@ -140,9 +147,10 @@ class IAP_Handler
 		trace("=== onPurchaseCancelled! ");
 	}
 
-	public function onReceiptsReceived(receipts:Array<String>)
+	public function onReceiptsReceived()
 	{
-		trace("=== onReceiptsReceived! "+receipts.join(" "));
+		var p:Array<String> = getReceiptProductIDsCall().split(" ");
+		trace("=== onReceiptsReceived! >> "+p.join("x"));
 	}
 	public function onReceiptsFailed( error:String )
 	{

diff --git a/src/java/com/jarnik/iaptest/OUYA_IAP.java b/src/java/com/jarnik/iaptest/OUYA_IAP.java
@@ -108,12 +108,7 @@ public void onSuccess(final ArrayList<Product> products) {
                     Log.d("IAP", p.getName() + " costs " + p.getPriceInCents());
                 }
 				Log.d("IAP", "========== requestProductList SUCCESS "+products.size() );
-				//callback.call("onPurchase", new Object[] {"junk"});
-				String product_ids = "";
-				//for ( int i = 0; i < mProductList.size(); i++ )
-					//product_ids += mProductList.get( i ).getIdentifier()+" ";
-				product_ids = "kocka leze dirou";
-				mCallback.call("onProductListReceived", new Object[] { product_ids } );
+				mCallback.call("onProductListReceived", new Object[] {} );
             }
 
             @Override
@@ -131,6 +126,13 @@ public void onFailure(int errorCode, String errorMessage, Bundle optionalData) {
 		//callback.call("onPurchase", new Object[] {"junk"});
 	}
 
+	public static String getProductListIDs() {
+		String product_ids = "";
+		for ( int i = 0; i < mProductList.size(); i++ )
+			product_ids += ( i > 0 ? " ": "" ) + mProductList.get( i ).getIdentifier();
+		return product_ids;
+	}
+
 	// ======================================= PURCHASE =====================================================
 
 	public static void requestPurchase( String productName ) 
@@ -401,5 +403,12 @@ public void onCancel()
         }
     }
 
+	public static String getReceiptProductIDs() {
+		String product_ids = "";
+		for ( int i = 0; i < mReceiptList.size(); i++ )
+			product_ids += ( i > 0 ? " ": "" ) + mReceiptList.get( i ).getIdentifier();
+		return product_ids;
+	}
+
 }