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

4 files changed, 13 insertions, 9 deletions

diff --git a/android/app/build.gradle.kts b/android/app/build.gradle.kts
index 8e523ecb39..3e99a3c7ab 100644
--- a/android/app/build.gradle.kts
+++ b/android/app/build.gradle.kts
@@ -339,6 +339,7 @@ dependencies {
     ksp(Dependencies.Compose.destinationsKsp)
 
     implementation(Dependencies.jodaTime)
+    implementation(Dependencies.kermit)
     implementation(Dependencies.Koin.core)
     implementation(Dependencies.Koin.android)
     implementation(Dependencies.Koin.compose)
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt
index 04ccb1cddc..617f538e87 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/MullvadApplication.kt
@@ -1,19 +1,22 @@
 package net.mullvad.mullvadvpn
 
 import android.app.Application
+import co.touchlab.kermit.Logger
+import co.touchlab.kermit.Severity
 import net.mullvad.mullvadvpn.di.appModule
 import org.koin.android.ext.koin.androidContext
 import org.koin.core.context.loadKoinModules
 import org.koin.core.context.startKoin
 
-/**
- * In Android, separate instances of the application class (MullvadApplication) will be instantiated
- * for each process. That also means that a only common logic should be placed here.
- */
+private const val LOG_TAG = "mullvad"
+
 class MullvadApplication : Application() {
     override fun onCreate() {
         super.onCreate()
-        // Used to create/start separate DI graphs for each process. Avoid non-common classes etc.
+        Logger.setTag(LOG_TAG)
+        if (!BuildConfig.DEBUG) {
+            Logger.setMinSeverity(Severity.Info)
+        }
         startKoin { androidContext(this@MullvadApplication) }
         loadKoinModules(listOf(appModule))
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangelogDataProvider.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangelogDataProvider.kt
index c1dc72ebfe..d4e3957f94 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangelogDataProvider.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/util/ChangelogDataProvider.kt
@@ -1,7 +1,7 @@
 package net.mullvad.mullvadvpn.util
 
 import android.content.res.AssetManager
-import android.util.Log
+import co.touchlab.kermit.Logger
 import java.io.IOException
 
 private const val CHANGELOG_FILE = "en-US/default.txt"
@@ -12,7 +12,7 @@ class ChangelogDataProvider(private var assets: AssetManager) : IChangelogDataPr
         return try {
             assets.open(CHANGELOG_FILE).bufferedReader().use { it.readText() }
         } catch (ex: IOException) {
-            Log.e("mullvad", "Unable to read bundled changelog file.")
+            Logger.e("Unable to read bundled changelog file.")
             EMPTY_DEFAULT_STRING_WHEN_UNABLE_TO_READ_CHANGELOG
         }
     }
diff --git a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
index 3c24cba6d6..1e9a335951 100644
--- a/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
+++ b/android/app/src/main/kotlin/net/mullvad/mullvadvpn/viewmodel/VpnSettingsViewModel.kt
@@ -1,8 +1,8 @@
 package net.mullvad.mullvadvpn.viewmodel
 
-import android.util.Log
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
+import co.touchlab.kermit.Logger
 import java.net.InetAddress
 import java.net.UnknownHostException
 import kotlinx.coroutines.CoroutineDispatcher
@@ -259,7 +259,7 @@ class VpnSettingsViewModel(
         return try {
             map { InetAddress.getByName(it) }
         } catch (ex: UnknownHostException) {
-            Log.e("mullvad", "Error parsing the DNS address list.")
+            Logger.e("Error parsing the DNS address list.")
             emptyList()
         }
     }