project updated

Author: paulocoutinhox

export_presets.cfg

@@ -30,7 +30,7 @@ application/code_sign_identity_release=""
 application/provisioning_profile_specifier_debug=""
 application/provisioning_profile_specifier_release=""
 application/export_method_release=0
-application/bundle_identifier=""
+application/bundle_identifier="com.castoria.app"
 application/signature=""
 application/short_version=""
 application/version=""
@@ -300,7 +300,7 @@ architectures/x86=false
 architectures/x86_64=false
 version/code=1
 version/name="1.0.0"
-package/unique_name=""
+package/unique_name="com.castoria.app"
 package/name=""
 package/signed=true
 package/app_category=2

scenes/Main.tscn

@@ -187,6 +187,14 @@ theme_override_colors/font_color = Color(1, 1, 1, 1)
 theme_override_font_sizes/font_size = 28
 text = "Purchase"
 
+[node name="RestorePurchasesButton" type="Button" parent="VBoxContainer/ScrollContainer/Content/SectionPurchases/SectionPurchasesVBox"]
+custom_minimum_size = Vector2(0, 70)
+layout_mode = 2
+size_flags_horizontal = 3
+theme_override_colors/font_color = Color(1, 1, 1, 1)
+theme_override_font_sizes/font_size = 28
+text = "Restore Purchases"
+
 [node name="SectionOfferings" type="PanelContainer" parent="VBoxContainer/ScrollContainer/Content"]
 layout_mode = 2
 theme_override_styles/panel = SubResource("StyleBoxFlat_1")
@@ -438,6 +446,7 @@ text = "Clear Log"
 [connection signal="pressed" from="VBoxContainer/ScrollContainer/Content/SectionInitialize/SectionInitializeVBox/InitializeButton" to="." method="_on_initialize_pressed"]
 [connection signal="pressed" from="VBoxContainer/ScrollContainer/Content/SectionCustomerInfo/SectionCustomerInfoVBox/GetCustomerInfoButton" to="." method="_on_get_customer_info_pressed"]
 [connection signal="pressed" from="VBoxContainer/ScrollContainer/Content/SectionPurchases/SectionPurchasesVBox/PurchaseButton" to="." method="_on_purchase_pressed"]
+[connection signal="pressed" from="VBoxContainer/ScrollContainer/Content/SectionPurchases/SectionPurchasesVBox/RestorePurchasesButton" to="." method="_on_restore_purchases_pressed"]
 [connection signal="pressed" from="VBoxContainer/ScrollContainer/Content/SectionOfferings/SectionOfferingsVBox/FetchOfferingsButton" to="." method="_on_fetch_offerings_pressed"]
 [connection signal="pressed" from="VBoxContainer/ScrollContainer/Content/SectionProducts/SectionProductsVBox/FetchProductsHBox/FetchProductsButton" to="." method="_on_fetch_products_pressed"]
 [connection signal="pressed" from="VBoxContainer/ScrollContainer/Content/SectionLogin/SectionLoginVBox/LoginHBox/LoginButton" to="." method="_on_login_pressed"]

scripts/Main.gd

@@ -84,6 +84,7 @@ func connect_signals() -> void:
 	revenuecat.subscriber.connect(_on_subscriber_result)
 	revenuecat.entitlement.connect(_on_entitlement_result)
 	revenuecat.paywall_result.connect(_on_paywall_result)
+	revenuecat.restore_result.connect(_on_restore_result)
 
 	log_message("🔌 Connected all RevenueCat signals")
 
@@ -213,6 +214,13 @@ func _on_present_paywall_pressed():
 	log_message("➡️ present_paywall(%s)" % off_id)
 
 
+func _on_restore_purchases_pressed():
+	if revenuecat == null:
+		return
+	revenuecat.restore_purchases()
+	log_message("➡️ restore_purchases()")
+
+
 func _on_clear_log_pressed():
 	log_output.text = ""
 
@@ -277,3 +285,8 @@ func _on_entitlement_result(ent_id, active):
 func _on_paywall_result(data):
 	log_message("🔔 SIGNAL: paywall_result")
 	log_message(dict_to_string(data))
+
+
+func _on_restore_result(data):
+	log_message("🔔 SIGNAL: restore_result")
+	log_message(dict_to_string(data))

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

@@ -19,6 +19,7 @@ import com.revenuecat.purchases.interfaces.ReceiveCustomerInfoCallback
 import com.revenuecat.purchases.interfaces.ReceiveOfferingsCallback
 import com.revenuecat.purchases.models.StoreProduct
 import com.revenuecat.purchases.models.StoreTransaction
+import com.revenuecat.purchases.restorePurchasesWith
 import org.godotengine.godot.Dictionary
 import org.godotengine.godot.Godot
 import org.godotengine.godot.plugin.GodotPlugin
@@ -49,7 +50,8 @@ class RevenueCatPlugin(godot: Godot) : GodotPlugin(godot) {
             SignalInfo("logout_finished", Dictionary::class.java),
             SignalInfo("subscriber", Boolean::class.javaObjectType),
             SignalInfo("entitlement", String::class.java, Boolean::class.javaObjectType),
-            SignalInfo("paywall_result", Dictionary::class.java)
+            SignalInfo("paywall_result", Dictionary::class.java),
+            SignalInfo("restore_finished", Dictionary::class.java)
         )
     }
 
@@ -221,6 +223,23 @@ class RevenueCatPlugin(godot: Godot) : GodotPlugin(godot) {
         })
     }
 
+    @UsedByGodot
+    fun restore_purchases() {
+        Purchases.sharedInstance.restorePurchasesWith() { customerInfo ->
+            currentCustomerInfo = customerInfo
+
+            val restoredCount = customerInfo.entitlements.active.size
+
+            emitOnMain(
+                "restore_finished",
+                dictOf(
+                    "active_entitlements" to restoredCount,
+                    "restored" to (restoredCount > 0)
+                )
+            )
+        }
+    }
+
     @UsedByGodot
     fun fetch_offerings() {
         Purchases.sharedInstance.getOfferings(

source/ios/revenue_cat/Sources/godotx_revenuecat.h

@@ -6,14 +6,14 @@
 
 class GodotxRevenueCat : public Object {
     GDCLASS(GodotxRevenueCat, Object);
-    
+
 protected:
     static void _bind_methods();
-    
+
 public:
     static GodotxRevenueCat *instance;
     static GodotxRevenueCat *get_singleton();
-    
+
     void initialize(String api_key, String user_id, bool debug);
     void get_customer_info();
     void purchase(String product_id);
@@ -22,10 +22,11 @@ class GodotxRevenueCat : public Object {
     void login(String user_id);
     void logout();
     void is_subscriber();
+    bool has_entitlement(String entitlement_id);
     void check_entitlement(String entitlement_id);
     void present_paywall(String offering_id);
-    bool has_entitlement(String entitlement_id);
-    
+    void restore_purchases();
+
     GodotxRevenueCat();
     ~GodotxRevenueCat();
 };

source/ios/revenue_cat/Sources/godotx_revenuecat.mm

@@ -60,7 +60,8 @@ - (void)purchases:(RCPurchases *)purchases receivedUpdatedCustomerInfo:(RCCustom
     ADD_SIGNAL(MethodInfo("subscriber", PropertyInfo(Variant::BOOL, "value")));
     ADD_SIGNAL(MethodInfo("entitlement", PropertyInfo(Variant::STRING, "id"), PropertyInfo(Variant::BOOL, "active")));
     ADD_SIGNAL(MethodInfo("paywall_result", PropertyInfo(Variant::DICTIONARY, "data")));
-    
+    ADD_SIGNAL(MethodInfo("restore_finished", PropertyInfo(Variant::DICTIONARY, "data")));
+
     ClassDB::bind_method(D_METHOD("initialize", "api_key", "user_id", "debug"), &GodotxRevenueCat::initialize);
     ClassDB::bind_method(D_METHOD("get_customer_info"), &GodotxRevenueCat::get_customer_info);
     ClassDB::bind_method(D_METHOD("purchase", "product_id"), &GodotxRevenueCat::purchase);
@@ -72,6 +73,7 @@ - (void)purchases:(RCPurchases *)purchases receivedUpdatedCustomerInfo:(RCCustom
     ClassDB::bind_method(D_METHOD("has_entitlement", "entitlement_id"), &GodotxRevenueCat::has_entitlement);
     ClassDB::bind_method(D_METHOD("present_paywall", "offering_id"), &GodotxRevenueCat::present_paywall);
     ClassDB::bind_method(D_METHOD("check_entitlement", "entitlement_id"), &GodotxRevenueCat::check_entitlement);
+    ClassDB::bind_method(D_METHOD("restore_purchases"), &GodotxRevenueCat::restore_purchases);
 }
 
 void GodotxRevenueCat::initialize(String api_key, String user_id, bool debug) {
@@ -262,6 +264,24 @@ - (void)purchases:(RCPurchases *)purchases receivedUpdatedCustomerInfo:(RCCustom
     return ent && ent.isActive;
 }
 
+void GodotxRevenueCat::restore_purchases() {
+    [[RCPurchases sharedPurchases] restorePurchasesWithCompletion:^(RCCustomerInfo *info, NSError *error) {
+        currentCustomerInfo = info;
+
+        int count = info ? (int)info.entitlements.active.count : 0;
+        String err = error ? String(error.localizedDescription.UTF8String) : "";
+        bool success = error == nil;
+
+        dispatch_async(dispatch_get_main_queue(), ^{
+            Dictionary d;
+            d["success"] = success;
+            d["active_entitlements"] = count;
+            if (error) d["error"] = err;
+            emit_signal("restore_finished", d);
+        });
+    }];
+}
+
 static UIViewController *godotx_revenuecat_get_root_view_controller() {
     UIWindow *keyWindow = nil;