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

Work in progress

Browse Source
This commit is contained in:
Björn Ritzl 2021-04-27 19:41:59 +02:00
parent 257f95f1d3
commit 53ae8a308e
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -35,6 +35,7 @@ struct IAP
int m_ProviderId; int m_ProviderId;
dmScript::LuaCallbackInfo* m_Listener; dmScript::LuaCallbackInfo* m_Listener;
dmScript::LuaCallbackInfo* m_RestoreListener;
jobject m_IAP; jobject m_IAP;
jobject m_IAPJNI; jobject m_IAPJNI;
@ -191,14 +192,23 @@ static int IAP_Restore(lua_State* L)
{ {
// TODO: Missing callback here for completion/error // TODO: Missing callback here for completion/error
// See iap_ios.mm // 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(); JNIEnv* env = Attach();
env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Restore, g_IAP.m_IAPJNI); env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_Restore, g_IAP.m_IAPJNI);
Detach(); Detach();
assert(top == lua_gettop(L));
lua_pushboolean(L, 1); lua_pushboolean(L, 1);
return 1; return 1;
} }
@ -501,6 +511,11 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
g_IAP.m_Listener = 0; g_IAP.m_Listener = 0;
} }
if (iap->m_RestoreListener)
{
dmScript::DestroyCallback(iap->m_RestoreListener);
}
if (g_IAP.m_InitCount == 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);

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

@ -28,6 +28,7 @@ struct IAP
bool m_AutoFinishTransactions; bool m_AutoFinishTransactions;
NSMutableDictionary* m_PendingTransactions; NSMutableDictionary* m_PendingTransactions;
dmScript::LuaCallbackInfo* m_Listener; dmScript::LuaCallbackInfo* m_Listener;
dmScript::LuaCallbackInfo* m_RestoreListener;
IAPCommandQueue m_CommandQueue; IAPCommandQueue m_CommandQueue;
IAPCommandQueue m_ObservableQueue; IAPCommandQueue m_ObservableQueue;
SKPaymentTransactionObserver* m_Observer; SKPaymentTransactionObserver* m_Observer;
@ -599,6 +600,11 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
g_IAP.m_Listener = 0; g_IAP.m_Listener = 0;
} }
if (iap->m_RestoreListener)
{
dmScript::DestroyCallback(iap->m_RestoreListener);
}
if (g_IAP.m_InitCount == 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];