summaryrefslogtreecommitdiffhomepage
path: root/android
diff options
context:
space:
mode:
Diffstat (limited to 'android')
-rw-r--r--android/build.gradle10
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt2
-rw-r--r--android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt1
3 files changed, 11 insertions, 2 deletions
diff --git a/android/build.gradle b/android/build.gradle
index 9bfb4d23c3..a7508fb3fb 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -70,6 +70,16 @@ android {
}
}
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+ kotlinOptions {
+ allWarningsAsErrors = true
+
+ kotlinOptions.freeCompilerArgs += [
+ "-Xuse-experimental=kotlinx.coroutines.ObsoleteCoroutinesApi",
+ ]
+ }
+}
+
play {
serviceAccountCredentials = file("play-api-key.json")
}
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
index 4973c7fcc2..1642020b86 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -72,7 +72,7 @@ class MullvadVpnService : TalpidVpnService() {
private lateinit var notificationManager: ForegroundNotificationManager
private lateinit var tunnelStateUpdater: TunnelStateUpdater
- private var pendingAction by observable<PendingAction?>(null) { _, _, action ->
+ private var pendingAction by observable<PendingAction?>(null) { _, _, _ ->
instance?.let { activeInstance ->
handlePendingAction(
activeInstance.connectionProxy,
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
index 3d9f95fa71..978533643a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -41,7 +41,6 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
savedInstanceState: Bundle?
): View {
val view = inflater.inflate(R.layout.connect, container, false)
- val resources = parentActivity.resources
headerBar = view.findViewById<HeaderBar>(R.id.header_bar).apply {
tunnelState = TunnelState.Disconnected()