Merge pull request #9 from geeksville/master

0.2.2 hotfix

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 {

app/src/main/assets/firmware

@@ -1 +1 @@
-../../../../../meshtastic-esp32/release/latest/
+../../../../../meshtastic-esp32/release/latest/bins

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 {

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()
     }
 }