From 6a1d778552b4ddf9e35319a0ad4178979fa9c0cf Mon Sep 17 00:00:00 2001
From: geeksville <kevinh@geeksville.com>
Date: Sun, 13 Sep 2020 13:22:40 -0700
Subject: [PATCH] 0.9.90 fix ble scanning on samsung?

---
 app/build.gradle                                       |  4 ++--
 .../java/com/geeksville/mesh/ui/SettingsFragment.kt    | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index ef8aeaa2b..0e90aff81 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -28,8 +28,8 @@ android {
         applicationId "com.geeksville.mesh"
         minSdkVersion 21 // The oldest emulator image I have tried is 22 (though 21 probably works)
         targetSdkVersion 29
-        versionCode 10981 // format is Mmmss (where M is 1+the numeric major number
-        versionName "0.9.81"
+        versionCode 10990 // format is Mmmss (where M is 1+the numeric major number
+        versionName "0.9.90"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
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 83e5f5030..a1bd80e07 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
@@ -15,7 +15,6 @@ import android.content.*
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
 import android.os.Bundle
-import android.os.ParcelUuid
 import android.os.RemoteException
 import android.view.LayoutInflater
 import android.view.View
@@ -318,9 +317,10 @@ 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))
+                                // Samsung doesn't seem to filter properly by service so this can't work
+                                // see https://stackoverflow.com/questions/57981986/altbeacon-android-beacon-library-not-working-after-device-has-screen-off-for-a-s/57995960#57995960
+                                // and https://stackoverflow.com/a/45590493
+                                // .setServiceUuid(ParcelUuid(BluetoothInterface.BTM_SERVICE_UUID))
                                 .build()
 
                         val settings =
@@ -542,7 +542,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
         // Only let user edit their name or set software update while connected to a radio
         model.isConnected.observe(viewLifecycleOwner, Observer { connected ->
             usernameView.isEnabled = connected == MeshService.ConnectionState.CONNECTED
-            if(connected == MeshService.ConnectionState.DISCONNECTED)
+            if (connected == MeshService.ConnectionState.DISCONNECTED)
                 model.ownerName.value = ""
             initNodeInfo()
         })