diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 8a10375bd..f43cb4049 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
     </inspection_tool>
     <inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
diff --git a/app/build.gradle b/app/build.gradle
index e4b21d60f..f80721690 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -32,8 +32,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdk 34
-        versionCode 30510 // format is Mmmss (where M is 1+the numeric major number
-        versionName "2.5.10"
+        versionCode 30512 // format is Mmmss (where M is 1+the numeric major number
+        versionName "2.5.12"
         testInstrumentationRunner "com.geeksville.mesh.TestRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio
diff --git a/app/src/androidTest/java/com/geeksville/mesh/ChannelSetTest.kt b/app/src/androidTest/java/com/geeksville/mesh/ChannelSetTest.kt
index d65d9f924..0afe23249 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/ChannelSetTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/ChannelSetTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.net.Uri
diff --git a/app/src/androidTest/java/com/geeksville/mesh/ChannelTest.kt b/app/src/androidTest/java/com/geeksville/mesh/ChannelTest.kt
index d0f814eb0..9013c4f4f 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/ChannelTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/ChannelTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/app/src/androidTest/java/com/geeksville/mesh/ExampleInstrumentedTest.kt b/app/src/androidTest/java/com/geeksville/mesh/ExampleInstrumentedTest.kt
index 2e96d2f76..5cc32fdec 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/ExampleInstrumentedTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/ExampleInstrumentedTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import androidx.test.ext.junit.runners.AndroidJUnit4
diff --git a/app/src/androidTest/java/com/geeksville/mesh/MeshtasticDatabaseTest.kt b/app/src/androidTest/java/com/geeksville/mesh/MeshtasticDatabaseTest.kt
index 8990554f0..321d06ba8 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/MeshtasticDatabaseTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/MeshtasticDatabaseTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import androidx.room.Room
diff --git a/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt b/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt
index 1879a828a..e5b479b1b 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/NodeInfoDaoTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import androidx.room.Room
diff --git a/app/src/androidTest/java/com/geeksville/mesh/PacketDaoTest.kt b/app/src/androidTest/java/com/geeksville/mesh/PacketDaoTest.kt
index 6f2240d0f..be9b58beb 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/PacketDaoTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/PacketDaoTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import androidx.room.Room
diff --git a/app/src/androidTest/java/com/geeksville/mesh/TestRunner.kt b/app/src/androidTest/java/com/geeksville/mesh/TestRunner.kt
index dae86c664..11b649395 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/TestRunner.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/TestRunner.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.app.Application
diff --git a/app/src/androidTest/java/com/geeksville/mesh/compose/EditDeviceProfileDialogTest.kt b/app/src/androidTest/java/com/geeksville/mesh/compose/EditDeviceProfileDialogTest.kt
index 6fdf77877..d281beca2 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/compose/EditDeviceProfileDialogTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/compose/EditDeviceProfileDialogTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.compose
 
 import androidx.compose.ui.test.assertIsDisplayed
diff --git a/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt b/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt
index 11bce1ca7..262617b33 100644
--- a/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt
+++ b/app/src/androidTest/java/com/geeksville/mesh/compose/ScannedQrCodeDialogTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.compose
 
 import androidx.compose.ui.test.assertIsDisplayed
diff --git a/app/src/fdroid/java/com/geeksville/mesh/MeshUtilApplication.kt b/app/src/fdroid/java/com/geeksville/mesh/MeshUtilApplication.kt
index b5ca0980e..db611df04 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/MeshUtilApplication.kt
+++ b/app/src/fdroid/java/com/geeksville/mesh/MeshUtilApplication.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import com.geeksville.mesh.android.GeeksvilleApplication
diff --git a/app/src/fdroid/java/com/geeksville/mesh/analytics/NopAnalytics.kt b/app/src/fdroid/java/com/geeksville/mesh/analytics/NopAnalytics.kt
index d4e320076..13ac2ea30 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/analytics/NopAnalytics.kt
+++ b/app/src/fdroid/java/com/geeksville/mesh/analytics/NopAnalytics.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.analytics
 
 import android.content.Context
diff --git a/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt b/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
index af47b17fd..b7f252931 100644
--- a/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
+++ b/app/src/fdroid/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.app.Application
diff --git a/app/src/google/java/com/geeksville/mesh/MeshUtilApplication.kt b/app/src/google/java/com/geeksville/mesh/MeshUtilApplication.kt
index 8fa7c2c9d..40e137d6f 100644
--- a/app/src/google/java/com/geeksville/mesh/MeshUtilApplication.kt
+++ b/app/src/google/java/com/geeksville/mesh/MeshUtilApplication.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.os.Debug
diff --git a/app/src/google/java/com/geeksville/mesh/analytics/FirebaseAnalytics.kt b/app/src/google/java/com/geeksville/mesh/analytics/FirebaseAnalytics.kt
index 4d2246e4a..bd6a17412 100644
--- a/app/src/google/java/com/geeksville/mesh/analytics/FirebaseAnalytics.kt
+++ b/app/src/google/java/com/geeksville/mesh/analytics/FirebaseAnalytics.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.analytics
 
 import android.content.Context
diff --git a/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt b/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
index d391bdf77..b7581a243 100644
--- a/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
+++ b/app/src/google/java/com/geeksville/mesh/android/GeeksvilleApplication.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.app.Application
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 5e08f29db..0f9e42f02 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="GoogleAppIndexingWarning">
@@ -137,6 +154,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
 
+            <intent-filter>
+                <action android:name="android.intent.action.SEND" />
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
+
             <intent-filter android:autoVerify="true">
                 <!-- The QR codes to share channel settings are shared as meshtastic URLS
 
@@ -205,6 +228,7 @@
                 <action android:name="com.atakmap.app.component" />
             </intent-filter>
         </activity>
+
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/geeksville/mesh/AppIntroduction.kt b/app/src/main/java/com/geeksville/mesh/AppIntroduction.kt
index f15bec7b8..816ff36e8 100644
--- a/app/src/main/java/com/geeksville/mesh/AppIntroduction.kt
+++ b/app/src/main/java/com/geeksville/mesh/AppIntroduction.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.os.Bundle
diff --git a/app/src/main/java/com/geeksville/mesh/ApplicationModule.kt b/app/src/main/java/com/geeksville/mesh/ApplicationModule.kt
index b84d8b553..357e06dc4 100644
--- a/app/src/main/java/com/geeksville/mesh/ApplicationModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/ApplicationModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/CoroutineDispatchers.kt b/app/src/main/java/com/geeksville/mesh/CoroutineDispatchers.kt
index 9922b19eb..9776b5359 100644
--- a/app/src/main/java/com/geeksville/mesh/CoroutineDispatchers.kt
+++ b/app/src/main/java/com/geeksville/mesh/CoroutineDispatchers.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/com/geeksville/mesh/DataPacket.kt b/app/src/main/java/com/geeksville/mesh/DataPacket.kt
index 2cc10d29d..7d8658412 100644
--- a/app/src/main/java/com/geeksville/mesh/DataPacket.kt
+++ b/app/src/main/java/com/geeksville/mesh/DataPacket.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.os.Parcel
diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index 4efba6bbc..9513ab978 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.app.Activity
@@ -48,7 +65,6 @@ import com.geeksville.mesh.databinding.ActivityMainBinding
 import com.geeksville.mesh.model.BluetoothViewModel
 import com.geeksville.mesh.model.DeviceVersion
 import com.geeksville.mesh.model.UIViewModel
-import com.geeksville.mesh.model.toChannelSet
 import com.geeksville.mesh.service.MeshService
 import com.geeksville.mesh.service.MeshServiceNotifications
 import com.geeksville.mesh.service.ServiceRepository
@@ -63,6 +79,7 @@ import com.geeksville.mesh.ui.components.ScannedQrCodeDialog
 import com.geeksville.mesh.ui.map.MapFragment
 import com.geeksville.mesh.ui.navigateToMessages
 import com.geeksville.mesh.ui.navigateToNavGraph
+import com.geeksville.mesh.ui.navigateToShareMessage
 import com.geeksville.mesh.ui.theme.AppTheme
 import com.geeksville.mesh.util.Exceptions
 import com.geeksville.mesh.util.LanguageUtils
@@ -303,12 +320,7 @@ class MainActivity : AppCompatActivity(), Logging {
         when (appLinkAction) {
             Intent.ACTION_VIEW -> {
                 debug("Asked to open a channel URL - ask user if they want to switch to that channel.  If so send the config to the radio")
-                try {
-                    appLinkData?.let { model.requestChannelSet(it.toChannelSet()) }
-                } catch (ex: Throwable) {
-                    errormsg("Channel url error: ${ex.message}")
-                    showSnackbar("${getString(R.string.channel_invalid)}: ${ex.message}")
-                }
+                appLinkData?.let(model::requestChannelUrl)
 
                 // We now wait for the device to connect, once connected, we ask the user if they want to switch to the new channel
             }
@@ -316,9 +328,7 @@ class MainActivity : AppCompatActivity(), Logging {
             MeshServiceNotifications.OPEN_MESSAGE_ACTION -> {
                 val contactKey =
                     intent.getStringExtra(MeshServiceNotifications.OPEN_MESSAGE_EXTRA_CONTACT_KEY)
-                val contactName =
-                    intent.getStringExtra(MeshServiceNotifications.OPEN_MESSAGE_EXTRA_CONTACT_NAME)
-                showMessages(contactKey, contactName)
+                showMessages(contactKey)
             }
 
             UsbManager.ACTION_USB_DEVICE_ATTACHED -> {
@@ -328,6 +338,13 @@ class MainActivity : AppCompatActivity(), Logging {
             Intent.ACTION_MAIN -> {
             }
 
+            Intent.ACTION_SEND -> {
+                val text = intent.getStringExtra(Intent.EXTRA_TEXT)
+                if (text != null) {
+                    shareMessages(text)
+                }
+            }
+
             else -> {
                 warn("Unexpected action $appLinkAction")
             }
@@ -591,10 +608,17 @@ class MainActivity : AppCompatActivity(), Logging {
         binding.pager.currentItem = 5
     }
 
-    private fun showMessages(contactKey: String?, contactName: String?) {
+    private fun showMessages(contactKey: String?) {
+        model.setCurrentTab(0)
+        if (contactKey != null) {
+            supportFragmentManager.navigateToMessages(contactKey)
+        }
+    }
+
+    private fun shareMessages(message: String?) {
         model.setCurrentTab(0)
-        if (contactKey != null && contactName != null) {
-            supportFragmentManager.navigateToMessages(contactKey, contactName)
+        if (message != null) {
+            supportFragmentManager.navigateToShareMessage(message)
         }
     }
 
diff --git a/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt b/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt
index 66ee73c92..0c2392712 100644
--- a/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/MyNodeInfo.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.os.Parcelable
diff --git a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
index 670053eda..91de30281 100644
--- a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import android.graphics.Color
diff --git a/app/src/main/java/com/geeksville/mesh/analytics/AnalyticsClient.kt b/app/src/main/java/com/geeksville/mesh/analytics/AnalyticsClient.kt
index a54a95251..6234acfab 100644
--- a/app/src/main/java/com/geeksville/mesh/analytics/AnalyticsClient.kt
+++ b/app/src/main/java/com/geeksville/mesh/analytics/AnalyticsClient.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.analytics
 
 /**
diff --git a/app/src/main/java/com/geeksville/mesh/android/AppPrefs.kt b/app/src/main/java/com/geeksville/mesh/android/AppPrefs.kt
index dc147bc60..a94e84d1d 100644
--- a/app/src/main/java/com/geeksville/mesh/android/AppPrefs.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/AppPrefs.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.content.Context
diff --git a/app/src/main/java/com/geeksville/mesh/android/BuildUtils.kt b/app/src/main/java/com/geeksville/mesh/android/BuildUtils.kt
index 87f4814ba..816ffb01c 100644
--- a/app/src/main/java/com/geeksville/mesh/android/BuildUtils.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/BuildUtils.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.os.Build
diff --git a/app/src/main/java/com/geeksville/mesh/android/ContextExtensions.kt b/app/src/main/java/com/geeksville/mesh/android/ContextExtensions.kt
index 219585f3c..04796cf08 100644
--- a/app/src/main/java/com/geeksville/mesh/android/ContextExtensions.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/ContextExtensions.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.app.Activity
diff --git a/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt b/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
index 551195ec4..473facb08 100644
--- a/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.Manifest
diff --git a/app/src/main/java/com/geeksville/mesh/android/DateUtils.kt b/app/src/main/java/com/geeksville/mesh/android/DateUtils.kt
index ededfa21b..cf5642543 100644
--- a/app/src/main/java/com/geeksville/mesh/android/DateUtils.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/DateUtils.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import java.util.*
diff --git a/app/src/main/java/com/geeksville/mesh/android/DebugLogFile.kt b/app/src/main/java/com/geeksville/mesh/android/DebugLogFile.kt
index c5b68e4b8..c29b8ee36 100644
--- a/app/src/main/java/com/geeksville/mesh/android/DebugLogFile.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/DebugLogFile.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.content.Context
diff --git a/app/src/main/java/com/geeksville/mesh/android/ExpireChecker.kt b/app/src/main/java/com/geeksville/mesh/android/ExpireChecker.kt
index a2ccc482f..1a348ea13 100644
--- a/app/src/main/java/com/geeksville/mesh/android/ExpireChecker.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/ExpireChecker.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.app.Activity
diff --git a/app/src/main/java/com/geeksville/mesh/android/Logging.kt b/app/src/main/java/com/geeksville/mesh/android/Logging.kt
index 036afb7aa..1037f0f7f 100644
--- a/app/src/main/java/com/geeksville/mesh/android/Logging.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/Logging.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.os.Build
diff --git a/app/src/main/java/com/geeksville/mesh/android/ServiceClient.kt b/app/src/main/java/com/geeksville/mesh/android/ServiceClient.kt
index 92370ccf4..194d2d53c 100644
--- a/app/src/main/java/com/geeksville/mesh/android/ServiceClient.kt
+++ b/app/src/main/java/com/geeksville/mesh/android/ServiceClient.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.android
 
 import android.content.ComponentName
diff --git a/app/src/main/java/com/geeksville/mesh/concurrent/Coroutines.kt b/app/src/main/java/com/geeksville/mesh/concurrent/Coroutines.kt
index 89c652b25..63ea85aac 100644
--- a/app/src/main/java/com/geeksville/mesh/concurrent/Coroutines.kt
+++ b/app/src/main/java/com/geeksville/mesh/concurrent/Coroutines.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.concurrent
 
 import com.geeksville.mesh.util.Exceptions
diff --git a/app/src/main/java/com/geeksville/mesh/concurrent/DeferredExecution.kt b/app/src/main/java/com/geeksville/mesh/concurrent/DeferredExecution.kt
index d6f061e3c..7a764f213 100644
--- a/app/src/main/java/com/geeksville/mesh/concurrent/DeferredExecution.kt
+++ b/app/src/main/java/com/geeksville/mesh/concurrent/DeferredExecution.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.concurrent
 
 import com.geeksville.mesh.android.Logging
diff --git a/app/src/main/java/com/geeksville/mesh/concurrent/SyncContinuation.kt b/app/src/main/java/com/geeksville/mesh/concurrent/SyncContinuation.kt
index f1f6d1490..ccd65f3c7 100644
--- a/app/src/main/java/com/geeksville/mesh/concurrent/SyncContinuation.kt
+++ b/app/src/main/java/com/geeksville/mesh/concurrent/SyncContinuation.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.concurrent
 
 import com.geeksville.mesh.android.Logging
diff --git a/app/src/main/java/com/geeksville/mesh/database/Converters.kt b/app/src/main/java/com/geeksville/mesh/database/Converters.kt
index 6cc44b9c4..bf3c1579e 100644
--- a/app/src/main/java/com/geeksville/mesh/database/Converters.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/Converters.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database
 
 import androidx.room.TypeConverter
diff --git a/app/src/main/java/com/geeksville/mesh/database/DatabaseModule.kt b/app/src/main/java/com/geeksville/mesh/database/DatabaseModule.kt
index 2c2909f2c..10f1c8b94 100644
--- a/app/src/main/java/com/geeksville/mesh/database/DatabaseModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/DatabaseModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/database/MeshLogRepository.kt b/app/src/main/java/com/geeksville/mesh/database/MeshLogRepository.kt
index d2d846580..bf515625b 100644
--- a/app/src/main/java/com/geeksville/mesh/database/MeshLogRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/MeshLogRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database
 
 import com.geeksville.mesh.CoroutineDispatchers
diff --git a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt b/app/src/main/java/com/geeksville/mesh/database/NodeRepository.kt
similarity index 56%
rename from app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
rename to app/src/main/java/com/geeksville/mesh/database/NodeRepository.kt
index 900a79063..7da648fe2 100644
--- a/app/src/main/java/com/geeksville/mesh/model/NodeDB.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/NodeRepository.kt
@@ -1,29 +1,52 @@
-package com.geeksville.mesh.model
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.geeksville.mesh.database
 
 import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.coroutineScope
+import com.geeksville.mesh.CoroutineDispatchers
 import com.geeksville.mesh.DataPacket
 import com.geeksville.mesh.MeshProtos
 import com.geeksville.mesh.database.dao.NodeInfoDao
 import com.geeksville.mesh.database.entity.MyNodeEntity
 import com.geeksville.mesh.database.entity.NodeEntity
-import kotlinx.coroutines.Dispatchers
+import com.geeksville.mesh.model.NodeSortOption
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.StateFlow
-import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.conflate
+import kotlinx.coroutines.flow.flowOn
 import kotlinx.coroutines.flow.onEach
+import kotlinx.coroutines.flow.stateIn
 import kotlinx.coroutines.withContext
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class NodeDB @Inject constructor(
+class NodeRepository @Inject constructor(
     processLifecycle: Lifecycle,
     private val nodeInfoDao: NodeInfoDao,
+    private val dispatchers: CoroutineDispatchers,
 ) {
     // hardware info about our local device (can be null)
-    private val _myNodeInfo = MutableStateFlow<MyNodeEntity?>(null)
-    val myNodeInfo: StateFlow<MyNodeEntity?> get() = _myNodeInfo
+    val myNodeInfo: StateFlow<MyNodeEntity?> = nodeInfoDao.getMyNodeInfo()
+        .flowOn(dispatchers.io)
+        .stateIn(processLifecycle.coroutineScope, SharingStarted.Eagerly, null)
 
     // our node info
     private val _ourNodeInfo = MutableStateFlow<NodeEntity?>(null)
@@ -34,8 +57,15 @@ class NodeDB @Inject constructor(
     val myId: StateFlow<String?> get() = _myId
 
     // A map from nodeNum to NodeEntity
-    private val _nodeDBbyNum = MutableStateFlow<Map<Int, NodeEntity>>(mapOf())
-    val nodeDBbyNum: StateFlow<Map<Int, NodeEntity>> get() = _nodeDBbyNum
+    val nodeDBbyNum: StateFlow<Map<Int, NodeEntity>> = nodeInfoDao.nodeDBbyNum()
+        .onEach {
+            val ourNodeInfo = it.values.firstOrNull()
+            _ourNodeInfo.value = ourNodeInfo
+            _myId.value = ourNodeInfo?.user?.id
+        }
+        .flowOn(dispatchers.io)
+        .conflate()
+        .stateIn(processLifecycle.coroutineScope, SharingStarted.Eagerly, emptyMap())
 
     fun getUser(nodeNum: Int): MeshProtos.User = getUser(DataPacket.nodeNumToDefaultId(nodeNum))
 
@@ -48,18 +78,6 @@ class NodeDB @Inject constructor(
                 .setHwModel(MeshProtos.HardwareModel.UNSET)
                 .build()
 
-    init {
-        nodeInfoDao.getMyNodeInfo().onEach { _myNodeInfo.value = it }
-            .launchIn(processLifecycle.coroutineScope)
-
-        nodeInfoDao.nodeDBbyNum().onEach {
-            _nodeDBbyNum.value = it
-            val ourNodeInfo = it.values.firstOrNull()
-            _ourNodeInfo.value = ourNodeInfo
-            _myId.value = ourNodeInfo?.user?.id
-        }.launchIn(processLifecycle.coroutineScope)
-    }
-
     fun getNodes(
         sort: NodeSortOption = NodeSortOption.LAST_HEARD,
         filter: String = "",
@@ -68,20 +86,20 @@ class NodeDB @Inject constructor(
         sort = sort.sqlValue,
         filter = filter,
         includeUnknown = includeUnknown,
-    )
+    ).flowOn(dispatchers.io).conflate()
 
-    suspend fun upsert(node: NodeEntity) = withContext(Dispatchers.IO) {
+    suspend fun upsert(node: NodeEntity) = withContext(dispatchers.io) {
         nodeInfoDao.upsert(node)
     }
 
-    suspend fun installNodeDB(mi: MyNodeEntity, nodes: List<NodeEntity>) = withContext(Dispatchers.IO) {
+    suspend fun installNodeDB(mi: MyNodeEntity, nodes: List<NodeEntity>) = withContext(dispatchers.io) {
         nodeInfoDao.clearMyNodeInfo()
         nodeInfoDao.setMyNodeInfo(mi) // set MyNodeEntity first
         nodeInfoDao.clearNodeInfo()
         nodeInfoDao.putAll(nodes)
     }
 
-    suspend fun deleteNode(num: Int) = withContext(Dispatchers.IO) {
+    suspend fun deleteNode(num: Int) = withContext(dispatchers.io) {
         nodeInfoDao.deleteNode(num)
     }
 }
diff --git a/app/src/main/java/com/geeksville/mesh/database/PacketRepository.kt b/app/src/main/java/com/geeksville/mesh/database/PacketRepository.kt
index e4651b914..8e0a2b56e 100644
--- a/app/src/main/java/com/geeksville/mesh/database/PacketRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/PacketRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database
 
 import com.geeksville.mesh.DataPacket
diff --git a/app/src/main/java/com/geeksville/mesh/database/QuickChatActionRepository.kt b/app/src/main/java/com/geeksville/mesh/database/QuickChatActionRepository.kt
index 51cc750bf..917dd44e8 100644
--- a/app/src/main/java/com/geeksville/mesh/database/QuickChatActionRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/QuickChatActionRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database
 
 import com.geeksville.mesh.CoroutineDispatchers
diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/MeshLogDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/MeshLogDao.kt
index ae917b9fb..7f66d48af 100644
--- a/app/src/main/java/com/geeksville/mesh/database/dao/MeshLogDao.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/dao/MeshLogDao.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.dao
 
 import androidx.room.Dao
diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt
index b8361ee32..99bbb5be4 100644
--- a/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/dao/NodeInfoDao.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.dao
 
 import androidx.room.Dao
diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
index 80d0a56d0..e7ca27202 100644
--- a/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/dao/PacketDao.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.dao
 
 import androidx.room.Dao
diff --git a/app/src/main/java/com/geeksville/mesh/database/dao/QuickChatActionDao.kt b/app/src/main/java/com/geeksville/mesh/database/dao/QuickChatActionDao.kt
index 237696494..ef35d8cb7 100644
--- a/app/src/main/java/com/geeksville/mesh/database/dao/QuickChatActionDao.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/dao/QuickChatActionDao.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.dao
 
 import androidx.room.Dao
diff --git a/app/src/main/java/com/geeksville/mesh/database/entity/MeshLog.kt b/app/src/main/java/com/geeksville/mesh/database/entity/MeshLog.kt
index 73c92d3ee..5e69c8b4f 100644
--- a/app/src/main/java/com/geeksville/mesh/database/entity/MeshLog.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/entity/MeshLog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.entity
 
 import androidx.room.ColumnInfo
diff --git a/app/src/main/java/com/geeksville/mesh/database/entity/MyNodeEntity.kt b/app/src/main/java/com/geeksville/mesh/database/entity/MyNodeEntity.kt
index b14ccc309..4cddfe1fa 100644
--- a/app/src/main/java/com/geeksville/mesh/database/entity/MyNodeEntity.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/entity/MyNodeEntity.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.entity
 
 import androidx.room.Entity
diff --git a/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt b/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt
index b4d3e7d44..8cc47c742 100644
--- a/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/entity/NodeEntity.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.entity
 
 import android.graphics.Color
diff --git a/app/src/main/java/com/geeksville/mesh/database/entity/Packet.kt b/app/src/main/java/com/geeksville/mesh/database/entity/Packet.kt
index 3952519f1..4045ebf1c 100644
--- a/app/src/main/java/com/geeksville/mesh/database/entity/Packet.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/entity/Packet.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.entity
 
 import androidx.room.ColumnInfo
diff --git a/app/src/main/java/com/geeksville/mesh/database/entity/QuickChatAction.kt b/app/src/main/java/com/geeksville/mesh/database/entity/QuickChatAction.kt
index f4bb26619..717b5c411 100644
--- a/app/src/main/java/com/geeksville/mesh/database/entity/QuickChatAction.kt
+++ b/app/src/main/java/com/geeksville/mesh/database/entity/QuickChatAction.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.database.entity
 
 import androidx.room.ColumnInfo
diff --git a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
index 1eef56855..b091fa184 100644
--- a/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/BTScanModel.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import android.annotation.SuppressLint
diff --git a/app/src/main/java/com/geeksville/mesh/model/BluetoothViewModel.kt b/app/src/main/java/com/geeksville/mesh/model/BluetoothViewModel.kt
index 6562f41be..b65b9487a 100644
--- a/app/src/main/java/com/geeksville/mesh/model/BluetoothViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/BluetoothViewModel.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/geeksville/mesh/model/Channel.kt b/app/src/main/java/com/geeksville/mesh/model/Channel.kt
index 71407471c..a9c4dc061 100644
--- a/app/src/main/java/com/geeksville/mesh/model/Channel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/Channel.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import com.geeksville.mesh.ChannelProtos
diff --git a/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt b/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt
index 3f4418f0b..12500dbde 100644
--- a/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/ChannelOption.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import com.geeksville.mesh.ConfigProtos.Config.LoRaConfig
diff --git a/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt b/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt
index 3060b92be..fc8a76131 100644
--- a/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/ChannelSet.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import android.graphics.Bitmap
diff --git a/app/src/main/java/com/geeksville/mesh/model/DebugViewModel.kt b/app/src/main/java/com/geeksville/mesh/model/DebugViewModel.kt
index 4bca71eeb..38ed1423b 100644
--- a/app/src/main/java/com/geeksville/mesh/model/DebugViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/DebugViewModel.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import androidx.lifecycle.ViewModel
diff --git a/app/src/main/java/com/geeksville/mesh/model/DeviceVersion.kt b/app/src/main/java/com/geeksville/mesh/model/DeviceVersion.kt
index 09ba6fcf8..76f5e2070 100644
--- a/app/src/main/java/com/geeksville/mesh/model/DeviceVersion.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/DeviceVersion.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import com.geeksville.mesh.android.Logging
diff --git a/app/src/main/java/com/geeksville/mesh/model/Message.kt b/app/src/main/java/com/geeksville/mesh/model/Message.kt
index 02c959ed4..5551a513a 100644
--- a/app/src/main/java/com/geeksville/mesh/model/Message.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/Message.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import com.geeksville.mesh.MeshProtos
diff --git a/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt b/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
index 807962726..1a4be6f9f 100644
--- a/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/MetricsViewModel.kt
@@ -1,9 +1,28 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import android.app.Application
 import android.content.SharedPreferences
 import android.net.Uri
 import androidx.annotation.StringRes
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
 import androidx.lifecycle.SavedStateHandle
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.viewModelScope
@@ -18,17 +37,20 @@ import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.database.MeshLogRepository
 import com.geeksville.mesh.database.entity.MeshLog
+import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.model.map.CustomTileSource
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import com.geeksville.mesh.ui.Route
 import com.geeksville.mesh.ui.map.MAP_STYLE_ID
 import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.combine
 import kotlinx.coroutines.flow.distinctUntilChanged
 import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.mapLatest
 import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.flow.toList
 import kotlinx.coroutines.flow.update
@@ -46,6 +68,7 @@ data class MetricsState(
     val isManaged: Boolean = true,
     val isFahrenheit: Boolean = false,
     val displayUnits: DisplayUnits = DisplayUnits.METRIC,
+    val node: NodeEntity? = null,
     val deviceMetrics: List<Telemetry> = emptyList(),
     val environmentMetrics: List<Telemetry> = emptyList(),
     val signalMetrics: List<MeshPacket> = emptyList(),
@@ -99,6 +122,48 @@ enum class TimeFrame(
     } else {
         System.currentTimeMillis() / 1000 - this.seconds
     }
+
+    /**
+     * The time interval to draw the vertical lines representing
+     * time on the x-axis.
+     *
+     * @return seconds epoch seconds
+     */
+    fun lineInterval(): Long {
+        return when (this.ordinal) {
+            TWENTY_FOUR_HOURS.ordinal,
+            FORTY_EIGHT_HOURS.ordinal ->
+                TimeUnit.HOURS.toSeconds(1)
+            ONE_WEEK.ordinal,
+            TWO_WEEKS.ordinal ->
+                TimeUnit.DAYS.toSeconds(1)
+            else ->
+                TimeUnit.DAYS.toSeconds(7)
+        }
+    }
+
+    /**
+     * Calculates the needed [Dp] depending on the amount of time being plotted.
+     *
+     * @param time in seconds
+     */
+    fun dp(screenWidth: Int, time: Long): Dp {
+
+        val timePerScreen = when (this.ordinal) {
+            TWENTY_FOUR_HOURS.ordinal,
+            FORTY_EIGHT_HOURS.ordinal ->
+                TimeUnit.HOURS.toSeconds(1)
+            ONE_WEEK.ordinal,
+            TWO_WEEKS.ordinal ->
+                TimeUnit.DAYS.toSeconds(1)
+            else ->
+                TimeUnit.DAYS.toSeconds(7)
+        }
+
+        val multiplier = time / timePerScreen
+        val dp = (screenWidth * multiplier).toInt().dp
+        return dp.takeIf { it != 0.dp } ?: screenWidth.dp
+    }
 }
 
 private fun MeshPacket.hasValidSignal(): Boolean =
@@ -143,6 +208,13 @@ class MetricsViewModel @Inject constructor(
     val timeFrame: StateFlow<TimeFrame> = _timeFrame
 
     init {
+        @OptIn(ExperimentalCoroutinesApi::class)
+        radioConfigRepository.nodeDBbyNum
+            .mapLatest { nodes -> nodes[destNum] }
+            .distinctUntilChanged()
+            .onEach { node -> _state.update { state -> state.copy(node = node) } }
+            .launchIn(viewModelScope)
+
         radioConfigRepository.deviceProfileFlow.onEach { profile ->
             val moduleConfig = profile.moduleConfig
             _state.update { state ->
diff --git a/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt b/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt
index 70bca26e3..9ff528aee 100644
--- a/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/RadioConfigViewModel.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import android.app.Application
@@ -51,6 +68,7 @@ import javax.inject.Inject
  * Data class that represents the current RadioConfig state.
  */
 data class RadioConfigState(
+    val isLocal: Boolean = false,
     val connected: Boolean = false,
     val route: String = "",
     val metadata: MeshProtos.DeviceMetadata = MeshProtos.DeviceMetadata.getDefaultInstance(),
@@ -104,6 +122,10 @@ class RadioConfigViewModel @Inject constructor(
             }
         }.launchIn(viewModelScope)
 
+        radioConfigRepository.myNodeInfo.onEach { ni ->
+            _radioConfigState.update { it.copy(isLocal = destNum == null || destNum == ni?.myNodeNum) }
+        }.launchIn(viewModelScope)
+
         debug("RadioConfigViewModel created")
     }
 
diff --git a/app/src/main/java/com/geeksville/mesh/model/RouteDiscovery.kt b/app/src/main/java/com/geeksville/mesh/model/RouteDiscovery.kt
index 0459b3dac..2dc476080 100644
--- a/app/src/main/java/com/geeksville/mesh/model/RouteDiscovery.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/RouteDiscovery.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import com.geeksville.mesh.MeshProtos
diff --git a/app/src/main/java/com/geeksville/mesh/model/SortOption.kt b/app/src/main/java/com/geeksville/mesh/model/SortOption.kt
index 2adf7352f..4a3dfef89 100644
--- a/app/src/main/java/com/geeksville/mesh/model/SortOption.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/SortOption.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/com/geeksville/mesh/model/UIState.kt b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
index 00c052d01..6145c9006 100644
--- a/app/src/main/java/com/geeksville/mesh/model/UIState.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/UIState.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import android.app.Application
@@ -12,14 +29,27 @@ import androidx.lifecycle.MutableLiveData
 import androidx.lifecycle.ViewModel
 import androidx.lifecycle.asLiveData
 import androidx.lifecycle.viewModelScope
-import com.geeksville.mesh.*
+import com.geeksville.mesh.AppOnlyProtos
+import com.geeksville.mesh.ChannelProtos
 import com.geeksville.mesh.ChannelProtos.ChannelSettings
 import com.geeksville.mesh.ConfigProtos.Config
+import com.geeksville.mesh.DataPacket
+import com.geeksville.mesh.IMeshService
 import com.geeksville.mesh.LocalOnlyProtos.LocalConfig
 import com.geeksville.mesh.LocalOnlyProtos.LocalModuleConfig
 import com.geeksville.mesh.MeshProtos.MeshPacket
+import com.geeksville.mesh.MeshProtos
+import com.geeksville.mesh.Portnums
+import com.geeksville.mesh.Position
+import com.geeksville.mesh.R
 import com.geeksville.mesh.android.Logging
+import com.geeksville.mesh.channel
+import com.geeksville.mesh.channelSet
+import com.geeksville.mesh.channelSettings
+import com.geeksville.mesh.config
+import com.geeksville.mesh.copy
 import com.geeksville.mesh.database.MeshLogRepository
+import com.geeksville.mesh.database.NodeRepository
 import com.geeksville.mesh.database.PacketRepository
 import com.geeksville.mesh.database.QuickChatActionRepository
 import com.geeksville.mesh.database.entity.MyNodeEntity
@@ -30,7 +60,10 @@ import com.geeksville.mesh.database.entity.TapBack
 import com.geeksville.mesh.repository.datastore.RadioConfigRepository
 import com.geeksville.mesh.repository.radio.RadioInterfaceService
 import com.geeksville.mesh.service.MeshService
+import com.geeksville.mesh.service.ServiceAction
 import com.geeksville.mesh.ui.map.MAP_STYLE_ID
+import com.geeksville.mesh.util.getShortDate
+import com.geeksville.mesh.util.getShortDateTime
 import com.geeksville.mesh.util.positionToMeter
 import dagger.hilt.android.lifecycle.HiltViewModel
 import kotlinx.coroutines.Dispatchers
@@ -51,11 +84,8 @@ import kotlinx.coroutines.withContext
 import java.io.BufferedWriter
 import java.io.FileNotFoundException
 import java.io.FileWriter
-import java.text.DateFormat
 import java.text.SimpleDateFormat
-import java.util.Date
 import java.util.Locale
-import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 import kotlin.math.roundToInt
 
@@ -134,35 +164,11 @@ data class Contact(
     val isMuted: Boolean,
 )
 
-// return time if within 24 hours, otherwise date
-private fun getShortDate(time: Long): String? {
-    val date = if (time != 0L) Date(time) else return null
-    val isWithin24Hours = System.currentTimeMillis() - date.time <= TimeUnit.DAYS.toMillis(1)
-
-    return if (isWithin24Hours) {
-        DateFormat.getTimeInstance(DateFormat.SHORT).format(date)
-    } else {
-        DateFormat.getDateInstance(DateFormat.SHORT).format(date)
-    }
-}
-
-// return time if within 24 hours, otherwise date/time
-private fun getShortDateTime(time: Long): String {
-    val date = Date(time)
-    val isWithin24Hours = System.currentTimeMillis() - date.time <= TimeUnit.DAYS.toMillis(1)
-
-    return if (isWithin24Hours) {
-        DateFormat.getTimeInstance(DateFormat.SHORT).format(date)
-    } else {
-        DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(date)
-    }
-}
-
 @Suppress("LongParameterList")
 @HiltViewModel
 class UIViewModel @Inject constructor(
     private val app: Application,
-    private val nodeDB: NodeDB,
+    private val nodeDB: NodeRepository,
     private val radioConfigRepository: RadioConfigRepository,
     private val radioInterfaceService: RadioInterfaceService,
     private val meshLogRepository: MeshLogRepository,
@@ -191,9 +197,6 @@ class UIViewModel @Inject constructor(
     val quickChatActions get() = quickChatActionRepository.getAllActions()
         .stateIn(viewModelScope, SharingStarted.WhileSubscribed(5_000), emptyList())
 
-    private val _focusedNode = MutableStateFlow<NodeEntity?>(null)
-    val focusedNode: StateFlow<NodeEntity?> = _focusedNode
-
     private val nodeFilterText = MutableStateFlow("")
     private val nodeSortOption = MutableStateFlow(NodeSortOption.LAST_HEARD)
     private val includeUnknown = MutableStateFlow(preferences.getBoolean("include-unknown", false))
@@ -396,6 +399,12 @@ class UIViewModel @Inject constructor(
         }
     }
 
+    fun sendTapback(emoji: String, replyId: Int, contactKey: String) {
+        viewModelScope.launch {
+            radioConfigRepository.onServiceAction(ServiceAction.Tapback(emoji, replyId, contactKey))
+        }
+    }
+
     fun requestTraceroute(destNum: Int) {
         info("Requesting traceroute for '$destNum'")
         try {
@@ -467,8 +476,11 @@ class UIViewModel @Inject constructor(
     private val _requestChannelSet = MutableStateFlow<AppOnlyProtos.ChannelSet?>(null)
     val requestChannelSet: StateFlow<AppOnlyProtos.ChannelSet?> get() = _requestChannelSet
 
-    fun requestChannelSet(channelSet: AppOnlyProtos.ChannelSet) {
-        _requestChannelSet.value = channelSet
+    fun requestChannelUrl(url: Uri) = runCatching {
+        _requestChannelSet.value = url.toChannelSet()
+    }.onFailure { ex ->
+        errormsg("Channel url error: ${ex.message}")
+        showSnackbar(R.string.channel_invalid)
     }
 
     /**
@@ -727,11 +739,6 @@ class UIViewModel @Inject constructor(
         _currentTab.value = tab
     }
 
-    fun focusUserNode(node: NodeEntity?) {
-        _currentTab.value = 1
-        _focusedNode.value = node
-    }
-
     fun setNodeFilterText(text: String) {
         nodeFilterText.value = text
     }
diff --git a/app/src/main/java/com/geeksville/mesh/model/map/CustomTileSource.kt b/app/src/main/java/com/geeksville/mesh/model/map/CustomTileSource.kt
index c8892b82f..1a3c41080 100644
--- a/app/src/main/java/com/geeksville/mesh/model/map/CustomTileSource.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/map/CustomTileSource.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model.map
 
 import org.osmdroid.tileprovider.tilesource.ITileSource
diff --git a/app/src/main/java/com/geeksville/mesh/model/map/MarkerWithLabel.kt b/app/src/main/java/com/geeksville/mesh/model/map/MarkerWithLabel.kt
index 33b2ba00e..34ecdab8c 100644
--- a/app/src/main/java/com/geeksville/mesh/model/map/MarkerWithLabel.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/map/MarkerWithLabel.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model.map
 
 import android.graphics.Canvas
diff --git a/app/src/main/java/com/geeksville/mesh/model/map/NOAAWmsTileSource.kt b/app/src/main/java/com/geeksville/mesh/model/map/NOAAWmsTileSource.kt
index a99cf1f9b..b042cea36 100644
--- a/app/src/main/java/com/geeksville/mesh/model/map/NOAAWmsTileSource.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/map/NOAAWmsTileSource.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model.map
 
 import android.content.res.Resources
diff --git a/app/src/main/java/com/geeksville/mesh/model/map/OnlineTileSourceAuth.kt b/app/src/main/java/com/geeksville/mesh/model/map/OnlineTileSourceAuth.kt
index 1e4e37a39..37863e05a 100644
--- a/app/src/main/java/com/geeksville/mesh/model/map/OnlineTileSourceAuth.kt
+++ b/app/src/main/java/com/geeksville/mesh/model/map/OnlineTileSourceAuth.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model.map
 
 import org.osmdroid.tileprovider.tilesource.OnlineTileSourceBase
diff --git a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothBroadcastReceiver.kt b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothBroadcastReceiver.kt
index c7f8e1066..f4851852c 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothBroadcastReceiver.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothBroadcastReceiver.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.bluetooth
 
 import android.bluetooth.BluetoothAdapter
diff --git a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothDevice.kt b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothDevice.kt
index 6106fba29..4bdf48628 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothDevice.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothDevice.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.bluetooth
 
 import android.bluetooth.BluetoothDevice
diff --git a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothLeScanner.kt b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothLeScanner.kt
index 920f153c9..f1d87f376 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothLeScanner.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothLeScanner.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.bluetooth
 
 import android.bluetooth.le.BluetoothLeScanner
diff --git a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepository.kt
index ec4781edb..045bd917c 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.bluetooth
 
 import android.annotation.SuppressLint
diff --git a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepositoryModule.kt b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepositoryModule.kt
index 7974b9b31..9e37fbaae 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepositoryModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothRepositoryModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.bluetooth
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothState.kt b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothState.kt
index 95985f701..25f634f21 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothState.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/bluetooth/BluetoothState.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.bluetooth
 
 import android.bluetooth.BluetoothDevice
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetRepository.kt
index d1978340e..96c366d66 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import androidx.datastore.core.DataStore
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetSerializer.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetSerializer.kt
index 89cfcbc34..1a13a985e 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetSerializer.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/ChannelSetSerializer.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import androidx.datastore.core.CorruptionException
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/DataStoreModule.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/DataStoreModule.kt
index f979a6b3a..042cf224e 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/DataStoreModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/DataStoreModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import android.content.Context
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigRepository.kt
index 0d2ed409b..6adf3b8e1 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import androidx.datastore.core.DataStore
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigSerializer.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigSerializer.kt
index f210493d8..1c6d0456b 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigSerializer.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/LocalConfigSerializer.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import androidx.datastore.core.CorruptionException
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigRepository.kt
index 9f6d330ed..718e0ce2a 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import androidx.datastore.core.DataStore
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigSerializer.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigSerializer.kt
index 6aa516ab6..7434d5690 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigSerializer.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/ModuleConfigSerializer.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import androidx.datastore.core.CorruptionException
diff --git a/app/src/main/java/com/geeksville/mesh/repository/datastore/RadioConfigRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/datastore/RadioConfigRepository.kt
index 36d6dbb65..b50de2b1b 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/datastore/RadioConfigRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/datastore/RadioConfigRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.datastore
 
 import com.geeksville.mesh.AppOnlyProtos.ChannelSet
@@ -13,9 +30,10 @@ import com.geeksville.mesh.ModuleConfigProtos.ModuleConfig
 import com.geeksville.mesh.database.entity.MyNodeEntity
 import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.deviceProfile
-import com.geeksville.mesh.model.NodeDB
+import com.geeksville.mesh.database.NodeRepository
 import com.geeksville.mesh.model.getChannelUrl
 import com.geeksville.mesh.service.MeshService.ConnectionState
+import com.geeksville.mesh.service.ServiceAction
 import com.geeksville.mesh.service.ServiceRepository
 import kotlinx.coroutines.coroutineScope
 import kotlinx.coroutines.flow.Flow
@@ -30,7 +48,7 @@ import javax.inject.Inject
  */
 class RadioConfigRepository @Inject constructor(
     private val serviceRepository: ServiceRepository,
-    private val nodeDB: NodeDB,
+    private val nodeDB: NodeRepository,
     private val channelSetRepository: ChannelSetRepository,
     private val localConfigRepository: LocalConfigRepository,
     private val moduleConfigRepository: ModuleConfigRepository,
@@ -177,6 +195,12 @@ class RadioConfigRepository @Inject constructor(
         serviceRepository.emitMeshPacket(packet)
     }
 
+    val serviceAction: SharedFlow<ServiceAction> get() = serviceRepository.serviceAction
+
+    suspend fun onServiceAction(action: ServiceAction) = coroutineScope {
+        serviceRepository.onServiceAction(action)
+    }
+
     val tracerouteResponse: StateFlow<String?> get() = serviceRepository.tracerouteResponse
 
     fun setTracerouteResponse(value: String?) {
diff --git a/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepository.kt
index 9cd064814..f4f65fc20 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.location
 
 import android.Manifest.permission.ACCESS_COARSE_LOCATION
diff --git a/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepositoryModule.kt b/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepositoryModule.kt
index c11ddfeb8..b4244ed6c 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepositoryModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/location/LocationRepositoryModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.location
 
 import android.content.Context
diff --git a/app/src/main/java/com/geeksville/mesh/repository/network/ConnectivityManager.kt b/app/src/main/java/com/geeksville/mesh/repository/network/ConnectivityManager.kt
index 2d868333f..e694a2608 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/network/ConnectivityManager.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/network/ConnectivityManager.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.network
 
 import android.net.ConnectivityManager
diff --git a/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt
index 72fa7d0b0..00f9911f2 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/network/MQTTRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.network
 
 import com.geeksville.mesh.MeshProtos.MqttClientProxyMessage
diff --git a/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepository.kt
index f7caee6c3..d1ec20c28 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.network
 
 import android.net.ConnectivityManager
diff --git a/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepositoryModule.kt b/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepositoryModule.kt
index 59908eb5b..684fe7197 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepositoryModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/network/NetworkRepositoryModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.network
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/repository/network/NsdManager.kt b/app/src/main/java/com/geeksville/mesh/repository/network/NsdManager.kt
index 76bbdab89..cc567cf5f 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/network/NsdManager.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/network/NsdManager.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.network
 
 import android.net.nsd.NsdManager
diff --git a/app/src/main/java/com/geeksville/mesh/repository/network/TrustAllX509TrustManager.kt b/app/src/main/java/com/geeksville/mesh/repository/network/TrustAllX509TrustManager.kt
index 1783d7617..e04e6a761 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/network/TrustAllX509TrustManager.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/network/TrustAllX509TrustManager.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.network
 
 import android.annotation.SuppressLint
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterface.kt
index 31a85d851..5b23e2ca4 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterface.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt
index 8c0ce5912..5600e0064 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceFactory.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import dagger.assisted.AssistedFactory
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceSpec.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceSpec.kt
index 1ed16ddb1..ea7a49480 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceSpec.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterfaceSpec.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import com.geeksville.mesh.android.Logging
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/IRadioInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/IRadioInterface.kt
index e60b7804e..011f958f5 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/IRadioInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/IRadioInterface.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import java.io.Closeable
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactory.kt
index 2845675ed..00194d763 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactory.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactory.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import javax.inject.Inject
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactorySpi.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactorySpi.kt
index 320b06c1a..10c51c85f 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactorySpi.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactorySpi.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 /**
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceId.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceId.kt
index 20f70f695..bc7768ab1 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceId.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceId.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 /**
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceMapKey.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceMapKey.kt
index c8cd5d1be..bed983263 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceMapKey.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceMapKey.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import dagger.MapKey
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceSpec.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceSpec.kt
index 91bc8b296..93cea38da 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceSpec.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceSpec.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 /**
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt
index 5b0dd3e60..486f2148b 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import com.geeksville.mesh.*
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt
index 0ad9c6317..4dd2703c4 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceFactory.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import dagger.assisted.AssistedFactory
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceSpec.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceSpec.kt
index e726464fb..bb50e77d0 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceSpec.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/MockInterfaceSpec.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import javax.inject.Inject
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterface.kt
index a9be7cee1..5e9391030 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterface.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import dagger.assisted.Assisted
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt
index 07ef9cdf7..461689e57 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceFactory.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import dagger.assisted.AssistedFactory
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceSpec.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceSpec.kt
index e711e8841..6749e31f9 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceSpec.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/NopInterfaceSpec.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import javax.inject.Inject
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt
index 3f36f614f..2b629cd69 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryModule.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryModule.kt
index ba1821739..971cf528b 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryQualifier.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryQualifier.kt
index 223d83b30..b8d3a120e 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryQualifier.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioRepositoryQualifier.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import javax.inject.Qualifier
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioServiceConnectionState.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioServiceConnectionState.kt
index 1bf3f723c..280c69be0 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioServiceConnectionState.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioServiceConnectionState.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 data class RadioServiceConnectionState(
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterface.kt
index 54fbf3dca..417547b97 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterface.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import com.geeksville.mesh.android.Logging
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt
index 076c09b21..33f4261e7 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceFactory.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import dagger.assisted.AssistedFactory
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceSpec.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceSpec.kt
index 620b6012c..98c96142a 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceSpec.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterfaceSpec.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import android.hardware.usb.UsbManager
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/StreamInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/StreamInterface.kt
index 9e947ddcb..168133280 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/StreamInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/StreamInterface.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import com.geeksville.mesh.android.Logging
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt
index bfe56d010..02ee89cab 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import com.geeksville.mesh.android.Logging
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt
index ff359d1fe..27b28a2ee 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceFactory.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import dagger.assisted.AssistedFactory
diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceSpec.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceSpec.kt
index 651699b6a..66e318f5c 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceSpec.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterfaceSpec.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.radio
 
 import javax.inject.Inject
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/ProbeTableProvider.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/ProbeTableProvider.kt
index 602a9498d..99394e740 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/ProbeTableProvider.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/ProbeTableProvider.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 import com.hoho.android.usbserial.driver.CdcAcmSerialDriver
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnection.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnection.kt
index 906d86dee..3f2be5f98 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnection.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnection.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 /**
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionImpl.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionImpl.kt
index 70641934f..f2039017e 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionImpl.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionImpl.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 import android.hardware.usb.UsbManager
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionListener.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionListener.kt
index 38266c342..be8591e3c 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionListener.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/SerialConnectionListener.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 /**
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbBroadcastReceiver.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbBroadcastReceiver.kt
index fafeed7c2..b3862f5d1 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbBroadcastReceiver.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbBroadcastReceiver.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 import android.content.BroadcastReceiver
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbManager.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbManager.kt
index a3faabf6b..c04c7fae4 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbManager.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbManager.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 import android.content.BroadcastReceiver
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepository.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepository.kt
index 0d3b863d0..bada8f43a 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepositoryModule.kt b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepositoryModule.kt
index ebd616d60..ecff33535 100644
--- a/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepositoryModule.kt
+++ b/app/src/main/java/com/geeksville/mesh/repository/usb/UsbRepositoryModule.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.repository.usb
 
 import android.app.Application
diff --git a/app/src/main/java/com/geeksville/mesh/service/BLEException.kt b/app/src/main/java/com/geeksville/mesh/service/BLEException.kt
index 68f7c6c4d..dfa4e70a0 100644
--- a/app/src/main/java/com/geeksville/mesh/service/BLEException.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/BLEException.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import java.io.IOException
diff --git a/app/src/main/java/com/geeksville/mesh/service/BootCompleteReceiver.kt b/app/src/main/java/com/geeksville/mesh/service/BootCompleteReceiver.kt
index 089c574e7..08661e3a4 100644
--- a/app/src/main/java/com/geeksville/mesh/service/BootCompleteReceiver.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/BootCompleteReceiver.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import android.content.BroadcastReceiver
diff --git a/app/src/main/java/com/geeksville/mesh/service/Constants.kt b/app/src/main/java/com/geeksville/mesh/service/Constants.kt
index 3b99c917a..e105a9ee0 100644
--- a/app/src/main/java/com/geeksville/mesh/service/Constants.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/Constants.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 const val prefix = "com.geeksville.mesh"
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 9a3c6ff51..3a791ca2b 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import android.annotation.SuppressLint
@@ -59,6 +76,10 @@ import java.util.concurrent.TimeoutException
 import javax.inject.Inject
 import kotlin.math.absoluteValue
 
+sealed class ServiceAction {
+    data class Tapback(val emoji: String, val replyId: Int, val contactKey: String) : ServiceAction()
+}
+
 /**
  * Handles all the communication with android apps.  Also keeps an internal model
  * of the network state.
@@ -280,6 +301,11 @@ class MeshService : Service(), Logging {
             .launchIn(serviceScope)
         radioConfigRepository.channelSetFlow.onEach { channelSet = it }
             .launchIn(serviceScope)
+        radioConfigRepository.serviceAction.onEach { action ->
+            when (action) {
+                is ServiceAction.Tapback -> sendTapback(action)
+            }
+        }.launchIn(serviceScope)
 
         loadSettings() // Load our last known node DB
 
@@ -425,7 +451,6 @@ class MeshService : Service(), Logging {
     }
 
     private val hexIdRegex = """\!([0-9A-Fa-f]+)""".toRegex()
-    private val rangeTestRegex = Regex("seq (\\d{1,10})")
 
     // Map a userid to a node/ node num, or throw an exception if not found
     // We prefer to find nodes based on their assigned IDs, but if no ID has been assigned to a node, we can also find it based on node number
@@ -672,16 +697,6 @@ class MeshService : Service(), Logging {
 
                 when (data.portnumValue) {
                     Portnums.PortNum.TEXT_MESSAGE_APP_VALUE -> {
-                        if (data.emoji != 0) {
-                            rememberTapBack(data)
-                            return
-                        }
-                        if (fromUs) return
-
-                        // TODO temporary solution to Range Test spam, may be removed in the future
-                        val isRangeTest = rangeTestRegex.matches(data.payload.toStringUtf8())
-                        if (!moduleConfig.rangeTest.enabled && isRangeTest) return
-
                         debug("Received CLEAR_TEXT from $fromId")
                         rememberDataPacket(dataPacket)
                     }
@@ -693,7 +708,6 @@ class MeshService : Service(), Logging {
                         rememberDataPacket(dataPacket, u.expire > currentSecond())
                     }
 
-                    // Handle new style position info
                     Portnums.PortNum.POSITION_APP_VALUE -> {
                         val u = MeshProtos.Position.parseFrom(data.payload)
                         // debug("position_app ${packet.from} ${u.toOneLineString()}")
@@ -704,7 +718,6 @@ class MeshService : Service(), Logging {
                         }
                     }
 
-                    // Handle new style user info
                     Portnums.PortNum.NODEINFO_APP_VALUE ->
                         if (!fromUs) {
                             val u = MeshProtos.User.parseFrom(data.payload).copy {
@@ -1743,6 +1756,21 @@ class MeshService : Service(), Logging {
         }
     }
 
+    private fun sendTapback(tapback: ServiceAction.Tapback) = toRemoteExceptions {
+        // contactKey: unique contact key filter (channel)+(nodeId)
+        val channel = tapback.contactKey[0].digitToInt()
+        val destNum = tapback.contactKey.substring(1)
+
+        sendToRadio(newMeshPacketTo(destNum).buildMeshPacket(
+            channel = channel,
+            priority = MeshPacket.Priority.BACKGROUND,
+        ) {
+            replyId = tapback.replyId
+            portnumValue = Portnums.PortNum.TEXT_MESSAGE_APP_VALUE
+            payload = ByteString.copyFrom(tapback.emoji.encodeToByteArray())
+        })
+    }
+
     private val binder = object : IMeshService.Stub() {
 
         override fun setDeviceAddress(deviceAddr: String?) = toRemoteExceptions {
diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshServiceBroadcasts.kt b/app/src/main/java/com/geeksville/mesh/service/MeshServiceBroadcasts.kt
index 585cfaecf..9a1ddd3bc 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceBroadcasts.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceBroadcasts.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import android.content.Context
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 4a6392e7f..554ad0262 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceNotifications.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import android.app.Notification
@@ -18,10 +35,7 @@ import com.geeksville.mesh.R
 import com.geeksville.mesh.TelemetryProtos.LocalStats
 import com.geeksville.mesh.android.notificationManager
 import com.geeksville.mesh.database.entity.NodeEntity
-import com.geeksville.mesh.util.PendingIntentCompat
-import java.text.SimpleDateFormat
-import java.util.Date
-import java.util.Locale
+import com.geeksville.mesh.util.formatUptime
 
 @Suppress("TooManyFunctions")
 class MeshServiceNotifications(
@@ -32,8 +46,6 @@ class MeshServiceNotifications(
         private const val FIFTEEN_MINUTES_IN_MILLIS = 15L * 60 * 1000
         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 OPEN_MESSAGE_EXTRA_CONTACT_NAME =
-            "com.geeksville.mesh.OPEN_MESSAGE_EXTRA_CONTACT_NAME"
     }
 
     private val notificationManager: NotificationManager get() = context.notificationManager
@@ -133,37 +145,29 @@ class MeshServiceNotifications(
         }
     }
 
-    private fun formatStatsString(stats: LocalStats?, currentStatsUpdatedAtMillis: Long?): String {
-        val updatedAt = "Next update at: ${
-            currentStatsUpdatedAtMillis?.let {
-                val date = Date(it + FIFTEEN_MINUTES_IN_MILLIS) // Add 15 minutes in milliseconds
-                val dateFormat = SimpleDateFormat("yyyy-MM-dd HH:mm:ss", Locale.getDefault())
-                dateFormat.format(date)
-            } ?: "???"
-        }"
-        val statsJoined = stats?.allFields?.mapNotNull { (k, v) ->
-            if (k.name == "num_online_nodes" || k.name == "num_total_nodes") {
-                return@mapNotNull null
-            }
-            "${
+    private fun LocalStats?.formatToString(): String = this?.allFields?.mapNotNull { (k, v) ->
+        when (k.name) {
+            "num_online_nodes", "num_total_nodes" -> return@mapNotNull null
+            "uptime_seconds" -> "Uptime: ${formatUptime(v as Int)}"
+            "channel_utilization" -> "ChUtil: %.2f%%".format(v)
+            "air_util_tx" -> "AirUtilTX: %.2f%%".format(v)
+            else -> "${
                 k.name.replace('_', ' ').split(" ")
                     .joinToString(" ") { it.replaceFirstChar { char -> char.uppercase() } }
-            }=$v"
-        }?.joinToString("\n") ?: "No Local Stats"
-        return "$updatedAt\n$statsJoined"
-    }
+            }: $v"
+        }
+    }?.joinToString("\n") ?: "No Local Stats"
 
     fun updateServiceStateNotification(
         summaryString: String? = null,
         localStats: LocalStats? = null,
         currentStatsUpdatedAtMillis: Long? = null,
     ) {
-        val statsString = formatStatsString(localStats, currentStatsUpdatedAtMillis)
         notificationManager.notify(
             notifyId,
             createServiceStateNotification(
                 name = summaryString.orEmpty(),
-                message = statsString,
+                message = localStats.formatToString(),
                 nextUpdateAt = currentStatsUpdatedAtMillis?.plus(FIFTEEN_MINUTES_IN_MILLIS)
             )
         )
@@ -187,21 +191,20 @@ class MeshServiceNotifications(
             context,
             0,
             Intent(context, MainActivity::class.java),
-            PendingIntentCompat.FLAG_IMMUTABLE
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )
     }
 
-    private fun openMessageIntent(contactKey: String, contactName: String): PendingIntent {
+    private fun openMessageIntent(contactKey: String): PendingIntent {
         val intent = Intent(context, MainActivity::class.java)
         intent.action = OPEN_MESSAGE_ACTION
         intent.putExtra(OPEN_MESSAGE_EXTRA_CONTACT_KEY, contactKey)
-        intent.putExtra(OPEN_MESSAGE_EXTRA_CONTACT_NAME, contactName)
 
         val pendingIntent = PendingIntent.getActivity(
             context,
             0,
             intent,
-            PendingIntentCompat.FLAG_IMMUTABLE
+            PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
         )
         return pendingIntent
     }
@@ -271,7 +274,7 @@ class MeshServiceNotifications(
         }
         val person = Person.Builder().setName(name).build()
         with(messageNotificationBuilder) {
-            setContentIntent(openMessageIntent(contactKey, name))
+            setContentIntent(openMessageIntent(contactKey))
             priority = NotificationCompat.PRIORITY_DEFAULT
             setCategory(Notification.CATEGORY_MESSAGE)
             setAutoCancel(true)
diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshServiceStarter.kt b/app/src/main/java/com/geeksville/mesh/service/MeshServiceStarter.kt
index ce7a2d0a1..55ed71be4 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshServiceStarter.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshServiceStarter.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import android.app.ForegroundServiceStartNotAllowedException
diff --git a/app/src/main/java/com/geeksville/mesh/service/RadioNotConnectedException.kt b/app/src/main/java/com/geeksville/mesh/service/RadioNotConnectedException.kt
index 21454800d..68d66fc75 100644
--- a/app/src/main/java/com/geeksville/mesh/service/RadioNotConnectedException.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/RadioNotConnectedException.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 open class RadioNotConnectedException(message: String = "Not connected to radio") :
diff --git a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
index 39a478528..4dbc4f771 100644
--- a/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/SafeBluetooth.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import android.bluetooth.*
diff --git a/app/src/main/java/com/geeksville/mesh/service/ServiceRepository.kt b/app/src/main/java/com/geeksville/mesh/service/ServiceRepository.kt
index c1fea6773..db08b64d0 100644
--- a/app/src/main/java/com/geeksville/mesh/service/ServiceRepository.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/ServiceRepository.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import com.geeksville.mesh.IMeshService
@@ -68,4 +85,11 @@ class ServiceRepository @Inject constructor() : Logging {
     fun clearTracerouteResponse() {
         setTracerouteResponse(null)
     }
+
+    private val _serviceAction = MutableSharedFlow<ServiceAction>()
+    val serviceAction: SharedFlow<ServiceAction> get() = _serviceAction
+
+    suspend fun onServiceAction(action: ServiceAction) {
+        _serviceAction.emit(action)
+    }
 }
diff --git a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
index 16ac63e59..71d0a7c67 100644
--- a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.service
 
 import android.bluetooth.BluetoothGattCharacteristic
diff --git a/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt
index 102ec4f64..ef5e7cc68 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/BatteryInfo.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import androidx.compose.foundation.layout.Row
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
index 5e815e306..7072d9d58 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ChannelFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.net.Uri
@@ -125,7 +142,6 @@ fun ChannelScreen(
 ) {
     val context = LocalContext.current
     val focusManager = LocalFocusManager.current
-    val clipboardManager = LocalClipboardManager.current
 
     val connectionState by viewModel.connectionState.collectAsStateWithLifecycle()
     val enabled = connectionState == MeshService.ConnectionState.CONNECTED && !viewModel.isManaged
@@ -138,22 +154,21 @@ fun ChannelScreen(
     /* Holds selections made by the user for QR generation. */
     val channelSelections = rememberSaveable(
         saver = listSaver(
-            save = { stateList -> stateList.toList() },
+            save = { it.toList() },
             restore = { it.toMutableStateList() }
         )
     ) { mutableStateListOf(elements = Array(size = 8, init = { true })) }
 
-    val channelUrl = channelSet.getChannelUrl()
+    val selectedChannelSet = channelSet.copy {
+        val result = settings.filterIndexed { i, _ -> channelSelections.getOrNull(i) == true }
+        settings.clear()
+        settings.addAll(result)
+    }
     val modemPresetName = Channel(loraConfig = channelSet.loraConfig).name
 
     val barcodeLauncher = rememberLauncherForActivityResult(ScanContract()) { result ->
         if (result.contents != null) {
-            try {
-                viewModel.requestChannelSet(Uri.parse(result.contents).toChannelSet())
-            } catch (ex: Throwable) {
-                errormsg("Channel url error: ${ex.message}")
-                viewModel.showSnackbar(R.string.channel_invalid)
-            }
+            viewModel.requestChannelUrl(Uri.parse(result.contents))
         }
     }
 
@@ -340,64 +355,10 @@ fun ChannelScreen(
         }
 
         item {
-            var valueState by remember(channelUrl) { mutableStateOf(channelUrl) }
-            val isError = valueState != channelUrl
-
-            OutlinedTextField(
-                value = valueState.toString(),
-                onValueChange = {
-                    try {
-                        valueState = Uri.parse(it)
-                        channelSet = valueState.toChannelSet()
-                    } catch (ex: Throwable) {
-                        // channelSet failed to update, isError true
-                    }
-                },
-                modifier = Modifier.fillMaxWidth(),
+            EditChannelUrl(
                 enabled = enabled,
-                label = { Text("URL") },
-                isError = isError,
-                trailingIcon = {
-                    val isUrlEqual = channelUrl == channels.getChannelUrl()
-                    IconButton(onClick = {
-                        when {
-                            isError -> valueState = channelUrl
-                            !isUrlEqual -> viewModel.requestChannelSet(channels)
-                            else -> {
-                                // track how many times users share channels
-                                GeeksvilleApplication.analytics.track(
-                                    "share",
-                                    DataPair("content_type", "channel")
-                                )
-                                clipboardManager.setText(AnnotatedString(channelUrl.toString()))
-                            }
-                        }
-                    }) {
-                        Icon(
-                            imageVector = when {
-                                isError -> Icons.TwoTone.Close
-                                !isUrlEqual -> Icons.TwoTone.Check
-                                else -> Icons.TwoTone.ContentCopy
-                            },
-                            contentDescription = when {
-                                isError -> "Error"
-                                !isUrlEqual -> stringResource(R.string.send)
-                                else -> "Copy"
-                            },
-                            tint = if (isError) {
-                                MaterialTheme.colors.error
-                            } else {
-                                LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
-                            }
-                        )
-                    }
-                },
-                maxLines = 1,
-                singleLine = true,
-                keyboardOptions = KeyboardOptions.Default.copy(
-                    keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done
-                ),
-                keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
+                channelUrl = selectedChannelSet.getChannelUrl(),
+                onConfirm = viewModel::requestChannelUrl
             )
         }
 
@@ -413,21 +374,20 @@ fun ChannelScreen(
                 })
         }
 
-        if (isEditing) item {
-            PreferenceFooter(
-                enabled = enabled,
-                onCancelClicked = {
-                    focusManager.clearFocus()
-                    showChannelEditor = false
-                    channelSet = channels
-                },
-                onSaveClicked = {
-                    focusManager.clearFocus()
-                    // viewModel.setRequestChannelUrl(channelUrl)
-                    sendButton()
-                })
-        } else {
-            item {
+        item {
+            if (isEditing) {
+                PreferenceFooter(
+                    enabled = enabled,
+                    onCancelClicked = {
+                        focusManager.clearFocus()
+                        showChannelEditor = false
+                        channelSet = channels
+                    },
+                    onSaveClicked = {
+                        focusManager.clearFocus()
+                        sendButton()
+                    })
+            } else {
                 PreferenceFooter(
                     enabled = enabled,
                     negativeText = R.string.reset,
@@ -438,7 +398,6 @@ fun ChannelScreen(
                     positiveText = R.string.scan,
                     onPositiveClicked = {
                         focusManager.clearFocus()
-                        // viewModel.setRequestChannelUrl(channelUrl)
                         if (context.hasCameraPermission()) zxingScan() else requestPermissionAndScan()
                     })
             }
@@ -446,6 +405,83 @@ fun ChannelScreen(
     }
 }
 
+@Suppress("LongMethod")
+@Composable
+private fun EditChannelUrl(
+    enabled: Boolean,
+    channelUrl: Uri,
+    modifier: Modifier = Modifier,
+    onConfirm: (Uri) -> Unit
+) {
+    val focusManager = LocalFocusManager.current
+    val clipboardManager = LocalClipboardManager.current
+
+    var valueState by remember(channelUrl) { mutableStateOf(channelUrl) }
+    var isError by remember { mutableStateOf(false) }
+
+    OutlinedTextField(
+        value = valueState.toString(),
+        onValueChange = {
+            isError = runCatching {
+                valueState = Uri.parse(it)
+                valueState.toChannelSet()
+            }.isFailure
+        },
+        modifier = modifier.fillMaxWidth(),
+        enabled = enabled,
+        label = { Text("URL") },
+        isError = isError,
+        trailingIcon = {
+            val isUrlEqual = valueState == channelUrl
+            IconButton(onClick = {
+                when {
+                    isError -> {
+                        isError = false
+                        valueState = channelUrl
+                    }
+
+                    !isUrlEqual -> {
+                        onConfirm(valueState)
+                        valueState = channelUrl
+                    }
+
+                    else -> {
+                        // track how many times users share channels
+                        GeeksvilleApplication.analytics.track(
+                            "share", DataPair("content_type", "channel")
+                        )
+                        clipboardManager.setText(AnnotatedString(valueState.toString()))
+                    }
+                }
+            }) {
+                Icon(
+                    imageVector = when {
+                        isError -> Icons.TwoTone.Close
+                        !isUrlEqual -> Icons.TwoTone.Check
+                        else -> Icons.TwoTone.ContentCopy
+                    },
+                    contentDescription = when {
+                        isError -> stringResource(R.string.share)
+                        !isUrlEqual -> stringResource(R.string.send)
+                        else -> stringResource(R.string.share)
+                    },
+                    tint = if (isError) {
+                        MaterialTheme.colors.error
+                    } else {
+                        LocalContentColor.current.copy(alpha = LocalContentAlpha.current)
+                    }
+                )
+            }
+        },
+        maxLines = 1,
+        singleLine = true,
+        keyboardOptions = KeyboardOptions.Default.copy(
+            keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done
+        ),
+        keyboardActions = KeyboardActions(onDone = { focusManager.clearFocus() }),
+    )
+}
+
 @Composable
 private fun QrCodeImage(
     enabled: Boolean,
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ContactItem.kt b/app/src/main/java/com/geeksville/mesh/ui/ContactItem.kt
index 30c3176af..b4b63baa0 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ContactItem.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ContactItem.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import androidx.compose.animation.AnimatedVisibility
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
index af9762b89..06cc1fca1 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.os.Bundle
@@ -53,7 +70,7 @@ class ContactsFragment : ScreenFragment("Messages"), Logging {
             onLongClick(contact)
         } else {
             debug("calling MessagesFragment filter:${contact.contactKey}")
-            parentFragmentManager.navigateToMessages(contact.contactKey, contact.longName)
+            parentFragmentManager.navigateToMessages(contact.contactKey)
         }
     }
 
@@ -109,7 +126,6 @@ class ContactsFragment : ScreenFragment("Messages"), Logging {
     private inner class ActionModeCallback : ActionMode.Callback {
         override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
             mode.menuInflater.inflate(R.menu.menu_messages, menu)
-            menu.findItem(R.id.resendButton).isVisible = false
             mode.title = "1"
             return true
         }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt
index e5f55454b..0f4e8e641 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/DebugFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.os.Bundle
diff --git a/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt
index a9200362b..ec400ed86 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/LastHeardInfo.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt b/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt
index 4b6250fa9..90cd9109b 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/LinkedCoordinates.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.content.ActivityNotFoundException
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessageItem.kt b/app/src/main/java/com/geeksville/mesh/ui/MessageItem.kt
index 00e3cf841..61b2eaee5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessageItem.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessageItem.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import androidx.compose.animation.AnimatedVisibility
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessageListView.kt b/app/src/main/java/com/geeksville/mesh/ui/MessageListView.kt
index d3695e722..187987390 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessageListView.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessageListView.kt
@@ -1,5 +1,23 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.LazyListState
@@ -7,6 +25,7 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
 import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -24,13 +43,13 @@ import kotlinx.coroutines.flow.debounce
 @Composable
 internal fun MessageListView(
     messages: List<Message>,
-    selectedList: List<Message>,
-    onClick: (Message) -> Unit,
-    onLongClick: (Message) -> Unit,
-    onChipClick: (Message) -> Unit,
+    selectedIds: MutableState<Set<Long>>,
     onUnreadChanged: (Long) -> Unit,
     onSendTapBack: (String, Int) -> Unit,
+    contentPadding: PaddingValues,
+    onClick: (Message) -> Unit = {}
 ) {
+    val inSelectionMode by remember { derivedStateOf { selectedIds.value.isNotEmpty() } }
     val listState = rememberLazyListState(
         initialFirstVisibleItemIndex = messages.indexOfLast { !it.read }.coerceAtLeast(0)
     )
@@ -44,14 +63,20 @@ internal fun MessageListView(
         SimpleAlertDialog(title = title, text = text) { showStatusDialog = null }
     }
 
+    fun toggle(uuid: Long) = if (selectedIds.value.contains(uuid)) {
+        selectedIds.value -= uuid
+    } else {
+        selectedIds.value += uuid
+    }
+
     LazyColumn(
         modifier = Modifier.fillMaxSize(),
         state = listState,
         reverseLayout = true,
-        // contentPadding = PaddingValues(8.dp)
+        contentPadding = contentPadding
     ) {
         items(messages, key = { it.uuid }) { msg ->
-            val selected by remember { derivedStateOf { selectedList.contains(msg) } }
+            val selected by remember { derivedStateOf { selectedIds.value.contains(msg.uuid) } }
 
             MessageItem(
                 shortName = msg.user.shortName.takeIf { msg.user.id != DataPacket.ID_LOCAL },
diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
index 68da77093..56a99b825 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -1,45 +1,103 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.os.Bundle
 import android.view.LayoutInflater
-import android.view.Menu
-import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import androidx.appcompat.app.AppCompatActivity
-import androidx.appcompat.view.ActionMode
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyRow
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.AlertDialog
+import androidx.compose.material.Button
+import androidx.compose.material.ButtonDefaults
+import androidx.compose.material.Icon
+import androidx.compose.material.IconButton
+import androidx.compose.material.MaterialTheme
+import androidx.compose.material.Scaffold
+import androidx.compose.material.Text
+import androidx.compose.material.TextButton
+import androidx.compose.material.TextField
+import androidx.compose.material.TextFieldDefaults
+import androidx.compose.material.TopAppBar
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.automirrored.filled.Send
+import androidx.compose.material.icons.filled.ContentCopy
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.SelectAll
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.derivedStateOf
 import androidx.compose.runtime.getValue
-import androidx.compose.runtime.toMutableStateList
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.scale
+import androidx.compose.ui.focus.onFocusEvent
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.platform.LocalClipboardManager
+import androidx.compose.ui.platform.ViewCompositionStrategy
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.pluralStringResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.AnnotatedString
+import androidx.compose.ui.text.TextRange
+import androidx.compose.ui.text.input.TextFieldValue
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.PreviewLightDark
+import androidx.compose.ui.unit.dp
 import androidx.core.content.ContextCompat
 import androidx.core.os.bundleOf
-import androidx.core.view.allViews
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.fragment.app.activityViewModels
-import androidx.lifecycle.Lifecycle
-import androidx.lifecycle.asLiveData
+import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import androidx.lifecycle.lifecycleScope
-import androidx.lifecycle.repeatOnLifecycle
 import com.geeksville.mesh.DataPacket
-import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.R
+import com.geeksville.mesh.android.Logging
 import com.geeksville.mesh.database.entity.QuickChatAction
-import com.geeksville.mesh.databinding.MessagesFragmentBinding
-import com.geeksville.mesh.model.Message
 import com.geeksville.mesh.model.UIViewModel
 import com.geeksville.mesh.model.getChannel
+import com.geeksville.mesh.ui.components.NodeKeyStatusIcon
 import com.geeksville.mesh.ui.theme.AppTheme
-import com.geeksville.mesh.util.Utf8ByteLengthFilter
-import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import dagger.hilt.android.AndroidEntryPoint
-import kotlinx.coroutines.flow.firstOrNull
 import kotlinx.coroutines.launch
 
-internal fun FragmentManager.navigateToMessages(contactKey: String, contactName: String) {
+internal fun FragmentManager.navigateToMessages(contactKey: String, message: String = "") {
     val messagesFragment = MessagesFragment().apply {
-        arguments = bundleOf("contactKey" to contactKey, "contactName" to contactName)
+        arguments = bundleOf("contactKey" to contactKey, "message" to message)
     }
     beginTransaction()
         .add(R.id.mainActivityLayout, messagesFragment)
@@ -49,246 +107,345 @@ internal fun FragmentManager.navigateToMessages(contactKey: String, contactName:
 
 @AndroidEntryPoint
 class MessagesFragment : Fragment(), Logging {
-
-    private val actionModeCallback: ActionModeCallback = ActionModeCallback()
-    private var actionMode: ActionMode? = null
-    private var _binding: MessagesFragmentBinding? = null
-
-    // This property is only valid between onCreateView and onDestroyView.
-    private val binding get() = _binding!!
-
     private val model: UIViewModel by activityViewModels()
 
-    private lateinit var contactKey: String
-
-    private val selectedList = emptyList<Message>().toMutableStateList()
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        val contactKey = arguments?.getString("contactKey").toString()
+        val message = arguments?.getString("message").toString()
 
-    private fun onClick(message: Message) {
-        if (actionMode != null) {
-            onLongClick(message)
+        return ComposeView(requireContext()).apply {
+            setViewCompositionStrategy(ViewCompositionStrategy.DisposeOnViewTreeLifecycleDestroyed)
+            setBackgroundColor(ContextCompat.getColor(context, R.color.colorAdvancedBackground))
+            setContent {
+                AppTheme {
+                    MessageScreen(
+                        contactKey = contactKey,
+                        message = message,
+                        viewModel = model,
+                    ) { parentFragmentManager.popBackStack() }
+                }
+            }
         }
     }
+}
 
-    private fun onLongClick(message: Message) {
-        if (actionMode == null) {
-            actionMode = (activity as AppCompatActivity).startSupportActionMode(actionModeCallback)
-        }
-        selectedList.apply {
-            if (contains(message)) remove(message) else add(message)
-        }
-        if (selectedList.isEmpty()) {
-            // finish action mode when no items selected
-            actionMode?.finish()
-        } else {
-            // show total items selected on action mode title
-            actionMode?.title = selectedList.size.toString()
-        }
-    }
+sealed class MessageMenuAction {
+    data object ClipboardCopy : MessageMenuAction()
+    data object Delete : MessageMenuAction()
+    data object Dismiss : MessageMenuAction()
+    data object SelectAll : MessageMenuAction()
+}
 
-    override fun onPause() {
-        actionMode?.finish()
-        super.onPause()
-    }
+@Suppress("LongMethod", "CyclomaticComplexMethod")
+@Composable
+internal fun MessageScreen(
+    contactKey: String,
+    message: String,
+    viewModel: UIViewModel = hiltViewModel(),
+    onNavigateBack: () -> Unit
+) {
+    val coroutineScope = rememberCoroutineScope()
+    val clipboardManager = LocalClipboardManager.current
 
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        _binding = MessagesFragmentBinding.inflate(inflater, container, false)
-        return binding.root
+    val channelIndex = contactKey[0].digitToIntOrNull()
+    val nodeId = contactKey.substring(1)
+    val channelName = channelIndex?.let { viewModel.channels.value.getChannel(it)?.name }
+        ?: "Unknown Channel"
+
+    val title = when (nodeId) {
+        DataPacket.ID_BROADCAST -> channelName
+        else -> viewModel.getUser(nodeId).longName
     }
 
-    @Suppress("LongMethod", "CyclomaticComplexMethod")
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
+//    if (channelIndex != DataPacket.PKC_CHANNEL_INDEX && nodeId != DataPacket.ID_BROADCAST) {
+//        subtitle = "(ch: $channelIndex - $channelName)"
+//    }
 
-        binding.toolbar.setNavigationOnClickListener {
-            parentFragmentManager.popBackStack()
-        }
+    val selectedIds = rememberSaveable { mutableStateOf(emptySet<Long>()) }
+    val inSelectionMode by remember { derivedStateOf { selectedIds.value.isNotEmpty() } }
 
-        contactKey = arguments?.getString("contactKey").toString()
-        val contactName = arguments?.getString("contactName").toString()
-        binding.toolbar.title = contactName
-        val channelNumber = contactKey[0].digitToIntOrNull()
-        if (channelNumber == DataPacket.PKC_CHANNEL_INDEX) {
-            binding.toolbar.title = "$contactName🔒"
-        } else if (channelNumber != null && contactKey.substring(1) != DataPacket.ID_BROADCAST) {
-            lifecycleScope.launch {
-                repeatOnLifecycle(Lifecycle.State.STARTED) {
-                    model.channels.collect { channels ->
-                        val channelName =
-                            channels.getChannel(channelNumber)?.name ?: "Unknown Channel"
-                        val subtitle = "(ch: $channelNumber - $channelName)"
-                        binding.toolbar.subtitle = subtitle
-                    }
-                }
-            }
-        }
+    val connState by viewModel.connectionState.collectAsStateWithLifecycle()
+    val quickChat by viewModel.quickChatActions.collectAsStateWithLifecycle()
+    val messages by viewModel.getMessagesFrom(contactKey).collectAsStateWithLifecycle(listOf())
 
-        fun sendMessageInputText() {
-            val str = binding.messageInputText.text.toString().trim()
-            if (str.isNotEmpty()) {
-                model.sendMessage(str, contactKey)
-            }
-            binding.messageInputText.setText("") // blow away the string the user just entered
-            // requireActivity().hideKeyboard()
-        }
+    val messageInput = rememberSaveable(stateSaver = TextFieldValue.Saver) {
+        mutableStateOf(TextFieldValue(message))
+    }
 
-        binding.sendButton.setOnClickListener {
-            debug("User clicked sendButton")
-            sendMessageInputText()
-        }
+    var showDeleteDialog by remember { mutableStateOf(false) }
+    if (showDeleteDialog) {
+        DeleteMessageDialog(
+            size = selectedIds.value.size,
+            onConfirm = {
+                viewModel.deleteMessages(selectedIds.value.toList())
+                selectedIds.value = emptySet()
+                showDeleteDialog = false
+            },
+            onDismiss = { showDeleteDialog = false }
+        )
+    }
 
-        // max payload length should be 237 bytes but anything over 235 bytes crashes the radio
-        binding.messageInputText.filters += Utf8ByteLengthFilter(234)
+    Scaffold(
+        topBar = {
+            if (inSelectionMode) {
+                ActionModeTopBar(selectedIds.value) { action ->
+                    when (action) {
+                        MessageMenuAction.ClipboardCopy -> coroutineScope.launch {
+                            val copiedText = messages
+                                .filter { it.uuid in selectedIds.value }
+                                .joinToString("\n") { it.text }
 
-        binding.messageListView.setContent {
-            val messages by model.getMessagesFrom(contactKey).collectAsStateWithLifecycle(listOf())
+                            clipboardManager.setText(AnnotatedString(copiedText))
+                            selectedIds.value = emptySet()
+                        }
 
-            AppTheme {
-                if (messages.isNotEmpty()) {
-                    MessageListView(
-                        messages = messages,
-                        selectedList = selectedList,
-                        onClick = ::onClick,
-                        onLongClick = ::onLongClick,
-                        onChipClick = ::openNodeInfo,
-                        onUnreadChanged = { model.clearUnreadCount(contactKey, it) },
-                        onSendTapBack = { emoji, messageId ->
-                            model.sendTapBack(emoji, messageId, contactKey)
+                        MessageMenuAction.Delete -> {
+                            showDeleteDialog = true
                         }
-                    )
-                }
-            }
-        }
 
-        // If connection state _OR_ myID changes we have to fix our ability to edit outgoing messages
-        model.connectionState.asLiveData().observe(viewLifecycleOwner) {
-            // If we don't know our node ID and we are offline don't let user try to send
-            val isConnected = model.isConnected()
-            binding.textInputLayout.isEnabled = isConnected
-            binding.sendButton.isEnabled = isConnected
-            for (subView: View in binding.quickChatLayout.allViews) {
-                if (subView is Button) {
-                    subView.isEnabled = isConnected
+                        MessageMenuAction.Dismiss -> selectedIds.value = emptySet()
+                        MessageMenuAction.SelectAll -> {
+                            if (selectedIds.value.size == messages.size) {
+                                selectedIds.value = emptySet()
+                            } else {
+                                selectedIds.value = messages.map { it.uuid }.toSet()
+                            }
+                        }
+                    }
                 }
+            } else {
+                MessageTopBar(title, channelIndex, onNavigateBack)
             }
-        }
-
-        model.quickChatActions.asLiveData().observe(viewLifecycleOwner) { actions ->
-            actions?.let {
-                // This seems kinda hacky it might be better to replace with a recycler view
-                binding.quickChatLayout.removeAllViews()
-                for (action in actions) {
-                    val button = Button(context)
-                    button.text = action.name
-                    button.isEnabled = model.isConnected()
-                    if (action.mode == QuickChatAction.Mode.Instant) {
-                        button.backgroundTintList =
-                            ContextCompat.getColorStateList(requireActivity(), R.color.colorMyMsg)
-                    }
-                    button.setOnClickListener {
-                        if (action.mode == QuickChatAction.Mode.Append) {
-                            val originalText = binding.messageInputText.text ?: ""
-                            val needsSpace =
-                                !originalText.endsWith(' ') && originalText.isNotEmpty()
-                            val newText = buildString {
-                                append(originalText)
-                                if (needsSpace) append(' ')
-                                append(action.message)
-                            }
-                            binding.messageInputText.setText(newText)
-                            binding.messageInputText.setSelection(newText.length)
-                        } else {
-                            model.sendMessage(action.message, contactKey)
+        },
+        bottomBar = {
+            val isConnected = connState.isConnected()
+            Column(
+                modifier = Modifier
+                    .background(MaterialTheme.colors.background)
+                    .padding(start = 8.dp, end = 8.dp, bottom = 4.dp),
+            ) {
+                QuickChatRow(isConnected, quickChat) { action ->
+                    if (action.mode == QuickChatAction.Mode.Append) {
+                        val originalText = messageInput.value.text
+                        val needsSpace = !originalText.endsWith(' ') && originalText.isNotEmpty()
+                        val newText = buildString {
+                            append(originalText)
+                            if (needsSpace) append(' ')
+                            append(action.message)
                         }
+                        messageInput.value = TextFieldValue(newText, TextRange(newText.length))
+                    } else {
+                        viewModel.sendMessage(action.message, contactKey)
                     }
-                    binding.quickChatLayout.addView(button)
                 }
+                TextInput(isConnected, messageInput) { viewModel.sendMessage(it, contactKey) }
+            }
+        }
+    ) { innerPadding ->
+        if (messages.isNotEmpty()) {
+            MessageListView(
+                messages = messages,
+                selectedIds = selectedIds,
+                onUnreadChanged = { viewModel.clearUnreadCount(contactKey, it) },
+                contentPadding = innerPadding
+            ) {
+                // TODO onCLick()
             }
         }
     }
+}
 
-    override fun onDestroyView() {
-        super.onDestroyView()
-        actionMode?.finish()
-        actionMode = null
-        _binding = null
-    }
+@Composable
+private fun DeleteMessageDialog(
+    size: Int,
+    onConfirm: () -> Unit = {},
+    onDismiss: () -> Unit = {},
+) {
+    val deleteMessagesString = pluralStringResource(R.plurals.delete_messages, size, size)
 
-    private inner class ActionModeCallback : ActionMode.Callback {
-        override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
-            mode.menuInflater.inflate(R.menu.menu_messages, menu)
-            menu.findItem(R.id.muteButton).isVisible = false
-            mode.title = "1"
-            return true
+    AlertDialog(
+        onDismissRequest = onDismiss,
+        shape = RoundedCornerShape(16.dp),
+        backgroundColor = MaterialTheme.colors.background,
+        text = {
+            Text(
+                text = deleteMessagesString,
+                modifier = Modifier.fillMaxWidth(),
+                textAlign = TextAlign.Center,
+            )
+        },
+        confirmButton = {
+            TextButton(onClick = onConfirm) {
+                Text(stringResource(R.string.delete))
+            }
+        },
+        dismissButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.cancel))
+            }
         }
+    )
+}
 
-        override fun onPrepareActionMode(mode: ActionMode, menu: Menu): Boolean {
-            return false
+@Composable
+private fun ActionModeTopBar(
+    selectedList: Set<Long>,
+    onAction: (MessageMenuAction) -> Unit,
+) = TopAppBar(
+    title = { Text(text = selectedList.size.toString()) },
+    navigationIcon = {
+        IconButton(onClick = { onAction(MessageMenuAction.Dismiss) }) {
+            Icon(
+                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                contentDescription = stringResource(id = R.string.clear),
+            )
+        }
+    },
+    actions = {
+        IconButton(onClick = { onAction(MessageMenuAction.ClipboardCopy) }) {
+            Icon(
+                imageVector = Icons.Default.ContentCopy,
+                contentDescription = stringResource(id = R.string.copy)
+            )
+        }
+        IconButton(onClick = { onAction(MessageMenuAction.Delete) }) {
+            Icon(
+                imageVector = Icons.Default.Delete,
+                contentDescription = stringResource(id = R.string.delete)
+            )
         }
+        IconButton(onClick = { onAction(MessageMenuAction.SelectAll) }) {
+            Icon(
+                imageVector = Icons.Default.SelectAll,
+                contentDescription = stringResource(id = R.string.select_all)
+            )
+        }
+    },
+    backgroundColor = MaterialTheme.colors.primary,
+)
 
-        override fun onActionItemClicked(mode: ActionMode, item: MenuItem): Boolean {
-            when (item.itemId) {
-                R.id.deleteButton -> {
-                    val deleteMessagesString = resources.getQuantityString(
-                        R.plurals.delete_messages,
-                        selectedList.size,
-                        selectedList.size
-                    )
-                    MaterialAlertDialogBuilder(requireContext())
-                        .setMessage(deleteMessagesString)
-                        .setPositiveButton(getString(R.string.delete)) { _, _ ->
-                            debug("User clicked deleteButton")
-                            model.deleteMessages(selectedList.map { it.uuid })
-                            mode.finish()
-                        }
-                        .setNeutralButton(R.string.cancel) { _, _ ->
-                        }
-                        .show()
-                }
-                R.id.selectAllButton -> lifecycleScope.launch {
-                    model.getMessagesFrom(contactKey).firstOrNull()?.let { messages ->
-                        if (selectedList.size == messages.size) {
-                            // if all selected -> unselect all
-                            selectedList.clear()
-                            mode.finish()
-                        } else {
-                            // else --> select all
-                            selectedList.clear()
-                            selectedList.addAll(messages)
-                        }
-                        actionMode?.title = selectedList.size.toString()
-                    }
-                }
+@Composable
+private fun MessageTopBar(
+    title: String,
+    channelIndex: Int?,
+    onNavigateBack: () -> Unit
+) = TopAppBar(
+    title = { Text(text = title) },
+    navigationIcon = {
+        IconButton(onClick = onNavigateBack) {
+            Icon(
+                imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                contentDescription = stringResource(id = R.string.navigate_back),
+            )
+        }
+    },
+    actions = {
+        if (channelIndex == DataPacket.PKC_CHANNEL_INDEX) {
+            NodeKeyStatusIcon(hasPKC = true, mismatchKey = false)
+        }
+    }
+)
 
-                R.id.resendButton -> lifecycleScope.launch {
-                    debug("User clicked resendButton")
-                    var resendText = ""
-                    selectedList.forEach {
-                        resendText = resendText + it.text + System.lineSeparator()
-                    }
-                    if (resendText != "") {
-                        resendText = resendText.substring(0, resendText.length - 1)
-                    }
-                    binding.messageInputText.setText(resendText)
-                    mode.finish()
-                }
+@Composable
+private fun QuickChatRow(
+    enabled: Boolean,
+    actions: List<QuickChatAction>,
+    modifier: Modifier = Modifier,
+    onClick: (QuickChatAction) -> Unit
+) {
+    LazyRow(
+        modifier = modifier,
+    ) {
+        items(actions, key = { it.uuid }) { action ->
+            Button(
+                onClick = { onClick(action) },
+                modifier = Modifier.padding(horizontal = 4.dp),
+                enabled = enabled,
+                colors = ButtonDefaults.buttonColors(
+                    backgroundColor = colorResource(id = R.color.colorMyMsg),
+                )
+            ) {
+                Text(
+                    text = action.name,
+                )
             }
-            return true
         }
+    }
+}
 
-        override fun onDestroyActionMode(mode: ActionMode) {
-            selectedList.clear()
-            actionMode = null
+@Composable
+private fun TextInput(
+    enabled: Boolean,
+    message: MutableState<TextFieldValue>,
+    modifier: Modifier = Modifier,
+    maxSize: Int = 200,
+    onClick: (String) -> Unit = {}
+) = Column(modifier) {
+    var isFocused by remember { mutableStateOf(false) }
+
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        TextField(
+            value = message.value,
+            onValueChange = {
+                if (it.text.toByteArray().size <= maxSize) {
+                    message.value = it
+                }
+            },
+            modifier = Modifier
+                .weight(1f)
+                .onFocusEvent { isFocused = it.isFocused },
+            enabled = enabled,
+            placeholder = { Text(stringResource(id = R.string.send_text)) },
+            maxLines = 3,
+            shape = RoundedCornerShape(24.dp),
+            colors = TextFieldDefaults.textFieldColors(
+                focusedIndicatorColor = Color.Transparent,
+                unfocusedIndicatorColor = Color.Transparent,
+            )
+        )
+        Spacer(Modifier.width(8.dp))
+        Button(
+            onClick = {
+                if (message.value.text.isNotEmpty()) {
+                    onClick(message.value.text)
+                    message.value = TextFieldValue("")
+                }
+            },
+            modifier = Modifier.size(48.dp),
+            enabled = enabled,
+            shape = CircleShape,
+        ) {
+            Icon(
+                imageVector = Icons.AutoMirrored.Default.Send,
+                contentDescription = stringResource(id = R.string.send_text),
+                modifier = Modifier.scale(scale = 1.5f),
+            )
         }
     }
+    if (isFocused) {
+        Text(
+            text = "${message.value.text.toByteArray().size}/$maxSize",
+            style = MaterialTheme.typography.caption,
+            modifier = Modifier
+                .align(Alignment.End)
+                .padding(top = 4.dp, end = 72.dp)
+        )
+    }
+}
 
-    private fun openNodeInfo(msg: Message) = lifecycleScope.launch {
-        model.nodeList.firstOrNull()?.find { it.user.id == msg.user.id }?.let { node ->
-            parentFragmentManager.popBackStack()
-            model.focusUserNode(node)
-        }
+@PreviewLightDark
+@Composable
+private fun TextInputPreview() {
+    AppTheme {
+        TextInput(
+            enabled = true,
+            message = remember { mutableStateOf(TextFieldValue("")) },
+        )
     }
 }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/NavGraph.kt b/app/src/main/java/com/geeksville/mesh/ui/NavGraph.kt
index 38994f8a9..11dc1baf6 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/NavGraph.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/NavGraph.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.os.Bundle
@@ -56,7 +73,6 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.rememberNavController
 import com.geeksville.mesh.R
 import com.geeksville.mesh.android.Logging
-import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.model.MetricsViewModel
 import com.geeksville.mesh.model.RadioConfigViewModel
 import com.geeksville.mesh.ui.components.DeviceMetricsScreen
@@ -146,8 +162,6 @@ class NavGraphFragment : ScreenFragment("NavGraph"), Logging {
                         }
                     ) { innerPadding ->
                         NavGraph(
-                            node = node,
-                            viewModel = model,
                             navController = navController,
                             startDestination = startDestination,
                             modifier = Modifier.padding(innerPadding),
@@ -167,6 +181,9 @@ enum class AdminRoute(@StringRes val title: Int) {
 }
 
 sealed interface Route {
+    @Serializable
+    data class Messages(val contactKey: String, val message: String = "") : Route
+
     @Serializable
     data class RadioConfig(val destNum: Int? = null) : Route
     @Serializable data object User : Route
@@ -273,8 +290,6 @@ private fun MeshAppBar(
 @Suppress("LongMethod")
 @Composable
 fun NavGraph(
-    node: NodeEntity?,
-    viewModel: RadioConfigViewModel = hiltViewModel(),
     navController: NavHostController = rememberNavController(),
     startDestination: Any,
     modifier: Modifier = Modifier,
@@ -285,9 +300,7 @@ fun NavGraph(
         modifier = modifier,
     ) {
         composable<Route.NodeDetail> {
-            NodeDetailScreen(
-                node = node,
-            ) { navController.navigate(route = it) }
+            NodeDetailScreen { navController.navigate(route = it) }
         }
         composable<Route.DeviceMetrics> {
             val parentEntry = remember { navController.getBackStackEntry<Route.NodeDetail>() }
@@ -314,79 +327,99 @@ fun NavGraph(
             TracerouteLogScreen(hiltViewModel<MetricsViewModel>(parentEntry))
         }
         composable<Route.RadioConfig> {
-            RadioConfigScreen(
-                node = node,
-                viewModel = viewModel,
-            ) { navController.navigate(route = it) }
+            RadioConfigScreen { navController.navigate(route = it) }
         }
         composable<Route.User> {
-            UserConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            UserConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Channels> {
-            ChannelConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            ChannelConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Device> {
-            DeviceConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            DeviceConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Position> {
-            PositionConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            PositionConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Power> {
-            PowerConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            PowerConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Network> {
-            NetworkConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            NetworkConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Display> {
-            DisplayConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            DisplayConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.LoRa> {
-            LoRaConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            LoRaConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Bluetooth> {
-            BluetoothConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            BluetoothConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Security> {
-            SecurityConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            SecurityConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.MQTT> {
-            MQTTConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            MQTTConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Serial> {
-            SerialConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            SerialConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.ExtNotification> {
-            ExternalNotificationConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            ExternalNotificationConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.StoreForward> {
-            StoreForwardConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            StoreForwardConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.RangeTest> {
-            RangeTestConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            RangeTestConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Telemetry> {
-            TelemetryConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            TelemetryConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.CannedMessage> {
-            CannedMessageConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            CannedMessageConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Audio> {
-            AudioConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            AudioConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.RemoteHardware> {
-            RemoteHardwareConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            RemoteHardwareConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.NeighborInfo> {
-            NeighborInfoConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            NeighborInfoConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.AmbientLighting> {
-            AmbientLightingConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            AmbientLightingConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.DetectionSensor> {
-            DetectionSensorConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            DetectionSensorConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
         composable<Route.Paxcounter> {
-            PaxcounterConfigScreen(viewModel)
+            val parentEntry = remember { navController.getBackStackEntry<Route.RadioConfig>() }
+            PaxcounterConfigScreen(hiltViewModel<RadioConfigViewModel>(parentEntry))
         }
     }
 }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt b/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt
index bd01aff4b..fd179a690 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/NodeDetail.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 @file:Suppress("TooManyFunctions")
 
 package com.geeksville.mesh.ui
@@ -31,8 +48,10 @@ import androidx.compose.material.icons.filled.BlurOn
 import androidx.compose.material.icons.filled.Bolt
 import androidx.compose.material.icons.filled.ChargingStation
 import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.Height
 import androidx.compose.material.icons.filled.History
 import androidx.compose.material.icons.filled.KeyOff
+import androidx.compose.material.icons.filled.LightMode
 import androidx.compose.material.icons.filled.LocationOn
 import androidx.compose.material.icons.filled.Map
 import androidx.compose.material.icons.filled.Numbers
@@ -40,16 +59,19 @@ import androidx.compose.material.icons.filled.Person
 import androidx.compose.material.icons.filled.Power
 import androidx.compose.material.icons.filled.Route
 import androidx.compose.material.icons.filled.Router
+import androidx.compose.material.icons.filled.Scale
 import androidx.compose.material.icons.filled.Settings
 import androidx.compose.material.icons.filled.SignalCellularAlt
 import androidx.compose.material.icons.filled.Speed
 import androidx.compose.material.icons.filled.Thermostat
 import androidx.compose.material.icons.filled.WaterDrop
 import androidx.compose.material.icons.filled.Work
+import androidx.compose.material.icons.outlined.Navigation
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
@@ -60,6 +82,7 @@ import androidx.compose.ui.tooling.preview.PreviewParameter
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.geeksville.mesh.ConfigProtos.Config.DisplayConfig.DisplayUnits
 import com.geeksville.mesh.R
 import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.model.MetricsState
@@ -67,20 +90,22 @@ import com.geeksville.mesh.model.MetricsViewModel
 import com.geeksville.mesh.ui.components.PreferenceCategory
 import com.geeksville.mesh.ui.preview.NodeEntityPreviewParameterProvider
 import com.geeksville.mesh.ui.theme.AppTheme
+import com.geeksville.mesh.util.DistanceUnit
 import com.geeksville.mesh.util.formatAgo
-import java.util.concurrent.TimeUnit
+import com.geeksville.mesh.util.formatUptime
+import com.geeksville.mesh.util.thenIf
 import kotlin.math.ln
 
 @Composable
 fun NodeDetailScreen(
-    node: NodeEntity?,
     viewModel: MetricsViewModel = hiltViewModel(),
     modifier: Modifier = Modifier,
     onNavigate: (Any) -> Unit,
 ) {
     val state by viewModel.state.collectAsStateWithLifecycle()
 
-    if (node != null) {
+    if (state.node != null) {
+        val node = state.node ?: return
         NodeDetailList(
             node = node,
             metricsState = state,
@@ -282,6 +307,7 @@ private fun InfoCard(
     icon: ImageVector,
     text: String,
     value: String,
+    rotateIcon: Float = 0f,
 ) {
     Card(
         shape = RoundedCornerShape(12.dp),
@@ -299,7 +325,9 @@ private fun InfoCard(
             Icon(
                 imageVector = icon,
                 contentDescription = text,
-                modifier = Modifier.size(24.dp),
+                modifier = Modifier
+                    .size(24.dp)
+                    .thenIf(rotateIcon != 0f) { rotate(rotateIcon) },
             )
             Text(
                 text = text,
@@ -311,30 +339,18 @@ private fun InfoCard(
                 text = value,
                 maxLines = 1,
                 overflow = TextOverflow.Ellipsis,
-                style = MaterialTheme.typography.h5
+                style = if (value.length < 7) {
+                    MaterialTheme.typography.h5
+                } else {
+                    MaterialTheme.typography.h6
+                },
             )
         }
     }
 }
 
-private fun formatUptime(seconds: Int): String = formatUptime(seconds.toLong())
-
-private fun formatUptime(seconds: Long): String {
-    val days = TimeUnit.SECONDS.toDays(seconds)
-    val hours = TimeUnit.SECONDS.toHours(seconds) % TimeUnit.DAYS.toHours(1)
-    val minutes = TimeUnit.SECONDS.toMinutes(seconds) % TimeUnit.HOURS.toMinutes(1)
-    val secs = seconds % TimeUnit.MINUTES.toSeconds(1)
-
-    return listOfNotNull(
-        "${days}d".takeIf { days > 0 },
-        "${hours}h".takeIf { hours > 0 },
-        "${minutes}m".takeIf { minutes > 0 },
-        "${secs}s".takeIf { secs > 0 },
-    ).joinToString(" ")
-}
-
 @OptIn(ExperimentalLayoutApi::class)
-@Suppress("LongMethod")
+@Suppress("LongMethod", "CyclomaticComplexMethod")
 @Composable
 private fun EnvironmentMetrics(
     node: NodeEntity,
@@ -402,6 +418,37 @@ private fun EnvironmentMetrics(
                 value = iaq.toString()
             )
         }
+        if (distance != 0f) {
+            InfoCard(
+                icon = Icons.Default.Height,
+                text = "Distance",
+                value = "%.0f mm".format(distance)
+            )
+        }
+        if (lux != 0f) {
+            InfoCard(
+                icon = Icons.Default.LightMode,
+                text = "Lux",
+                value = "%.0f".format(lux)
+            )
+        }
+        if (hasWindSpeed()) {
+            @Suppress("MagicNumber")
+            val normalizedBearing = (windDirection % 360 + 360) % 360
+            InfoCard(
+                icon = Icons.Outlined.Navigation,
+                text = "Wind",
+                value = windSpeed.toSpeedString(),
+                rotateIcon = normalizedBearing.toFloat(),
+            )
+        }
+        if (weight != 0f) {
+            InfoCard(
+                icon = Icons.Default.Scale,
+                text = "Weight",
+                value = "%.2f kg".format(weight)
+            )
+        }
     }
 }
 
@@ -413,6 +460,12 @@ private fun Float.toTempString(isFahrenheit: Boolean) = if (isFahrenheit) {
     "%.0f°C".format(this)
 }
 
+@Suppress("MagicNumber")
+private fun Float.toSpeedString() = when (DistanceUnit.getFromLocale()) {
+    DisplayUnits.METRIC -> "%.0f km/h".format(this * 3.6)
+    else -> "%.0f mph".format(this * 2.23694f)
+}
+
 // Magnus-Tetens approximation
 @Suppress("MagicNumber")
 private fun calculateDewPoint(tempCelsius: Float, humidity: Float): Float {
diff --git a/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt b/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt
index 23bb0c5fd..4fdc64d7d 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/NodeItem.kt
@@ -1,11 +1,22 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
-import androidx.compose.animation.animateColorAsState
-import androidx.compose.animation.core.FastOutSlowInEasing
-import androidx.compose.animation.core.RepeatMode
-import androidx.compose.animation.core.repeatable
-import androidx.compose.animation.core.tween
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -52,7 +63,7 @@ import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.ui.components.MenuItemAction
 import com.geeksville.mesh.ui.components.NodeKeyStatusIcon
 import com.geeksville.mesh.ui.components.NodeMenu
-import com.geeksville.mesh.ui.components.SimpleAlertDialog
+import com.geeksville.mesh.ui.components.SignalInfo
 import com.geeksville.mesh.ui.compose.ElevationInfo
 import com.geeksville.mesh.ui.compose.SatelliteCountInfo
 import com.geeksville.mesh.ui.preview.NodeEntityPreviewParameterProvider
@@ -70,7 +81,6 @@ fun NodeItem(
     tempInFahrenheit: Boolean,
     ignoreIncomingList: List<Int> = emptyList(),
     menuItemActionClicked: (MenuItemAction) -> Unit = {},
-    blinking: Boolean = false,
     expanded: Boolean = false,
     currentTimeMillis: Long,
     isConnected: Boolean = false,
@@ -95,16 +105,6 @@ fun NodeItem(
         thatNode.user.role.name
     }
 
-    val bgColor by animateColorAsState(
-        targetValue = if (blinking) Color(color = 0x33FFFFFF) else Color.Transparent,
-        animationSpec = repeatable(
-            iterations = 6,
-            animation = tween(durationMillis = 250, easing = FastOutSlowInEasing),
-            repeatMode = RepeatMode.Reverse
-        ),
-        label = "blinking node"
-    )
-
     val style = if (thatNode.isUnknownUser) {
         LocalTextStyle.current.copy(fontStyle = FontStyle.Italic)
     } else {
@@ -113,16 +113,6 @@ fun NodeItem(
 
     val (detailsShown, showDetails) = remember { mutableStateOf(expanded) }
 
-    var showEncryptionDialog by remember { mutableStateOf(false) }
-    if (showEncryptionDialog) {
-        val (title, text) = when {
-            thatNode.mismatchKey -> R.string.encryption_error to R.string.encryption_error_text
-            thatNode.hasPKC -> R.string.encryption_pkc to R.string.encryption_pkc_text
-            else -> R.string.encryption_psk to R.string.encryption_psk_text
-        }
-        SimpleAlertDialog(title, text) { showEncryptionDialog = false }
-    }
-
     Card(
         modifier = Modifier
             .fillMaxWidth()
@@ -135,8 +125,7 @@ fun NodeItem(
             Column(
                 modifier = Modifier
                     .fillMaxWidth()
-                    .padding(8.dp)
-                    .background(bgColor),
+                    .padding(8.dp),
             ) {
                 Row(
                     modifier = Modifier
@@ -182,7 +171,7 @@ fun NodeItem(
                         hasPKC = thatNode.hasPKC,
                         mismatchKey = thatNode.mismatchKey,
                         modifier = Modifier.size(32.dp)
-                    ) { showEncryptionDialog = true }
+                    )
                     Text(
                         modifier = Modifier.weight(1f),
                         text = longName,
@@ -218,8 +207,9 @@ fun NodeItem(
                 Row(
                     modifier = Modifier.fillMaxWidth(),
                     horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
                 ) {
-                    signalInfo(
+                    SignalInfo(
                         node = thatNode,
                         isThisNode = isThisNode
                     )
diff --git a/app/src/main/java/com/geeksville/mesh/ui/QuickChatSettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/QuickChatSettingsFragment.kt
index 7557f2c8b..6dd1869f8 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/QuickChatSettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/QuickChatSettingsFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.os.Bundle
diff --git a/app/src/main/java/com/geeksville/mesh/ui/RadioConfigScreen.kt b/app/src/main/java/com/geeksville/mesh/ui/RadioConfigScreen.kt
index 063e2ba3b..1a1ca7eb7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/RadioConfigScreen.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/RadioConfigScreen.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.app.Activity
@@ -17,8 +34,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.wrapContentSize
-import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.AlertDialog
 import androidx.compose.material.Button
@@ -48,7 +65,6 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.ClientOnlyProtos.DeviceProfile
 import com.geeksville.mesh.R
-import com.geeksville.mesh.database.entity.NodeEntity
 import com.geeksville.mesh.model.RadioConfigViewModel
 import com.geeksville.mesh.ui.components.PreferenceCategory
 import com.geeksville.mesh.ui.components.config.EditDeviceProfileDialog
@@ -62,12 +78,10 @@ private fun getNavRouteFrom(routeName: String): Any? {
 @Suppress("LongMethod", "CyclomaticComplexMethod")
 @Composable
 fun RadioConfigScreen(
-    node: NodeEntity?,
     viewModel: RadioConfigViewModel = hiltViewModel(),
     modifier: Modifier = Modifier,
     onNavigate: (Any) -> Unit = {}
 ) {
-    val isLocal = node?.num == viewModel.myNodeNum
     val state by viewModel.radioConfigState.collectAsStateWithLifecycle()
     var isWaiting by remember { mutableStateOf(false) }
 
@@ -123,7 +137,7 @@ fun RadioConfigScreen(
                     val intent = Intent(Intent.ACTION_CREATE_DOCUMENT).apply {
                         addCategory(Intent.CATEGORY_OPENABLE)
                         type = "application/*"
-                        putExtra(Intent.EXTRA_TITLE, "${node!!.num.toUInt()}.cfg")
+                        putExtra(Intent.EXTRA_TITLE, "device_profile.cfg")
                     }
                     exportConfigLauncher.launch(intent)
                 }
@@ -137,7 +151,7 @@ fun RadioConfigScreen(
 
     RadioConfigItemList(
         enabled = state.connected && !isWaiting,
-        isLocal = isLocal,
+        isLocal = state.isLocal,
         modifier = modifier,
         onRouteClick = { route ->
             isWaiting = true
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt
index 21798b848..ac8271d0f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ScreenFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import androidx.fragment.app.Fragment
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
index eba5c78f7..0bd04085f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.net.InetAddresses
diff --git a/app/src/main/java/com/geeksville/mesh/ui/ShareFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ShareFragment.kt
new file mode 100644
index 000000000..529cf388e
--- /dev/null
+++ b/app/src/main/java/com/geeksville/mesh/ui/ShareFragment.kt
@@ -0,0 +1,128 @@
+package com.geeksville.mesh.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.fragment.app.FragmentManager
+import androidx.fragment.app.activityViewModels
+import androidx.lifecycle.compose.collectAsStateWithLifecycle
+import com.geeksville.mesh.android.Logging
+import com.geeksville.mesh.R
+import com.geeksville.mesh.databinding.ShareFragmentBinding
+import com.geeksville.mesh.model.Contact
+import com.geeksville.mesh.model.UIViewModel
+import com.geeksville.mesh.ui.theme.AppTheme
+import dagger.hilt.android.AndroidEntryPoint
+
+internal fun FragmentManager.navigateToShareMessage(message: String) {
+    val shareFragment = ShareFragment().apply {
+        arguments = bundleOf("message" to message)
+    }
+    beginTransaction()
+        .add(R.id.mainActivityLayout, shareFragment)
+        .addToBackStack(null)
+        .commit()
+}
+
+@AndroidEntryPoint
+class ShareFragment : ScreenFragment("Messages"), Logging {
+
+    private val model: UIViewModel by activityViewModels()
+    private var _binding: ShareFragmentBinding? = null
+
+    // This property is only valid between onCreateView and onDestroyView.
+    private val binding get() = _binding!!
+
+    private val contacts get() = model.contactList.value
+    private var selectedContact = mutableStateOf("")
+
+    private fun shareMessage(contact: Contact) {
+        debug("calling MessagesFragment filter:${contact.contactKey}")
+        parentFragmentManager.navigateToMessages(
+            contact.contactKey,
+            arguments?.getString("message").toString()
+        )
+    }
+
+    private fun onClick(contact: Contact) {
+        if (selectedContact.value == contact.contactKey) {
+            selectedContact.value = ""
+            binding.shareButton.isEnabled = false
+        } else {
+            selectedContact.value = contact.contactKey
+            binding.shareButton.isEnabled = true
+        }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        _binding = ShareFragmentBinding.inflate(inflater, container, false)
+        return binding.root
+    }
+
+    @Suppress("LongMethod", "CyclomaticComplexMethod")
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        binding.toolbar.setNavigationOnClickListener {
+            parentFragmentManager.popBackStack()
+        }
+
+        binding.shareButton.isEnabled = false
+
+        binding.shareButton.setOnClickListener {
+            debug("User clicked shareButton")
+            val contact = contacts.find { c -> c.contactKey == selectedContact.value }
+            if (contact != null) {
+                shareMessage(contact)
+            }
+        }
+
+        binding.contactListView.setContent {
+            val contacts by model.contactList.collectAsStateWithLifecycle()
+            AppTheme {
+                ShareContactListView(
+                    contacts = contacts,
+                    selectedContact = selectedContact.value,
+                    onClick = ::onClick,
+                )
+            }
+        }
+    }
+}
+
+@Composable
+fun ShareContactListView(
+    contacts: List<Contact>,
+    selectedContact: String,
+    onClick: (Contact) -> Unit,
+) {
+    LazyColumn(
+        modifier = Modifier
+            .fillMaxSize(),
+        contentPadding = PaddingValues(6.dp),
+    ) {
+        items(contacts, key = { it.contactKey }) { contact ->
+            val selected = contact.contactKey == selectedContact
+            ContactItem(
+                contact = contact,
+                selected = selected,
+                onClick = { onClick(contact) },
+                onLongClick = {},
+            )
+        }
+    }
+}
diff --git a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
index cc791980d..41ba2a0d9 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import android.os.Bundle
@@ -12,7 +29,6 @@ import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.rememberLazyListState
 import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.ComposeView
@@ -41,7 +57,7 @@ class UsersFragment : ScreenFragment("Users"), Logging {
         val channel = if (hasPKC) DataPacket.PKC_CHANNEL_INDEX else node.channel
         val contactKey = "$channel${user.id}"
         info("calling MessagesFragment filter: $contactKey")
-        parentFragmentManager.navigateToMessages(contactKey, user.longName)
+        parentFragmentManager.navigateToMessages(contactKey)
     }
 
     private fun navigateToNodeDetails(nodeNum: Int) {
@@ -83,16 +99,6 @@ fun NodesScreen(
     val ourNode by model.ourNodeInfo.collectAsStateWithLifecycle()
 
     val listState = rememberLazyListState()
-    val focusedNode by model.focusedNode.collectAsStateWithLifecycle()
-    LaunchedEffect(focusedNode) {
-        focusedNode?.let { node ->
-            val index = nodes.indexOfFirst { it.num == node.num }
-            if (index != -1) {
-                listState.animateScrollToItem(index)
-            }
-            model.focusUserNode(null)
-        }
-    }
 
     val currentTimeMillis = rememberTimeTickWithLifecycle()
     val connectionState by model.connectionState.collectAsStateWithLifecycle()
@@ -136,7 +142,6 @@ fun NodesScreen(
                         MenuItemAction.MoreDetails -> navigateToNodeDetails(node.num)
                     }
                 },
-                blinking = node == focusedNode,
                 expanded = state.showDetails,
                 currentTimeMillis = currentTimeMillis,
                 isConnected = connectionState.isConnected(),
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/AdaptiveTwoPane.kt b/app/src/main/java/com/geeksville/mesh/ui/components/AdaptiveTwoPane.kt
index 713de3b83..e515ee846 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/AdaptiveTwoPane.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/AdaptiveTwoPane.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.BoxWithConstraints
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/AutoLinkText.kt b/app/src/main/java/com/geeksville/mesh/ui/components/AutoLinkText.kt
index f8edf20d5..0b71f2efb 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/AutoLinkText.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/AutoLinkText.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import android.text.Spannable
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/BitwisePreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/BitwisePreference.kt
index fc32204f5..8af374977 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/BitwisePreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/BitwisePreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/ClickableTextField.kt b/app/src/main/java/com/geeksville/mesh/ui/components/ClickableTextField.kt
index 080723e17..18a137d9f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/ClickableTextField.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/ClickableTextField.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/CommonCharts.kt b/app/src/main/java/com/geeksville/mesh/ui/components/CommonCharts.kt
index 613c78071..01d642751 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/CommonCharts.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/CommonCharts.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import android.graphics.Paint
@@ -42,21 +59,25 @@ import androidx.compose.ui.unit.sp
 import com.geeksville.mesh.R
 import com.geeksville.mesh.ui.components.CommonCharts.LINE_LIMIT
 import com.geeksville.mesh.ui.components.CommonCharts.TEXT_PAINT_ALPHA
-import com.geeksville.mesh.ui.components.CommonCharts.TIME_FORMAT
+import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT
 import com.geeksville.mesh.ui.components.CommonCharts.LEFT_LABEL_SPACING
+import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC
 import java.text.DateFormat
 
 object CommonCharts {
-    val TIME_FORMAT: DateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM)
+    val DATE_TIME_FORMAT: DateFormat = DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.MEDIUM)
     const val X_AXIS_SPACING = 8f
     const val LEFT_LABEL_SPACING = 36
-    const val MS_PER_SEC = 1000.0f
+    const val MS_PER_SEC = 1000L
     const val LINE_LIMIT = 4
     const val TEXT_PAINT_ALPHA = 192
 }
 
+private val TIME_FORMAT: DateFormat = DateFormat.getTimeInstance(DateFormat.MEDIUM)
+private val DATE_FORMAT: DateFormat = DateFormat.getDateInstance(DateFormat.SHORT)
 private const val LINE_ON = 10f
 private const val LINE_OFF = 20f
+private const val DATE_Y = 32f
 
 data class LegendData(val nameRes: Int, val color: Color, val isLine: Boolean = false)
 
@@ -83,6 +104,7 @@ fun ChartHeader(amount: Int) {
  * @param lineColors A list of 5 `Color`s for the chart lines, 0 being the lowest line on the chart.
  * @param leaveSpace When true the lines will leave space for Y labels on the left side of the graph.
  */
+@Deprecated("Will soon be replaced with YAxisLabels() and HorizontalLines()", level = DeprecationLevel.WARNING)
 @Composable
 fun ChartOverlay(
     modifier: Modifier,
@@ -143,14 +165,162 @@ fun ChartOverlay(
     }
 }
 
+/**
+ * Draws chart lines with respect to the Y-axis range; defined by (`maxValue` - `minValue`).
+ *
+ * @param lineColors A list of 5 `Color`s for the chart lines, 0 being the lowest line on the chart.
+ */
+@Composable
+fun HorizontalLinesOverlay(
+    modifier: Modifier,
+    lineColors: List<Color>,
+    minValue: Float,
+    maxValue: Float,
+) {
+    val range = maxValue - minValue
+    val verticalSpacing = range / LINE_LIMIT
+    Canvas(modifier = modifier) {
+
+        val lineStart = 0f
+        val height = size.height
+        val width = size.width
+
+        /* Horizontal Lines */
+        var lineY = minValue
+        for (i in 0..LINE_LIMIT) {
+            val ratio = (lineY - minValue) / range
+            val y = height - (ratio * height)
+            drawLine(
+                start = Offset(lineStart, y),
+                end = Offset(width, y),
+                color = lineColors[i],
+                strokeWidth = 1.dp.toPx(),
+                cap = StrokeCap.Round,
+                pathEffect = PathEffect.dashPathEffect(floatArrayOf(LINE_ON, LINE_OFF), 0f)
+            )
+            lineY += verticalSpacing
+        }
+    }
+}
+
+/**
+ * Draws labels on the Y-axis with respect to the range. Defined by (`maxValue` - `minValue`).
+ */
+@Composable
+fun YAxisLabels(
+    modifier: Modifier,
+    labelColor: Color,
+    minValue: Float,
+    maxValue: Float,
+) {
+    val range = maxValue - minValue
+    val verticalSpacing = range / LINE_LIMIT
+    val density = LocalDensity.current
+    Canvas(modifier = modifier) {
+
+        val height = size.height
+
+        /* Y Labels */
+        val textPaint = Paint().apply {
+            color = labelColor.toArgb()
+            textAlign = Paint.Align.LEFT
+            textSize = density.run { 12.dp.toPx() }
+            typeface = setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD))
+            alpha = TEXT_PAINT_ALPHA
+        }
+
+        drawContext.canvas.nativeCanvas.apply {
+            var label = minValue
+            for (i in 0..LINE_LIMIT) {
+                val ratio = (label - minValue) / range
+                val y = height - (ratio * height)
+                drawText(
+                    "${label.toInt()}",
+                    0f,
+                    y + 4.dp.toPx(),
+                    textPaint
+                )
+                label += verticalSpacing
+            }
+        }
+    }
+}
+
+/**
+ * Draws the vertical lines to help the user relate the plotted data within a time frame.
+ */
+@Composable
+fun TimeAxisOverlay(
+    modifier: Modifier,
+    oldest: Int,
+    newest: Int,
+    timeInterval: Long
+) {
+
+    val range = newest - oldest
+    val density = LocalDensity.current
+    val lineColor = MaterialTheme.colors.onSurface
+    Canvas(modifier = modifier) {
+
+        val height = size.height
+        val width = size.width - 28.dp.toPx()
+
+        /* Cut out the time remaining in order to place the lines on the dot. */
+        val timeRemaining = oldest % timeInterval
+        var current = oldest.toLong()
+        current -= timeRemaining
+        current += timeInterval
+
+        val textPaint = Paint().apply {
+            color = lineColor.toArgb()
+            textAlign = Paint.Align.LEFT
+            textSize = density.run { 12.dp.toPx() }
+            typeface = setTypeface(Typeface.create(Typeface.DEFAULT, Typeface.BOLD))
+            alpha = TEXT_PAINT_ALPHA
+        }
+
+        /* Vertical Lines with labels */
+        drawContext.canvas.nativeCanvas.apply {
+            while (current <= newest) {
+                val ratio = (current - oldest).toFloat() / range
+                val x = (ratio * width)
+                drawLine(
+                    start = Offset(x, 0f),
+                    end = Offset(x, height),
+                    color = lineColor,
+                    strokeWidth = 1.dp.toPx(),
+                    cap = StrokeCap.Round,
+                    pathEffect = PathEffect.dashPathEffect(floatArrayOf(LINE_ON, LINE_OFF), 0f)
+                )
+
+                /* Time */
+                drawText(
+                    TIME_FORMAT.format(current * MS_PER_SEC),
+                    x,
+                    0f,
+                    textPaint
+                )
+                /* Date */
+                drawText(
+                    DATE_FORMAT.format(current * MS_PER_SEC),
+                    x,
+                    DATE_Y,
+                    textPaint
+                )
+                current += timeInterval
+            }
+        }
+    }
+}
+
 /**
  * Draws the `oldest` and `newest` times for the respective telemetry data.
- * Expects time in milliseconds
+ * Expects time in seconds.
  */
 @Composable
 fun TimeLabels(
-    oldest: Float,
-    newest: Float
+    oldest: Int,
+    newest: Int
 ) {
     Row(
         modifier = Modifier.fillMaxWidth(),
@@ -158,14 +328,14 @@ fun TimeLabels(
         verticalAlignment = Alignment.CenterVertically
     ) {
         Text(
-            text = TIME_FORMAT.format(oldest),
+            text = DATE_TIME_FORMAT.format(oldest * MS_PER_SEC),
             modifier = Modifier.wrapContentWidth(),
             style = TextStyle(fontWeight = FontWeight.Bold),
             fontSize = 12.sp,
         )
         Spacer(modifier = Modifier.weight(1f))
         Text(
-            text = TIME_FORMAT.format(newest),
+            text = DATE_TIME_FORMAT.format(newest * MS_PER_SEC),
             modifier = Modifier.wrapContentWidth(),
             style = TextStyle(fontWeight = FontWeight.Bold),
             fontSize = 12.sp
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/DeviceMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/components/DeviceMetrics.kt
index 404a68215..8eba0e799 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/DeviceMetrics.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/DeviceMetrics.kt
@@ -1,6 +1,24 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.Canvas
+import androidx.compose.foundation.horizontalScroll
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
@@ -11,8 +29,10 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.text.selection.SelectionContainer
 import androidx.compose.material.Card
 import androidx.compose.material.MaterialTheme
@@ -31,6 +51,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.Path
 import androidx.compose.ui.graphics.StrokeCap
 import androidx.compose.ui.graphics.drawscope.Stroke
+import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.FontWeight
@@ -40,10 +61,10 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.geeksville.mesh.R
 import com.geeksville.mesh.TelemetryProtos.Telemetry
 import com.geeksville.mesh.model.MetricsViewModel
+import com.geeksville.mesh.model.TimeFrame
 import com.geeksville.mesh.ui.BatteryInfo
-import com.geeksville.mesh.ui.components.CommonCharts.X_AXIS_SPACING
 import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC
-import com.geeksville.mesh.ui.components.CommonCharts.TIME_FORMAT
+import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT
 import com.geeksville.mesh.ui.theme.Orange
 
 private val DEVICE_METRICS_COLORS = listOf(Color.Green, Color.Magenta, Color.Cyan)
@@ -85,6 +106,7 @@ fun DeviceMetricsScreen(
                 .fillMaxWidth()
                 .fillMaxHeight(fraction = 0.33f),
             data.reversed(),
+            selectedTimeFrame,
             promptInfoDialog = { displayInfoDialog = true }
         )
 
@@ -109,95 +131,133 @@ fun DeviceMetricsScreen(
 private fun DeviceMetricsChart(
     modifier: Modifier = Modifier,
     telemetries: List<Telemetry>,
+    selectedTime: TimeFrame,
     promptInfoDialog: () -> Unit
 ) {
 
     ChartHeader(amount = telemetries.size)
     if (telemetries.isEmpty()) return
 
+    val (oldest, newest) = remember(key1 = telemetries) {
+        Pair(
+            telemetries.minBy { it.time },
+            telemetries.maxBy { it.time }
+        )
+    }
+    val timeDiff = newest.time - oldest.time
+
     TimeLabels(
-        oldest = telemetries.first().time * MS_PER_SEC,
-        newest = telemetries.last().time * MS_PER_SEC
+        oldest = oldest.time,
+        newest = newest.time
     )
 
     Spacer(modifier = Modifier.height(16.dp))
 
     val graphColor = MaterialTheme.colors.onSurface
-    val spacing = X_AXIS_SPACING
+    val scrollState = rememberScrollState()
 
-    Box(contentAlignment = Alignment.TopStart) {
+    val configuration = LocalConfiguration.current
+    val screenWidth = configuration.screenWidthDp
+    val dp by remember(key1 = selectedTime) {
+        mutableStateOf(selectedTime.dp(screenWidth, time = (newest.time - oldest.time).toLong()))
+    }
 
-        /*
-         * The order of the colors are with respect to the ChUtil.
-         * 25 - 49  Orange
-         * 50 - 100 Red
-         */
-        ChartOverlay(
-            modifier,
-            graphColor,
-            lineColors = listOf(graphColor, Orange, Color.Red, graphColor, graphColor),
-            minValue = 0f,
-            maxValue = 100f
-        )
+    Row {
+        Box(
+            contentAlignment = Alignment.TopStart,
+            modifier = Modifier
+                .horizontalScroll(scrollState)
+                .weight(1f)
+        ) {
 
-        /* Plot Battery Line, ChUtil, and AirUtilTx */
-        Canvas(modifier = modifier) {
-
-            val height = size.height
-            val width = size.width - 28.dp.toPx()
-            val spacePerEntry = (width - spacing) / telemetries.size
-            val dataPointRadius = 2.dp.toPx()
-            var lastX: Float
-            val strokePath = Path().apply {
-                for (i in telemetries.indices) {
-                    val telemetry = telemetries[i]
-                    val nextTelemetry = telemetries.getOrNull(i + 1) ?: telemetries.last()
-                    val leftRatio = telemetry.deviceMetrics.batteryLevel / MAX_PERCENT_VALUE
-                    val rightRatio = nextTelemetry.deviceMetrics.batteryLevel / MAX_PERCENT_VALUE
-
-                    val x1 = spacing + i * spacePerEntry
-                    val y1 = height - (leftRatio * height)
-
-                    /* Channel Utilization */
-                    val chUtilRatio = telemetry.deviceMetrics.channelUtilization / MAX_PERCENT_VALUE
-                    val yChUtil = height - (chUtilRatio * height)
-                    drawCircle(
-                        color = DEVICE_METRICS_COLORS[Device.CH_UTIL.ordinal],
-                        radius = dataPointRadius,
-                        center = Offset(x1, yChUtil)
-                    )
+            /*
+             * The order of the colors are with respect to the ChUtil.
+             * 25 - 49  Orange
+             * 50 - 100 Red
+             */
+            HorizontalLinesOverlay(
+                modifier.width(dp),
+                lineColors = listOf(graphColor, Orange, Color.Red, graphColor, graphColor),
+                minValue = 0f,
+                maxValue = 100f
+            )
 
-                    /* Air Utilization Transmit */
-                    val airUtilRatio = telemetry.deviceMetrics.airUtilTx / MAX_PERCENT_VALUE
-                    val yAirUtil = height - (airUtilRatio * height)
-                    drawCircle(
-                        color = DEVICE_METRICS_COLORS[Device.AIR_UTIL.ordinal],
-                        radius = dataPointRadius,
-                        center = Offset(x1, yAirUtil)
-                    )
+            TimeAxisOverlay(
+                modifier.width(dp),
+                oldest = oldest.time,
+                newest = newest.time,
+                selectedTime.lineInterval()
+            )
 
-                    val x2 = spacing + (i + 1) * spacePerEntry
-                    val y2 = height - (rightRatio * height)
-                    if (i == 0) {
-                        moveTo(x1, y1)
-                    }
+            /* Plot Battery Line, ChUtil, and AirUtilTx */
+            Canvas(modifier = modifier.width(dp)) {
+
+                val height = size.height
+                val width = size.width
+                val dataPointRadius = 2.dp.toPx()
+                val strokePath = Path().apply {
+                    for (i in telemetries.indices) {
+                        val telemetry = telemetries[i]
 
-                    lastX = (x1 + x2) / 2f
+                        /* x-value for all three */
+                        val x1Ratio = (telemetry.time - oldest.time).toFloat() / timeDiff
+                        val x1 = x1Ratio * width
 
-                    quadraticTo(x1, y1, lastX, (y1 + y2) / 2f)
+                        /* Channel Utilization */
+                        val chUtilRatio =
+                            telemetry.deviceMetrics.channelUtilization / MAX_PERCENT_VALUE
+                        val yChUtil = height - (chUtilRatio * height)
+                        drawCircle(
+                            color = DEVICE_METRICS_COLORS[Device.CH_UTIL.ordinal],
+                            radius = dataPointRadius,
+                            center = Offset(x1, yChUtil)
+                        )
+
+                        /* Air Utilization Transmit */
+                        val airUtilRatio = telemetry.deviceMetrics.airUtilTx / MAX_PERCENT_VALUE
+                        val yAirUtil = height - (airUtilRatio * height)
+                        drawCircle(
+                            color = DEVICE_METRICS_COLORS[Device.AIR_UTIL.ordinal],
+                            radius = dataPointRadius,
+                            center = Offset(x1, yAirUtil)
+                        )
+
+                        /* Battery line */
+                        val nextTelemetry = telemetries.getOrNull(i + 1) ?: telemetries.last()
+                        val y1Ratio = telemetry.deviceMetrics.batteryLevel / MAX_PERCENT_VALUE
+                        val y1 = height - (y1Ratio * height)
+
+                        val x2Ratio = (nextTelemetry.time - oldest.time).toFloat() / timeDiff
+                        val x2 = x2Ratio * width
+
+                        val y2Ratio = nextTelemetry.deviceMetrics.batteryLevel / MAX_PERCENT_VALUE
+                        val y2 = height - (y2Ratio * height)
+
+                        if (i == 0) {
+                            moveTo(x1, y1)
+                        }
+
+                        quadraticTo(x1, y1, (x1 + x2) / 2f, (y1 + y2) / 2f)
+                    }
                 }
-            }
 
-            /* Battery Line */
-            drawPath(
-                path = strokePath,
-                color = DEVICE_METRICS_COLORS[Device.BATTERY.ordinal],
-                style = Stroke(
-                    width = dataPointRadius,
-                    cap = StrokeCap.Round
+                /* Battery Line */
+                drawPath(
+                    path = strokePath,
+                    color = DEVICE_METRICS_COLORS[Device.BATTERY.ordinal],
+                    style = Stroke(
+                        width = dataPointRadius,
+                        cap = StrokeCap.Round
+                    )
                 )
-            )
+            }
         }
+        YAxisLabels(
+            modifier = modifier.weight(weight = .1f),
+            graphColor,
+            minValue = 0f,
+            maxValue = 100f
+        )
     }
     Spacer(modifier = Modifier.height(16.dp))
 
@@ -229,7 +289,7 @@ private fun DeviceMetricsCard(telemetry: Telemetry) {
                         horizontalArrangement = Arrangement.SpaceBetween
                     ) {
                         Text(
-                            text = TIME_FORMAT.format(time),
+                            text = DATE_TIME_FORMAT.format(time),
                             style = TextStyle(fontWeight = FontWeight.Bold),
                             fontSize = MaterialTheme.typography.button.fontSize
                         )
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/DropDownPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/DropDownPreference.kt
index 2224b23f9..cfc79b02e 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/DropDownPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/DropDownPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/EditBase64Preference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/EditBase64Preference.kt
index 1275b1ca1..f68d73c0f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/EditBase64Preference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/EditBase64Preference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import android.util.Base64
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/EditIPv4Preference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/EditIPv4Preference.kt
index 239a397f8..baafd0297 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/EditIPv4Preference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/EditIPv4Preference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.text.KeyboardActions
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt
index 09ffa413b..91c6b0485 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/EditListPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/EditPasswordPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/EditPasswordPreference.kt
index b3af71cfb..ca0abbaf5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/EditPasswordPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/EditPasswordPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.text.KeyboardActions
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/EditTextPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/EditTextPreference.kt
index b95de81eb..435d8344a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/EditTextPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/EditTextPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.Box
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/EnvironmentMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/components/EnvironmentMetrics.kt
index 2ffd6a81e..60a0e026b 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/EnvironmentMetrics.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/EnvironmentMetrics.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.Canvas
@@ -46,7 +63,7 @@ import com.geeksville.mesh.copy
 import com.geeksville.mesh.model.MetricsViewModel
 import com.geeksville.mesh.ui.components.CommonCharts.X_AXIS_SPACING
 import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC
-import com.geeksville.mesh.ui.components.CommonCharts.TIME_FORMAT
+import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT
 
 private val ENVIRONMENT_METRICS_COLORS = listOf(Color.Red, Color.Blue, Color.Green)
 private enum class Environment {
@@ -153,8 +170,8 @@ private fun EnvironmentMetricsChart(
         return
     }
     TimeLabels(
-        oldest = telemetries.first().time * MS_PER_SEC,
-        newest = telemetries.last().time * MS_PER_SEC
+        oldest = telemetries.first().time,
+        newest = telemetries.last().time
     )
 
     Spacer(modifier = Modifier.height(16.dp))
@@ -411,7 +428,7 @@ private fun EnvironmentMetricsCard(telemetry: Telemetry, environmentDisplayFahre
                         horizontalArrangement = Arrangement.SpaceBetween
                     ) {
                         Text(
-                            text = TIME_FORMAT.format(time),
+                            text = DATE_TIME_FORMAT.format(time),
                             style = TextStyle(fontWeight = FontWeight.Bold),
                             fontSize = MaterialTheme.typography.button.fontSize
                         )
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/IndoorAirQuality.kt b/app/src/main/java/com/geeksville/mesh/ui/components/IndoorAirQuality.kt
index 78cbc8a75..453783346 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/IndoorAirQuality.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/IndoorAirQuality.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/LoraSignalIndicator.kt b/app/src/main/java/com/geeksville/mesh/ui/components/LoraSignalIndicator.kt
index 9e0faf679..836cf0e3a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/LoraSignalIndicator.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/LoraSignalIndicator.kt
@@ -1,11 +1,32 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.ExperimentalLayoutApi
+import androidx.compose.foundation.layout.FlowRow
 import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.width
 import androidx.compose.material.Icon
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
@@ -44,17 +65,23 @@ private enum class Quality(
  * Displays the `snr` and `rssi` color coded based on the signal quality, along with
  * a human readable description and related icon.
  */
+@OptIn(ExperimentalLayoutApi::class)
 @Composable
-fun NodeSignalQuality(snr: Float, rssi: Int) {
+fun NodeSignalQuality(snr: Float, rssi: Int, modifier: Modifier = Modifier) {
     val quality = determineSignalQuality(snr, rssi)
-    Row(
-        modifier = Modifier.fillMaxWidth(),
-        verticalAlignment = Alignment.CenterVertically,
-        horizontalArrangement = Arrangement.SpaceBetween
+    FlowRow(
+        modifier = modifier,
+        maxLines = 1,
     ) {
         Snr(snr)
+        Spacer(Modifier.width(8.dp))
         Rssi(rssi)
-        Text(text = "${stringResource(R.string.signal)} ${stringResource(quality.nameRes)}")
+        Spacer(Modifier.width(8.dp))
+        Text(
+            text = "${stringResource(R.string.signal)} ${stringResource(quality.nameRes)}",
+            fontSize = MaterialTheme.typography.button.fontSize
+        )
+        Spacer(Modifier.width(8.dp))
         Icon(
             imageVector = quality.imageVector,
             contentDescription = stringResource(R.string.signal_quality),
@@ -112,10 +139,7 @@ private fun Snr(snr: Float) {
     }
 
     Text(
-        text = "%s %.2fdB".format(
-            stringResource(id = R.string.snr),
-            snr
-        ),
+        text = "%s %.2fdB".format(stringResource(id = R.string.snr), snr),
         color = color,
         fontSize = MaterialTheme.typography.button.fontSize
     )
@@ -131,10 +155,7 @@ private fun Rssi(rssi: Int) {
         Quality.BAD.color
     }
     Text(
-        text = "%s %ddB".format(
-            stringResource(id = R.string.rssi),
-            rssi
-        ),
+        text = "%s %ddBm".format(stringResource(id = R.string.rssi), rssi),
         color = color,
         fontSize = MaterialTheme.typography.button.fontSize
     )
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/MetricsTimeSelector.kt b/app/src/main/java/com/geeksville/mesh/ui/components/MetricsTimeSelector.kt
index 92b3c8d5e..39ae19b07 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/MetricsTimeSelector.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/MetricsTimeSelector.kt
@@ -1,4 +1,19 @@
-/* Inspired by https://gist.github.com/zach-klippenstein/7ae8874db304f957d6bb91263e292117 */
+/*
+ * Copyright (c) 8874-9126 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
 package com.geeksville.mesh.ui.components
 
@@ -81,6 +96,7 @@ private val BACKGROUND_SHAPE = RoundedCornerShape(8.dp)
 /**
  * Provides the user with a set of time options they can choose from that controls
  * the time frame the data being plotted was received.
+ * (Inspired by https://gist.github.com/zach-klippenstein/7ae8874db304f957d6bb91263e292117)
  */
 @Composable
 fun MetricsTimeSelector(
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt b/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt
index 8b66bd0b5..f1390c503 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/NodeFilterTextField.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.animation.AnimatedVisibility
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/NodeKeyStatusIcon.kt b/app/src/main/java/com/geeksville/mesh/ui/components/NodeKeyStatusIcon.kt
index 9cb12495a..233bbc777 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/NodeKeyStatusIcon.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/NodeKeyStatusIcon.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.material.Icon
@@ -6,6 +23,10 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.KeyOff
 import androidx.compose.material.icons.filled.Lock
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
@@ -18,25 +39,37 @@ fun NodeKeyStatusIcon(
     hasPKC: Boolean,
     mismatchKey: Boolean,
     modifier: Modifier = Modifier,
-    onClick: () -> Unit = {},
-) = IconButton(
-    onClick = onClick,
-    modifier = modifier,
 ) {
+    var showEncryptionDialog by remember { mutableStateOf(false) }
+    if (showEncryptionDialog) {
+        val (title, text) = when {
+            mismatchKey -> R.string.encryption_error to R.string.encryption_error_text
+            hasPKC -> R.string.encryption_pkc to R.string.encryption_pkc_text
+            else -> R.string.encryption_psk to R.string.encryption_psk_text
+        }
+        SimpleAlertDialog(title, text) { showEncryptionDialog = false }
+    }
+
     val (icon, tint) = when {
         mismatchKey -> rememberVectorPainter(Icons.Default.KeyOff) to Color.Red
         hasPKC -> rememberVectorPainter(Icons.Default.Lock) to Color(color = 0xFF30C047)
         else -> painterResource(R.drawable.ic_lock_open_right_24) to Color(color = 0xFFFEC30A)
     }
-    Icon(
-        painter = icon,
-        contentDescription = stringResource(
-            id = when {
-                mismatchKey -> R.string.encryption_error
-                hasPKC -> R.string.encryption_pkc
-                else -> R.string.encryption_psk
-            }
-        ),
-        tint = tint,
-    )
+
+    IconButton(
+        onClick = { showEncryptionDialog = true },
+        modifier = modifier,
+    ) {
+        Icon(
+            painter = icon,
+            contentDescription = stringResource(
+                id = when {
+                    mismatchKey -> R.string.encryption_error
+                    hasPKC -> R.string.encryption_pkc
+                    else -> R.string.encryption_psk
+                }
+            ),
+            tint = tint,
+        )
+    }
 }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/NodeMap.kt b/app/src/main/java/com/geeksville/mesh/ui/components/NodeMap.kt
index a196b30b6..d46543a1e 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/NodeMap.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/NodeMap.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/NodeMenu.kt b/app/src/main/java/com/geeksville/mesh/ui/components/NodeMenu.kt
index 5a7329d99..9abae0178 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/NodeMenu.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/NodeMenu.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/PositionLog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/PositionLog.kt
index 6fb7c68b2..50dfa8b4d 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/PositionLog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/PositionLog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import android.app.Activity
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/PositionPrecisionPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/PositionPrecisionPreference.kt
index f7557eb49..64a89f9f8 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/PositionPrecisionPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/PositionPrecisionPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.animation.AnimatedVisibility
@@ -16,7 +33,6 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.geeksville.mesh.util.DistanceUnit
 import com.geeksville.mesh.util.toDistanceString
-import java.util.Locale
 import kotlin.math.pow
 import kotlin.math.roundToInt
 
@@ -38,7 +54,7 @@ fun PositionPrecisionPreference(
     onValueChanged: (Int) -> Unit,
     modifier: Modifier = Modifier,
 ) {
-    val unit = remember { DistanceUnit.getFromLocale(Locale.getDefault()) }
+    val unit = remember { DistanceUnit.getFromLocale() }
 
     Column(modifier = modifier) {
         SwitchPreference(
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceCategory.kt b/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceCategory.kt
index 8187a4d1c..ce95c39fd 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceCategory.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceCategory.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.Column
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceFooter.kt b/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceFooter.kt
index 9bfea6f9c..bdddb8fae 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceFooter.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/PreferenceFooter.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/RegularPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/RegularPreference.kt
index f8c7dc8e3..caf7999c7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/RegularPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/RegularPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.clickable
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/ScannedQrCodeDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/ScannedQrCodeDialog.kt
index 0ae988362..dfe9c4cdd 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/ScannedQrCodeDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/ScannedQrCodeDialog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/components/SignalInfo.kt
similarity index 76%
rename from app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt
rename to app/src/main/java/com/geeksville/mesh/ui/components/SignalInfo.kt
index 4a3d43b2c..730999e17 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SignalInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/SignalInfo.kt
@@ -1,4 +1,21 @@
-package com.geeksville.mesh.ui
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.geeksville.mesh.ui.components
 
 import androidx.compose.material.MaterialTheme
 import androidx.compose.material.Text
@@ -10,7 +27,6 @@ import androidx.compose.ui.tooling.preview.PreviewLightDark
 import androidx.compose.ui.tooling.preview.PreviewParameter
 import com.geeksville.mesh.R
 import com.geeksville.mesh.database.entity.NodeEntity
-import com.geeksville.mesh.ui.components.NodeSignalQuality
 import com.geeksville.mesh.ui.preview.NodeEntityPreviewParameterProvider
 import com.geeksville.mesh.ui.theme.AppTheme
 
@@ -18,7 +34,7 @@ const val MAX_VALID_SNR = 100F
 const val MAX_VALID_RSSI = 0
 
 @Composable
-fun signalInfo(
+fun SignalInfo(
     modifier: Modifier = Modifier,
     node: NodeEntity,
     isThisNode: Boolean
@@ -42,7 +58,7 @@ fun signalInfo(
                 add("ch:${node.channel}")
             }
             if (node.hopsAway != 0) add(hopsString)
-        }.joinToString(" | ")
+        }.joinToString(" ")
     }
     if (text.isNotEmpty()) {
         Text(
@@ -64,7 +80,7 @@ fun signalInfo(
 @Preview(showBackground = true)
 fun SignalInfoSimplePreview() {
     AppTheme {
-        signalInfo(
+        SignalInfo(
             node = NodeEntity(
                 num = 1,
                 lastHeard = 0,
@@ -85,7 +101,7 @@ fun SignalInfoPreview(
     node: NodeEntity
 ) {
     AppTheme {
-        signalInfo(
+        SignalInfo(
             node = node,
             isThisNode = false
         )
@@ -99,7 +115,7 @@ fun SignalInfoSelfPreview(
     node: NodeEntity
 ) {
     AppTheme {
-        signalInfo(
+        SignalInfo(
             node = node,
             isThisNode = true
         )
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/SignalMetrics.kt b/app/src/main/java/com/geeksville/mesh/ui/components/SignalMetrics.kt
index af8124f2a..a9aa7222d 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/SignalMetrics.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/SignalMetrics.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import android.graphics.Paint
@@ -47,7 +64,7 @@ import com.geeksville.mesh.ui.components.CommonCharts.MS_PER_SEC
 import com.geeksville.mesh.ui.components.CommonCharts.LINE_LIMIT
 import com.geeksville.mesh.ui.components.CommonCharts.TEXT_PAINT_ALPHA
 import com.geeksville.mesh.ui.components.CommonCharts.LEFT_LABEL_SPACING
-import com.geeksville.mesh.ui.components.CommonCharts.TIME_FORMAT
+import com.geeksville.mesh.ui.components.CommonCharts.DATE_TIME_FORMAT
 
 private val METRICS_COLORS = listOf(Color.Green, Color.Blue)
 
@@ -122,8 +139,8 @@ private fun SignalMetricsChart(
     }
 
     TimeLabels(
-        oldest = meshPackets.first().rxTime * MS_PER_SEC,
-        newest = meshPackets.last().rxTime * MS_PER_SEC
+        oldest = meshPackets.first().rxTime,
+        newest = meshPackets.last().rxTime
     )
 
     Spacer(modifier = Modifier.height(16.dp))
@@ -257,7 +274,7 @@ private fun SignalMetricsCard(meshPacket: MeshPacket) {
                                 horizontalArrangement = Arrangement.SpaceBetween
                             ) {
                                 Text(
-                                    text = TIME_FORMAT.format(time),
+                                    text = DATE_TIME_FORMAT.format(time),
                                     style = TextStyle(fontWeight = FontWeight.Bold),
                                     fontSize = MaterialTheme.typography.button.fontSize
                                 )
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/SimpleAlertDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/SimpleAlertDialog.kt
index c2cbfe951..f28ed65a5 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/SimpleAlertDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/SimpleAlertDialog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/SwitchPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/SwitchPreference.kt
index 70cb25cc6..7584cae74 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/SwitchPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/SwitchPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/TextDividerPreference.kt b/app/src/main/java/com/geeksville/mesh/ui/components/TextDividerPreference.kt
index 64f5db65a..abf127601 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/TextDividerPreference.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/TextDividerPreference.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.isSystemInDarkTheme
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/TimeTickWithLifecycle.kt b/app/src/main/java/com/geeksville/mesh/ui/components/TimeTickWithLifecycle.kt
index 3d15b524d..7a026d18c 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/TimeTickWithLifecycle.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/TimeTickWithLifecycle.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import android.content.BroadcastReceiver
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/TracerouteLog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/TracerouteLog.kt
index d5c2bd05d..183db60a3 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/TracerouteLog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/TracerouteLog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components
 
 import androidx.compose.foundation.ExperimentalFoundationApi
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/AmbientLightingConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/AmbientLightingConfigItemList.kt
index b1de4c500..d6158dad0 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/AmbientLightingConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/AmbientLightingConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt
index 1b10c1ddd..e8b272c66 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/AudioConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt
index e5eb987d1..fb61a57df 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/BluetoothConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt
index 57bded7e9..eb2cefbe0 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/CannedMessageConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt
index 80fc14422..4ff1541d3 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/ChannelSettingsItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.animation.AnimatedVisibility
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/DetectionSensorConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/DetectionSensorConfigItemList.kt
index 1e950e5a5..7cd46ce2a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/DetectionSensorConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/DetectionSensorConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt
index 6b5935da3..e68879bea 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/DeviceConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt
index 26f99c1ad..42a05de55 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/DisplayConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt
index 80f4cfca9..fc8fed78b 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditChannelDialog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt
index 1994b1074..c5dd4521a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/EditDeviceProfileDialog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt
index 37eb3d934..5b94a971f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/ExternalNotificationConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt
index 0cc606ef6..e27214c4c 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/LoRaConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt
index 81c866e94..e7a688dd3 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/MQTTConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt
index ba67b0b2c..5db521acf 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/NeighborInfoConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt
index ec2d9b817..22ae68f63 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/NetworkConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.activity.compose.rememberLauncherForActivityResult
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt
index 61dde89df..62bcf8ad7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PacketResponseStateDialog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.animation.core.animateFloatAsState
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PaxcounterConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PaxcounterConfigItemList.kt
index dd57e6727..342349941 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PaxcounterConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PaxcounterConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
index 08f7efc2e..7f2a336ff 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PositionConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt
index f8d5abb48..f4d0f8203 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/PowerConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt
index ae333cd0d..070cc4981 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/RangeTestConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt
index 377f6ec47..bdd9d885a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/RemoteHardwareConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/SecurityConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/SecurityConfigItemList.kt
index 305613964..e3b7e6b69 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/SecurityConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/SecurityConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt
index e3dda34d6..6b5ae795b 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/SerialConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt
index 2c578e615..9e47eb250 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/StoreForwardConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt
index 19ac0fd38..e352ace03 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/TelemetryConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt b/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt
index cb51224fa..bc4d27242 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/components/config/UserConfigItemList.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.components.config
 
 import androidx.compose.foundation.layout.fillMaxSize
diff --git a/app/src/main/java/com/geeksville/mesh/ui/compose/ElevationInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/compose/ElevationInfo.kt
index f24d0953e..c6912d405 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/compose/ElevationInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/compose/ElevationInfo.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.compose
 
 import androidx.compose.material.MaterialTheme
diff --git a/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt b/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt
index 7de5e233f..942b8c11a 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/compose/SatelliteCountInfo.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.compose
 
 import androidx.compose.foundation.layout.Arrangement
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt b/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt
index a9b14caf2..077af1752 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/CacheLayout.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.map
 
 import androidx.compose.foundation.background
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/DownloadButton.kt b/app/src/main/java/com/geeksville/mesh/ui/map/DownloadButton.kt
index 21b7e6ea5..d640396b2 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/DownloadButton.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/DownloadButton.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.map
 
 import androidx.compose.animation.AnimatedVisibility
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/EditWaypointDialog.kt b/app/src/main/java/com/geeksville/mesh/ui/map/EditWaypointDialog.kt
index 01c1f3678..33954af53 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/EditWaypointDialog.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/EditWaypointDialog.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.map
 
 import androidx.activity.compose.BackHandler
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/MapButton.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapButton.kt
index 8eacd324e..ff41ce408 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/MapButton.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapButton.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.map
 
 import androidx.annotation.StringRes
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
index 70137449b..c54911f9f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapFragment.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.map
 
 import android.content.Context
@@ -317,11 +334,11 @@ fun MapView(
                 position = nodePosition
                 icon = markerIcon
 
-                setOnLongClickListener {
-                    performHapticFeedback()
-                    model.focusUserNode(node)
-                    true
-                }
+//                setOnLongClickListener {
+//                    performHapticFeedback()
+//                    TODO NodeMenu?
+//                    true
+//                }
                 setNodeColors(node.colors)
                 setPrecisionBits(p.precisionBits)
             }
diff --git a/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt b/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt
index 8db94c8d5..a73a028f7 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/map/MapViewWithLifecycle.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.map
 
 import android.annotation.SuppressLint
diff --git a/app/src/main/java/com/geeksville/mesh/ui/preview/NodeEntityPreviewParameterProvider.kt b/app/src/main/java/com/geeksville/mesh/ui/preview/NodeEntityPreviewParameterProvider.kt
index 58a5e6da1..976c43ab2 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/preview/NodeEntityPreviewParameterProvider.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/preview/NodeEntityPreviewParameterProvider.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.preview
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
diff --git a/app/src/main/java/com/geeksville/mesh/ui/preview/PreviewParameterProviders.kt b/app/src/main/java/com/geeksville/mesh/ui/preview/PreviewParameterProviders.kt
index 75d7c3b15..418f7dff8 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/preview/PreviewParameterProviders.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/preview/PreviewParameterProviders.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.preview
 
 import androidx.compose.ui.tooling.preview.PreviewParameterProvider
diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt
index 9da963e12..fcd1f2ceb 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Color.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.theme
 
 import androidx.compose.ui.graphics.Color
diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Shape.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Shape.kt
index 99ce8e696..e024999c6 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/theme/Shape.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Shape.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt
index ba310667d..6b738a991 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Theme.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
diff --git a/app/src/main/java/com/geeksville/mesh/ui/theme/Type.kt b/app/src/main/java/com/geeksville/mesh/ui/theme/Type.kt
index 91432aa78..9bd7b47f1 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/theme/Type.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/theme/Type.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui.theme
 
 import androidx.compose.material.Typography
diff --git a/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt b/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
index 07b2f361d..6698b3108 100644
--- a/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/CompatExtensions.kt
@@ -1,6 +1,22 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
-import android.app.PendingIntent
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
@@ -13,14 +29,6 @@ import androidx.core.content.ContextCompat
 import androidx.core.content.IntentCompat
 import androidx.core.os.ParcelCompat
 
-object PendingIntentCompat {
-    val FLAG_IMMUTABLE = if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.S) {
-        PendingIntent.FLAG_IMMUTABLE
-    } else {
-        0
-    }
-}
-
 inline fun <reified T : Parcelable> Parcel.readParcelableCompat(loader: ClassLoader?): T? =
     ParcelCompat.readParcelable(this, loader, T::class.java)
 
diff --git a/app/src/main/java/com/geeksville/mesh/util/CustomRecentEmojiProvider.kt b/app/src/main/java/com/geeksville/mesh/util/CustomRecentEmojiProvider.kt
index d1d2a3ae2..cc4dbccc9 100644
--- a/app/src/main/java/com/geeksville/mesh/util/CustomRecentEmojiProvider.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/CustomRecentEmojiProvider.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import android.content.Context
diff --git a/app/src/main/java/com/geeksville/mesh/util/DateTimeUtils.kt b/app/src/main/java/com/geeksville/mesh/util/DateTimeUtils.kt
new file mode 100644
index 000000000..15811f660
--- /dev/null
+++ b/app/src/main/java/com/geeksville/mesh/util/DateTimeUtils.kt
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.geeksville.mesh.util
+
+import java.text.DateFormat
+import java.util.Date
+import java.util.concurrent.TimeUnit
+
+// return time if within 24 hours, otherwise date
+fun getShortDate(time: Long): String? {
+    val date = if (time != 0L) Date(time) else return null
+    val isWithin24Hours = System.currentTimeMillis() - date.time <= TimeUnit.DAYS.toMillis(1)
+
+    return if (isWithin24Hours) {
+        DateFormat.getTimeInstance(DateFormat.SHORT).format(date)
+    } else {
+        DateFormat.getDateInstance(DateFormat.SHORT).format(date)
+    }
+}
+
+// return time if within 24 hours, otherwise date/time
+fun getShortDateTime(time: Long): String {
+    val date = Date(time)
+    val isWithin24Hours = System.currentTimeMillis() - date.time <= TimeUnit.DAYS.toMillis(1)
+
+    return if (isWithin24Hours) {
+        DateFormat.getTimeInstance(DateFormat.SHORT).format(date)
+    } else {
+        DateFormat.getDateTimeInstance(DateFormat.SHORT, DateFormat.SHORT).format(date)
+    }
+}
+
+fun formatUptime(seconds: Int): String = formatUptime(seconds.toLong())
+
+private fun formatUptime(seconds: Long): String {
+    val days = TimeUnit.SECONDS.toDays(seconds)
+    val hours = TimeUnit.SECONDS.toHours(seconds) % TimeUnit.DAYS.toHours(1)
+    val minutes = TimeUnit.SECONDS.toMinutes(seconds) % TimeUnit.HOURS.toMinutes(1)
+    val secs = seconds % TimeUnit.MINUTES.toSeconds(1)
+
+    return listOfNotNull(
+        "${days}d".takeIf { days > 0 },
+        "${hours}h".takeIf { hours > 0 },
+        "${minutes}m".takeIf { minutes > 0 },
+        "${secs}s".takeIf { secs > 0 },
+    ).joinToString(" ")
+}
diff --git a/app/src/main/java/com/geeksville/mesh/util/DistanceExtensions.kt b/app/src/main/java/com/geeksville/mesh/util/DistanceExtensions.kt
index 4455cada4..7831f6b92 100644
--- a/app/src/main/java/com/geeksville/mesh/util/DistanceExtensions.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/DistanceExtensions.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import android.icu.util.LocaleData
@@ -17,7 +34,7 @@ enum class DistanceUnit(
     ;
 
     companion object {
-        fun getFromLocale(locale: Locale): DisplayConfig.DisplayUnits {
+        fun getFromLocale(locale: Locale = Locale.getDefault()): DisplayConfig.DisplayUnits {
             return if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.P) {
                 when (LocaleData.getMeasurementSystem(ULocale.forLocale(locale))) {
                     LocaleData.MeasurementSystem.SI -> DisplayConfig.DisplayUnits.METRIC
diff --git a/app/src/main/java/com/geeksville/mesh/util/Exceptions.kt b/app/src/main/java/com/geeksville/mesh/util/Exceptions.kt
index 690574a9e..285bdbf1c 100644
--- a/app/src/main/java/com/geeksville/mesh/util/Exceptions.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/Exceptions.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import android.os.RemoteException
diff --git a/app/src/main/java/com/geeksville/mesh/util/Extensions.kt b/app/src/main/java/com/geeksville/mesh/util/Extensions.kt
index 997b27de4..100bf7389 100644
--- a/app/src/main/java/com/geeksville/mesh/util/Extensions.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/Extensions.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import android.widget.EditText
diff --git a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
index 8157b67a4..60aa307a0 100644
--- a/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/LanguageUtils.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import android.content.Context
diff --git a/app/src/main/java/com/geeksville/mesh/util/LocationUtils.kt b/app/src/main/java/com/geeksville/mesh/util/LocationUtils.kt
index 613bb8b65..cc0f2a92b 100644
--- a/app/src/main/java/com/geeksville/mesh/util/LocationUtils.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/LocationUtils.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import com.geeksville.mesh.MeshProtos
diff --git a/app/src/main/java/com/geeksville/mesh/util/MapViewExtensions.kt b/app/src/main/java/com/geeksville/mesh/util/MapViewExtensions.kt
index 15bf8b250..a941cae50 100644
--- a/app/src/main/java/com/geeksville/mesh/util/MapViewExtensions.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/MapViewExtensions.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import android.graphics.Color
diff --git a/app/src/main/java/com/geeksville/mesh/util/ModifierExtensions.kt b/app/src/main/java/com/geeksville/mesh/util/ModifierExtensions.kt
new file mode 100644
index 000000000..c683258ef
--- /dev/null
+++ b/app/src/main/java/com/geeksville/mesh/util/ModifierExtensions.kt
@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package com.geeksville.mesh.util
+
+import androidx.compose.ui.Modifier
+
+/**
+ * Conditionally applies the [action] to the receiver [Modifier], if [precondition] is true.
+ * Returns the receiver as-is otherwise.
+ */
+inline fun Modifier.thenIf(precondition: Boolean, action: Modifier.() -> Modifier): Modifier =
+    if (precondition) action() else this
diff --git a/app/src/main/java/com/geeksville/mesh/util/SqlTileWriterExt.kt b/app/src/main/java/com/geeksville/mesh/util/SqlTileWriterExt.kt
index edeea8306..a88566591 100644
--- a/app/src/main/java/com/geeksville/mesh/util/SqlTileWriterExt.kt
+++ b/app/src/main/java/com/geeksville/mesh/util/SqlTileWriterExt.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.util
 
 import android.database.Cursor
diff --git a/app/src/main/proto b/app/src/main/proto
index af2fea10f..02e6576ef 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit af2fea10fe2eba5857fb8e27975bbcea9c10af8e
+Subproject commit 02e6576efaa2f691be9504b8c1c6261703f7a277
diff --git a/app/src/main/res/color/tab_color_selector.xml b/app/src/main/res/color/tab_color_selector.xml
index 79262078c..a3c6793ba 100644
--- a/app/src/main/res/color/tab_color_selector.xml
+++ b/app/src/main/res/color/tab_color_selector.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:color="@color/selectedColor" android:state_selected="true"/>
     <item android:color="@color/unselectedColor"/>
diff --git a/app/src/main/res/drawable-anydpi/app_icon.xml b/app/src/main/res/drawable-anydpi/app_icon.xml
index 3b5436367..62c5e49d1 100644
--- a/app/src/main/res/drawable-anydpi/app_icon.xml
+++ b/app/src/main/res/drawable-anydpi/app_icon.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
diff --git a/app/src/main/res/drawable/ic_twotone_content_paste_go_24.xml b/app/src/main/res/drawable/ic_twotone_content_paste_go_24.xml
deleted file mode 100644
index 21fc0ae3a..000000000
--- a/app/src/main/res/drawable/ic_twotone_content_paste_go_24.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
-    android:tint="?attr/colorControlNormal">
-  <path
-      android:pathData="M10,17c0,-3.31 2.69,-6 6,-6h3V5h-2v3H7V5H5v14h5v-2z"
-      android:strokeAlpha="0.3"
-      android:fillColor="@android:color/white"
-      android:fillAlpha="0.3"/>
-  <path
-      android:pathData="M10,19L5,19L5,5h2v3h10L17,5h2v6h2L21,5c0,-1.1 -0.9,-2 -2,-2h-4.18C14.4,1.84 13.3,1 12,1s-2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h5v-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1s-1,-0.45 -1,-1s0.45,-1 1,-1z"
-      android:fillColor="@android:color/white"/>
-  <path
-      android:pathData="m18.01,13l-1.42,1.41l1.58,1.58H12v2h6.17l-1.58,1.59l1.42,1.41l3.99,-4z"
-      android:fillColor="@android:color/white"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index f30961e2d..e395d9d68 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 31f080f9c..834bc7939 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -1,4 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
 
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/share_fragment.xml
similarity index 57%
rename from app/src/main/res/layout/messages_fragment.xml
rename to app/src/main/res/layout/share_fragment.xml
index 72b3a7ad1..809650518 100644
--- a/app/src/main/res/layout/messages_fragment.xml
+++ b/app/src/main/res/layout/share_fragment.xml
@@ -1,25 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/colorAdvancedBackground"
-    >
+    android:background="@color/colorAdvancedBackground">
 
     <com.google.android.material.appbar.MaterialToolbar
         android:id="@+id/toolbar"
         style="@style/MyToolbar"
-        android:title="@string/channel_name"
         android:layout_width="match_parent"
-        app:layout_constraintHeight_min="?attr/actionBarSize"
         android:layout_height="wrap_content"
         android:background="@color/toolbarBackground"
+        android:title="@string/share_to"
+        app:title="@string/share_to"
+        app:layout_constraintHeight_min="?attr/actionBarSize"
         app:layout_constraintTop_toTopOf="parent"
-        app:navigationIcon="?android:attr/homeAsUpIndicator"/>
+        app:navigationIcon="?android:attr/homeAsUpIndicator"
+        app:titleMargin="4dp" />
 
     <androidx.compose.ui.platform.ComposeView
-        android:id="@+id/messageListView"
+        android:id="@+id/contactListView"
         android:layout_width="0dp"
         android:layout_height="0dp"
         android:layout_margin="8dp"
@@ -38,7 +39,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        app:layout_constraintBottom_toTopOf="@+id/textInputLayout"
+        app:layout_constraintBottom_toTopOf="@+id/shareButton"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent">
 
@@ -49,34 +50,14 @@
             android:orientation="horizontal" />
     </HorizontalScrollView>
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/textInputLayout"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:layout_marginBottom="4dp"
-        android:hint="@string/send_text"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/sendButton"
-        app:layout_constraintStart_toStartOf="parent">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/messageInputText"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:inputType="textMultiLine|textCapSentences"
-            android:text="" />
-
-    </com.google.android.material.textfield.TextInputLayout>
 
     <ImageButton
-        android:id="@+id/sendButton"
-        android:layout_width="64dp"
+        android:id="@+id/shareButton"
+        android:layout_width="match_parent"
         android:layout_height="64dp"
-        android:contentDescription="@string/send_text"
+        android:contentDescription="@string/share_message"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/textInputLayout"
         app:srcCompat="@drawable/ic_twotone_send_24" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index b00869f71..a7a67abeb 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <menu
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
diff --git a/app/src/main/res/menu/menu_messages.xml b/app/src/main/res/menu/menu_messages.xml
index 11f534152..a0192c268 100644
--- a/app/src/main/res/menu/menu_messages.xml
+++ b/app/src/main/res/menu/menu_messages.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
@@ -6,11 +23,6 @@
         android:icon="@drawable/ic_twotone_volume_off_24"
         android:title="@string/mute"
         app:showAsAction="ifRoom" />
-    <item
-        android:id="@+id/resendButton"
-        android:icon="@drawable/ic_twotone_content_paste_go_24"
-        android:title="@string/resend"
-        app:showAsAction="ifRoom" />
     <item
         android:id="@+id/deleteButton"
         android:icon="@drawable/ic_twotone_delete_24"
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index e9039f6e6..80d8a24dd 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -17,26 +17,35 @@
     <string name="routing_error_no_route">Keine Route</string>
     <string name="routing_error_got_nak">negative Bestätigung erhalten</string>
     <string name="routing_error_timeout">Zeitüberschreitung</string>
-    <string name="routing_error_no_interface">No Interface</string>
+    <string name="routing_error_no_interface">Keine Schnittstelle</string>
     <string name="routing_error_max_retransmit">Maximale Weiterleitungen erreicht</string>
     <string name="routing_error_no_channel">Kein Kanal</string>
     <string name="routing_error_too_large">Paket zu groß</string>
     <string name="routing_error_no_response">Keine Reaktion</string>
-    <string name="routing_error_bad_request">Bad Request</string>
+    <string name="routing_error_bad_request">Schlechte Anfrage</string>
     <string name="routing_error_duty_cycle_limit">Regionales Duty-Cycle-Limit erreicht</string>
     <string name="routing_error_not_authorized">Nicht autorisiert</string>
     <string name="routing_error_pki_failed">Verschlüsseltes Senden fehlgeschlagen</string>
     <string name="routing_error_pki_unknown_pubkey">Unbekannter öffentlicher Schlüssel</string>
+    <string name="routing_error_admin_bad_session_key">Fehlerhafter Sitzungsschlüssel</string>
+    <string name="routing_error_admin_public_key_unauthorized">Öffentlicher Schlüssel nicht autorisiert</string>
     <string name="role_client">Mit der App verbundenes oder eigenständiges Messaging-Gerät.</string>
     <string name="role_client_mute">Gerät, welches keine Pakete von anderen Geräten weiterleitet.</string>
     <string name="role_router">Knoten zur Erweiterung des Abdeckungsgebiets durch Weiterleiten von Nachrichten. In Knotenliste sichtbar.</string>
+    <string name="role_router_client">Kombination von ROUTER und CLIENT. Nicht für mobile Endgeräte.</string>
     <string name="role_repeater">Infrastrukturknoten zur Erweiterung der Netzabdeckung durch Weiterleitung von Nachrichten mit minimalem Overhead. In der Knotenliste nicht sichtbar.</string>
     <string name="role_tracker">GPS-Positionspakete mit Priorität gesendet.</string>
     <string name="role_sensor">Telemetrie-Pakete mit Priorität gesendet.</string>
     <string name="role_tak">Optimiert für Kommunikation des ATAK Systems, reduziert Routineübertragungen.</string>
     <string name="role_client_hidden">Gerät, das nur bei Bedarf sendet, um sich zu tarnen oder Strom zu sparen.</string>
-    <string name="role_lost_and_found">Broadcasts location as message to default channel regularly for to assist with device recovery.</string>
-    <string name="role_tak_tracker">Enables automatic TAK PLI broadcasts and reduces routine broadcasts.</string>
+    <string name="role_lost_and_found">Sendet den Standort regelmäßig als Nachricht an den Standardkanal, um bei der Wiederherstellung des Geräts zu helfen.</string>
+    <string name="role_tak_tracker">Aktiviert automatische TAK PLI Übertragungen und reduziert Routineübertragungen.</string>
+    <string name="rebroadcast_mode_all">Sende jede beobachtete Nachricht erneut aus, ob sie auf unserem privaten Kanal oder von einem anderen Netz mit den gleichen lora-Parametern stammt.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Das gleiche Verhalten wie ALLE aber überspringt die Paketdekodierung und sendet sie einfach erneut. Nur in Repeater Rolle verfügbar. Wenn Sie diese auf jede andere Rolle setzen, wird ALLE Verhaltensweisen folgen.</string>
+    <string name="rebroadcast_mode_local_only">Ignoriert beobachtete Nachrichten aus fremden Netzen, die offen sind oder die, die nicht entschlüsselt werden können. Sendet nur die Nachricht auf den Knoten lokalen primären / sekundären Kanälen.</string>
+    <string name="rebroadcast_mode_known_only">Ignores observed messages from foreign meshes like LOCAL ONLY, but takes it step further by also ignoring messages from nodes not already in the node\'s known list.</string>
+    <string name="rebroadcast_mode_none">Dies ist nur für SENSOR, TRACKER und TAK_TRACKER zulässig. Dies verhindert alle Übertragungen, nicht anders als CLIENT_MUTE Rolle.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing.</string>
     <string name="channel_name">Kanalname</string>
     <string name="channel_options">Kanaloptionen</string>
     <string name="qr_code">QR-Code</string>
@@ -217,23 +226,51 @@
     <string name="mute_always">Immer</string>
     <string name="replace">Ersetzen</string>
     <string name="wifi_qr_code_scan">WiFi QR-Code scannen</string>
-    <string name="wifi_qr_code_error">Invalid WiFi Credential QR code format</string>
-    <string name="navigate_back">Navigate Back</string>
+    <string name="wifi_qr_code_error">Ungültiges QR-Code-Format für WiFi-Berechtigung</string>
+    <string name="navigate_back">Zurück navigieren</string>
     <string name="battery">Akku</string>
     <string name="channel_utilization">Kanalauslastung</string>
-    <string name="air_utilization">Air Utilization</string>
+    <string name="air_utilization">Luftauslastung</string>
     <string name="temperature">Temperatur</string>
     <string name="humidity">Luftfeuchte</string>
     <string name="logs">Protokolle</string>
-    <string name="hops_away">Hops Away</string>
+    <string name="hops_away">Zwischenschritte entfernt</string>
     <string name="info">Information</string>
     <string name="ch_util_definition">Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).</string>
     <string name="air_util_definition">Prozent der Sendezeit für die Übertragung innerhalb der letzten Stunde.</string>
     <string name="iaq">IAQ</string>
-    <string name="encryption_psk">Shared Key</string>
-    <string name="encryption_psk_text">Direct messages are using the shared key for the channel.</string>
+    <string name="encryption_psk">Geteilter Schlüssel</string>
+    <string name="encryption_psk_text">Direktnachrichten verwenden den gemeinsamen Schlüssel für den Kanal.</string>
     <string name="encryption_pkc">Public Key Verschlüsselung</string>
-    <string name="encryption_pkc_text">Direct messages are using the new public key infrastructure for encryption. Requires firmware version 2.5 or greater.</string>
+    <string name="encryption_pkc_text">Direkte Nachrichten verwenden die neue öffentliche Schlüssel-Infrastruktur für die Verschlüsselung. Benötigt Firmware-Version 2.5 oder höher.</string>
     <string name="encryption_error">Public-Key Fehler</string>
     <string name="encryption_error_text">The public key does not match the recorded key. You may remove the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action.</string>
+    <string name="request_userinfo">Benutzerinfo anfordern</string>
+    <string name="meshtastic_new_nodes_notifications">Neue Node Benachrichtigung</string>
+    <string name="more_details">Mehr Details</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, a measure used in communications to quantify the level of a desired signal to the level of background noise. In Meshtastic and other wireless systems, a higher SNR indicates a clearer signal that can enhance the reliability and quality of data transmission.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Received Signal Strength Indicator, a measurement used to determine the power level being received by the antenna. A higher RSSI value generally indicates a stronger and more stable connection.</string>
+    <string name="iaq_definition">(Innenluftqualität) relativer IAQ-Wert gemessen von Bosch BME680.</string>
+    <string name="device_metrics_log">Geräte-Metriken-Protokoll</string>
+    <string name="node_map">Nodekarte</string>
+    <string name="position_log">Positions-Protokoll</string>
+    <string name="env_metrics_log">Geräte-Metriken-Protokoll</string>
+    <string name="sig_metrics_log">Signal-Metriken-Protkoll</string>
+    <string name="administration">Administration</string>
+    <string name="remote_admin">Fernadministration</string>
+    <string name="bad">Schlecht</string>
+    <string name="fair">Angemessen</string>
+    <string name="good">Gut</string>
+    <string name="none_quality">Keine</string>
+    <string name="signal">Signal</string>
+    <string name="signal_quality">Signalqualität</string>
+    <string name="traceroute_log">Traceroute-Protokoll</string>
+    <string name="traceroute_direct">Direkt</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 hop</item>
+        <item quantity="other">%d hops</item>
+    </plurals>
+    <string name="traceroute_diff">Hops towards %1$d Hops back %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-et/strings.xml b/app/src/main/res/values-et/strings.xml
index cec905931..a6f5ca958 100644
--- a/app/src/main/res/values-et/strings.xml
+++ b/app/src/main/res/values-et/strings.xml
@@ -9,7 +9,7 @@
     <string name="node_sort_distance">Kaugus</string>
     <string name="node_sort_hops_away">Hüppeid</string>
     <string name="node_sort_last_heard">Viimati kuuldud</string>
-    <string name="node_sort_via_mqtt">MQTT kaudu</string>
+    <string name="node_sort_via_mqtt">läbi MQTT</string>
     <string name="unrecognized">Tundmatu</string>
     <string name="message_status_enroute">Ootab kinnitamist</string>
     <string name="message_status_queued">Saatmise järjekorras</string>
@@ -27,16 +27,25 @@
     <string name="routing_error_not_authorized">Autoriseerimata</string>
     <string name="routing_error_pki_failed">Krüpteeritud saatmine nurjus</string>
     <string name="routing_error_pki_unknown_pubkey">Tundmatu avalik võti</string>
+    <string name="routing_error_admin_bad_session_key">Bad session key</string>
+    <string name="routing_error_admin_public_key_unauthorized">Public Key unauthorized</string>
     <string name="role_client">Rakendusega ühendatud või iseseisev sõnumsideseade.</string>
     <string name="role_client_mute">Seade, mis ei edasta pakette teistelt seadmetelt.</string>
     <string name="role_router">Infrastruktuuri sõlm võrgu leviala laiendamiseks sõnumite edastamise kaudu. Nähtav sõlmede loendis.</string>
+    <string name="role_router_client">Combination of both ROUTER and CLIENT. Not for mobile devices.</string>
     <string name="role_repeater">Infrastruktuuri sõlm võrgu leviala laiendamiseks, edastades sõnumeid minimaalse üldkuluga. Pole sõlmede loendis nähtav.</string>
-    <string name="role_tracker">Esmalt edastatakse GPS-i asukoha pakette.</string>
+    <string name="role_tracker">Esmajärjekorras edastatakse GPS asukoha pakette.</string>
     <string name="role_sensor">Esmalt edastatakse telemeetria pakette.</string>
-    <string name="role_tak">Optimeeritud ATAK side jaoks, vähendab rutiinseid saateid.</string>
+    <string name="role_tak">Optimeeritud ATAK süsteemi side jaoks, vähendab rutiinseid saateid.</string>
     <string name="role_client_hidden">Seade, mis edastab ülekandeid ainult siis, kui see on vajalik varjamiseks või energia säästmiseks.</string>
     <string name="role_lost_and_found">Edastab asukohta regulaarselt vaikekanalile sõnumina, et aidata seadme leidmisel.</string>
     <string name="role_tak_tracker">Võimaldab automaatseid TAK PLI saateid ja vähendab rutiinseid saateid.</string>
+    <string name="rebroadcast_mode_all">Rebroadcast any observed message, if it was on our private channel or from another mesh with the same lora parameters.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Same as behavior as ALL but skips packet decoding and simply rebroadcasts them. Only available in Repeater role. Setting this on any other roles will result in ALL behavior.</string>
+    <string name="rebroadcast_mode_local_only">Ignores observed messages from foreign meshes that are open or those which it cannot decrypt. Only rebroadcasts message on the nodes local primary / secondary channels.</string>
+    <string name="rebroadcast_mode_known_only">Ignores observed messages from foreign meshes like LOCAL ONLY, but takes it step further by also ignoring messages from nodes not already in the node\'s known list.</string>
+    <string name="rebroadcast_mode_none">Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing.</string>
     <string name="channel_name">Kanali nimi</string>
     <string name="channel_options">Kanali valikud</string>
     <string name="qr_code">QR kood</string>
@@ -46,7 +55,7 @@
     <string name="unknown_username">Tundmatu kasutajanimi</string>
     <string name="send">Saada</string>
     <string name="send_text">Saada tekst</string>
-    <string name="warning_not_paired">Sa ei ole veel nutiseadmega ühendanud  Meshtastic seadet. Seo seade selle telefoniga ja määra kasutajanimi.\n\nSee avatud lähtekoodiga (open source) rakendus on arendus staatuses. Kui märkad vigu, saada palun saada sõnum meie veebilehe foorumisse.\n\nLisateave kodulehel - www.meshtastic.org.</string>
+    <string name="warning_not_paired">Ei ole veel ühendanud Meshtastic -kokku sobivat raadiot telefoniga. Seo seade selle telefoniga ja määra kasutajanimi.\n\nSee avatud lähtekoodiga programm on alpha-testi staatuses. Kui märkad vigu, saada palun saada sõnum meie veebisaidi foorumisse.\n\nLisateave kodulehel - www.meshtastic.org.</string>
     <string name="you">Sina</string>
     <string name="your_name">Sinu nimi</string>
     <string name="analytics_okay">Anonüümne kasutus statistika ja krahhiaruanded.</string>
@@ -224,7 +233,7 @@
     <string name="air_utilization">Eetri kasutus</string>
     <string name="temperature">Temperatuur</string>
     <string name="humidity">Niiskus</string>
-    <string name="logs">Logi kirjed</string>
+    <string name="logs">Logi kirjet</string>
     <string name="hops_away">Hüppe kaugusel</string>
     <string name="info">Informatsioon</string>
     <string name="ch_util_definition">Praeguse kanali kasutamine, sealhulgas korrektne TX, RX ja vigane RX (ehk müra).</string>
@@ -236,4 +245,32 @@
     <string name="encryption_pkc_text">Otsesõnumid kasutavad krüpteerimiseks uut avaliku võtme taristut. Eeldab püsivara versiooni 2.5 või uuemat.</string>
     <string name="encryption_error">Kokkusobimatu avalik võti</string>
     <string name="encryption_error_text">Avalik võti ei ühti salvestatud võtmega. Võite sõlme eemaldada ja lasta sellel uuesti võtmeid vahetada, kuid see võib viidata tõsisemale turvaprobleemile. Võtke kasutajaga ühendust mõne muu usaldusväärse kanali kaudu, et teha kindlaks, kas võtme muudatuse põhjuseks oli tehaseseadete taastamine või muu tahtlik tegevus.</string>
+    <string name="request_userinfo">Request user info</string>
+    <string name="meshtastic_new_nodes_notifications">New node notifications</string>
+    <string name="more_details">More details</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, a measure used in communications to quantify the level of a desired signal to the level of background noise. In Meshtastic and other wireless systems, a higher SNR indicates a clearer signal that can enhance the reliability and quality of data transmission.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Received Signal Strength Indicator, a measurement used to determine the power level being received by the antenna. A higher RSSI value generally indicates a stronger and more stable connection.</string>
+    <string name="iaq_definition">(Indoor Air Quality) relative scale IAQ value as measured by Bosch BME680. Value Range 0–500.</string>
+    <string name="device_metrics_log">Device Metrics Log</string>
+    <string name="node_map">Node Map</string>
+    <string name="position_log">Position Log</string>
+    <string name="env_metrics_log">Environment Metrics Log</string>
+    <string name="sig_metrics_log">Signal Metrics Log</string>
+    <string name="administration">Administration</string>
+    <string name="remote_admin">Remote Administration</string>
+    <string name="bad">Halb</string>
+    <string name="fair">Rahuldav</string>
+    <string name="good">Hea</string>
+    <string name="none_quality">Puudub</string>
+    <string name="signal">Levi</string>
+    <string name="signal_quality">Levi Kvaliteet</string>
+    <string name="traceroute_log">Marsruutimise Logi</string>
+    <string name="traceroute_direct">Otsene</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 hüpe</item>
+        <item quantity="other">%d hüppet</item>
+    </plurals>
+    <string name="traceroute_diff">Hops towards %1$d Hops back %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-fi/strings.xml b/app/src/main/res/values-fi/strings.xml
index 9e8fd968b..8ab94b347 100644
--- a/app/src/main/res/values-fi/strings.xml
+++ b/app/src/main/res/values-fi/strings.xml
@@ -27,9 +27,12 @@
     <string name="routing_error_not_authorized">Ei oikeuksia</string>
     <string name="routing_error_pki_failed">Salattu Lähetys Epäonnistui</string>
     <string name="routing_error_pki_unknown_pubkey">Tuntematon Julkinen Avain</string>
+    <string name="routing_error_admin_bad_session_key">Virheellinen istunnon avain</string>
+    <string name="routing_error_admin_public_key_unauthorized">Julkinen avain valtuuttamaton</string>
     <string name="role_client">Sovellus yhdistetty tai itsenäinen viestintäväline.</string>
     <string name="role_client_mute">Laite, joka ei välitä paketteja muista laitteista.</string>
     <string name="role_router">Infrastruktuurin node verkon kattavuuden laajentamiseksi viestien välittämisen avulla. Näkyvä node listassa.</string>
+    <string name="role_router_client">Yhdistelmä ROUTER ja CLIENT. Ei mobiili laitteille.</string>
     <string name="role_repeater">Infrastruktuuri node verkon kattavuuden laajentamiseen välittämällä viestejä minimaalisella ylikuormituksella. Ei näy node listassa.</string>
     <string name="role_tracker">Lähettää GPS-sijaintipaketit prioriteettina.</string>
     <string name="role_sensor">Lähettää telemetriapaketteja prioriteettina.</string>
@@ -37,6 +40,12 @@
     <string name="role_client_hidden">Device that only broadcasts as needed for stealth or power savings.</string>
     <string name="role_lost_and_found">Lähettää sijainnin oletuskanavana säännöllisesti viestiksi, jotta se voi auttaa laitteen löydössä.</string>
     <string name="role_tak_tracker">Ottaa käyttöön automaattisen TAK PLI -lähetyksen ja vähentää rutiininomaisia lähetyksiä.</string>
+    <string name="rebroadcast_mode_all">Lähetä kaikki havaitut viestit uudelleen, jos se oli yksityisellä kanavallamme tai toisella verkolla, jolla on sama lora-parametrit.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Same as behavior as ALL but skips packet decoding and simply rebroadcasts them. Only available in Repeater role. Setting this on any other roles will result in ALL behavior.</string>
+    <string name="rebroadcast_mode_local_only">Ignores observed messages from foreign meshes that are open or those which it cannot decrypt. Only rebroadcasts message on the nodes local primary / secondary channels.</string>
+    <string name="rebroadcast_mode_known_only">Ignores observed messages from foreign meshes like LOCAL ONLY, but takes it step further by also ignoring messages from nodes not already in the node\'s known list.</string>
+    <string name="rebroadcast_mode_none">Tämä on sallittu vain SENSOR-, TRACKER- ja TAK_TRACKER -rooleille, mikä estää kaikki uudelleenlähetykset, ei toisin kuin CLIENT_MUTE -rooli.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing.</string>
     <string name="channel_name">Kanavan nimi</string>
     <string name="channel_options">Kanavan ominaisuudet</string>
     <string name="qr_code">QR koodi</string>
@@ -236,4 +245,32 @@
     <string name="encryption_pkc_text">Suorat viestit käyttävät uutta julkisen avaimen infrastruktuuria salaukseen. Vaatii firmware version 2.5 tai uudemman.</string>
     <string name="encryption_error">Julkinen avain ei täsmää</string>
     <string name="encryption_error_text">Julkinen avain ei vastaa kirjattua avainta. Voit poistaa noden ja antaa sen vaihtaa avaimia uudelleen, mutta tämä saattaa merkitä vakavampaa turvallisuusongelmaa. Ota yhteyttä käyttäjään toisen luotetun kanavan kautta määrittääksesi, johtuiko avain tehtaan resetoinnista tai muusta tarkoituksellisesta toiminnosta.</string>
+    <string name="request_userinfo">Pyydä käyttäjätietoja</string>
+    <string name="meshtastic_new_nodes_notifications">Uusi node ilmoitus</string>
+    <string name="more_details">Lisätietoja</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, a measure used in communications to quantify the level of a desired signal to the level of background noise. In Meshtastic and other wireless systems, a higher SNR indicates a clearer signal that can enhance the reliability and quality of data transmission.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Received Signal Strength Indicator, a measurement used to determine the power level being received by the antenna. A higher RSSI value generally indicates a stronger and more stable connection.</string>
+    <string name="iaq_definition">(Indoor Air Quality) relative scale IAQ value as measured by Bosch BME680. Value Range 0–500.</string>
+    <string name="device_metrics_log">Device Metrics Log</string>
+    <string name="node_map">Node Map</string>
+    <string name="position_log">Sijainnin Loki</string>
+    <string name="env_metrics_log">Environment Metrics Log</string>
+    <string name="sig_metrics_log">Signal Metrics Log</string>
+    <string name="administration">Ylläpito</string>
+    <string name="remote_admin">Etä Hallinta</string>
+    <string name="bad">Huono</string>
+    <string name="fair">Kohtalainen</string>
+    <string name="good">Hyvä</string>
+    <string name="none_quality">Ei mitään</string>
+    <string name="signal">Signaali</string>
+    <string name="signal_quality">Signaalin laatu</string>
+    <string name="traceroute_log">Reitinselvitys loki</string>
+    <string name="traceroute_direct">Suora</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 hop</item>
+        <item quantity="other">%d hyppyä</item>
+    </plurals>
+    <string name="traceroute_diff">Hops towards %1$d Hops back %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index 712d6f0fc..755cf8f29 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="node_filter_placeholder">Filtrer</string>
+    <string name="node_filter_placeholder">Filtre</string>
     <string name="desc_node_filter_clear">Effacer le filtre de nœud</string>
     <string name="node_filter_include_unknown">Inclure inconnu</string>
     <string name="node_filter_show_details">Afficher les détails</string>
     <string name="node_sort_alpha">A-Z</string>
     <string name="node_sort_channel">Canal</string>
     <string name="node_sort_distance">Distance</string>
-    <string name="node_sort_hops_away">Passer au suivant</string>
+    <string name="node_sort_hops_away">Nœuds intermédiaires</string>
     <string name="node_sort_last_heard">Dernière écoute</string>
     <string name="node_sort_via_mqtt">via MQTT</string>
     <string name="unrecognized">Non reconnu</string>
@@ -15,7 +15,7 @@
     <string name="message_status_queued">En attente d\'envoi</string>
     <string name="routing_error_none">Confirmé</string>
     <string name="routing_error_no_route">Pas de routage</string>
-    <string name="routing_error_got_nak">Sans accusé de réception</string>
+    <string name="routing_error_got_nak">Accusé de réception négatif</string>
     <string name="routing_error_timeout">Délai dépassé</string>
     <string name="routing_error_no_interface">Aucune interface</string>
     <string name="routing_error_max_retransmit">Retransmission maximale atteinte</string>
@@ -27,9 +27,12 @@
     <string name="routing_error_not_authorized">Non Autorisé</string>
     <string name="routing_error_pki_failed">Envoi chiffré échoué</string>
     <string name="routing_error_pki_unknown_pubkey">Clé publique inconnue</string>
+    <string name="routing_error_admin_bad_session_key">Mauvaise clé de session</string>
+    <string name="routing_error_admin_public_key_unauthorized">Clé publique non autorisée</string>
     <string name="role_client">Dispositif de messagerie autonome ou connecté à l\'application.</string>
     <string name="role_client_mute">Le périphérique ne peut pas retransmettre les paquets des autres périphériques.</string>
     <string name="role_router">Nœud d\'infrastructure pour étendre la couverture réseau en relayant les messages. Visible dans la liste des nœuds.</string>
+    <string name="role_router_client">Combinaison à la fois du ROUTER et du CLIENT. Pas pour les appareils mobiles.</string>
     <string name="role_repeater">Nœud d\'infrastructure permettant d\'étendre la couverture réseau en relayant les messages avec une couverture minimale. Non visible dans la liste des nœuds.</string>
     <string name="role_tracker">Diffuse les paquets de position GPS en priorité.</string>
     <string name="role_sensor">Diffuse les paquets de télémétrie en priorité.</string>
@@ -37,6 +40,12 @@
     <string name="role_client_hidden">Appareil qui ne diffuse que si nécessaire pour économiser en énergie ou en furtivité.</string>
     <string name="role_lost_and_found">Diffuse la localisation comme message vers le canal par défaut régulièrement afin d\'aider à la récupération de l\'appareil.</string>
     <string name="role_tak_tracker">Active les diffusions automatiques de TAK PLI et réduit les diffusions de routine.</string>
+    <string name="rebroadcast_mode_all">Rediffuse tout message observé, si il était sur notre canal privé ou depuis un autre maillage avec les mêmes paramètres lora.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Identique au comportement de TOUS mais ignore le décodage des paquets et les rediffuse simplement. Uniquement disponible pour le rôle Répéteur. Définir cela sur tout autre rôle entraînera le comportement de TOUS.</string>
+    <string name="rebroadcast_mode_local_only">Ignores observed messages from foreign meshes that are open or those which it cannot decrypt. Only rebroadcasts message on the nodes local primary / secondary channels.</string>
+    <string name="rebroadcast_mode_known_only">Ignores observed messages from foreign meshes like LOCAL ONLY, but takes it step further by also ignoring messages from nodes not already in the node\'s known list.</string>
+    <string name="rebroadcast_mode_none">Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing.</string>
     <string name="channel_name">Nom du canal</string>
     <string name="channel_options">Options du canal</string>
     <string name="qr_code">Code QR</string>
@@ -236,4 +245,32 @@
     <string name="encryption_pkc_text">Les messages directs utilisent la nouvelle infrastructure de clé publique pour le chiffrement. Nécessite une version de firmware 2.5 ou plus.</string>
     <string name="encryption_error">Les messages directs utilisent la nouvelle infrastructure de clé publique pour le chiffrement. Nécessite une version de firmware 2.5 ou plus.</string>
     <string name="encryption_error_text">La clé publique ne correspond pas à la clé enregistrée. Vous pouvez supprimer le nœud et le laisser à nouveau échanger les clés, mais cela peut indiquer un problème de sécurité plus grave. Contactez l\'utilisateur à travers un autre canal de confiance, pour déterminer si le changement de clé est dû à une réinitialisation d\'usine ou à une autre action intentionnelle.</string>
+    <string name="request_userinfo">Demander les informations de l\'utilisateur</string>
+    <string name="meshtastic_new_nodes_notifications">Notifications de nouveaux nœuds</string>
+    <string name="more_details">Plus de détails</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, a measure used in communications to quantify the level of a desired signal to the level of background noise. In Meshtastic and other wireless systems, a higher SNR indicates a clearer signal that can enhance the reliability and quality of data transmission.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Received Signal Strength Indicator, a measurement used to determine the power level being received by the antenna. A higher RSSI value generally indicates a stronger and more stable connection.</string>
+    <string name="iaq_definition">(Indoor Air Quality) relative scale IAQ value as measured by Bosch BME680. Value Range 0–500.</string>
+    <string name="device_metrics_log">Device Metrics Log</string>
+    <string name="node_map">Carte des nœuds</string>
+    <string name="position_log">Position Log</string>
+    <string name="env_metrics_log">Environment Metrics Log</string>
+    <string name="sig_metrics_log">Signal Metrics Log</string>
+    <string name="administration">Administration</string>
+    <string name="remote_admin">Administration à distance</string>
+    <string name="bad">Mauvais</string>
+    <string name="fair">Passable</string>
+    <string name="good">Bon</string>
+    <string name="none_quality">Aucun</string>
+    <string name="signal">Signal</string>
+    <string name="signal_quality">Qualité du signal</string>
+    <string name="traceroute_log">Traceroute Log</string>
+    <string name="traceroute_direct">Direct</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 hop</item>
+        <item quantity="other">%d hops</item>
+    </plurals>
+    <string name="traceroute_diff">Sauts vers %1$d Sauts retour %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-hu/strings.xml b/app/src/main/res/values-hu/strings.xml
index 3fba781e7..218771342 100644
--- a/app/src/main/res/values-hu/strings.xml
+++ b/app/src/main/res/values-hu/strings.xml
@@ -1,14 +1,51 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="node_filter_placeholder">Filter</string>
-    <string name="desc_node_filter_clear">clear node filter</string>
-    <string name="node_filter_include_unknown">Include unknown</string>
+    <string name="desc_node_filter_clear">állomás filter törlése</string>
+    <string name="node_filter_include_unknown">Ismeretlent tartalmaz</string>
+    <string name="node_filter_show_details">Részletek megjelenítése</string>
     <string name="node_sort_alpha">A-Z</string>
     <string name="node_sort_channel">Csatorna</string>
-    <string name="node_sort_distance">Distance</string>
-    <string name="node_sort_hops_away">Hops away</string>
-    <string name="node_sort_last_heard">Last heard</string>
-    <string name="node_sort_via_mqtt">via MQTT</string>
+    <string name="node_sort_distance">Távolság</string>
+    <string name="node_sort_hops_away">Ugrás Messzire</string>
+    <string name="node_sort_last_heard">Utoljára hallott</string>
+    <string name="node_sort_via_mqtt">MQTT-n Keresztül</string>
+    <string name="unrecognized">Ismeretlen</string>
+    <string name="message_status_enroute">Visszajelzésre vár</string>
+    <string name="message_status_queued">Elküldésre vár</string>
+    <string name="routing_error_none">Visszaigazolva</string>
+    <string name="routing_error_no_route">Nincs út</string>
+    <string name="routing_error_got_nak">Received a negative acknowledgment</string>
+    <string name="routing_error_timeout">Időtúllépés</string>
+    <string name="routing_error_no_interface">Nincs Interfész</string>
+    <string name="routing_error_max_retransmit">Maximális Újraküldés Elérve</string>
+    <string name="routing_error_no_channel">Nincs Csatorna</string>
+    <string name="routing_error_too_large">Túl nagy csomag</string>
+    <string name="routing_error_no_response">Nincs Válasz</string>
+    <string name="routing_error_bad_request">Hibás kérés</string>
+    <string name="routing_error_duty_cycle_limit">Helyi Üzemciklus Határ Elérve</string>
+    <string name="routing_error_not_authorized">Nem Engedélyezett</string>
+    <string name="routing_error_pki_failed">Titkosított Küldés Sikertelen</string>
+    <string name="routing_error_pki_unknown_pubkey">Nem Ismert Publikus Kulcs</string>
+    <string name="routing_error_admin_bad_session_key">Hibás munkamenet kulcs</string>
+    <string name="routing_error_admin_public_key_unauthorized">Nem Engedélyezett Publikus Kulcs</string>
+    <string name="role_client">App connected or standalone messaging device.</string>
+    <string name="role_client_mute">Device that does not forward packets from other devices.</string>
+    <string name="role_router">Infrastructure node for extending network coverage by relaying messages. Visible in nodes list.</string>
+    <string name="role_router_client">Combination of both ROUTER and CLIENT. Not for mobile devices.</string>
+    <string name="role_repeater">Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in nodes list.</string>
+    <string name="role_tracker">Broadcasts GPS position packets as priority.</string>
+    <string name="role_sensor">Broadcasts telemetry packets as priority.</string>
+    <string name="role_tak">Optimized for ATAK system communication, reduces routine broadcasts.</string>
+    <string name="role_client_hidden">Device that only broadcasts as needed for stealth or power savings.</string>
+    <string name="role_lost_and_found">Broadcasts location as message to default channel regularly for to assist with device recovery.</string>
+    <string name="role_tak_tracker">Enables automatic TAK PLI broadcasts and reduces routine broadcasts.</string>
+    <string name="rebroadcast_mode_all">Rebroadcast any observed message, if it was on our private channel or from another mesh with the same lora parameters.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Same as behavior as ALL but skips packet decoding and simply rebroadcasts them. Only available in Repeater role. Setting this on any other roles will result in ALL behavior.</string>
+    <string name="rebroadcast_mode_local_only">Ignores observed messages from foreign meshes that are open or those which it cannot decrypt. Only rebroadcasts message on the nodes local primary / secondary channels.</string>
+    <string name="rebroadcast_mode_known_only">Ignores observed messages from foreign meshes like LOCAL ONLY, but takes it step further by also ignoring messages from nodes not already in the node\'s known list.</string>
+    <string name="rebroadcast_mode_none">Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing.</string>
     <string name="channel_name">Csatorna neve</string>
     <string name="channel_options">Csatorna opciók</string>
     <string name="qr_code">QR kód</string>
@@ -18,7 +55,7 @@
     <string name="unknown_username">Ismeretlen felhasználónév</string>
     <string name="send">Küldeni</string>
     <string name="send_text">Szöveg elküldése</string>
-    <string name="warning_not_paired">Még nem párosított egyetlen Meshtastic rádiót sem ehhez a telefonhoz. Kérem pároztasson egyet és állítsa be a felhasználónevet.\n\nEz a szabad forráskódú alkalmazás fejlesztés alatt áll, ha hibát talál kérem írjon a projekt fórumába: meshtastic.discourse.group.\n\nBővebb információért látogasson el a projekt veboldalára - www.meshtastic.org.</string>
+    <string name="warning_not_paired">Még nem párosított egyetlen Meshtastic rádiót sem ehhez a telefonhoz. Kérem pároztasson egyet és állítsa be a felhasználónevet.\n\nEz a szabad forráskódú alkalmazás fejlesztés alatt áll, ha hibát talál kérem írjon a projekt fórumába: meshtastic.discourse.group.\n\nBővebb információért látogasson el a projekt weboldalára - www.meshtastic.org.</string>
     <string name="you">Te</string>
     <string name="your_name">A neve</string>
     <string name="analytics_okay">Névtelen felhasználási statisztikák és hibajelentések.</string>
@@ -54,6 +91,7 @@
     <string name="app_too_old">Az alkalmazás frissítése szükséges</string>
     <string name="must_update">Frissítenie kell ezt az alkalmazást a Google Play áruházban (vagy a GitHub-ról), mert túl régi, hogy kommunikálni tudjob ezzel a rádió firmware-rel. Kérem olvassa el a tudnivalókat ebből a <a href="https://meshtastic.org/docs/software/android/installation">docs</a>-ből.</string>
     <string name="none">Egyik sem (letiltás)</string>
+    <string name="modem_config_turbo">Rövid Távolság / Turbó</string>
     <string name="modem_config_short">Rövid hatótáv (gyors)</string>
     <string name="modem_config_medium">Közepes hatótáv (gyors)</string>
     <string name="modem_config_long">Távoli hatótáv (gyors)</string>
@@ -61,7 +99,7 @@
     <string name="modem_config_very_long">Nagyon távoli hatótáv (lassú)</string>
     <string name="modem_config_unrecognized">FELISMERHETETLEN</string>
     <string name="meshtastic_service_notifications">Szolgáltatás értesítések</string>
-    <string name="location_disabled_warning">Be kell kapcsolja a (nagy pontosságú) helyzet szolgáltatásokat az Android beállításokban</string>
+    <string name="location_disabled_warning">Be kell kapcsolja a helyzet szolgáltatásokat az Android beállításokban.</string>
     <string name="about">A programról</string>
     <string name="text_messages">Szöveges üzenetek</string>
     <string name="channel_invalid">Ez a csatorna URL érvénytelen, ezért nem használható.</string>
@@ -124,6 +162,7 @@
     <string name="preferences_system_default">Alapbeállítás</string>
     <string name="resend">Újraküldés</string>
     <string name="shutdown">Leállítás</string>
+    <string name="cant_shutdown">Leállítás nem támogatott ezen az eszközön</string>
     <string name="reboot">Újraindítás</string>
     <string name="traceroute">Traceroute</string>
     <string name="intro_show">Bemutatkozás megjelenítése</string>
@@ -146,9 +185,9 @@
     <string name="direct_message">Közvetlen üzenet</string>
     <string name="nodedb_reset">NodeDB törlése</string>
     <string name="nodedb_reset_description">Ezzel minden állomást törölni fogsz erről listáról.</string>
-    <string name="delivery_confirmed">Delivery confirmed</string>
-    <string name="error">Error</string>
-    <string name="ignore">Ignore</string>
+    <string name="delivery_confirmed">Kézbesítés sikeres</string>
+    <string name="error">Hiba</string>
+    <string name="ignore">Mellőzés</string>
     <string name="ignore_add">Add \'%s\' to ignore list?</string>
     <string name="ignore_remove">Remove \'%s\' from ignore list?</string>
     <string name="map_select_download_region">Válassz letöltési régiót</string>
@@ -159,7 +198,7 @@
     <string name="device_settings">Eszköz beállítások</string>
     <string name="module_settings">Modul beállítások</string>
     <string name="add">Új hozzáadása</string>
-    <string name="edit">Edit</string>
+    <string name="edit">Szerkesztés</string>
     <string name="calculating">Számolás…</string>
     <string name="map_offline_manager">Offline kezelő</string>
     <string name="map_cache_size">Gyorsítótár mérete jelenleg</string>
@@ -178,11 +217,60 @@
     <string name="waypoint_new">Új útpont</string>
     <string name="waypoint_received">Received waypoint: %s</string>
     <string name="error_duty_cycle">Duty Cycle limit reached. Cannot send messages right now, please try again later.</string>
-    <string name="remove">Remove</string>
+    <string name="remove">Törlés</string>
     <string name="remove_node_text">This node will be removed from your list until your node receives data from it again.</string>
-    <string name="mute">Mute</string>
-    <string name="mute_notifications">Mute notifications</string>
-    <string name="mute_8_hours">8 hours</string>
-    <string name="mute_1_week">1 week</string>
-    <string name="mute_always">Always</string>
+    <string name="mute">Némítás</string>
+    <string name="mute_notifications">Értesítések némítása</string>
+    <string name="mute_8_hours">8 óra</string>
+    <string name="mute_1_week">1 hét</string>
+    <string name="mute_always">Mindig</string>
+    <string name="replace">Csere</string>
+    <string name="wifi_qr_code_scan">WiFi QR kód szkennelése</string>
+    <string name="wifi_qr_code_error">Invalid WiFi Credential QR code format</string>
+    <string name="navigate_back">Vissza</string>
+    <string name="battery">Akkumulátor</string>
+    <string name="channel_utilization">Csatornahasználat</string>
+    <string name="air_utilization">Légidőhasználat</string>
+    <string name="temperature">Hőmérséklet</string>
+    <string name="humidity">Páratartalom</string>
+    <string name="logs">Naplók</string>
+    <string name="hops_away">Ugrás Messzire</string>
+    <string name="info">Információ</string>
+    <string name="ch_util_definition">Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).</string>
+    <string name="air_util_definition">Percent of airtime for transmission used within the last hour.</string>
+    <string name="iaq">IAQ</string>
+    <string name="encryption_psk">Megosztott kulcs</string>
+    <string name="encryption_psk_text">Direct messages are using the shared key for the channel.</string>
+    <string name="encryption_pkc">Publikus Kulcs Titkosítás</string>
+    <string name="encryption_pkc_text">Direct messages are using the new public key infrastructure for encryption. Requires firmware version 2.5 or greater.</string>
+    <string name="encryption_error">Publikus kulcs nem egyezik</string>
+    <string name="encryption_error_text">The public key does not match the recorded key. You may remove the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action.</string>
+    <string name="request_userinfo">Felhasználó információ kérése</string>
+    <string name="meshtastic_new_nodes_notifications">Új állomás értesítések</string>
+    <string name="more_details">Több részlet</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, a measure used in communications to quantify the level of a desired signal to the level of background noise. In Meshtastic and other wireless systems, a higher SNR indicates a clearer signal that can enhance the reliability and quality of data transmission.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Received Signal Strength Indicator, a measurement used to determine the power level being received by the antenna. A higher RSSI value generally indicates a stronger and more stable connection.</string>
+    <string name="iaq_definition">(Indoor Air Quality) relative scale IAQ value as measured by Bosch BME680. Value Range 0–500.</string>
+    <string name="device_metrics_log">Eszközmérő Napló</string>
+    <string name="node_map">Állomás Térkép</string>
+    <string name="position_log">Pozíciónapló</string>
+    <string name="env_metrics_log">Környezeti Mérés Napló</string>
+    <string name="sig_metrics_log">Jelminőség Napló</string>
+    <string name="administration">Adminisztráció</string>
+    <string name="remote_admin">Távoli Adminisztráció</string>
+    <string name="bad">Rossz</string>
+    <string name="fair">Megfelelő</string>
+    <string name="good">Jó</string>
+    <string name="none_quality">Semmi</string>
+    <string name="signal">Jel</string>
+    <string name="signal_quality">Jelminőség</string>
+    <string name="traceroute_log">Traceroute napló</string>
+    <string name="traceroute_direct">Közvetlen</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 ugrás</item>
+        <item quantity="other">%d ugrások</item>
+    </plurals>
+    <string name="traceroute_diff">Ugrások oda %1$d Vissza %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 7c54b9106..f53293155 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <resources>
     <color name="colorOnPrimary">#141414</color>
     <color name="colorPrimary">#67EA94</color>
diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml
index 8bb75feca..d4ef15b41 100644
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -2,6 +2,50 @@
 <resources>
     <string name="node_filter_placeholder">Filter</string>
     <string name="desc_node_filter_clear">wis node filter</string>
+    <string name="node_filter_include_unknown">Include onbekend</string>
+    <string name="node_filter_show_details">Toon details</string>
+    <string name="node_sort_alpha">A-Z</string>
+    <string name="node_sort_channel">Kanaal</string>
+    <string name="node_sort_distance">Afstand</string>
+    <string name="node_sort_hops_away">Aantal sprongen</string>
+    <string name="node_sort_last_heard">Laatst gehoord</string>
+    <string name="node_sort_via_mqtt">via MQTT</string>
+    <string name="unrecognized">Niet herkend</string>
+    <string name="message_status_enroute">Wachten op bevestiging</string>
+    <string name="message_status_queued">In behandeling</string>
+    <string name="routing_error_none">Bevestigd</string>
+    <string name="routing_error_no_route">Geen route</string>
+    <string name="routing_error_got_nak">Negatieve bevestiging ontvangen</string>
+    <string name="routing_error_timeout">Time-Out</string>
+    <string name="routing_error_no_interface">Geen Interface</string>
+    <string name="routing_error_max_retransmit">Maximum Pogingen Bereikt</string>
+    <string name="routing_error_no_channel">Geen Kanaal</string>
+    <string name="routing_error_too_large">Pakket te groot</string>
+    <string name="routing_error_no_response">Geen antwoord</string>
+    <string name="routing_error_bad_request">Slechte Aanvraag</string>
+    <string name="routing_error_duty_cycle_limit">Regionale limiet inschakeltijd bereikt</string>
+    <string name="routing_error_not_authorized">Niet Bevoegd</string>
+    <string name="routing_error_pki_failed">Versleuteld Zenden Mislukt</string>
+    <string name="routing_error_pki_unknown_pubkey">Onbekende publieke sleutel</string>
+    <string name="routing_error_admin_bad_session_key">Ongeldige sessiesleutel</string>
+    <string name="routing_error_admin_public_key_unauthorized">Openbare sleutel niet toegestaan</string>
+    <string name="role_client">Toestel geeft geen pakketten door van andere toestellen.</string>
+    <string name="role_client_mute">Apparaat stuurt geen pakketten van andere apparaten.</string>
+    <string name="role_router">Infrastructuur node om netwerk bereik te vergroten door berichten door te geven. Zichtbare in noden lijst.</string>
+    <string name="role_router_client">Combinatie van ROUTER en CLIENT. Niet voor mobiele toestellen.</string>
+    <string name="role_repeater">Infrastructuur node om netwerk bereik te vergroten door berichten door te geven zonder overtolligheid. Niet zichtbaar in noden lijst.</string>
+    <string name="role_tracker">Zend GPS positie pakketjes met prioriteit.</string>
+    <string name="role_sensor">Zend telemetrie pakketjes met prioriteit.</string>
+    <string name="role_tak">Geoptimaliseerd voor ATAK communicatie systeem, beperkt routine zendingen.</string>
+    <string name="role_client_hidden">Zend enkel indien nodig voor spaarstand of verborgenheid.</string>
+    <string name="role_lost_and_found">Zend locatie regelmatig als bericht via het standaard kanaal voor zoektocht apparaat.</string>
+    <string name="role_tak_tracker">Activeer automatisch zenden TAK PLI en beperk routine zendingen.</string>
+    <string name="rebroadcast_mode_all">Herzend ontvangen berichten indien ontvangen op eigen privé kanaal of van een ander toestel met dezelfde lora instellingen.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Hetzelfde gedrag als ALL maar sla pakketdecodering over en herzendt opnieuw. Alleen beschikbaar in Repeater rol. Het instellen van dit op andere rollen resulteert in ALL gedrag.</string>
+    <string name="rebroadcast_mode_local_only">Negeert waargenomen berichten van open vreemde mazen of die welke niet kunnen decoderen. Alleen heruitzenden bericht op de nodes lokale primaire / secundaire kanalen.</string>
+    <string name="rebroadcast_mode_known_only">Negeert alleen waargenomen berichten van vreemde meshes zoals LOCAL ONLY, maar gaat een stap verder door ook berichten van knooppunten te negeren die nog niet in de bekende lijst van knooppunten staan.</string>
+    <string name="rebroadcast_mode_none">Alleen toegestaan voor SENSOR, TRACKER en TAK_TRACKER rollen, dit zal alle heruitzendingen beperken, niet in tegenstelling tot CLIENT_MUTE rol.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Negeert pakketten van niet-standaard portnums, zoals: TAK, RangeTest, PaxCounter, etc. Herzendt alleen pakketten met standaard portnummers: NodeInfo, Text, Positie, Telemetry, en Routing.</string>
     <string name="channel_name">Kanaal Naam</string>
     <string name="channel_options">Kanaal opties</string>
     <string name="qr_code">QR code</string>
@@ -47,6 +91,7 @@
     <string name="app_too_old">Applicatie te oud</string>
     <string name="must_update">Applicatie update noodzakelijk in Google Play store (of Github). Deze versie is te oud om te praten met deze radio.</string>
     <string name="none">Geen (inactief)</string>
+    <string name="modem_config_turbo">Kort Bereik / Turbo</string>
     <string name="modem_config_short">Klein bereik (snel)</string>
     <string name="modem_config_medium">Medium bereik (snel)</string>
     <string name="modem_config_long">Groot bereik (snel)</string>
@@ -54,7 +99,7 @@
     <string name="modem_config_very_long">Zeer groot bereik (traag)</string>
     <string name="modem_config_unrecognized">ONBEKEND</string>
     <string name="meshtastic_service_notifications">Service berichten</string>
-    <string name="location_disabled_warning">Noodzakelijk de (nauwkeurige) positioneringsservice te activeren in Android Instellingen. Je kunt dit achteraf weer uitzetten.</string>
+    <string name="location_disabled_warning">Noodzakelijk de positioneringsservice te activeren in Android Instellingen. Je kunt dit achteraf weer uitzetten.</string>
     <string name="about">Over</string>
     <string name="text_messages">Tekstberichten</string>
     <string name="channel_invalid">Deze Kanaal URL is ongeldig en kan niet worden gebruikt</string>
@@ -117,6 +162,7 @@
     <string name="preferences_system_default">Systeemstandaard</string>
     <string name="resend">Opnieuw verzenden</string>
     <string name="shutdown">Uitschakelen</string>
+    <string name="cant_shutdown">Uitschakelen niet ondersteund op dit apparaat</string>
     <string name="reboot">Herstarten</string>
     <string name="traceroute">Traceroute</string>
     <string name="intro_show">Toon introductie</string>
@@ -152,6 +198,7 @@
     <string name="device_settings">Radio configuratie</string>
     <string name="module_settings">Module configuratie</string>
     <string name="add">Toevoegen</string>
+    <string name="edit">Bewerken</string>
     <string name="calculating">Berekenen…</string>
     <string name="map_offline_manager">Offline Manager</string>
     <string name="map_cache_size">Huidige cache grootte</string>
@@ -177,4 +224,53 @@
     <string name="mute_8_hours">8 uur</string>
     <string name="mute_1_week">1 week</string>
     <string name="mute_always">Altijd</string>
+    <string name="replace">Vervang</string>
+    <string name="wifi_qr_code_scan">Scan WiFi QR-code</string>
+    <string name="wifi_qr_code_error">Ongeldige WiFi Credential QR-code formaat</string>
+    <string name="navigate_back">Ga terug</string>
+    <string name="battery">Batterij</string>
+    <string name="channel_utilization">Kanaalgebruik</string>
+    <string name="air_utilization">Luchtverbruik</string>
+    <string name="temperature">Temperatuur</string>
+    <string name="humidity">Vochtigheid</string>
+    <string name="logs">Logs</string>
+    <string name="hops_away">Aantal sprongen</string>
+    <string name="info">Informatie</string>
+    <string name="ch_util_definition">Gebruik voor het huidige kanaal, inclusief goed gevormde TX, RX en misvormde RX (ruis).</string>
+    <string name="air_util_definition">Percentage van de zendtijd die het afgelopen uur werd gebruikt.</string>
+    <string name="iaq">IAQ</string>
+    <string name="encryption_psk">Gedeelde Key</string>
+    <string name="encryption_psk_text">Directe berichten gebruiken de gedeelde sleutel voor het kanaal.</string>
+    <string name="encryption_pkc">Publieke sleutel encryptie</string>
+    <string name="encryption_pkc_text">Directe berichten gebruiken de nieuwe openbare sleutel infrastructuur voor versleuteling. Vereist firmware versie 2.5 of hoger.</string>
+    <string name="encryption_error">Publieke sleutel komt niet overeen</string>
+    <string name="encryption_error_text">De publieke sleutel komt niet overeen met de opgenomen sleutel. Je kan de node verwijderen en opnieuw een sleutel laten uitwisselen, maar dit kan duiden op een ernstiger beveiligingsprobleem. Neem contact op met de gebruiker via een ander vertrouwd kanaal, om te bepalen of de sleutel gewijzigd is door een reset naar de fabrieksinstellingen of andere opzettelijke actie.</string>
+    <string name="request_userinfo">Gebruikergegevens opvragen</string>
+    <string name="meshtastic_new_nodes_notifications">Nieuwe node meldingen</string>
+    <string name="more_details">Meer details</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, een meeting die wordt gebruikt in de communicatie om het niveau van een gewenst signaal tegenover achtergrondlawaai te kwantificeren. In Meshtastische en andere draadloze systemen geeft een hoger SNR een zuiverder signaal aan dat de betrouwbaarheid en kwaliteit van de gegevensoverdracht kan verbeteren.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Ontvangen Signal Sterkte Indicator, een meting gebruikt om het stroomniveau te bepalen dat de antenne ontvangt. Een hogere RSSI-waarde geeft een sterkere en stabielere verbinding aan.</string>
+    <string name="iaq_definition">(Binnenluchtkwaliteit) relatieve schaal IAQ waarde gemeten door Bosch BME680. Waarde tussen 0 en 500.</string>
+    <string name="device_metrics_log">Apparaat Statistieken Log</string>
+    <string name="node_map">Node Kaart</string>
+    <string name="position_log">Positie Logboek</string>
+    <string name="env_metrics_log">Omgevingsstatistieken logboek</string>
+    <string name="sig_metrics_log">Signaal Statistieken Logboek</string>
+    <string name="administration">Beheer</string>
+    <string name="remote_admin">Extern Beheer</string>
+    <string name="bad">Slecht</string>
+    <string name="fair">Matig</string>
+    <string name="good">Goed</string>
+    <string name="none_quality">Geen</string>
+    <string name="signal">Signaal</string>
+    <string name="signal_quality">Signaal-kwaliteit</string>
+    <string name="traceroute_log">Traceroute log</string>
+    <string name="traceroute_direct">Direct</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 hop</item>
+        <item quantity="other">%d hops</item>
+    </plurals>
+    <string name="traceroute_diff">Sprongen richting %1$d Springt terug %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml
index 96a312931..4c6dd666f 100644
--- a/app/src/main/res/values-pl/strings.xml
+++ b/app/src/main/res/values-pl/strings.xml
@@ -18,7 +18,7 @@
     <string name="routing_error_got_nak">Otrzymano negatywne potwierdzenie</string>
     <string name="routing_error_timeout">Upłynął limit czasu</string>
     <string name="routing_error_no_interface">Brak interfejsu</string>
-    <string name="routing_error_max_retransmit">Osiągnięto maksymalną liczbę retransmisji</string>
+    <string name="routing_error_max_retransmit">Przekroczono czas lub liczbę retransmisji</string>
     <string name="routing_error_no_channel">Brak kanału</string>
     <string name="routing_error_too_large">Pakiet jest zbyt duży</string>
     <string name="routing_error_no_response">Brak odpowiedzi</string>
@@ -42,7 +42,7 @@
     <string name="role_tak_tracker">Umożliwia automatyczne transmisje TAK PLI i zmniejsza liczbę nadmiarowych transmisji.</string>
     <string name="rebroadcast_mode_all">Przekazuje ponownie każdy odebrany pakiet, niezależnie od tego, czy został wysłany na nasz prywatny kanał, czy z innej sieci Mesh o tych samych parametrach radia.</string>
     <string name="rebroadcast_mode_all_skip_decoding">To samo zachowanie co ALL, ale pomija dekodowanie pakietów i po prostu je retransmituje. Dostępne tylko w roli REPEATER. Ustawienie tego w innych rolach spowoduje zachowanie jak ALL.</string>
-    <string name="rebroadcast_mode_local_only">Ignoruje odebrane pakiety z obcych sieci Mesh, które są otwarte lub których nie może odszyfrować. Retransmituje wiadomość tylko na lokalnych kanałach primary / secondary.</string>
+    <string name="rebroadcast_mode_local_only">Ignoruje odebrane pakiety z obcych sieci Mesh, które są otwarte lub których nie można odszyfrować. Retransmituje wiadomość tylko na lokalnych kanałach primary / secondary.</string>
     <string name="rebroadcast_mode_known_only">Ignoruje odebrane pakiety z obcych sieci, podobnie jak LOCAL_ONLY, ale idzie o krok dalej, ignorując również pakiety z węzłów, które nie znajdują się jeszcze na liście znanych węzłów.</string>
     <string name="rebroadcast_mode_none">Dozwolone wyłącznie dla ról SENSOR, TRACKER i TAK_TRACKER. Spowoduje to zablokowanie wszystkich retransmisji, podobnie jak rola CLIENT_MUTE.</string>
     <string name="rebroadcast_mode_core_portnums_only">Ignoruje niestandardowe pakiety (non-standard portnums) takie jak: TAK, RangeTest, PaxCounter, itp. Przekazuje dalej jedynie standardowe pakiety (standard portnums): NodeInfo, Text, Position, Telemetry oraz Routing.</string>
@@ -104,7 +104,7 @@
     <string name="text_messages">Wiadomości tekstowe</string>
     <string name="channel_invalid">Ten adres URL kanału jest nieprawidłowy i nie można go użyć</string>
     <string name="debug_panel">Panel debugowania</string>
-    <string name="debug_last_messages">Ostatnie 500 wiadomości</string>
+    <string name="debug_last_messages">Ostatnie 500 zdarzeń</string>
     <string name="clear">Czyść</string>
     <string name="updating_firmware">Aktualizuję oprogramowanie, poczekaj chwilę…</string>
     <string name="update_successful">Aktualizacja zakończona sukcesem</string>
@@ -235,7 +235,7 @@
     <string name="air_utilization">Wykorzystanie eteru</string>
     <string name="temperature">Temperatura</string>
     <string name="humidity">Wilgotność</string>
-    <string name="logs">Logi</string>
+    <string name="logs">Rejestry zdarzeń (logs)</string>
     <string name="hops_away">Skoków</string>
     <string name="info">Informacja</string>
     <string name="ch_util_definition">Wykorzystanie dla bieżącego kanału, w tym prawidłowego TX/RX oraz zniekształconego RX (czyli szumu).</string>
@@ -254,21 +254,21 @@
     <string name="snr_definition">Współczynnik sygnału do szumu (Signal-to-Noise Ratio) - miara stosowana w komunikacji do określania poziomu pożądanego sygnału w stosunku do poziomu szumu tła. W Meshtastic i innych systemach bezprzewodowych wyższy współczynnik SNR oznacza czystszy sygnał, który może zwiększyć niezawodność i jakość transmisji danych.</string>
     <string name="rssi">RSSI</string>
     <string name="rssi_definition">Received Signal Strength Indicator - miara używana do określenia poziomu mocy odbieranej przez antenę. Wyższa wartość RSSI zazwyczaj oznacza silniejsze i bardziej stabilne połączenie.</string>
-    <string name="iaq_definition">(Jakość powietrza w pomieszczeniach) wartość względna w skali IAQ mierzona urządzeniem BME680. Zakres wartości: 0–500.</string>
-    <string name="device_metrics_log">Log telemetrii urządzenia</string>
+    <string name="iaq_definition">Jakość powietrza w pomieszczeniach (Indoor Air Quality) - wartość względna w skali IAQ mierzona czujnikiem BME680. Zakres wartości: 0–500.</string>
+    <string name="device_metrics_log">Historia telemetrii</string>
     <string name="node_map">Ślad na mapie</string>
-    <string name="position_log">Log pozycji</string>
-    <string name="env_metrics_log">Log danych środowiskowych</string>
-    <string name="sig_metrics_log">Log danych dot. sygnału</string>
+    <string name="position_log">Historia pozycji</string>
+    <string name="env_metrics_log">Historia danych otoczenia</string>
+    <string name="sig_metrics_log">Historia danych sygnału</string>
     <string name="administration">Zarządzanie</string>
     <string name="remote_admin">Zdalne zarządzanie</string>
-    <string name="bad">Zły</string>
-    <string name="fair">Wystarczający</string>
-    <string name="good">Dobry</string>
-    <string name="none_quality">Brak</string>
-    <string name="signal">Sygnał</string>
+    <string name="bad">zły</string>
+    <string name="fair">wystarczający</string>
+    <string name="good">dobry</string>
+    <string name="none_quality">brak</string>
+    <string name="signal">Sygnał:</string>
     <string name="signal_quality">Jakość sygnału</string>
-    <string name="traceroute_log">Log sprawdzania trasy</string>
+    <string name="traceroute_log">Historia sprawdzania trasy</string>
     <string name="traceroute_direct">Bezpośrednio</string>
     <plurals name="traceroute_hops">
         <item quantity="one">1 skok</item>
@@ -276,5 +276,6 @@
         <item quantity="many">%d skoki</item>
         <item quantity="other">%d skoków</item>
     </plurals>
-    <string name="traceroute_diff">Trasa do %1$d Trasa z %2$d</string>
+    <string name="traceroute_diff">Skoki do: %1$d. Skoki od: %2$d</string>
+    <string name="copy">Kopiuj</string>
 </resources>
diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml
index 8c36de16e..bdfc2ad68 100644
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -27,9 +27,12 @@
     <string name="routing_error_not_authorized">Not Authorized</string>
     <string name="routing_error_pki_failed">Encrypted Send Failed</string>
     <string name="routing_error_pki_unknown_pubkey">Unknown Public Key</string>
+    <string name="routing_error_admin_bad_session_key">Bad session key</string>
+    <string name="routing_error_admin_public_key_unauthorized">Public Key unauthorized</string>
     <string name="role_client">App connected or standalone messaging device.</string>
     <string name="role_client_mute">Device that does not forward packets from other devices.</string>
     <string name="role_router">Infrastructure node for extending network coverage by relaying messages. Visible in nodes list.</string>
+    <string name="role_router_client">Combination of both ROUTER and CLIENT. Not for mobile devices.</string>
     <string name="role_repeater">Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in nodes list.</string>
     <string name="role_tracker">Broadcasts GPS position packets as priority.</string>
     <string name="role_sensor">Broadcasts telemetry packets as priority.</string>
@@ -37,6 +40,12 @@
     <string name="role_client_hidden">Device that only broadcasts as needed for stealth or power savings.</string>
     <string name="role_lost_and_found">Broadcasts location as message to default channel regularly for to assist with device recovery.</string>
     <string name="role_tak_tracker">Enables automatic TAK PLI broadcasts and reduces routine broadcasts.</string>
+    <string name="rebroadcast_mode_all">Rebroadcast any observed message, if it was on our private channel or from another mesh with the same lora parameters.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Same as behavior as ALL but skips packet decoding and simply rebroadcasts them. Only available in Repeater role. Setting this on any other roles will result in ALL behavior.</string>
+    <string name="rebroadcast_mode_local_only">Ignores observed messages from foreign meshes that are open or those which it cannot decrypt. Only rebroadcasts message on the nodes local primary / secondary channels.</string>
+    <string name="rebroadcast_mode_known_only">Ignores observed messages from foreign meshes like LOCAL ONLY, but takes it step further by also ignoring messages from nodes not already in the node\'s known list.</string>
+    <string name="rebroadcast_mode_none">Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing.</string>
     <string name="channel_name">Имя канала</string>
     <string name="channel_options">Настройки канала</string>
     <string name="qr_code">QR код</string>
@@ -90,7 +99,7 @@
     <string name="modem_config_very_long">Очень большое расстояние / Медленный</string>
     <string name="modem_config_unrecognized">НЕРАСПОЗНАНО</string>
     <string name="meshtastic_service_notifications">Служебные уведомления</string>
-    <string name="location_disabled_warning">Локация должна быть включена (высокая точность), чтобы найти новые устройства с помощью bluetooth. Вы можете выключить его позже.</string>
+    <string name="location_disabled_warning">Локация должна быть включена, чтобы найти новые устройства с помощью bluetooth. Вы можете выключить его позже.</string>
     <string name="about">О программе</string>
     <string name="text_messages">Текстовые сообщения</string>
     <string name="channel_invalid">Этот URL-адрес канала недействителен и не может быть использован</string>
@@ -238,4 +247,34 @@
     <string name="encryption_pkc_text">Direct messages are using the new public key infrastructure for encryption. Requires firmware version 2.5 or greater.</string>
     <string name="encryption_error">Public key mismatch</string>
     <string name="encryption_error_text">The public key does not match the recorded key. You may remove the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action.</string>
+    <string name="request_userinfo">Request user info</string>
+    <string name="meshtastic_new_nodes_notifications">New node notifications</string>
+    <string name="more_details">More details</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, a measure used in communications to quantify the level of a desired signal to the level of background noise. In Meshtastic and other wireless systems, a higher SNR indicates a clearer signal that can enhance the reliability and quality of data transmission.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Received Signal Strength Indicator, a measurement used to determine the power level being received by the antenna. A higher RSSI value generally indicates a stronger and more stable connection.</string>
+    <string name="iaq_definition">(Indoor Air Quality) relative scale IAQ value as measured by Bosch BME680. Value Range 0–500.</string>
+    <string name="device_metrics_log">Device Metrics Log</string>
+    <string name="node_map">Node Map</string>
+    <string name="position_log">Position Log</string>
+    <string name="env_metrics_log">Environment Metrics Log</string>
+    <string name="sig_metrics_log">Signal Metrics Log</string>
+    <string name="administration">Administration</string>
+    <string name="remote_admin">Remote Administration</string>
+    <string name="bad">Bad</string>
+    <string name="fair">Fair</string>
+    <string name="good">Good</string>
+    <string name="none_quality">None</string>
+    <string name="signal">Signal</string>
+    <string name="signal_quality">Signal Quality</string>
+    <string name="traceroute_log">Traceroute Log</string>
+    <string name="traceroute_direct">Direct</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 hop</item>
+        <item quantity="few">%d hops</item>
+        <item quantity="many">%d hops</item>
+        <item quantity="other">%d hops</item>
+    </plurals>
+    <string name="traceroute_diff">Hops towards %1$d Hops back %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 891b4ea27..9224c92bb 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -27,9 +27,12 @@
     <string name="routing_error_not_authorized">Yetkisiz</string>
     <string name="routing_error_pki_failed">Şifreli Gönderme Başarısız</string>
     <string name="routing_error_pki_unknown_pubkey">Bilinmeyen Genel Anahtar</string>
+    <string name="routing_error_admin_bad_session_key">Hatalı oturum anahtarı</string>
+    <string name="routing_error_admin_public_key_unauthorized">Genel Anahtar yetkisiz</string>
     <string name="role_client">Uygulamaya bağlı veya bağımsız mesajlaşma cihazı.</string>
     <string name="role_client_mute">Diğer cihazlardan gelen paketleri tekrarlamayan cihaz.</string>
     <string name="role_router">Mesajları tekrarlayarak ağ kapsamını genişletmek için altyapı düğümü. Düğümler listesinde görünür.</string>
+    <string name="role_router_client">Hem ROUTER hem de CLIENT\'ın bir kombinasyonu. Mobil cihazlar için değildir.</string>
     <string name="role_repeater">Mesajları minimum ek yük ile tekrarlayarak ağ kapsamını genişletmek için altyapı düğümü. Düğümler listesinde görünmez.</string>
     <string name="role_tracker">Öncelikli olarak konum paketlerini yayınlar.</string>
     <string name="role_sensor">Öncelikli olarak telemetri paketlerini yayınlar.</string>
@@ -37,6 +40,12 @@
     <string name="role_client_hidden">Gizlilik veya güç tasarrufu için sadece gerektiğinde yayın yapan cihaz.</string>
     <string name="role_lost_and_found">Cihazın kurtarılmasına yardımcı olmak için konumunu düzenli olarak varsayılan kanala mesaj olarak gönderir.</string>
     <string name="role_tak_tracker">Rutin yayınları azaltarak otomatik TAK PLI yayınlarını etkinleştirir.</string>
+    <string name="rebroadcast_mode_all">Tespit edilen herhangi bir mesajı, özel kanalımızdaysa veya aynı LoRa parametrelerine sahip başka bir ağdan geliyorsa yeniden yayınlayın.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">ALL ile aynı davranış, ancak paketleri çözmeksizin yeniden yayınlar. Yalnızca Repeater rolünde kullanılabilir. Bunu başka herhangi bir rolde ayarlamak ALL davranışıyla sonuçlanacaktır.</string>
+    <string name="rebroadcast_mode_local_only">Açık olan veya şifresini çözemediği yabancı ağlardan geldiği tespit edilen mesajları yok sayar. Yalnızca düğümlerin yerel birincil / ikincil kanallarında mesajı yeniden yayınlar.</string>
+    <string name="rebroadcast_mode_known_only">LOCAL ONLY gibi yabancı ağlardan geldiği tespit edilen mesajları yok sayar, ancak düğümün bilinen listesinde bulunmayan düğümlerden gelen mesajları da yok sayarak bir adım daha ileri gider.</string>
+    <string name="rebroadcast_mode_none">Yalnızca SENSOR, TRACKER ve TAK_TRACKER rolleri için izin verilir, CLIENT_MUTE rolünden farklı olarak tüm yeniden yayınları engeller.</string>
+    <string name="rebroadcast_mode_core_portnums_only">TAK, RangeTest, PaxCounter gibi standart olmayan portnum\'ları yok sayarken sadece standart portnum\'lar olan NodeInfo, Text, Position, Telemetry ve Routing\'i yeniden yayınlar.</string>
     <string name="channel_name">Kanal Adı</string>
     <string name="channel_options">Kanal Seçenekleri</string>
     <string name="qr_code">Karekod</string>
@@ -227,7 +236,7 @@
     <string name="logs">Kayıtlar</string>
     <string name="hops_away">Atlama Üzerinden</string>
     <string name="info">Bilgi</string>
-    <string name="ch_util_definition">Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).</string>
+    <string name="ch_util_definition">İyi biçimlendirilmiş TX ve RX ile hatalı biçimlendirilmiş RX (gürültü) dahil olmak üzere mevcut kanal için kullanım.</string>
     <string name="air_util_definition">Son bir saat içinde kullanılan iletim için yayın süresi yüzdesi.</string>
     <string name="iaq">IAQ</string>
     <string name="encryption_psk">Paylaşılan Anahtar</string>
@@ -236,4 +245,32 @@
     <string name="encryption_pkc_text">Doğrudan mesajlar şifreleme için yeni genel anahtar alt yapısını kullanmaktadır. Bu bağlamda 2.5 ve üstü firmware yüklemeniz gerekmektedir.</string>
     <string name="encryption_error">Genel Anahtar Uyuşmazlığı</string>
     <string name="encryption_error_text">Genel anahtar, kayıtlı anahtarla eşleşmiyor. Düğümü kaldırabilir ve tekrar anahtar değişimi yapmasına izin verebilirsiniz, ancak bu daha ciddi bir güvenlik sorununa işaret edebilir. Anahtar değişikliğinin fabrika ayarlarına sıfırlamadan veya başka bir kasıtlı eylemden kaynaklanıp kaynaklanmadığını belirlemek için başka bir güvenilir kanal aracılığıyla kullanıcıyla iletişime geçiniz.</string>
+    <string name="request_userinfo">Kullanıcı bilgisi iste</string>
+    <string name="meshtastic_new_nodes_notifications">Yeni düğüm bildirimleri</string>
+    <string name="more_details">Daha fazla detay</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Sinyal-Gürültü Oranı, iletişimde istenen bir sinyalin seviyesini arka plan gürültüsü seviyesine mukayese ölçmek için kullanılan bir ölçüdür. Meshtastic ve diğer kablosuz sistemlerde, daha yüksek bir SNR, veri iletiminin güvenilirliğini ve kalitesini artırabilecek daha net bir sinyale işaret eder.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Alınan Sinyal Gücü Göstergesi, anten tarafından alınan güç seviyesini belirlemek için kullanılan bir ölçüdür. Daha yüksek bir RSSI değeri genellikle daha güçlü ve daha istikrarlı bir bağlantıya işaret eder.</string>
+    <string name="iaq_definition">(İç Hava Kalitesi) Bosch BME680 tarafından ölçülen bağıl ölçekli IAQ değeri. Değer Aralığı 0–500.</string>
+    <string name="device_metrics_log">Cihaz Ölçüm Kayıtları</string>
+    <string name="node_map">Düğüm Haritası</string>
+    <string name="position_log">Konum Kayıtları</string>
+    <string name="env_metrics_log">Çevre Ölçüm Kayıtları</string>
+    <string name="sig_metrics_log">Sinyal Seviyesi Kayıtları</string>
+    <string name="administration">Yönetim</string>
+    <string name="remote_admin">Uzaktan Yönetim</string>
+    <string name="bad">Kötü</string>
+    <string name="fair">İdare Eder</string>
+    <string name="good">İyi</string>
+    <string name="none_quality">Yok</string>
+    <string name="signal">Sinyal</string>
+    <string name="signal_quality">Sinyal Kalitesi</string>
+    <string name="traceroute_log">Yol İzleme Kayıtları</string>
+    <string name="traceroute_direct">Doğrudan</string>
+    <plurals name="traceroute_hops">
+        <item quantity="one">1 atlama</item>
+        <item quantity="other">%d atlama</item>
+    </plurals>
+    <string name="traceroute_diff">İleri atlama %1$d Geri atlama %2$d</string>
 </resources>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 69af30c08..a2750904a 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -3,7 +3,7 @@
     <string name="node_filter_placeholder">過濾器</string>
     <string name="desc_node_filter_clear">清除節點過濾器</string>
     <string name="node_filter_include_unknown">顯示未知節點</string>
-    <string name="node_filter_show_details">Show details</string>
+    <string name="node_filter_show_details">顯示詳細資料</string>
     <string name="node_sort_alpha">依名字排序</string>
     <string name="node_sort_channel">頻道</string>
     <string name="node_sort_distance">距離</string>
@@ -16,7 +16,7 @@
     <string name="routing_error_none">Acknowledged</string>
     <string name="routing_error_no_route">No route</string>
     <string name="routing_error_got_nak">Received a negative acknowledgment</string>
-    <string name="routing_error_timeout">Timeout</string>
+    <string name="routing_error_timeout">逾時</string>
     <string name="routing_error_no_interface">No Interface</string>
     <string name="routing_error_max_retransmit">Max Retransmission Reached</string>
     <string name="routing_error_no_channel">No Channel</string>
@@ -24,12 +24,15 @@
     <string name="routing_error_no_response">No response</string>
     <string name="routing_error_bad_request">Bad Request</string>
     <string name="routing_error_duty_cycle_limit">Regional Duty Cycle Limit Reached</string>
-    <string name="routing_error_not_authorized">Not Authorized</string>
+    <string name="routing_error_not_authorized">未授權</string>
     <string name="routing_error_pki_failed">Encrypted Send Failed</string>
     <string name="routing_error_pki_unknown_pubkey">Unknown Public Key</string>
+    <string name="routing_error_admin_bad_session_key">Bad session key</string>
+    <string name="routing_error_admin_public_key_unauthorized">Public Key unauthorized</string>
     <string name="role_client">App connected or standalone messaging device.</string>
     <string name="role_client_mute">Device that does not forward packets from other devices.</string>
     <string name="role_router">Infrastructure node for extending network coverage by relaying messages. Visible in nodes list.</string>
+    <string name="role_router_client">Combination of both ROUTER and CLIENT. Not for mobile devices.</string>
     <string name="role_repeater">Infrastructure node for extending network coverage by relaying messages with minimal overhead. Not visible in nodes list.</string>
     <string name="role_tracker">Broadcasts GPS position packets as priority.</string>
     <string name="role_sensor">Broadcasts telemetry packets as priority.</string>
@@ -37,6 +40,12 @@
     <string name="role_client_hidden">Device that only broadcasts as needed for stealth or power savings.</string>
     <string name="role_lost_and_found">Broadcasts location as message to default channel regularly for to assist with device recovery.</string>
     <string name="role_tak_tracker">Enables automatic TAK PLI broadcasts and reduces routine broadcasts.</string>
+    <string name="rebroadcast_mode_all">Rebroadcast any observed message, if it was on our private channel or from another mesh with the same lora parameters.</string>
+    <string name="rebroadcast_mode_all_skip_decoding">Same as behavior as ALL but skips packet decoding and simply rebroadcasts them. Only available in Repeater role. Setting this on any other roles will result in ALL behavior.</string>
+    <string name="rebroadcast_mode_local_only">Ignores observed messages from foreign meshes that are open or those which it cannot decrypt. Only rebroadcasts message on the nodes local primary / secondary channels.</string>
+    <string name="rebroadcast_mode_known_only">Ignores observed messages from foreign meshes like LOCAL ONLY, but takes it step further by also ignoring messages from nodes not already in the node\'s known list.</string>
+    <string name="rebroadcast_mode_none">Only permitted for SENSOR, TRACKER and TAK_TRACKER roles, this will inhibit all rebroadcasts, not unlike CLIENT_MUTE role.</string>
+    <string name="rebroadcast_mode_core_portnums_only">Ignores packets from non-standard portnums such as: TAK, RangeTest, PaxCounter, etc. Only rebroadcasts packets with standard portnums: NodeInfo, Text, Position, Telemetry, and Routing.</string>
     <string name="channel_name">頻道名稱</string>
     <string name="channel_options">頻道選項</string>
     <string name="qr_code">QRCODE</string>
@@ -214,17 +223,17 @@
     <string name="mute_8_hours">8小時</string>
     <string name="mute_1_week">1週</string>
     <string name="mute_always">總是</string>
-    <string name="replace">Replace</string>
+    <string name="replace">替換</string>
     <string name="wifi_qr_code_scan">Scan WiFi QR code</string>
     <string name="wifi_qr_code_error">Invalid WiFi Credential QR code format</string>
     <string name="navigate_back">Navigate Back</string>
-    <string name="battery">Battery</string>
+    <string name="battery">電池</string>
     <string name="channel_utilization">Channel Utilization</string>
     <string name="air_utilization">Air Utilization</string>
     <string name="temperature">Temperature</string>
     <string name="humidity">Humidity</string>
-    <string name="logs">Logs</string>
-    <string name="hops_away">Hops Away</string>
+    <string name="logs">系統記錄</string>
+    <string name="hops_away">節點距</string>
     <string name="info">Information</string>
     <string name="ch_util_definition">Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise).</string>
     <string name="air_util_definition">Percent of airtime for transmission used within the last hour.</string>
@@ -235,4 +244,31 @@
     <string name="encryption_pkc_text">Direct messages are using the new public key infrastructure for encryption. Requires firmware version 2.5 or greater.</string>
     <string name="encryption_error">Public key mismatch</string>
     <string name="encryption_error_text">The public key does not match the recorded key. You may remove the node and let it exchange keys again, but this may indicate a more serious security problem. Contact the user through another trusted channel, to determine if the key change was due to a factory reset or other intentional action.</string>
+    <string name="request_userinfo">Request user info</string>
+    <string name="meshtastic_new_nodes_notifications">New node notifications</string>
+    <string name="more_details">More details</string>
+    <string name="snr">SNR</string>
+    <string name="snr_definition">Signal-to-Noise Ratio, a measure used in communications to quantify the level of a desired signal to the level of background noise. In Meshtastic and other wireless systems, a higher SNR indicates a clearer signal that can enhance the reliability and quality of data transmission.</string>
+    <string name="rssi">RSSI</string>
+    <string name="rssi_definition">Received Signal Strength Indicator, a measurement used to determine the power level being received by the antenna. A higher RSSI value generally indicates a stronger and more stable connection.</string>
+    <string name="iaq_definition">(Indoor Air Quality) relative scale IAQ value as measured by Bosch BME680. Value Range 0–500.</string>
+    <string name="device_metrics_log">Device Metrics Log</string>
+    <string name="node_map">Node Map</string>
+    <string name="position_log">Position Log</string>
+    <string name="env_metrics_log">Environment Metrics Log</string>
+    <string name="sig_metrics_log">Signal Metrics Log</string>
+    <string name="administration">Administration</string>
+    <string name="remote_admin">Remote Administration</string>
+    <string name="bad">Bad</string>
+    <string name="fair">Fair</string>
+    <string name="good">Good</string>
+    <string name="none_quality">None</string>
+    <string name="signal">Signal</string>
+    <string name="signal_quality">Signal Quality</string>
+    <string name="traceroute_log">Traceroute Log</string>
+    <string name="traceroute_direct">Direct</string>
+    <plurals name="traceroute_hops">
+        <item quantity="other">%d hops</item>
+    </plurals>
+    <string name="traceroute_diff">Hops towards %1$d Hops back %2$d</string>
 </resources>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 962fe517c..d9cb53677 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <resources>
     <color name="colorOnPrimary">#FFFFFF</color>
     <color name="colorPrimary">#67EA94</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d6c44a40d..010f9a53d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -290,6 +290,8 @@
     <string name="fair">Fair</string>
     <string name="good">Good</string>
     <string name="none_quality">None</string>
+    <string name="share_to">Share to…</string>
+    <string name="share_message">Share message</string>
     <string name="signal">Signal</string>
     <string name="signal_quality">Signal Quality</string>
     <string name="traceroute_log">Traceroute Log</string>
@@ -308,4 +310,5 @@
     <string name="selected">Selected</string>
     <string name="not_selected">Not Selected</string>
     <string name="unknown_age">Unknown Age</string>
+    <string name="copy">Copy</string>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 23b3ac011..5586516f2 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,3 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <resources>
 
     <!-- Base application theme. -->
@@ -61,6 +79,7 @@
     <style name="MyActionBar" parent="@style/ThemeOverlay.MaterialComponents.ActionBar">
         <item name="background">@color/colorPrimary</item>
         <item name="android:textColorPrimary">@color/colorOnPrimary</item>
+        <item name="tint">@color/colorOnPrimary</item>
     </style>
 
     <style name="MyToolbar" parent="Widget.MaterialComponents.Toolbar">
diff --git a/app/src/main/res/xml/data_extraction_rules.xml b/app/src/main/res/xml/data_extraction_rules.xml
index fe61eb717..fc2693372 100644
--- a/app/src/main/res/xml/data_extraction_rules.xml
+++ b/app/src/main/res/xml/data_extraction_rules.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <data-extraction-rules>
     <cloud-backup>
         <exclude domain="root" />
diff --git a/app/src/main/res/xml/device_filter.xml b/app/src/main/res/xml/device_filter.xml
index 045b500db..1dc69f725 100644
--- a/app/src/main/res/xml/device_filter.xml
+++ b/app/src/main/res/xml/device_filter.xml
@@ -1,4 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2024 Meshtastic LLC
+
+     This program is free software: you can redistribute it and/or modify
+     it under the terms of the GNU General Public License as published by
+     the Free Software Foundation, either version 3 of the License, or
+     (at your option) any later version.
+
+     This program is distributed in the hope that it will be useful,
+     but WITHOUT ANY WARRANTY; without even the implied warranty of
+     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+     GNU General Public License for more details.
+
+     You should have received a copy of the GNU General Public License
+     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+-->
+
 <resources>
     <!-- 0x0403 FTDI -->
     <usb-device
diff --git a/app/src/test/java/com/geeksville/mesh/ExampleUnitTest.kt b/app/src/test/java/com/geeksville/mesh/ExampleUnitTest.kt
index 1de8e19a7..c7df39a10 100644
--- a/app/src/test/java/com/geeksville/mesh/ExampleUnitTest.kt
+++ b/app/src/test/java/com/geeksville/mesh/ExampleUnitTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import org.junit.Test
diff --git a/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt b/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt
index f7a361740..55214770b 100644
--- a/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt
+++ b/app/src/test/java/com/geeksville/mesh/NodeInfoTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh
 
 import androidx.core.os.LocaleListCompat
diff --git a/app/src/test/java/com/geeksville/mesh/PositionTest.kt b/app/src/test/java/com/geeksville/mesh/PositionTest.kt
index 4f7f4e171..281b44a57 100644
--- a/app/src/test/java/com/geeksville/mesh/PositionTest.kt
+++ b/app/src/test/java/com/geeksville/mesh/PositionTest.kt
@@ -1,5 +1,21 @@
-package com.geeksville.mesh
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
 
+package com.geeksville.mesh
 
 import org.junit.Assert
 import org.junit.Test
diff --git a/app/src/test/java/com/geeksville/mesh/model/DeviceVersionTest.kt b/app/src/test/java/com/geeksville/mesh/model/DeviceVersionTest.kt
index 09f6ad9e5..8499f4276 100644
--- a/app/src/test/java/com/geeksville/mesh/model/DeviceVersionTest.kt
+++ b/app/src/test/java/com/geeksville/mesh/model/DeviceVersionTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.model
 
 import org.junit.Assert.*
diff --git a/app/src/test/java/com/geeksville/mesh/ui/UIUnitTest.kt b/app/src/test/java/com/geeksville/mesh/ui/UIUnitTest.kt
index 4fa459693..cfe2d3bbc 100644
--- a/app/src/test/java/com/geeksville/mesh/ui/UIUnitTest.kt
+++ b/app/src/test/java/com/geeksville/mesh/ui/UIUnitTest.kt
@@ -1,3 +1,20 @@
+/*
+ * Copyright (c) 2024 Meshtastic LLC
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package com.geeksville.mesh.ui
 
 import com.geeksville.mesh.model.getInitials
diff --git a/config/detekt/detekt-baseline.xml b/config/detekt/detekt-baseline.xml
index b12339f1d..927f9a593 100644
--- a/config/detekt/detekt-baseline.xml
+++ b/config/detekt/detekt-baseline.xml
@@ -284,7 +284,7 @@
     <ID>MagicNumber:MeshService.kt$MeshService$32</ID>
     <ID>MagicNumber:MeshService.kt$MeshService$60000</ID>
     <ID>MagicNumber:MeshService.kt$MeshService$8</ID>
-    <ID>MagicNumber:MessagesFragment.kt$MessagesFragment$234</ID>
+    <ID>MagicNumber:MessagesFragment.kt$MessagesFragment$200</ID>
     <ID>MagicNumber:MetricsViewModel.kt$MetricsViewModel$1000L</ID>
     <ID>MagicNumber:MetricsViewModel.kt$MetricsViewModel$1e-5</ID>
     <ID>MagicNumber:MetricsViewModel.kt$MetricsViewModel$1e-7</ID>