From 44de8239ec7d9e6b79194647829863d176123379 Mon Sep 17 00:00:00 2001
From: Allan Wang <me@allanwang.ca>
Date: Sun, 23 Feb 2020 16:47:57 -0800
Subject: Remove pref component from logger

---
 app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt    | 17 +++--------------
 .../main/kotlin/com/pitchedapps/frost/utils/Prefs.kt    |  4 ++++
 2 files changed, 7 insertions(+), 14 deletions(-)

(limited to 'app/src/main/kotlin/com/pitchedapps/frost/utils')

diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
index 393df763..974047e8 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/L.kt
@@ -16,28 +16,17 @@
  */
 package com.pitchedapps.frost.utils
 
-import android.util.Log
 import ca.allanwang.kau.logging.KauLogger
 import ca.allanwang.kau.logging.KauLoggerExtension
 import com.bugsnag.android.Bugsnag
 import com.pitchedapps.frost.BuildConfig
-import org.koin.core.KoinComponent
-import org.koin.core.inject
 
 /**
  * Created by Allan Wang on 2017-05-28.
  *
  * Logging for frost
  */
-object L : KauLogger("Frost", {
-    when (it) {
-        Log.VERBOSE -> BuildConfig.DEBUG
-        Log.INFO, Log.ERROR -> true
-        else -> BuildConfig.DEBUG || L.prefs.verboseLogging
-    }
-}), KoinComponent {
-
-    private val prefs: Prefs by inject()
+object L : KauLogger("Frost") {
 
     inline fun test(message: () -> Any?) {
         _d {
@@ -63,7 +52,7 @@ object L : KauLogger("Frost", {
         }
     }
 
-    var bugsnagInit = false
+    var hasAnalytics: () -> Boolean = { false }
 
     override fun logImpl(priority: Int, message: String?, t: Throwable?) {
         /*
@@ -71,7 +60,7 @@ object L : KauLogger("Frost", {
          * bugsnagInit is changed per application and helps prevent crashes (if calling pre init)
          * analytics is changed by the user, and may be toggled throughout the app
          */
-        if (BuildConfig.DEBUG || !bugsnagInit || !prefs.analytics) {
+        if (BuildConfig.DEBUG || !hasAnalytics()) {
             super.logImpl(priority, message, t)
         } else {
             if (message != null) {
diff --git a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
index 3d394abe..8052533b 100644
--- a/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
+++ b/app/src/main/kotlin/com/pitchedapps/frost/utils/Prefs.kt
@@ -158,6 +158,10 @@ class Prefs(factory: KPrefFactory) : KPref("${BuildConfig.APPLICATION_ID}.prefs"
 
     var enablePip: Boolean by kpref("enable_pip", true)
 
+    /**
+     * Despite the naming, this toggle currently only enables debug logging.
+     * Verbose is never logged in release builds.
+     */
     var verboseLogging: Boolean by kpref("verbose_logging", false)
 
     var analytics: Boolean by kpref("analytics", false) {
-- 
cgit v1.2.3