From a527852f5540d3fab4784d88e3424515b65faf8e Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 15 Jul 2020 17:09:45 -0700
Subject: [PATCH 1/6] make HW GPS optional on phone

---
 app/src/main/AndroidManifest.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7dd67e5fb..04e5994e1 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,6 +13,14 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- only useful if this phone can do BTLE -->
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- needed to access bluetooth when app is background -->
 
+    <!-- If a device is missing a GPS - we will still be able to work though -->
+    <uses-feature
+        android:name="android.hardware.location"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false" />
+
     <uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- for job intent service -->
 
     <!--

From 87c272f78434a245d3f8fb7eb4fbdbcab78ff731 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 15 Jul 2020 17:19:36 -0700
Subject: [PATCH 2/6] Don't rely on android filtering for BLE scan, because
 NRF52

---
 .../geeksville/mesh/ui/SettingsFragment.kt    | 89 ++++++++++---------
 1 file changed, 48 insertions(+), 41 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 c96cd66a3..e8d92f8ed 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -183,54 +183,59 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
         // if that device later disconnects remove it as a candidate
         override fun onScanResult(callbackType: Int, result: ScanResult) {
 
-            val addr = result.device.address
-            val fullAddr = "x$addr" // full address with the bluetooh prefix
-            // prevent logspam because weill get get lots of redundant scan results
-            val isBonded = result.device.bondState == BluetoothDevice.BOND_BONDED
-            val oldDevs = devices.value!!
-            val oldEntry = oldDevs[fullAddr]
-            if (oldEntry == null || oldEntry.bonded != isBonded) { // Don't spam the GUI with endless updates for non changing nodes
+            if ((result.device.name?.startsWith("Mesh") ?: false)) {
+                val addr = result.device.address
+                val fullAddr = "x$addr" // full address with the bluetooh prefix
+                // prevent logspam because weill get get lots of redundant scan results
+                val isBonded = result.device.bondState == BluetoothDevice.BOND_BONDED
+                val oldDevs = devices.value!!
+                val oldEntry = oldDevs[fullAddr]
+                if (oldEntry == null || oldEntry.bonded != isBonded) { // Don't spam the GUI with endless updates for non changing nodes
 
-                val skipBogus = try {
-                    // Note Soyes XS has a buggy BLE scan implementation and returns devices we didn't ask for.  So we check to see if the
-                    // last two chars of the name matches the last two of the address - if not we skip it
+                    val skipBogus = try {
+                        // Note Soyes XS has a buggy BLE scan implementation and returns devices we didn't ask for.  So we check to see if the
+                        // last two chars of the name matches the last two of the address - if not we skip it
 
-                    // Note: the address is always two more than the hex string we show in the name
+                        // Note: the address is always two more than the hex string we show in the name
 
-                    // nasty parsing of a string that ends with ab:45 as four hex digits
-                    val lastAddr = (addr.substring(
-                        addr.length - 5,
-                        addr.length - 3
-                    ) + addr.substring(addr.length - 2)).toInt(16)
+                        // nasty parsing of a string that ends with ab:45 as four hex digits
+                        val lastAddr = (addr.substring(
+                            addr.length - 5,
+                            addr.length - 3
+                        ) + addr.substring(addr.length - 2)).toInt(16)
 
-                    val lastName =
-                        result.device.name.substring(result.device.name.length - 4).toInt(16)
+                        val lastName =
+                            result.device.name.substring(result.device.name.length - 4).toInt(16)
 
-                    (lastAddr - 2) != lastName
-                } catch (ex: Throwable) {
-                    false // If we fail parsing anything, don't do this nasty hack
-                }
+                        // ESP32 macaddr are two higher than the reported device name
+                        // NRF52 macaddrs match the portion used in the string
+                        // either would be acceptable
+                        (lastAddr - 2) != lastName && lastAddr != lastName
+                    } catch (ex: Throwable) {
+                        false // If we fail parsing anything, don't do this nasty hack
+                    }
 
-                if (skipBogus)
-                    errormsg("Skipping bogus BLE entry $result")
-                else {
-                    val entry = DeviceListEntry(
-                        result.device.name
-                            ?: "unnamed-$addr", // autobug: some devices might not have a name, if someone is running really old device code?
-                        fullAddr,
-                        isBonded
-                    )
-                    debug("onScanResult ${entry}")
-
-                    // If nothing was selected, by default select the first valid thing we see
-                    val activity =
-                        GeeksvilleApplication.currentActivity as MainActivity? // Can be null if app is shutting down
-                    if (selectedAddress == null && entry.bonded && activity != null)
-                        changeScanSelection(
-                            activity,
-                            fullAddr
+                    if (skipBogus)
+                        errormsg("Skipping bogus BLE entry $result")
+                    else {
+                        val entry = DeviceListEntry(
+                            result.device.name
+                                ?: "unnamed-$addr", // autobug: some devices might not have a name, if someone is running really old device code?
+                            fullAddr,
+                            isBonded
                         )
-                    addDevice(entry) // Add/replace entry
+                        debug("onScanResult ${entry}")
+
+                        // If nothing was selected, by default select the first valid thing we see
+                        val activity =
+                            GeeksvilleApplication.currentActivity as MainActivity? // Can be null if app is shutting down
+                        if (selectedAddress == null && entry.bonded && activity != null)
+                            changeScanSelection(
+                                activity,
+                                fullAddr
+                            )
+                        addDevice(entry) // Add/replace entry
+                    }
                 }
             }
         }
@@ -313,6 +318,8 @@ class BTScanModel(app: Application) : AndroidViewModel(app), Logging {
                         // filter and only accept devices that have our service
                         val filter =
                             ScanFilter.Builder()
+                                // Note: NRF52 doesn't put the service in the avertizement, so we can't filter by service here
+                                // Instead we check in the callback
                                 .setServiceUuid(ParcelUuid(BluetoothInterface.BTM_SERVICE_UUID))
                                 .build()
 

From 62be0ed4ebc086c044256657531431ee70fec6db Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 15 Jul 2020 17:30:31 -0700
Subject: [PATCH 3/6] 0.7.94

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 4a6a01320..eec7ee295 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 10793 // format is Mmmss (where M is 1+the numeric major number
-        versionName "0.7.93"
+        versionCode 10794 // format is Mmmss (where M is 1+the numeric major number
+        versionName "0.7.94"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {

From 02cda26f1269504323d047e5b945f5c2d031267b Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Wed, 15 Jul 2020 19:53:45 -0700
Subject: [PATCH 4/6] fix localization warnings

---
 app/src/main/res/layout/messages_fragment.xml | 2 +-
 app/src/main/res/layout/nodelist_fragment.xml | 2 +-
 app/src/main/res/values/strings.xml           | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout/messages_fragment.xml b/app/src/main/res/layout/messages_fragment.xml
index c00e573ee..42e81fb78 100644
--- a/app/src/main/res/layout/messages_fragment.xml
+++ b/app/src/main/res/layout/messages_fragment.xml
@@ -12,7 +12,7 @@
         android:layout_marginTop="8dp"
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
-        android:contentDescription="Text messages"
+        android:contentDescription="@string/text_messages"
         app:layout_constraintBottom_toTopOf="@+id/textInputLayout"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/nodelist_fragment.xml b/app/src/main/res/layout/nodelist_fragment.xml
index 113f23c12..3b2d3a883 100644
--- a/app/src/main/res/layout/nodelist_fragment.xml
+++ b/app/src/main/res/layout/nodelist_fragment.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:contentDescription="A list of nodes in the mesh">
+    android:contentDescription="@string/a_list_of_nodes_in_the_mesh">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/nodeListView"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index fe6ec0143..1763a2332 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -71,4 +71,6 @@
     <string name="meshtastic_service_notifications">Meshtastic Service Notifications</string>
     <string name="location_disabled_warning">You must turn on location services in Android Settings</string>
     <string name="about">About</string>
+    <string name="a_list_of_nodes_in_the_mesh">A list of nodes in the mesh</string>
+    <string name="text_messages">Text messages</string>
 </resources>

From b2b20cb8cf5ca8e93cf17efb1131afa68d51ea24 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Thu, 16 Jul 2020 18:25:31 -0700
Subject: [PATCH 5/6] 0.7.95 just to make amazon happy

---
 app/build.gradle                 |  6 +++---
 app/src/main/AndroidManifest.xml | 18 +++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index eec7ee295..b74bfe28d 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -17,8 +17,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 10794 // format is Mmmss (where M is 1+the numeric major number
-        versionName "0.7.94"
+        versionCode 10795 // format is Mmmss (where M is 1+the numeric major number
+        versionName "0.7.95"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -95,7 +95,7 @@ dependencies {
     implementation 'androidx.fragment:fragment-ktx:1.2.5'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta7'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.0-beta8'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 04e5994e1..5422c73bc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,6 +4,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="GoogleAppIndexingWarning">
 
+    <!-- If a device is missing a GPS - we will still be able to work though , must be before uses-permission-->
+    <uses-feature
+        android:name="android.hardware.location"
+        android:required="false" />
+    <uses-feature
+        android:name="android.hardware.location.gps"
+        android:required="false" />
+
     <!-- per https://github.com/journeyapps/zxing-android-embedded to force support for build 22 -->
     <uses-sdk tools:overrideLibrary="com.google.zxing.client.android" />
 
@@ -13,14 +21,6 @@
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- only useful if this phone can do BTLE -->
     <uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- needed to access bluetooth when app is background -->
 
-    <!-- If a device is missing a GPS - we will still be able to work though -->
-    <uses-feature
-        android:name="android.hardware.location"
-        android:required="false" />
-    <uses-feature
-        android:name="android.hardware.location.gps"
-        android:required="false" />
-
     <uses-permission android:name="android.permission.WAKE_LOCK" /> <!-- for job intent service -->
 
     <!--
@@ -58,7 +58,7 @@
 
     <uses-feature
         android:name="android.hardware.bluetooth_le"
-        android:required="true" />
+        android:required="false" />
 
     <!-- For the modern BLE scanning API -->
     <uses-feature

From 203dc456ab846aed01f72a45b4eef2c61c96ace3 Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Fri, 17 Jul 2020 11:55:36 -0700
Subject: [PATCH 6/6] NRF52 based devices don't need our forceRefresh BLE hack

---
 .../java/com/geeksville/mesh/service/BluetoothInterface.kt  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt b/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
index 06e86969b..b78f42af0 100644
--- a/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
+++ b/app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt
@@ -191,6 +191,10 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
      */
     private var isFirstSend = true
 
+    // NRF52 targets do not need the nasty force refresh hack that ESP32 needs (because they keep their
+    // BLE handles stable.  So turn the hack off for these devices.  FIXME - find a better way to know that the board is NRF52 based
+    private var needForceRefresh = !address.startsWith("FD:10:04")
+
     init {
         // Note: this call does no comms, it just creates the device object (even if the
         // device is off/not connected)
@@ -400,8 +404,6 @@ class BluetoothInterface(val service: RadioInterfaceService, val address: String
             }
     }
 
-    private var needForceRefresh = true
-
     private fun onConnect(connRes: Result<Unit>) {
         // This callback is invoked after we are connected