Skip to content

Commit 794722a

Browse files
ovitrifovitrif
committed
fix: clean stacked lint fallout
1 parent cdc7e6b commit 794722a

7 files changed

Lines changed: 110 additions & 27 deletions

File tree

‎app/src/main/java/to/bitkit/repositories/PreActivityMetadataRepo.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import kotlinx.coroutines.withContext
1010
import to.bitkit.di.IoDispatcher
1111
import to.bitkit.ext.nowMillis
1212
import to.bitkit.ext.nowTimestamp
13-
import to.bitkit.services.CoreService
1413
import to.bitkit.models.WalletScope
14+
import to.bitkit.services.CoreService
1515
import to.bitkit.utils.Logger
1616
import javax.inject.Inject
1717
import javax.inject.Singleton

‎app/src/main/java/to/bitkit/repositories/WalletRepo.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@ import to.bitkit.models.ALL_ADDRESS_TYPE_STRINGS
3535
import to.bitkit.models.AddressModel
3636
import to.bitkit.models.BalanceState
3737
import to.bitkit.models.DEFAULT_ADDRESS_TYPE_STRING
38+
import to.bitkit.models.WalletScope
3839
import to.bitkit.models.msatFloorOf
3940
import to.bitkit.models.toAccountDerivationPath
4041
import to.bitkit.models.toBalance
@@ -44,7 +45,6 @@ import to.bitkit.services.CoreService
4445
import to.bitkit.usecases.DeriveBalanceStateUseCase
4546
import to.bitkit.usecases.WipeWalletUseCase
4647
import to.bitkit.utils.Bip21Utils
47-
import to.bitkit.models.WalletScope
4848
import to.bitkit.utils.Logger
4949
import to.bitkit.utils.ServiceError
5050
import to.bitkit.utils.measured

‎app/src/main/java/to/bitkit/services/TrezorTransport.kt‎

Lines changed: 104 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -674,13 +674,17 @@ class TrezorTransport @Inject constructor(
674674
return UsbEndpoints(read = readEndpoint, write = writeEndpoint)
675675
}
676676

677-
@Suppress("TooGenericExceptionCaught", "ReturnCount")
677+
@Suppress("TooGenericExceptionCaught", "ReturnCount", "LongMethod")
678678
private fun openUsbDevice(path: String): TrezorTransportWriteResult {
679679
return try {
680680
closeUsbDevice(path)
681681

682682
val device = usbManager.deviceList[path]
683-
?: return TrezorTransportWriteResult(success = false, error = "Device not found: $path", errorCode = null)
683+
?: return TrezorTransportWriteResult(
684+
success = false,
685+
error = "Device not found: $path",
686+
errorCode = null,
687+
)
684688

685689
if (!usbManager.hasPermission(device)) {
686690
if (!requestUsbPermissionEnabled) {
@@ -701,12 +705,20 @@ class TrezorTransport @Inject constructor(
701705
}
702706

703707
val connection = usbManager.openDevice(device)
704-
?: return TrezorTransportWriteResult(success = false, error = "Failed to open device: $path", errorCode = null)
708+
?: return TrezorTransportWriteResult(
709+
success = false,
710+
error = "Failed to open device: $path",
711+
errorCode = null,
712+
)
705713

706714
val usbInterface = device.getInterface(0)
707715
if (!connection.claimInterface(usbInterface, true)) {
708716
connection.close()
709-
return TrezorTransportWriteResult(success = false, error = "Failed to claim interface", errorCode = null)
717+
return TrezorTransportWriteResult(
718+
success = false,
719+
error = "Failed to claim interface",
720+
errorCode = null,
721+
)
710722
}
711723

712724
val endpoints = findUsbEndpoints(usbInterface)
@@ -730,7 +742,11 @@ class TrezorTransport @Inject constructor(
730742
TrezorTransportWriteResult(success = true, error = "", errorCode = null)
731743
} catch (e: Exception) {
732744
Logger.error("USB open failed", e, context = TAG)
733-
TrezorTransportWriteResult(success = false, error = e.message ?: "Unknown error", errorCode = null)
745+
TrezorTransportWriteResult(
746+
success = false,
747+
error = e.message ?: "Unknown error",
748+
errorCode = null,
749+
)
734750
}
735751
}
736752

@@ -746,7 +762,11 @@ class TrezorTransport @Inject constructor(
746762
TrezorTransportWriteResult(success = true, error = "", errorCode = null)
747763
} catch (e: Exception) {
748764
Logger.error("USB close failed", e, context = TAG)
749-
TrezorTransportWriteResult(success = false, error = e.message ?: "Unknown error", errorCode = null)
765+
TrezorTransportWriteResult(
766+
success = false,
767+
error = e.message ?: "Unknown error",
768+
errorCode = null,
769+
)
750770
}
751771
}
752772

@@ -782,18 +802,32 @@ class TrezorTransport @Inject constructor(
782802
}
783803

784804
Logger.debug("USB read '$bytesRead' bytes from '$path'", context = TAG)
785-
TrezorTransportReadResult(success = true, data = buffer.copyOf(bytesRead), error = "", errorCode = null)
805+
TrezorTransportReadResult(
806+
success = true,
807+
data = buffer.copyOf(bytesRead),
808+
error = "",
809+
errorCode = null,
810+
)
786811
} catch (e: Exception) {
787812
Logger.error("USB read failed", e, context = TAG)
788-
TrezorTransportReadResult(success = false, data = byteArrayOf(), error = e.message ?: "Unknown error", errorCode = null)
813+
TrezorTransportReadResult(
814+
success = false,
815+
data = byteArrayOf(),
816+
error = e.message ?: "Unknown error",
817+
errorCode = null,
818+
)
789819
}
790820
}
791821

792822
@Suppress("TooGenericExceptionCaught")
793823
private fun writeUsbChunk(path: String, data: ByteArray): TrezorTransportWriteResult {
794824
return try {
795825
val openDevice = usbConnections[path]
796-
?: return TrezorTransportWriteResult(success = false, error = "Device not open: $path", errorCode = null)
826+
?: return TrezorTransportWriteResult(
827+
success = false,
828+
error = "Device not open: $path",
829+
errorCode = null,
830+
)
797831

798832
val bytesWritten = openDevice.connection.bulkTransfer(
799833
openDevice.writeEndpoint,
@@ -802,14 +836,22 @@ class TrezorTransport @Inject constructor(
802836
WRITE_TIMEOUT_MS,
803837
)
804838
if (bytesWritten != data.size) {
805-
return TrezorTransportWriteResult(success = false, error = "USB write timed out", errorCode = null)
839+
return TrezorTransportWriteResult(
840+
success = false,
841+
error = "USB write timed out",
842+
errorCode = null,
843+
)
806844
}
807845

808846
Logger.debug("USB wrote '${data.size}' bytes to '$path'", context = TAG)
809847
TrezorTransportWriteResult(success = true, error = "", errorCode = null)
810848
} catch (e: Exception) {
811849
Logger.error("USB write failed", e, context = TAG)
812-
TrezorTransportWriteResult(success = false, error = e.message ?: "Unknown error", errorCode = null)
850+
TrezorTransportWriteResult(
851+
success = false,
852+
error = e.message ?: "Unknown error",
853+
errorCode = null,
854+
)
813855
}
814856
}
815857

@@ -875,18 +917,30 @@ class TrezorTransport @Inject constructor(
875917
if (device.bondState == BluetoothDevice.BOND_NONE) {
876918
Logger.info("Device not bonded, initiating bonding: '$address'", context = TAG)
877919
if (!device.createBond()) {
878-
return TrezorTransportWriteResult(success = false, error = "Failed to initiate bonding", errorCode = null)
920+
return TrezorTransportWriteResult(
921+
success = false,
922+
error = "Failed to initiate bonding",
923+
errorCode = null,
924+
)
879925
}
880926
var bondAttempts = 0
881927
while (device.bondState != BluetoothDevice.BOND_BONDED && bondAttempts < MAX_BOND_POLL_ATTEMPTS) {
882928
Thread.sleep(BOND_POLL_INTERVAL_MS)
883929
bondAttempts++
884930
if (device.bondState == BluetoothDevice.BOND_NONE) {
885-
return TrezorTransportWriteResult(success = false, error = "Bonding failed or rejected", errorCode = null)
931+
return TrezorTransportWriteResult(
932+
success = false,
933+
error = "Bonding failed or rejected",
934+
errorCode = null,
935+
)
886936
}
887937
}
888938
if (device.bondState != BluetoothDevice.BOND_BONDED) {
889-
return TrezorTransportWriteResult(success = false, error = "Bonding timeout", errorCode = null)
939+
return TrezorTransportWriteResult(
940+
success = false,
941+
error = "Bonding timeout",
942+
errorCode = null,
943+
)
890944
}
891945
Logger.info("Device bonded successfully: '$address'", context = TAG)
892946
} else if (device.bondState == BluetoothDevice.BOND_BONDING) {
@@ -1005,10 +1059,18 @@ class TrezorTransport @Inject constructor(
10051059
connection.gatt.close()
10061060
Thread.sleep(100)
10071061
Logger.info("BLE device closed: '$path'", context = TAG)
1008-
TrezorTransportWriteResult(success = timeoutError == null, error = timeoutError.orEmpty(), errorCode = null)
1062+
TrezorTransportWriteResult(
1063+
success = timeoutError == null,
1064+
error = timeoutError.orEmpty(),
1065+
errorCode = null,
1066+
)
10091067
} catch (e: Exception) {
10101068
Logger.error("BLE close failed", e, context = TAG)
1011-
TrezorTransportWriteResult(success = false, error = e.message ?: "BLE close failed", errorCode = null)
1069+
TrezorTransportWriteResult(
1070+
success = false,
1071+
error = e.message ?: "BLE close failed",
1072+
errorCode = null,
1073+
)
10121074
} finally {
10131075
userInitiatedCloseSet.remove(path)
10141076
}
@@ -1037,7 +1099,12 @@ class TrezorTransport @Inject constructor(
10371099
TrezorTransportReadResult(success = true, data = data, error = "", errorCode = null)
10381100
} catch (e: Exception) {
10391101
Logger.error("BLE read failed", e, context = TAG)
1040-
TrezorTransportReadResult(success = false, data = byteArrayOf(), error = e.message ?: "Read failed", errorCode = null)
1102+
TrezorTransportReadResult(
1103+
success = false,
1104+
data = byteArrayOf(),
1105+
error = e.message ?: "Read failed",
1106+
errorCode = null,
1107+
)
10411108
}
10421109
}
10431110

@@ -1052,14 +1119,26 @@ class TrezorTransport @Inject constructor(
10521119
@SuppressLint("MissingPermission")
10531120
private fun writeBleChunk(path: String, data: ByteArray): TrezorTransportWriteResult {
10541121
val connection = bleConnections[path]
1055-
?: return TrezorTransportWriteResult(success = false, error = "Device not open: $path", errorCode = null)
1122+
?: return TrezorTransportWriteResult(
1123+
success = false,
1124+
error = "Device not open: $path",
1125+
errorCode = null,
1126+
)
10561127

10571128
val writeChar = connection.writeCharacteristic
1058-
?: return TrezorTransportWriteResult(success = false, error = "Write characteristic not available", errorCode = null)
1129+
?: return TrezorTransportWriteResult(
1130+
success = false,
1131+
error = "Write characteristic not available",
1132+
errorCode = null,
1133+
)
10591134

10601135
if (!connection.isConnected) {
10611136
Logger.warn("BLE write attempted on disconnected device: '$path'", context = TAG)
1062-
return TrezorTransportWriteResult(success = false, error = "Device disconnected", errorCode = null)
1137+
return TrezorTransportWriteResult(
1138+
success = false,
1139+
error = "Device disconnected",
1140+
errorCode = null,
1141+
)
10631142
}
10641143

10651144
return try {
@@ -1127,7 +1206,11 @@ class TrezorTransport @Inject constructor(
11271206
TrezorTransportWriteResult(success = false, error = lastError, errorCode = null)
11281207
} catch (e: Exception) {
11291208
Logger.error("BLE write failed", e, context = TAG)
1130-
TrezorTransportWriteResult(success = false, error = e.message ?: "Write failed", errorCode = null)
1209+
TrezorTransportWriteResult(
1210+
success = false,
1211+
error = e.message ?: "Write failed",
1212+
errorCode = null,
1213+
)
11311214
}
11321215
}
11331216

‎app/src/main/java/to/bitkit/ui/screens/trezor/TrezorPreviewData.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import com.synonym.bitkitcore.TrezorTransportType
1818
import com.synonym.bitkitcore.TxDirection
1919
import com.synonym.bitkitcore.WalletBalance
2020
import kotlinx.collections.immutable.persistentListOf
21-
import to.bitkit.ext.create
2221
import to.bitkit.models.KnownDevice
2322
import to.bitkit.models.TransportType
2423
import to.bitkit.repositories.ConnectedTrezorDevice

‎app/src/main/java/to/bitkit/viewmodels/TransferViewModel.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,7 @@ class TransferViewModel @Inject constructor(
201201
}
202202

203203
/** Pays for the order and start watching it for state updates */
204+
@Suppress("LongMethod")
204205
fun onTransferToSpendingConfirm(order: IBtOrder, speed: TransactionSpeed? = null) {
205206
viewModelScope.launch {
206207
val address = order.payment?.onchain?.address.orEmpty()

‎app/src/test/java/to/bitkit/ext/BackupRestoreCompatTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package to.bitkit.ext
22

3-
import com.synonym.bitkitcore.ActivityTags
43
import com.synonym.bitkitcore.Activity
4+
import com.synonym.bitkitcore.ActivityTags
55
import com.synonym.bitkitcore.OnchainActivity
66
import com.synonym.bitkitcore.PaymentType
77
import com.synonym.bitkitcore.PreActivityMetadata
88
import kotlinx.serialization.json.JsonArray
99
import kotlinx.serialization.json.JsonElement
1010
import kotlinx.serialization.json.JsonObject
11+
import org.junit.Test
1112
import to.bitkit.data.AppCacheData
1213
import to.bitkit.di.json
1314
import to.bitkit.models.ActivityBackupV1
1415
import to.bitkit.models.MetadataBackupV1
1516
import to.bitkit.models.WalletScope
1617
import to.bitkit.test.BaseUnitTest
17-
import org.junit.Test
1818
import kotlin.test.assertEquals
1919

2020
class BackupRestoreCompatTest : BaseUnitTest() {

‎app/src/test/java/to/bitkit/ext/TrezorExceptionExtTest.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
package to.bitkit.ext
22

33
import com.synonym.bitkitcore.TrezorException
4+
import org.junit.Test
45
import to.bitkit.utils.AppError
56
import kotlin.test.assertFalse
67
import kotlin.test.assertTrue
7-
import org.junit.Test
88

99
class TrezorExceptionExtTest {
1010
@Test

0 commit comments

Comments
 (0)