From bb2dd81ac6b1ea57eeb85127aa7789e08b9ba9af Mon Sep 17 00:00:00 2001
From: Jamil <jamilbk@users.noreply.github.com>
Date: Wed, 25 Sep 2024 09:21:30 -0700
Subject: [PATCH] refactor(android): Fix Kotlin compile warnings (#6773)

Somehow these snuck in. I would turn on warnings-as-errors but we are
using deprecated functions that don't have good replacements.
---
 .../android/features/settings/ui/SettingsActivity.kt         | 2 +-
 .../main/java/dev/firezone/android/tunnel/TunnelService.kt   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/kotlin/android/app/src/main/java/dev/firezone/android/features/settings/ui/SettingsActivity.kt b/kotlin/android/app/src/main/java/dev/firezone/android/features/settings/ui/SettingsActivity.kt
index 7218baeef..519c7206d 100644
--- a/kotlin/android/app/src/main/java/dev/firezone/android/features/settings/ui/SettingsActivity.kt
+++ b/kotlin/android/app/src/main/java/dev/firezone/android/features/settings/ui/SettingsActivity.kt
@@ -94,7 +94,7 @@ internal class SettingsActivity : AppCompatActivity() {
         AlertDialog.Builder(this).apply {
             setTitle("Warning")
             setMessage("Changed settings will not be applied until you sign out and sign back in.")
-            setPositiveButton("Okay") { dialog, which ->
+            setPositiveButton("Okay") { _, _ ->
                 viewModel.onSaveSettingsCompleted()
             }
             create().show()
diff --git a/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt b/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
index d9fb51334..1adacd1a7 100644
--- a/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
+++ b/kotlin/android/app/src/main/java/dev/firezone/android/tunnel/TunnelService.kt
@@ -52,7 +52,7 @@ class TunnelService : VpnService() {
     private var tunnelRoutes: MutableList<Cidr> = mutableListOf()
     private var _tunnelResources: List<Resource> = emptyList()
     private var _tunnelState: State = State.DOWN
-    var resourceState: ResourceState = ResourceState.UNSET
+    private var resourceState: ResourceState = ResourceState.UNSET
 
     // For reacting to changes to the network
     private var networkCallback: NetworkMonitor? = null
@@ -259,7 +259,7 @@ class TunnelService : VpnService() {
         return resourceState
     }
 
-    fun internetResource(): Resource? {
+    private fun internetResource(): Resource? {
         return tunnelResources.firstOrNull { it.isInternetResource() }
     }
 
@@ -439,7 +439,6 @@ class TunnelService : VpnService() {
             DOWN,
         }
 
-        private const val TAG: String = "TunnelService"
         private const val SESSION_NAME: String = "Firezone Connection"
         private const val MTU: Int = 1280