Skip to content

Fix missing keys in Android event context #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 15, 2017
Merged

Fix missing keys in Android event context #56

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
32 changes: 20 additions & 12 deletions android/src/main/java/io/sentry/RNSentryModule.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,14 +132,15 @@ public void captureEvent(ReadableMap event) {
.withLogger(event.getString("logger"))
.withLevel(eventLevel(event.getString("level")));

eventBuilder.withSentryInterface(
new UserInterface(
event.getMap("user").getString("userID"),
event.getMap("user").getString("username"),
null,
event.getMap("user").getString("email")
)
);
if (event.hasKey("user")) {
UserInterface userInterface = new UserInterface(
event.getMap("user").getString("userID"),
event.getMap("user").getString("username"),
null,
event.getMap("user").getString("email")
);
eventBuilder.withSentryInterface(userInterface);
}

helper.helpBuildingEvent(eventBuilder);

Copy link
Member

@HazAT HazAT May 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you also add a check for extra?

Copy link
Contributor Author

@Amwam Amwam May 15, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@HazAT Done and rebased. Thanks!

Expand All @@ -148,18 +149,25 @@ public void captureEvent(ReadableMap event) {
eventBuilder.withExtra(entry.getKey(), entry.getValue());
}
}
for (Map.Entry<String, Object> entry : castEvent.getMap("extra").toHashMap().entrySet()) {
eventBuilder.withExtra(entry.getKey(), entry.getValue());

if (castEvent.hasKey("extra")) {
for (Map.Entry<String, Object> entry : castEvent.getMap("extra").toHashMap().entrySet()) {
eventBuilder.withExtra(entry.getKey(), entry.getValue());
}
}

if (this.tags != null) {
for (Map.Entry<String, Object> entry : ((ReadableNativeMap)this.tags).toHashMap().entrySet()) {
eventBuilder.withExtra(entry.getKey(), entry.getValue());
}
}
for (Map.Entry<String, Object> entry : castEvent.getMap("tags").toHashMap().entrySet()) {
eventBuilder.withTag(entry.getKey(), entry.getValue().toString());

if (castEvent.hasKey("tags")) {
for (Map.Entry<String, Object> entry : castEvent.getMap("tags").toHashMap().entrySet()) {
eventBuilder.withTag(entry.getKey(), entry.getValue().toString());
}
}

Event builtEvent = eventBuilder.build();
Sentry.capture(builtEvent);
} else {
Expand Down