android: fix Kotlin compiler warnings

fixes tailscale/corp#40476

Correcting all of the compiler warnings and code formatting issues.

This also fixes the ‘make fmt’ recipe so it doesn’t build anything, it just formats
the kt files.

Signed-off-by: Jonathan Nobels <jonathan@tailscale.com>

Author: barnstar

Makefile

@@ -327,11 +327,11 @@ test: gradle-dependencies ## Run the Android tests
 	(cd android && ./gradlew test)
 
 .PHONY: fmt
-fmt: gradle-dependencies ## Format the Android code
+fmt: ## Format the Android code
 	(cd android && ./gradlew ktfmtFormat)
 
 .PHONY: fmt-check
-fmt-check: gradle-dependencies ## Check the Android code is formatted
+fmt-check: ## Check the Android code is formatted
 	(cd android && ./gradlew ktfmtCheck)
 
 .PHONY: emulator

android/src/main/java/com/tailscale/ipn/App.kt

@@ -52,7 +52,6 @@ import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
-import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.launch
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.encodeToString
@@ -174,8 +173,9 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
     NetworkChangeCallback.monitorDnsChanges(connectivityManager, dns)
     initViewModels()
     applicationScope.launch {
-      val rm = getSystemService(Context.RESTRICTIONS_SERVICE) as RestrictionsManager
-      MDMSettings.update(get(), rm)
+      val restrictionsManager =
+          getSystemService(Context.RESTRICTIONS_SERVICE) as RestrictionsManager
+      MDMSettings.update(get(), restrictionsManager)
     }
     applicationScope.launch {
       Notifier.state.collect { _ ->
@@ -208,9 +208,6 @@ class App : UninitializedApp(), libtailscale.AppContext, ViewModelStoreOwner {
             }
       }
     }
-    applicationScope.launch {
-      val hideDisconnectAction = MDMSettings.forceEnabled.flow.first()
-    }
     TSLog.init(this)
     FeatureFlags.initialize(mapOf("enable_new_search" to true))
   }

android/src/main/java/com/tailscale/ipn/MainActivity.kt

@@ -337,7 +337,7 @@ class MainActivity : ComponentActivity() {
                         loginAtUrl = ::login,
                         navigation = mainViewNav,
                         viewModel = viewModel,
-                        appViewModel = appViewModel)
+                    )
                   }
                   composable("search") {
                     val autoFocus = viewModel.autoFocusSearch
@@ -473,17 +473,13 @@ class MainActivity : ComponentActivity() {
       if (this::navController.isInitialized) {
         val previousEntry = navController.previousBackStackEntry
         TSLog.d("MainActivity", "onNewIntent: previousBackStackEntry = $previousEntry")
-        if (this::navController.isInitialized) {
-          val previousEntry = navController.previousBackStackEntry
-          TSLog.d("MainActivity", "onNewIntent: previousBackStackEntry = $previousEntry")
-          if (previousEntry != null) {
-            navController.popBackStack(route = "main", inclusive = false)
-          } else {
-            TSLog.e(
-                "MainActivity",
-                "onNewIntent: No previous back stack entry, navigating directly to 'main'")
-            navController.navigate("main") { popUpTo("main") { inclusive = true } }
-          }
+        if (previousEntry != null) {
+          navController.popBackStack(route = "main", inclusive = false)
+        } else {
+          TSLog.e(
+              "MainActivity",
+              "onNewIntent: No previous back stack entry, navigating directly to 'main'")
+          navController.navigate("main") { popUpTo("main") { inclusive = true } }
         }
       }
     }

android/src/main/java/com/tailscale/ipn/ui/util/Lists.kt

@@ -4,14 +4,14 @@
 package com.tailscale.ipn.ui.util
 
 import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
 import androidx.compose.foundation.focusable
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyItemScope
 import androidx.compose.foundation.lazy.LazyListScope
-import androidx.compose.foundation.text.ClickableText
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
@@ -95,7 +95,10 @@ object Lists {
         headlineContent = {
           Box(modifier = Modifier.padding(vertical = 4.dp)) {
             onClick?.let {
-              ClickableText(text = text as AnnotatedString, style = style, onClick = { onClick() })
+              Text(
+                  text = text as AnnotatedString,
+                  style = style,
+                  modifier = Modifier.clickable { onClick() })
             } ?: run { Text(text as String, style = style) }
           }
         })

android/src/main/java/com/tailscale/ipn/ui/view/BugReportView.kt

@@ -8,17 +8,17 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.text.ClickableText
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.platform.LocalUriHandler
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.LinkAnnotation
 import androidx.compose.ui.text.SpanStyle
 import androidx.compose.ui.text.buildAnnotatedString
 import androidx.compose.ui.text.style.TextDecoration
@@ -36,7 +36,6 @@ import com.tailscale.ipn.ui.viewModel.BugReportViewModel
 
 @Composable
 fun BugReportView(backToSettings: BackNavigation, model: BugReportViewModel = viewModel()) {
-  val handler = LocalUriHandler.current
   val bugReportID by model.bugReportID.collectAsState()
 
   Scaffold(topBar = { Header(R.string.bug_report_title, onBack = backToSettings) }) { innerPadding
@@ -48,10 +47,7 @@ fun BugReportView(backToSettings: BackNavigation, model: BugReportViewModel = vi
                 .fillMaxHeight()
                 .verticalScroll(rememberScrollState())) {
           Lists.MultilineDescription {
-            ClickableText(
-                text = contactText(),
-                style = MaterialTheme.typography.bodyMedium,
-                onClick = { handler.openUri(Links.SUPPORT_URL) })
+            Text(text = contactText(), style = MaterialTheme.typography.bodyMedium)
           }
 
           ClipboardValueView(bugReportID, title = stringResource(R.string.bug_report_id))
@@ -68,7 +64,7 @@ fun contactText(): AnnotatedString {
       append(stringResource(id = R.string.bug_report_instructions_prefix))
     }
 
-    pushStringAnnotation(tag = "reportLink", annotation = Links.SUPPORT_URL)
+    pushLink(LinkAnnotation.Url(Links.SUPPORT_URL))
     withStyle(
         style =
             SpanStyle(

android/src/main/java/com/tailscale/ipn/ui/view/MainView.kt

@@ -129,7 +129,6 @@ fun MainView(
     loginAtUrl: (String) -> Unit,
     navigation: MainViewNavigation,
     viewModel: MainViewModel,
-    appViewModel: AppViewModel
 ) {
   val currentPingDevice by viewModel.pingViewModel.peer.collectAsState()
   val healthIcon by viewModel.healthIcon.collectAsState()
@@ -829,5 +828,5 @@ fun MainViewPreview() {
           onNavigateToHealth = {},
           onNavigateToSearch = {}),
       vm,
-      appViewModel)
+  )
 }