From 2f48e8e68a078f4dd674a63d22b4c776b43a04ff Mon Sep 17 00:00:00 2001 From: Joshua Soberg Date: Thu, 27 Feb 2025 17:18:42 -0500 Subject: [PATCH] chore: Unused code cleanup (#1612) * Remove unused SoftwareUpdateService code and commented out service reg in manifest * Remove unused methods that had unnecessary version checks * Regenerate baseline to remove detekt issues that are no longer present --- app/src/main/AndroidManifest.xml | 9 --- .../com/geeksville/mesh/android/BuildUtils.kt | 13 ---- .../mesh/service/SoftwareUpdateService.kt | 77 ------------------- config/detekt/detekt-baseline.xml | 15 +--- 4 files changed, 1 insertion(+), 113 deletions(-) delete mode 100644 app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 93d05fd0d..84634560c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -108,15 +108,6 @@ android:name="firebase_analytics_collection_enabled" android:value="false" /> - - - 0 - } - - fun isBuggyMoto(): Boolean { - debug("Device type is: ${Build.DEVICE}") - return Build.DEVICE == "osprey_u2" // Moto G - } - // Are we running on the emulator? val isEmulator get() = Build.FINGERPRINT.startsWith("generic") || diff --git a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt b/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt deleted file mode 100644 index 74c467197..000000000 --- a/app/src/main/java/com/geeksville/mesh/service/SoftwareUpdateService.kt +++ /dev/null @@ -1,77 +0,0 @@ -/* - * Copyright (c) 2025 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 . - */ - -package com.geeksville.mesh.service - -import android.bluetooth.BluetoothGattCharacteristic - -/** - * Some misformatted ESP32s have problems - */ -class DeviceRejectedException : BLEException("Device rejected filesize") - -/** - * Move this somewhere as a generic network byte order function - */ -fun toNetworkByteArray(value: Int, formatType: Int): ByteArray { - - val len = when (formatType) { - BluetoothGattCharacteristic.FORMAT_UINT8 -> 1 - BluetoothGattCharacteristic.FORMAT_UINT32 -> 4 - else -> TODO() - } - - val mValue = ByteArray(len) - - when (formatType) { - /* BluetoothGattCharacteristic.FORMAT_SINT8 -> { - value = intToSignedBits(value, 8) - mValue.get(offset) = (value and 0xFF).toByte() - } - BluetoothGattCharacteristic.FORMAT_UINT8 -> mValue.get(offset) = - (value and 0xFF).toByte() - BluetoothGattCharacteristic.FORMAT_SINT16 -> { - value = intToSignedBits(value, 16) - mValue.get(offset++) = (value and 0xFF).toByte() - mValue.get(offset) = (value shr 8 and 0xFF).toByte() - } - BluetoothGattCharacteristic.FORMAT_UINT16 -> { - mValue.get(offset++) = (value and 0xFF).toByte() - mValue.get(offset) = (value shr 8 and 0xFF).toByte() - } - BluetoothGattCharacteristic.FORMAT_SINT32 -> { - value = intToSignedBits(value, 32) - mValue.get(offset++) = (value and 0xFF).toByte() - mValue.get(offset++) = (value shr 8 and 0xFF).toByte() - mValue.get(offset++) = (value shr 16 and 0xFF).toByte() - mValue.get(offset) = (value shr 24 and 0xFF).toByte() - } */ - BluetoothGattCharacteristic.FORMAT_UINT8 -> - mValue[0] = (value and 0xFF).toByte() - - BluetoothGattCharacteristic.FORMAT_UINT32 -> { - mValue[0] = (value and 0xFF).toByte() - mValue[1] = (value shr 8 and 0xFF).toByte() - mValue[2] = (value shr 16 and 0xFF).toByte() - mValue[3] = (value shr 24 and 0xFF).toByte() - } - else -> TODO() - } - return mValue -} - -data class UpdateFilenames(val appLoad: String?, val littlefs: String?) \ No newline at end of file diff --git a/config/detekt/detekt-baseline.xml b/config/detekt/detekt-baseline.xml index c13ab3d07..27bb2ab2a 100644 --- a/config/detekt/detekt-baseline.xml +++ b/config/detekt/detekt-baseline.xml @@ -1,6 +1,6 @@ - + AbsentOrWrongFileLicense:LazyColumnDragAndDropDemo.kt$com.geeksville.mesh.ui.components.LazyColumnDragAndDropDemo.kt ChainWrapping:Channel.kt$Channel$&& @@ -126,7 +126,6 @@ FinalNewline:SerialConnectionListener.kt$com.geeksville.mesh.repository.usb.SerialConnectionListener.kt FinalNewline:SerialInterface.kt$com.geeksville.mesh.repository.radio.SerialInterface.kt FinalNewline:SerialInterfaceFactory.kt$com.geeksville.mesh.repository.radio.SerialInterfaceFactory.kt - FinalNewline:SoftwareUpdateService.kt$com.geeksville.mesh.service.SoftwareUpdateService.kt FinalNewline:SqlTileWriterExt.kt$com.geeksville.mesh.util.SqlTileWriterExt.kt FinalNewline:TCPInterfaceFactory.kt$com.geeksville.mesh.repository.radio.TCPInterfaceFactory.kt FinalNewline:UsbBroadcastReceiver.kt$com.geeksville.mesh.repository.usb.UsbBroadcastReceiver.kt @@ -186,7 +185,6 @@ MagicNumber:BluetoothInterface.kt$BluetoothInterface$1500 MagicNumber:BluetoothInterface.kt$BluetoothInterface$500 MagicNumber:BluetoothInterface.kt$BluetoothInterface$512 - MagicNumber:BuildUtils.kt$BuildUtils$21 MagicNumber:Channel.kt$0xff MagicNumber:ChannelOption.kt$.03125f MagicNumber:ChannelOption.kt$.0625f @@ -336,12 +334,6 @@ MagicNumber:SerialConnectionImpl.kt$SerialConnectionImpl$115200 MagicNumber:SerialConnectionImpl.kt$SerialConnectionImpl$200 MagicNumber:ServiceClient.kt$ServiceClient$500 - MagicNumber:SoftwareUpdateService.kt$0xFF - MagicNumber:SoftwareUpdateService.kt$16 - MagicNumber:SoftwareUpdateService.kt$24 - MagicNumber:SoftwareUpdateService.kt$3 - MagicNumber:SoftwareUpdateService.kt$4 - MagicNumber:SoftwareUpdateService.kt$8 MagicNumber:StreamInterface.kt$StreamInterface$0xff MagicNumber:StreamInterface.kt$StreamInterface$3 MagicNumber:StreamInterface.kt$StreamInterface$4 @@ -460,8 +452,6 @@ MultiLineIfElse:BluetoothInterface.kt$BluetoothInterface$warn("Not connecting, because safe==null, someone must have closed us") MultiLineIfElse:BluetoothRepository.kt$BluetoothRepository$bondedDevices.filter { it.name?.matches(Regex(BLE_NAME_PATTERN)) == true } MultiLineIfElse:BluetoothRepository.kt$BluetoothRepository$emptyList() - MultiLineIfElse:BuildUtils.kt$BuildUtils$return Build.SUPPORTED_64_BIT_ABIS.size > 0 - MultiLineIfElse:BuildUtils.kt$BuildUtils$return false MultiLineIfElse:Channel.kt$Channel$"Custom" MultiLineIfElse:Channel.kt$Channel$when (loraConfig.modemPreset) { ModemPreset.SHORT_TURBO -> "ShortTurbo" ModemPreset.SHORT_FAST -> "ShortFast" ModemPreset.SHORT_SLOW -> "ShortSlow" ModemPreset.MEDIUM_FAST -> "MediumFast" ModemPreset.MEDIUM_SLOW -> "MediumSlow" ModemPreset.LONG_FAST -> "LongFast" ModemPreset.LONG_SLOW -> "LongSlow" ModemPreset.LONG_MODERATE -> "LongMod" ModemPreset.VERY_LONG_SLOW -> "VLongSlow" else -> "Invalid" } MultiLineIfElse:ChannelFragment.kt$channelSet = copy { settings.add(it) } @@ -561,7 +551,6 @@ NewLineAtEndOfFile:SerialConnectionListener.kt$com.geeksville.mesh.repository.usb.SerialConnectionListener.kt NewLineAtEndOfFile:SerialInterface.kt$com.geeksville.mesh.repository.radio.SerialInterface.kt NewLineAtEndOfFile:SerialInterfaceFactory.kt$com.geeksville.mesh.repository.radio.SerialInterfaceFactory.kt - NewLineAtEndOfFile:SoftwareUpdateService.kt$com.geeksville.mesh.service.SoftwareUpdateService.kt NewLineAtEndOfFile:SqlTileWriterExt.kt$com.geeksville.mesh.util.SqlTileWriterExt.kt NewLineAtEndOfFile:TCPInterfaceFactory.kt$com.geeksville.mesh.repository.radio.TCPInterfaceFactory.kt NewLineAtEndOfFile:UsbBroadcastReceiver.kt$com.geeksville.mesh.repository.usb.UsbBroadcastReceiver.kt @@ -597,7 +586,6 @@ NoTrailingSpaces:ExpireChecker.kt$ExpireChecker$ NoWildcardImports:BluetoothInterface.kt$import com.geeksville.mesh.service.* NoWildcardImports:DeviceVersionTest.kt$import org.junit.Assert.* - NoWildcardImports:ExampleUnitTest.kt$import org.junit.Assert.* NoWildcardImports:MockInterface.kt$import com.geeksville.mesh.* NoWildcardImports:PreferenceFooter.kt$import androidx.compose.foundation.layout.* NoWildcardImports:PreferenceFooter.kt$import androidx.compose.material.* @@ -710,7 +698,6 @@ VariableNaming:SafeBluetooth.kt$SafeBluetooth$private val STATUS_TIMEOUT = 4404 WildcardImport:BluetoothInterface.kt$import com.geeksville.mesh.service.* WildcardImport:DeviceVersionTest.kt$import org.junit.Assert.* - WildcardImport:ExampleUnitTest.kt$import org.junit.Assert.* WildcardImport:MockInterface.kt$import com.geeksville.mesh.* WildcardImport:PreferenceFooter.kt$import androidx.compose.foundation.layout.* WildcardImport:PreferenceFooter.kt$import androidx.compose.material.*