Merge pull request #22 from dyukorev/master

Pending transactions fix

docs/_data/api.yml

@@ -161,6 +161,13 @@
         desc: value is `true` if current store supports handling
               restored transactions, otherwise `false`.
 
+#*****************************************************************************************************
+
+  - name: process_pending_transactions
+    type: function
+    desc: Process transactions still unprocessed from previous session if any. Transactions will be
+          processed with callback function set with `set_listener` function
+
 #*****************************************************************************************************
 
   - name: set_listener

docs/index.md

@@ -11,7 +11,7 @@ To use this library in your Defold project, add the following URL to your <code
 
     https://github.com/defold/extension-iap/archive/master.zip
 
-We recommend using a link to a zip file of a [https://github.com/defold/extension-iap/releases](specific release).
+We recommend using a link to a zip file of a [specific release](https://github.com/defold/extension-iap/releases).
 
 ## Source code
 

extension-iap/lib/web/library_facebook_iap.js

@@ -31,7 +31,7 @@ var LibraryFacebookIAP = {
                 FB_PAYMENT_RESPONSE_APPINVALIDITEMPARAM : 1383051
             },
 
-            http_callback: function(xmlhttp, callback, lua_state, products, product_ids, product_count, url_index, url_count) {
+            http_callback: function(xmlhttp, callback, lua_callback, products, product_ids, product_count, url_index, url_count) {
                 if (xmlhttp.readyState == 4) {
                     if(xmlhttp.status == 200) {
                         var xmlDoc = document.createElement( 'html' );
@@ -72,11 +72,11 @@ var LibraryFacebookIAP = {
                     if(url_index == product_count-1) {
                         var productsJSON = JSON.stringify(products);
                         var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
-                        Runtime.dynCall('vii', callback, [lua_state, res_buf]);
+                        Runtime.dynCall('vii', callback, [lua_callback, res_buf]);
                     } else {
                         var xmlhttp = new XMLHttpRequest();
                         xmlhttp.onreadystatechange = function() {
-                            FBinner.http_callback(xmlhttp, callback, lua_state, products, product_ids, product_count, url_index+1);
+                            FBinner.http_callback(xmlhttp, callback, lua_callback, products, product_ids, product_count, url_index+1);
                         };
                         xmlhttp.open("GET", product_ids[url_index+1], true);
                         xmlhttp.send();
@@ -86,7 +86,7 @@ var LibraryFacebookIAP = {
 
         },
 
-        dmIAPFBList: function(params, callback, lua_state) {
+        dmIAPFBList: function(params, callback, lua_callback) {
             var product_ids = Pointer_stringify(params).trim().split(',');
             var product_count = product_ids.length;
             if(product_count == 0) {
@@ -96,7 +96,7 @@ var LibraryFacebookIAP = {
             products = {};
             var xmlhttp = new XMLHttpRequest();
             xmlhttp.onreadystatechange = function() {
-                FBinner.http_callback(xmlhttp, callback, lua_state, products, product_ids, product_count, 0);
+                FBinner.http_callback(xmlhttp, callback, lua_callback, products, product_ids, product_count, 0);
             };
             // chain of async http read of product files
             xmlhttp.open("GET", product_ids[0], true);
@@ -104,7 +104,7 @@ var LibraryFacebookIAP = {
         },
 
         // https://developers.facebook.com/docs/javascript/reference/FB.ui
-        dmIAPFBBuy: function(param_product_id, param_request_id, callback, lua_state) {
+        dmIAPFBBuy: function(param_product_id, param_request_id, callback, lua_callback) {
             var product_id = Pointer_stringify(param_product_id);
 
             var buy_params = {
@@ -144,7 +144,7 @@ var LibraryFacebookIAP = {
 
 	                    var productsJSON = JSON.stringify(result)
 	                    var res_buf = allocate(intArrayFromString(productsJSON), 'i8', ALLOC_STACK);
-	                    Runtime.dynCall('viii', callback, [lua_state, res_buf, 0]);
+	                    Runtime.dynCall('viii', callback, [lua_callback, res_buf, 0]);
 
 	                } else {
 
@@ -157,7 +157,7 @@ var LibraryFacebookIAP = {
 	                        reason = FBinner.BillingResponse.BILLING_RESPONSE_RESULT_ERROR;
 	                        console.log("Unknown response: ", response);
 	                    }
-	                    Runtime.dynCall('viii', callback, [lua_state, 0, reason]);
+	                    Runtime.dynCall('viii', callback, [lua_callback, 0, reason]);
 	                }
             	}
             );

extension-iap/src/iap_android.cpp

@@ -27,20 +27,14 @@ struct IAP
     IAP()
     {
         memset(this, 0, sizeof(*this));
-        m_Callback = LUA_NOREF;
-        m_Self = LUA_NOREF;
-        m_Listener.m_Callback = LUA_NOREF;
-        m_Listener.m_Self = LUA_NOREF;
         m_autoFinishTransactions = true;
         m_ProviderId = PROVIDER_ID_GOOGLE;
     }
     int             m_InitCount;
-    int             m_Callback;
-    int             m_Self;
     bool            m_autoFinishTransactions;
     int             m_ProviderId;
-    lua_State*      m_L;
-    IAPListener     m_Listener;
+
+    dmScript::LuaCallbackInfo* m_Listener;
 
     jobject         m_IAP;
     jobject         m_IAPJNI;
@@ -56,22 +50,15 @@ struct IAP
 
 static IAP g_IAP;
 
-static void ResetCallback(lua_State* L)
+static int IAP_ProcessPendingTransactions(lua_State* L)
 {
-    if (g_IAP.m_Callback != LUA_NOREF) {
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-        g_IAP.m_Callback = LUA_NOREF;
-        g_IAP.m_Self = LUA_NOREF;
-        g_IAP.m_L = 0;
-    }
+    //todo handle pending transactions if there is such thing on Android
+    return 0;
 }
 
 static int IAP_List(lua_State* L)
 {
     int top = lua_gettop(L);
-    ResetCallback(L);
-
     char* buf = IAP_List_CreateBuffer(L);
     if( buf == 0 )
     {
@@ -79,18 +66,13 @@ static int IAP_List(lua_State* L)
         return 0;
     }
 
-    luaL_checktype(L, 2, LUA_TFUNCTION);
-    lua_pushvalue(L, 2);
-    g_IAP.m_Callback = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    dmScript::GetInstance(L);
-    g_IAP.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    g_IAP.m_L = dmScript::GetMainThread(L);
-
     JNIEnv* env = Attach();
+    IAPCommand* cmd = new IAPCommand;
+    cmd->m_Callback = dmScript::CreateCallback(L, 2);
+    cmd->m_Command = IAP_PRODUCT_RESULT;
+
     jstring products = env->NewStringUTF(buf);
-    env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_List, products, g_IAP.m_IAPJNI);
+    env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_List, products, g_IAP.m_IAPJNI, (jlong)cmd);
     env->DeleteLocalRef(products);
     Detach();
 
@@ -180,22 +162,13 @@ static int IAP_Restore(lua_State* L)
 static int IAP_SetListener(lua_State* L)
 {
     IAP* iap = &g_IAP;
-    luaL_checktype(L, 1, LUA_TFUNCTION);
-    lua_pushvalue(L, 1);
-    int cb = dmScript::Ref(L, LUA_REGISTRYINDEX);
 
-    bool had_previous = false;
-    if (iap->m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Callback);
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Self);
-        had_previous = true;
-    }
+    bool had_previous = iap->m_Listener != 0;
 
-    iap->m_Listener.m_L = dmScript::GetMainThread(L);
-    iap->m_Listener.m_Callback = cb;
+    if (iap->m_Listener)
+        dmScript::DestroyCallback(iap->m_Listener);
 
-    dmScript::GetInstance(L);
-    iap->m_Listener.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
+    iap->m_Listener = dmScript::CreateCallback(L, 1);
 
     // On first set listener, trigger process old ones.
     if (!had_previous) {
@@ -220,6 +193,7 @@ static const luaL_reg IAP_methods[] =
     {"restore", IAP_Restore},
     {"set_listener", IAP_SetListener},
     {"get_provider_id", IAP_GetProviderId},
+    {"process_pending_transactions", IAP_ProcessPendingTransactions},
     {0, 0}
 };
 
@@ -229,7 +203,7 @@ extern "C" {
 #endif
 
 
-JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult__ILjava_lang_String_2(JNIEnv* env, jobject, jint responseCode, jstring productList)
+JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult(JNIEnv* env, jobject, jint responseCode, jstring productList, jlong cmdHandle)
 {
     const char* pl = 0;
     if (productList)
@@ -237,15 +211,14 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult__ILjava_lang_
         pl = env->GetStringUTFChars(productList, 0);
     }
 
-    IAPCommand cmd;
-    cmd.m_Command = IAP_PRODUCT_RESULT;
-    cmd.m_ResponseCode = responseCode;
+    IAPCommand* cmd = (IAPCommand*)cmdHandle;
+    cmd->m_ResponseCode = responseCode;
     if (pl)
     {
-        cmd.m_Data = strdup(pl);
+        cmd->m_Data = strdup(pl);
         env->ReleaseStringUTFChars(productList, pl);
     }
-    IAP_Queue_Push(&g_IAP.m_CommandQueue, &cmd);
+    IAP_Queue_Push(&g_IAP.m_CommandQueue, cmd);
 }
 
 JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_String_2(JNIEnv* env, jobject, jint responseCode, jstring purchaseData)
@@ -257,6 +230,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_
     }
 
     IAPCommand cmd;
+    cmd.m_Callback = g_IAP.m_Listener;
     cmd.m_Command = IAP_PURCHASE_RESULT;
     cmd.m_ResponseCode = responseCode;
     if (pd)
@@ -273,25 +247,17 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_
 
 static void HandleProductResult(const IAPCommand* cmd)
 {
-    lua_State* L = g_IAP.m_L;
-    int top = lua_gettop(L);
-
-    if (g_IAP.m_Callback == LUA_NOREF) {
-        dmLogError("No callback set");
+    if (cmd->m_Callback == 0)
+    {
+        dmLogWarning("Received product list but no listener was set!");
         return;
     }
 
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
+    int top = lua_gettop(L);
 
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
-        dmLogError("Could not run IAP callback because the instance has been deleted.");
-        lua_pop(L, 2);
         assert(top == lua_gettop(L));
         return;
     }
@@ -320,42 +286,27 @@ static void HandleProductResult(const IAPCommand* cmd)
         IAP_PushError(L, "failed to fetch product", REASON_UNSPECIFIED);
     }
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("Error running callback: %s", lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
 
-    dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
-    dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-    g_IAP.m_Callback = LUA_NOREF;
-    g_IAP.m_Self = LUA_NOREF;
+    dmScript::TeardownCallback(cmd->m_Callback);
+    dmScript::DestroyCallback(cmd->m_Callback);
 
     assert(top == lua_gettop(L));
 }
 
 static void HandlePurchaseResult(const IAPCommand* cmd)
 {
-    lua_State* L = g_IAP.m_Listener.m_L;
-    int top = lua_gettop(L);
-
-    if (g_IAP.m_Listener.m_Callback == LUA_NOREF) {
-        dmLogError("No callback set");
+    if (cmd->m_Callback == 0)
+    {
+        dmLogWarning("Received purchase result but no listener was set!");
         return;
     }
 
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
+    int top = lua_gettop(L);
 
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
-
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
-        dmLogError("Could not run IAP callback because the instance has been deleted.");
-        lua_pop(L, 2);
         assert(top == lua_gettop(L));
         return;
     }
@@ -393,11 +344,9 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
         IAP_PushError(L, "failed to buy product", REASON_UNSPECIFIED);
     }
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("Error running callback: %s", lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::TeardownCallback(cmd->m_Callback);
 
     assert(top == lua_gettop(L));
 }
@@ -440,7 +389,7 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
         jclass iap_jni_class = (jclass)env->CallObjectMethod(cls, find_class, str_class_name);
         env->DeleteLocalRef(str_class_name);
 
-        g_IAP.m_List = env->GetMethodID(iap_class, "listItems", "(Ljava/lang/String;Lcom/defold/iap/IListProductsListener;)V");
+        g_IAP.m_List = env->GetMethodID(iap_class, "listItems", "(Ljava/lang/String;Lcom/defold/iap/IListProductsListener;J)V");
         g_IAP.m_Buy = env->GetMethodID(iap_class, "buy", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
         g_IAP.m_Restore = env->GetMethodID(iap_class, "restore", "(Lcom/defold/iap/IPurchaseListener;)V");
         g_IAP.m_Stop = env->GetMethodID(iap_class, "stop", "()V");
@@ -500,12 +449,9 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
     --g_IAP.m_InitCount;
 
-    if (params->m_L == g_IAP.m_Listener.m_L && g_IAP.m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-        g_IAP.m_Listener.m_L = 0;
-        g_IAP.m_Listener.m_Callback = LUA_NOREF;
-        g_IAP.m_Listener.m_Self = LUA_NOREF;
+    if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+        g_IAP.m_Listener = 0;
     }
 
     if (g_IAP.m_InitCount == 0) {

extension-iap/src/iap_emscripten.cpp

@@ -15,152 +15,102 @@ struct IAP
     IAP()
     {
         memset(this, 0, sizeof(*this));
-        m_Callback = LUA_NOREF;
-        m_Self = LUA_NOREF;
-        m_Listener.m_Callback = LUA_NOREF;
-        m_Listener.m_Self = LUA_NOREF;
         m_autoFinishTransactions = true;
     }
-    int                  m_InitCount;
-    int                  m_Callback;
-    int                  m_Self;
-    bool                 m_autoFinishTransactions;
-    lua_State*           m_L;
-    IAPListener          m_Listener;
 
+    dmScript::LuaCallbackInfo*  m_Listener;
+    int                         m_InitCount;
+    bool                        m_autoFinishTransactions;
 } g_IAP;
 
-typedef void (*OnIAPFBList)(void *L, const char* json);
-typedef void (*OnIAPFBListenerCallback)(void *L, const char* json, int error_code);
+typedef void (*OnIAPFBList)(void* luacallback, const char* json);
+typedef void (*OnIAPFBListenerCallback)(void* luacallback, const char* json, int error_code);
 
 extern "C" {
     // Implementation in library_facebook_iap.js
-    void dmIAPFBList(const char* item_ids, OnIAPFBList callback, lua_State* L);
-    void dmIAPFBBuy(const char* item_id, const char* request_id, OnIAPFBListenerCallback callback, lua_State* L);
+    void dmIAPFBList(const char* item_ids, OnIAPFBList callback, dmScript::LuaCallbackInfo* luacallback);
+    void dmIAPFBBuy(const char* item_id, const char* request_id, OnIAPFBListenerCallback callback, dmScript::LuaCallbackInfo* luacallback);
 }
 
-
-static void VerifyCallback(lua_State* L)
+static void IAPList_Callback(void* luacallback, const char* result_json)
 {
-    if (g_IAP.m_Callback != LUA_NOREF) {
-        dmLogError("Unexpected callback set");
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Callback);
-        dmScript::Unref(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-        g_IAP.m_Callback = LUA_NOREF;
-        g_IAP.m_Self = LUA_NOREF;
-        g_IAP.m_L = 0;
+    dmScript::LuaCallbackInfo* callback = (dmScript::LuaCallbackInfo*)luacallback;
+    lua_State* L = dmScript::GetCallbackLuaContext(callback);
+    DM_LUA_STACK_CHECK(L, 0);
+
+    if (!dmScript::SetupCallback(callback))
+    {
+        dmScript::DestroyCallback(callback);
+        return;
     }
-}
 
-void IAPList_Callback(void* Lv, const char* result_json)
-{
-    lua_State* L = (lua_State*) Lv;
-    if (g_IAP.m_Callback != LUA_NOREF) {
-        int top = lua_gettop(L);
-        int callback = g_IAP.m_Callback;
-        lua_rawgeti(L, LUA_REGISTRYINDEX, callback);
-
-        // Setup self
-        lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Self);
-        lua_pushvalue(L, -1);
-        dmScript::SetInstance(L);
-
-        if (!dmScript::IsInstanceValid(L))
-        {
-            dmLogError("Could not run iap facebook callback because the instance has been deleted.");
-            lua_pop(L, 2);
-            assert(top == lua_gettop(L));
-            return;
-        }
-        if(result_json != 0)
-        {
-            dmJson::Document doc;
-            dmJson::Result r = dmJson::Parse(result_json, &doc);
-            if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
-                char err_str[128];
-                if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
-                    dmLogError("Failed converting list result JSON to Lua; %s", err_str);
-                    lua_pushnil(L);
-                    IAP_PushError(L, "Failed converting list result JSON to Lua", REASON_UNSPECIFIED);
-                } else {
-                    lua_pushnil(L);
-                }
-            } else {
-                dmLogError("Failed to parse list result JSON (%d)", r);
+    if(result_json != 0)
+    {
+        dmJson::Document doc;
+        dmJson::Result r = dmJson::Parse(result_json, &doc);
+        if (r == dmJson::RESULT_OK && doc.m_NodeCount > 0) {
+            char err_str[128];
+            if (dmScript::JsonToLua(L, &doc, 0, err_str, sizeof(err_str)) < 0) {
+                dmLogError("Failed converting list result JSON to Lua; %s", err_str);
+                lua_pushnil(L);
+                IAP_PushError(L, "Failed converting list result JSON to Lua", REASON_UNSPECIFIED);
+            } else {
                 lua_pushnil(L);
-                IAP_PushError(L, "Failed to parse list result JSON", REASON_UNSPECIFIED);
             }
-            dmJson::Free(&doc);
-        }
-        else
-        {
-            dmLogError("Got empty list result.");
+        } else {
+            dmLogError("Failed to parse list result JSON (%d)", r);
             lua_pushnil(L);
-            IAP_PushError(L, "Got empty list result.", REASON_UNSPECIFIED);
+            IAP_PushError(L, "Failed to parse list result JSON", REASON_UNSPECIFIED);
         }
-
-        int ret = lua_pcall(L, 3, 0, 0);
-        if (ret != 0) {
-            dmLogError("Error running callback: %s", lua_tostring(L, -1));
-            lua_pop(L, 1);
-        }
-        assert(top == lua_gettop(L));
-        dmScript::Unref(L, LUA_REGISTRYINDEX, callback);
-
-        g_IAP.m_Callback = LUA_NOREF;
-    } else {
-        dmLogError("No callback set");
+        dmJson::Free(&doc);
+    }
+    else
+    {
+        dmLogError("Got empty list result.");
+        lua_pushnil(L);
+        IAP_PushError(L, "Got empty list result.", REASON_UNSPECIFIED);
     }
 
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::DestroyCallback(callback);
+    dmScript::TeardownCallback(callback);
 }
 
-int IAP_List(lua_State* L)
+static int IAP_ProcessPendingTransactions(lua_State* L)
 {
-    int top = lua_gettop(L);
-    VerifyCallback(L);
+    return 0;
+}
+
+static int IAP_List(lua_State* L)
+{
+    DM_LUA_STACK_CHECK(L, 0);
 
     char* buf = IAP_List_CreateBuffer(L);
     if( buf == 0 )
     {
-        assert(top == lua_gettop(L));
         return 0;
     }
 
-    luaL_checktype(L, 2, LUA_TFUNCTION);
-    lua_pushvalue(L, 2);
-    g_IAP.m_Callback = dmScript::Ref(L, LUA_REGISTRYINDEX);
-    dmScript::GetInstance(L);
-    g_IAP.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-    g_IAP.m_L = dmScript::GetMainThread(L);
-    dmIAPFBList(buf, (OnIAPFBList)IAPList_Callback, g_IAP.m_L);
+    dmScript::LuaCallbackInfo* callback = dmScript::CreateCallback(L, 2);
+
+    dmIAPFBList(buf, (OnIAPFBList)IAPList_Callback, callback);
 
     free(buf);
-    assert(top == lua_gettop(L));
     return 0;
 }
 
-void IAPListener_Callback(void* Lv, const char* result_json, int error_code)
+static void IAPListener_Callback(void* luacallback, const char* result_json, int error_code)
 {
-    lua_State* L = g_IAP.m_Listener.m_L;
-    int top = lua_gettop(L);
-    if (g_IAP.m_Listener.m_Callback == LUA_NOREF) {
-        dmLogError("No callback set");
-        return;
-    }
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
+    dmScript::LuaCallbackInfo* callback = (dmScript::LuaCallbackInfo*)luacallback;
+    lua_State* L = dmScript::GetCallbackLuaContext(callback);
+    DM_LUA_STACK_CHECK(L, 0);
 
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
+    if (!dmScript::SetupCallback(callback))
     {
-        dmLogError("Could not run IAP callback because the instance has been deleted.");
-        lua_pop(L, 2);
-        assert(top == lua_gettop(L));
         return;
     }
+
     if (result_json) {
         dmJson::Document doc;
         dmJson::Result r = dmJson::Parse(result_json, &doc);
@@ -197,21 +147,22 @@ void IAPListener_Callback(void* Lv, const char* result_json, int error_code)
                 break;
         }
     }
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("Error running callback: %s", lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
-    assert(top == lua_gettop(L));
+
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::TeardownCallback(callback);
 }
 
 
-int IAP_Buy(lua_State* L)
+static int IAP_Buy(lua_State* L)
 {
-    if (g_IAP.m_Listener.m_Callback == LUA_NOREF) {
+    DM_LUA_STACK_CHECK(L, 0);
+
+    if (!g_IAP.m_Listener) {
         dmLogError("No callback set");
         return 0;
     }
+
     int top = lua_gettop(L);
     const char* id = luaL_checkstring(L, 1);
     const char* request_id = 0x0;
@@ -224,43 +175,34 @@ int IAP_Buy(lua_State* L)
         lua_pop(L, 2);
     }
 
-    dmIAPFBBuy(id, request_id, (OnIAPFBListenerCallback)IAPListener_Callback, L);
-    assert(top == lua_gettop(L));
+    dmIAPFBBuy(id, request_id, (OnIAPFBListenerCallback)IAPListener_Callback, g_IAP.m_Listener);
     return 0;
 }
 
-int IAP_SetListener(lua_State* L)
+static int IAP_SetListener(lua_State* L)
 {
-    IAP* iap = &g_IAP;
-    luaL_checktype(L, 1, LUA_TFUNCTION);
-    lua_pushvalue(L, 1);
-    int cb = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    if (iap->m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Callback);
-        dmScript::Unref(iap->m_Listener.m_L, LUA_REGISTRYINDEX, iap->m_Listener.m_Self);
-    }
-    iap->m_Listener.m_L = dmScript::GetMainThread(L);
-    iap->m_Listener.m_Callback = cb;
-    dmScript::GetInstance(L);
-    iap->m_Listener.m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
+    DM_LUA_STACK_CHECK(L, 0);
+    if (g_IAP.m_Listener)
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+    g_IAP.m_Listener = dmScript::CreateCallback(L, 1);
     return 0;
 }
 
-int IAP_Finish(lua_State* L)
+static int IAP_Finish(lua_State* L)
 {
     return 0;
 }
 
-int IAP_Restore(lua_State* L)
+static int IAP_Restore(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 1);
     lua_pushboolean(L, 0);
     return 1;
 }
 
-int IAP_GetProviderId(lua_State* L)
+static int IAP_GetProviderId(lua_State* L)
 {
+    DM_LUA_STACK_CHECK(L, 1);
     lua_pushinteger(L, PROVIDER_ID_FACEBOOK);
     return 1;
 }
@@ -273,16 +215,17 @@ static const luaL_reg IAP_methods[] =
     {"restore", IAP_Restore},
     {"set_listener", IAP_SetListener},
     {"get_provider_id", IAP_GetProviderId},
+    {"process_pending_transactions", IAP_ProcessPendingTransactions},
     {0, 0}
 };
 
-dmExtension::Result InitializeIAP(dmExtension::Params* params)
+static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
     if (g_IAP.m_InitCount == 0) {
         g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
     }
     g_IAP.m_InitCount++;
-    lua_State*L = params->m_L;
+    lua_State* L = params->m_L;
     int top = lua_gettop(L);
     luaL_register(L, LIB_NAME, IAP_methods);
 
@@ -293,15 +236,13 @@ dmExtension::Result InitializeIAP(dmExtension::Params* params)
     return dmExtension::RESULT_OK;
 }
 
-dmExtension::Result FinalizeIAP(dmExtension::Params* params)
+static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
     --g_IAP.m_InitCount;
-    if (params->m_L == g_IAP.m_Listener.m_L && g_IAP.m_Listener.m_Callback != LUA_NOREF) {
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Callback);
-        dmScript::Unref(g_IAP.m_Listener.m_L, LUA_REGISTRYINDEX, g_IAP.m_Listener.m_Self);
-        g_IAP.m_Listener.m_L = 0;
-        g_IAP.m_Listener.m_Callback = LUA_NOREF;
-        g_IAP.m_Listener.m_Self = LUA_NOREF;
+    if (g_IAP.m_Listener && g_IAP.m_InitCount == 0)
+    {
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+        g_IAP.m_Listener = 0;
     }
     return dmExtension::RESULT_OK;
 }

extension-iap/src/iap_ios.mm

@@ -23,13 +23,13 @@ struct IAP
     {
         memset(this, 0, sizeof(*this));
         m_AutoFinishTransactions = true;
-        IAP_ClearCallback(&m_Listener);
     }
     int                             m_InitCount;
     bool                            m_AutoFinishTransactions;
     NSMutableDictionary*            m_PendingTransactions;
-    IAPListener                     m_Listener;
+    dmScript::LuaCallbackInfo*      m_Listener;
     IAPCommandQueue                 m_CommandQueue;
+    IAPCommandQueue                 m_ObservableQueue;
     SKPaymentTransactionObserver*   m_Observer;
 };
 
@@ -101,15 +101,14 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 
 
 @interface SKProductsRequestDelegate : NSObject<SKProductsRequestDelegate>
-    @property IAPListener m_Callback;
+    @property dmScript::LuaCallbackInfo* m_Callback;
     @property (assign) SKProductsRequest* m_Request;
 @end
 
 @implementation SKProductsRequestDelegate
 - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response{
 
-    IAPListener callback = self.m_Callback;
-    if (!IAP_CallbackIsValid(&callback)) {
+    if (!dmScript::IsCallbackValid(self.m_Callback)) {
         dmLogError("No callback set");
         return;
     }
@@ -121,8 +120,20 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 
         IAPProduct product = {0};
         product.ident           = strdup([p.productIdentifier UTF8String]);
-        product.title           = strdup([p.localizedTitle UTF8String]);
-        product.description     = strdup([p.localizedDescription UTF8String]);
+        if (p.localizedTitle) {
+            product.title       = strdup([p.localizedTitle UTF8String]);
+        }
+        else {
+            dmLogWarning("Product %s has no localizedTitle", [p.productIdentifier UTF8String]);
+            product.title       = "";
+        }
+        if (p.localizedDescription) {
+            product.description = strdup([p.localizedDescription UTF8String]);
+        }
+        else {
+            dmLogWarning("Product %s has no localizedDescription", [p.productIdentifier UTF8String]);
+            product.description = "";
+        }
         product.currency_code   = strdup([[p.priceLocale objectForKey:NSLocaleCurrencyCode] UTF8String]);
         product.price           = p.price.floatValue;
 
@@ -141,7 +152,7 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 
     IAPCommand cmd;
     cmd.m_Command = IAP_PRODUCT_RESULT;
-    cmd.m_Callback = callback;
+    cmd.m_Callback = self.m_Callback;
     cmd.m_Data = iap_response;
     IAP_Queue_Push(&g_IAP.m_CommandQueue, &cmd);
 }
@@ -151,10 +162,10 @@ static void HandleProductResult(IAPCommand* cmd)
 
     IAPResponse* response = (IAPResponse*)cmd->m_Data;
 
-    lua_State* L = cmd->m_Callback.m_L;
+    lua_State* L = dmScript::GetCallbackLuaContext(g_IAP.m_Listener);
     int top = lua_gettop(L);
 
-    if (!IAP_SetupCallback(&cmd->m_Callback))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
         assert(top == lua_gettop(L));
         delete response;
@@ -188,13 +199,10 @@ static void HandleProductResult(IAPCommand* cmd)
     }
     lua_pushnil(L);
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("%d: Error running callback: %s", __LINE__, lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
 
-    IAP_UnregisterCallback(&cmd->m_Callback);
+    dmScript::TeardownCallback(cmd->m_Callback);
+    dmScript::DestroyCallback(cmd->m_Callback);
 
     delete response;
     assert(top == lua_gettop(L));
@@ -203,8 +211,7 @@ static void HandleProductResult(IAPCommand* cmd)
 - (void)request:(SKRequest *)request didFailWithError:(NSError *)error{
     dmLogWarning("SKProductsRequest failed: %s", [error.localizedDescription UTF8String]);
 
-    IAPListener callback = self.m_Callback;
-    if (!IAP_CallbackIsValid(&callback)) {
+    if (!dmScript::IsCallbackValid(self.m_Callback)) {
         dmLogError("No callback set");
         return;
     }
@@ -215,7 +222,7 @@ static void HandleProductResult(IAPCommand* cmd)
 
     IAPCommand cmd;
     cmd.m_Command = IAP_PRODUCT_RESULT;
-    cmd.m_Callback = callback;
+    cmd.m_Callback = self.m_Callback;
     cmd.m_Data = response;
 
     IAP_Queue_Push(&g_IAP.m_CommandQueue, &cmd);
@@ -239,6 +246,7 @@ static void CopyTransaction(SKPaymentTransaction* transaction, IAPTransaction* o
     }
 
     NSDateFormatter *dateFormatter = [[[NSDateFormatter alloc] init] autorelease];
+    [dateFormatter setLocale: [NSLocale localeWithLocaleIdentifier:@"en_US_POSIX"]];
     [dateFormatter setDateFormat:@"yyyy-MM-dd'T'HH:mm:ssZZZ"];
 
     out->ident = strdup([transaction.payment.productIdentifier UTF8String]);
@@ -300,13 +308,12 @@ static void PushTransaction(lua_State* L, IAPTransaction* transaction)
 
 static void HandlePurchaseResult(IAPCommand* cmd)
 {
-
     IAPTransaction* transaction = (IAPTransaction*)cmd->m_Data;
 
-    lua_State* L = cmd->m_Callback.m_L;
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
     int top = lua_gettop(L);
 
-    if (!IAP_SetupCallback(&cmd->m_Callback))
+    if (!dmScript::SetupCallback(cmd->m_Callback))
     {
         assert(top == lua_gettop(L));
         return;
@@ -321,11 +328,9 @@ static void HandlePurchaseResult(IAPCommand* cmd)
         lua_pushnil(L);
     }
 
-    int ret = lua_pcall(L, 3, 0, 0);
-    if (ret != 0) {
-        dmLogError("%d: Error running callback: %s", __LINE__, lua_tostring(L, -1));
-        lua_pop(L, 1);
-    }
+    dmScript::PCall(L, 3, 0);
+
+    dmScript::TeardownCallback(cmd->m_Callback);
 
     IAP_FreeTransaction(transaction);
 
@@ -333,29 +338,25 @@ static void HandlePurchaseResult(IAPCommand* cmd)
     assert(top == lua_gettop(L));
 }
 
-@implementation SKPaymentTransactionObserver
-    - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions
-    {
-        for (SKPaymentTransaction* transaction in transactions) {
-
-            if ((!self.m_IAP->m_AutoFinishTransactions) && (transaction.transactionState == SKPaymentTransactionStatePurchased)) {
+static void processTransactions(IAP* iap, NSArray* transactions) {
+    for (SKPaymentTransaction* transaction in transactions) {
+            if ((!iap->m_AutoFinishTransactions) && (transaction.transactionState == SKPaymentTransactionStatePurchased)) {
                 NSData *data = [transaction.transactionIdentifier dataUsingEncoding:NSUTF8StringEncoding];
                 uint64_t trans_id_hash = dmHashBuffer64((const char*) [data bytes], [data length]);
-                [self.m_IAP->m_PendingTransactions setObject:transaction forKey:[NSNumber numberWithInteger:trans_id_hash] ];
+                [iap->m_PendingTransactions setObject:transaction forKey:[NSNumber numberWithInteger:trans_id_hash] ];
             }
 
-            bool has_listener = self.m_IAP->m_Listener.m_Callback != LUA_NOREF;
-            if (!has_listener)
+            if (!iap->m_Listener)
                 continue;
 
             IAPTransaction* iap_transaction = new IAPTransaction;
             CopyTransaction(transaction, iap_transaction);
 
             IAPCommand cmd;
-            cmd.m_Callback = self.m_IAP->m_Listener;
+            cmd.m_Callback = iap->m_Listener;
             cmd.m_Command = IAP_PURCHASE_RESULT;
             cmd.m_Data = iap_transaction;
-            IAP_Queue_Push(&self.m_IAP->m_CommandQueue, &cmd);
+            IAP_Queue_Push(&iap->m_ObservableQueue, &cmd);
 
             switch (transaction.transactionState)
             {
@@ -373,7 +374,19 @@ static void HandlePurchaseResult(IAPCommand* cmd)
                 default:
                     break;
             }
-        }
+    }
+}
+
+static int IAP_ProcessPendingTransactions(lua_State* L)
+{
+    processTransactions(&g_IAP, [SKPaymentQueue defaultQueue].transactions);
+    return 0;
+}
+
+@implementation SKPaymentTransactionObserver
+    - (void)paymentQueue:(SKPaymentQueue *)queue updatedTransactions:(NSArray *)transactions
+    {
+        processTransactions(self.m_IAP, transactions);
     }
 @end
 
@@ -394,10 +407,7 @@ static int IAP_List(lua_State* L)
     SKProductsRequest* products_request = [[SKProductsRequest alloc] initWithProductIdentifiers: product_identifiers];
     SKProductsRequestDelegate* delegate = [SKProductsRequestDelegate alloc];
 
-    IAPListener callback;
-    IAP_RegisterCallback(L, 2, &callback);
-    delegate.m_Callback = callback;
-
+    delegate.m_Callback = dmScript::CreateCallback(L, 2);
     delegate.m_Request = products_request;
     products_request.delegate = delegate;
     [products_request start];
@@ -486,20 +496,10 @@ static int IAP_SetListener(lua_State* L)
 {
     IAP* iap = &g_IAP;
 
-    IAP_UnregisterCallback(&iap->m_Listener);
-    IAP_RegisterCallback(L, 1, &iap->m_Listener);
-
-    if (g_IAP.m_Observer == 0) {
-        SKPaymentTransactionObserver* observer = [[SKPaymentTransactionObserver alloc] init];
-        observer.m_IAP = &g_IAP;
-        // NOTE: We add the listener *after* a lua listener is set
-        // The payment queue is persistent and "old" transaction might be processed
-        // from previous session. We call "finishTransaction" when appropriate
-        // for all transaction and we must ensure that the result is delivered to lua.
-        [[SKPaymentQueue defaultQueue] addTransactionObserver: observer];
-        g_IAP.m_Observer = observer;
-    }
+    if (iap->m_Listener)
+        dmScript::DestroyCallback(iap->m_Listener);
 
+    iap->m_Listener = dmScript::CreateCallback(L, 1);
     return 0;
 }
 
@@ -517,6 +517,7 @@ static const luaL_reg IAP_methods[] =
     {"restore", IAP_Restore},
     {"set_listener", IAP_SetListener},
     {"get_provider_id", IAP_GetProviderId},
+    {"process_pending_transactions", IAP_ProcessPendingTransactions},
     {0, 0}
 };
 
@@ -531,6 +532,7 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
     g_IAP.m_InitCount++;
 
     IAP_Queue_Create(&g_IAP.m_CommandQueue);
+    IAP_Queue_Create(&g_IAP.m_ObservableQueue);
 
     lua_State*L = params->m_L;
     int top = lua_gettop(L);
@@ -546,6 +548,12 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 
     lua_pop(L, 1);
     assert(top == lua_gettop(L));
+
+    SKPaymentTransactionObserver* observer = [[SKPaymentTransactionObserver alloc] init];
+    observer.m_IAP = &g_IAP;
+    [[SKPaymentQueue defaultQueue] addTransactionObserver: observer];
+    g_IAP.m_Observer = observer;
+
     return dmExtension::RESULT_OK;
 }
 
@@ -568,6 +576,9 @@ static void IAP_OnCommand(IAPCommand* cmd, void*)
 static dmExtension::Result UpdateIAP(dmExtension::Params* params)
 {
     IAP_Queue_Flush(&g_IAP.m_CommandQueue, IAP_OnCommand, 0);
+    if (g_IAP.m_Observer) {
+        IAP_Queue_Flush(&g_IAP.m_ObservableQueue, IAP_OnCommand, 0);
+    }
     return dmExtension::RESULT_OK;
 }
 
@@ -577,8 +588,9 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 
     // TODO: Should we support one listener per lua-state?
     // Or just use a single lua-state...?
-    if (params->m_L == g_IAP.m_Listener.m_L) {
-        IAP_UnregisterCallback(&g_IAP.m_Listener);
+    if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
+        dmScript::DestroyCallback(g_IAP.m_Listener);
+        g_IAP.m_Listener = 0;
     }
 
     if (g_IAP.m_InitCount == 0) {
@@ -595,6 +607,7 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
     }
 
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
+    IAP_Queue_Destroy(&g_IAP.m_ObservableQueue);
 
     return dmExtension::RESULT_OK;
 }

extension-iap/src/iap_private.cpp

@@ -7,65 +7,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-
-IAPListener::IAPListener() {
-    IAP_ClearCallback(this);
-}
-
-void IAP_ClearCallback(IAPListener* callback)
-{
-    callback->m_L = 0;
-    callback->m_Callback = LUA_NOREF;
-    callback->m_Self = LUA_NOREF;
-}
-
-void IAP_RegisterCallback(lua_State* L, int index, IAPListener* callback)
-{
-    luaL_checktype(L, index, LUA_TFUNCTION);
-    lua_pushvalue(L, index);
-    callback->m_Callback = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    dmScript::GetInstance(L);
-    callback->m_Self = dmScript::Ref(L, LUA_REGISTRYINDEX);
-
-    callback->m_L = L;
-}
-
-void IAP_UnregisterCallback(IAPListener* callback)
-{
-    if (LUA_NOREF != callback->m_Callback)
-        dmScript::Unref(callback->m_L, LUA_REGISTRYINDEX, callback->m_Callback);
-    if (LUA_NOREF != callback->m_Self)
-        dmScript::Unref(callback->m_L, LUA_REGISTRYINDEX, callback->m_Self);
-    callback->m_Callback = LUA_NOREF;
-    callback->m_Self = LUA_NOREF;
-    callback->m_L = 0;
-}
-
-bool IAP_SetupCallback(IAPListener* callback)
-{
-    lua_State* L = callback->m_L;
-    lua_rawgeti(L, LUA_REGISTRYINDEX, callback->m_Callback);
-
-    // Setup self
-    lua_rawgeti(L, LUA_REGISTRYINDEX, callback->m_Self);
-    lua_pushvalue(L, -1);
-    dmScript::SetInstance(L);
-
-    if (!dmScript::IsInstanceValid(L))
-    {
-        dmLogError("Could not run callback because the instance has been deleted.");
-        lua_pop(L, 2);
-        return false;
-    }
-    return true;
-}
-
-bool IAP_CallbackIsValid(IAPListener* callback)
-{
-    return callback != 0 && callback->m_L != 0 && callback->m_Callback != LUA_NOREF && callback->m_Self != LUA_NOREF;
-}
-
 // Creates a comma separated string, given a table where all values are strings (or numbers)
 // Returns a malloc'ed string, which the caller must free
 char* IAP_List_CreateBuffer(lua_State* L)

extension-iap/src/iap_private.h

@@ -5,16 +5,6 @@
 
 #include <dmsdk/sdk.h>
 
-// TODO: Rename Callback
-struct IAPListener
-{
-    IAPListener();
-
-    lua_State* m_L;
-    int        m_Callback;
-    int        m_Self;
-};
-
 enum EIAPCommand
 {
 	IAP_PRODUCT_RESULT,
@@ -29,7 +19,7 @@ struct DM_ALIGNED(16) IAPCommand
     }
 
     // Used for storing eventual callback info (if needed)
-    IAPListener m_Callback;
+    dmScript::LuaCallbackInfo* m_Callback;
 
     // THe actual command payload
     int32_t  	m_Command;
@@ -43,12 +33,6 @@ struct IAPCommandQueue
     dmMutex::HMutex      m_Mutex;
 };
 
-void IAP_ClearCallback(IAPListener* callback);
-void IAP_RegisterCallback(lua_State* L, int index, IAPListener* callback);
-void IAP_UnregisterCallback(IAPListener* callback);
-bool IAP_SetupCallback(IAPListener* callback);
-bool IAP_CallbackIsValid(IAPListener* callback);
-
 char* IAP_List_CreateBuffer(lua_State* L);
 void IAP_PushError(lua_State* L, const char* error, int reason);
 void IAP_PushConstants(lua_State* L);

extension-iap/src/java/com/defold/iap/IListProductsListener.java

@@ -1,5 +1,5 @@
 package com.defold.iap;
 
 public interface IListProductsListener {
-	public void onProductsResult(int resultCode, String productList);
+	public void onProductsResult(int resultCode, String productList, long cmdHandle);
 }

extension-iap/src/java/com/defold/iap/IapAmazon.java

@@ -35,6 +35,7 @@ public class IapAmazon implements PurchasingListener {
     public static final String TAG = "iap";
 
     private HashMap<RequestId, IListProductsListener> listProductsListeners;
+    private HashMap<RequestId, Long> listProductsCommandPtrs;
     private HashMap<RequestId, IPurchaseListener> purchaseListeners;
 
     private Activity activity;
@@ -54,7 +55,7 @@ public class IapAmazon implements PurchasingListener {
     public void stop() {
     }
 
-    public void listItems(final String skus, final IListProductsListener listener) {
+    public void listItems(final String skus, final IListProductsListener listener, final long commandPtr) {
         final Set<String> skuSet = new HashSet<String>();
         for (String x : skus.split(",")) {
             if (x.trim().length() > 0) {
@@ -71,6 +72,7 @@ public class IapAmazon implements PurchasingListener {
             RequestId req = PurchasingService.getProductData(skuSet);
             if (req != null) {
                 listProductsListeners.put(req, listener);
+                listProductsCommandPtrs.put(req, commandPtr);
             } else {
                 Log.e(TAG, "Did not expect a null requestId");
             }
@@ -150,17 +152,21 @@ public class IapAmazon implements PurchasingListener {
     public void onProductDataResponse(ProductDataResponse productDataResponse) {
         RequestId reqId = productDataResponse.getRequestId();
         IListProductsListener listener;
+        long commadPtr = 0;
         synchronized (this.listProductsListeners) {
             listener = this.listProductsListeners.get(reqId);
+            commadPtr = this.listProductsCommandPtrs.get(reqId);
+
+            this.listProductsListeners.remove(reqId);
+            this.listProductsCommandPtrs.remove(reqId);
             if (listener == null) {
                 Log.e(TAG, "No listener found for request " + reqId.toString());
                 return;
             }
-            this.listProductsListeners.remove(reqId);
         }
 
         if (productDataResponse.getRequestStatus() != ProductDataResponse.RequestStatus.SUCCESSFUL) {
-            listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null);
+            listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null, commadPtr);
         } else {
             Map<String, Product> products = productDataResponse.getProductData();
             try {
@@ -180,9 +186,9 @@ public class IapAmazon implements PurchasingListener {
                     }
                     data.put(key, item);
                 }
-                listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_OK, data.toString());
+                listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_OK, data.toString(), commadPtr);
             } catch (JSONException e) {
-                listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null);
+                listener.onProductsResult(IapJNI.BILLING_RESPONSE_RESULT_ERROR, null, commadPtr);
             }
         }
     }

extension-iap/src/java/com/defold/iap/IapGooglePlay.java

@@ -17,6 +17,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.content.ServiceConnection;
 import android.content.pm.ResolveInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
@@ -67,7 +68,7 @@ public class IapGooglePlay implements Handler.Callback {
     private boolean autoFinishTransactions;
 
     private static interface ISkuRequestListener {
-    	public void onProducts(int resultCode, JSONObject products);
+        public void onProducts(int resultCode, JSONObject products);
     }
 
     private static class SkuRequest {
@@ -155,10 +156,24 @@ public class IapGooglePlay implements Handler.Callback {
         this.autoFinishTransactions = autoFinishTransactions;
     }
 
+    private static boolean isPlayStoreInstalled(Context context){
+        try {
+            context.getPackageManager().getPackageInfo("com.android.vending", 0);
+            return true;
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+    }
+
     private void init() {
         // NOTE: We must create Handler lazily as construction of
         // handlers must be in the context of a "looper" on Android
 
+        if (!isPlayStoreInstalled(activity)) {
+            Log.e(TAG, "Unable to find Google Play Store (com.android.vending)");
+            return;
+        }
+
         if (this.initialized)
             return;
 
@@ -238,7 +253,7 @@ public class IapGooglePlay implements Handler.Callback {
         });
     }
 
-    public void listItems(final String skus, final IListProductsListener listener) {
+    public void listItems(final String skus, final IListProductsListener listener, final long commandPtr) {
         ArrayList<String> skuList = new ArrayList<String>();
         for (String x : skus.split(",")) {
             if (x.trim().length() > 0) {
@@ -261,15 +276,15 @@ public class IapGooglePlay implements Handler.Callback {
                                 products.put(key, convertProduct(product));
                             }
                         }
-                        listener.onProductsResult(resultCode, products.toString());
+                        listener.onProductsResult(resultCode, products.toString(), commandPtr);
                     }
                     catch(JSONException e) {
                         Log.wtf(TAG, "Failed to convert products", e);
-                        listener.onProductsResult(resultCode, null);
+                        listener.onProductsResult(resultCode, null, commandPtr);
                     }
                 }
                 else {
-                    listener.onProductsResult(resultCode, null);
+                    listener.onProductsResult(resultCode, null, commandPtr);
                 }
             }
         }));

extension-iap/src/java/com/defold/iap/IapGooglePlayActivity.java

@@ -69,8 +69,8 @@ public class IapGooglePlayActivity extends Activity {
     }
 
     private void buy(String product, String productType) {
-    	// Flush any pending items, in order to be able to buy the same (new) product again
-    	processPendingConsumables();
+        // Flush any pending items, in order to be able to buy the same (new) product again
+        processPendingConsumables();
 
         try {
             Bundle buyIntentBundle = service.getBuyIntent(3, getPackageName(), product, productType, "");

extension-iap/src/java/com/defold/iap/IapJNI.java

@@ -23,7 +23,7 @@ public class IapJNI implements IListProductsListener, IPurchaseListener {
     }
 
     @Override
-    public native void onProductsResult(int responseCode, String productList);
+    public native void onProductsResult(int responseCode, String productList, long cmdHandle);
 
     @Override
     public native void onPurchaseResult(int responseCode, String purchaseData);

game.project

@@ -5,13 +5,13 @@ main_collection = /main/main.collectionc
 shared_state = 1
 
 [display]
-width = 960
-height = 640
+width = 640
+height = 1136
 
 [android]
 input_method = HiddenInputField
-package = com.defold.iaprtestapp
-version_code = 3
+package = com.defold.extension.iap
+version_code = 5
 
 [project]
 title = extension-iap
@@ -21,8 +21,11 @@ dependencies = https://github.com/andsve/dirtylarry/archive/master.zip
 include_dirs = extension-iap
 
 [ios]
-bundle_identifier = com.defoldextension.push
+bundle_identifier = com.defold.extension.iap
 
 [iap]
 auto_finish_transactions = 0
 
+[osx]
+bundle_identifier = com.defold.extension.iap
+

main/main.gui

@@ -41,7 +41,7 @@ nodes {
     w: 1.0
   }
   type: TYPE_TEMPLATE
-  id: "consumable"
+  id: "goldbars_small"
   layer: ""
   inherit_alpha: true
   alpha: 1.0
@@ -82,12 +82,12 @@ nodes {
   type: TYPE_BOX
   blend_mode: BLEND_MODE_ALPHA
   texture: "button/button_normal"
-  id: "consumable/larrybutton"
+  id: "goldbars_small/larrybutton"
   xanchor: XANCHOR_NONE
   yanchor: YANCHOR_NONE
   pivot: PIVOT_CENTER
   adjust_mode: ADJUST_MODE_FIT
-  parent: "consumable"
+  parent: "goldbars_small"
   layer: ""
   inherit_alpha: true
   slice9 {
@@ -129,16 +129,16 @@ nodes {
     w: 1.0
   }
   color {
-    x: 0.6
-    y: 0.0
-    z: 0.0
+    x: 1.0
+    y: 1.0
+    z: 1.0
     w: 1.0
   }
   type: TYPE_TEXT
   blend_mode: BLEND_MODE_ALPHA
-  text: "consumable"
+  text: "Goldbars - S"
   font: "larryfont"
-  id: "consumable/larrylabel"
+  id: "goldbars_small/larrylabel"
   xanchor: XANCHOR_NONE
   yanchor: YANCHOR_NONE
   pivot: PIVOT_CENTER
@@ -156,172 +156,12 @@ nodes {
   }
   adjust_mode: ADJUST_MODE_FIT
   line_break: false
-  parent: "consumable/larrybutton"
+  parent: "goldbars_small/larrybutton"
   layer: ""
   inherit_alpha: true
   alpha: 1.0
   outline_alpha: 1.0
   shadow_alpha: 1.0
-  overridden_fields: 5
-  overridden_fields: 8
-  template_node_child: true
-  text_leading: 1.0
-  text_tracking: 0.0
-}
-nodes {
-  position {
-    x: 171.0
-    y: 449.0
-    z: 0.0
-    w: 1.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  size {
-    x: 200.0
-    y: 100.0
-    z: 0.0
-    w: 1.0
-  }
-  color {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  type: TYPE_TEMPLATE
-  id: "nonconsumable"
-  layer: ""
-  inherit_alpha: true
-  alpha: 1.0
-  template: "/dirtylarry/button.gui"
-  template_node_child: false
-}
-nodes {
-  position {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  size {
-    x: 300.0
-    y: 88.0
-    z: 0.0
-    w: 1.0
-  }
-  color {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  type: TYPE_BOX
-  blend_mode: BLEND_MODE_ALPHA
-  texture: "button/button_normal"
-  id: "nonconsumable/larrybutton"
-  xanchor: XANCHOR_NONE
-  yanchor: YANCHOR_NONE
-  pivot: PIVOT_CENTER
-  adjust_mode: ADJUST_MODE_FIT
-  parent: "nonconsumable"
-  layer: ""
-  inherit_alpha: true
-  slice9 {
-    x: 32.0
-    y: 32.0
-    z: 32.0
-    w: 32.0
-  }
-  clipping_mode: CLIPPING_MODE_NONE
-  clipping_visible: true
-  clipping_inverted: false
-  alpha: 1.0
-  template_node_child: true
-  size_mode: SIZE_MODE_MANUAL
-}
-nodes {
-  position {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  rotation {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  scale {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  size {
-    x: 200.0
-    y: 100.0
-    z: 0.0
-    w: 1.0
-  }
-  color {
-    x: 0.6
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  type: TYPE_TEXT
-  blend_mode: BLEND_MODE_ALPHA
-  text: "non-consumable"
-  font: "larryfont"
-  id: "nonconsumable/larrylabel"
-  xanchor: XANCHOR_NONE
-  yanchor: YANCHOR_NONE
-  pivot: PIVOT_CENTER
-  outline {
-    x: 0.0
-    y: 0.0
-    z: 0.0
-    w: 1.0
-  }
-  shadow {
-    x: 1.0
-    y: 1.0
-    z: 1.0
-    w: 1.0
-  }
-  adjust_mode: ADJUST_MODE_FIT
-  line_break: false
-  parent: "nonconsumable/larrybutton"
-  layer: ""
-  inherit_alpha: true
-  alpha: 1.0
-  outline_alpha: 1.0
-  shadow_alpha: 1.0
-  overridden_fields: 5
   overridden_fields: 8
   template_node_child: true
   text_leading: 1.0
@@ -330,7 +170,7 @@ nodes {
 nodes {
   position {
     x: 485.0
-    y: 449.0
+    y: 56.0
     z: 0.0
     w: 1.0
   }
@@ -447,14 +287,14 @@ nodes {
     w: 1.0
   }
   color {
-    x: 0.6
-    y: 0.0
-    z: 0.0
+    x: 1.0
+    y: 1.0
+    z: 1.0
     w: 1.0
   }
   type: TYPE_TEXT
   blend_mode: BLEND_MODE_ALPHA
-  text: "<- reset"
+  text: "Reset"
   font: "larryfont"
   id: "reset/larrylabel"
   xanchor: XANCHOR_NONE
@@ -480,7 +320,700 @@ nodes {
   alpha: 1.0
   outline_alpha: 1.0
   shadow_alpha: 1.0
-  overridden_fields: 5
+  overridden_fields: 8
+  template_node_child: true
+  text_leading: 1.0
+  text_tracking: 0.0
+}
+nodes {
+  position {
+    x: 20.0
+    y: 1124.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 600.0
+    y: 450.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEXT
+  blend_mode: BLEND_MODE_ALPHA
+  text: "<text>"
+  font: "system_font"
+  id: "log"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_NW
+  outline {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  shadow {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  adjust_mode: ADJUST_MODE_FIT
+  line_break: true
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  outline_alpha: 1.0
+  shadow_alpha: 1.0
+  template_node_child: false
+  text_leading: 1.0
+  text_tracking: 0.0
+}
+nodes {
+  position {
+    x: 171.0
+    y: 465.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEMPLATE
+  id: "goldbars_medium"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  template: "/dirtylarry/button.gui"
+  template_node_child: false
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 300.0
+    y: 88.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_BOX
+  blend_mode: BLEND_MODE_ALPHA
+  texture: "button/button_normal"
+  id: "goldbars_medium/larrybutton"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  adjust_mode: ADJUST_MODE_FIT
+  parent: "goldbars_medium"
+  layer: ""
+  inherit_alpha: true
+  slice9 {
+    x: 32.0
+    y: 32.0
+    z: 32.0
+    w: 32.0
+  }
+  clipping_mode: CLIPPING_MODE_NONE
+  clipping_visible: true
+  clipping_inverted: false
+  alpha: 1.0
+  template_node_child: true
+  size_mode: SIZE_MODE_MANUAL
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEXT
+  blend_mode: BLEND_MODE_ALPHA
+  text: "Goldbars - M"
+  font: "larryfont"
+  id: "goldbars_medium/larrylabel"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  outline {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  shadow {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  adjust_mode: ADJUST_MODE_FIT
+  line_break: false
+  parent: "goldbars_medium/larrybutton"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  outline_alpha: 1.0
+  shadow_alpha: 1.0
+  overridden_fields: 8
+  template_node_child: true
+  text_leading: 1.0
+  text_tracking: 0.0
+}
+nodes {
+  position {
+    x: 171.0
+    y: 357.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEMPLATE
+  id: "goldbars_large"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  template: "/dirtylarry/button.gui"
+  template_node_child: false
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 300.0
+    y: 88.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_BOX
+  blend_mode: BLEND_MODE_ALPHA
+  texture: "button/button_normal"
+  id: "goldbars_large/larrybutton"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  adjust_mode: ADJUST_MODE_FIT
+  parent: "goldbars_large"
+  layer: ""
+  inherit_alpha: true
+  slice9 {
+    x: 32.0
+    y: 32.0
+    z: 32.0
+    w: 32.0
+  }
+  clipping_mode: CLIPPING_MODE_NONE
+  clipping_visible: true
+  clipping_inverted: false
+  alpha: 1.0
+  template_node_child: true
+  size_mode: SIZE_MODE_MANUAL
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEXT
+  blend_mode: BLEND_MODE_ALPHA
+  text: "Goldbars - L"
+  font: "larryfont"
+  id: "goldbars_large/larrylabel"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  outline {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  shadow {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  adjust_mode: ADJUST_MODE_FIT
+  line_break: false
+  parent: "goldbars_large/larrybutton"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  outline_alpha: 1.0
+  shadow_alpha: 1.0
+  overridden_fields: 8
+  template_node_child: true
+  text_leading: 1.0
+  text_tracking: 0.0
+}
+nodes {
+  position {
+    x: 159.0
+    y: 56.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEMPLATE
+  id: "list"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  template: "/dirtylarry/button.gui"
+  template_node_child: false
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 300.0
+    y: 88.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_BOX
+  blend_mode: BLEND_MODE_ALPHA
+  texture: "button/button_normal"
+  id: "list/larrybutton"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  adjust_mode: ADJUST_MODE_FIT
+  parent: "list"
+  layer: ""
+  inherit_alpha: true
+  slice9 {
+    x: 32.0
+    y: 32.0
+    z: 32.0
+    w: 32.0
+  }
+  clipping_mode: CLIPPING_MODE_NONE
+  clipping_visible: true
+  clipping_inverted: false
+  alpha: 1.0
+  template_node_child: true
+  size_mode: SIZE_MODE_MANUAL
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEXT
+  blend_mode: BLEND_MODE_ALPHA
+  text: "List"
+  font: "larryfont"
+  id: "list/larrylabel"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  outline {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  shadow {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  adjust_mode: ADJUST_MODE_FIT
+  line_break: false
+  parent: "list/larrybutton"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  outline_alpha: 1.0
+  shadow_alpha: 1.0
+  overridden_fields: 8
+  template_node_child: true
+  text_leading: 1.0
+  text_tracking: 0.0
+}
+nodes {
+  position {
+    x: 171.0
+    y: 251.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEMPLATE
+  id: "subscription"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  template: "/dirtylarry/button.gui"
+  template_node_child: false
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 300.0
+    y: 88.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_BOX
+  blend_mode: BLEND_MODE_ALPHA
+  texture: "button/button_normal"
+  id: "subscription/larrybutton"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  adjust_mode: ADJUST_MODE_FIT
+  parent: "subscription"
+  layer: ""
+  inherit_alpha: true
+  slice9 {
+    x: 32.0
+    y: 32.0
+    z: 32.0
+    w: 32.0
+  }
+  clipping_mode: CLIPPING_MODE_NONE
+  clipping_visible: true
+  clipping_inverted: false
+  alpha: 1.0
+  template_node_child: true
+  size_mode: SIZE_MODE_MANUAL
+}
+nodes {
+  position {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  rotation {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  scale {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  size {
+    x: 200.0
+    y: 100.0
+    z: 0.0
+    w: 1.0
+  }
+  color {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  type: TYPE_TEXT
+  blend_mode: BLEND_MODE_ALPHA
+  text: "Subscription"
+  font: "larryfont"
+  id: "subscription/larrylabel"
+  xanchor: XANCHOR_NONE
+  yanchor: YANCHOR_NONE
+  pivot: PIVOT_CENTER
+  outline {
+    x: 0.0
+    y: 0.0
+    z: 0.0
+    w: 1.0
+  }
+  shadow {
+    x: 1.0
+    y: 1.0
+    z: 1.0
+    w: 1.0
+  }
+  adjust_mode: ADJUST_MODE_FIT
+  line_break: false
+  parent: "subscription/larrybutton"
+  layer: ""
+  inherit_alpha: true
+  alpha: 1.0
+  outline_alpha: 1.0
+  shadow_alpha: 1.0
   overridden_fields: 8
   template_node_child: true
   text_leading: 1.0

main/main.gui_script

@@ -1,59 +1,113 @@
 local dirtylarry = require "dirtylarry/dirtylarry"
 
+local GOLDBARS_SMALL = "com.defold.iap.goldbar.small"
+local GOLDBARS_MEDIUM = "com.defold.iap.goldbar.medium"
+local GOLDBARS_LARGE = "com.defold.iap.goldbar.large"
+local SUBSCRIPTION = "com.defold.iap.subscription"
+
 local items = {
-	"consumable",
-	"nonconsumable"
+	GOLDBARS_SMALL,
+	GOLDBARS_MEDIUM,
+	GOLDBARS_LARGE,
+	SUBSCRIPTION,
 }
 
-local product_items = {}
+-- mapping between product id and button name
+local item_buttons = {
+	[GOLDBARS_SMALL] = "goldbars_small",
+	[GOLDBARS_MEDIUM] = "goldbars_medium",
+	[GOLDBARS_LARGE] = "goldbars_large",
+	[SUBSCRIPTION] = "subscription",
+}
 
-local function list_callback(self, products, error)
-	if error == nil then
-		for k,p in pairs(products) do
-			product_items[p.ident] = p
-			local name = p.ident.."/larrylabel"
-			gui.set_color(gui.get_node(name), vmath.vector4(1,1,1,1))
-		end
-	else
-		print(error.error)
+local available_items = {}
+
+local LOG = {}
+
+local function log(fmt, ...)
+	if not fmt then return end
+	local line = fmt:format(...)
+	print(line)
+	table.insert(LOG, line)
+	if #LOG > 10 then
+		table.remove(LOG, 1)
 	end
+	local s = table.concat(LOG, "\n")
+	gui.set_text(gui.get_node("log"), s)
 end
 
+local function buy(id)
+	log("iap.buy() " .. id)
+	iap.buy(id)
+end
+
+local function list()
+	log("iap.list()")
+	for item, button in pairs(item_buttons) do
+		gui.set_color(gui.get_node(button.."/larrylabel"), vmath.vector4(1,1,1,0.5))
+	end
+	iap.list(items, function(self, products, error)
+		if error then
+			log(error.error)
+			return
+		end
+
+		for k,p in pairs(products) do
+			available_items[p.ident] = p
+			log("Item %s", p.ident)
+			local button = item_buttons[p.ident]
+			if button then
+				gui.set_color(gui.get_node(button.."/larrylabel"), vmath.vector4(1,1,1,1))
+			else
+				log("Unable to find button for %s", tostring(p.ident))
+			end
+		end
+	end)
+end
+
+
 local function buy_listener(self, transaction, error)
 	pprint(transaction, error)
-	if not error and iap.get_provider_id() == iap.PROVIDER_ID_GOOGLE and transaction.ident == "nonconsumable" then
-		local name = "reset/larrylabel"
-		gui.set_color(gui.get_node(name), vmath.vector4(1,1,1,1))
+	if error then
+		log("iap.buy() error %s - %s", tostring(error.error), tostring(error.reason))
+		return
+	end
+	
+	if iap.get_provider_id() == iap.PROVIDER_ID_GOOGLE and transaction.ident == NON_CONSUMABLE then
+		log("iap.buy() ok - google")
+		gui.set_color(gui.get_node("reset/larrylabel"), vmath.vector4(1,1,1,1))
 		product_items["reset"] = transaction
-	elseif not error then
+	else
+		log("iap.buy() ok")
+		log("iap.finish()")
 		iap.finish(transaction)
 	end
 end
 
 function init(self)
+	self.log = {}
+	log("init()")
 	msg.post(".", "acquire_input_focus")
-	iap.list(items, list_callback)
+	if not iap then
+		log("In-App Purchases not supported")
+		return
+	end
+
+	list()
 	iap.set_listener(buy_listener)
 end
 
 function on_input(self, action_id, action)
-	if product_items["consumable"] then
-		dirtylarry:button("consumable", action_id, action, function()
-			iap.buy("consumable")
+	if action_id then
+		for item, button in pairs(item_buttons) do
+			if available_items[item] then
+				dirtylarry:button(button, action_id, action, function()
+					buy(item)
+				end)
+			end
+		end
+		dirtylarry:button("list", action_id, action, function()
+			list()
 		end)
-	end	
-
-	if product_items["nonconsumable"] then
-		dirtylarry:button("nonconsumable", action_id, action, function()
-			iap.buy("nonconsumable")
-		end)
-	end	
-
-	if product_items["reset"] then
-		dirtylarry:button("reset", action_id, action, function()
-			iap.finish(product_items["reset"])
-			product_items["reset"] =  nil
-			gui.set_color(gui.get_node("reset/larrylabel"), vmath.vector4(1,0,0,1))
-		end)
-	end	
+	end
 end