Merge branch 'clean-up-kotlin-warnings'

16 files changed, 46 insertions, 49 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
index fc7de5b3be..e375bf2113 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/relaylist/RelayItemHolder.kt
@@ -17,15 +17,16 @@ class RelayItemHolder(
     private val relayActive: ImageView = view.findViewById(R.id.relay_active)
     private val selectedIcon: View = view.findViewById(R.id.selected)
 
-    private val resources = view.context.resources
-    private val countryColor = resources.getColor(R.color.blue)
-    private val cityColor = resources.getColor(R.color.blue40)
-    private val relayColor = resources.getColor(R.color.blue20)
-    private val selectedColor = resources.getColor(R.color.green)
+    private val context = view.context
+    private val countryColor = context.getColor(R.color.blue)
+    private val cityColor = context.getColor(R.color.blue40)
+    private val relayColor = context.getColor(R.color.blue20)
+    private val selectedColor = context.getColor(R.color.green)
 
-    private val countryPadding = view.resources.getDimensionPixelSize(R.dimen.country_row_padding)
-    private val cityPadding = view.resources.getDimensionPixelSize(R.dimen.city_row_padding)
-    private val relayPadding = view.resources.getDimensionPixelSize(R.dimen.relay_row_padding)
+    private val resources = view.resources
+    private val countryPadding = resources.getDimensionPixelSize(R.dimen.country_row_padding)
+    private val cityPadding = resources.getDimensionPixelSize(R.dimen.city_row_padding)
+    private val relayPadding = resources.getDimensionPixelSize(R.dimen.relay_row_padding)
 
     var item: RelayItem? = null
         set(value) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt
index 037a01033d..7a638721ac 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/service/notifications/NotificationChannel.kt
@@ -17,7 +17,7 @@ class NotificationChannel(
     val importance: Int
 ) {
     private val badgeColor by lazy {
-        context.resources.getColor(R.color.colorPrimary)
+        context.getColor(R.color.colorPrimary)
     }
 
     val notificationManager =
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt
index d67a878b25..cfcf26fad9 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt
@@ -1,6 +1,6 @@
 package net.mullvad.mullvadvpn.ui
 
-import android.content.res.Resources
+import android.content.Context
 import android.text.Editable
 import android.text.TextWatcher
 import android.text.style.MetricAffectingSpan
@@ -16,15 +16,12 @@ import net.mullvad.mullvadvpn.ui.AccountInputContainer.BorderState
 
 const val MIN_ACCOUNT_TOKEN_LENGTH = 10
 
-class AccountInput(
-    val parentView: View,
-    val resources: Resources
-) {
-    private val disabledBackgroundColor = resources.getColor(R.color.white20)
-    private val disabledTextColor = resources.getColor(R.color.white)
-    private val enabledBackgroundColor = resources.getColor(R.color.white)
-    private val enabledTextColor = resources.getColor(R.color.blue)
-    private val errorTextColor = resources.getColor(R.color.red)
+class AccountInput(val parentView: View, context: Context) {
+    private val disabledBackgroundColor = context.getColor(R.color.white20)
+    private val disabledTextColor = context.getColor(R.color.white)
+    private val enabledBackgroundColor = context.getColor(R.color.white)
+    private val enabledTextColor = context.getColor(R.color.blue)
+    private val errorTextColor = context.getColor(R.color.red)
 
     private var inputHasFocus = false
         set(value) {
@@ -34,6 +31,7 @@ class AccountInput(
                 shouldShowAccountHistory = true
             }
         }
+
     private var usingErrorColor = false
         set(value) {
             field = value
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellInput.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellInput.kt
index 0d5ede54fb..dd40712e24 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellInput.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellInput.kt
@@ -6,10 +6,10 @@ import android.widget.EditText
 import net.mullvad.mullvadvpn.R
 
 class CellInput(val input: EditText, val minValue: Int, val maxValue: Int) {
-    private val resources = input.context.resources
+    private val context = input.context
 
-    private val validInputColor = resources.getColor(R.color.white)
-    private val invalidInputColor = resources.getColor(R.color.red)
+    private val validInputColor = context.getColor(R.color.white)
+    private val invalidInputColor = context.getColor(R.color.red)
 
     var value
         get() = input.text.toString().trim().toIntOrNull()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellSwitch.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellSwitch.kt
index 1b8c0d7c73..a012087e61 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellSwitch.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/CellSwitch.kt
@@ -31,8 +31,8 @@ class CellSwitch : LinearLayout {
 
     var listener: ((State) -> Unit)? = null
 
-    private val onColor = resources.getColor(R.color.green)
-    private val offColor = resources.getColor(R.color.red)
+    private val onColor = context.getColor(R.color.green)
+    private val offColor = context.getColor(R.color.red)
 
     private val knobSize = resources.getDimensionPixelSize(R.dimen.cell_switch_knob_size)
     private val knobImage = ShapeDrawable(OvalShape()).apply {
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 55144b8529..22ed6c3d39 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectFragment.kt
@@ -46,7 +46,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             parentActivity.openSettings()
         }
 
-        headerBar = HeaderBar(view, resources)
+        headerBar = HeaderBar(view, parentActivity)
 
         notificationBanner = view.findViewById<NotificationBanner>(R.id.notification_banner).apply {
             notifications.apply {
@@ -57,7 +57,7 @@ class ConnectFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
             }
         }
 
-        status = ConnectionStatus(view, resources)
+        status = ConnectionStatus(view, parentActivity)
 
         locationInfo = LocationInfo(view, context!!)
         locationInfo.isTunnelInfoExpanded = isTunnelInfoExpanded
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt
index c06746d3fc..d2b413f1d0 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/ConnectionStatus.kt
@@ -1,19 +1,19 @@
 package net.mullvad.mullvadvpn.ui
 
-import android.content.res.Resources
+import android.content.Context
 import android.view.View
 import android.widget.TextView
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.TunnelState
 import net.mullvad.talpid.tunnel.ActionAfterDisconnect
 
-class ConnectionStatus(val parentView: View, val resources: Resources) {
+class ConnectionStatus(val parentView: View, context: Context) {
     private val spinner: View = parentView.findViewById(R.id.connecting_spinner)
     private val text: TextView = parentView.findViewById(R.id.connection_status)
 
-    private val unsecuredTextColor = resources.getColor(R.color.red)
-    private val connectingTextColor = resources.getColor(R.color.white)
-    private val securedTextColor = resources.getColor(R.color.green)
+    private val unsecuredTextColor = context.getColor(R.color.red)
+    private val connectingTextColor = context.getColor(R.color.white)
+    private val securedTextColor = context.getColor(R.color.green)
 
     fun setState(state: TunnelState) {
         when (state) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/HeaderBar.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/HeaderBar.kt
index 6a84e005af..0b2c0f849a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/HeaderBar.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/HeaderBar.kt
@@ -1,15 +1,15 @@
 package net.mullvad.mullvadvpn.ui
 
-import android.content.res.Resources
+import android.content.Context
 import android.view.View
 import net.mullvad.mullvadvpn.R
 import net.mullvad.mullvadvpn.model.TunnelState
 
-class HeaderBar(val parentView: View, val resources: Resources) {
+class HeaderBar(val parentView: View, context: Context) {
     private val headerBar: View = parentView.findViewById(R.id.header_bar)
 
-    private val securedColor = resources.getColor(R.color.green)
-    private val unsecuredColor = resources.getColor(R.color.red)
+    private val securedColor = context.getColor(R.color.green)
+    private val unsecuredColor = context.getColor(R.color.red)
 
     fun setState(state: TunnelState) {
         when (state) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
index de24fee6fc..8cc64918f5 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LoginFragment.kt
@@ -48,7 +48,7 @@ class LoginFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen) {
         loggedInStatus = view.findViewById(R.id.logged_in_status)
         loginFailStatus = view.findViewById(R.id.login_fail_status)
 
-        accountInput = AccountInput(view, parentActivity.resources)
+        accountInput = AccountInput(view, parentActivity)
         accountInput.onLogin = { accountToken -> login(accountToken) }
 
         view.findViewById<Button>(R.id.create_account)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
index ef79da99c3..2dcaff637c 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/OutOfTimeFragment.kt
@@ -38,7 +38,7 @@ class OutOfTimeFragment : ServiceDependentFragment(OnNoService.GoToLaunchScreen)
             parentActivity.openSettings()
         }
 
-        headerBar = HeaderBar(view, resources)
+        headerBar = HeaderBar(view, parentActivity)
 
         disconnectButton = view.findViewById<Button>(R.id.disconnect).apply {
             setOnClickAction("disconnect", jobTracker) {
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 20a5c62e6e..0a21cd5394 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/RemainingTimeLabel.kt
@@ -12,8 +12,8 @@ class RemainingTimeLabel(val context: Context, val view: View) {
     private val resources = context.resources
     private val formatter = TimeLeftFormatter(resources)
 
-    private val expiredColor = resources.getColor(R.color.red)
-    private val normalColor = resources.getColor(R.color.white60)
+    private val expiredColor = context.getColor(R.color.red)
+    private val normalColor = context.getColor(R.color.white60)
 
     private val label = view.findViewById<TextView>(R.id.remaining_time)
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
index 483a4e58c6..c57291f804 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/WireguardKeyFragment.kt
@@ -98,11 +98,9 @@ class WireguardKeyFragment : ServiceDependentFragment(OnNoService.GoToLaunchScre
     override fun onAttach(context: Context) {
         super.onAttach(context)
 
-        val resources = context.resources
-
-        redColor = resources.getColor(R.color.red)
-        greenColor = resources.getColor(R.color.green)
-        timeAgoFormatter = TimeAgoFormatter(resources)
+        redColor = context.getColor(R.color.red)
+        greenColor = context.getColor(R.color.green)
+        timeAgoFormatter = TimeAgoFormatter(context.resources)
     }
 
     override fun onSafelyCreateView(
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt
index 3c1a62d925..a67cd7ea45 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/notification/InAppNotificationController.kt
@@ -9,7 +9,7 @@ class InAppNotificationController(private val onNotificationChanged: (InAppNotif
     private var currentIndex: Int? = null
 
     var current by observable<InAppNotification?>(null) { _, _, notification ->
-        onNotificationChanged?.invoke(notification)
+        onNotificationChanged.invoke(notification)
     }
 
     fun register(notification: InAppNotification) {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
index d4376cfd62..59b5154fb8 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/InformationView.kt
@@ -59,7 +59,7 @@ open class InformationView : LinearLayout {
             updateStatus()
         }
 
-    var errorColor = context.resources.getColor(R.color.red)
+    var errorColor = context.getColor(R.color.red)
         set(value) {
             field = value
             updateStatus()
@@ -71,7 +71,7 @@ open class InformationView : LinearLayout {
             updateStatus()
         }
 
-    var informationColor = context.resources.getColor(R.color.white)
+    var informationColor = context.getColor(R.color.white)
         set(value) {
             field = value
             updateStatus()
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
index 8bcd6c3648..a929488880 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/UrlButton.kt
@@ -41,7 +41,7 @@ class UrlButton : Button {
 
     init {
         super.setEnabled(false)
-        super.detailImage = context.resources.getDrawable(R.drawable.icon_extlink)
+        super.detailImage = context.getDrawable(R.drawable.icon_extlink)
         super.showSpinner = true
     }
 
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt
index ea0f21ad49..750780aa6a 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/util/LinearInterpolation.kt
@@ -4,7 +4,7 @@ import kotlin.properties.Delegates.observable
 import kotlin.reflect.KProperty
 
 class LinearInterpolation {
-    private val observer = { property: KProperty<*>, oldValue: Float, newValue: Float ->
+    private val observer = { _: KProperty<*>, oldValue: Float, newValue: Float ->
         if (!updated && oldValue != newValue) {
             updated = true
         }