From db3c9266e874f038c1d07596be12d1eb8ac46c05 Mon Sep 17 00:00:00 2001 From: geeksville Date: Sun, 8 Mar 2020 14:47:00 -0700 Subject: [PATCH] 0.1.3 fix autobug related to meshService unexpectedly being !null --- app/build.gradle | 4 ++-- app/src/main/java/com/geeksville/mesh/MainActivity.kt | 3 ++- geeksville-androidlib | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 3ca6dbe4..11f6cc6a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 { diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index 4b416391..d4850409 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -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 diff --git a/geeksville-androidlib b/geeksville-androidlib index 45c5deee..ee0863c3 160000 --- a/geeksville-androidlib +++ b/geeksville-androidlib @@ -1 +1 @@ -Subproject commit 45c5deeee23b1e104265a553eeb497caa120bd47 +Subproject commit ee0863c3c94856f9859d17219761903f4dea00fd