Merge pull request #39 from defold/dev-remove-init-count

Do not track init count for multiple Lua states

extension-iap/src/iap_android.cpp

@@ -30,12 +30,10 @@ struct IAP
         m_autoFinishTransactions = true;
         m_ProviderId = PROVIDER_ID_GOOGLE;
     }
-    int             m_InitCount;
     bool            m_autoFinishTransactions;
     int             m_ProviderId;
 
     dmScript::LuaCallbackInfo* m_Listener;
-    dmScript::LuaCallbackInfo* m_RestoreListener;
 
     jobject         m_IAP;
     jobject         m_IAPJNI;
@@ -192,23 +190,14 @@ static int IAP_Restore(lua_State* L)
 {
     // TODO: Missing callback here for completion/error
     // See iap_ios.mm
-    DM_LUA_STACKCHECK(L, 1);
-
-    if (iap->m_RestoreListener)
-    {
-        dmScript::DestroyCallback(iap->m_RestoreListener);
-        iap->m_RestoreListener = 0;
-    }
-
-    if (lua_isfunction(L, 1))
-    {
-        iap->m_RestoreListener = dmScript::CreateCallback(L, 1);
-    }
 
+    int top = lua_gettop(L);
     JNIEnv* env = Attach();
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Restore, g_IAP.m_IAPJNI);
     Detach();
 
+    assert(top == lua_gettop(L));
+
     lua_pushboolean(L, 1);
     return 1;
 }
@@ -409,9 +398,6 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
 
 static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
-    // TODO: Life-cycle managaemnt is *budget*. No notion of "static initalization"
-    // Extend extension functionality with per system initalization?
-    if (g_IAP.m_InitCount == 0) {
     IAP_Queue_Create(&g_IAP.m_CommandQueue);
 
     g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
@@ -460,8 +446,6 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
     g_IAP.m_IAPJNI = env->NewGlobalRef(env->NewObject(iap_jni_class, jni_constructor));
 
     Detach();
-    }
-    g_IAP.m_InitCount++;
 
     lua_State*L = params->m_L;
     int top = lua_gettop(L);
@@ -504,26 +488,18 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
 static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
-    --g_IAP.m_InitCount;
 
     if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
         dmScript::DestroyCallback(g_IAP.m_Listener);
         g_IAP.m_Listener = 0;
     }
 
-    if (iap->m_RestoreListener)
-    {
-        dmScript::DestroyCallback(iap->m_RestoreListener);
-    }
-
-    if (g_IAP.m_InitCount == 0) {
     JNIEnv* env = Attach();
     env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Stop);
     env->DeleteGlobalRef(g_IAP.m_IAP);
     env->DeleteGlobalRef(g_IAP.m_IAPJNI);
     Detach();
     g_IAP.m_IAP = NULL;
-    }
     return dmExtension::RESULT_OK;
 }
 

extension-iap/src/iap_ios.mm

@@ -24,11 +24,10 @@ struct IAP
         memset(this, 0, sizeof(*this));
         m_AutoFinishTransactions = true;
     }
-    int                             m_InitCount;
+    int                             m_Version;
     bool                            m_AutoFinishTransactions;
     NSMutableDictionary*            m_PendingTransactions;
     dmScript::LuaCallbackInfo*      m_Listener;
-    dmScript::LuaCallbackInfo*      m_RestoreListener;
     IAPCommandQueue                 m_CommandQueue;
     IAPCommandQueue                 m_ObservableQueue;
     SKPaymentTransactionObserver*   m_Observer;
@@ -104,11 +103,17 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
 @interface SKProductsRequestDelegate : NSObject<SKProductsRequestDelegate>
     @property dmScript::LuaCallbackInfo* m_Callback;
     @property (assign) SKProductsRequest* m_Request;
+    @property int m_Version;
 @end
 
 @implementation SKProductsRequestDelegate
 - (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response{
 
+    if (self.m_Version != g_IAP.m_Version) {
+        dmLogWarning("Received products but the extension has been restarted")
+        return;
+    }
+
     if (!dmScript::IsCallbackValid(self.m_Callback)) {
         dmLogError("No callback set");
         return;
@@ -163,7 +168,7 @@ static void HandleProductResult(IAPCommand* cmd)
 
     IAPResponse* response = (IAPResponse*)cmd->m_Data;
 
-    lua_State* L = dmScript::GetCallbackLuaContext(g_IAP.m_Listener);
+    lua_State* L = dmScript::GetCallbackLuaContext(cmd->m_Callback);
     int top = lua_gettop(L);
 
     if (!dmScript::SetupCallback(cmd->m_Callback))
@@ -410,6 +415,7 @@ static int IAP_List(lua_State* L)
 
     delegate.m_Callback = dmScript::CreateCallback(L, 2);
     delegate.m_Request = products_request;
+    delegate.m_Version = g_IAP.m_Version;
     products_request.delegate = delegate;
     [products_request start];
 
@@ -530,13 +536,9 @@ static const luaL_reg IAP_methods[] =
 
 static dmExtension::Result InitializeIAP(dmExtension::Params* params)
 {
-    // TODO: Life-cycle managaemnt is *budget*. No notion of "static initalization"
-    // Extend extension functionality with per system initalization?
-    if (g_IAP.m_InitCount == 0) {
     g_IAP.m_AutoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
     g_IAP.m_PendingTransactions = [[NSMutableDictionary alloc]initWithCapacity:2];
-    }
-    g_IAP.m_InitCount++;
+    g_IAP.m_Version++;
 
     IAP_Queue_Create(&g_IAP.m_CommandQueue);
     IAP_Queue_Create(&g_IAP.m_ObservableQueue);
@@ -591,21 +593,9 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
 
 static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
 {
-    --g_IAP.m_InitCount;
-
-    // TODO: Should we support one listener per lua-state?
-    // Or just use a single lua-state...?
-    if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
     dmScript::DestroyCallback(g_IAP.m_Listener);
     g_IAP.m_Listener = 0;
-    }
 
-    if (iap->m_RestoreListener)
-    {
-        dmScript::DestroyCallback(iap->m_RestoreListener);
-    }
-
-    if (g_IAP.m_InitCount == 0) {
     if (g_IAP.m_PendingTransactions) {
          [g_IAP.m_PendingTransactions release];
          g_IAP.m_PendingTransactions = 0;
@@ -616,7 +606,6 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
         [g_IAP.m_Observer release];
         g_IAP.m_Observer = 0;
     }
-    }
 
     IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
     IAP_Queue_Destroy(&g_IAP.m_ObservableQueue);