Merge pull request #478 from timoschwarzer/android-iap-3.2.2

Update Android IAP demo for 3.2.2

Author: aaronfranke

misc/android_iap/iap.gd

@@ -1,78 +1,117 @@
 extends Control
 
-onready var alert = get_node("alert")
+const TEST_ITEM_SKU = "my_in_app_purchase_sku"
+
+onready var alert_dialog = $AlertDialog
+onready var label = $Label
+
+var payment = null
+var test_item_purchase_token = null
 
 func _ready():
-	iap.set_auto_consume(false)
-	iap.connect("purchase_success", self, "on_purchase_success")
-	iap.connect("purchase_fail", self, "on_purchase_fail")
-	iap.connect("purchase_cancel", self, "on_purchase_cancel")
-	iap.connect("purchase_owned", self, "on_purchase_owned")
-	iap.connect("has_purchased", self, "on_has_purchased")
-	iap.connect("consume_success", self, "on_consume_success")
-	iap.connect("consume_fail", self, "on_consume_fail")
-	iap.connect("sku_details_complete", self, "on_sku_details_complete")
+	if Engine.has_singleton("GodotPayment"):
+		label.text += "\n\n\nTest item SKU: %s" % TEST_ITEM_SKU
+
+		payment = Engine.get_singleton("GodotPayment")
+		payment.connect("connected", self, "_on_connected") # No params
+		payment.connect("disconnected", self, "_on_disconnected") # No params
+		payment.connect("connect_error", self, "_on_connect_error") # Response ID (int), Debug message (string)
+		payment.connect("purchases_updated", self, "_on_purchases_updated") # Purchases (Dictionary[])
+		payment.connect("purchase_error", self, "_on_purchase_error") # Response ID (int), Debug message (string)
+		payment.connect("sku_details_query_completed", self, "_on_sku_details_query_completed") # SKUs (Dictionary[])
+		payment.connect("sku_details_query_error", self, "_on_sku_details_query_error") # Response ID (int), Debug message (string), Queried SKUs (string[])
+		payment.connect("purchase_acknowledged", self, "_on_purchase_acknowledged") # Purchase token (string)
+		payment.connect("purchase_acknowledgement_error", self, "_on_purchase_acknowledgement_error") # Response ID (int), Debug message (string), Purchase token (string)
+		payment.connect("purchase_consumed", self, "_on_purchase_consumed") # Purchase token (string)
+		payment.connect("purchase_consumption_error", self, "_on_purchase_consumption_error") # Response ID (int), Debug message (string), Purchase token (string)
+		payment.startConnection()
+	else:
+		show_alert("Android IAP support is not enabled. Make sure you have enabled 'Custom Build' and the GodotPayment plugin in your Android export settings! This application will not work.")
 
-	get_node("purchase").connect("pressed", self, "button_purchase")
-	get_node("consume").connect("pressed", self, "button_consume")
-	get_node("request").connect("pressed", self, "button_request")
-	get_node("query").connect("pressed", self, "button_query")
 
+func show_alert(text):
+	alert_dialog.dialog_text = text
+	alert_dialog.popup_centered()
 
-func on_purchase_success(item_name):
-	alert.set_text("Purchase success : " + item_name)
-	alert.popup()
 
+func _on_connected():
+	print("PurchaseManager connected")
 
-func on_purchase_fail():
-	alert.set_text("Purchase fail")
-	alert.popup()
+	# We must acknowledge all puchases.
+	# See https://developer.android.com/google/play/billing/integrate#process for more information
+	var query = payment.queryPurchases("inapp") # Use "subs" for subscriptions
+	var purchase_token = null
+	if query.status == OK:
+		for purchase in query.purchases:
+			if !purchase.is_acknowledged:
+				print("Purchase " + str(purchase.sku) + " has not been acknowledged. Acknowledging...")
+				payment.acknowledgePurchase(purchase.purchase_token)
+	else:
+		print("Purchase query failed: %d" % query.status)
 
 
-func on_purchase_cancel():
-	alert.set_text("Purchase cancel")
-	alert.popup()
+func _on_sku_details_query_completed(sku_details):
+	for available_sku in sku_details:
+		show_alert(to_json(available_sku))
 
 
-func on_purchase_owned(item_name):
-	alert.set_text("Purchase owned: " + item_name)
-	alert.popup()
+func _on_purchases_updated(purchases):
+	print("Purchases updated: %s" % to_json(purchases))
 
+	# See _on_connected
+	for purchase in purchases:
+		if !purchase.is_acknowledged:
+			print("Purchase " + str(purchase.sku) + " has not been acknowledged. Acknowledging...")
+			payment.acknowledgePurchase(purchase.purchase_token)
+
+	if purchases.size() > 0:
+		test_item_purchase_token = purchases[purchases.size() - 1].purchase_token
+
+
+func _on_purchase_acknowledged(purchase_token):
+	print("Purchase acknowledged: %s" % purchase_token)
+
+
+func _on_purchase_consumed(purchase_token):
+	show_alert("Purchase consumed successfully: %s" % purchase_token)
+
+
+func _on_purchase_error(code, message):
+	show_alert("Purchase error %d: %s" % [code, message])
 
-func on_has_purchased(item_name):
-	if item_name == null:
-		alert.set_text("Don't have purchased item")
-	else:
-		alert.set_text("Has purchased: " + item_name)
-	alert.popup()
 
+func _on_purchase_acknowledgement_error(code, message):
+	show_alert("Purchase acknowledgement error %d: %s" % [code, message])
 
-func on_consume_success(item_name):
-	alert.set_text("Consume success: " + item_name)
-	alert.popup()
 
+func _on_purchase_consumption_error(code, message):
+	show_alert("Purchase consumption error %d: %s" % [code, message])
 
-func on_consume_fail():
-	alert.set_text("Try to request purchased first")
-	alert.popup()
 
+func _on_sku_details_query_error(code, message):
+	show_alert("SKU details query error %d: %s" % [code, message])
 
-func on_sku_details_complete():
-	alert.set_text("Got detail info: " + to_json(iap.sku_details["item_test_a"]))
-	alert.popup()
 
+func _on_disconnected():
+	show_alert("GodotPayment disconnected. Will try to reconnect in 10s...")
+	yield(get_tree().create_timer(10), "timeout")
+	payment.startConnection()
 
-func button_purchase():
-	iap.purchase("item_tess")
 
+# GUI
+func _on_QuerySkuDetailsButton_pressed():
+	payment.querySkuDetails([TEST_ITEM_SKU])
 
-func button_consume():
-	iap.consume("item_tess")
 
+func _on_PurchaseButton_pressed():
+	var response = payment.purchase(TEST_ITEM_SKU)
+	if response.status != OK:
+		show_alert("Purchase error %d: %s" % [response.response_code, response.debug_message])
 
-func button_request():
-	iap.request_purchased()
 
+func _on_ConsumeButton_pressed():
+	if test_item_purchase_token == null:
+		show_alert("You need to set 'test_item_purchase_token' first! (either by hand or in code)")
+		return
 
-func button_query():
-	iap.sku_details_query(["item_test_a", "item_test_b"])
+	payment.consumePurchase(test_item_purchase_token)