Partydeck/IAP-Extension-Mirror
3
0
Fork 0
mirror of https://github.com/defold/extension-iap synced 2025-06-27 10:27:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into dev-remove-init-count

Browse Source
This commit is contained in:
Björn Ritzl 2021-04-28 10:08:12 +02:00
commit 6e975b67de
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,7 @@ struct IAP
memset(this, 0, sizeof(*this)); memset(this, 0, sizeof(*this));
m_AutoFinishTransactions = true; m_AutoFinishTransactions = true;
} }
int m_Version;
bool m_AutoFinishTransactions; bool m_AutoFinishTransactions;
NSMutableDictionary* m_PendingTransactions; NSMutableDictionary* m_PendingTransactions;
dmScript::LuaCallbackInfo* m_Listener; dmScript::LuaCallbackInfo* m_Listener;
@ -102,11 +103,17 @@ static void IAP_FreeTransaction(IAPTransaction* transaction)
@interface SKProductsRequestDelegate : NSObject<SKProductsRequestDelegate> @interface SKProductsRequestDelegate : NSObject<SKProductsRequestDelegate>
@property dmScript::LuaCallbackInfo* m_Callback; @property dmScript::LuaCallbackInfo* m_Callback;
@property (assign) SKProductsRequest* m_Request; @property (assign) SKProductsRequest* m_Request;
@property int m_Version;
@end @end
@implementation SKProductsRequestDelegate @implementation SKProductsRequestDelegate
- (void)productsRequest:(SKProductsRequest *)request didReceiveResponse:(SKProductsResponse *)response{ - (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)) { if (!dmScript::IsCallbackValid(self.m_Callback)) {
dmLogError("No callback set"); dmLogError("No callback set");
return; return;
@ -161,7 +168,7 @@ static void HandleProductResult(IAPCommand* cmd)
IAPResponse* response = (IAPResponse*)cmd->m_Data; 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); int top = lua_gettop(L);
if (!dmScript::SetupCallback(cmd->m_Callback)) if (!dmScript::SetupCallback(cmd->m_Callback))
@ -408,6 +415,7 @@ static int IAP_List(lua_State* L)
delegate.m_Callback = dmScript::CreateCallback(L, 2); delegate.m_Callback = dmScript::CreateCallback(L, 2);
delegate.m_Request = products_request; delegate.m_Request = products_request;
delegate.m_Version = g_IAP.m_Version;
products_request.delegate = delegate; products_request.delegate = delegate;
[products_request start]; [products_request start];
@ -530,6 +538,7 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
{ {
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_Version++;
IAP_Queue_Create(&g_IAP.m_CommandQueue); IAP_Queue_Create(&g_IAP.m_CommandQueue);
IAP_Queue_Create(&g_IAP.m_ObservableQueue); IAP_Queue_Create(&g_IAP.m_ObservableQueue);