refactor: null safety, update date/time libraries, and migrate tests (#4900)

Signed-off-by: James Rich <2199651+jamesarich@users.noreply.github.com>

app/src/fdroid/kotlin/org/meshtastic/app/map/FdroidMapViewProvider.kt

@@ -39,6 +39,7 @@ class FdroidMapViewProvider : MapViewProvider {
     ) {
         val mapViewModel: MapViewModel = koinViewModel()
         LaunchedEffect(waypointId) { mapViewModel.setWaypointId(waypointId) }
+        @Suppress("UNCHECKED_CAST")
         org.meshtastic.app.map.MapView(
             modifier = modifier,
             mapViewModel = mapViewModel,

app/src/fdroid/kotlin/org/meshtastic/app/map/MapView.kt

@@ -449,7 +449,7 @@ fun MapView(
                 if (!mapFilterStateValue.showPrecisionCircle) {
                     setPrecisionBits(0)
                 } else {
-                    setPrecisionBits(p.precision_bits ?: 0)
+                    setPrecisionBits(p.precision_bits)
                 }
                 setOnLongClickListener {
                     navigateToNodeDetails(node.num)
@@ -469,7 +469,7 @@ fun MapView(
             Logger.d { "User deleted waypoint ${waypoint.id} for me" }
             mapViewModel.deleteWaypoint(waypoint.id)
         }
-        if ((waypoint.locked_to ?: 0) in setOf(0, mapViewModel.myNodeNum ?: 0) && isConnected) {
+        if (waypoint.locked_to in setOf(0, mapViewModel.myNodeNum ?: 0) && isConnected) {
             builder.setPositiveButton(getString(Res.string.delete_for_everyone)) { _, _ ->
                 Logger.d { "User deleted waypoint ${waypoint.id} for everyone" }
                 mapViewModel.sendWaypoint(waypoint.copy(expire = 1))
@@ -497,7 +497,7 @@ fun MapView(
         Logger.d { "marker long pressed id=$id" }
         val waypoint = waypoints[id]?.waypoint ?: return
         // edit only when unlocked or lockedTo myNodeNum
-        if ((waypoint.locked_to ?: 0) in setOf(0, mapViewModel.myNodeNum ?: 0) && isConnected) {
+        if (waypoint.locked_to in setOf(0, mapViewModel.myNodeNum ?: 0) && isConnected) {
             showEditWaypointDialog = waypoint
         } else {
             showDeleteMarkerDialog(waypoint)
@@ -515,15 +515,15 @@ fun MapView(
         return waypoints.mapNotNull { waypoint ->
             val pt = waypoint.waypoint ?: return@mapNotNull null
             if (!mapFilterState.showWaypoints) return@mapNotNull null // Use collected mapFilterState
-            val lock = if ((pt.locked_to ?: 0) != 0) "\uD83D\uDD12" else ""
+            val lock = if (pt.locked_to != 0) "\uD83D\uDD12" else ""
             val time = DateFormatter.formatDateTime(waypoint.time)
-            val label = (pt.name ?: "") + " " + formatAgo((waypoint.time / 1000).toInt())
-            val emoji = String(Character.toChars(if ((pt.icon ?: 0) == 0) 128205 else pt.icon!!))
+            val label = pt.name + " " + formatAgo((waypoint.time / 1000).toInt())
+            val emoji = String(Character.toChars(if (pt.icon == 0) 128205 else pt.icon))
             val now = nowMillis
-            val expireTimeMillis = (pt.expire ?: 0) * 1000L
+            val expireTimeMillis = pt.expire * 1000L
             val expireTimeStr =
                 when {
-                    (pt.expire ?: 0) == 0 || pt.expire == Int.MAX_VALUE -> "Never"
+                    pt.expire == 0 || pt.expire == Int.MAX_VALUE -> "Never"
                     expireTimeMillis <= now -> "Expired"
                     else -> DateFormatter.formatRelativeTime(expireTimeMillis)
                 }
@@ -693,10 +693,9 @@ fun MapView(
         if (nodeTracks == null || focusedNodeNum == null) return emptyList<Marker>() to emptyList<Polyline>()
 
         val lastHeardTrackFilter = mapFilterState.lastHeardTrackFilter
-        val timeFilteredPositions =
-            nodeTracks.filter {
-                lastHeardTrackFilter == LastHeardFilter.Any || it.time > nowSeconds - lastHeardTrackFilter.seconds
-            }
+        val timeFilteredPositions = nodeTracks.filter {
+            lastHeardTrackFilter == LastHeardFilter.Any || it.time > nowSeconds - lastHeardTrackFilter.seconds
+        }
         val sortedPositions = timeFilteredPositions.sortedBy { it.time }
 
         val focusedNode = nodes.find { it.num == focusedNodeNum } ?: return emptyList<Marker>() to emptyList<Polyline>()
@@ -719,18 +718,17 @@ fun MapView(
             }
         }
 
-        val trackMarkers =
-            sortedPositions.mapIndexedNotNull { index, position ->
-                if (index == sortedPositions.lastIndex) return@mapIndexedNotNull null
+        val trackMarkers = sortedPositions.mapIndexedNotNull { index, position ->
+            if (index == sortedPositions.lastIndex) return@mapIndexedNotNull null
 
-                Marker(this).apply {
-                    this.position = GeoPoint((position.latitude_i ?: 0) * 1e-7, (position.longitude_i ?: 0) * 1e-7)
-                    icon = AppCompatResources.getDrawable(context, R.drawable.ic_map_location_dot)
-                    setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
-                    title = getString(Res.string.position)
-                    snippet = formatAgo(position.time)
-                }
+            Marker(this).apply {
+                this.position = GeoPoint((position.latitude_i ?: 0) * 1e-7, (position.longitude_i ?: 0) * 1e-7)
+                icon = AppCompatResources.getDrawable(context, R.drawable.ic_map_location_dot)
+                setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
+                title = getString(Res.string.position)
+                snippet = formatAgo(position.time)
             }
+        }
         return trackMarkers to trackPolylines
     }
 
@@ -941,12 +939,11 @@ fun MapView(
                 Logger.d { "User clicked send waypoint ${waypoint.id}" }
                 showEditWaypointDialog = null
 
-                val newId =
-                    if (waypoint.id == 0) mapViewModel.generatePacketId() ?: return@EditWaypointDialog else waypoint.id
+                val newId = if (waypoint.id == 0) mapViewModel.generatePacketId() else waypoint.id
                 val newName = if (waypoint.name.isNullOrEmpty()) "Dropped Pin" else waypoint.name
-                val newExpire = if ((waypoint.expire ?: 0) == 0) Int.MAX_VALUE else (waypoint.expire ?: Int.MAX_VALUE)
-                val newLockedTo = if ((waypoint.locked_to ?: 0) != 0) mapViewModel.myNodeNum ?: 0 else 0
-                val newIcon = if ((waypoint.icon ?: 0) == 0) 128205 else waypoint.icon
+                val newExpire = if (waypoint.expire == 0) Int.MAX_VALUE else waypoint.expire
+                val newLockedTo = if (waypoint.locked_to != 0) mapViewModel.myNodeNum ?: 0 else 0
+                val newIcon = if (waypoint.icon == 0) 128205 else waypoint.icon
 
                 mapViewModel.sendWaypoint(
                     waypoint.copy(
@@ -1161,16 +1158,15 @@ private fun offsetPolyline(
     val headingPoints = headingReferencePoints.takeIf { it.size >= 2 } ?: points
     if (points.size < 2 || headingPoints.size < 2 || offsetMeters == 0.0) return points
 
-    val headings =
-        headingPoints.mapIndexed { index, _ ->
-            when (index) {
-                0 -> bearingRad(headingPoints[0], headingPoints[1])
-                headingPoints.lastIndex ->
-                    bearingRad(headingPoints[headingPoints.lastIndex - 1], headingPoints[headingPoints.lastIndex])
+    val headings = headingPoints.mapIndexed { index, _ ->
+        when (index) {
+            0 -> bearingRad(headingPoints[0], headingPoints[1])
+            headingPoints.lastIndex ->
+                bearingRad(headingPoints[headingPoints.lastIndex - 1], headingPoints[headingPoints.lastIndex])
 
-                else -> bearingRad(headingPoints[index - 1], headingPoints[index + 1])
-            }
+            else -> bearingRad(headingPoints[index - 1], headingPoints[index + 1])
         }
+    }
 
     return points.mapIndexed { index, point ->
         val heading = headings[index.coerceIn(0, headings.lastIndex)]

app/src/fdroid/kotlin/org/meshtastic/app/map/MapViewExtensions.kt

@@ -126,19 +126,18 @@ fun MapView.addPolyline(density: Density, geoPoints: List<GeoPoint>, onClick: ()
 
 fun MapView.addPositionMarkers(positions: List<Position>, onClick: () -> Unit): List<Marker> {
     val navIcon = ContextCompat.getDrawable(context, R.drawable.ic_map_navigation)
-    val markers =
-        positions.map {
-            Marker(this).apply {
-                icon = navIcon
-                rotation = ((it.ground_track ?: 0) * 1e-5).toFloat()
-                setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
-                position = GeoPoint((it.latitude_i ?: 0) * 1e-7, (it.longitude_i ?: 0) * 1e-7)
-                setOnMarkerClickListener { _, _ ->
-                    onClick()
-                    true
-                }
+    val markers = positions.map {
+        Marker(this).apply {
+            icon = navIcon
+            rotation = ((it.ground_track ?: 0) * 1e-5).toFloat()
+            setAnchor(Marker.ANCHOR_CENTER, Marker.ANCHOR_CENTER)
+            position = GeoPoint((it.latitude_i ?: 0) * 1e-7, (it.longitude_i ?: 0) * 1e-7)
+            setOnMarkerClickListener { _, _ ->
+                onClick()
+                true
             }
         }
+    }
     overlays.addAll(markers)
 
     return markers

app/src/fdroid/kotlin/org/meshtastic/app/map/component/EditWaypointDialog.kt

@@ -60,7 +60,6 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import kotlinx.datetime.Instant
 import kotlinx.datetime.LocalDateTime
 import kotlinx.datetime.Month
 import kotlinx.datetime.toInstant
@@ -85,6 +84,7 @@ import org.meshtastic.core.ui.emoji.EmojiPickerDialog
 import org.meshtastic.core.ui.theme.AppTheme
 import org.meshtastic.proto.Waypoint
 import kotlin.time.Duration.Companion.hours
+import kotlin.time.Instant
 
 @Suppress("LongMethod", "CyclomaticComplexMethod")
 @OptIn(ExperimentalLayoutApi::class)
@@ -100,7 +100,7 @@ fun EditWaypointDialog(
     val title = if (waypoint.id == 0) Res.string.waypoint_new else Res.string.waypoint_edit
 
     @Suppress("MagicNumber")
-    val emoji = if ((waypointInput.icon ?: 0) == 0) 128205 else waypointInput.icon!!
+    val emoji = if (waypointInput.icon == 0) 128205 else waypointInput.icon
     var showEmojiPickerView by remember { mutableStateOf(false) }
 
     // Get current context for dialogs
@@ -115,11 +115,11 @@ fun EditWaypointDialog(
 
     val currentInstant =
         remember(waypointInput.expire) {
-            val expire = waypointInput.expire ?: 0
+            val expire = waypointInput.expire
             if (expire != 0 && expire != Int.MAX_VALUE) {
-                Instant.fromEpochSeconds(expire.toLong())
+                kotlin.time.Instant.fromEpochSeconds(expire.toLong())
             } else {
-                kotlinx.datetime.Clock.System.now() + 8.hours
+                kotlin.time.Clock.System.now() + 8.hours
             }
         }
 
@@ -127,7 +127,7 @@ fun EditWaypointDialog(
     var selectedDate by
         remember(currentInstant) {
             mutableStateOf(
-                if ((waypointInput.expire ?: 0) != 0 && waypointInput.expire != Int.MAX_VALUE) {
+                if (waypointInput.expire != 0 && waypointInput.expire != Int.MAX_VALUE) {
                     dateFormat.format(java.util.Date(currentInstant.toEpochMilliseconds()))
                 } else {
                     ""
@@ -137,7 +137,7 @@ fun EditWaypointDialog(
     var selectedTime by
         remember(currentInstant) {
             mutableStateOf(
-                if ((waypointInput.expire ?: 0) != 0 && waypointInput.expire != Int.MAX_VALUE) {
+                if (waypointInput.expire != 0 && waypointInput.expire != Int.MAX_VALUE) {
                     timeFormat.format(java.util.Date(currentInstant.toEpochMilliseconds()))
                 } else {
                     ""
@@ -162,7 +162,7 @@ fun EditWaypointDialog(
                     )
                     EditTextPreference(
                         title = stringResource(Res.string.name),
-                        value = waypointInput.name ?: "",
+                        value = waypointInput.name,
                         maxSize = 29,
                         enabled = true,
                         isError = false,
@@ -185,7 +185,7 @@ fun EditWaypointDialog(
                     )
                     EditTextPreference(
                         title = stringResource(Res.string.description),
-                        value = waypointInput.description ?: "",
+                        value = waypointInput.description,
                         maxSize = 99,
                         enabled = true,
                         isError = false,
@@ -202,7 +202,7 @@ fun EditWaypointDialog(
                         Text(stringResource(Res.string.locked))
                         Switch(
                             modifier = Modifier.fillMaxWidth().wrapContentWidth(Alignment.End),
-                            checked = (waypointInput.locked_to ?: 0) != 0,
+                            checked = waypointInput.locked_to != 0,
                             onCheckedChange = { waypointInput = waypointInput.copy(locked_to = if (it) 1 else 0) },
                         )
                     }
@@ -225,7 +225,7 @@ fun EditWaypointDialog(
                                 waypointInput = waypointInput.copy(expire = newLdt.toInstant(tz).epochSeconds.toInt())
                             },
                             ldt.year,
-                            ldt.monthNumber - 1,
+                            ldt.month.ordinal,
                             ldt.day,
                         )
 
@@ -261,7 +261,7 @@ fun EditWaypointDialog(
                         Text(stringResource(Res.string.expires))
                         Switch(
                             modifier = Modifier.fillMaxWidth().wrapContentWidth(Alignment.End),
-                            checked = waypointInput.expire != Int.MAX_VALUE && (waypointInput.expire ?: 0) != 0,
+                            checked = waypointInput.expire != Int.MAX_VALUE && waypointInput.expire != 0,
                             onCheckedChange = { isChecked ->
                                 if (isChecked) {
                                     waypointInput = waypointInput.copy(expire = currentInstant.epochSeconds.toInt())
@@ -272,7 +272,7 @@ fun EditWaypointDialog(
                         )
                     }
 
-                    if (waypointInput.expire != Int.MAX_VALUE && (waypointInput.expire ?: 0) != 0) {
+                    if (waypointInput.expire != Int.MAX_VALUE && waypointInput.expire != 0) {
                         Row(
                             modifier = Modifier.fillMaxWidth(),
                             horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally),

app/src/google/kotlin/org/meshtastic/app/map/MapView.kt

@@ -302,17 +302,16 @@ fun MapView(
     }
 
     val myNodeNum = mapViewModel.myNodeNum
-    val nodeClusterItems =
-        displayNodes.map { node ->
-            val latLng = LatLng((node.position.latitude_i ?: 0) * DEG_D, (node.position.longitude_i ?: 0) * DEG_D)
-            NodeClusterItem(
-                node = node,
-                nodePosition = latLng,
-                nodeTitle = "${node.user.short_name} ${formatAgo(node.position.time)}",
-                nodeSnippet = "${node.user.long_name}",
-                myNodeNum = myNodeNum,
-            )
-        }
+    val nodeClusterItems = displayNodes.map { node ->
+        val latLng = LatLng((node.position.latitude_i ?: 0) * DEG_D, (node.position.longitude_i ?: 0) * DEG_D)
+        NodeClusterItem(
+            node = node,
+            nodePosition = latLng,
+            nodeTitle = "${node.user.short_name} ${formatAgo(node.position.time)}",
+            nodeSnippet = "${node.user.long_name}",
+            myNodeNum = myNodeNum,
+        )
+    }
     val isConnected by mapViewModel.isConnected.collectAsStateWithLifecycle()
     val theme by mapViewModel.theme.collectAsStateWithLifecycle()
     val dark =
@@ -492,11 +491,9 @@ fun MapView(
 
             if (nodeTracks != null && focusedNodeNum != null) {
                 val lastHeardTrackFilter = mapFilterState.lastHeardTrackFilter
-                val timeFilteredPositions =
-                    nodeTracks.filter {
-                        lastHeardTrackFilter == LastHeardFilter.Any ||
-                            it.time > nowSeconds - lastHeardTrackFilter.seconds
-                    }
+                val timeFilteredPositions = nodeTracks.filter {
+                    lastHeardTrackFilter == LastHeardFilter.Any || it.time > nowSeconds - lastHeardTrackFilter.seconds
+                }
                 val sortedPositions = timeFilteredPositions.sortedBy { it.time }
                 allNodes
                     .find { it.num == focusedNodeNum }
@@ -872,19 +869,18 @@ private fun offsetPolyline(
     val headingPoints = headingReferencePoints.takeIf { it.size >= 2 } ?: points
     if (points.size < 2 || headingPoints.size < 2 || offsetMeters == 0.0) return points
 
-    val headings =
-        headingPoints.mapIndexed { index, _ ->
-            when (index) {
-                0 -> SphericalUtil.computeHeading(headingPoints[0], headingPoints[1])
-                headingPoints.lastIndex ->
-                    SphericalUtil.computeHeading(
-                        headingPoints[headingPoints.lastIndex - 1],
-                        headingPoints[headingPoints.lastIndex],
-                    )
+    val headings = headingPoints.mapIndexed { index, _ ->
+        when (index) {
+            0 -> SphericalUtil.computeHeading(headingPoints[0], headingPoints[1])
+            headingPoints.lastIndex ->
+                SphericalUtil.computeHeading(
+                    headingPoints[headingPoints.lastIndex - 1],
+                    headingPoints[headingPoints.lastIndex],
+                )
 
-                else -> SphericalUtil.computeHeading(headingPoints[index - 1], headingPoints[index + 1])
-            }
+            else -> SphericalUtil.computeHeading(headingPoints[index - 1], headingPoints[index + 1])
         }
+    }
 
     return points.mapIndexed { index, point ->
         val heading = headings[index.coerceIn(0, headings.lastIndex)]

app/src/google/kotlin/org/meshtastic/app/map/MapViewModel.kt

@@ -412,33 +412,32 @@ class MapViewModel(
 
                     if (persistedLayerFiles != null) {
                         val hiddenLayerUrls = googleMapsPrefs.hiddenLayerUrls.value
-                        val loadedItems =
-                            persistedLayerFiles.mapNotNull { file ->
-                                if (file.isFile) {
-                                    val layerType =
-                                        when (file.extension.lowercase()) {
-                                            "kml",
-                                            "kmz",
-                                            -> LayerType.KML
-                                            "geojson",
-                                            "json",
-                                            -> LayerType.GEOJSON
-                                            else -> null
-                                        }
-
-                                    layerType?.let {
-                                        val uri = Uri.fromFile(file)
-                                        MapLayerItem(
-                                            name = file.nameWithoutExtension,
-                                            uri = uri,
-                                            isVisible = !hiddenLayerUrls.contains(uri.toString()),
-                                            layerType = it,
-                                        )
+                        val loadedItems = persistedLayerFiles.mapNotNull { file ->
+                            if (file.isFile) {
+                                val layerType =
+                                    when (file.extension.lowercase()) {
+                                        "kml",
+                                        "kmz",
+                                        -> LayerType.KML
+                                        "geojson",
+                                        "json",
+                                        -> LayerType.GEOJSON
+                                        else -> null
                                     }
-                                } else {
-                                    null
+
+                                layerType?.let {
+                                    val uri = Uri.fromFile(file)
+                                    MapLayerItem(
+                                        name = file.nameWithoutExtension,
+                                        uri = uri,
+                                        isVisible = !hiddenLayerUrls.contains(uri.toString()),
+                                        layerType = it,
+                                    )
                                 }
+                            } else {
+                                null
                             }
+                        }
 
                         val networkItems =
                             googleMapsPrefs.networkMapLayers.value.mapNotNull { networkString ->