From 053ca17207fb14773b484ec7170345737fd49174 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Tue, 11 Dec 2018 13:50:26 +0000
Subject: [PATCH 01/10] build: regenerate lint baseline file to account for
 changed lines + binary arch PR

---
 sdk/lint-baseline.xml | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/sdk/lint-baseline.xml b/sdk/lint-baseline.xml
index cfa00f3ed5..0c900ea019 100644
--- a/sdk/lint-baseline.xml
+++ b/sdk/lint-baseline.xml
@@ -1827,6 +1827,17 @@
             column="44"/>
     </issue>
 
+    <issue
+        id="UnknownNullness"
+        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
+        errorLine1="    public static void setBinaryArch(final String binaryArch) {"
+        errorLine2="                                           ~~~~~~">
+        <location
+            file="src/main/java/com/bugsnag/android/NativeInterface.java"
+            line="350"
+            column="44"/>
+    </issue>
+
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -1834,7 +1845,7 @@
         errorLine2="                  ~~~~~~">
         <location
             file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="350"
+            line="357"
             column="19"/>
     </issue>
 
@@ -1845,7 +1856,7 @@
         errorLine2="                  ~~~~~~~~">
         <location
             file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="357"
+            line="364"
             column="19"/>
     </issue>
 
@@ -1856,7 +1867,7 @@
         errorLine2="                                              ~~~~~~~~">
         <location
             file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="364"
+            line="371"
             column="47"/>
     </issue>
 
@@ -1867,7 +1878,7 @@
         errorLine2="                                     ~~~~~~">
         <location
             file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="376"
+            line="383"
             column="38"/>
     </issue>
 
@@ -1878,7 +1889,7 @@
         errorLine2="                                                          ~~~~~~">
         <location
             file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="376"
+            line="383"
             column="59"/>
     </issue>
 
@@ -1889,7 +1900,7 @@
         errorLine2="                                    ~~~~~~~~">
         <location
             file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="396"
+            line="403"
             column="37"/>
     </issue>
 

From 2ff6ca5f7335dabe4810be3f47688383bb7a72ba Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Tue, 11 Dec 2018 15:36:19 +0000
Subject: [PATCH 02/10] feat: add nullability annotations to public Client
 methods

---
 sdk/lint-baseline.xml                         | 451 ------------------
 .../main/java/com/bugsnag/android/Client.java |  72 +--
 2 files changed, 36 insertions(+), 487 deletions(-)

diff --git a/sdk/lint-baseline.xml b/sdk/lint-baseline.xml
index 0c900ea019..3a2586078b 100644
--- a/sdk/lint-baseline.xml
+++ b/sdk/lint-baseline.xml
@@ -474,457 +474,6 @@
             column="23"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void update(Observable observable, Object arg) {"
-        errorLine2="                       ~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="273"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void update(Observable observable, Object arg) {"
-        errorLine2="                                              ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="273"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void startFirstSession(Activity activity) {"
-        errorLine2="                                  ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="297"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setAppVersion(String appVersion) {"
-        errorLine2="                              ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="307"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getContext() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="316"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setContext(String context) {"
-        errorLine2="                           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="327"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setEndpoint(String endpoint) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="342"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setBuildUUID(final String buildUuid) {"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="355"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFilters(String... filters) {"
-        errorLine2="                           ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="373"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setIgnoreClasses(String... ignoreClasses) {"
-        errorLine2="                                 ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="386"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setNotifyReleaseStages(String... notifyReleaseStages) {"
-        errorLine2="                                       ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="401"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setProjectPackages(String... projectPackages) {"
-        errorLine2="                                   ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="417"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setReleaseStage(String releaseStage) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="429"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUser(String id, String email, String name) {"
-        errorLine2="                        ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="473"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUser(String id, String email, String name) {"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="473"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUser(String id, String email, String name) {"
-        errorLine2="                                                 ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="473"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUserId(String id) {"
-        errorLine2="                          ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="532"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUserEmail(String email) {"
-        errorLine2="                             ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="546"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUserName(String name) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="560"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void beforeNotify(BeforeNotify beforeNotify) {"
-        errorLine2="                             ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="622"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void beforeRecordBreadcrumb(BeforeRecordBreadcrumb beforeRecordBreadcrumb) {"
-        errorLine2="                                       ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="644"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void notify(@NonNull Throwable exception, Callback callback) {"
-        errorLine2="                                                     ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="668"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                       Callback callback) {"
-        errorLine2="                       ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="688"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void notify(@NonNull Throwable exception, Severity severity) {"
-        errorLine2="                                                     ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="703"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void notify(@NonNull Throwable exception, Severity severity,"
-        errorLine2="                                                     ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="739"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                       @NonNull StackTraceElement[] stacktrace, Severity severity,"
-        errorLine2="                                                                ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="763"
-            column="65"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                       String context,"
-        errorLine2="                       ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="789"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                       Severity severity,"
-        errorLine2="                       ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="791"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void notifyBlocking(@NonNull Throwable exception, Callback callback) {"
-        errorLine2="                                                             ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="928"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                               Callback callback) {"
-        errorLine2="                               ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="948"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void notifyBlocking(@NonNull Throwable exception, Severity severity,"
-        errorLine2="                                                             ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="984"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                               Severity severity,"
-        errorLine2="                               ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1010"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                               String context,"
-        errorLine2="                               ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1036"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                               Severity severity,"
-        errorLine2="                               ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1038"
-            column="32"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void notifyBlocking(@NonNull Throwable exception, Severity severity) {"
-        errorLine2="                                                             ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1056"
-            column="62"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                              Map&lt;String, Object> clientData,"
-        errorLine2="                              ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1073"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                              Callback callback) {"
-        errorLine2="                              ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1075"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tab, String key, Object value) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1123"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tab, String key, Object value) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1123"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tab, String key, Object value) {"
-        errorLine2="                                                 ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1123"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void clearTab(String tabName) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Client.java"
-            line="1132"
-            column="26"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
diff --git a/sdk/src/main/java/com/bugsnag/android/Client.java b/sdk/src/main/java/com/bugsnag/android/Client.java
index 1e1c9f000f..fdd91baa9c 100644
--- a/sdk/src/main/java/com/bugsnag/android/Client.java
+++ b/sdk/src/main/java/com/bugsnag/android/Client.java
@@ -270,7 +270,7 @@ void enqueuePendingNativeReports() {
     }
 
     @Override
-    public void update(Observable observable, Object arg) {
+    public void update(@NonNull Observable observable, @NonNull Object arg) {
         if (arg instanceof Message) {
             setChanged();
             super.notifyObservers(arg);
@@ -294,7 +294,7 @@ public void startSession() {
      * This is an integration point for custom libraries implementing automatic session capture
      * which differs from the default activity-based initialization.
      */
-    public void startFirstSession(Activity activity) {
+    public void startFirstSession(@NonNull Activity activity) {
         sessionTracker.startFirstSession(activity);
     }
 
@@ -304,7 +304,7 @@ public void startFirstSession(Activity activity) {
      *
      * @param appVersion the app version to send
      */
-    public void setAppVersion(String appVersion) {
+    public void setAppVersion(@NonNull String appVersion) {
         config.setAppVersion(appVersion);
     }
 
@@ -313,7 +313,7 @@ public void setAppVersion(String appVersion) {
      *
      * @return Context
      */
-    public String getContext() {
+    @Nullable public String getContext() {
         return config.getContext();
     }
 
@@ -324,7 +324,7 @@ public String getContext() {
      *
      * @param context set what was happening at the time of a crash
      */
-    public void setContext(String context) {
+    public void setContext(@Nullable String context) {
         config.setContext(context);
     }
 
@@ -339,7 +339,7 @@ public void setContext(String context) {
      * instead.
      */
     @Deprecated
-    public void setEndpoint(String endpoint) {
+    public void setEndpoint(@NonNull String endpoint) {
         config.setEndpoint(endpoint);
     }
 
@@ -352,7 +352,7 @@ public void setEndpoint(String endpoint) {
      * @param buildUuid the buildUuid.
      */
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
-    public void setBuildUUID(final String buildUuid) {
+    public void setBuildUUID(@Nullable final String buildUuid) {
         config.setBuildUUID(buildUuid);
     }
 
@@ -370,7 +370,7 @@ public void setBuildUUID(final String buildUuid) {
      *
      * @param filters a list of keys to filter from metaData
      */
-    public void setFilters(String... filters) {
+    public void setFilters(@NonNull String... filters) {
         config.setFilters(filters);
     }
 
@@ -383,7 +383,7 @@ public void setFilters(String... filters) {
      *
      * @param ignoreClasses a list of exception classes to ignore
      */
-    public void setIgnoreClasses(String... ignoreClasses) {
+    public void setIgnoreClasses(@NonNull String... ignoreClasses) {
         config.setIgnoreClasses(ignoreClasses);
     }
 
@@ -398,7 +398,7 @@ public void setIgnoreClasses(String... ignoreClasses) {
      * @param notifyReleaseStages a list of releaseStages to notify for
      * @see #setReleaseStage
      */
-    public void setNotifyReleaseStages(String... notifyReleaseStages) {
+    public void setNotifyReleaseStages(@NonNull String... notifyReleaseStages) {
         config.setNotifyReleaseStages(notifyReleaseStages);
     }
 
@@ -414,7 +414,7 @@ public void setNotifyReleaseStages(String... notifyReleaseStages) {
      *
      * @param projectPackages a list of package names
      */
-    public void setProjectPackages(String... projectPackages) {
+    public void setProjectPackages(@NonNull String... projectPackages) {
         config.setProjectPackages(projectPackages);
     }
 
@@ -426,7 +426,7 @@ public void setProjectPackages(String... projectPackages) {
      * @param releaseStage the release stage of the app
      * @see #setNotifyReleaseStages
      */
-    public void setReleaseStage(String releaseStage) {
+    public void setReleaseStage(@Nullable String releaseStage) {
         config.setReleaseStage(releaseStage);
         Logger.setEnabled(!AppData.RELEASE_STAGE_PRODUCTION.equals(releaseStage));
     }
@@ -470,7 +470,7 @@ public void setAutoCaptureSessions(boolean autoCapture) {
      * @param email the email address of the current user
      * @param name  the name of the current user
      */
-    public void setUser(String id, String email, String name) {
+    public void setUser(@Nullable String id, @Nullable String email, @Nullable String name) {
         setUserId(id);
         setUserEmail(email);
         setUserName(name);
@@ -529,7 +529,7 @@ public void clearUser() {
      *
      * @param id a unique identifier of the current user
      */
-    public void setUserId(String id) {
+    public void setUserId(@Nullable String id) {
         user.setId(id);
 
         if (config.getPersistUserBetweenSessions()) {
@@ -543,7 +543,7 @@ public void setUserId(String id) {
      *
      * @param email the email address of the current user
      */
-    public void setUserEmail(String email) {
+    public void setUserEmail(@Nullable String email) {
         user.setEmail(email);
 
         if (config.getPersistUserBetweenSessions()) {
@@ -557,7 +557,7 @@ public void setUserEmail(String email) {
      *
      * @param name the name of the current user
      */
-    public void setUserName(String name) {
+    public void setUserName(@Nullable String name) {
         user.setName(name);
 
         if (config.getPersistUserBetweenSessions()) {
@@ -619,7 +619,7 @@ void setSessionTrackingApiClient(@NonNull SessionTrackingApiClient apiClient) {
      * @param beforeNotify a callback to run before sending errors to Bugsnag
      * @see BeforeNotify
      */
-    public void beforeNotify(BeforeNotify beforeNotify) {
+    public void beforeNotify(@NonNull BeforeNotify beforeNotify) {
         config.beforeNotify(beforeNotify);
     }
 
@@ -641,7 +641,7 @@ public void beforeNotify(BeforeNotify beforeNotify) {
      * @param beforeRecordBreadcrumb a callback to run before a breadcrumb is captured
      * @see BeforeRecordBreadcrumb
      */
-    public void beforeRecordBreadcrumb(BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
+    public void beforeRecordBreadcrumb(@NonNull BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
         config.beforeRecordBreadcrumb(beforeRecordBreadcrumb);
     }
 
@@ -665,7 +665,7 @@ public void notify(@NonNull Throwable exception) {
      * @param callback  callback invoked on the generated error report for
      *                  additional modification
      */
-    public void notify(@NonNull Throwable exception, Callback callback) {
+    public void notify(@NonNull Throwable exception, @Nullable Callback callback) {
         Error error = new Error.Builder(config, exception, sessionTracker.getCurrentSession(),
             Thread.currentThread(), false)
             .severityReasonType(HandledState.REASON_HANDLED_EXCEPTION)
@@ -685,7 +685,7 @@ public void notify(@NonNull Throwable exception, Callback callback) {
     public void notify(@NonNull String name,
                        @NonNull String message,
                        @NonNull StackTraceElement[] stacktrace,
-                       Callback callback) {
+                       @Nullable Callback callback) {
         Error error = new Error.Builder(config, name, message, stacktrace,
             sessionTracker.getCurrentSession(), Thread.currentThread())
             .severityReasonType(HandledState.REASON_HANDLED_EXCEPTION)
@@ -700,7 +700,7 @@ public void notify(@NonNull String name,
      * @param severity  the severity of the error, one of Severity.ERROR,
      *                  Severity.WARNING or Severity.INFO
      */
-    public void notify(@NonNull Throwable exception, Severity severity) {
+    public void notify(@NonNull Throwable exception, @NonNull Severity severity) {
         Error error = new Error.Builder(config, exception, sessionTracker.getCurrentSession(),
             Thread.currentThread(), false)
             .severity(severity)
@@ -736,7 +736,7 @@ public void notify(@NonNull Throwable exception,
      * @deprecated Use {@link #notify(Throwable, Callback)} to send and modify error reports
      */
     @Deprecated
-    public void notify(@NonNull Throwable exception, Severity severity,
+    public void notify(@NonNull Throwable exception, @NonNull Severity severity,
                        @NonNull MetaData metaData) {
         Error error = new Error.Builder(config, exception, sessionTracker.getCurrentSession(),
             Thread.currentThread(), false)
@@ -760,7 +760,7 @@ public void notify(@NonNull Throwable exception, Severity severity,
      */
     @Deprecated
     public void notify(@NonNull String name, @NonNull String message,
-                       @NonNull StackTraceElement[] stacktrace, Severity severity,
+                       @NonNull StackTraceElement[] stacktrace, @NonNull Severity severity,
                        @NonNull MetaData metaData) {
         Error error = new Error.Builder(config, name, message,
             stacktrace, sessionTracker.getCurrentSession(), Thread.currentThread())
@@ -786,9 +786,9 @@ public void notify(@NonNull String name, @NonNull String message,
     @Deprecated
     public void notify(@NonNull String name,
                        @NonNull String message,
-                       String context,
+                       @Nullable String context,
                        @NonNull StackTraceElement[] stacktrace,
-                       Severity severity,
+                       @NonNull Severity severity,
                        @NonNull MetaData metaData) {
         Error error = new Error.Builder(config, name, message,
             stacktrace, sessionTracker.getCurrentSession(), Thread.currentThread())
@@ -925,7 +925,7 @@ public void notifyBlocking(@NonNull Throwable exception) {
      * @param callback  callback invoked on the generated error report for
      *                  additional modification
      */
-    public void notifyBlocking(@NonNull Throwable exception, Callback callback) {
+    public void notifyBlocking(@NonNull Throwable exception, @Nullable Callback callback) {
         Error error = new Error.Builder(config, exception, sessionTracker.getCurrentSession(),
             Thread.currentThread(), false)
             .severityReasonType(HandledState.REASON_HANDLED_EXCEPTION)
@@ -945,7 +945,7 @@ public void notifyBlocking(@NonNull Throwable exception, Callback callback) {
     public void notifyBlocking(@NonNull String name,
                                @NonNull String message,
                                @NonNull StackTraceElement[] stacktrace,
-                               Callback callback) {
+                               @Nullable Callback callback) {
         Error error = new Error.Builder(config, name, message,
             stacktrace, sessionTracker.getCurrentSession(), Thread.currentThread())
             .severityReasonType(HandledState.REASON_HANDLED_EXCEPTION)
@@ -981,7 +981,7 @@ public void notifyBlocking(@NonNull Throwable exception,
      * @deprecated Use {@link #notifyBlocking(Throwable, Callback)} to send and modify error reports
      */
     @Deprecated
-    public void notifyBlocking(@NonNull Throwable exception, Severity severity,
+    public void notifyBlocking(@NonNull Throwable exception, @NonNull Severity severity,
                                @NonNull MetaData metaData) {
         Error error = new Error.Builder(config, exception, sessionTracker.getCurrentSession(),
             Thread.currentThread(), false)
@@ -1007,7 +1007,7 @@ public void notifyBlocking(@NonNull Throwable exception, Severity severity,
     public void notifyBlocking(@NonNull String name,
                                @NonNull String message,
                                @NonNull StackTraceElement[] stacktrace,
-                               Severity severity,
+                               @NonNull Severity severity,
                                @NonNull MetaData metaData) {
         Error error = new Error.Builder(config, name, message,
             stacktrace, sessionTracker.getCurrentSession(), Thread.currentThread())
@@ -1033,9 +1033,9 @@ public void notifyBlocking(@NonNull String name,
     @Deprecated
     public void notifyBlocking(@NonNull String name,
                                @NonNull String message,
-                               String context,
+                               @Nullable String context,
                                @NonNull StackTraceElement[] stacktrace,
-                               Severity severity,
+                               @NonNull Severity severity,
                                @NonNull MetaData metaData) {
         Error error = new Error.Builder(config, name, message,
             stacktrace, sessionTracker.getCurrentSession(), Thread.currentThread())
@@ -1053,7 +1053,7 @@ public void notifyBlocking(@NonNull String name,
      * @param severity  the severity of the error, one of Severity.ERROR,
      *                  Severity.WARNING or Severity.INFO
      */
-    public void notifyBlocking(@NonNull Throwable exception, Severity severity) {
+    public void notifyBlocking(@NonNull Throwable exception, @NonNull Severity severity) {
         Error error = new Error.Builder(config, exception,
             sessionTracker.getCurrentSession(), Thread.currentThread(), false)
             .severity(severity)
@@ -1070,9 +1070,9 @@ public void notifyBlocking(@NonNull Throwable exception, Severity severity) {
      * @param callback a callback when notifying
      */
     public void internalClientNotify(@NonNull Throwable exception,
-                              Map<String, Object> clientData,
+                              @NonNull Map<String, Object> clientData,
                               boolean blocking,
-                              Callback callback) {
+                              @Nullable Callback callback) {
         String severity = getKeyFromClientData(clientData, "severity", true);
         String severityReason =
             getKeyFromClientData(clientData, "severityReason", true);
@@ -1120,7 +1120,7 @@ private String getKeyFromClientData(Map<String, Object> clientData,
      * @param key   the name of the diagnostic information
      * @param value the contents of the diagnostic information
      */
-    public void addToTab(String tab, String key, Object value) {
+    public void addToTab(@NonNull String tab, @NonNull String key, @Nullable Object value) {
         config.getMetaData().addToTab(tab, key, value);
     }
 
@@ -1129,7 +1129,7 @@ public void addToTab(String tab, String key, Object value) {
      *
      * @param tabName the dashboard tab to remove diagnostic data from
      */
-    public void clearTab(String tabName) {
+    public void clearTab(@NonNull String tabName) {
         config.getMetaData().clearTab(tabName);
     }
 

From 8f2266232f04384975d03d55c5c3fd8d5c332761 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Tue, 11 Dec 2018 16:01:01 +0000
Subject: [PATCH 03/10] feat: add nullability annotations to public
 Bugsnag.java methods

---
 sdk/lint-baseline.xml                         | 341 ------------------
 .../java/com/bugsnag/android/Bugsnag.java     |  69 ++--
 2 files changed, 41 insertions(+), 369 deletions(-)

diff --git a/sdk/lint-baseline.xml b/sdk/lint-baseline.xml
index 0c900ea019..b7ba537558 100644
--- a/sdk/lint-baseline.xml
+++ b/sdk/lint-baseline.xml
@@ -78,347 +78,6 @@
             column="12"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setAppVersion(final String appVersion) {"
-        errorLine2="                                           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="89"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String getContext() {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="98"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setContext(final String context) {"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="109"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setEndpoint(final String endpoint) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="124"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setBuildUUID(final String buildUuid) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="137"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setFilters(final String... filters) {"
-        errorLine2="                                        ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="154"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setIgnoreClasses(final String... ignoreClasses) {"
-        errorLine2="                                              ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="167"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setNotifyReleaseStages(final String... notifyReleaseStages) {"
-        errorLine2="                                                    ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="182"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setProjectPackages(final String... projectPackages) {"
-        errorLine2="                                                ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="198"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setReleaseStage(final String releaseStage) {"
-        errorLine2="                                             ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="212"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setUser(final String id, final String email, final String name) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="250"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setUser(final String id, final String email, final String name) {"
-        errorLine2="                                                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="250"
-            column="55"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setUser(final String id, final String email, final String name) {"
-        errorLine2="                                                                          ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="250"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setUserId(final String id) {"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="268"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setUserEmail(final String email) {"
-        errorLine2="                                          ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="278"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setUserName(final String name) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="288"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void beforeNotify(final BeforeNotify beforeNotify) {"
-        errorLine2="                                          ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="350"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void beforeRecordBreadcrumb(final BeforeRecordBreadcrumb beforeRecordBreadcrumb) {"
-        errorLine2="                                                    ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="372"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void notify(@NonNull final Throwable exception, final Callback callback) {"
-        errorLine2="                                                                        ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="392"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                              Callback callback) {"
-        errorLine2="                              ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="408"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void notify(@NonNull final Throwable exception, final Severity severity) {"
-        errorLine2="                                                                        ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="419"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void notify(@NonNull final Throwable exception, final Severity severity,"
-        errorLine2="                                                                        ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="451"
-            column="73"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                              @NonNull StackTraceElement[] stacktrace, Severity severity,"
-        errorLine2="                                                                       ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="476"
-            column="72"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void notify(@NonNull String name, @NonNull String message, String context,"
-        errorLine2="                                                                             ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="505"
-            column="78"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                              @NonNull StackTraceElement[] stacktrace, Severity severity,"
-        errorLine2="                                                                       ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="506"
-            column="72"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                                            Map&lt;String, Object> clientData,"
-        errorLine2="                                            ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="526"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                                            Callback callback) {"
-        errorLine2="                                            ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="528"
-            column="45"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void addToTab(final String tab, final String key, final Object value) {"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="545"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void addToTab(final String tab, final String key, final Object value) {"
-        errorLine2="                                                        ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="545"
-            column="57"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void addToTab(final String tab, final String key, final Object value) {"
-        errorLine2="                                                                          ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="545"
-            column="75"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void clearTab(String tabName) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Bugsnag.java"
-            line="554"
-            column="33"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
diff --git a/sdk/src/main/java/com/bugsnag/android/Bugsnag.java b/sdk/src/main/java/com/bugsnag/android/Bugsnag.java
index b656f37f43..3b18121f59 100644
--- a/sdk/src/main/java/com/bugsnag/android/Bugsnag.java
+++ b/sdk/src/main/java/com/bugsnag/android/Bugsnag.java
@@ -86,7 +86,7 @@ public static Client init(@NonNull Context androidContext, @NonNull Configuratio
      *
      * @param appVersion the app version to send
      */
-    public static void setAppVersion(final String appVersion) {
+    public static void setAppVersion(@NonNull final String appVersion) {
         getClient().setAppVersion(appVersion);
     }
 
@@ -95,7 +95,7 @@ public static void setAppVersion(final String appVersion) {
      *
      * @return Context
      */
-    public static String getContext() {
+    @Nullable public static String getContext() {
         return getClient().getContext();
     }
 
@@ -106,7 +106,7 @@ public static String getContext() {
      *
      * @param context set what was happening at the time of a crash
      */
-    public static void setContext(final String context) {
+    public static void setContext(@Nullable final String context) {
         getClient().setContext(context);
     }
 
@@ -121,7 +121,7 @@ public static void setContext(final String context) {
      * instead.
      */
     @Deprecated
-    public static void setEndpoint(final String endpoint) {
+    public static void setEndpoint(@NonNull final String endpoint) {
         getClient().setEndpoint(endpoint);
     }
 
@@ -134,7 +134,7 @@ public static void setEndpoint(final String endpoint) {
      * @param buildUuid the buildUuid.
      */
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
-    public static void setBuildUUID(final String buildUuid) {
+    public static void setBuildUUID(@Nullable final String buildUuid) {
         getClient().setBuildUUID(buildUuid);
     }
 
@@ -151,7 +151,7 @@ public static void setBuildUUID(final String buildUuid) {
      *
      * @param filters a list of keys to filter from metaData
      */
-    public static void setFilters(final String... filters) {
+    public static void setFilters(@NonNull final String... filters) {
         getClient().setFilters(filters);
     }
 
@@ -164,7 +164,7 @@ public static void setFilters(final String... filters) {
      *
      * @param ignoreClasses a list of exception classes to ignore
      */
-    public static void setIgnoreClasses(final String... ignoreClasses) {
+    public static void setIgnoreClasses(@NonNull final String... ignoreClasses) {
         getClient().setIgnoreClasses(ignoreClasses);
     }
 
@@ -179,7 +179,7 @@ public static void setIgnoreClasses(final String... ignoreClasses) {
      * @param notifyReleaseStages a list of releaseStages to notify for
      * @see #setReleaseStage
      */
-    public static void setNotifyReleaseStages(final String... notifyReleaseStages) {
+    public static void setNotifyReleaseStages(@NonNull final String... notifyReleaseStages) {
         getClient().setNotifyReleaseStages(notifyReleaseStages);
     }
 
@@ -195,7 +195,7 @@ public static void setNotifyReleaseStages(final String... notifyReleaseStages) {
      *
      * @param projectPackages a list of package names
      */
-    public static void setProjectPackages(final String... projectPackages) {
+    public static void setProjectPackages(@NonNull final String... projectPackages) {
         getClient().setProjectPackages(projectPackages);
     }
 
@@ -209,7 +209,7 @@ public static void setProjectPackages(final String... projectPackages) {
      * @param releaseStage the release stage of the app
      * @see #setNotifyReleaseStages {@link #setLoggingEnabled(boolean)}
      */
-    public static void setReleaseStage(final String releaseStage) {
+    public static void setReleaseStage(@Nullable final String releaseStage) {
         getClient().setReleaseStage(releaseStage);
     }
 
@@ -247,7 +247,9 @@ public static void setAutoCaptureSessions(boolean autoCapture) {
      * @param email the email address of the current user
      * @param name  the name of the current user
      */
-    public static void setUser(final String id, final String email, final String name) {
+    public static void setUser(@Nullable final String id,
+                               @Nullable final String email,
+                               @Nullable final String name) {
         getClient().setUser(id, email, name);
     }
 
@@ -265,7 +267,7 @@ public static void clearUser() {
      *
      * @param id a unique identifier of the current user
      */
-    public static void setUserId(final String id) {
+    public static void setUserId(@Nullable final String id) {
         getClient().setUserId(id);
     }
 
@@ -275,7 +277,7 @@ public static void setUserId(final String id) {
      *
      * @param email the email address of the current user
      */
-    public static void setUserEmail(final String email) {
+    public static void setUserEmail(@Nullable final String email) {
         getClient().setUserEmail(email);
     }
 
@@ -285,7 +287,7 @@ public static void setUserEmail(final String email) {
      *
      * @param name the name of the current user
      */
-    public static void setUserName(final String name) {
+    public static void setUserName(@Nullable final String name) {
         getClient().setUserName(name);
     }
 
@@ -347,7 +349,7 @@ public static void setSessionTrackingApiClient(@NonNull SessionTrackingApiClient
      * @param beforeNotify a callback to run before sending errors to Bugsnag
      * @see BeforeNotify
      */
-    public static void beforeNotify(final BeforeNotify beforeNotify) {
+    public static void beforeNotify(@NonNull final BeforeNotify beforeNotify) {
         getClient().beforeNotify(beforeNotify);
     }
 
@@ -369,7 +371,8 @@ public static void beforeNotify(final BeforeNotify beforeNotify) {
      * @param beforeRecordBreadcrumb a callback to run before a breadcrumb is captured
      * @see BeforeRecordBreadcrumb
      */
-    public static void beforeRecordBreadcrumb(final BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
+    public static void beforeRecordBreadcrumb(
+        @NonNull final BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
         getClient().beforeRecordBreadcrumb(beforeRecordBreadcrumb);
     }
 
@@ -389,7 +392,8 @@ public static void notify(@NonNull final Throwable exception) {
      * @param callback  callback invoked on the generated error report for
      *                  additional modification
      */
-    public static void notify(@NonNull final Throwable exception, final Callback callback) {
+    public static void notify(@NonNull final Throwable exception,
+                              @Nullable final Callback callback) {
         getClient().notify(exception, callback);
     }
 
@@ -405,7 +409,7 @@ public static void notify(@NonNull final Throwable exception, final Callback cal
     public static void notify(@NonNull String name,
                               @NonNull String message,
                               @NonNull StackTraceElement[] stacktrace,
-                              Callback callback) {
+                              @Nullable Callback callback) {
         getClient().notify(name, message, stacktrace, callback);
     }
 
@@ -416,7 +420,8 @@ public static void notify(@NonNull String name,
      * @param severity  the severity of the error, one of Severity.ERROR,
      *                  Severity.WARNING or Severity.INFO
      */
-    public static void notify(@NonNull final Throwable exception, final Severity severity) {
+    public static void notify(@NonNull final Throwable exception,
+                              @NonNull final Severity severity) {
         getClient().notify(exception, severity);
     }
 
@@ -448,7 +453,8 @@ public void beforeNotify(@NonNull Report report) {
      * @deprecated Use {@link #notify(Throwable, Callback)} to send and modify error reports
      */
     @Deprecated
-    public static void notify(@NonNull final Throwable exception, final Severity severity,
+    public static void notify(@NonNull final Throwable exception,
+                              @NonNull final Severity severity,
                               @NonNull final MetaData metaData) {
         getClient().notify(exception, new Callback() {
             @Override
@@ -472,8 +478,10 @@ public void beforeNotify(@NonNull Report report) {
      * to send and modify error reports
      */
     @Deprecated
-    public static void notify(@NonNull String name, @NonNull String message,
-                              @NonNull StackTraceElement[] stacktrace, Severity severity,
+    public static void notify(@NonNull String name,
+                              @NonNull String message,
+                              @NonNull StackTraceElement[] stacktrace,
+                              @NonNull Severity severity,
                               @NonNull MetaData metaData) {
         final Severity finalSeverity = severity;
         final MetaData finalMetaData = metaData;
@@ -502,8 +510,11 @@ public void beforeNotify(@NonNull Report report) {
     @Deprecated
     @SuppressWarnings("checkstyle:JavadocTagContinuationIndentation")
 
-    public static void notify(@NonNull String name, @NonNull String message, String context,
-                              @NonNull StackTraceElement[] stacktrace, Severity severity,
+    public static void notify(@NonNull String name,
+                              @NonNull String message,
+                              @Nullable String context,
+                              @NonNull StackTraceElement[] stacktrace,
+                              @NonNull Severity severity,
                               @NonNull MetaData metaData) {
         final String finalContext = context;
         final Severity finalSeverity = severity;
@@ -523,9 +534,9 @@ public void beforeNotify(@NonNull Report report) {
      * Android is not supported.
      */
     public static void internalClientNotify(@NonNull final Throwable exception,
-                                            Map<String, Object> clientData,
+                                            @NonNull Map<String, Object> clientData,
                                             boolean blocking,
-                                            Callback callback) {
+                                            @Nullable Callback callback) {
         getClient().internalClientNotify(exception, clientData, blocking, callback);
     }
 
@@ -542,7 +553,9 @@ public static void internalClientNotify(@NonNull final Throwable exception,
      * @param key   the name of the diagnostic information
      * @param value the contents of the diagnostic information
      */
-    public static void addToTab(final String tab, final String key, final Object value) {
+    public static void addToTab(@NonNull final String tab,
+                                @NonNull final String key,
+                                @Nullable final Object value) {
         getClient().addToTab(tab, key, value);
     }
 
@@ -551,7 +564,7 @@ public static void addToTab(final String tab, final String key, final Object val
      *
      * @param tabName the dashboard tab to remove diagnostic data from
      */
-    public static void clearTab(String tabName) {
+    public static void clearTab(@NonNull String tabName) {
         getClient().clearTab(tabName);
     }
 

From 8472047997148c055b0fa626b7c161df5a9cf39d Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Tue, 11 Dec 2018 16:18:52 +0000
Subject: [PATCH 04/10] feat: add nullability annotations for Client

---
 sdk/lint-baseline.xml                         | 330 ------------------
 .../com/bugsnag/android/Configuration.java    |  48 ++-
 2 files changed, 30 insertions(+), 348 deletions(-)

diff --git a/sdk/lint-baseline.xml b/sdk/lint-baseline.xml
index 0c900ea019..776acbdbca 100644
--- a/sdk/lint-baseline.xml
+++ b/sdk/lint-baseline.xml
@@ -925,336 +925,6 @@
             column="26"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void update(Observable observable, Object arg) {"
-        errorLine2="                       ~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="76"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void update(Observable observable, Object arg) {"
-        errorLine2="                                              ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="76"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getAppVersion() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="98"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setAppVersion(String appVersion) {"
-        errorLine2="                              ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="108"
-            column="31"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getContext() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="120"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setContext(String context) {"
-        errorLine2="                           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="131"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getEndpoint() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="143"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setEndpoint(String endpoint) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="157"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getSessionEndpoint() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="201"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setSessionEndpoint(String endpoint) {"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="215"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getBuildUUID() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="225"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setBuildUUID(String buildUuid) {"
-        errorLine2="                             ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="238"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String[] getFilters() {"
-        errorLine2="           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="250"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setFilters(String[] filters) {"
-        errorLine2="                           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="267"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String[] getIgnoreClasses() {"
-        errorLine2="           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="276"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setIgnoreClasses(String[] ignoreClasses) {"
-        errorLine2="                                 ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="289"
-            column="34"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String[] getProjectPackages() {"
-        errorLine2="           ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="323"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setProjectPackages(String[] projectPackages) {"
-        errorLine2="                                   ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="339"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getReleaseStage() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="348"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setReleaseStage(String releaseStage) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="360"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setNotifierType(String notifierType) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="546"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setCodeBundleId(String codeBundleId) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="554"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Map&lt;String, String> getErrorApiHeaders() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="627"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Map&lt;String, String> getSessionApiHeaders() {"
-        errorLine2="           ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="640"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void beforeSend(BeforeSend beforeSend) {"
-        errorLine2="                           ~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="669"
-            column="28"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected boolean shouldNotifyForReleaseStage(String releaseStage) {"
-        errorLine2="                                                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="681"
-            column="51"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected boolean shouldIgnoreClass(String className) {"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="696"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void beforeNotify(BeforeNotify beforeNotify) {"
-        errorLine2="                                ~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="710"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected void beforeRecordBreadcrumb(BeforeRecordBreadcrumb beforeRecordBreadcrumb) {"
-        errorLine2="                                          ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="721"
-            column="43"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    protected Collection&lt;BeforeRecordBreadcrumb> getBeforeRecordBreadcrumbTasks() {"
-        errorLine2="              ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Configuration.java"
-            line="750"
-            column="15"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
diff --git a/sdk/src/main/java/com/bugsnag/android/Configuration.java b/sdk/src/main/java/com/bugsnag/android/Configuration.java
index 0d466ec0dd..31b86309d2 100644
--- a/sdk/src/main/java/com/bugsnag/android/Configuration.java
+++ b/sdk/src/main/java/com/bugsnag/android/Configuration.java
@@ -73,7 +73,7 @@ public Configuration(@NonNull String apiKey) {
     /**
      * Respond to an update notification from observed objects, like MetaData
      */
-    public void update(Observable observable, Object arg) {
+    public void update(@NonNull Observable observable, @NonNull Object arg) {
         if (arg instanceof NativeInterface.Message) {
             setChanged();
             notifyObservers(arg);
@@ -95,6 +95,7 @@ public String getApiKey() {
      *
      * @return App Version
      */
+    @NonNull
     public String getAppVersion() {
         return appVersion;
     }
@@ -105,7 +106,7 @@ public String getAppVersion() {
      *
      * @param appVersion the app version to send
      */
-    public void setAppVersion(String appVersion) {
+    public void setAppVersion(@NonNull String appVersion) {
         this.appVersion = appVersion;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -117,6 +118,7 @@ public void setAppVersion(String appVersion) {
      *
      * @return Context
      */
+    @Nullable
     public String getContext() {
         return context;
     }
@@ -128,7 +130,7 @@ public String getContext() {
      *
      * @param context set what was happening at the time of a crash
      */
-    public void setContext(String context) {
+    public void setContext(@Nullable String context) {
         this.context = context;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -140,6 +142,7 @@ public void setContext(String context) {
      *
      * @return Endpoint
      */
+    @NonNull
     public String getEndpoint() {
         return endpoint;
     }
@@ -154,7 +157,7 @@ public String getEndpoint() {
      * @deprecated use {@link com.bugsnag.android.Configuration#setEndpoints(String, String)}
      */
     @Deprecated
-    public void setEndpoint(String endpoint) {
+    public void setEndpoint(@NonNull String endpoint) {
         this.endpoint = endpoint;
     }
 
@@ -198,6 +201,7 @@ public void setEndpoints(@NonNull String notify, @NonNull String sessions)
      *
      * @return the endpoint
      */
+    @NonNull
     public String getSessionEndpoint() {
         return sessionEndpoint;
     }
@@ -212,7 +216,7 @@ public String getSessionEndpoint() {
      * @deprecated use {@link com.bugsnag.android.Configuration#setEndpoints(String, String)}
      */
     @Deprecated
-    public void setSessionEndpoint(String endpoint) {
+    public void setSessionEndpoint(@NonNull String endpoint) {
         this.sessionEndpoint = endpoint;
     }
 
@@ -222,6 +226,7 @@ public void setSessionEndpoint(String endpoint) {
      * @return build UUID
      */
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
+    @Nullable
     public String getBuildUUID() {
         return buildUuid;
     }
@@ -235,7 +240,7 @@ public String getBuildUUID() {
      * @param buildUuid the buildUUID.
      */
     @SuppressWarnings("checkstyle:AbbreviationAsWordInName")
-    public void setBuildUUID(String buildUuid) {
+    public void setBuildUUID(@Nullable String buildUuid) {
         this.buildUuid = buildUuid;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -247,6 +252,7 @@ public void setBuildUUID(String buildUuid) {
      *
      * @return Filters
      */
+    @NonNull
     public String[] getFilters() {
         return metaData.getFilters();
     }
@@ -264,7 +270,7 @@ public String[] getFilters() {
      *
      * @param filters a list of keys to filter from metaData
      */
-    public void setFilters(String[] filters) {
+    public void setFilters(@NonNull String[] filters) {
         this.metaData.setFilters(filters);
     }
 
@@ -273,6 +279,7 @@ public void setFilters(String[] filters) {
      *
      * @return Ignore classes
      */
+    @Nullable
     public String[] getIgnoreClasses() {
         return ignoreClasses;
     }
@@ -286,7 +293,7 @@ public String[] getIgnoreClasses() {
      *
      * @param ignoreClasses a list of exception classes to ignore
      */
-    public void setIgnoreClasses(String[] ignoreClasses) {
+    public void setIgnoreClasses(@NonNull String[] ignoreClasses) {
         this.ignoreClasses = ignoreClasses;
     }
 
@@ -311,7 +318,7 @@ public String[] getNotifyReleaseStages() {
      * @param notifyReleaseStages a list of releaseStages to notify for
      * @see #setReleaseStage
      */
-    public void setNotifyReleaseStages(@Nullable String[] notifyReleaseStages) {
+    public void setNotifyReleaseStages(@NonNull String[] notifyReleaseStages) {
         this.notifyReleaseStages = notifyReleaseStages;
     }
 
@@ -320,6 +327,7 @@ public void setNotifyReleaseStages(@Nullable String[] notifyReleaseStages) {
      *
      * @return packages
      */
+    @Nullable
     public String[] getProjectPackages() {
         return projectPackages;
     }
@@ -336,7 +344,7 @@ public String[] getProjectPackages() {
      *
      * @param projectPackages a list of package names
      */
-    public void setProjectPackages(String[] projectPackages) {
+    public void setProjectPackages(@NonNull String[] projectPackages) {
         this.projectPackages = projectPackages;
     }
 
@@ -345,6 +353,7 @@ public void setProjectPackages(String[] projectPackages) {
      *
      * @return release stage
      */
+    @Nullable
     public String getReleaseStage() {
         return releaseStage;
     }
@@ -357,7 +366,7 @@ public String getReleaseStage() {
      * @param releaseStage the release stage of the app
      * @see #setNotifyReleaseStages
      */
-    public void setReleaseStage(String releaseStage) {
+    public void setReleaseStage(@Nullable String releaseStage) {
         this.releaseStage = releaseStage;
         setChanged();
         notifyObservers(new NativeInterface.Message(
@@ -543,7 +552,7 @@ public void setAutomaticallyCollectBreadcrumbs(boolean automaticallyCollectBread
      * Intended for internal use only - sets the type of the notifier (e.g. Android, React Native)
      * @param notifierType the notifier type
      */
-    public void setNotifierType(String notifierType) {
+    public void setNotifierType(@NonNull String notifierType) {
         this.notifierType = notifierType;
     }
 
@@ -551,7 +560,7 @@ public void setNotifierType(String notifierType) {
      * Intended for internal use only - sets the code bundle id for React Native
      * @param codeBundleId the code bundle id
      */
-    public void setCodeBundleId(String codeBundleId) {
+    public void setCodeBundleId(@Nullable String codeBundleId) {
         this.codeBundleId = codeBundleId;
     }
 
@@ -624,6 +633,7 @@ public void setDelivery(@NonNull Delivery delivery) {
      *
      * @return the HTTP headers
      */
+    @NonNull
     public Map<String, String> getErrorApiHeaders() {
         Map<String, String> map = new HashMap<>();
         map.put(HEADER_API_PAYLOAD_VERSION, "4.0");
@@ -637,6 +647,7 @@ public Map<String, String> getErrorApiHeaders() {
      *
      * @return the HTTP headers
      */
+    @NonNull
     public Map<String, String> getSessionApiHeaders() {
         Map<String, String> map = new HashMap<>();
         map.put(HEADER_API_PAYLOAD_VERSION, "1.0");
@@ -666,7 +677,7 @@ public Map<String, String> getSessionApiHeaders() {
      * @see BeforeSend
      * @see Report
      */
-    public void beforeSend(BeforeSend beforeSend) {
+    public void beforeSend(@NonNull BeforeSend beforeSend) {
         if (!beforeSendTasks.contains(beforeSend)) {
             beforeSendTasks.add(beforeSend);
         }
@@ -678,7 +689,7 @@ public void beforeSend(BeforeSend beforeSend) {
      * @param releaseStage the release stage to check
      * @return true if the release state should be notified else false
      */
-    protected boolean shouldNotifyForReleaseStage(String releaseStage) {
+    protected boolean shouldNotifyForReleaseStage(@Nullable String releaseStage) {
         if (this.notifyReleaseStages == null) {
             return true;
         }
@@ -693,7 +704,7 @@ protected boolean shouldNotifyForReleaseStage(String releaseStage) {
      * @param className the exception class to check
      * @return true if the exception class should be ignored else false
      */
-    protected boolean shouldIgnoreClass(String className) {
+    protected boolean shouldIgnoreClass(@Nullable String className) {
         if (this.ignoreClasses == null) {
             return false;
         }
@@ -707,7 +718,7 @@ protected boolean shouldIgnoreClass(String className) {
      *
      * @param beforeNotify the new before notify task
      */
-    protected void beforeNotify(BeforeNotify beforeNotify) {
+    protected void beforeNotify(@NonNull BeforeNotify beforeNotify) {
         if (!beforeNotifyTasks.contains(beforeNotify)) {
             beforeNotifyTasks.add(beforeNotify);
         }
@@ -718,7 +729,7 @@ protected void beforeNotify(BeforeNotify beforeNotify) {
      *
      * @param beforeRecordBreadcrumb the new before breadcrumb task
      */
-    protected void beforeRecordBreadcrumb(BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
+    protected void beforeRecordBreadcrumb(@NonNull BeforeRecordBreadcrumb beforeRecordBreadcrumb) {
         if (!beforeRecordBreadcrumbTasks.contains(beforeRecordBreadcrumb)) {
             beforeRecordBreadcrumbTasks.add(beforeRecordBreadcrumb);
         }
@@ -747,6 +758,7 @@ protected boolean inProject(@NonNull String className) {
      *
      * @return the before breadcrumb tasks
      */
+    @NonNull
     protected Collection<BeforeRecordBreadcrumb> getBeforeRecordBreadcrumbTasks() {
         return beforeRecordBreadcrumbTasks;
     }

From d1fefcde96f8aa26ce6fe77b60332f0196e76307 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Wed, 12 Dec 2018 09:21:56 +0000
Subject: [PATCH 05/10] feat: add nullability annotations to NativeInterface
 class

---
 sdk/lint-baseline.xml                         | 328 ------------------
 .../com/bugsnag/android/NativeInterface.java  |  48 ++-
 2 files changed, 31 insertions(+), 345 deletions(-)

diff --git a/sdk/lint-baseline.xml b/sdk/lint-baseline.xml
index 0c900ea019..bc622dfc5f 100644
--- a/sdk/lint-baseline.xml
+++ b/sdk/lint-baseline.xml
@@ -1574,335 +1574,7 @@
             column="26"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public final MessageType type;"
-        errorLine2="                     ~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="118"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public final Object value;"
-        errorLine2="                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="119"
-            column="22"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Message(MessageType type, Object value) {"
-        errorLine2="                       ~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="121"
-            column="24"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="        public Message(MessageType type, Object value) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="121"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String getContext() {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="176"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String getNativeReportPath() {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="184"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setUser(final String id,"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="254"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                               final String email,"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="255"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                               final String name) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="256"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void leaveBreadcrumb(String name, String type, Map&lt;String, String> metadata) {"
-        errorLine2="                                       ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="274"
-            column="40"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void leaveBreadcrumb(String name, String type, Map&lt;String, String> metadata) {"
-        errorLine2="                                                    ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="274"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void leaveBreadcrumb(String name, String type, Map&lt;String, String> metadata) {"
-        errorLine2="                                                                 ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="274"
-            column="66"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void addToTab(final String tab,"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="283"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                                final String key,"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="284"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                                final Object value) {"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="285"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setReleaseStage(final String stage) {"
-        errorLine2="                                             ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="292"
-            column="46"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String getReleaseStage() {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="299"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String getSessionEndpoint() {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="306"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String getEndpoint() {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="313"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setSessionEndpoint(final String endpoint) {"
-        errorLine2="                                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="321"
-            column="49"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setEndpoint(final String endpoint) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="329"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setContext(final String context) {"
-        errorLine2="                                        ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="336"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setAppVersion(final String version) {"
-        errorLine2="                                           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="343"
-            column="44"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setBinaryArch(final String binaryArch) {"
-        errorLine2="                                           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="350"
-            column="44"/>
-    </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String getAppVersion() {"
-        errorLine2="                  ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="357"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static String[] getNotifyReleaseStages() {"
-        errorLine2="                  ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="364"
-            column="19"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void setNotifyReleaseStages(String[] notifyReleaseStages) {"
-        errorLine2="                                              ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="371"
-            column="47"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void deliverReport(String releaseStage, String payload) {"
-        errorLine2="                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="383"
-            column="38"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public static void deliverReport(String releaseStage, String payload) {"
-        errorLine2="                                                          ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="383"
-            column="59"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                              final Severity severity,"
-        errorLine2="                                    ~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NativeInterface.java"
-            line="403"
-            column="37"/>
-    </issue>
 
     <issue
         id="UnknownNullness"
diff --git a/sdk/src/main/java/com/bugsnag/android/NativeInterface.java b/sdk/src/main/java/com/bugsnag/android/NativeInterface.java
index fc94bc0453..9a58878908 100644
--- a/sdk/src/main/java/com/bugsnag/android/NativeInterface.java
+++ b/sdk/src/main/java/com/bugsnag/android/NativeInterface.java
@@ -2,6 +2,7 @@
 
 import android.annotation.SuppressLint;
 import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -115,10 +116,14 @@ public enum MessageType {
      * Wrapper for messages sent to native observers
      */
     public static class Message {
+
+        @NonNull
         public final MessageType type;
+
+        @Nullable
         public final Object value;
 
-        public Message(MessageType type, Object value) {
+        public Message(@NonNull MessageType type, @Nullable Object value) {
             this.type = type;
             this.value = value;
         }
@@ -173,6 +178,7 @@ public static void configureClientObservers(@NonNull Client client) {
         client.sendNativeSetupNotification();
     }
 
+    @Nullable
     public static String getContext() {
         return getClient().getContext();
     }
@@ -181,6 +187,7 @@ public static boolean getLoggingEnabled() {
         return Logger.getEnabled();
     }
 
+    @NonNull
     public static String getNativeReportPath() {
         return getClient().appContext.getCacheDir().getAbsolutePath() + "/bugsnag-native/";
     }
@@ -251,9 +258,9 @@ public static List<Breadcrumb> getBreadcrumbs() {
      * @param name name
      */
     @SuppressWarnings("unused")
-    public static void setUser(final String id,
-                               final String email,
-                               final String name) {
+    public static void setUser(@Nullable final String id,
+                               @Nullable final String email,
+                               @Nullable final String name) {
         Client client = getClient();
         client.setUserId(id);
         client.setUserEmail(email);
@@ -271,7 +278,9 @@ public static void leaveBreadcrumb(@NonNull final String name,
     /**
      * Leaves a breadcrumb on the static client instance
      */
-    public static void leaveBreadcrumb(String name, String type, Map<String, String> metadata) {
+    public static void leaveBreadcrumb(@NonNull String name,
+                                       @NonNull String type,
+                                       @NonNull Map<String, String> metadata) {
         String typeName = type.toUpperCase(Locale.US);
         Map<String, String> map = metadata == null ? new HashMap<String, String>() : metadata;
         getClient().leaveBreadcrumb(name, BreadcrumbType.valueOf(typeName), map);
@@ -280,22 +289,23 @@ public static void leaveBreadcrumb(String name, String type, Map<String, String>
     /**
      * Add metadata to subsequent exception reports
      */
-    public static void addToTab(final String tab,
-                                final String key,
-                                final Object value) {
+    public static void addToTab(@NonNull final String tab,
+                                @NonNull final String key,
+                                @Nullable final Object value) {
         getClient().addToTab(tab, key, value);
     }
 
     /**
      * Set the client report release stage
      */
-    public static void setReleaseStage(final String stage) {
+    public static void setReleaseStage(@Nullable final String stage) {
         getClient().setReleaseStage(stage);
     }
 
     /**
      * Return the client report release stage
      */
+    @Nullable
     public static String getReleaseStage() {
         return getClient().getConfig().getReleaseStage();
     }
@@ -303,6 +313,7 @@ public static String getReleaseStage() {
     /**
      * Return the client session endpoint
      */
+    @NonNull
     public static String getSessionEndpoint() {
         return getClient().getConfig().getSessionEndpoint();
     }
@@ -310,6 +321,7 @@ public static String getSessionEndpoint() {
     /**
      * Return the client report endpoint
      */
+    @NonNull
     public static String getEndpoint() {
         return getClient().getConfig().getEndpoint();
     }
@@ -318,7 +330,7 @@ public static String getEndpoint() {
      * Set the client session endpoint
      */
     @SuppressWarnings("deprecation")
-    public static void setSessionEndpoint(final String endpoint) {
+    public static void setSessionEndpoint(@NonNull final String endpoint) {
         getClient().getConfig().setSessionEndpoint(endpoint);
     }
 
@@ -326,34 +338,35 @@ public static void setSessionEndpoint(final String endpoint) {
      * Set the client report endpoint
      */
     @SuppressWarnings("deprecation")
-    public static void setEndpoint(final String endpoint) {
+    public static void setEndpoint(@NonNull final String endpoint) {
         getClient().getConfig().setEndpoint(endpoint);
     }
 
     /**
      * Set the client report context
      */
-    public static void setContext(final String context) {
+    public static void setContext(@Nullable final String context) {
         getClient().setContext(context);
     }
 
     /**
      * Set the client report app version
      */
-    public static void setAppVersion(final String version) {
+    public static void setAppVersion(@NonNull final String version) {
         getClient().setAppVersion(version);
     }
 
     /**
      * Set the binary arch used in the application
      */
-    public static void setBinaryArch(final String binaryArch) {
+    public static void setBinaryArch(@NonNull final String binaryArch) {
         getClient().setBinaryArch(binaryArch);
     }
 
     /**
      * Return the client report app version
      */
+    @NonNull
     public static String getAppVersion() {
         return getClient().getConfig().getAppVersion();
     }
@@ -361,6 +374,7 @@ public static String getAppVersion() {
     /**
      * Return which release stages notify
      */
+    @NonNull
     public static String[] getNotifyReleaseStages() {
         return getClient().getConfig().getNotifyReleaseStages();
     }
@@ -368,7 +382,7 @@ public static String[] getNotifyReleaseStages() {
     /**
      * Set which release stages notify
      */
-    public static void setNotifyReleaseStages(String[] notifyReleaseStages) {
+    public static void setNotifyReleaseStages(@NonNull String[] notifyReleaseStages) {
         getClient().getConfig().setNotifyReleaseStages(notifyReleaseStages);
     }
 
@@ -380,7 +394,7 @@ public static void setNotifyReleaseStages(String[] notifyReleaseStages) {
      *                     stages
      */
     @SuppressWarnings("unused")
-    public static void deliverReport(String releaseStage, String payload) {
+    public static void deliverReport(@Nullable String releaseStage, @NonNull String payload) {
         Client client = getClient();
         if (releaseStage == null
             || releaseStage.length() == 0
@@ -400,7 +414,7 @@ public static void deliverReport(String releaseStage, String payload) {
      */
     public static void notify(@NonNull final String name,
                               @NonNull final String message,
-                              final Severity severity,
+                              @NonNull final Severity severity,
                               @NonNull final StackTraceElement[] stacktrace) {
 
         getClient().notify(name, message, stacktrace, new Callback() {

From 181e809f8ef600f6236c1c2a974613237947f27b Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Wed, 12 Dec 2018 09:52:44 +0000
Subject: [PATCH 06/10] feat: add nullability annotations to remaining public
 sites

---
 sdk/lint-baseline.xml                         | 494 ------------------
 .../bugsnag/android/BadResponseException.java |   4 +-
 .../com/bugsnag/android/BeforeNotify.java     |   4 +-
 .../java/com/bugsnag/android/BeforeSend.java  |   4 +-
 .../com/bugsnag/android/BreadcrumbType.java   |   5 +-
 .../com/bugsnag/android/BugsnagException.java |   7 +-
 .../java/com/bugsnag/android/Callback.java    |   4 +-
 .../com/bugsnag/android/DefaultDelivery.java  |   9 +-
 .../java/com/bugsnag/android/Delivery.java    |  10 +-
 .../com/bugsnag/android/DeliveryCompat.java   |   9 +-
 .../android/DeliveryFailureException.java     |   7 +-
 .../main/java/com/bugsnag/android/Error.java  |  14 +-
 .../bugsnag/android/ErrorReportApiClient.java |   6 +-
 .../com/bugsnag/android/EventReceiver.java    |   4 +-
 .../java/com/bugsnag/android/JsonStream.java  |   2 +-
 .../java/com/bugsnag/android/MetaData.java    |   4 +-
 .../com/bugsnag/android/NetworkException.java |   5 +-
 .../java/com/bugsnag/android/NotifyType.java  |   2 +
 .../android/SessionTrackingApiClient.java     |   8 +-
 .../java/com/bugsnag/android/Severity.java    |   1 +
 20 files changed, 74 insertions(+), 529 deletions(-)

diff --git a/sdk/lint-baseline.xml b/sdk/lint-baseline.xml
index 0c900ea019..d071408b7d 100644
--- a/sdk/lint-baseline.xml
+++ b/sdk/lint-baseline.xml
@@ -34,50 +34,6 @@
             column="12"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public BadResponseException(String msg, int responseCode) {"
-        errorLine2="                                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BadResponseException.java"
-            line="13"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    boolean run(Error error);"
-        errorLine2="                ~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BeforeNotify.java"
-            line="21"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    boolean run(Report report);"
-        errorLine2="                ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BeforeSend.java"
-            line="19"
-            column="17"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String toString() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BreadcrumbType.java"
-            line="48"
-            column="12"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -419,61 +375,6 @@
             column="33"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public BugsnagException(String name, String message, StackTraceElement[] frames) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BugsnagException.java"
-            line="22"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public BugsnagException(String name, String message, StackTraceElement[] frames) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BugsnagException.java"
-            line="22"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public BugsnagException(String name, String message, StackTraceElement[] frames) {"
-        errorLine2="                                                         ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BugsnagException.java"
-            line="22"
-            column="58"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getName() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/BugsnagException.java"
-            line="32"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void beforeNotify(Report report);"
-        errorLine2="                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Callback.java"
-            line="14"
-            column="23"/>
-    </issue>
-
     <issue
         id="UnknownNullness"
         message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
@@ -1255,324 +1156,6 @@
             column="15"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void deliver(SessionTrackingPayload payload,"
-        errorLine2="                 ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Delivery.java"
-            line="39"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                 Configuration config) throws DeliveryFailureException;"
-        errorLine2="                 ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Delivery.java"
-            line="40"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void deliver(Report report,"
-        errorLine2="                 ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Delivery.java"
-            line="61"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                 Configuration config) throws DeliveryFailureException;"
-        errorLine2="                 ~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Delivery.java"
-            line="62"
-            column="18"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public DeliveryFailureException(String message) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/DeliveryFailureException.java"
-            line="13"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public DeliveryFailureException(String message, Throwable cause) {"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/DeliveryFailureException.java"
-            line="17"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public DeliveryFailureException(String message, Throwable cause) {"
-        errorLine2="                                                    ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/DeliveryFailureException.java"
-            line="17"
-            column="53"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUser(String id, String email, String name) {"
-        errorLine2="                        ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="194"
-            column="25"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUser(String id, String email, String name) {"
-        errorLine2="                                   ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="194"
-            column="36"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUser(String id, String email, String name) {"
-        errorLine2="                                                 ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="194"
-            column="50"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUserId(String id) {"
-        errorLine2="                          ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="215"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUserEmail(String email) {"
-        errorLine2="                             ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="225"
-            column="30"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void setUserName(String name) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="235"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tabName, String key, Object value) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="253"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tabName, String key, Object value) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="253"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tabName, String key, Object value) {"
-        errorLine2="                                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="253"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void clearTab(String tabName) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="262"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getExceptionName() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="302"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Throwable getException() {"
-        errorLine2="           ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Error.java"
-            line="322"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void postReport(String urlString, Report report, Map&lt;String, String> headers)"
-        errorLine2="                    ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/ErrorReportApiClient.java"
-            line="29"
-            column="21"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void postReport(String urlString, Report report, Map&lt;String, String> headers)"
-        errorLine2="                                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/ErrorReportApiClient.java"
-            line="29"
-            column="39"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void postReport(String urlString, Report report, Map&lt;String, String> headers)"
-        errorLine2="                                                     ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/ErrorReportApiClient.java"
-            line="29"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public EventReceiver(Client client) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/EventReceiver.java"
-            line="28"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void onReceive(Context context, @NonNull Intent intent) {"
-        errorLine2="                          ~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/EventReceiver.java"
-            line="33"
-            column="27"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public JsonStream(Writer out) {"
-        errorLine2="                      ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/JsonStream.java"
-            line="29"
-            column="23"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tabName, String key, Object value) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/MetaData.java"
-            line="60"
-            column="26"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tabName, String key, Object value) {"
-        errorLine2="                                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/MetaData.java"
-            line="60"
-            column="42"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void addToTab(String tabName, String key, Object value) {"
-        errorLine2="                                                     ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/MetaData.java"
-            line="60"
-            column="54"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public void clearTab(String tabName) {"
-        errorLine2="                         ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/MetaData.java"
-            line="81"
-            column="26"/>
-    </issue>
 
     <issue
         id="UnknownNullness"
@@ -1904,81 +1487,4 @@
             column="37"/>
     </issue>
 
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public NetworkException(String msg, Throwable cause) {"
-        errorLine2="                            ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NetworkException.java"
-            line="13"
-            column="29"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public NetworkException(String msg, Throwable cause) {"
-        errorLine2="                                        ~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NetworkException.java"
-            line="13"
-            column="41"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public Integer getValue() {"
-        errorLine2="           ~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/NotifyType.java"
-            line="26"
-            column="12"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    void postSessionTrackingPayload(String urlString,"
-        errorLine2="                                    ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/SessionTrackingApiClient.java"
-            line="25"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                                    SessionTrackingPayload payload,"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/SessionTrackingApiClient.java"
-            line="26"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="                                    Map&lt;String, String> headers)"
-        errorLine2="                                    ~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/SessionTrackingApiClient.java"
-            line="27"
-            column="37"/>
-    </issue>
-
-    <issue
-        id="UnknownNullness"
-        message="Unknown nullability; explicitly declare as `@Nullable` or `@NonNull` to improve Kotlin interoperability; see https://android.github.io/kotlin-guides/interop.html#nullability-annotations"
-        errorLine1="    public String getName() {"
-        errorLine2="           ~~~~~~">
-        <location
-            file="src/main/java/com/bugsnag/android/Severity.java"
-            line="42"
-            column="12"/>
-    </issue>
-
 </issues>
diff --git a/sdk/src/main/java/com/bugsnag/android/BadResponseException.java b/sdk/src/main/java/com/bugsnag/android/BadResponseException.java
index f42c62f1b6..81b7642764 100644
--- a/sdk/src/main/java/com/bugsnag/android/BadResponseException.java
+++ b/sdk/src/main/java/com/bugsnag/android/BadResponseException.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 import java.util.Locale;
 
 /**
@@ -10,7 +12,7 @@
 public class BadResponseException extends Exception {
     private static final long serialVersionUID = -870190454845379171L;
 
-    public BadResponseException(String msg, int responseCode) {
+    public BadResponseException(@NonNull String msg, int responseCode) {
         super(String.format(Locale.US, "%s (%d)", msg, responseCode));
     }
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/BeforeNotify.java b/sdk/src/main/java/com/bugsnag/android/BeforeNotify.java
index 01112e0dea..a67eb3a359 100644
--- a/sdk/src/main/java/com/bugsnag/android/BeforeNotify.java
+++ b/sdk/src/main/java/com/bugsnag/android/BeforeNotify.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 /**
  * A callback to be run before reports are sent to Bugsnag.
  * <p>
@@ -18,5 +20,5 @@ public interface BeforeNotify {
      * @param error the error to be sent to Bugsnag
      * @see Error
      */
-    boolean run(Error error);
+    boolean run(@NonNull Error error);
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/BeforeSend.java b/sdk/src/main/java/com/bugsnag/android/BeforeSend.java
index e652b49277..41babd2b52 100644
--- a/sdk/src/main/java/com/bugsnag/android/BeforeSend.java
+++ b/sdk/src/main/java/com/bugsnag/android/BeforeSend.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 /**
  * A callback to be run before every report sent to Bugsnag.
  * <p>
@@ -16,5 +18,5 @@ public interface BeforeSend {
      *
      * @param report the {@link Report} to be sent to Bugsnag
      */
-    boolean run(Report report);
+    boolean run(@NonNull Report report);
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/BreadcrumbType.java b/sdk/src/main/java/com/bugsnag/android/BreadcrumbType.java
index 39140de43a..b9408a1f4e 100644
--- a/sdk/src/main/java/com/bugsnag/android/BreadcrumbType.java
+++ b/sdk/src/main/java/com/bugsnag/android/BreadcrumbType.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 /**
  * Recognized types of breadcrumbs
  */
@@ -40,11 +42,12 @@ public enum BreadcrumbType {
 
     private final String type;
 
-    BreadcrumbType(String type) {
+    BreadcrumbType(@NonNull String type) {
         this.type = type;
     }
 
     @Override
+    @NonNull
     public String toString() {
         return type;
     }
diff --git a/sdk/src/main/java/com/bugsnag/android/BugsnagException.java b/sdk/src/main/java/com/bugsnag/android/BugsnagException.java
index 3abe5585b6..25a9dd7b91 100644
--- a/sdk/src/main/java/com/bugsnag/android/BugsnagException.java
+++ b/sdk/src/main/java/com/bugsnag/android/BugsnagException.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 /**
  * Used to store information about an exception that was not provided with an exception object
  */
@@ -19,7 +21,9 @@ public class BugsnagException extends Throwable {
      * @param message The exception message
      * @param frames  The exception stack trace
      */
-    public BugsnagException(String name, String message, StackTraceElement[] frames) {
+    public BugsnagException(@NonNull String name,
+                            @NonNull String message,
+                            @NonNull StackTraceElement[] frames) {
         super(message);
 
         super.setStackTrace(frames);
@@ -29,6 +33,7 @@ public BugsnagException(String name, String message, StackTraceElement[] frames)
     /**
      * @return The name of the exception (used instead of the exception class)
      */
+    @NonNull
     public String getName() {
         return name;
     }
diff --git a/sdk/src/main/java/com/bugsnag/android/Callback.java b/sdk/src/main/java/com/bugsnag/android/Callback.java
index 483d89a441..58b20a03a0 100644
--- a/sdk/src/main/java/com/bugsnag/android/Callback.java
+++ b/sdk/src/main/java/com/bugsnag/android/Callback.java
@@ -1,6 +1,8 @@
 package com.bugsnag.android;
 
 
+import android.support.annotation.NonNull;
+
 /**
  * A callback to be run before an individual report is sent to Bugsnag.
  * <p>
@@ -11,5 +13,5 @@
  */
 public interface Callback {
 
-    void beforeNotify(Report report);
+    void beforeNotify(@NonNull Report report);
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java b/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java
index fe82d72ba1..76ef349322 100644
--- a/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java
+++ b/sdk/src/main/java/com/bugsnag/android/DefaultDelivery.java
@@ -2,6 +2,7 @@
 
 import android.net.ConnectivityManager;
 import android.net.NetworkInfo;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 import java.io.BufferedWriter;
@@ -23,8 +24,8 @@ class DefaultDelivery implements Delivery {
     }
 
     @Override
-    public void deliver(SessionTrackingPayload payload,
-                        Configuration config) throws DeliveryFailureException {
+    public void deliver(@NonNull SessionTrackingPayload payload,
+                        @NonNull Configuration config) throws DeliveryFailureException {
         String endpoint = config.getSessionEndpoint();
         int status = deliver(endpoint, payload, config.getSessionApiHeaders());
 
@@ -36,8 +37,8 @@ public void deliver(SessionTrackingPayload payload,
     }
 
     @Override
-    public void deliver(Report report,
-                        Configuration config) throws DeliveryFailureException {
+    public void deliver(@NonNull Report report,
+                        @NonNull Configuration config) throws DeliveryFailureException {
         String endpoint = config.getEndpoint();
         int status = deliver(endpoint, report, config.getErrorApiHeaders());
 
diff --git a/sdk/src/main/java/com/bugsnag/android/Delivery.java b/sdk/src/main/java/com/bugsnag/android/Delivery.java
index 2bb75990c2..72222f7acb 100644
--- a/sdk/src/main/java/com/bugsnag/android/Delivery.java
+++ b/sdk/src/main/java/com/bugsnag/android/Delivery.java
@@ -1,6 +1,8 @@
 package com.bugsnag.android;
 
 
+import android.support.annotation.NonNull;
+
 /**
  * Implementations of this interface deliver Error Reports and Sessions captured to the Bugsnag API.
  * <p>
@@ -36,8 +38,8 @@ public interface Delivery {
      * @throws DeliveryFailureException when delivery is not successful and
      *                                  the report should be stored for future attempts.
      */
-    void deliver(SessionTrackingPayload payload,
-                 Configuration config) throws DeliveryFailureException;
+    void deliver(@NonNull SessionTrackingPayload payload,
+                 @NonNull Configuration config) throws DeliveryFailureException;
 
     /**
      * Posts an Error Report to the Bugsnag Error Reporting API.
@@ -58,6 +60,6 @@ void deliver(SessionTrackingPayload payload,
      * @throws DeliveryFailureException when delivery is not successful and
      *                                  the report should be stored for future attempts.
      */
-    void deliver(Report report,
-                 Configuration config) throws DeliveryFailureException;
+    void deliver(@NonNull Report report,
+                 @NonNull Configuration config) throws DeliveryFailureException;
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/DeliveryCompat.java b/sdk/src/main/java/com/bugsnag/android/DeliveryCompat.java
index 98edd77674..b711c7aa65 100644
--- a/sdk/src/main/java/com/bugsnag/android/DeliveryCompat.java
+++ b/sdk/src/main/java/com/bugsnag/android/DeliveryCompat.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 /**
  * A compatibility implementation of {@link Delivery} which wraps {@link ErrorReportApiClient} and
  * {@link SessionTrackingApiClient}. This class allows for backwards compatibility for users still
@@ -15,8 +17,8 @@ class DeliveryCompat implements Delivery {
     volatile SessionTrackingApiClient sessionTrackingApiClient;
 
     @Override
-    public void deliver(SessionTrackingPayload payload,
-                        Configuration config) throws DeliveryFailureException {
+    public void deliver(@NonNull SessionTrackingPayload payload,
+                        @NonNull Configuration config) throws DeliveryFailureException {
         if (sessionTrackingApiClient != null) {
             try {
                 sessionTrackingApiClient.postSessionTrackingPayload(config.getSessionEndpoint(),
@@ -28,7 +30,8 @@ public void deliver(SessionTrackingPayload payload,
     }
 
     @Override
-    public void deliver(Report report, Configuration config) throws DeliveryFailureException {
+    public void deliver(@NonNull Report report,
+                        @NonNull Configuration config) throws DeliveryFailureException {
         if (errorReportApiClient != null) {
             try {
                 errorReportApiClient.postReport(config.getEndpoint(),
diff --git a/sdk/src/main/java/com/bugsnag/android/DeliveryFailureException.java b/sdk/src/main/java/com/bugsnag/android/DeliveryFailureException.java
index 25315c9f1b..8b33e257e9 100644
--- a/sdk/src/main/java/com/bugsnag/android/DeliveryFailureException.java
+++ b/sdk/src/main/java/com/bugsnag/android/DeliveryFailureException.java
@@ -1,5 +1,8 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 /**
  * This should be thrown if delivery of a request was not successful and you wish to try again
  * later. The notifier will cache the payload and initiate delivery at a future time.
@@ -10,11 +13,11 @@
 public class DeliveryFailureException extends Exception {
     private static final long serialVersionUID = 1501477209400426470L;
 
-    public DeliveryFailureException(String message) {
+    public DeliveryFailureException(@NonNull String message) {
         super(message);
     }
 
-    public DeliveryFailureException(String message, Throwable cause) {
+    public DeliveryFailureException(@NonNull String message, @Nullable Throwable cause) {
         super(message, cause);
     }
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/Error.java b/sdk/src/main/java/com/bugsnag/android/Error.java
index 246aa07f59..66999cb758 100644
--- a/sdk/src/main/java/com/bugsnag/android/Error.java
+++ b/sdk/src/main/java/com/bugsnag/android/Error.java
@@ -191,7 +191,7 @@ public Severity getSeverity() {
      * @param email the email address of the user
      * @param name  the name of the user
      */
-    public void setUser(String id, String email, String name) {
+    public void setUser(@Nullable String id, @Nullable String email, @Nullable String name) {
         this.user = new User(id, email, name);
     }
 
@@ -212,7 +212,7 @@ public User getUser() {
      *
      * @param id the id of the user
      */
-    public void setUserId(String id) {
+    public void setUserId(@Nullable String id) {
         this.user = new User(this.user);
         this.user.setId(id);
     }
@@ -222,7 +222,7 @@ public void setUserId(String id) {
      *
      * @param email the email address of the user
      */
-    public void setUserEmail(String email) {
+    public void setUserEmail(@Nullable String email) {
         this.user = new User(this.user);
         this.user.setEmail(email);
     }
@@ -232,7 +232,7 @@ public void setUserEmail(String email) {
      *
      * @param name the name of the user
      */
-    public void setUserName(String name) {
+    public void setUserName(@Nullable String name) {
         this.user = new User(this.user);
         this.user.setName(name);
     }
@@ -250,7 +250,7 @@ public void setUserName(String name) {
      * @param key     the name of the diagnostic information
      * @param value   the contents of the diagnostic information
      */
-    public void addToTab(String tabName, String key, Object value) {
+    public void addToTab(@NonNull String tabName, @NonNull String key, @Nullable Object value) {
         metaData.addToTab(tabName, key, value);
     }
 
@@ -259,7 +259,7 @@ public void addToTab(String tabName, String key, Object value) {
      *
      * @param tabName the dashboard tab to remove diagnostic data from
      */
-    public void clearTab(String tabName) {
+    public void clearTab(@NonNull String tabName) {
         metaData.clearTab(tabName);
     }
 
@@ -299,6 +299,7 @@ public void setMetaData(@NonNull MetaData metaData) {
     /**
      * Get the class name from the exception contained in this Error report.
      */
+    @NonNull
     public String getExceptionName() {
         if (exception instanceof BugsnagException) {
             return ((BugsnagException) exception).getName();
@@ -319,6 +320,7 @@ public String getExceptionMessage() {
     /**
      * The {@linkplain Throwable exception} which triggered this Error report.
      */
+    @NonNull
     public Throwable getException() {
         return exception;
     }
diff --git a/sdk/src/main/java/com/bugsnag/android/ErrorReportApiClient.java b/sdk/src/main/java/com/bugsnag/android/ErrorReportApiClient.java
index d3791806b8..9efd125bb2 100644
--- a/sdk/src/main/java/com/bugsnag/android/ErrorReportApiClient.java
+++ b/sdk/src/main/java/com/bugsnag/android/ErrorReportApiClient.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 import java.util.Map;
 
 /**
@@ -26,7 +28,9 @@ public interface ErrorReportApiClient {
      * @throws NetworkException     if the client was unable to complete the request
      * @throws BadResponseException when a non-200 response code is received from the server
      */
-    void postReport(String urlString, Report report, Map<String, String> headers)
+    void postReport(@NonNull String urlString,
+                    @NonNull Report report,
+                    @NonNull Map<String, String> headers)
         throws NetworkException, BadResponseException;
 
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/EventReceiver.java b/sdk/src/main/java/com/bugsnag/android/EventReceiver.java
index bf877b75f6..40820064a3 100644
--- a/sdk/src/main/java/com/bugsnag/android/EventReceiver.java
+++ b/sdk/src/main/java/com/bugsnag/android/EventReceiver.java
@@ -25,12 +25,12 @@ public class EventReceiver extends BroadcastReceiver {
 
     private final Client client;
 
-    public EventReceiver(Client client) {
+    public EventReceiver(@NonNull Client client) {
         this.client = client;
     }
 
     @Override
-    public void onReceive(Context context, @NonNull Intent intent) {
+    public void onReceive(@NonNull Context context, @NonNull Intent intent) {
         try {
             Map<String, String> meta = new HashMap<>();
             String fullAction = intent.getAction();
diff --git a/sdk/src/main/java/com/bugsnag/android/JsonStream.java b/sdk/src/main/java/com/bugsnag/android/JsonStream.java
index 291126cbf8..89bd103456 100644
--- a/sdk/src/main/java/com/bugsnag/android/JsonStream.java
+++ b/sdk/src/main/java/com/bugsnag/android/JsonStream.java
@@ -26,7 +26,7 @@ public interface Streamable {
      *
      * @param out the writer
      */
-    public JsonStream(Writer out) {
+    public JsonStream(@NonNull Writer out) {
         super(out);
         setSerializeNulls(false);
         this.out = out;
diff --git a/sdk/src/main/java/com/bugsnag/android/MetaData.java b/sdk/src/main/java/com/bugsnag/android/MetaData.java
index 4b440fe9db..026bcbdc20 100644
--- a/sdk/src/main/java/com/bugsnag/android/MetaData.java
+++ b/sdk/src/main/java/com/bugsnag/android/MetaData.java
@@ -57,7 +57,7 @@ public void toStream(@NonNull JsonStream writer) throws IOException {
      * @param key     the name of the diagnostic information
      * @param value   the contents of the diagnostic information
      */
-    public void addToTab(String tabName, String key, Object value) {
+    public void addToTab(@NonNull String tabName, @NonNull String key, @Nullable Object value) {
         Map<String, Object> tab = getTab(tabName);
         setChanged();
         if (value != null) {
@@ -78,7 +78,7 @@ public void addToTab(String tabName, String key, Object value) {
      *
      * @param tabName the dashboard tab to remove diagnostic data from
      */
-    public void clearTab(String tabName) {
+    public void clearTab(@NonNull String tabName) {
         store.remove(tabName);
         setChanged();
         notifyObservers(new NativeInterface.Message(
diff --git a/sdk/src/main/java/com/bugsnag/android/NetworkException.java b/sdk/src/main/java/com/bugsnag/android/NetworkException.java
index 3c08e17d48..d8d06ba493 100644
--- a/sdk/src/main/java/com/bugsnag/android/NetworkException.java
+++ b/sdk/src/main/java/com/bugsnag/android/NetworkException.java
@@ -1,5 +1,8 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
 import java.io.IOException;
 
 /**
@@ -10,7 +13,7 @@
 public class NetworkException extends IOException {
     private static final long serialVersionUID = -4370366096145029322L;
 
-    public NetworkException(String msg, Throwable cause) {
+    public NetworkException(@NonNull String msg, @Nullable Throwable cause) {
         super(msg, cause);
     }
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/NotifyType.java b/sdk/src/main/java/com/bugsnag/android/NotifyType.java
index 9a9035c31c..f1f19e06ac 100644
--- a/sdk/src/main/java/com/bugsnag/android/NotifyType.java
+++ b/sdk/src/main/java/com/bugsnag/android/NotifyType.java
@@ -1,5 +1,6 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 
 /**
@@ -23,6 +24,7 @@ public enum NotifyType {
         this.intValue = intValue;
     }
 
+    @NonNull
     public Integer getValue() {
         return intValue;
     }
diff --git a/sdk/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java b/sdk/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java
index 173cdb0f1f..d270df90a6 100644
--- a/sdk/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java
+++ b/sdk/src/main/java/com/bugsnag/android/SessionTrackingApiClient.java
@@ -1,5 +1,7 @@
 package com.bugsnag.android;
 
+import android.support.annotation.NonNull;
+
 import java.util.Map;
 
 /**
@@ -22,9 +24,9 @@ public interface SessionTrackingApiClient {
      * @throws NetworkException     if the client was unable to complete the request
      * @throws BadResponseException when a non-202 response code is received from the server
      */
-    void postSessionTrackingPayload(String urlString,
-                                    SessionTrackingPayload payload,
-                                    Map<String, String> headers)
+    void postSessionTrackingPayload(@NonNull String urlString,
+                                    @NonNull SessionTrackingPayload payload,
+                                    @NonNull Map<String, String> headers)
         throws NetworkException, BadResponseException;
 
 }
diff --git a/sdk/src/main/java/com/bugsnag/android/Severity.java b/sdk/src/main/java/com/bugsnag/android/Severity.java
index 09bfb3da52..5d300875dc 100644
--- a/sdk/src/main/java/com/bugsnag/android/Severity.java
+++ b/sdk/src/main/java/com/bugsnag/android/Severity.java
@@ -39,6 +39,7 @@ static Severity fromString(String input) {
         }
     }
 
+    @NonNull
     public String getName() {
         return name;
     }

From ebab41a4c9ed74d4f5b89c2adeca0e3f09058aa0 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Thu, 13 Dec 2018 09:04:37 +0000
Subject: [PATCH 07/10] feat: update mazerunner delivery signatures to use
 non-null parameters

---
 .../com/bugsnag/android/TestHarnessHooks.kt   | 20 +++++++++----------
 .../android/mazerunner/scenarios/Scenario.kt  | 12 +++++------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/TestHarnessHooks.kt b/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/TestHarnessHooks.kt
index 98bea56795..fa6666ba5c 100644
--- a/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/TestHarnessHooks.kt
+++ b/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/TestHarnessHooks.kt
@@ -26,12 +26,12 @@ internal fun createSlowDelivery(context: Context): Delivery {
     val delivery = DefaultDelivery(cm)
 
     return object : Delivery {
-        override fun deliver(payload: SessionTrackingPayload?, config: Configuration?) {
+        override fun deliver(payload: SessionTrackingPayload, config: Configuration) {
             Thread.sleep(500)
             delivery.deliver(payload, config)
         }
 
-        override fun deliver(report: Report?, config: Configuration?) {
+        override fun deliver(report: Report, config: Configuration) {
             Thread.sleep(500)
             delivery.deliver(report, config)
         }
@@ -47,18 +47,18 @@ internal fun createCustomHeaderDelivery(context: Context): Delivery {
     return object : Delivery {
         val delivery: DefaultDelivery = createDefaultDelivery(context)
 
-        override fun deliver(payload: SessionTrackingPayload?, config: Configuration?) {
-            deliver(config?.sessionEndpoint, payload, config?.sessionApiHeaders)
+        override fun deliver(payload: SessionTrackingPayload, config: Configuration) {
+            deliver(config.sessionEndpoint, payload, config.sessionApiHeaders)
         }
 
-        override fun deliver(report: Report?, config: Configuration?) {
-            deliver(config?.endpoint, report, config?.errorApiHeaders)
+        override fun deliver(report: Report, config: Configuration) {
+            deliver(config.endpoint, report, config.errorApiHeaders)
         }
 
-        fun deliver(endpoint: String?,
-                    streamable: JsonStream.Streamable?,
-                    headers: MutableMap<String, String>?) {
-            headers!!["Custom-Client"] = "Hello World"
+        fun deliver(endpoint: String,
+                    streamable: JsonStream.Streamable,
+                    headers: MutableMap<String, String>) {
+            headers["Custom-Client"] = "Hello World"
             delivery.deliver(endpoint, streamable, headers)
         }
     }
diff --git a/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/mazerunner/scenarios/Scenario.kt b/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/mazerunner/scenarios/Scenario.kt
index 7e962d13a2..a7e132df87 100644
--- a/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/mazerunner/scenarios/Scenario.kt
+++ b/features/fixtures/mazerunner/src/main/java/com/bugsnag/android/mazerunner/scenarios/Scenario.kt
@@ -18,11 +18,11 @@ abstract internal class Scenario(protected val config: Configuration,
     protected fun disableSessionDelivery() {
         val baseDelivery = Bugsnag.getClient().config.delivery
         Bugsnag.getClient().config.delivery = object: Delivery {
-            override fun deliver(payload: SessionTrackingPayload?, config: Configuration?) {
+            override fun deliver(payload: SessionTrackingPayload, config: Configuration) {
                 throw DeliveryFailureException("Session Delivery NOP", RuntimeException("NOP"))
             }
 
-            override fun deliver(report: Report?, config: Configuration?) {
+            override fun deliver(report: Report, config: Configuration) {
                 baseDelivery.deliver(report, config)
             }
         }
@@ -34,11 +34,11 @@ abstract internal class Scenario(protected val config: Configuration,
     protected fun disableReportDelivery() {
         val baseDelivery = Bugsnag.getClient().config.delivery
         Bugsnag.getClient().config.delivery = object: Delivery {
-            override fun deliver(payload: SessionTrackingPayload?, config: Configuration?) {
+            override fun deliver(payload: SessionTrackingPayload, config: Configuration) {
                 baseDelivery.deliver(payload, config)
             }
 
-            override fun deliver(report: Report?, config: Configuration?) {
+            override fun deliver(report: Report, config: Configuration) {
                 throw DeliveryFailureException("Session Delivery NOP", RuntimeException("NOP"))
             }
         }
@@ -57,11 +57,11 @@ abstract internal class Scenario(protected val config: Configuration,
 
     protected fun disableAllDelivery(config: Configuration) {
         config.delivery = object: Delivery {
-            override fun deliver(payload: SessionTrackingPayload?, config: Configuration?) {
+            override fun deliver(payload: SessionTrackingPayload, config: Configuration) {
                 throw DeliveryFailureException("Error Delivery NOP", RuntimeException("NOP"))
             }
 
-            override fun deliver(report: Report?, config: Configuration?) {
+            override fun deliver(report: Report, config: Configuration) {
                 throw DeliveryFailureException("Session Delivery NOP", RuntimeException("NOP"))
             }
         }

From 18c5b5a8127ad86f40a52917c535248cf043f2e5 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Thu, 13 Dec 2018 14:19:55 +0000
Subject: [PATCH 08/10] feat: add nullability annotations to missed getters

---
 sdk/src/main/java/com/bugsnag/android/Configuration.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sdk/src/main/java/com/bugsnag/android/Configuration.java b/sdk/src/main/java/com/bugsnag/android/Configuration.java
index 97830011b3..e85b78618a 100644
--- a/sdk/src/main/java/com/bugsnag/android/Configuration.java
+++ b/sdk/src/main/java/com/bugsnag/android/Configuration.java
@@ -575,10 +575,12 @@ public void setCodeBundleId(@Nullable String codeBundleId) {
         this.codeBundleId = codeBundleId;
     }
 
+    @Nullable
     public String getCodeBundleId() {
         return codeBundleId;
     }
 
+    @NonNull
     public String getNotifierType() {
         return notifierType;
     }

From 55f1577736fe9ede304f218ff575c3f756b0ccce Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Fri, 14 Dec 2018 14:21:45 +0000
Subject: [PATCH 09/10] feat: final adjustments of nullability annotations on
 second sweep

---
 sdk/src/main/java/com/bugsnag/android/Bugsnag.java     |  8 ++++----
 sdk/src/main/java/com/bugsnag/android/Client.java      |  8 ++++----
 .../main/java/com/bugsnag/android/Configuration.java   | 10 +++++-----
 .../main/java/com/bugsnag/android/NativeInterface.java |  4 ++--
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/sdk/src/main/java/com/bugsnag/android/Bugsnag.java b/sdk/src/main/java/com/bugsnag/android/Bugsnag.java
index 3b18121f59..1a0dbdf1dc 100644
--- a/sdk/src/main/java/com/bugsnag/android/Bugsnag.java
+++ b/sdk/src/main/java/com/bugsnag/android/Bugsnag.java
@@ -151,7 +151,7 @@ public static void setBuildUUID(@Nullable final String buildUuid) {
      *
      * @param filters a list of keys to filter from metaData
      */
-    public static void setFilters(@NonNull final String... filters) {
+    public static void setFilters(@Nullable final String... filters) {
         getClient().setFilters(filters);
     }
 
@@ -164,7 +164,7 @@ public static void setFilters(@NonNull final String... filters) {
      *
      * @param ignoreClasses a list of exception classes to ignore
      */
-    public static void setIgnoreClasses(@NonNull final String... ignoreClasses) {
+    public static void setIgnoreClasses(@Nullable final String... ignoreClasses) {
         getClient().setIgnoreClasses(ignoreClasses);
     }
 
@@ -179,7 +179,7 @@ public static void setIgnoreClasses(@NonNull final String... ignoreClasses) {
      * @param notifyReleaseStages a list of releaseStages to notify for
      * @see #setReleaseStage
      */
-    public static void setNotifyReleaseStages(@NonNull final String... notifyReleaseStages) {
+    public static void setNotifyReleaseStages(@Nullable final String... notifyReleaseStages) {
         getClient().setNotifyReleaseStages(notifyReleaseStages);
     }
 
@@ -195,7 +195,7 @@ public static void setNotifyReleaseStages(@NonNull final String... notifyRelease
      *
      * @param projectPackages a list of package names
      */
-    public static void setProjectPackages(@NonNull final String... projectPackages) {
+    public static void setProjectPackages(@Nullable final String... projectPackages) {
         getClient().setProjectPackages(projectPackages);
     }
 
diff --git a/sdk/src/main/java/com/bugsnag/android/Client.java b/sdk/src/main/java/com/bugsnag/android/Client.java
index fdd91baa9c..ef9ac11af0 100644
--- a/sdk/src/main/java/com/bugsnag/android/Client.java
+++ b/sdk/src/main/java/com/bugsnag/android/Client.java
@@ -370,7 +370,7 @@ public void setBuildUUID(@Nullable final String buildUuid) {
      *
      * @param filters a list of keys to filter from metaData
      */
-    public void setFilters(@NonNull String... filters) {
+    public void setFilters(@Nullable String... filters) {
         config.setFilters(filters);
     }
 
@@ -383,7 +383,7 @@ public void setFilters(@NonNull String... filters) {
      *
      * @param ignoreClasses a list of exception classes to ignore
      */
-    public void setIgnoreClasses(@NonNull String... ignoreClasses) {
+    public void setIgnoreClasses(@Nullable String... ignoreClasses) {
         config.setIgnoreClasses(ignoreClasses);
     }
 
@@ -398,7 +398,7 @@ public void setIgnoreClasses(@NonNull String... ignoreClasses) {
      * @param notifyReleaseStages a list of releaseStages to notify for
      * @see #setReleaseStage
      */
-    public void setNotifyReleaseStages(@NonNull String... notifyReleaseStages) {
+    public void setNotifyReleaseStages(@Nullable String... notifyReleaseStages) {
         config.setNotifyReleaseStages(notifyReleaseStages);
     }
 
@@ -414,7 +414,7 @@ public void setNotifyReleaseStages(@NonNull String... notifyReleaseStages) {
      *
      * @param projectPackages a list of package names
      */
-    public void setProjectPackages(@NonNull String... projectPackages) {
+    public void setProjectPackages(@Nullable String... projectPackages) {
         config.setProjectPackages(projectPackages);
     }
 
diff --git a/sdk/src/main/java/com/bugsnag/android/Configuration.java b/sdk/src/main/java/com/bugsnag/android/Configuration.java
index e85b78618a..7dbd5bc0c6 100644
--- a/sdk/src/main/java/com/bugsnag/android/Configuration.java
+++ b/sdk/src/main/java/com/bugsnag/android/Configuration.java
@@ -252,7 +252,7 @@ public void setBuildUUID(@Nullable String buildUuid) {
      *
      * @return Filters
      */
-    @NonNull
+    @Nullable
     public String[] getFilters() {
         return metaData.getFilters();
     }
@@ -270,7 +270,7 @@ public String[] getFilters() {
      *
      * @param filters a list of keys to filter from metaData
      */
-    public void setFilters(@NonNull String[] filters) {
+    public void setFilters(@Nullable String[] filters) {
         this.metaData.setFilters(filters);
     }
 
@@ -293,7 +293,7 @@ public String[] getIgnoreClasses() {
      *
      * @param ignoreClasses a list of exception classes to ignore
      */
-    public void setIgnoreClasses(@NonNull String[] ignoreClasses) {
+    public void setIgnoreClasses(@Nullable String[] ignoreClasses) {
         this.ignoreClasses = ignoreClasses;
     }
 
@@ -318,7 +318,7 @@ public String[] getNotifyReleaseStages() {
      * @param notifyReleaseStages a list of releaseStages to notify for
      * @see #setReleaseStage
      */
-    public void setNotifyReleaseStages(@NonNull String[] notifyReleaseStages) {
+    public void setNotifyReleaseStages(@Nullable String[] notifyReleaseStages) {
         this.notifyReleaseStages = notifyReleaseStages;
     }
 
@@ -344,7 +344,7 @@ public String[] getProjectPackages() {
      *
      * @param projectPackages a list of package names
      */
-    public void setProjectPackages(@NonNull String[] projectPackages) {
+    public void setProjectPackages(@Nullable String[] projectPackages) {
         this.projectPackages = projectPackages;
     }
 
diff --git a/sdk/src/main/java/com/bugsnag/android/NativeInterface.java b/sdk/src/main/java/com/bugsnag/android/NativeInterface.java
index 9a58878908..4f552b234f 100644
--- a/sdk/src/main/java/com/bugsnag/android/NativeInterface.java
+++ b/sdk/src/main/java/com/bugsnag/android/NativeInterface.java
@@ -374,7 +374,7 @@ public static String getAppVersion() {
     /**
      * Return which release stages notify
      */
-    @NonNull
+    @Nullable
     public static String[] getNotifyReleaseStages() {
         return getClient().getConfig().getNotifyReleaseStages();
     }
@@ -382,7 +382,7 @@ public static String[] getNotifyReleaseStages() {
     /**
      * Set which release stages notify
      */
-    public static void setNotifyReleaseStages(@NonNull String[] notifyReleaseStages) {
+    public static void setNotifyReleaseStages(@Nullable String[] notifyReleaseStages) {
         getClient().getConfig().setNotifyReleaseStages(notifyReleaseStages);
     }
 

From 194f576c70d8f9df8b9278abca560fa8bd45d8d4 Mon Sep 17 00:00:00 2001
From: fractalwrench <fractalwrench@gmail.com>
Date: Mon, 17 Dec 2018 10:46:10 +0000
Subject: [PATCH 10/10] docs: add changelog entry

---
 CHANGELOG.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f432f1ade2..71476aa148 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## 4.X.X (TBD)
 
+* Added additional nullability annotations to public API
+ [#395](https://github.com/bugsnag/bugsnag-android/pull/395)
+
 ### Bug fixes
 
 * Add binary architecture of application to payload