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

Fixed callback

Browse Source
This commit is contained in:
Alexey Gulev 2019-09-19 09:19:00 +02:00
parent 8fda0a3ae9
commit d3323f9884
1 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,6 @@ struct IAP
jmethodID m_Restore; jmethodID m_Restore;
jmethodID m_ProcessPendingConsumables; jmethodID m_ProcessPendingConsumables;
jmethodID m_FinishTransaction; jmethodID m_FinishTransaction;
int m_Pipefd[2];
}; };
IAP g_IAP; IAP g_IAP;
@ -277,9 +276,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult__ILjava_lang_
cmd.m_Data1 = strdup(pl); cmd.m_Data1 = strdup(pl);
env->ReleaseStringUTFChars(productList, pl); env->ReleaseStringUTFChars(productList, pl);
} }
if (write(g_IAP.m_Pipefd[1], &cmd, sizeof(cmd)) != sizeof(cmd)) { add_to_queue(cmd);
dmLogFatal("Failed to write command");
}
} }
JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_String_2(JNIEnv* env, jobject, jint responseCode, jstring purchaseData) JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_String_2(JNIEnv* env, jobject, jint responseCode, jstring purchaseData)
@ -299,9 +296,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_
cmd.m_Data1 = strdup(pd); cmd.m_Data1 = strdup(pd);
env->ReleaseStringUTFChars(purchaseData, pd); env->ReleaseStringUTFChars(purchaseData, pd);
} }
if (write(g_IAP.m_Pipefd[1], &cmd, sizeof(cmd)) != sizeof(cmd)) { add_to_queue(cmd);
dmLogFatal("Failed to write command");
}
} }
#ifdef __cplusplus #ifdef __cplusplus
@ -565,14 +560,6 @@ static dmExtension::Result FinalizeIAP(dmExtension::Params* params)
env->DeleteGlobalRef(g_IAP.m_IAPJNI); env->DeleteGlobalRef(g_IAP.m_IAPJNI);
Detach(); Detach();
g_IAP.m_IAP = NULL; g_IAP.m_IAP = NULL;
int result = ALooper_removeFd(g_AndroidApp->looper, g_IAP.m_Pipefd[0]);
if (result != 1) {
dmLogFatal("Could not remove fd from looper: %d", result);
}
close(g_IAP.m_Pipefd[0]);
close(g_IAP.m_Pipefd[1]);
} }
return dmExtension::RESULT_OK; return dmExtension::RESULT_OK;
} }