Fix nullability for nonfatals & clean up logging calls

Author: mrwillis21

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/FirebaseCrashlytics.java

@@ -123,6 +123,10 @@ public static FirebaseCrashlytics getInstance() {
    * @param throwable a {@link Throwable} to be recorded as a non-fatal event.
    */
   public void recordException(@NonNull Throwable throwable) {
+    if (throwable == null) { // Users could call this with null despite the annotation.
+      Logger.getLogger().w("Crashlytics is ignoring a request to log a null exception.");
+      return;
+    }
     core.logException(throwable);
   }
 

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsController.java

@@ -646,7 +646,7 @@ public Void call() throws Exception {
   }
 
   /** Log a caught exception - write out Throwable as event section of protobuf */
-  void writeNonFatalException(final Thread thread, final Throwable ex) {
+  void writeNonFatalException(@NonNull final Thread thread, @NonNull final Throwable ex) {
     // Capture and close over the current time, so that we get the exact call time,
     // rather than the time at which the task executes.
     final Date time = new Date();
@@ -676,7 +676,7 @@ void setCustomKey(String key, String value) {
       if (context != null && CommonUtils.isAppDebuggable(context)) {
         throw ex;
       } else {
-        Logger.getLogger().e("Attempting to set custom attribute with null key, ignoring.", null);
+        Logger.getLogger().e("Attempting to set custom attribute with null key, ignoring.");
         return;
       }
     }
@@ -1169,7 +1169,7 @@ private void writeFatal(Thread thread, Throwable ex, long eventTime) {
       final String currentSessionId = getCurrentSessionId();
 
       if (currentSessionId == null) {
-        Logger.getLogger().e("Tried to write a fatal exception while no session was open.", null);
+        Logger.getLogger().e("Tried to write a fatal exception while no session was open.");
         return;
       }
 
@@ -1188,11 +1188,11 @@ private void writeFatal(Thread thread, Throwable ex, long eventTime) {
    * Not synchronized/locked. Must be executed from the single thread executor service used by this
    * class.
    */
-  private void doWriteNonFatal(Thread thread, Throwable ex, long eventTime) {
+  private void doWriteNonFatal(@NonNull Thread thread, @NonNull Throwable ex, long eventTime) {
     final String currentSessionId = getCurrentSessionId();
 
     if (currentSessionId == null) {
-      Logger.getLogger().e("Tried to write a non-fatal exception while no session was open.", null);
+      Logger.getLogger().d("Tried to write a non-fatal exception while no session was open.");
       return;
     }
 
@@ -1601,7 +1601,7 @@ private void writeInitialPartsTo(CodedOutputStream cos, String sessionId) throws
           listFilesMatching(new FileNameContainsFilter(sessionId + tag + SESSION_FILE_EXTENSION));
 
       if (sessionPartFiles.length == 0) {
-        Logger.getLogger().e("Can't find " + tag + " data for session ID " + sessionId, null);
+        Logger.getLogger().d("Can't find " + tag + " data for session ID " + sessionId);
       } else {
         Logger.getLogger().d("Collecting " + tag + " data for session ID " + sessionId);
         writeToCosFromFile(cos, sessionPartFiles[0]);
@@ -1630,7 +1630,7 @@ public void writeTo(CodedOutputStream cos) throws Exception {
    */
   private static void writeToCosFromFile(CodedOutputStream cos, File file) throws IOException {
     if (!file.exists()) {
-      Logger.getLogger().e("Tried to include a file that doesn't exist: " + file.getName(), null);
+      Logger.getLogger().e("Tried to include a file that doesn't exist: " + file.getName());
       return;
     }
 

firebase-crashlytics/src/main/java/com/google/firebase/crashlytics/internal/common/CrashlyticsCore.java

@@ -311,12 +311,7 @@ public static String getVersion() {
    * Throwable was thrown. The Throwable will always be processed on a background thread, so it is
    * safe to invoke this method from the main thread.
    */
-  public void logException(final Throwable throwable) {
-    if (throwable == null) {
-      Logger.getLogger().w("Crashlytics is ignoring a request to log a null exception.");
-      return;
-    }
-
+  public void logException(@NonNull Throwable throwable) {
     controller.writeNonFatalException(Thread.currentThread(), throwable);
   }