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

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ęć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

4
app/build.gradle
Wyświetl plik

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

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

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