Migrate log calls to kermit

3 files changed, 10 insertions, 11 deletions

diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/Extensions.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/Extensions.kt
index 7eb096b499..356cacb97e 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/Extensions.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/Extensions.kt
@@ -1,7 +1,6 @@
 package net.mullvad.mullvadvpn.test.mockapi
 
-import android.util.Log
-import net.mullvad.mullvadvpn.test.mockapi.constant.LOG_TAG
+import co.touchlab.kermit.Logger
 import okhttp3.mockwebserver.MockResponse
 import okio.Buffer
 import org.json.JSONException
@@ -15,7 +14,7 @@ fun Buffer.getAccountNumber(): String? {
     return try {
         JSONObject(readUtf8()).getString("account_number")
     } catch (ex: JSONException) {
-        Log.e(LOG_TAG, "Unable to parse account number")
+        Logger.e("Unable to parse account number")
         ex.printStackTrace()
         null
     }
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
index abb4813a33..3539bad0fa 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiDispatcher.kt
@@ -1,13 +1,12 @@
 package net.mullvad.mullvadvpn.test.mockapi
 
-import android.util.Log
+import co.touchlab.kermit.Logger
 import net.mullvad.mullvadvpn.test.mockapi.constant.ACCOUNT_URL_PATH
 import net.mullvad.mullvadvpn.test.mockapi.constant.AUTH_TOKEN_URL_PATH
 import net.mullvad.mullvadvpn.test.mockapi.constant.CREATE_ACCOUNT_URL_PATH
 import net.mullvad.mullvadvpn.test.mockapi.constant.DEVICES_URL_PATH
 import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_ACCESS_TOKEN
 import net.mullvad.mullvadvpn.test.mockapi.constant.DUMMY_ID_1
-import net.mullvad.mullvadvpn.test.mockapi.constant.LOG_TAG
 import net.mullvad.mullvadvpn.test.mockapi.util.accessTokenJsonResponse
 import net.mullvad.mullvadvpn.test.mockapi.util.accountCreationJson
 import net.mullvad.mullvadvpn.test.mockapi.util.accountInfoJson
@@ -34,7 +33,7 @@ class MockApiDispatcher : Dispatcher() {
     private var cachedPubKeyFromAppUnderTest: String? = null
 
     override fun dispatch(request: RecordedRequest): MockResponse {
-        Log.d(LOG_TAG, "Request: $request (body=${request.body.peek().readUtf8()})")
+        Logger.d("Request: $request (body=${request.body.peek().readUtf8()})")
         return when (request.path ?: "") {
             AUTH_TOKEN_URL_PATH -> handleLoginRequest(request.body)
             DEVICES_URL_PATH -> {
@@ -70,7 +69,7 @@ class MockApiDispatcher : Dispatcher() {
                 }
             }
         }.also { response ->
-            Log.d(LOG_TAG, "Response: $response (body=${response.getBody()?.peek()?.readUtf8()})")
+            Logger.d("Response: $response (body=${response.getBody()?.peek()?.readUtf8()})")
         }
     }
 
@@ -89,8 +88,7 @@ class MockApiDispatcher : Dispatcher() {
                         .toString()
                 )
         } else {
-            Log.e(
-                LOG_TAG,
+            Logger.e(
                 "Unexpected account number (expected=$expectedAccountNumber was=$accountNumber)"
             )
             MockResponse().setResponseCode(400)
diff --git a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
index 02e53a09d9..74a47f3c3d 100644
--- a/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
+++ b/android/test/mockapi/src/main/kotlin/net/mullvad/mullvadvpn/test/mockapi/MockApiTest.kt
@@ -3,9 +3,9 @@ package net.mullvad.mullvadvpn.test.mockapi
 import android.Manifest.permission.READ_EXTERNAL_STORAGE
 import android.Manifest.permission.WRITE_EXTERNAL_STORAGE
 import android.content.Context
-import android.util.Log
 import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.uiautomator.UiDevice
+import co.touchlab.kermit.Logger
 import de.mannodermaus.junit5.extensions.GrantPermissionExtension
 import java.net.InetAddress
 import net.mullvad.mullvadvpn.lib.endpoint.CustomApiEndpointConfiguration
@@ -37,13 +37,15 @@ abstract class MockApiTest {
 
     @BeforeEach
     open fun setup() {
+        Logger.setTag(LOG_TAG)
+
         device = UiDevice.getInstance(InstrumentationRegistry.getInstrumentation())
         targetContext = InstrumentationRegistry.getInstrumentation().targetContext
 
         app = AppInteractor(device, targetContext, PACKAGE_NAME)
 
         mockWebServer.start()
-        Log.d(LOG_TAG, "Mocked web server started using port: ${mockWebServer.port}")
+        Logger.d("Mocked web server started using port: ${mockWebServer.port}")
         endpoint = createEndpoint(mockWebServer.port)
     }