Merge branch 'replace-default-logging-tool-with-kermit-droid-704'

10 files changed, 17 insertions, 22 deletions

diff --git a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/LogTag.kt b/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/LogTag.kt
deleted file mode 100644
index d2ae3f1871..0000000000
--- a/android/lib/common/src/main/kotlin/net/mullvad/mullvadvpn/lib/common/constant/LogTag.kt
+++ /dev/null
@@ -1,3 +0,0 @@
-package net.mullvad.mullvadvpn.lib.common.constant
-
-const val TAG = "mullvad"
diff --git a/android/lib/daemon-grpc/build.gradle.kts b/android/lib/daemon-grpc/build.gradle.kts
index ff5d75aa16..840de57984 100644
--- a/android/lib/daemon-grpc/build.gradle.kts
+++ b/android/lib/daemon-grpc/build.gradle.kts
@@ -59,6 +59,7 @@ dependencies {
     implementation(project(Dependencies.Mullvad.talpidLib))
 
     implementation(Dependencies.jodaTime)
+    implementation(Dependencies.kermit)
     implementation(Dependencies.Kotlin.stdlib)
     implementation(Dependencies.KotlinX.coroutinesCore)
     implementation(Dependencies.KotlinX.coroutinesAndroid)
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
index 10c2406850..d088ffc77a 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/ManagementService.kt
@@ -1,13 +1,13 @@
 package net.mullvad.mullvadvpn.lib.daemon.grpc
 
 import android.net.LocalSocketAddress
-import android.util.Log
 import arrow.core.Either
 import arrow.core.raise.either
 import arrow.core.raise.ensure
 import arrow.optics.copy
 import arrow.optics.dsl.index
 import arrow.optics.typeclasses.Index
+import co.touchlab.kermit.Logger
 import com.google.protobuf.BoolValue
 import com.google.protobuf.Empty
 import com.google.protobuf.StringValue
@@ -38,7 +38,6 @@ import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
 import mullvad_daemon.management_interface.ManagementInterface
 import mullvad_daemon.management_interface.ManagementServiceGrpcKt
-import net.mullvad.mullvadvpn.lib.common.constant.TAG
 import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.fromDomain
 import net.mullvad.mullvadvpn.lib.daemon.grpc.mapper.toDomain
 import net.mullvad.mullvadvpn.lib.daemon.grpc.util.LogInterceptor
@@ -204,7 +203,7 @@ class ManagementService(
             launch {
                 grpc.eventsListen(Empty.getDefaultInstance()).collect { event ->
                     if (extensiveLogging) {
-                        Log.d(TAG, "Event: $event")
+                        Logger.v("Event: $event")
                     }
                     @Suppress("WHEN_ENUM_CAN_BE_NULL_IN_JAVA")
                     when (event.eventCase) {
diff --git a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt
index fde87ecdd5..b01b0266b7 100644
--- a/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt
+++ b/android/lib/daemon-grpc/src/main/kotlin/net/mullvad/mullvadvpn/lib/daemon/grpc/util/LogInterceptor.kt
@@ -1,12 +1,11 @@
 package net.mullvad.mullvadvpn.lib.daemon.grpc.util
 
-import android.util.Log
+import co.touchlab.kermit.Logger
 import io.grpc.CallOptions
 import io.grpc.Channel
 import io.grpc.ClientCall
 import io.grpc.ClientInterceptor
 import io.grpc.MethodDescriptor
-import net.mullvad.mullvadvpn.lib.common.constant.TAG
 
 internal class LogInterceptor : ClientInterceptor {
     override fun <ReqT : Any?, RespT : Any?> interceptCall(
@@ -14,7 +13,7 @@ internal class LogInterceptor : ClientInterceptor {
         callOptions: CallOptions?,
         next: Channel?
     ): ClientCall<ReqT, RespT> {
-        Log.d(TAG, "Intercepted call: ${method?.fullMethodName}")
+        Logger.v("Intercepted call: ${method?.fullMethodName}")
         return next!!.newCall(method, callOptions)
     }
 }
diff --git a/android/lib/map/build.gradle.kts b/android/lib/map/build.gradle.kts
index 7ca04c16da..f4606de5bd 100644
--- a/android/lib/map/build.gradle.kts
+++ b/android/lib/map/build.gradle.kts
@@ -35,12 +35,10 @@ android {
 }
 
 dependencies {
-
-    //Model
     implementation(project(Dependencies.Mullvad.modelLib))
 
+    implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
     implementation(Dependencies.Compose.ui)
     implementation(Dependencies.Compose.foundation)
-
-    implementation(Dependencies.AndroidX.lifecycleRuntimeKtx)
+    implementation(Dependencies.kermit)
 }
diff --git a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt
index e416988d8d..b60dc83c7f 100644
--- a/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt
+++ b/android/lib/map/src/main/kotlin/net/mullvad/mullvadvpn/lib/map/internal/GLHelper.kt
@@ -2,8 +2,8 @@ package net.mullvad.mullvadvpn.lib.map.internal
 
 import android.opengl.GLES20
 import android.opengl.Matrix
-import android.util.Log
 import androidx.compose.ui.graphics.Color
+import co.touchlab.kermit.Logger
 import java.nio.Buffer
 import java.nio.ByteBuffer
 import java.nio.FloatBuffer
@@ -31,7 +31,7 @@ internal fun initShaderProgram(vsSource: String, fsSource: String): Int {
     GLES20.glGetProgramiv(program, GLES20.GL_LINK_STATUS, linked, 0)
     if (linked[0] == GLES20.GL_FALSE) {
         val infoLog = GLES20.glGetProgramInfoLog(program)
-        Log.e("GLHelper", "Could not link program: $infoLog")
+        Logger.e("Could not link program: $infoLog")
         GLES20.glDeleteProgram(program)
         error("Could not link program with vsSource: $vsSource and fsSource: $fsSource")
     }
@@ -54,7 +54,7 @@ private fun loadShader(type: Int, shaderCode: String): Int {
     GLES20.glGetShaderiv(shader, GLES20.GL_COMPILE_STATUS, compiled, 0)
     if (compiled[0] == GLES20.GL_FALSE) {
         val infoLog = GLES20.glGetShaderInfoLog(shader)
-        Log.e("GLHelper", "Could not compile shader $type:$infoLog")
+        Logger.e("Could not compile shader $type:$infoLog")
         GLES20.glDeleteShader(shader)
 
         error("Could not compile shader with shaderCode: $shaderCode")
diff --git a/android/lib/shared/build.gradle.kts b/android/lib/shared/build.gradle.kts
index 88b5cfb3c9..a1bf4a9c75 100644
--- a/android/lib/shared/build.gradle.kts
+++ b/android/lib/shared/build.gradle.kts
@@ -32,6 +32,7 @@ dependencies {
     implementation(project(Dependencies.Mullvad.modelLib))
 
     implementation(Dependencies.Arrow.core)
+    implementation(Dependencies.kermit)
     implementation(Dependencies.Kotlin.stdlib)
     implementation(Dependencies.KotlinX.coroutinesAndroid)
     implementation(Dependencies.jodaTime)
diff --git a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
index 1c971e8069..29f91b43f1 100644
--- a/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
+++ b/android/lib/shared/src/main/kotlin/net/mullvad/mullvadvpn/lib/shared/DeviceRepository.kt
@@ -1,7 +1,7 @@
 package net.mullvad.mullvadvpn.lib.shared
 
-import android.util.Log
 import arrow.core.Either
+import co.touchlab.kermit.Logger
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -36,7 +36,7 @@ class DeviceRepository(
         managementService.getDeviceList(accountNumber)
 
     suspend fun updateDevice() {
-        Log.d("mullvad", "Update device")
+        Logger.i("Update device")
         managementService.updateDevice()
     }
 }
diff --git a/android/lib/talpid/build.gradle.kts b/android/lib/talpid/build.gradle.kts
index 00409f9482..b8426e3a81 100644
--- a/android/lib/talpid/build.gradle.kts
+++ b/android/lib/talpid/build.gradle.kts
@@ -27,7 +27,8 @@ android {
 dependencies {
     implementation(project(Dependencies.Mullvad.modelLib))
 
+    implementation(Dependencies.AndroidX.lifecycleService)
+    implementation(Dependencies.kermit)
     implementation(Dependencies.Kotlin.stdlib)
     implementation(Dependencies.KotlinX.coroutinesAndroid)
-    implementation(Dependencies.AndroidX.lifecycleService)
 }
diff --git a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
index e89c841d25..2a854f7e5c 100644
--- a/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
+++ b/android/lib/talpid/src/main/kotlin/net/mullvad/talpid/TalpidVpnService.kt
@@ -1,8 +1,8 @@
 package net.mullvad.talpid
 
 import android.os.ParcelFileDescriptor
-import android.util.Log
 import androidx.annotation.CallSuper
+import co.touchlab.kermit.Logger
 import java.net.Inet4Address
 import java.net.Inet6Address
 import java.net.InetAddress
@@ -106,8 +106,7 @@ open class TalpidVpnService : LifecycleVpnService() {
                 // since apps then may leak DNS requests.
                 // https://issuetracker.google.com/issues/337961996
                 if (invalidDnsServerAddresses.size == config.dnsServers.size) {
-                    Log.w(
-                        "mullvad",
+                    Logger.w(
                         "All DNS servers invalid or non set, using fallback DNS server to " +
                             "minimize leaks, dnsServers.isEmpty(): ${config.dnsServers.isEmpty()}"
                     )