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 pull request #55 from defold/fix-json-migration-issue

Browse Source 
Push nil as last argument if there is no error
This commit is contained in:
Björn Ritzl 2022-11-21 10:30:12 +01:00 committed by GitHub
commit f97a7ee6b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -308,6 +308,7 @@ static void HandleProductResult(const IAPCommand* cmd)
if (cmd->m_ResponseCode == BILLING_RESPONSE_RESULT_OK) { if (cmd->m_ResponseCode == BILLING_RESPONSE_RESULT_OK) {
const char* json = (const char*)cmd->m_Data; const char* json = (const char*)cmd->m_Data;
dmScript::JsonToLua(L, json, strlen(json)); // throws lua error if it fails dmScript::JsonToLua(L, json, strlen(json)); // throws lua error if it fails
lua_pushnil(L);
} else { } else {
dmLogError("IAP error %d", cmd->m_ResponseCode); dmLogError("IAP error %d", cmd->m_ResponseCode);
lua_pushnil(L); lua_pushnil(L);
@ -343,6 +344,7 @@ static void HandlePurchaseResult(const IAPCommand* cmd)
if (cmd->m_Data != 0) { if (cmd->m_Data != 0) {
const char* json = (const char*)cmd->m_Data; const char* json = (const char*)cmd->m_Data;
dmScript::JsonToLua(L, json, strlen(json)); // throws lua error if it fails dmScript::JsonToLua(L, json, strlen(json)); // throws lua error if it fails
lua_pushnil(L);
} else { } else {
dmLogError("IAP error, purchase response was null"); dmLogError("IAP error, purchase response was null");
lua_pushnil(L); lua_pushnil(L);

2
extension-iap/src/iap_emscripten.cpp
View File

@ -47,6 +47,7 @@ static void IAPList_Callback(void* luacallback, const char* result_json)
if(result_json != 0) if(result_json != 0)
{ {
dmScript::JsonToLua(L, result_json, strlen(result_json)); // throws lua error if it fails dmScript::JsonToLua(L, result_json, strlen(result_json)); // throws lua error if it fails
lua_pushnil(L);
} }
else else
{ {
@ -97,6 +98,7 @@ static void IAPListener_Callback(void* luacallback, const char* result_json, int
if (result_json) { if (result_json) {
dmScript::JsonToLua(L, result_json, strlen(result_json)); // throws lua error if it fails dmScript::JsonToLua(L, result_json, strlen(result_json)); // throws lua error if it fails
lua_pushnil(L);
} else { } else {
lua_pushnil(L); lua_pushnil(L);
switch(error_code) switch(error_code)