From 705e0deae3470e2571b5ce6d2f64348035e40677 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 11 Feb 2021 13:37:51 +0800
Subject: [PATCH 1/6] make settings layout work on even the tiniest of screens

---
 .../geeksville/mesh/ui/SettingsFragment.kt    |   5 +-
 app/src/main/res/layout/settings_fragment.xml | 353 +++++++++---------
 2 files changed, 183 insertions(+), 175 deletions(-)

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 decfa6fed..a582d3c5c 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -745,8 +745,9 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         val hasBonded =
             RadioInterfaceService.getBondedDeviceAddress(requireContext()) != null
 
-        // get rid of the warning text once at least one device is paired
-        binding.warningNotPaired.visibility = if (hasBonded) View.GONE else View.VISIBLE
+        // get rid of the warning text once at least one device is paired.
+        // If we are running on an emulator, always leave this message showing so we can test the worst case layout
+        binding.warningNotPaired.visibility = if (hasBonded && !RadioInterfaceService.isMockInterfaceAvailable(requireContext())) View.GONE else View.VISIBLE
     }
 
     /// Setup the GUI to do a classic (pre SDK 26 BLE scan)
diff --git a/app/src/main/res/layout/settings_fragment.xml b/app/src/main/res/layout/settings_fragment.xml
index 7f6e135f2..45a7b535c 100644
--- a/app/src/main/res/layout/settings_fragment.xml
+++ b/app/src/main/res/layout/settings_fragment.xml
@@ -1,192 +1,199 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<ScrollView 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:layout_height="match_parent"
+    android:fillViewport="true"
+    tools:context=".MainActivity">
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/warningNotPaired"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:autoLink="web"
-        android:ems="10"
-        android:gravity="start|top"
-        android:text="@string/warning_not_paired"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/deviceRadioGroup" />
+    <androidx.constraintlayout.widget.ConstraintLayout xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/usernameView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:hint="@string/your_name"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/usernameEditText"
-            android:layout_width="match_parent"
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/warningNotPaired"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:autoLink="web"
+            android:ems="10"
+            android:gravity="start|top"
+            android:text="@string/warning_not_paired"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/deviceRadioGroup" />
 
 
-    <com.google.android.material.textview.MaterialTextView
-        android:id="@+id/scanStatusText"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="8dp"
-        android:text="@string/looking_for_meshtastic_devices"
-        app:layout_constraintEnd_toStartOf="@+id/updateFirmwareButton"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/usernameView" />
-
-    <ProgressBar
-        android:id="@+id/scanProgressBar"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/deviceRadioGroup" />
-
-    <RadioGroup
-        android:id="@+id/deviceRadioGroup"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/changeRadioButton">
-
-        <RadioButton
-            android:id="@+id/radioButton2"
-            android:layout_width="match_parent"
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/usernameView"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/test__devname1" />
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:hint="@string/your_name"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent">
 
-        <RadioButton
-            android:id="@+id/radioButton"
-            android:layout_width="match_parent"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/usernameEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/scanStatusText"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:text="@string/test_devname2" />
-    </RadioGroup>
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="8dp"
+            android:text="@string/looking_for_meshtastic_devices"
+            app:layout_constraintEnd_toStartOf="@+id/updateFirmwareButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/usernameView" />
 
-    <CheckBox
-        android:id="@+id/analyticsOkayCheckbox"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:background="@color/cardview_light_background"
-        android:checked="true"
-        android:text="@string/analytics_okay"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/reportBugButton"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/deviceRadioGroup"
-        app:layout_constraintVertical_bias="1.0" />
-
-    <Button
-        android:id="@+id/reportBugButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:text="@string/report_bug"
-        app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintWidth_percent="0.4" />
-
-    <Button
-        android:id="@+id/changeRadioButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:text="@string/select_radio"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/scanStatusText" />
-
-    <Button
-        android:id="@+id/updateFirmwareButton"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginEnd="16dp"
-        android:text="@string/update_firmware"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/scanStatusText" />
-
-    <ProgressBar
-        android:id="@+id/updateProgressBar"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:layout_constraintEnd_toEndOf="@+id/updateFirmwareButton"
-        app:layout_constraintStart_toStartOf="@+id/updateFirmwareButton"
-        app:layout_constraintTop_toBottomOf="@+id/updateFirmwareButton" />
-
-
-
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/positionBroadcastPeriodView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:hint="@string/broadcast_position_secs"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/warningNotPaired">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/positionBroadcastPeriodEditText"
-            android:layout_width="match_parent"
+        <ProgressBar
+            android:id="@+id/scanProgressBar"
+            style="?android:attr/progressBarStyle"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="number"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginTop="8dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/deviceRadioGroup" />
 
-    <com.google.android.material.textfield.TextInputLayout
-        android:id="@+id/lsSleepView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        android:layout_marginEnd="16dp"
-        android:hint="@string/ls_sleep_secs"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/positionBroadcastPeriodView">
-
-        <com.google.android.material.textfield.TextInputEditText
-            android:id="@+id/lsSleepEditText"
-            android:layout_width="match_parent"
+        <RadioGroup
+            android:id="@+id/deviceRadioGroup"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:imeOptions="actionDone"
-            android:inputType="number"
-            android:singleLine="true" />
-    </com.google.android.material.textfield.TextInputLayout>
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/changeRadioButton">
+
+            <RadioButton
+                android:id="@+id/radioButton2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/test__devname1" />
+
+            <RadioButton
+                android:id="@+id/radioButton"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/test_devname2" />
+        </RadioGroup>
+
+        <CheckBox
+            android:id="@+id/analyticsOkayCheckbox"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="8dp"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:background="@color/cardview_light_background"
+            android:checked="true"
+            android:text="@string/analytics_okay"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toStartOf="@+id/reportBugButton"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/lsSleepView"
+            app:layout_constraintVertical_bias="1.0" />
+
+        <Button
+            android:id="@+id/reportBugButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:layout_marginBottom="8dp"
+            android:text="@string/report_bug"
+            app:layout_constrainedWidth="true"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintWidth_percent="0.4" />
+
+        <Button
+            android:id="@+id/changeRadioButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="16dp"
+            android:text="@string/select_radio"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/scanStatusText" />
+
+        <Button
+            android:id="@+id/updateFirmwareButton"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="16dp"
+            android:text="@string/update_firmware"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintTop_toTopOf="@+id/scanStatusText" />
+
+        <ProgressBar
+            android:id="@+id/updateProgressBar"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            app:layout_constraintEnd_toEndOf="@+id/updateFirmwareButton"
+            app:layout_constraintStart_toStartOf="@+id/updateFirmwareButton"
+            app:layout_constraintTop_toBottomOf="@+id/updateFirmwareButton" />
 
 
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/positionBroadcastPeriodView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:hint="@string/broadcast_position_secs"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/warningNotPaired">
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/positionBroadcastPeriodEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
+                android:inputType="number"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+        <com.google.android.material.textfield.TextInputLayout
+            android:id="@+id/lsSleepView"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="16dp"
+            android:layout_marginTop="16dp"
+            android:layout_marginEnd="16dp"
+            android:hint="@string/ls_sleep_secs"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/positionBroadcastPeriodView">
+
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/lsSleepEditText"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:imeOptions="actionDone"
+                android:inputType="number"
+                android:singleLine="true" />
+        </com.google.android.material.textfield.TextInputLayout>
+
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file

From c46b6f3c96559ae3d17f250c78e9a568f0794d2c Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 11 Feb 2021 13:47:46 +0800
Subject: [PATCH 2/6] change alpha to beta in strings

---
 README.md                           | 2 +-
 app/src/main/res/values/strings.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 206d6848c..e0a5fd85a 100644
--- a/README.md
+++ b/README.md
@@ -4,7 +4,7 @@
 
 This is a tool for using Android with open-source mesh radios.  For more information see our webpage: [meshtastic.org](https://www.meshtastic.org).  If you are looking for the the device side code, see [here](https://github.com/meshtastic/Meshtastic-esp32).
 
-This project is currently early-alpha, if you have questions or feedback please [Join our discussion forum](https://meshtastic.discourse.group/).  We would love to hear from you.
+This project is currently beta testing, if you have questions or feedback please [Join our discussion forum](https://meshtastic.discourse.group/).  We would love to hear from you.
 
 The production version of our application is here:
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 11e7483c1..de41846ff 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -14,7 +14,7 @@
     <string name="sample_message">hey I found the cache, it is over here next to the big tiger. I\'m kinda scared.</string>
     <string name="some_username" translatable="false">SKH</string>
     <string name="send_text">Send Text</string>
-    <string name="warning_not_paired">You haven\'t yet paired a Meshtastic compatible radio with this phone. Please pair a device and set your username.\n\nThis open-source application is in alpha-testing, if you find problems please post on our forum: meshtastic.discourse.group.\n\nFor more information see our web page - www.meshtastic.org.</string>
+    <string name="warning_not_paired">You haven\'t yet paired a Meshtastic compatible radio with this phone. Please pair a device and set your username.\n\nThis open-source application is in development, if you find problems please post on our forum: meshtastic.discourse.group.\n\nFor more information see our web page - www.meshtastic.org.</string>
     <string name="username_unset">Username unset</string>
     <string name="your_name">Your Name</string>
     <string name="analytics_okay">Anonymous usage statistics and crash reports.</string>

From 2736a01d4be8181208283ef8afa63050214566f2 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 11 Feb 2021 16:29:26 +0800
Subject: [PATCH 3/6] change stress test to a checkbox and only show for debug
 builds

---
 .../java/com/geeksville/mesh/MainActivity.kt  | 20 +++++++------------
 app/src/main/res/menu/menu_main.xml           |  5 +++++
 2 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index e50440f9e..56731fa28 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -929,12 +929,9 @@ class MainActivity : AppCompatActivity(), Logging,
     val handler: Handler by lazy {
         Handler(mainLooper)
     }
-    // Keeps track of pings status so we update the menu properly.
-    var pingRunning: Boolean = false
 
     override fun onPrepareOptionsMenu(menu: Menu): Boolean {
-        menu.findItem(R.id.start_ping).setVisible(!pingRunning)
-        menu.findItem(R.id.stop_ping).setVisible(pingRunning)
+        menu.findItem(R.id.stress_test).isVisible = BuildConfig.DEBUG // only show stress test for debug builds (for now)
         return super.onPrepareOptionsMenu(menu)
     }
 
@@ -960,7 +957,7 @@ class MainActivity : AppCompatActivity(), Logging,
                 fragmentTransaction.commit()
                 return true
             }
-            R.id.start_ping -> {
+            R.id.stress_test -> {
                 fun postPing() {
                     // Send ping message and arrange delayed recursion.
                     debug("Sending ping")
@@ -975,14 +972,11 @@ class MainActivity : AppCompatActivity(), Logging,
                     )
                 }
                 postPing()
-                pingRunning = true
-                invalidateOptionsMenu()
-                return true
-            }
-            R.id.stop_ping -> {
-                handler.removeCallbacksAndMessages(null)
-                pingRunning = false
-                invalidateOptionsMenu()
+                item.isChecked = !item.isChecked // toggle ping test
+                if(item.isChecked)
+                    postPing()
+                else
+                    handler.removeCallbacksAndMessages(null)
                 return true
             }
             else -> super.onOptionsItemSelected(item)
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 61e43ace0..a68555fad 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -11,6 +11,11 @@
         android:id="@+id/debug"
         android:title="@string/debug_panel"
         app:showAsAction="withText" />
+    <item
+        android:id="@+id/stress_test"
+        android:checkable="true"
+        android:checked="false"
+        android:title="Protocol stress test" />
     <item
         android:id="@+id/about"
         android:title="@string/about"

From 23ab6c70489447c2d1d1c46e2c37ed82049f5c4b Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 11 Feb 2021 16:32:33 +0800
Subject: [PATCH 4/6] fix my ping change

---
 app/src/main/java/com/geeksville/mesh/MainActivity.kt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index 56731fa28..a0d0a99a7 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -971,7 +971,6 @@ class MainActivity : AppCompatActivity(), Logging,
                         30000
                     )
                 }
-                postPing()
                 item.isChecked = !item.isChecked // toggle ping test
                 if(item.isChecked)
                     postPing()

From 11bc8ef5f0db30804e6946fe3716b6c2c724b90d Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Thu, 11 Feb 2021 16:54:17 +0800
Subject: [PATCH 5/6] add logging in support of
 https://github.com/meshtastic/Meshtastic-device/issues/681

---
 app/src/main/java/com/geeksville/mesh/MainActivity.kt        | 2 +-
 app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
index a0d0a99a7..4481f7680 100644
--- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt
+++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt
@@ -961,7 +961,7 @@ class MainActivity : AppCompatActivity(), Logging,
                 fun postPing() {
                     // Send ping message and arrange delayed recursion.
                     debug("Sending ping")
-                    val str = "Ping " + DateFormat.getTimeInstance(DateFormat.SHORT)
+                    val str = "Ping " + DateFormat.getTimeInstance(DateFormat.MEDIUM)
                         .format(Date(System.currentTimeMillis()))
                     model.messagesState.sendMessage(str)
                     handler.postDelayed(
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 45b311f8a..f0a27b574 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -6,6 +6,7 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.os.Build
 import android.os.IBinder
 import android.os.RemoteException
 import android.widget.Toast
@@ -734,7 +735,8 @@ class MeshService : Service(), Logging {
         val packet = toMeshPacket(p)
         p.status = MessageStatus.ENROUTE
         p.time = System.currentTimeMillis() // update time to the actual time we started sending
-        // debug("SENDING TO RADIO: $packet")
+        if(BuildConfig.DEBUG)
+            debug("Sending to radio: $packet") // IMPORTANT: we only log this info for debug builds, because it might leak PII
         sendToRadio(packet)
     }
 

From 221738603b6e94da4cfbcb735ad150aa8a046ca2 Mon Sep 17 00:00:00 2001
From: Kevin Hester <kevinh@geeksville.com>
Date: Fri, 12 Feb 2021 13:50:39 +0800
Subject: [PATCH 6/6] 1.1.46

---
 app/build.gradle                                |  4 ++--
 .../com/geeksville/mesh/service/MeshService.kt  | 17 +++++++++++------
 app/src/main/proto                              |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 695e2ad7d..1f703a316 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,8 +31,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 20144 // format is Mmmss (where M is 1+the numeric major number
-        versionName "1.1.44"
+        versionCode 20146 // format is Mmmss (where M is 1+the numeric major number
+        versionName "1.1.46"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         // per https://developer.android.com/studio/write/vector-asset-studio
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 f0a27b574..817fdd95e 100644
--- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt
@@ -6,7 +6,6 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
-import android.os.Build
 import android.os.IBinder
 import android.os.RemoteException
 import android.widget.Toast
@@ -735,7 +734,7 @@ class MeshService : Service(), Logging {
         val packet = toMeshPacket(p)
         p.status = MessageStatus.ENROUTE
         p.time = System.currentTimeMillis() // update time to the actual time we started sending
-        if(BuildConfig.DEBUG)
+        if (BuildConfig.DEBUG)
             debug("Sending to radio: $packet") // IMPORTANT: we only log this info for debug builds, because it might leak PII
         sendToRadio(packet)
     }
@@ -1308,6 +1307,9 @@ class MeshService : Service(), Logging {
             it.wantResponse = wantResponse
         }.build()
 
+        // Assume our position packets are not critical
+        packet.priority = MeshProtos.MeshPacket.Priority.BACKGROUND
+
         // Also update our own map for our nodenum, by handling the packet just like packets from other users
         handleReceivedPosition(myNodeInfo!!.myNodeNum, position)
 
@@ -1401,7 +1403,7 @@ class MeshService : Service(), Logging {
                 // We now always pick a random initial packet id (odds of collision with the device is insanely low with 32 bit ids)
                 val random = Random(System.currentTimeMillis())
                 val devicePacketId = random.nextLong().absoluteValue
-                
+
                 // Not inited - pick a number on the opposite side of what the device is using
                 currentPacketId = devicePacketId + numPacketIds / 2
             } else {
@@ -1449,13 +1451,16 @@ class MeshService : Service(), Logging {
             BluetoothInterface.safe
                 ?: throw Exception("Can't update - no bluetooth connected")
 
-        if (updateJob?.isActive == true)
+        if (updateJob?.isActive == true) {
+            errormsg("A firmware update is already running")
             throw Exception("Firmware update already running")
-        else
+        } else {
+            debug("Creating firmware update coroutine")
             updateJob = serviceScope.handledLaunch {
-                info("Starting firmware update coroutine")
+                debug("Starting firmware update coroutine")
                 SoftwareUpdateService.doUpdate(this@MeshService, safe, filename)
             }
+        }
     }
 
     /**
diff --git a/app/src/main/proto b/app/src/main/proto
index 8492e4030..b1aed0644 160000
--- a/app/src/main/proto
+++ b/app/src/main/proto
@@ -1 +1 @@
-Subproject commit 8492e4030ad928ee5fc97f8ead95325dba7f9492
+Subproject commit b1aed06442025624841b2288fac273d9bc41c438