mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-03-31 04:04:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

0.9.90 fix ble scanning on samsung?

Browse Source
This commit is contained in:
geeksville
2020-09-13 13:22:40 -07:00
parent 404efa926c
commit 6a1d778552
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -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 {

10
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View File

@@ -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()
})