Added iap.acknowledge
This commit is contained in:
Björn Ritzl
parent
b1233f5912
commit
497d0dee1e
@ -61,6 +61,19 @@
|
||||
type: table
|
||||
desc: transaction table parameter as supplied in listener callback
|
||||
|
||||
#*****************************************************************************************************
|
||||
|
||||
- name: acknowledge
|
||||
type: function
|
||||
desc: Acknowledges a product transaction but does not consume it.
|
||||
[icon:attention] [icon:googleplay] Calling iap.acknowledge is required on a successful transaction
|
||||
on Google Play unless iap.finish is called.
|
||||
The `transaction.state` field must equal `iap.TRANS_STATE_PURCHASED`.
|
||||
parameters:
|
||||
- name: transaction
|
||||
type: table
|
||||
desc: transaction table parameter as supplied in listener callback
|
||||
|
||||
#*****************************************************************************************************
|
||||
|
||||
- name: get_provider_id
|
||||
@ -302,5 +315,3 @@
|
||||
- name: TRANS_STATE_UNVERIFIED
|
||||
type: number
|
||||
desc: transaction unverified state, requires verification of purchase
|
||||
|
||||
|
||||
|
||||
@ -43,6 +43,7 @@ struct IAP
|
||||
jmethodID m_Buy;
|
||||
jmethodID m_Restore;
|
||||
jmethodID m_ProcessPendingConsumables;
|
||||
jmethodID m_AcknowledgeTransaction;
|
||||
jmethodID m_FinishTransaction;
|
||||
|
||||
IAPCommandQueue m_CommandQueue;
|
||||
@ -146,6 +147,46 @@ static int IAP_Finish(lua_State* L)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int IAP_Acknowledge(lua_State* L)
|
||||
{
|
||||
int top = lua_gettop(L);
|
||||
|
||||
luaL_checktype(L, 1, LUA_TTABLE);
|
||||
|
||||
lua_getfield(L, -1, "state");
|
||||
if (lua_isnumber(L, -1))
|
||||
{
|
||||
if(lua_tointeger(L, -1) != TRANS_STATE_PURCHASED)
|
||||
{
|
||||
dmLogError("Invalid transaction state (must be iap.TRANS_STATE_PURCHASED).");
|
||||
lua_pop(L, 1);
|
||||
assert(top == lua_gettop(L));
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
lua_pop(L, 1);
|
||||
|
||||
lua_getfield(L, -1, "receipt");
|
||||
if (!lua_isstring(L, -1)) {
|
||||
dmLogError("Transaction error. Invalid transaction data, does not contain 'receipt' key.");
|
||||
lua_pop(L, 1);
|
||||
}
|
||||
else
|
||||
{
|
||||
const char * receipt = lua_tostring(L, -1);
|
||||
lua_pop(L, 1);
|
||||
|
||||
JNIEnv* env = Attach();
|
||||
jstring receiptUTF = env->NewStringUTF(receipt);
|
||||
env->CallVoidMethod(g_IAP.m_IAP, g_IAP.m_AcknowledgeTransaction, receiptUTF, g_IAP.m_IAPJNI);
|
||||
env->DeleteLocalRef(receiptUTF);
|
||||
Detach();
|
||||
}
|
||||
|
||||
assert(top == lua_gettop(L));
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int IAP_Restore(lua_State* L)
|
||||
{
|
||||
// TODO: Missing callback here for completion/error
|
||||
@ -193,6 +234,7 @@ static const luaL_reg IAP_methods[] =
|
||||
{"list", IAP_List},
|
||||
{"buy", IAP_Buy},
|
||||
{"finish", IAP_Finish},
|
||||
{"acknowledge", IAP_Acknowledge},
|
||||
{"restore", IAP_Restore},
|
||||
{"set_listener", IAP_SetListener},
|
||||
{"get_provider_id", IAP_GetProviderId},
|
||||
@ -226,6 +268,7 @@ JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onProductsResult(JNIEnv* env,
|
||||
|
||||
JNIEXPORT void JNICALL Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_String_2(JNIEnv* env, jobject, jint responseCode, jstring purchaseData)
|
||||
{
|
||||
dmLogInfo("Java_com_defold_iap_IapJNI_onPurchaseResult__ILjava_lang_String_2 %d", (int)responseCode);
|
||||
const char* pd = 0;
|
||||
if (purchaseData)
|
||||
{
|
||||
@ -398,6 +441,7 @@ static dmExtension::Result InitializeIAP(dmExtension::Params* params)
|
||||
g_IAP.m_Stop = env->GetMethodID(iap_class, "stop", "()V");
|
||||
g_IAP.m_ProcessPendingConsumables = env->GetMethodID(iap_class, "processPendingConsumables", "(Lcom/defold/iap/IPurchaseListener;)V");
|
||||
g_IAP.m_FinishTransaction = env->GetMethodID(iap_class, "finishTransaction", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
|
||||
g_IAP.m_AcknowledgeTransaction = env->GetMethodID(iap_class, "acknowledgeTransaction", "(Ljava/lang/String;Lcom/defold/iap/IPurchaseListener;)V");
|
||||
|
||||
jmethodID jni_constructor = env->GetMethodID(iap_class, "<init>", "(Landroid/app/Activity;Z)V");
|
||||
g_IAP.m_IAP = env->NewGlobalRef(env->NewObject(iap_class, jni_constructor, dmGraphics::GetNativeAndroidActivity(), g_IAP.m_autoFinishTransactions));
|
||||
|
||||
@ -193,6 +193,11 @@ static int IAP_Finish(lua_State* L)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int IAP_Acknowledge(lua_State* L)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int IAP_Restore(lua_State* L)
|
||||
{
|
||||
DM_LUA_STACK_CHECK(L, 1);
|
||||
@ -212,6 +217,7 @@ static const luaL_reg IAP_methods[] =
|
||||
{"list", IAP_List},
|
||||
{"buy", IAP_Buy},
|
||||
{"finish", IAP_Finish},
|
||||
{"acknowledge", IAP_Acknowledge},
|
||||
{"restore", IAP_Restore},
|
||||
{"set_listener", IAP_SetListener},
|
||||
{"get_provider_id", IAP_GetProviderId},
|
||||
|
||||
@ -503,6 +503,11 @@ static int IAP_SetListener(lua_State* L)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int IAP_Acknowledge(lua_State* L)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int IAP_GetProviderId(lua_State* L)
|
||||
{
|
||||
lua_pushinteger(L, PROVIDER_ID_APPLE);
|
||||
@ -514,6 +519,7 @@ static const luaL_reg IAP_methods[] =
|
||||
{"list", IAP_List},
|
||||
{"buy", IAP_Buy},
|
||||
{"finish", IAP_Finish},
|
||||
{"acknowledge", IAP_Acknowledge},
|
||||
{"restore", IAP_Restore},
|
||||
{"set_listener", IAP_SetListener},
|
||||
{"get_provider_id", IAP_GetProviderId},
|
||||
|
||||
@ -28,11 +28,12 @@ import com.android.billingclient.api.SkuDetails;
|
||||
import com.android.billingclient.api.ConsumeParams;
|
||||
import com.android.billingclient.api.BillingFlowParams;
|
||||
import com.android.billingclient.api.SkuDetailsParams;
|
||||
import com.android.billingclient.api.AcknowledgePurchaseParams;
|
||||
import com.android.billingclient.api.PurchasesUpdatedListener;
|
||||
import com.android.billingclient.api.BillingClientStateListener;
|
||||
import com.android.billingclient.api.ConsumeResponseListener;
|
||||
import com.android.billingclient.api.SkuDetailsResponseListener;
|
||||
|
||||
import com.android.billingclient.api.AcknowledgePurchaseResponseListener;
|
||||
|
||||
public class IapGooglePlay implements PurchasesUpdatedListener {
|
||||
public static final String TAG = "IapGooglePlay";
|
||||
@ -70,7 +71,14 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
|
||||
|
||||
public void stop() {
|
||||
Log.d(TAG, "stop()");
|
||||
billingClient.endConnection();
|
||||
this.activity.runOnUiThread(new Runnable() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (billingClient.isReady()) {
|
||||
billingClient.endConnection();
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public String toISO8601(final Date date) {
|
||||
@ -172,6 +180,7 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
|
||||
defoldResponse = IapJNI.BILLING_RESPONSE_RESULT_ERROR;
|
||||
break;
|
||||
}
|
||||
Log.d(TAG, "billingResponseCodeToDefoldResponse: " + responseCode + " defoldResponse: " + defoldResponse);
|
||||
return defoldResponse;
|
||||
}
|
||||
|
||||
@ -241,6 +250,29 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Called from Lua. This method will try to acknowledge a purchase (but not finish/consume it).
|
||||
*/
|
||||
public void acknowledgeTransaction(final String purchaseToken, final IPurchaseListener purchaseListener) {
|
||||
Log.d(TAG, "acknowledgeTransaction() " + purchaseToken);
|
||||
|
||||
AcknowledgePurchaseParams acknowledgeParams = AcknowledgePurchaseParams.newBuilder()
|
||||
.setPurchaseToken(purchaseToken)
|
||||
.build();
|
||||
|
||||
billingClient.acknowledgePurchase(acknowledgeParams, new AcknowledgePurchaseResponseListener() {
|
||||
@Override
|
||||
public void onAcknowledgePurchaseResponse(BillingResult billingResult) {
|
||||
Log.d(TAG, "acknowledgeTransaction() response code " + billingResult.getResponseCode());
|
||||
// note: we only call the purchase listener if an error happens
|
||||
if (billingResult.getResponseCode() != BillingResponseCode.OK) {
|
||||
Log.e(TAG, "Unable to acknowledge purchase: " + billingResult.getDebugMessage());
|
||||
purchaseListener.onPurchaseResult(billingResultToDefoldResponse(billingResult), "");
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Handle a purchase. If the extension is configured to automatically
|
||||
* finish transactions the purchase will be immediately consumed. Otherwise
|
||||
@ -385,7 +417,11 @@ public class IapGooglePlay implements PurchasesUpdatedListener {
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Called from Lua.
|
||||
*/
|
||||
public void restore(final IPurchaseListener listener) {
|
||||
Log.d(TAG, "restore()");
|
||||
processPendingConsumables(listener);
|
||||
}
|
||||
}
|
||||
|
||||
316
main/main.gui
316
main/main.gui
@ -1180,6 +1180,322 @@ nodes {
|
||||
text_leading: 1.0
|
||||
text_tracking: 0.0
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 40.0
|
||||
y: 153.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
rotation {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
scale {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
size {
|
||||
x: 200.0
|
||||
y: 100.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
color {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
type: TYPE_TEMPLATE
|
||||
id: "chk_finish"
|
||||
layer: ""
|
||||
inherit_alpha: true
|
||||
alpha: 1.0
|
||||
template: "/dirtylarry/checkbox_label.gui"
|
||||
template_node_child: false
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
rotation {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
scale {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
size {
|
||||
x: 64.0
|
||||
y: 68.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
color {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
type: TYPE_BOX
|
||||
blend_mode: BLEND_MODE_ALPHA
|
||||
texture: "checkbox/checkbox_normal"
|
||||
id: "chk_finish/larrycheckbox"
|
||||
xanchor: XANCHOR_NONE
|
||||
yanchor: YANCHOR_NONE
|
||||
pivot: PIVOT_CENTER
|
||||
adjust_mode: ADJUST_MODE_FIT
|
||||
parent: "chk_finish"
|
||||
layer: ""
|
||||
inherit_alpha: true
|
||||
slice9 {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 0.0
|
||||
}
|
||||
clipping_mode: CLIPPING_MODE_NONE
|
||||
clipping_visible: true
|
||||
clipping_inverted: false
|
||||
alpha: 1.0
|
||||
template_node_child: true
|
||||
size_mode: SIZE_MODE_MANUAL
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 46.0
|
||||
y: 3.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
rotation {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
scale {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
size {
|
||||
x: 200.0
|
||||
y: 50.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
color {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
type: TYPE_TEXT
|
||||
blend_mode: BLEND_MODE_ALPHA
|
||||
text: "Finish"
|
||||
font: "larryfont"
|
||||
id: "chk_finish/larrylabel"
|
||||
xanchor: XANCHOR_NONE
|
||||
yanchor: YANCHOR_NONE
|
||||
pivot: PIVOT_W
|
||||
outline {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
shadow {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
adjust_mode: ADJUST_MODE_FIT
|
||||
line_break: false
|
||||
parent: "chk_finish"
|
||||
layer: ""
|
||||
inherit_alpha: true
|
||||
alpha: 1.0
|
||||
outline_alpha: 1.0
|
||||
shadow_alpha: 1.0
|
||||
overridden_fields: 8
|
||||
template_node_child: true
|
||||
text_leading: 1.0
|
||||
text_tracking: 0.0
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 362.0
|
||||
y: 153.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
rotation {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
scale {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
size {
|
||||
x: 200.0
|
||||
y: 100.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
color {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
type: TYPE_TEMPLATE
|
||||
id: "chk_acknowledge"
|
||||
layer: ""
|
||||
inherit_alpha: true
|
||||
alpha: 1.0
|
||||
template: "/dirtylarry/checkbox_label.gui"
|
||||
template_node_child: false
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
rotation {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
scale {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
size {
|
||||
x: 64.0
|
||||
y: 68.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
color {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
type: TYPE_BOX
|
||||
blend_mode: BLEND_MODE_ALPHA
|
||||
texture: "checkbox/checkbox_normal"
|
||||
id: "chk_acknowledge/larrycheckbox"
|
||||
xanchor: XANCHOR_NONE
|
||||
yanchor: YANCHOR_NONE
|
||||
pivot: PIVOT_CENTER
|
||||
adjust_mode: ADJUST_MODE_FIT
|
||||
parent: "chk_acknowledge"
|
||||
layer: ""
|
||||
inherit_alpha: true
|
||||
slice9 {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 0.0
|
||||
}
|
||||
clipping_mode: CLIPPING_MODE_NONE
|
||||
clipping_visible: true
|
||||
clipping_inverted: false
|
||||
alpha: 1.0
|
||||
template_node_child: true
|
||||
size_mode: SIZE_MODE_MANUAL
|
||||
}
|
||||
nodes {
|
||||
position {
|
||||
x: 46.0
|
||||
y: 3.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
rotation {
|
||||
x: 0.0
|
||||
y: 0.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
scale {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
size {
|
||||
x: 200.0
|
||||
y: 50.0
|
||||
z: 0.0
|
||||
w: 1.0
|
||||
}
|
||||
color {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
type: TYPE_TEXT
|
||||
blend_mode: BLEND_MODE_ALPHA
|
||||
text: "Acknowledge"
|
||||
font: "larryfont"
|
||||
id: "chk_acknowledge/larrylabel"
|
||||
xanchor: XANCHOR_NONE
|
||||
yanchor: YANCHOR_NONE
|
||||
pivot: PIVOT_W
|
||||
outline {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
shadow {
|
||||
x: 1.0
|
||||
y: 1.0
|
||||
z: 1.0
|
||||
w: 1.0
|
||||
}
|
||||
adjust_mode: ADJUST_MODE_FIT
|
||||
line_break: false
|
||||
parent: "chk_acknowledge"
|
||||
layer: ""
|
||||
inherit_alpha: true
|
||||
alpha: 1.0
|
||||
outline_alpha: 1.0
|
||||
shadow_alpha: 1.0
|
||||
overridden_fields: 8
|
||||
template_node_child: true
|
||||
text_leading: 1.0
|
||||
text_tracking: 0.0
|
||||
}
|
||||
material: "/builtins/materials/gui.material"
|
||||
adjust_reference: ADJUST_REFERENCE_PARENT
|
||||
max_nodes: 512
|
||||
|
||||
@ -89,13 +89,20 @@ local function buy_listener(self, transaction, error)
|
||||
product_items["reset"] = transaction
|
||||
else
|
||||
log("iap.buy() ok %s", transaction.ident)
|
||||
log("iap.finish() %s", transaction.ident)
|
||||
iap.finish(transaction)
|
||||
if self.finish then
|
||||
log("iap.finish() %s", transaction.ident)
|
||||
iap.finish(transaction)
|
||||
elseif self.acknowledge then
|
||||
log("iap.acknowledge() %s", transaction.ident)
|
||||
iap.acknowledge(transaction)
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
function init(self)
|
||||
self.log = {}
|
||||
self.finish = false
|
||||
self.acknowledge = false
|
||||
log("init()")
|
||||
msg.post(".", "acquire_input_focus")
|
||||
if not iap then
|
||||
@ -125,5 +132,7 @@ function on_input(self, action_id, action)
|
||||
dirtylarry:button("pending", action_id, action, function()
|
||||
process_pending_transactions()
|
||||
end)
|
||||
self.finish = dirtylarry:checkbox("chk_finish", action_id, action, self.finish)
|
||||
self.acknowledge = dirtylarry:checkbox("chk_acknowledge", action_id, action, self.acknowledge)
|
||||
end
|
||||
end
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user