diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index 2ac40abe6..14420a6bb 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -937,14 +937,6 @@ class MainActivity : BaseActivity(), Logging, model.meshService = null } - override fun onBackPressed() { // FIXME Override back button to avoid closing - if (supportFragmentManager.backStackEntryCount == 0) { - moveTaskToBack(false) - } else { - super.onBackPressed() - } - } - override fun onStop() { unregisterMeshReceiver() // No point in receiving updates while the GUI is gone, we'll get them when the user launches the activity unbindMeshService() diff --git a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt index 35afe97fb..897bfd948 100644 --- a/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt +++ b/app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt @@ -40,7 +40,7 @@ class RadioInterfaceService @Inject constructor( private val processLifecycle: Lifecycle, private val usbRepository: UsbRepository, @RadioRepositoryQualifier private val prefs: SharedPreferences -): Logging { +) : Logging { private val _connectionState = MutableStateFlow(RadioServiceConnectionState()) val connectionState = _connectionState.asStateFlow() @@ -73,7 +73,7 @@ class RadioInterfaceService @Inject constructor( processLifecycle.coroutineScope.launch { bluetoothRepository.state.collect { state -> if (state.enabled) { - startInterface() + // startInterface() FIXME no longer safe to call here, crashing SafeBluetooth.asyncConnect } else if (radioIf is BluetoothInterface) { stopInterface() }