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 radio service code verbatim into repository/radio

Browse source
This commit is contained in:
Mike Cumings 2022-04-22 10:22:03 -07:00
parent 166a56a75d
commit 4f6357103b
14 changed files with 26 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View file

@ -117,7 +117,7 @@
<!-- This is a private service which just does direct communication to the radio -->
<service
android:name="com.geeksville.mesh.service.RadioInterfaceService"
android:name="com.geeksville.mesh.repository.radio.RadioInterfaceService"
android:enabled="true"
android:exported="false" />

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

@ -39,6 +39,8 @@ import com.geeksville.mesh.model.BluetoothViewModel
import com.geeksville.mesh.model.ChannelSet
import com.geeksville.mesh.model.DeviceVersion
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.repository.radio.RadioInterfaceService
import com.geeksville.mesh.repository.radio.SerialInterface
import com.geeksville.mesh.repository.usb.UsbRepository
import com.geeksville.mesh.service.*
import com.geeksville.mesh.ui.*

2
app/src/main/java/com/geeksville/mesh/android/ContextServices.kt
View file

@ -8,7 +8,7 @@ import android.content.pm.PackageManager
import android.hardware.usb.UsbManager
import android.os.Build
import androidx.core.content.ContextCompat
import com.geeksville.mesh.service.BluetoothInterface
import com.geeksville.mesh.repository.radio.BluetoothInterface
/**
* @return null on platforms without a BlueTooth driver (i.e. the emulator)

3
app/src/main/java/com/geeksville/mesh/service/BluetoothInterface.kt → app/src/main/java/com/geeksville/mesh/repository/radio/BluetoothInterface.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import android.annotation.SuppressLint
import android.bluetooth.BluetoothAdapter
@ -11,6 +11,7 @@ import android.os.Build
import com.geeksville.android.Logging
import com.geeksville.concurrent.handledLaunch
import com.geeksville.mesh.repository.usb.UsbRepository
import com.geeksville.mesh.service.*
import com.geeksville.util.anonymize
import com.geeksville.util.exceptionReporter
import com.geeksville.util.ignoreException

2
app/src/main/java/com/geeksville/mesh/service/IRadioInterface.kt → app/src/main/java/com/geeksville/mesh/repository/radio/IRadioInterface.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import java.io.Closeable

2
app/src/main/java/com/geeksville/mesh/service/InterfaceFactory.kt → app/src/main/java/com/geeksville/mesh/repository/radio/InterfaceFactory.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import android.content.Context
import com.geeksville.mesh.repository.usb.UsbRepository

2
app/src/main/java/com/geeksville/mesh/service/MockInterface.kt → app/src/main/java/com/geeksville/mesh/repository/radio/MockInterface.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import android.content.Context
import com.geeksville.android.BuildUtils

2
app/src/main/java/com/geeksville/mesh/service/NopInterface.kt → app/src/main/java/com/geeksville/mesh/repository/radio/NopInterface.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import com.geeksville.android.Logging
import com.geeksville.mesh.repository.usb.UsbRepository

9
app/src/main/java/com/geeksville/mesh/service/RadioInterfaceService.kt → app/src/main/java/com/geeksville/mesh/repository/radio/RadioInterfaceService.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import android.annotation.SuppressLint
import android.app.Service
@ -17,6 +17,10 @@ import com.geeksville.concurrent.handledLaunch
import com.geeksville.mesh.IRadioInterfaceService
import com.geeksville.mesh.repository.bluetooth.BluetoothRepository
import com.geeksville.mesh.repository.usb.UsbRepository
import com.geeksville.mesh.service.EXTRA_CONNECTED
import com.geeksville.mesh.service.EXTRA_PAYLOAD
import com.geeksville.mesh.service.EXTRA_PERMANENT
import com.geeksville.mesh.service.prefix
import com.geeksville.util.anonymize
import com.geeksville.util.ignoreException
import com.geeksville.util.toRemoteExceptions
@ -122,7 +126,8 @@ class RadioInterfaceService : Service(), Logging {
if (address != null) {
val c = address[0]
val rest = address.substring(1)
val isValid = InterfaceFactory.getFactory(c)?.addressValid(context, usbRepository, rest) ?: false
val isValid = InterfaceFactory.getFactory(c)
?.addressValid(context, usbRepository, rest) ?: false
if (!isValid)
return null
}

2
app/src/main/java/com/geeksville/mesh/service/SerialInterface.kt → app/src/main/java/com/geeksville/mesh/repository/radio/SerialInterface.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import android.content.Context
import com.geeksville.android.Logging

2
app/src/main/java/com/geeksville/mesh/service/StreamInterface.kt → app/src/main/java/com/geeksville/mesh/repository/radio/StreamInterface.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import com.geeksville.android.Logging

2
app/src/main/java/com/geeksville/mesh/service/TCPInterface.kt → app/src/main/java/com/geeksville/mesh/repository/radio/TCPInterface.kt
View file

@ -1,4 +1,4 @@
package com.geeksville.mesh.service
package com.geeksville.mesh.repository.radio
import com.geeksville.android.Logging
import com.geeksville.mesh.repository.usb.UsbRepository

2
app/src/main/java/com/geeksville/mesh/service/MeshService.kt
View file

@ -25,6 +25,8 @@ import com.geeksville.mesh.android.hasBackgroundPermission
import com.geeksville.mesh.database.PacketRepository
import com.geeksville.mesh.database.entity.Packet
import com.geeksville.mesh.model.DeviceVersion
import com.geeksville.mesh.repository.radio.BluetoothInterface
import com.geeksville.mesh.repository.radio.RadioInterfaceService
import com.geeksville.mesh.repository.usb.UsbRepository
import com.geeksville.mesh.service.SoftwareUpdateService.Companion.ProgressNotStarted
import com.geeksville.util.*

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

@ -36,6 +36,10 @@ 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
import com.geeksville.mesh.repository.usb.UsbRepository
import com.geeksville.mesh.service.*
import com.geeksville.mesh.service.SoftwareUpdateService.Companion.ACTION_UPDATE_PROGRESS