0.1.3 fix autobug related to meshService unexpectedly being !null

1.2-legacy
geeksville 2020-03-08 14:47:00 -07:00
rodzic 692f5994a0
commit db3c9266e8
3 zmienionych plików z 5 dodań i 4 usunięć

Wyświetl plik

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

Wyświetl plik

@ -411,7 +411,8 @@ class MainActivity : AppCompatActivity(), Logging,
private fun bindMeshService() {
debug("Binding to mesh service!")
// we bind using the well known name, to make sure 3rd party apps could also
logAssert(UIState.meshService == null)
if (UIState.meshService != null)
Exceptions.reportError("meshService was supposed to be null, ignoring (but reporting a bug)")
MeshService.startService(this)?.let { intent ->
// ALSO bind so we can use the api

@ -1 +1 @@
Subproject commit 45c5deeee23b1e104265a553eeb497caa120bd47
Subproject commit ee0863c3c94856f9859d17219761903f4dea00fd