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

move hasCompanionDeviceApi out of BluetoothInterface

Browse source
This commit is contained in:
andrekir 2022-04-28 21:40:34 -03:00
parent eaff87eed3
commit aaa5c1cf04
3 changed files with 11 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt
View file

@ -37,7 +37,6 @@ import com.geeksville.mesh.android.*
import com.geeksville.mesh.databinding.SettingsFragmentBinding
import com.geeksville.mesh.model.BluetoothViewModel
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.repository.radio.BluetoothInterface
import com.geeksville.mesh.repository.radio.MockInterface
import com.geeksville.mesh.repository.radio.RadioInterfaceService
import com.geeksville.mesh.repository.radio.SerialInterface
@ -154,6 +153,7 @@ class BTScanModel @Inject constructor(
}
val bluetoothAdapter = context.bluetoothManager?.adapter
val hasCompanionDeviceApi get() = context.hasCompanionDeviceApi()
private val usbManager get() = context.usbManager
var selectedAddress: String? = null
@ -466,10 +466,6 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
@Inject
internal lateinit var usbRepository: UsbRepository
private val hasCompanionDeviceApi: Boolean by lazy {
BluetoothInterface.hasCompanionDeviceApi(requireContext())
}
private val deviceManager: CompanionDeviceManager by lazy {
requireContext().getSystemService(Context.COMPANION_DEVICE_SERVICE) as CompanionDeviceManager
}
@ -958,7 +954,7 @@ class SettingsFragment : ScreenFragment("Settings"), Logging {
super.onViewCreated(view, savedInstanceState)
initCommonUI()
if (hasCompanionDeviceApi)
if (scanModel.hasCompanionDeviceApi)
initModernScan()
else
initClassicScan()