mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

fix an autobug 

https://console.firebase.google.com/project/meshutil/crashlytics/app/android:com.geeksville.mesh/issues/5777c66e7f3bb28bd2257c5685d9ec68?time=last-seven-days&sessionEventKey=5F7255AB03A80001161E65680B592F8D_1456099387864713143
pull/181/head
geeksville 2020-09-29 16:13:12 -07:00
rodzic 819185a852
commit 25ccba9ab7
1 zmienionych plików z 6 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

9
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
Wyświetl plik

@ -6,7 +6,6 @@ import android.app.PendingIntent
import android.bluetooth.BluetoothDevice import android.bluetooth.BluetoothDevice
import android.bluetooth.BluetoothDevice.BOND_BONDED import android.bluetooth.BluetoothDevice.BOND_BONDED
import android.bluetooth.BluetoothDevice.BOND_BONDING import android.bluetooth.BluetoothDevice.BOND_BONDING
import android.bluetooth.BluetoothManager
import android.bluetooth.le.* import android.bluetooth.le.*
import android.companion.AssociationRequest import android.companion.AssociationRequest
import android.companion.BluetoothDeviceFilter import android.companion.BluetoothDeviceFilter
@ -658,9 +657,13 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
// The device the user is already paired with is offline currently, still show it // The device the user is already paired with is offline currently, still show it
// it in the list, but greyed out // it in the list, but greyed out
if (!hasShownOurDevice) { if (!hasShownOurDevice) {
if (scanModel.selectedBluetooth != null && adapter != null && adapter.isEnabled) { // Note: we pull this into a tempvar, because otherwise some other thread can change selectedAddress after our null check
// and before use
val bleAddr = scanModel.selectedBluetooth
if (bleAddr != null && adapter != null && adapter.isEnabled) {
val bDevice = val bDevice =
adapter.getRemoteDevice(scanModel.selectedBluetooth) adapter.getRemoteDevice(bleAddr)
if (bDevice.name != null) { // ignore nodes that node have a name, that means we've lost them since they appeared if (bDevice.name != null) { // ignore nodes that node have a name, that means we've lost them since they appeared
val curDevice = BTScanModel.DeviceListEntry( val curDevice = BTScanModel.DeviceListEntry(
bDevice.name, bDevice.name,