From 4548434b7e766dcffe71565ba55d9a80fa2afb76 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Sat, 29 Mar 2025 15:43:34 -0500 Subject: [PATCH 1/4] chore (repo): Add release configuration (#1731) --- .github/release.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 .github/release.yml diff --git a/.github/release.yml b/.github/release.yml new file mode 100644 index 00000000..72cb085a --- /dev/null +++ b/.github/release.yml @@ -0,0 +1,13 @@ +# .github/release.yml + +changelog: + categories: + - title: 🛠️Fixes & Features + labels: + - '*' + exclude: + labels: + - dependencies + - title: 👷Dependencies + labels: + - dependencies From e9d69165291ef6b12b1d91492539e4c9d7b3cc62 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Mon, 31 Mar 2025 12:16:22 -0500 Subject: [PATCH 2/4] fix: remove notification grouping (#1735) --- .../mesh/service/MeshServiceNotifications.kt | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt index 4dc69ce2..adb4c2d7 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt @@ -51,11 +51,6 @@ class MeshServiceNotifications( const val OPEN_MESSAGE_ACTION = "com.geeksville.mesh.OPEN_MESSAGE_ACTION" const val OPEN_MESSAGE_EXTRA_CONTACT_KEY = "com.geeksville.mesh.OPEN_MESSAGE_EXTRA_CONTACT_KEY" - const val SERVICE_GROUP = "SERVICE_NOTIFICATION_GROUP" - const val MESSAGE_GROUP = "MESSAGE_NOTIFICATION_GROUP" - const val ALERT_GROUP = "ALERT_NOTIFICATION_GROUP" - const val NEW_NODE_GROUP = "NEW_NODE_NOTIFICATION_GROUP" - const val LOW_BATTERY_GROUP = "LOW_BATTERY_NOTIFICATION_GROUP" const val MAX_BATTERY_LEVEL = 100 } @@ -407,7 +402,6 @@ class MeshServiceNotifications( } with(serviceNotificationBuilder) { priority = NotificationCompat.PRIORITY_MIN - setGroup(SERVICE_GROUP) setCategory(Notification.CATEGORY_SERVICE) setOngoing(true) setContentTitle(name) @@ -446,7 +440,6 @@ class MeshServiceNotifications( setContentIntent(openMessageIntent(contactKey)) priority = NotificationCompat.PRIORITY_DEFAULT setCategory(Notification.CATEGORY_MESSAGE) - setGroup(MESSAGE_GROUP) setAutoCancel(true) setStyle( NotificationCompat.MessagingStyle(person) @@ -472,7 +465,6 @@ class MeshServiceNotifications( setContentIntent(openMessageIntent(contactKey)) priority = NotificationCompat.PRIORITY_HIGH setCategory(Notification.CATEGORY_ALARM) - setGroup(ALERT_GROUP) setAutoCancel(true) setStyle( NotificationCompat.MessagingStyle(person) @@ -489,7 +481,6 @@ class MeshServiceNotifications( } with(newNodeSeenNotificationBuilder) { priority = NotificationCompat.PRIORITY_DEFAULT - setGroup(NEW_NODE_GROUP) setCategory(Notification.CATEGORY_STATUS) setAutoCancel(true) setContentTitle("New Node Seen: $name") @@ -524,7 +515,6 @@ class MeshServiceNotifications( priority = NotificationCompat.PRIORITY_DEFAULT setCategory(Notification.CATEGORY_STATUS) setOngoing(true) - setGroup(LOW_BATTERY_GROUP) setShowWhen(true) setOnlyAlertOnce(true) setWhen(System.currentTimeMillis()) From d0816d34957ed04c6ce5881cd4295cba4d5947e3 Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Mon, 31 Mar 2025 12:17:33 -0500 Subject: [PATCH 3/4] fix: Remove nodeDb size from status string (#1734) --- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 2827bf9a..59e4659f 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1574,7 +1574,7 @@ class MeshService : Service(), Logging { insertMeshLog(packetToSave) newNodes.add(info) - radioConfigRepository.setStatusMessage("Nodes (${newNodes.size} / 100)") + radioConfigRepository.setStatusMessage("Nodes (${newNodes.size})") } private var rawMyNodeInfo: MeshProtos.MyNodeInfo? = null From b6876bba64c7ead09e0d22dca6b120e7f8dc438b Mon Sep 17 00:00:00 2001 From: James Rich <2199651+jamesarich@users.noreply.github.com> Date: Mon, 31 Mar 2025 12:18:13 -0500 Subject: [PATCH 4/4] fix: disable editing of Public Key field (#1737) --- .../mesh/ui/radioconfig/components/SecurityConfigItemList.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/SecurityConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/SecurityConfigItemList.kt index 55d7b055..53d36c9e 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/SecurityConfigItemList.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/radioconfig/components/SecurityConfigItemList.kt @@ -83,7 +83,7 @@ fun SecurityConfigItemList( EditBase64Preference( title = "Public Key", value = securityInput.publicKey, - enabled = enabled, + enabled = false, keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }), onValueChange = { if (it.size() == 32) {