meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

refactor: remove RadioInterfaceService from MainActivity

Browse source
This commit is contained in:
andrekir 2023-05-24 06:43:58 -03:00
parent d01e8e8e74
commit 956db658e9
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

9
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View file

@ -38,7 +38,6 @@ import com.geeksville.mesh.model.ChannelSet
import com.geeksville.mesh.model.DeviceVersion
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.repository.radio.BluetoothInterface
import com.geeksville.mesh.repository.radio.RadioInterfaceService
import com.geeksville.mesh.repository.radio.SerialInterface
import com.geeksville.mesh.service.*
import com.geeksville.mesh.ui.*
@ -55,7 +54,6 @@ import kotlinx.coroutines.Job
import kotlinx.coroutines.cancel
import java.text.DateFormat
import java.util.Date
import javax.inject.Inject
/*
UI design
@ -118,9 +116,6 @@ class MainActivity : AppCompatActivity(), Logging {
private val scanModel: BTScanModel by viewModels()
val model: UIViewModel by viewModels()
@Inject
internal lateinit var radioInterfaceService: RadioInterfaceService
private val requestPermissionsLauncher =
registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
if (!permissions.entries.all { it.value }) {
@ -664,7 +659,7 @@ class MainActivity : AppCompatActivity(), Logging {
}
bluetoothViewModel.enabled.observe(this) { enabled ->
if (!enabled && !requestedEnable && scanModel.selectedBluetooth) {
if (!enabled && !requestedEnable && model.selectedBluetooth) {
requestedEnable = true
if (hasBluetoothPermission()) {
val enableBtIntent = Intent(BluetoothAdapter.ACTION_REQUEST_ENABLE)
@ -701,7 +696,7 @@ class MainActivity : AppCompatActivity(), Logging {
errormsg("Bind of MeshService failed")
}
val bonded = radioInterfaceService.getBondedDeviceAddress() != null
val bonded = model.bondedAddress != null
if (!bonded && usbDevice == null) // we will handle USB later
showSettingsPage()
}