Merge pull request #66 from Iterable/feature/MOB-57-debug-level

[MOB-57] Make log level configurable from IterableConfig

Author: vbabenkoru

iterableapi/src/main/java/com/iterable/iterableapi/IterableConfig.java

@@ -1,5 +1,7 @@
 package com.iterable.iterableapi;
 
+import android.util.Log;
+
 /**
  *
  */
@@ -40,13 +42,19 @@ public class IterableConfig {
      */
     final boolean checkForDeferredDeeplink;
 
+    /**
+     * Log level for Iterable SDK log messages
+     */
+    final int logLevel;
+
     private IterableConfig(Builder builder) {
         pushIntegrationName = builder.pushIntegrationName;
         urlHandler = builder.urlHandler;
         customActionHandler = builder.customActionHandler;
         autoPushRegistration = builder.autoPushRegistration;
         legacyGCMSenderId = builder.legacyGCMSenderId;
         checkForDeferredDeeplink = builder.checkForDeferredDeeplink;
+        logLevel = builder.logLevel;
     }
 
     public static class Builder {
@@ -56,6 +64,7 @@ public static class Builder {
         private boolean autoPushRegistration = true;
         private String legacyGCMSenderId;
         private boolean checkForDeferredDeeplink;
+        private int logLevel = Log.ERROR;
 
         public Builder() {}
 
@@ -119,6 +128,15 @@ public Builder setCheckForDeferredDeeplink(boolean checkForDeferredDeeplink) {
             return this;
         }
 
+        /**
+         * Set the log level for Iterable SDK log messages
+         * @param logLevel Log level, defaults to {@link Log#ERROR}
+         */
+        public Builder setLogLevel(int logLevel) {
+            this.logLevel = logLevel;
+            return this;
+        }
+
         public IterableConfig build() {
             return new IterableConfig(this);
         }

iterableapi/src/main/java/com/iterable/iterableapi/IterableLogger.java

@@ -8,42 +8,53 @@
 public class IterableLogger {
 
     public static void d(String tag, String msg) {
-        if (isDebugMode()) {
+        if (isLoggableLevel(Log.DEBUG)) {
             Log.d(tag, msg);
         }
     }
 
     public static void d(String tag, String msg, Throwable tr) {
-        if (isDebugMode()) {
+        if (isLoggableLevel(Log.DEBUG)) {
             Log.d(tag, msg, tr);
         }
     }
 
     public static void w(String tag, String msg) {
-        if (isDebugMode()) {
+        if (isLoggableLevel(Log.WARN)) {
             Log.w(tag, msg);
         }
     }
 
     public static void w(String tag, String msg, Throwable tr) {
-        if (isDebugMode()) {
+        if (isLoggableLevel(Log.WARN)) {
             Log.w(tag, msg, tr);
         }
     }
 
     public static void e(String tag, String msg) {
-        if (isDebugMode()) {
+        if (isLoggableLevel(Log.ERROR)) {
             Log.e(tag, msg);
         }
     }
 
     public static void e(String tag, String msg, Throwable tr) {
-        if (isDebugMode()) {
+        if (isLoggableLevel(Log.ERROR)) {
             Log.e(tag, msg, tr);
         }
     }
 
-    private static boolean isDebugMode() {
-        return (IterableApi.sharedInstance != null) ? IterableApi.sharedInstance.getDebugMode() : false;
+    private static boolean isLoggableLevel(int messageLevel) {
+        return messageLevel >= getLogLevel();
+    }
+
+    private static int getLogLevel() {
+        if (IterableApi.sharedInstance != null) {
+            if (IterableApi.sharedInstance.getDebugMode()) {
+                return Log.VERBOSE;
+            } else {
+                return IterableApi.sharedInstance.config.logLevel;
+            }
+        }
+        return Log.ERROR;
     }
 }