Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand All @@ -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) {
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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();
Expand Down