Merge pull request #121 from Poing-Studios/fix-script-error-method-call

fix: script error when doesn't exists method #107

addons/admob/plugin.cfg

@@ -3,5 +3,5 @@
 name="AdMob"
 description="The AdMob Plugin for Android and iOS."
 author="Poing Studios"
-version="v3.0.3"
+version="v3.1.0"
 script="admob.gd"

addons/admob/sample/Main.tscn

@@ -135,10 +135,8 @@ text = "AdMob Plugin - Poing Studios"
 
 [node name="Body" type="TabContainer" parent="Background/Content/Main"]
 layout_mode = 2
-current_tab = 5
 
 [node name="Banner" parent="Background/Content/Main/Body" instance=ExtResource("6_xt5vc")]
-visible = false
 layout_mode = 2
 
 [node name="Interstitial" parent="Background/Content/Main/Body" instance=ExtResource("7_5rtn7")]
@@ -158,6 +156,7 @@ visible = false
 layout_mode = 2
 
 [node name="MobileAds" type="VBoxContainer" parent="Background/Content/Main/Body"]
+visible = false
 layout_mode = 2
 script = ExtResource("12_tjkhy")
 

addons/admob/src/api/AdView.gd

@@ -47,27 +47,27 @@ func _init(ad_unit_id : String, ad_size : AdSize, ad_position : AdPosition.Value
 		_uid = _plugin.create(ad_view_dictionary)
 		_plugin.connect("on_ad_clicked", func(uid : int): 
 			if uid == _uid:
-				ad_listener.on_ad_clicked.call()
+				ad_listener.on_ad_clicked.call_deferred()
 			)
 		_plugin.connect("on_ad_closed", func(uid : int): 
 			if uid == _uid:
-				ad_listener.on_ad_closed.call()
+				ad_listener.on_ad_closed.call_deferred()
 			)
 		_plugin.connect("on_ad_failed_to_load", func(uid : int, load_ad_error_dictionary : Dictionary): 
 			if uid == _uid:
-				ad_listener.on_ad_failed_to_load.call(LoadAdError.create(load_ad_error_dictionary))
+				ad_listener.on_ad_failed_to_load.call_deferred(LoadAdError.create(load_ad_error_dictionary))
 			)
 		_plugin.connect("on_ad_impression", func(uid : int): 
 			if uid == _uid:
-				ad_listener.on_ad_impression.call()
+				ad_listener.on_ad_impression.call_deferred()
 			)
 		_plugin.connect("on_ad_loaded", func(uid : int): 
 			if uid == _uid:
-				ad_listener.on_ad_loaded.call()
+				ad_listener.on_ad_loaded.call_deferred()
 			)
 		_plugin.connect("on_ad_opened", func(uid : int): 
 			if uid == _uid:
-				ad_listener.on_ad_opened.call()
+				ad_listener.on_ad_opened.call_deferred()
 			)
 
 func load_ad(ad_request : AdRequest) -> void:

addons/admob/src/api/InterstitialAd.gd

@@ -44,21 +44,21 @@ func register_callbacks() -> void:
 	if _plugin:
 		_plugin.connect("on_interstitial_ad_clicked", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_clicked.call()
+				full_screen_content_callback.on_ad_clicked.call_deferred()
 			)
 		_plugin.connect("on_interstitial_ad_dismissed_full_screen_content", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_dismissed_full_screen_content.call()
+				full_screen_content_callback.on_ad_dismissed_full_screen_content.call_deferred()
 			)
 		_plugin.connect("on_interstitial_ad_failed_to_show_full_screen_content", func(uid : int, ad_error_dictionary : Dictionary):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_failed_to_show_full_screen_content.call(AdError.create(ad_error_dictionary))
+				full_screen_content_callback.on_ad_failed_to_show_full_screen_content.call_deferred(AdError.create(ad_error_dictionary))
 			)
 		_plugin.connect("on_interstitial_ad_impression", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_impression.call()
+				full_screen_content_callback.on_ad_impression.call_deferred()
 			)
 		_plugin.connect("on_interstitial_ad_showed_full_screen_content", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_showed_full_screen_content.call()
+				full_screen_content_callback.on_ad_showed_full_screen_content.call_deferred()
 			)

addons/admob/src/api/InterstitialAdLoader.gd

@@ -43,9 +43,9 @@ func load(
 		_plugin.load(ad_unit_id, ad_request.convert_to_dictionary(), ad_request.keywords, _uid)
 		_plugin.connect("on_interstitial_ad_loaded", func(uid : int):
 			if uid == _uid:
-				interstitial_ad_load_callback.on_ad_loaded.call(InterstitialAd.new(uid))
+				interstitial_ad_load_callback.on_ad_loaded.call_deferred(InterstitialAd.new(uid))
 		)
 		_plugin.connect("on_interstitial_ad_failed_to_load", func(uid : int, load_ad_error_dictionary : Dictionary): 
 			if uid == _uid:
-				interstitial_ad_load_callback.on_ad_failed_to_load.call(LoadAdError.create(load_ad_error_dictionary))
+				interstitial_ad_load_callback.on_ad_failed_to_load.call_deferred(LoadAdError.create(load_ad_error_dictionary))
 		)

addons/admob/src/api/MobileAds.gd

@@ -32,7 +32,7 @@ static func initialize(on_initialization_complete_listener : OnInitializationCom
 		if on_initialization_complete_listener:
 			_plugin.connect("on_initialization_complete", func(admob_initialization_status : Dictionary):
 				var initialization_status := InitializationStatus.create(admob_initialization_status)
-				on_initialization_complete_listener.on_initialization_complete.call(initialization_status)
+				on_initialization_complete_listener.on_initialization_complete.call_deferred(initialization_status)
 			)
 
 static func set_request_configuration(request_configuration : RequestConfiguration) -> void:

addons/admob/src/api/RewardedAd.gd

@@ -37,7 +37,7 @@ func show(on_user_earned_reward_listener := OnUserEarnedRewardListener.new()) ->
 		_plugin.show(_uid)
 		_plugin.connect("on_rewarded_ad_user_earned_reward", func(uid : int, rewarded_item_dictionary : Dictionary):
 			if uid == _uid:
-				on_user_earned_reward_listener.on_user_earned_reward.call(RewardedItem.create(rewarded_item_dictionary))
+				on_user_earned_reward_listener.on_user_earned_reward.call_deferred(RewardedItem.create(rewarded_item_dictionary))
 			)
 
 func destroy() -> void:
@@ -52,21 +52,21 @@ func register_callbacks() -> void:
 	if _plugin:
 		_plugin.connect("on_rewarded_ad_clicked", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_clicked.call()
+				full_screen_content_callback.on_ad_clicked.call_deferred()
 			)
 		_plugin.connect("on_rewarded_ad_dismissed_full_screen_content", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_dismissed_full_screen_content.call()
+				full_screen_content_callback.on_ad_dismissed_full_screen_content.call_deferred()
 			)
 		_plugin.connect("on_rewarded_ad_failed_to_show_full_screen_content", func(uid : int, ad_error_dictionary : Dictionary):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_failed_to_show_full_screen_content.call(AdError.create(ad_error_dictionary))
+				full_screen_content_callback.on_ad_failed_to_show_full_screen_content.call_deferred(AdError.create(ad_error_dictionary))
 			)
 		_plugin.connect("on_rewarded_ad_impression", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_impression.call()
+				full_screen_content_callback.on_ad_impression.call_deferred()
 			)
 		_plugin.connect("on_rewarded_ad_showed_full_screen_content", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_showed_full_screen_content.call()
+				full_screen_content_callback.on_ad_showed_full_screen_content.call_deferred()
 			)

addons/admob/src/api/RewardedAdLoader.gd

@@ -43,9 +43,9 @@ func load(
 		_plugin.load(ad_unit_id, ad_request.convert_to_dictionary(), ad_request.keywords, _uid)
 		_plugin.connect("on_rewarded_ad_loaded", func(uid : int):
 			if uid == _uid:
-				rewarded_ad_load_callback.on_ad_loaded.call(RewardedAd.new(uid))
+				rewarded_ad_load_callback.on_ad_loaded.call_deferred(RewardedAd.new(uid))
 		)
 		_plugin.connect("on_rewarded_ad_failed_to_load", func(uid : int, load_ad_error_dictionary : Dictionary): 
 			if uid == _uid:
-				rewarded_ad_load_callback.on_ad_failed_to_load.call(LoadAdError.create(load_ad_error_dictionary))
+				rewarded_ad_load_callback.on_ad_failed_to_load.call_deferred(LoadAdError.create(load_ad_error_dictionary))
 		)

addons/admob/src/api/RewardedInterstitialAd.gd

@@ -37,7 +37,7 @@ func show(on_user_earned_reward_listener := OnUserEarnedRewardListener.new()) ->
 		_plugin.show(_uid)
 		_plugin.connect("on_rewarded_interstitial_ad_user_earned_reward", func(uid : int, rewarded_item_dictionary : Dictionary):
 			if uid == _uid:
-				on_user_earned_reward_listener.on_user_earned_reward.call(RewardedItem.create(rewarded_item_dictionary))
+				on_user_earned_reward_listener.on_user_earned_reward.call_deferred(RewardedItem.create(rewarded_item_dictionary))
 			)
 
 func destroy() -> void:
@@ -52,21 +52,21 @@ func register_callbacks() -> void:
 	if _plugin:
 		_plugin.connect("on_rewarded_interstitial_ad_clicked", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_clicked.call()
+				full_screen_content_callback.on_ad_clicked.call_deferred()
 			)
 		_plugin.connect("on_rewarded_interstitial_ad_dismissed_full_screen_content", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_dismissed_full_screen_content.call()
+				full_screen_content_callback.on_ad_dismissed_full_screen_content.call_deferred()
 			)
 		_plugin.connect("on_rewarded_interstitial_ad_failed_to_show_full_screen_content", func(uid : int, ad_error_dictionary : Dictionary):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_failed_to_show_full_screen_content.call(AdError.create(ad_error_dictionary))
+				full_screen_content_callback.on_ad_failed_to_show_full_screen_content.call_deferred(AdError.create(ad_error_dictionary))
 			)
 		_plugin.connect("on_rewarded_interstitial_ad_impression", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_impression.call()
+				full_screen_content_callback.on_ad_impression.call_deferred()
 			)
 		_plugin.connect("on_rewarded_interstitial_ad_showed_full_screen_content", func(uid : int):
 			if uid == _uid:
-				full_screen_content_callback.on_ad_showed_full_screen_content.call()
+				full_screen_content_callback.on_ad_showed_full_screen_content.call_deferred()
 			)

addons/admob/src/api/RewardedInterstitialAdLoader.gd

@@ -43,9 +43,9 @@ func load(
 		_plugin.load(ad_unit_id, ad_request.convert_to_dictionary(), ad_request.keywords, _uid)
 		_plugin.connect("on_rewarded_interstitial_ad_loaded", func(uid : int):
 			if uid == _uid:
-				rewarded_ad_load_callback.on_ad_loaded.call(RewardedInterstitialAd.new(uid))
+				rewarded_ad_load_callback.on_ad_loaded.call_deferred(RewardedInterstitialAd.new(uid))
 		)
 		_plugin.connect("on_rewarded_interstitial_ad_failed_to_load", func(uid : int, load_ad_error_dictionary : Dictionary): 
 			if uid == _uid:
-				rewarded_ad_load_callback.on_ad_failed_to_load.call(LoadAdError.create(load_ad_error_dictionary))
+				rewarded_ad_load_callback.on_ad_failed_to_load.call_deferred(LoadAdError.create(load_ad_error_dictionary))
 		)

addons/admob/src/ump/api/ConsentForm.gd

@@ -37,6 +37,6 @@ func show(on_consent_form_dismissed := func(form_error : FormError) : pass) -> v
 		_plugin.connect("on_consent_form_dismissed", func(uid : int, form_error_dictionary : Dictionary) :
 			if uid == _uid:
 				var formError : FormError = FormError.create(form_error_dictionary) if not form_error_dictionary.is_empty() else null
-				on_consent_form_dismissed.call(formError)
+				on_consent_form_dismissed.call_deferred(formError)
 			)
 

addons/admob/src/ump/api/ConsentInformation.gd

@@ -50,10 +50,10 @@ func update(consent_request : ConsentRequestParameters,
 		_plugin.update(consent_request.convert_to_dictionary())
 
 		_plugin.connect("on_consent_info_updated_success", func(): 
-			on_consent_info_updated_success.call()
+			on_consent_info_updated_success.call_deferred()
 		)
 		_plugin.connect("on_consent_info_updated_failure", func(form_error_dictionary : Dictionary): 
-			on_consent_info_updated_failure.call(FormError.create(form_error_dictionary))
+			on_consent_info_updated_failure.call_deferred(FormError.create(form_error_dictionary))
 		)
 
 func reset():

addons/admob/src/ump/api/UserMessagingPlatform.gd

@@ -34,9 +34,9 @@ static func load_consent_form(
 		_plugin.load_consent_form()
 #
 		_plugin.connect("on_consent_form_load_success_listener", func(UID : int): 
-			on_consent_form_load_success_listener.call(ConsentForm.new(UID))
+			on_consent_form_load_success_listener.call_deferred(ConsentForm.new(UID))
 		)
 
 		_plugin.connect("on_consent_form_load_failure_listener", func(form_error_dictionary : Dictionary): 
-			on_consent_form_load_failure_listener.call(FormError.create(form_error_dictionary))
+			on_consent_form_load_failure_listener.call_deferred(FormError.create(form_error_dictionary))
 		)

addons/admob/version_helper.gd

@@ -29,7 +29,7 @@ static var version_formated : String = _get_plugin_version_formated() :
 
 static func get_plugin_version() -> String:
 	var plugin_config_file := ConfigFile.new()
-	var version: String = "v3.0.3" #redundancy
+	var version: String = "v3.1.0" #redundancy
 
 	if plugin_config_file.load("res://addons/admob/plugin.cfg") == OK:
 		version = plugin_config_file.get_value("plugin", "version")