Merge pull request #359 from AppDevNext/RevertDelegatorLogger

Revert delegator logger

Author: hannesa2

LogcatCoreLib/build.gradle

@@ -23,7 +23,7 @@ dependencies {
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.6.4"
     implementation "androidx.lifecycle:lifecycle-runtime-ktx:2.5.0"
     implementation 'androidx.lifecycle:lifecycle-livedata-ktx:2.5.0'
-    api 'com.github.hannesa2:timber:5.0.1.2'
+    api 'com.jakewharton.timber:timber:5.0.1'
 }
 
 project.afterEvaluate {

LogcatCoreLib/src/main/java/info/hannes/logcat/LoggingApplication.kt

@@ -4,7 +4,7 @@ import android.app.Application
 import info.hannes.timber.DebugFormatTree
 import timber.log.Timber
 
-open class LoggingApplication(private val delegator: Class<*>? = null) : Application() {
+open class LoggingApplication : Application() {
 
     override fun onCreate() {
         super.onCreate()
@@ -14,6 +14,6 @@ open class LoggingApplication(private val delegator: Class<*>? = null) : Applica
     @Suppress("MemberVisibilityCanBePrivate")
     protected open fun setupLogging() {
         LoggingTools.globalErrorCatcher()
-        Timber.plant(DebugFormatTree(delegator = delegator))
+        Timber.plant(DebugFormatTree())
     }
 }

LogcatCoreLib/src/main/java/info/hannes/timber/DebugFormatTree.kt

@@ -4,7 +4,7 @@ import org.json.JSONException
 import org.json.JSONObject
 import timber.log.Timber
 
-open class DebugFormatTree(delegator: Class<*>? = null) : Timber.DebugTree(delegator = delegator) {
+open class DebugFormatTree : Timber.DebugTree() {
 
     override fun createStackElementTag(element: StackTraceElement): String? {
         return String.format(
@@ -18,7 +18,7 @@ open class DebugFormatTree(delegator: Class<*>? = null) : Timber.DebugTree(deleg
     }
 
     // if there is an JSON string, try to print out pretty
-    override fun logMessage(priority: Int, tag: String?, message: String, t: Throwable?, vararg args: Any?) {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         var localMessage = message.trim()
         if (localMessage.startsWith("{") && localMessage.endsWith("}")) {
             try {
@@ -27,6 +27,6 @@ open class DebugFormatTree(delegator: Class<*>? = null) : Timber.DebugTree(deleg
             } catch (e: JSONException) {
             }
         }
-        super.logMessage(priority, tag, localMessage, t, *args)
+        super.log(priority, tag, localMessage, t)
     }
 }

LogcatCoreLib/src/main/java/info/hannes/timber/FileLoggingTree.kt

@@ -41,7 +41,7 @@ open class FileLoggingTree(externalCacheDir: File, context: Context? = null, fil
     }
 
     @SuppressLint("LogNotTimber")
-    override fun logMessage(priority: Int, tag: String?, message: String, t: Throwable?, vararg args: Any?) {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         try {
             val logTimeStamp = SimpleDateFormat("yyyy-MM-dd HH:mm:ss:SSS", Locale.getDefault()).format(Date())
 
@@ -75,7 +75,7 @@ open class FileLoggingTree(externalCacheDir: File, context: Context? = null, fil
             }
         }
         // Don't call super, otherwise it logs twice
-        //super.logMessage(priority, tag, message, t, args)
+        //super.log(priority, tag, message, t)
     }
 
     fun getFileName(): String = file.absolutePath

LogcatCountlyLib/src/main/java/info/hannes/timber/CountlyTree.kt

@@ -19,7 +19,7 @@ class CountlyTree(private val analytics: Analytics, private val serverIgnoreToke
     private val t = serverIgnoreToken
     private val regex: Regex = "$t.+?$t|$t[^$t]*$".toRegex()
 
-    override fun logMessage(priority: Int, tag: String?, message: String, t: Throwable?, vararg args: Any?) {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         // we ignore INFO, DEBUG and VERBOSE
         if (priority <= Log.INFO) {
             return

LogcatCrashlyticLib/src/main/java/info/hannes/crashlytic/CrashlyticsTree.kt

@@ -8,7 +8,7 @@ import java.util.concurrent.atomic.AtomicBoolean
 @Suppress("unused")
 class CrashlyticsTree(private val identifier: String? = null) : Timber.Tree() {
 
-    override fun logMessage(priority: Int, tag: String?, message: String, t: Throwable?, vararg args: Any?) {
+    override fun log(priority: Int, tag: String?, message: String, t: Throwable?) {
         if (priority < Log.INFO) {
             return
         }

sample/src/main/java/info/hannes/logcat/CrashlyticApplication.kt

@@ -10,9 +10,7 @@ import info.hannes.timber.FileLoggingTree
 import timber.log.Timber
 
 
-class CrashlyticApplication : LoggingApplication(delegator = CustomLogger::class.java) {
-
-    private val logger = CustomLogger()
+class CrashlyticApplication : LoggingApplication() {
 
     @SuppressLint("HardwareIds")
     override fun onCreate() {
@@ -25,15 +23,15 @@ class CrashlyticApplication : LoggingApplication(delegator = CustomLogger::class
         FirebaseCrashlytics.getInstance().setCustomKey("VERSION_NAME", BuildConfig.VERSIONNAME)
         Timber.plant(CrashlyticsTree(Settings.Secure.getString(applicationContext.contentResolver, Settings.Secure.ANDROID_ID)))
 
-        logger.d("Debug test")
-        logger.i("Info test")
-        logger.w("Warning test")
-        logger.e("Error test")
+        Timber.d("Debug test")
+        Timber.i("Info test")
+        Timber.w("Warning test")
+        Timber.e("Error test")
 
         var x = 0
         val runner: Runnable = object : Runnable {
             override fun run() {
-                logger.d("live=$x")
+                Timber.d("live=$x")
                 x++
                 Handler(Looper.getMainLooper()).postDelayed(this, 3000)
             }