Merge branch 'release/3.7' into develop

Conflicts: WordPress/src/main/java/org/wordpress/android/ui/accounts/SignInFragment.java
wordpress-mobile · Feb 2, 2015 · 94d1dbb · 94d1dbb
2 parents 7c208db + 8ff9413
commit 94d1dbb
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java b/WordPressUtils/src/main/java/org/wordpress/android/util/AppLog.java
@@ -33,31 +33,37 @@ public static void enableRecording(boolean enable) {
     }
 
     public static void v(T tag, String message) {
+        message = StringUtils.notNullStr(message);
         Log.v(TAG + "-" + tag.toString(), message);
         addEntry(tag, LogLevel.v, message);
     }
 
     public static void d(T tag, String message) {
+        message = StringUtils.notNullStr(message);
         Log.d(TAG + "-" + tag.toString(), message);
         addEntry(tag, LogLevel.d, message);
     }
 
     public static void i(T tag, String message) {
+        message = StringUtils.notNullStr(message);
         Log.i(TAG + "-" + tag.toString(), message);
         addEntry(tag, LogLevel.i, message);
     }
 
     public static void w(T tag, String message) {
+        message = StringUtils.notNullStr(message);
         Log.w(TAG + "-" + tag.toString(), message);
         addEntry(tag, LogLevel.w, message);
     }
 
     public static void e(T tag, String message) {
+        message = StringUtils.notNullStr(message);
         Log.e(TAG + "-" + tag.toString(), message);
         addEntry(tag, LogLevel.e, message);
     }
 
     public static void e(T tag, String message, Throwable tr) {
+        message = StringUtils.notNullStr(message);
         Log.e(TAG + "-" + tag.toString(), message, tr);
         addEntry(tag, LogLevel.e, message + " - exception: " + tr.getMessage());
         addEntry(tag, LogLevel.e, "StackTrace: " + getStringStackTrace(tr));