From cb6cb44c4db07d3f91b5601af4b9de0e00fe9533 Mon Sep 17 00:00:00 2001
From: jcesarmobile <jcesarmobile@gmail.com>
Date: Thu, 4 Dec 2025 20:04:19 +0100
Subject: [PATCH] fix(android): replace deprecated methods

---
 .../firebaseanalytics/FirebaseAnalytics.java  | 28 ++++++++-----------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/android/src/main/java/com/getcapacitor/community/firebaseanalytics/FirebaseAnalytics.java b/android/src/main/java/com/getcapacitor/community/firebaseanalytics/FirebaseAnalytics.java
index 859d7ce..87c7c35 100644
--- a/android/src/main/java/com/getcapacitor/community/firebaseanalytics/FirebaseAnalytics.java
+++ b/android/src/main/java/com/getcapacitor/community/firebaseanalytics/FirebaseAnalytics.java
@@ -58,13 +58,11 @@ public void setUserId(PluginCall call) {
         call.reject(MISSING_REF_MSSG);
         return;
       }
-
-      if (!call.hasOption("userId")) {
+      String userId = call.getString("userId");
+      if (userId == null) {
         call.reject("userId property is missing");
         return;
       }
-
-      String userId = call.getString("userId");
       mFirebaseAnalytics.setUserId(userId);
       call.resolve();
     } catch (Exception ex) {
@@ -84,20 +82,18 @@ public void setUserProperty(PluginCall call) {
         call.reject(MISSING_REF_MSSG);
         return;
       }
-
-      if (!call.hasOption("name")) {
+      String name = call.getString("name");
+      String value = call.getString("value");
+      if (name == null) {
         call.reject("name property is missing");
         return;
       }
 
-      if (!call.hasOption("value")) {
+      if (value == null) {
         call.reject("value property is missing");
         return;
       }
 
-      String name = call.getString("name");
-      String value = call.getString("value");
-
       mFirebaseAnalytics.setUserProperty(name, value);
       call.resolve();
     } catch (Exception ex) {
@@ -149,14 +145,14 @@ public void setScreenName(final PluginCall call) {
         return;
       }
 
-      if (!call.hasOption("screenName")) {
+      final String screenName = call.getString("screenName");
+      final String nameOverride = call.getString("nameOverride");
+
+      if (screenName == null) {
         call.reject("screenName property is missing");
         return;
       }
 
-      final String screenName = call.getString("screenName");
-      final String nameOverride = call.getString("nameOverride", null);
-
       bridge
         .getActivity()
         .runOnUiThread(
@@ -218,12 +214,12 @@ public void logEvent(PluginCall call) {
         return;
       }
 
-      if (!call.hasOption("name")) {
+      String name = call.getString("name");
+      if (name == null) {
         call.reject("name property is missing");
         return;
       }
 
-      String name = call.getString("name");
       JSONObject params = call.getData().getJSObject("params");
       mFirebaseAnalytics.logEvent(name, params != null ? FirebaseAnalytics.convertJsonToBundle(params) : null);
       call.resolve();