Merge remote-tracking branch 'root/master' into dev

app/src/main/java/com/geeksville/mesh/MainActivity.kt

@@ -793,6 +793,7 @@ class MainActivity : AppCompatActivity(), Logging,
             connectionJob = mainScope.handledLaunch {
                 model.meshService = service
 
+                try {
                     usbDevice?.let { usb ->
                         debug("Switching to USB radio ${usb.deviceName}")
                         service.setDeviceAddress(SerialInterface.toInterfaceName(usb.deviceName))
@@ -817,7 +818,7 @@ class MainActivity : AppCompatActivity(), Logging,
                     if (connectionState != MeshService.ConnectionState.CONNECTED)
                         updateNodesFromDevice()
 
-                try {
+
                     // We won't receive a notify for the initial state of connection, so we force an update here
                     onMeshConnectionChanged(connectionState)
                 } catch (ex: RemoteException) {