Skip to content

Allow the user to specify a message with exceptions #77

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 2 commits into from
Sep 23, 2016
Merged

Allow the user to specify a message with exceptions #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07b84c7
Allow the user to specify a message with exceptions
Sep 16, 2016
bc18886
Add code to test
Sep 16, 2016
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
18 changes: 10 additions & 8 deletions sentry-android/src/main/java/com/joshdholtz/sentry/Sentry.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,10 @@
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
import java.util.TimeZone;
import java.util.UUID;
import java.util.regex.Pattern;

import javax.net.ssl.SSLContext;
import javax.net.ssl.TrustManager;
Expand Down Expand Up @@ -98,10 +98,8 @@ public class Sentry {
private Map<String, Object> contexts = Collections.emptyMap();

private static final String TAG = "Sentry";
private static final String DEFAULT_BASE_URL = "https://app.getsentry.com";

private Sentry() {

}

private static void log(String text) {
Expand Down Expand Up @@ -234,14 +232,18 @@ public static void captureMessage(String message, SentryEventLevel level) {
}

public static void captureException(Throwable t) {
Sentry.captureException(t, SentryEventLevel.ERROR);
Sentry.captureException(t, t.getMessage(), SentryEventLevel.ERROR);
}

public static void captureException(Throwable t, String message) {
Sentry.captureException(t, message, SentryEventLevel.ERROR);
}

public static void captureException(Throwable t, SentryEventLevel level) {
public static void captureException(Throwable t, String message, SentryEventLevel level) {
String culprit = getCause(t, t.getMessage());

Sentry.captureEvent(new SentryEventBuilder()
.setMessage(t.getMessage())
.setMessage(message)
.setCulprit(culprit)
.setLevel(level)
.setException(t)
Expand Down Expand Up @@ -689,7 +691,7 @@ public static class SentryEventBuilder implements Serializable {
// dalvik.system.*
static final String isInternalPackage = "^(java|android|com\\.android|com\\.google\\.android|dalvik\\.system)\\..*";

private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
private final static SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US);
Copy link
Collaborator Author

@marcomorain marcomorain Sep 16, 2016

Choose a reason for hiding this comment

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

~ this fixes a warning in AndroidStudio

static {
sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
}
Expand All @@ -700,7 +702,7 @@ public JSONObject toJSON() {
return new JSONObject(event);
}

public static enum SentryEventLevel {
public enum SentryEventLevel {

FATAL("fatal"),
ERROR("error"),
Expand Down
8 changes: 8 additions & 0 deletions sentry-app/src/main/java/com/joshdholtz/sentryapp/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,14 @@ public void onClickBreak(View view) {
s.length();
}

public void onClickCapture(View view) {
try {
onClickBreak(view);
} catch (Exception e) {
Sentry.captureException(e, "Exception caught in click handler");
}
}

@Override
public boolean onOptionsItemSelected(MenuItem item) {
// Handle action bar item clicks here. The action bar will
Expand Down
10 changes: 8 additions & 2 deletions sentry-app/src/main/res/layout/activity_main.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
Expand All @@ -10,4 +11,9 @@
android:layout_height="wrap_content"
android:onClick="onClickBreak" />

</RelativeLayout>
<Button android:text="Click to capture"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:onClick="onClickCapture" />

</LinearLayout>