From 5d264db7464b381b599fce690bef7f376d52074e Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 31 Mar 2020 07:59:10 -0700 Subject: [PATCH 1/3] fix autobug from crashlytics, channel edit text doesn't yet do anything --- app/src/main/java/com/geeksville/mesh/ui/Channel.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt index 0bcad65ff..0884da831 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt @@ -44,7 +44,7 @@ fun ChannelContent(channel: Channel?) { ), imeAction = ImeAction.Done, onImeActionPerformed = { - TODO() + ChannelLog.errormsg("FIXME, implement channel edit button") } ) } else { From 9f45401058655802c52f724e5335f5eda210391a Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 31 Mar 2020 08:01:15 -0700 Subject: [PATCH 2/3] fix autobug, only call map lifecycle callbacks once map view is created --- app/src/main/java/com/geeksville/mesh/ui/Map.kt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/ui/Map.kt b/app/src/main/java/com/geeksville/mesh/ui/Map.kt index 19a721a41..d39f995b1 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/Map.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/Map.kt @@ -42,23 +42,23 @@ private val mapLifecycleCallbacks = object : Application.ActivityLifecycleCallba var view: MapView? = null override fun onActivityPaused(activity: Activity) { - view!!.onPause() + view?.onPause() } override fun onActivityStarted(activity: Activity) { - view!!.onStart() + view?.onStart() } override fun onActivityDestroyed(activity: Activity) { - view!!.onDestroy() + view?.onDestroy() } override fun onActivitySaveInstanceState(activity: Activity, outState: Bundle) { - view!!.onSaveInstanceState(outState) + view?.onSaveInstanceState(outState) } override fun onActivityStopped(activity: Activity) { - view!!.onStop() + view?.onStop() } /** @@ -68,7 +68,7 @@ private val mapLifecycleCallbacks = object : Application.ActivityLifecycleCallba } override fun onActivityResumed(activity: Activity) { - view!!.onResume() + view?.onResume() } } From 368ad3ea2d5679d9cc132750cdace31de5f7de1b Mon Sep 17 00:00:00 2001 From: geeksville Date: Tue, 31 Mar 2020 08:04:08 -0700 Subject: [PATCH 3/3] 0.2.2 hotfix --- app/build.gradle | 4 ++-- app/src/main/assets/firmware | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9d8504258..a5dc65527 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 121 - versionName "0.2.1" + versionCode 122 + versionName "0.2.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/assets/firmware b/app/src/main/assets/firmware index da1929c81..e4a11c5bf 120000 --- a/app/src/main/assets/firmware +++ b/app/src/main/assets/firmware @@ -1 +1 @@ -../../../../../meshtastic-esp32/release/latest/ \ No newline at end of file +../../../../../meshtastic-esp32/release/latest/bins \ No newline at end of file