feat(Client): Added notify(Throwable, ErrorOptions) to Client & Bugsnag

Author: lemnik

bugsnag-android-core/api/bugsnag-android-core.api

@@ -82,6 +82,7 @@ public final class com/bugsnag/android/Bugsnag {
 	public static fun leaveBreadcrumb (Ljava/lang/String;Ljava/util/Map;Lcom/bugsnag/android/BreadcrumbType;)V
 	public static fun markLaunchCompleted ()V
 	public static fun notify (Ljava/lang/Throwable;)V
+	public static fun notify (Ljava/lang/Throwable;Lcom/bugsnag/android/ErrorOptions;)V
 	public static fun notify (Ljava/lang/Throwable;Lcom/bugsnag/android/ErrorOptions;Lcom/bugsnag/android/OnErrorCallback;)V
 	public static fun notify (Ljava/lang/Throwable;Lcom/bugsnag/android/OnErrorCallback;)V
 	public static fun pauseSession ()V
@@ -140,6 +141,7 @@ public class com/bugsnag/android/Client : com/bugsnag/android/CallbackAware, com
 	public fun leaveBreadcrumb (Ljava/lang/String;Ljava/util/Map;Lcom/bugsnag/android/BreadcrumbType;)V
 	public fun markLaunchCompleted ()V
 	public fun notify (Ljava/lang/Throwable;)V
+	public fun notify (Ljava/lang/Throwable;Lcom/bugsnag/android/ErrorOptions;)V
 	public fun notify (Ljava/lang/Throwable;Lcom/bugsnag/android/ErrorOptions;Lcom/bugsnag/android/OnErrorCallback;)V
 	public fun notify (Ljava/lang/Throwable;Lcom/bugsnag/android/OnErrorCallback;)V
 	public fun pauseSession ()V

bugsnag-android-core/src/main/java/com/bugsnag/android/Bugsnag.java

@@ -255,6 +255,17 @@ public static void notify(@NonNull final Throwable exception,
         getClient().notify(exception, onError);
     }
 
+    /**
+     * Notify Bugsnag of a handled exception
+     *
+     * @param exception the exception to send to Bugsnag
+     * @param options   additional options to adjust the reporting of the exception
+     */
+    public static void notify(@NonNull final Throwable exception,
+                              @Nullable final ErrorOptions options) {
+        getClient().notify(exception, options);
+    }
+
     /**
      * Notify Bugsnag of a handled exception
      *

bugsnag-android-core/src/main/java/com/bugsnag/android/Client.java

@@ -2,6 +2,13 @@
 
 import static com.bugsnag.android.SeverityReason.REASON_HANDLED_EXCEPTION;
 
+import android.app.Application;
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.VisibleForTesting;
+
 import com.bugsnag.android.internal.BackgroundTaskService;
 import com.bugsnag.android.internal.ForegroundDetector;
 import com.bugsnag.android.internal.ImmutableConfig;
@@ -15,16 +22,6 @@
 import com.bugsnag.android.internal.dag.Provider;
 import com.bugsnag.android.internal.dag.SystemServiceModule;
 
-import android.app.Application;
-import android.content.Context;
-
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.annotation.VisibleForTesting;
-
-import kotlin.Unit;
-import kotlin.jvm.functions.Function2;
-
 import java.io.File;
 import java.util.Collection;
 import java.util.Collections;
@@ -37,6 +34,9 @@
 import java.util.concurrent.RejectedExecutionException;
 import java.util.regex.Pattern;
 
+import kotlin.Unit;
+import kotlin.jvm.functions.Function2;
+
 /**
  * A Bugsnag Client instance allows you to use Bugsnag in your Android app.
  * Typically you'd instead use the static access provided in the Bugsnag class.
@@ -383,23 +383,23 @@ public Unit invoke(String oldOrientation, String newOrientation) {
                         return null;
                     }
                 }, new Function2<Boolean, Integer, Unit>() {
-                    @Override
+            @Override
             public Unit invoke(Boolean isLowMemory, Integer memoryTrimLevel) {
-                        memoryTrimState.setLowMemory(Boolean.TRUE.equals(isLowMemory));
-                        if (memoryTrimState.updateMemoryTrimLevel(memoryTrimLevel)) {
-                            leaveAutoBreadcrumb(
-                                "Trim Memory",
-                                BreadcrumbType.STATE,
-                                Collections.<String, Object>singletonMap(
+                memoryTrimState.setLowMemory(Boolean.TRUE.equals(isLowMemory));
+                if (memoryTrimState.updateMemoryTrimLevel(memoryTrimLevel)) {
+                    leaveAutoBreadcrumb(
+                            "Trim Memory",
+                            BreadcrumbType.STATE,
+                            Collections.<String, Object>singletonMap(
                                     "trimLevel", memoryTrimState.getTrimLevelDescription()
                             )
-                            );
-                        }
-
-                        memoryTrimState.emitObservableEvent();
-                        return null;
-                        }
+                    );
                 }
+
+                memoryTrimState.emitObservableEvent();
+                return null;
+            }
+        }
         ));
     }
 
@@ -536,7 +536,7 @@ public boolean resumeSession() {
     /**
      * Bugsnag uses the concept of "contexts" to help display and group your errors. Contexts
      * represent what was happening in your application at the time an error occurs.
-     *
+     * <p>
      * In an android app the "context" is automatically set as the foreground Activity.
      * If you would like to set this value manually, you should alter this property.
      */
@@ -548,7 +548,7 @@ public String getContext() {
     /**
      * Bugsnag uses the concept of "contexts" to help display and group your errors. Contexts
      * represent what was happening in your application at the time an error occurs.
-     *
+     * <p>
      * In an android app the "context" is automatically set as the foreground Activity.
      * If you would like to set this value manually, you should alter this property.
      */
@@ -603,15 +603,15 @@ public User getUser() {
     /**
      * Add a "on error" callback, to execute code at the point where an error report is
      * captured in Bugsnag.
-     *
+     * <p>
      * You can use this to add or modify information attached to an Event
      * before it is sent to your dashboard. You can also return
      * <code>false</code> from any callback to prevent delivery. "on error"
      * callbacks do not run before reports generated in the event
      * of immediate app termination from crashes in C/C++ code.
-     *
+     * <p>
      * For example:
-     *
+     * <p>
      * Bugsnag.addOnError(new OnErrorCallback() {
      * public boolean run(Event event) {
      * event.setSeverity(Severity.INFO);
@@ -648,12 +648,12 @@ public void removeOnError(@NonNull OnErrorCallback onError) {
     /**
      * Add an "on breadcrumb" callback, to execute code before every
      * breadcrumb captured by Bugsnag.
-     *
+     * <p>
      * You can use this to modify breadcrumbs before they are stored by Bugsnag.
      * You can also return <code>false</code> from any callback to ignore a breadcrumb.
-     *
+     * <p>
      * For example:
-     *
+     * <p>
      * Bugsnag.onBreadcrumb(new OnBreadcrumbCallback() {
      * public boolean run(Breadcrumb breadcrumb) {
      * return false; // ignore the breadcrumb
@@ -689,12 +689,12 @@ public void removeOnBreadcrumb(@NonNull OnBreadcrumbCallback onBreadcrumb) {
     /**
      * Add an "on session" callback, to execute code before every
      * session captured by Bugsnag.
-     *
+     * <p>
      * You can use this to modify sessions before they are stored by Bugsnag.
      * You can also return <code>false</code> from any callback to ignore a session.
-     *
+     * <p>
      * For example:
-     *
+     * <p>
      * Bugsnag.onSession(new OnSessionCallback() {
      * public boolean run(Session session) {
      * return false; // ignore the session
@@ -747,6 +747,16 @@ public void notify(@NonNull Throwable exc, @Nullable OnErrorCallback onError) {
         notify(exc, null, onError);
     }
 
+    /**
+     * Notify Bugsnag of a handled exception
+     *
+     * @param exc     the exception to send to Bugsnag
+     * @param options the error options
+     */
+    public void notify(@NonNull Throwable exc, @Nullable ErrorOptions options) {
+        notify(exc, options, null);
+    }
+
     /**
      * Notify Bugsnag of a handled exception
      *
@@ -767,7 +777,7 @@ public void notify(
             SeverityReason severityReason = SeverityReason.newInstance(REASON_HANDLED_EXCEPTION);
             Event event = createEventWithOptions(exc, severityReason, options);
             event.setGroupingDiscriminator(getGroupingDiscriminator());
-            populateAndNotifyAndroidEvent(event,options, onError);
+            populateAndNotifyAndroidEvent(event, options, onError);
         } else {
             logNull("notify");
         }
@@ -796,33 +806,19 @@ private Event createEventWithOptions(
         final FeatureFlags featureFlags = capture == null || capture.getFeatureFlags()
                 ? featureFlagState.getFeatureFlags()
                 : new FeatureFlags();
-        final boolean stacktrace = capture == null || capture.getStacktrace();
-        final boolean threads = capture == null || capture.getThreads();
-
-        Event event;
-        if (options != null || capture != null) {
-            event = new Event(
-                    exc,
-                    immutableConfig,
-                    severityReason,
-                    metadata,
-                    featureFlags,
-                    stacktrace,
-                    threads,
-                    logger
-            );
-        } else {
-            event = new Event(
-                    exc,
-                    immutableConfig,
-                    severityReason,
-                    metadataState.getMetadata(),
-                    featureFlagState.getFeatureFlags(),
-                    stacktrace,
-                    threads,
-                    logger);
-        }
-        return event;
+        final boolean captureStacktrace = capture == null || capture.getStacktrace();
+        final boolean captureThreads = capture == null || capture.getThreads();
+
+        return new Event(
+                exc,
+                immutableConfig,
+                severityReason,
+                metadata,
+                featureFlags,
+                captureStacktrace,
+                captureThreads,
+                logger
+        );
     }
 
     private Metadata captureSelectedMetadata(@Nullable Set<String> metadata) {
@@ -847,7 +843,7 @@ private Metadata captureSelectedMetadata(@Nullable Set<String> metadata) {
 
     /**
      * Caches an error then attempts to notify.
-     *
+     * <p>
      * Should only ever be called from the {@link ExceptionHandler}.
      */
     void notifyUnhandledException(@NonNull Throwable exc, Metadata metadata,
@@ -881,7 +877,7 @@ void populateAndNotifyAndroidEvent(@NonNull Event event,
     void populateAndNotifyAndroidEvent(@NonNull Event event,
                                        @Nullable ErrorOptions options,
                                        @Nullable OnErrorCallback onError
-                                       ) {
+    ) {
         populateDeviceAndAppData(event);
 
         if (options == null) {
@@ -996,7 +992,7 @@ void notifyInternal(@NonNull Event event,
      * Returns the current buffer of breadcrumbs that will be sent with captured events. This
      * ordered list represents the most recent breadcrumbs to be captured up to the limit
      * set in {@link Configuration#getMaxBreadcrumbs()}.
-     *
+     * <p>
      * The returned collection is readonly and mutating the list will cause no effect on the
      * Client's state. If you wish to alter the breadcrumbs collected by the Client then you should
      * use {@link Configuration#setEnabledBreadcrumbTypes(Set)} and
@@ -1226,7 +1222,7 @@ public void clearFeatureFlags() {
 
     /**
      * Retrieves information about the last launch of the application, if it has been run before.
-     *
+     * <p>
      * For example, this allows checking whether the app crashed on its last launch, which could
      * be used to perform conditional behaviour to recover from crashes, such as clearing the
      * app data cache.
@@ -1240,7 +1236,7 @@ public LastRunInfo getLastRunInfo() {
      * Informs Bugsnag that the application has finished launching. Once this has been called
      * {@link AppWithState#isLaunching()} will always be false in any new error reports,
      * and synchronous delivery will not be attempted on the next launch for any fatal crashes.
-     *
+     * <p>
      * By default this method will be called after Bugsnag is initialized when
      * {@link Configuration#getLaunchDurationMillis()} has elapsed. Invoking this method manually
      * has precedence over the value supplied via the launchDurationMillis configuration option.