Merge branch 'small-kotlin-fixes'

9 files changed, 10 insertions, 18 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
index db8afade98..080236cff9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/Relay.kt
@@ -18,5 +18,5 @@ data class Relay(
 
     override var expanded
         get() = false
-        set(value) {}
+        set(_) {}
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
index e43ddf3742..a04af6d8a8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/ForegroundNotificationManager.kt
@@ -161,9 +161,7 @@ class ForegroundNotificationManager(val service: Service, val connectionProxy: C
     }
 
     fun onDestroy() {
-        listenerId?.let { listener ->
-            connectionProxy.onStateChange.unsubscribe(listener)
-        }
+        connectionProxy.onStateChange.unsubscribe(listenerId)
 
         service.apply {
             unregisterReceiver(connectReceiver)
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 bb9335c537..7b3bfaea8e 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/MullvadVpnService.kt
@@ -14,7 +14,6 @@ import net.mullvad.talpid.TalpidVpnService
 
 class MullvadVpnService : TalpidVpnService() {
     private val binder = LocalBinder()
-    private val created = CompletableDeferred<Unit>()
 
     private var resetComplete: CompletableDeferred<Unit>? = null
 
@@ -25,7 +24,6 @@ class MullvadVpnService : TalpidVpnService() {
     override fun onCreate() {
         super.onCreate()
         setUp()
-        created.complete(Unit)
     }
 
     override fun onBind(intent: Intent): IBinder {
@@ -47,7 +45,6 @@ class MullvadVpnService : TalpidVpnService() {
     override fun onDestroy() {
         tearDown()
         daemon.cancel()
-        created.cancel()
         super.onDestroy()
     }
 
@@ -73,8 +70,8 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     private fun startDaemon() = GlobalScope.async(Dispatchers.Default) {
-        created.await()
         ApiRootCaFile().extract(application)
+
         MullvadDaemon(this@MullvadVpnService).apply {
             onSettingsChange.subscribe { settings ->
                 notificationManager.loggedIn = settings?.accountToken != null
@@ -90,7 +87,7 @@ class MullvadVpnService : TalpidVpnService() {
     }
 
     private fun stop() {
-        this@MullvadVpnService.resetComplete = CompletableDeferred()
+        resetComplete = CompletableDeferred()
 
         if (daemon.isCompleted) {
             runBlocking { daemon.await().shutdown() }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt
index c0cd54d56b..22aa7d3234 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInputContainer.kt
@@ -22,6 +22,7 @@ class AccountInputContainer : LinearLayout {
             overlay.clear()
 
             when (value) {
+                BorderState.UNFOCUSED -> {}
                 BorderState.FOCUSED -> overlay.add(focusedBorder)
                 BorderState.ERROR -> overlay.add(errorBorder)
             }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
index 94bfd5adf2..94691d93c3 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConfirmNoEmailDialogFragment.kt
@@ -47,7 +47,7 @@ class ConfirmNoEmailDialogFragment : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val dialog = super.onCreateDialog(savedInstanceState)
 
-        dialog.window.setBackgroundDrawable(ColorDrawable(android.R.color.transparent))
+        dialog.window?.apply { setBackgroundDrawable(ColorDrawable(android.R.color.transparent)) }
 
         return dialog
     }
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 30ae397097..d7f1704e9a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -116,7 +116,7 @@ class ConnectFragment : Fragment() {
             locationInfo.location = location
         }
 
-        relayListListener.onRelayListChange = { relayList, selectedRelayItem ->
+        relayListListener.onRelayListChange = { _, selectedRelayItem ->
             switchLocationButton.location = selectedRelayItem
         }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
index c0b673d834..89b33b6869 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/MainActivity.kt
@@ -88,7 +88,7 @@ class MainActivity : FragmentActivity() {
 
         appVersionInfoCache.onCreate()
 
-        if (intent.getBooleanExtra(KEY_SHOULD_CONNECT, false) ?: false) {
+        if (intent.getBooleanExtra(KEY_SHOULD_CONNECT, false)) {
             connectionProxy.awaitThen { connect() }
         }
     }
@@ -174,8 +174,4 @@ class MainActivity : FragmentActivity() {
             vpnPermission.complete(allow)
         }
     }
-
-    private fun fetchSettings() = GlobalScope.async(Dispatchers.Default) {
-        daemon.await().getSettings()
-    }
 }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
index 650b487e33..1f53a83556 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
@@ -27,7 +27,7 @@ class RemainingTimeLabel(val parentActivity: MainActivity, val view: View) {
         parentActivity.accountCache.apply {
             refetch()
 
-            onAccountDataChange = { accountNumber, accountExpiry ->
+            onAccountDataChange = { _, accountExpiry ->
                 updateJob?.cancel()
                 updateJob = updateLabel(accountExpiry)
             }
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
index b843fb13ed..6a330139eb 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/SettingsFragment.kt
@@ -89,7 +89,7 @@ class SettingsFragment : Fragment() {
 
         remainingTimeLabel.onResume()
 
-        accountCache.onAccountDataChange = { account, _expiry ->
+        accountCache.onAccountDataChange = { account, _ ->
             updateLoggedInStatusJob?.cancel()
             updateLoggedInStatusJob = updateLoggedInStatus(account != null)
         }