meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: non-expiring waypoints (#2237)

Browse source
This commit is contained in:
Benjamin Faershtein 2025-06-25 08:58:07 -07:00 • committed by GitHub
parent cd05fd1ccf
commit 0abc6e03b9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/com/geeksville/mesh/model/UIState.kt
View file

@ -560,7 +560,9 @@ class UIViewModel @Inject constructor(
val waypoints = packetRepository.getWaypoints().mapLatest { list ->
list.associateBy { packet -> packet.data.waypoint!!.id }
.filterValues { it.data.waypoint!!.expire > System.currentTimeMillis() / 1000 }
.filterValues {
it.data.waypoint!!.expire == 0 || it.data.waypoint!!.expire > System.currentTimeMillis() / 1000
}
}
fun generatePacketId(): Int? {

10
app/src/main/java/com/geeksville/mesh/ui/map/components/EditWaypointDialog.kt
View file

@ -89,11 +89,6 @@ internal fun EditWaypointDialog(
val emoji = if (waypointInput.icon == 0) 128205 else waypointInput.icon
var showEmojiPickerView by remember { mutableStateOf(false) }
// State to hold selected date and time
var selectedDate by remember { mutableStateOf("") }
var selectedTime by remember { mutableStateOf("") }
var epochTime by remember { mutableStateOf<Long?>(null) }
// Get current context for dialogs
val context = LocalContext.current
val calendar = Calendar.getInstance()
@ -124,6 +119,11 @@ internal fun EditWaypointDialog(
SimpleDateFormat("hh:mm a", locale)
}
// State to hold selected date and time
var selectedDate by remember { mutableStateOf(dateFormat.format(calendar.time)) }
var selectedTime by remember { mutableStateOf(timeFormat.format(calendar.time)) }
var epochTime by remember { mutableStateOf<Long?>(null) }
if (!showEmojiPickerView) {
AlertDialog(
onDismissRequest = onDismissRequest,