Merge pull request #5 from godot-x/fix-android-fetch

fix android fetch

Author: paulocoutinhox

README.md

@@ -135,18 +135,36 @@ func _on_purchase_result(data):
 revenuecat.fetch_offerings()
 
 # Products (for custom UI)
-revenuecat.fetch_products(["premium_monthly", "premium_yearly"])
 revenuecat.products.connect(_on_products_received)
+revenuecat.fetch_products(["premium_monthly", "premium_yearly"])
 
-func _on_products_received(data):
-    if data["error"].is_empty():
-        var products = data["products"]
-        for product in products:
-            print("ID: ", product["id"])
-            print("Title: ", product["title"])
-            print("Price: ", product["price"])
-    else:
-        print("Error: ", data["error"])
+func _on_products_received(data: Dictionary):
+    var error = data.get("error", "")
+    if error != "":
+        print("Error: ", error)
+        return
+    
+    var raw_products = data.get("products", null)
+    if raw_products == null:
+        return
+    
+    var products_list: Array = []
+    
+    # ios - native array
+    if raw_products is Array:
+        products_list = raw_products
+    
+    # android - array list
+    elif raw_products is JavaObject:
+        var count: int = raw_products.call("size")
+        for i in range(count):
+            products_list.append(raw_products.call("get", i))
+    
+    # process products
+    for product in products_list:
+        print("ID: ", product["id"])
+        print("Title: ", product["title"])
+        print("Price: ", product["price"])
 ```
 
 ### Purchases Flows

addons/godotx_revenue_cat/plugin.cfg

@@ -3,5 +3,5 @@
 name="Godotx RevenueCat"
 description="RevenueCat integration for Godot"
 author="Paulo Coutinho"
-version="1.4.0"
+version="1.5.0"
 script="export_plugin.gd"

scripts/Main.gd

@@ -257,12 +257,32 @@ func _on_offerings_received(data):
 	log_message(dict_to_string(data))
 
 
-func _on_products_received(data):
+func _on_products_received(data: Dictionary):
 	log_message("🔔 SIGNAL: products")
-	if data.has("error") and not data["error"].is_empty():
-		log_message("   ❌ Error: %s" % data["error"])
-	if data.has("products"):
-		log_message(array_to_string(data["products"]))
+	
+	var error = data.get("error", "")
+	if error != "":
+		log_message("   ❌ Error: %s" % error)
+		return
+	
+	var raw_products = data.get("products", null)
+	if raw_products == null:
+		log_message("   ⚠️ No products found")
+		return
+	
+	var products_list: Array = []
+	
+	# ios - native array
+	if raw_products is Array:
+		products_list = raw_products
+	
+	# android - array list
+	elif raw_products is JavaObject:
+		var count: int = raw_products.call("size")
+		for i in range(count):
+			products_list.append(raw_products.call("get", i))
+	
+	log_message(array_to_string(products_list))
 
 
 func _on_login_finished(data):

source/android/revenue_cat/src/main/java/com/godotx/revenuecat/RevenueCatPlugin.kt

@@ -25,6 +25,7 @@ import org.godotengine.godot.Godot
 import org.godotengine.godot.plugin.GodotPlugin
 import org.godotengine.godot.plugin.SignalInfo
 import org.godotengine.godot.plugin.UsedByGodot
+import java.util.ArrayList
 
 class RevenueCatPlugin(godot: Godot) : GodotPlugin(godot) {
 
@@ -266,25 +267,29 @@ class RevenueCatPlugin(godot: Godot) : GodotPlugin(godot) {
     fun fetch_products(ids: Array<String>) {
         Purchases.sharedInstance.getProductsWith(
             productIds = ids.toList(),
+
             onError = { error ->
                 val result = Dictionary()
-                result["products"] = arrayOf<Any>()
-                result["error"] = error.message
+                result["products"] = ArrayList<Dictionary>()
+                result["error"] = error.message ?: ""
                 emitOnMain("products", result)
             },
+
             onGetStoreProducts = { products ->
-                val arr = products.map { p ->
+                val list = ArrayList<Dictionary>()
+
+                for (p in products) {
                     val d = Dictionary()
                     d["id"] = p.id
                     d["title"] = p.title
                     d["description"] = p.description
                     d["price"] = p.price.formatted
                     d["amount"] = p.price.amountMicros / 1_000_000.0
-                    d
-                }.toTypedArray()
+                    list.add(d)
+                }
 
                 val result = Dictionary()
-                result["products"] = arr
+                result["products"] = list
                 result["error"] = ""
                 emitOnMain("products", result)
             }