Partydeck/IAP-Extension
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Do not track init count for multiple Lua states
This commit is contained in:
Björn Ritzl 2021-04-28 10:08:40 +02:00 committed by GitHub
commit 112744c6bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 59 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
extension-iap/src/iap_android.cpp
View File

@ -30,7 +30,6 @@ struct IAP
m_autoFinishTransactions = true; m_autoFinishTransactions = true;
m_ProviderId = PROVIDER_ID_GOOGLE; m_ProviderId = PROVIDER_ID_GOOGLE;
} }
int m_InitCount;
bool m_autoFinishTransactions; bool m_autoFinishTransactions;
int m_ProviderId; int m_ProviderId;
@ -399,9 +398,6 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
static dmExtension::Result InitializeIAP(dmExtension::Params* params) 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); IAP_Queue_Create(&g_IAP.m_CommandQueue);
g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1; g_IAP.m_autoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
@ -450,8 +446,6 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
g_IAP.m_IAPJNI = env->NewGlobalRef(env->NewObject(iap_jni_class, jni_constructor)); g_IAP.m_IAPJNI = env->NewGlobalRef(env->NewObject(iap_jni_class, jni_constructor));
Detach(); Detach();
}
g_IAP.m_InitCount++;
lua_State*L = params->m_L; lua_State*L = params->m_L;
int top = lua_gettop(L); int top = lua_gettop(L);
@ -494,21 +488,18 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
static dmExtension::Result FinalizeIAP(dmExtension::Params* params) static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
{ {
IAP_Queue_Destroy(&g_IAP.m_CommandQueue); IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
--g_IAP.m_InitCount;
if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) { if (params->m_L == dmScript::GetCallbackLuaContext(g_IAP.m_Listener)) {
dmScript::DestroyCallback(g_IAP.m_Listener); dmScript::DestroyCallback(g_IAP.m_Listener);
g_IAP.m_Listener = 0; g_IAP.m_Listener = 0;
} }
if (g_IAP.m_InitCount == 0) {
JNIEnv* env = Attach(); JNIEnv* env = Attach();
env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Stop); env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Stop);
env->DeleteGlobalRef(g_IAP.m_IAP); env->DeleteGlobalRef(g_IAP.m_IAP);
env->DeleteGlobalRef(g_IAP.m_IAPJNI); env->DeleteGlobalRef(g_IAP.m_IAPJNI);
Detach(); Detach();
g_IAP.m_IAP = NULL; g_IAP.m_IAP = NULL;
}
return dmExtension::RESULT_OK; return dmExtension::RESULT_OK;
} }

14
extension-iap/src/iap_ios.mm
View File

@ -24,7 +24,6 @@ struct IAP
memset(this, 0, sizeof(*this)); memset(this, 0, sizeof(*this));
m_AutoFinishTransactions = true; m_AutoFinishTransactions = true;
} }
int m_InitCount;
int m_Version; int m_Version;
bool m_AutoFinishTransactions; bool m_AutoFinishTransactions;
NSMutableDictionary* m_PendingTransactions; NSMutableDictionary* m_PendingTransactions;
@ -537,13 +536,8 @@ static const luaL_reg IAP_methods[] =
static dmExtension::Result InitializeIAP(dmExtension::Params* params) 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_AutoFinishTransactions = dmConfigFile::GetInt(params->m_ConfigFile, "iap.auto_finish_transactions", 1) == 1;
g_IAP.m_PendingTransactions = [[NSMutableDictionary alloc]initWithCapacity:2]; g_IAP.m_PendingTransactions = [[NSMutableDictionary alloc]initWithCapacity:2];
}
g_IAP.m_InitCount++;
g_IAP.m_Version++; g_IAP.m_Version++;
IAP_Queue_Create(&g_IAP.m_CommandQueue); IAP_Queue_Create(&g_IAP.m_CommandQueue);
@ -599,16 +593,9 @@ static dmExtension::Result UpdateIAP(dmExtension::Params* params)
static dmExtension::Result FinalizeIAP(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); dmScript::DestroyCallback(g_IAP.m_Listener);
g_IAP.m_Listener = 0; g_IAP.m_Listener = 0;
}
if (g_IAP.m_InitCount == 0) {
if (g_IAP.m_PendingTransactions) { if (g_IAP.m_PendingTransactions) {
[g_IAP.m_PendingTransactions release]; [g_IAP.m_PendingTransactions release];
g_IAP.m_PendingTransactions = 0; g_IAP.m_PendingTransactions = 0;
@ -619,7 +606,6 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
[g_IAP.m_Observer release]; [g_IAP.m_Observer release];
g_IAP.m_Observer = 0; g_IAP.m_Observer = 0;
} }
}
IAP_Queue_Destroy(&g_IAP.m_CommandQueue); IAP_Queue_Destroy(&g_IAP.m_CommandQueue);
IAP_Queue_Destroy(&g_IAP.m_ObservableQueue); IAP_Queue_Destroy(&g_IAP.m_ObservableQueue);