0.4.9 make app not crash when people try to run this on an emulator ;-)

pull/28/head
geeksville 2020-04-20 21:06:58 -07:00
rodzic bfff5f6215
commit 99b66b3396
2 zmienionych plików z 5 dodań i 5 usunięć

Wyświetl plik

@ -17,8 +17,8 @@ android {
applicationId "com.geeksville.mesh"
minSdkVersion 22 // The oldest emulator image I have tried is 22 (though 21 probably works)
targetSdkVersion 29
versionCode 148
versionName "0.4.8"
versionCode 149
versionName "0.4.9"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {

Wyświetl plik

@ -384,10 +384,10 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
// Remove the old radio buttons and repopulate
deviceRadioGroup.removeAllViews()
val adapter = scanModel.bluetoothAdapter!!
if (adapter.isEnabled) {
val adapter = scanModel.bluetoothAdapter
if (adapter != null && adapter.isEnabled) {
// This code requres BLE to be enabled
var hasShownOurDevice = false
devices.values.forEach { device ->
hasShownOurDevice =