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 and unify firmware update logic across platforms (#4966)

Browse source
This commit is contained in:
James Rich 2026-04-01 07:14:26 -05:00 • committed by GitHub
parent d8e295cafb
commit 89547afe6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
102 changed files with 7206 additions and 3485 deletions
Download patch file Download diff file Expand all files Collapse all files

12
desktop/src/main/kotlin/org/meshtastic/desktop/di/DesktopKoinModule.kt
View file

@ -158,11 +158,10 @@ private fun desktopPlatformStubsModule() = module {
single<org.meshtastic.feature.node.compass.PhoneLocationProvider> { NoopPhoneLocationProvider() }
single<org.meshtastic.feature.node.compass.MagneticFieldProvider> { NoopMagneticFieldProvider() }
// Desktop mesh service controller — replaces Android's MeshService lifecycle
// Ktor HttpClient for JVM/Desktop (equivalent of CoreNetworkAndroidModule on Android)
single<HttpClient> { HttpClient(Java) { install(ContentNegotiation) { json(get<Json>()) } } }
// Android asset-based JSON data sources (impls in core:data/androidMain)
// Desktop stubs for data sources that load from Android assets on mobile
single<FirmwareReleaseJsonDataSource> {
object : FirmwareReleaseJsonDataSource {
override fun loadFirmwareReleaseFromJsonAsset() = NetworkFirmwareReleases()
@ -178,13 +177,4 @@ private fun desktopPlatformStubsModule() = module {
override fun loadBootloaderOtaQuirksFromJsonAsset(): List<BootloaderOtaQuirk> = emptyList()
}
}
// Firmware update stubs
single<org.meshtastic.feature.firmware.FirmwareUpdateManager> {
org.meshtastic.desktop.stub.NoopFirmwareUpdateManager()
}
single<org.meshtastic.feature.firmware.FirmwareUsbManager> { org.meshtastic.desktop.stub.NoopFirmwareUsbManager() }
single<org.meshtastic.feature.firmware.FirmwareFileHandler> {
org.meshtastic.desktop.stub.NoopFirmwareFileHandler()
}
}

75
desktop/src/main/kotlin/org/meshtastic/desktop/stub/FirmwareStubs.kt
View file

@ -1,75 +0,0 @@
/*
* Copyright (c) 2026 Meshtastic LLC
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* 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.desktop.stub
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.emptyFlow
import org.meshtastic.core.common.util.CommonUri
import org.meshtastic.core.database.entity.FirmwareRelease
import org.meshtastic.core.model.DeviceHardware
import org.meshtastic.feature.firmware.DfuInternalState
import org.meshtastic.feature.firmware.FirmwareFileHandler
import org.meshtastic.feature.firmware.FirmwareUpdateManager
import org.meshtastic.feature.firmware.FirmwareUpdateState
import org.meshtastic.feature.firmware.FirmwareUsbManager
class NoopFirmwareUpdateManager : FirmwareUpdateManager {
override suspend fun startUpdate(
release: FirmwareRelease,
hardware: DeviceHardware,
address: String,
updateState: (FirmwareUpdateState) -> Unit,
firmwareUri: CommonUri?,
): String? = null
override fun dfuProgressFlow(): Flow<DfuInternalState> = emptyFlow()
}
class NoopFirmwareUsbManager : FirmwareUsbManager {
override fun deviceDetachFlow(): Flow<Unit> = emptyFlow()
}
@Suppress("EmptyFunctionBlock")
class NoopFirmwareFileHandler : FirmwareFileHandler {
override fun cleanupAllTemporaryFiles() {}
override suspend fun checkUrlExists(url: String): Boolean = false
override suspend fun downloadFile(url: String, fileName: String, onProgress: (Float) -> Unit): String? = null
override suspend fun extractFirmware(
uri: CommonUri,
hardware: DeviceHardware,
fileExtension: String,
preferredFilename: String?,
): String? = null
override suspend fun extractFirmwareFromZip(
zipFilePath: String,
hardware: DeviceHardware,
fileExtension: String,
preferredFilename: String?,
): String? = null
override suspend fun getFileSize(path: String): Long = 0L
override suspend fun deleteFile(path: String) {}
override suspend fun copyFileToUri(sourcePath: String, destinationUri: CommonUri): Long = 0L
override suspend fun copyUriToUri(sourceUri: CommonUri, destinationUri: CommonUri): Long = 0L
}