diff options
| author | David Göransson <david.goransson@mullvad.net> | 2024-10-08 16:09:13 +0200 |
|---|---|---|
| committer | David Göransson <david.goransson@mullvad.net> | 2024-10-08 16:09:13 +0200 |
| commit | 65bdbb5158242d80617dd9b40a9be33333831ce9 (patch) | |
| tree | ebf0bd03ecff93868b877657c0cad1b097b77e8e /android/test | |
| parent | a0086e992faf269a6819e1c593962d360ee052aa (diff) | |
| parent | 24df46bece887df0bd17af55399d69e8021e7d4e (diff) | |
| download | mullvadvpn-65bdbb5158242d80617dd9b40a9be33333831ce9.tar.xz mullvadvpn-65bdbb5158242d80617dd9b40a9be33333831ce9.zip | |
Merge branch 'fix-all-baselined-lint-issues-droid-218'
Diffstat (limited to 'android/test')
4 files changed, 3 insertions, 4 deletions
diff --git a/android/test/build.gradle.kts b/android/test/build.gradle.kts deleted file mode 100644 index 8b13789179..0000000000 --- a/android/test/build.gradle.kts +++ /dev/null @@ -1 +0,0 @@ - diff --git a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt index 5e702a2d80..b5dcc1d647 100644 --- a/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt +++ b/android/test/e2e/src/main/kotlin/net/mullvad/mullvadvpn/test/e2e/misc/SimpleMullvadHttpClient.kt @@ -167,7 +167,7 @@ class SimpleMullvadHttpClient(context: Context) { ): JSONArray? { val future = RequestFuture.newFuture<JSONArray>() val request = - object : JsonArrayRequest(method, url, null, future, onErrorResponse) { + object : JsonArrayRequest(method, url, body, future, onErrorResponse) { override fun getHeaders(): MutableMap<String, String> { val headers = HashMap<String, String>() headers.put("Content-Type", "application/json") 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 356cacb97e..ddb28e3937 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 @@ -14,8 +14,7 @@ fun Buffer.getAccountNumber(): String? { return try { JSONObject(readUtf8()).getString("account_number") } catch (ex: JSONException) { - Logger.e("Unable to parse account number") - ex.printStackTrace() + Logger.e("Unable to parse account number", ex) 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 a2978808d7..e230152efe 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 @@ -32,6 +32,7 @@ class MockApiDispatcher : Dispatcher() { private var cachedPubKeyFromAppUnderTest: String? = null + @Suppress("CyclomaticComplexMethod", "NestedBlockDepth") override fun dispatch(request: RecordedRequest): MockResponse { Logger.d("Request: $request (body=${request.body.peek().readUtf8()})") return when (request.path ?: "") { |