refactor(core:network): Move radio and networking components

app/src/main/kotlin/org/meshtastic/app/di/AppKoinModule.kt

@@ -37,6 +37,7 @@ import org.meshtastic.core.database.di.CoreDatabaseAndroidModule
 import org.meshtastic.core.database.di.CoreDatabaseModule
 import org.meshtastic.core.datastore.di.CoreDatastoreAndroidModule
 import org.meshtastic.core.datastore.di.CoreDatastoreModule
+import org.meshtastic.core.network.di.CoreNetworkAndroidModule
 import org.meshtastic.core.network.di.CoreNetworkModule
 import org.meshtastic.core.prefs.di.CorePrefsAndroidModule
 import org.meshtastic.core.prefs.di.CorePrefsModule
@@ -44,7 +45,7 @@ import org.meshtastic.core.service.di.CoreServiceAndroidModule
 import org.meshtastic.core.service.di.CoreServiceModule
 import org.meshtastic.core.ui.di.CoreUiModule
 import org.meshtastic.feature.connections.di.FeatureConnectionsModule
-import org.meshtastic.feature.connections.repository.ProbeTableProvider
+import org.meshtastic.core.network.repository.ProbeTableProvider
 import org.meshtastic.feature.firmware.di.FeatureFirmwareModule
 import org.meshtastic.feature.intro.di.FeatureIntroModule
 import org.meshtastic.feature.map.di.FeatureMapModule
@@ -72,6 +73,7 @@ import org.meshtastic.feature.settings.di.FeatureSettingsModule
         CoreServiceModule::class,
         CoreServiceAndroidModule::class,
         CoreNetworkModule::class,
+        CoreNetworkAndroidModule::class,
         CoreUiModule::class,
         FeatureNodeModule::class,
         FeatureMessagingModule::class,

conductor/tracks/extract_services_20260317/plan.md

@@ -19,9 +19,9 @@
 - [x] Task: Conductor - User Manual Verification 'Extraction to core:service' (Protocol in workflow.md)
 
 ## Phase 3: Extraction to `core:network`
-- [ ] Task: Move Radio connection and networking files from `app` to `core:network/androidMain`
-    - [ ] Move the files
-    - [ ] Update imports and Koin injections
+- [~] Task: Move Radio connection and networking files from `app` to `core:network/androidMain`
+    - [x] Move the files
+    - [x] Update imports and Koin injections
 - [ ] Task: Abstract shared radio/network logic into `core:network/commonMain`
     - [ ] Write failing tests for abstracted radio logic (TDD Red)
     - [ ] Extract platform-agnostic business logic (TDD Green)

core/network/build.gradle.kts

@@ -51,7 +51,10 @@ kotlin {
         val jvmMain by getting { dependencies { implementation(libs.ktor.client.java) } }
 
         androidMain.dependencies {
+            implementation(projects.core.ble)
+            implementation(projects.core.prefs)
             implementation(libs.org.eclipse.paho.client.mqttv3)
+            implementation(libs.usb.serial.android)
             implementation(libs.coil.network.okhttp)
             implementation(libs.coil.svg)
             implementation(libs.ktor.client.okhttp)

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/AndroidRadioInterfaceService.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import android.app.Application
 import android.provider.Settings
@@ -37,7 +37,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import org.koin.core.annotation.Named
 import org.koin.core.annotation.Single
-import org.meshtastic.app.BuildConfig
+import org.meshtastic.core.common.BuildConfigProvider
 import org.meshtastic.core.ble.BluetoothRepository
 import org.meshtastic.core.common.util.BinaryLogFile
 import org.meshtastic.core.common.util.handledLaunch
@@ -53,7 +53,7 @@ import org.meshtastic.core.repository.PlatformAnalytics
 import org.meshtastic.core.repository.RadioInterfaceService
 import org.meshtastic.core.repository.RadioPrefs
 import org.meshtastic.core.repository.RadioTransport
-import org.meshtastic.feature.connections.repository.NetworkRepository
+import org.meshtastic.core.network.repository.NetworkRepository
 import org.meshtastic.proto.Heartbeat
 import org.meshtastic.proto.ToRadio
 
@@ -73,6 +73,7 @@ class AndroidRadioInterfaceService(
     private val dispatchers: CoroutineDispatchers,
     private val bluetoothRepository: BluetoothRepository,
     private val networkRepository: NetworkRepository,
+    private val buildConfigProvider: BuildConfigProvider,
     @Named("ProcessLifecycle") private val processLifecycle: Lifecycle,
     private val radioPrefs: RadioPrefs,
     private val interfaceFactory: Lazy<InterfaceFactory>,
@@ -187,7 +188,7 @@ class AndroidRadioInterfaceService(
         interfaceFactory.value.toInterfaceAddress(interfaceId, rest)
 
     override fun isMockInterface(): Boolean =
-        BuildConfig.DEBUG || Settings.System.getString(context.contentResolver, "firebase.test.lab") == "true"
+        buildConfigProvider.isDebug || Settings.System.getString(context.contentResolver, "firebase.test.lab") == "true"
 
     override fun getDeviceAddress(): String? {
         // If the user has unpaired our device, treat things as if we don't have one

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/BleRadioInterface.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import android.annotation.SuppressLint
 import co.touchlab.kermit.Logger

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/BleRadioInterfaceFactory.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.ble.BleConnectionFactory

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/BleRadioInterfaceSpec.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/InterfaceFactory.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.model.InterfaceId

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/InterfaceFactorySpi.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.meshtastic.core.repository.RadioTransport
 

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/InterfaceSpec.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.meshtastic.core.repository.RadioInterfaceService
 import org.meshtastic.core.repository.RadioTransport

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterface.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import co.touchlab.kermit.Logger
 import kotlinx.coroutines.delay

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceFactory.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/MockInterfaceSpec.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterface.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.meshtastic.core.repository.RadioTransport
 

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceFactory.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/NopInterfaceSpec.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/SerialInterface.kt

@@ -14,14 +14,14 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import co.touchlab.kermit.Logger
 import org.meshtastic.core.common.util.nowMillis
 import org.meshtastic.core.repository.RadioInterfaceService
-import org.meshtastic.feature.connections.repository.SerialConnection
-import org.meshtastic.feature.connections.repository.SerialConnectionListener
-import org.meshtastic.feature.connections.repository.UsbRepository
+import org.meshtastic.core.network.repository.SerialConnection
+import org.meshtastic.core.network.repository.SerialConnectionListener
+import org.meshtastic.core.network.repository.UsbRepository
 import java.util.concurrent.atomic.AtomicReference
 
 /** An interface that assumes we are talking to a meshtastic device via USB serial */

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/SerialInterfaceFactory.kt

@@ -14,11 +14,11 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService
-import org.meshtastic.feature.connections.repository.UsbRepository
+import org.meshtastic.core.network.repository.UsbRepository
 
 /** Factory for creating `SerialInterface` instances. */
 @Single

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/SerialInterfaceSpec.kt

@@ -14,13 +14,13 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import android.hardware.usb.UsbManager
 import com.hoho.android.usbserial.driver.UsbSerialDriver
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService
-import org.meshtastic.feature.connections.repository.UsbRepository
+import org.meshtastic.core.network.repository.UsbRepository
 
 /** Serial/USB interface backend implementation. */
 @Single

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/StreamInterface.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import co.touchlab.kermit.Logger
 import kotlinx.coroutines.launch

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/TCPInterface.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import co.touchlab.kermit.Logger
 import org.meshtastic.core.common.util.handledLaunch

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/TCPInterfaceFactory.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.di.CoroutineDispatchers

core/network/src/androidMain/kotlin/org/meshtastic/core/network/radio/TCPInterfaceSpec.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import org.koin.core.annotation.Single
 import org.meshtastic.core.repository.RadioInterfaceService

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/ConnectivityManager.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import android.net.ConnectivityManager
 import android.net.Network

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/NetworkRepository.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import android.net.ConnectivityManager
 import android.net.nsd.NsdManager

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/NsdManager.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import android.annotation.SuppressLint
 import android.net.nsd.NsdManager

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/ProbeTableProvider.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import com.hoho.android.usbserial.driver.CdcAcmSerialDriver
 import com.hoho.android.usbserial.driver.ProbeTable

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/SerialConnection.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 /** USB serial connection. */
 interface SerialConnection : AutoCloseable {

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/SerialConnectionImpl.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import android.hardware.usb.UsbManager
 import co.touchlab.kermit.Logger

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/SerialConnectionListener.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 /** Callbacks indicating state changes in the USB serial connection. */
 interface SerialConnectionListener {

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/UsbBroadcastReceiver.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import android.content.BroadcastReceiver
 import android.content.Context

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/UsbManager.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import android.content.BroadcastReceiver
 import android.content.Context

core/network/src/androidMain/kotlin/org/meshtastic/core/network/repository/UsbRepository.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 import android.app.Application
 import android.hardware.usb.UsbDevice

core/network/src/androidUnitTest/kotlin/org/meshtastic/core/network/radio/BleRadioInterfaceTest.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.app.repository.radio
+package org.meshtastic.core.network.radio
 
 import io.mockk.coEvery
 import io.mockk.every

core/network/src/commonMain/kotlin/org/meshtastic/core/network/repository/NetworkConstants.kt

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
-package org.meshtastic.feature.connections.repository
+package org.meshtastic.core.network.repository
 
 object NetworkConstants {
     const val SERVICE_PORT = 4403

feature/connections/build.gradle.kts

@@ -50,6 +50,7 @@ kotlin {
             implementation(projects.core.service)
             implementation(projects.core.ui)
             implementation(projects.core.ble)
+            implementation(projects.core.network)
             implementation(projects.feature.settings)
 
             implementation(libs.jetbrains.lifecycle.viewmodel.compose)

feature/connections/src/androidMain/kotlin/org/meshtastic/feature/connections/AndroidScannerViewModel.kt

@@ -32,7 +32,7 @@ import org.meshtastic.core.repository.ServiceRepository
 import org.meshtastic.feature.connections.model.AndroidUsbDeviceData
 import org.meshtastic.feature.connections.model.DeviceListEntry
 import org.meshtastic.feature.connections.model.GetDiscoveredDevicesUseCase
-import org.meshtastic.feature.connections.repository.UsbRepository
+import org.meshtastic.core.network.repository.UsbRepository
 
 @KoinViewModel
 @Suppress("LongParameterList", "TooManyFunctions")

feature/connections/src/androidMain/kotlin/org/meshtastic/feature/connections/domain/usecase/AndroidGetDiscoveredDevicesUseCase.kt

@@ -38,9 +38,9 @@ import org.meshtastic.feature.connections.model.DeviceListEntry
 import org.meshtastic.feature.connections.model.DiscoveredDevices
 import org.meshtastic.feature.connections.model.GetDiscoveredDevicesUseCase
 import org.meshtastic.feature.connections.model.getMeshtasticShortName
-import org.meshtastic.feature.connections.repository.NetworkRepository
-import org.meshtastic.feature.connections.repository.NetworkRepository.Companion.toAddressString
-import org.meshtastic.feature.connections.repository.UsbRepository
+import org.meshtastic.core.network.repository.NetworkRepository
+import org.meshtastic.core.network.repository.NetworkRepository.Companion.toAddressString
+import org.meshtastic.core.network.repository.UsbRepository
 import java.util.Locale
 
 @Suppress("LongParameterList")

feature/connections/src/commonMain/kotlin/org/meshtastic/feature/connections/ui/components/NetworkDevices.kt

@@ -60,7 +60,7 @@ import org.meshtastic.core.resources.no_network_devices_found
 import org.meshtastic.core.resources.recent_network_devices
 import org.meshtastic.feature.connections.ScannerViewModel
 import org.meshtastic.feature.connections.model.DeviceListEntry
-import org.meshtastic.feature.connections.repository.NetworkConstants
+import org.meshtastic.core.network.repository.NetworkConstants
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable