Remove double implementation of the loglevel

Author: AustinBenoit

analytics/src/analytics_desktop.cc

@@ -26,6 +26,7 @@
 #include "app/src/include/firebase/future.h"
 #include "app/src/include/firebase/variant.h"
 #include "app/src/log.h"
+#include "firebase/log.h"
 
 #if defined(_WIN32)
 #include <windows.h>
@@ -388,28 +389,29 @@ void ResetAnalyticsData() {
   g_fake_instance_id++;
 }
 
-// C-style callback that will be passed to the Google Analytics C API.
-static void GoogleAnalyticsWraperLogCallback(GoogleAnalytics_LogLevel log_level,
-                            const char* message) {
-  if (g_log_callback) {
-    LogLevel sdk_log_level;
-    switch (log_level) {
-      case kDebug:
-        sdk_log_level = kLogLevelDebug;
-        break;
+LogLevel ConvertAnalyticsLogLevelToFirebaseLogLevel(
+    GoogleAnalytics_LogLevel log_level) {
+  switch (log_level) {
+    case kDebug:
+      return kLogLevelDebug;
       case kInfo:
-        sdk_log_level = kLogLevelInfo;
-        break;
+        return kLogLevelInfo;
       case kWarning:
-        sdk_log_level = kLogLevelWarning;
-        break;
+        return kLogLevelWarning;
       case kError:
-        sdk_log_level = kLogLevelError;
-        break;
+        return kLogLevelError;
       default:
-        sdk_log_level = kLogLevelInfo;
-    }
-    g_log_callback(sdk_log_level, message);
+        return kLogLevelInfo;
+  }
+}
+
+// C-style callback that will be passed to the Google Analytics C API.
+static void GoogleAnalyticsWraperLogCallback(GoogleAnalytics_LogLevel log_level,
+                            const char* message) {
+  if (g_log_callback) {
+    LogLevel firebase_log_level =
+        ConvertAnalyticsLogLevelToFirebaseLogLevel(log_level);
+    g_log_callback(firebase_log_level, message);
   }
 }
 

analytics/src/include/firebase/analytics.h

@@ -25,6 +25,7 @@
 #include <vector>
 
 #include "firebase/app.h"
+#include "firebase/log.h"
 #include "firebase/future.h"
 #include "firebase/internal/common.h"
 #include "firebase/variant.h"
@@ -559,14 +560,6 @@ void SetSessionTimeoutDuration(int64_t milliseconds);
 /// instance id.
 void ResetAnalyticsData();
 
-/// @brief The log level of the message logged by the SDK.
-enum LogLevel {
-  kLogLevelDebug,
-  kLogLevelInfo,
-  kLogLevelWarning,
-  kLogLevelError,
-};
-
 /// @brief The callback type for logging messages from the SDK.
 ///
 /// The callback is invoked whenever the SDK logs a message.
@@ -576,7 +569,7 @@ enum LogLevel {
 using LogCallback =  std::function<void(LogLevel, const char*)>;
 
 /// @brief Allows the passing of a callback to be used when the SDK logs any
-/// messages regarding its behavior. The callback must be thread-safe.
+/// messages regarding its behaviour. The callback must be thread-safe.
 ///
 /// @param[in] callback The callback to use. Must be thread-safe.
 void SetLogCallback(const LogCallback& callback);