From 4e22f4d3e9d1c77d438ae251ab207e9d7ae102bf Mon Sep 17 00:00:00 2001 From: rasputin Date: Fri, 12 Jun 2026 18:20:26 +0200 Subject: [PATCH] refactor: make linter happy --- .../gudariwallet/ui/balance/BalanceViewModel.kt | 9 ++++----- .../bitcointxoko/gudariwallet/ui/fiat/FiatViewModel.kt | 1 - .../gudariwallet/ui/history/HistoryViewModel.kt | 9 ++++----- .../gudariwallet/ui/history/PaymentDetailScreen.kt | 1 - .../gudariwallet/ui/history/PaymentSyncManager.kt | 3 +-- .../bitcointxoko/gudariwallet/ui/nfc/NdefHceService.kt | 7 +++---- .../com/bitcointxoko/gudariwallet/ui/nfc/NfcViewModel.kt | 5 ++--- .../gudariwallet/ui/onboarding/OnboardingPages.kt | 4 ++-- .../gudariwallet/ui/onboarding/OnboardingScreen.kt | 2 -- 9 files changed, 16 insertions(+), 25 deletions(-) diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/balance/BalanceViewModel.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/balance/BalanceViewModel.kt index 28d77fe..0453a33 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/balance/BalanceViewModel.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/balance/BalanceViewModel.kt @@ -75,11 +75,10 @@ class BalanceViewModel( runCatching { repo.getBalance() } .onSuccess { balance -> val sats = balance.sats - val prev = (_balanceState.value as? BalanceState.Success)?.sats - when { - prev == null -> Timber.d("BALANCE [NETWORK ] $sats sats — cold load complete") - prev == sats -> Timber.d("BALANCE [NETWORK ] $sats sats — matches cache, no change") - else -> Timber.d("BALANCE [NETWORK ] $sats sats — was $prev sats (diff ${sats - prev})") + when (val prev = (_balanceState.value as? BalanceState.Success)?.sats) { + null -> Timber.d("BALANCE [NETWORK ] $sats sats — cold load complete") + sats -> Timber.d("BALANCE [NETWORK ] $sats sats — matches cache, no change") + else -> Timber.d("BALANCE [NETWORK ] $sats sats — was $prev sats (diff ${sats - prev})") } _balanceState.value = BalanceState.Success( sats = sats, diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/fiat/FiatViewModel.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/fiat/FiatViewModel.kt index c0efcba..f399ce1 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/fiat/FiatViewModel.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/fiat/FiatViewModel.kt @@ -14,7 +14,6 @@ import com.bitcointxoko.gudariwallet.util.satsToFiat import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.mapNotNull import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/HistoryViewModel.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/HistoryViewModel.kt index 733b5e4..210437a 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/HistoryViewModel.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/HistoryViewModel.kt @@ -21,6 +21,7 @@ import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch +import kotlin.time.Duration.Companion.milliseconds private const val TAG = "HistoryViewModel" @@ -156,7 +157,7 @@ class HistoryViewModel( viewModelScope.launch { combine( - _filter.map { it.searchQuery }.debounce(300), + _filter.map { it.searchQuery }.debounce(300.milliseconds), _filter ) { _, f -> f } .collect { f -> @@ -164,10 +165,8 @@ class HistoryViewModel( Timber.d("FILTER [IN-MEMORY] filter=default → using cached state") _roomResults.value = null } else { - Timber.d("FILTER [ROOM ] q=\"${f.searchQuery}\" " + - "statuses=${f.statuses} dir=${f.direction} types=${f.types} " + - "amt=${f.minAmountSat}–${f.maxAmountSat} " + - "date=${f.minCreatedAt}–${f.maxCreatedAt}") + Timber.d("%snull", "FILTER [ROOM ] q=\"${f.searchQuery}\" " + + "statuses=${f.statuses} dir=${f.direction} types=${f.types} ") _roomResults.value = paymentCache.queryAll(f.searchQuery, f) } } diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentDetailScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentDetailScreen.kt index 64b36a3..f0e06bd 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentDetailScreen.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentDetailScreen.kt @@ -17,7 +17,6 @@ import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.ArrowBack import androidx.compose.material.icons.filled.ArrowDownward import androidx.compose.material.icons.filled.ArrowUpward -import androidx.compose.material.icons.outlined.ContentCopy import androidx.compose.material3.Card import androidx.compose.material3.CircularProgressIndicator import androidx.compose.material3.ExperimentalMaterial3Api diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentSyncManager.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentSyncManager.kt index 090d85d..568097a 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentSyncManager.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/history/PaymentSyncManager.kt @@ -159,8 +159,7 @@ class PaymentSyncManager( val reachedEnd = page.size < WalletConstants.PAYMENTS_PAGE_SIZE if (reachedOverlap || reachedEnd) { - Timber.d("PAYMENTS [SYNC DONE ] $totalNew new payment(s) across $pagesChecked page(s) — " + - if (reachedOverlap) "stopped at known record" else "reached end of history") + Timber.d("null%s", if (reachedOverlap) "stopped at known record" else "reached end of history") break } diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NdefHceService.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NdefHceService.kt index 8030338..58aa18c 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NdefHceService.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NdefHceService.kt @@ -77,13 +77,12 @@ class NdefHceService : HostApduService() { val ins = apdu[1] - return when { + return when (ins) { // ── SELECT (INS = 0xA4) ────────────────────────────────────────── - ins == 0xA4.toByte() -> handleSelect(apdu) + 0xA4.toByte() -> handleSelect(apdu) // ── READ BINARY (INS = 0xB0) ───────────────────────────────────── - ins == 0xB0.toByte() -> handleReadBinary(apdu) - + 0xB0.toByte() -> handleReadBinary(apdu) else -> SW_UNKNOWN }.also { Timber.d("APDU OUT: ${it.toHex()}") } } diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NfcViewModel.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NfcViewModel.kt index 28e8866..6ec2a28 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NfcViewModel.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/nfc/NfcViewModel.kt @@ -13,7 +13,6 @@ import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope import com.bitcointxoko.gudariwallet.ui.NfcOfferState import com.bitcointxoko.gudariwallet.util.SendInputDetector -import com.bitcointxoko.gudariwallet.util.SendInputType import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.StateFlow @@ -83,7 +82,7 @@ class NfcViewModel : ViewModel() { intent.getParcelableArrayExtra(NfcAdapter.EXTRA_NDEF_MESSAGES) } - if (rawMessages != null && rawMessages.isNotEmpty()) { + if (!rawMessages.isNullOrEmpty()) { val message = rawMessages[0] as NdefMessage val uri = extractUri(message) if (uri != null) { @@ -98,7 +97,7 @@ class NfcViewModel : ViewModel() { intent.getParcelableExtra(NfcAdapter.EXTRA_TAG, Tag::class.java) } else { @Suppress("DEPRECATION") - intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) + intent.getParcelableExtra(NfcAdapter.EXTRA_TAG) } if (tag != null) { viewModelScope.launch(Dispatchers.IO) { diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingPages.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingPages.kt index 0f9d34e..b5b0f4f 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingPages.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingPages.kt @@ -265,7 +265,7 @@ fun NotificationsPage( imageVector = Icons.Default.Notifications, contentDescription = null, modifier = Modifier.size(72.dp), - // Mirror the BatteryPage tint behaviour + // Mirror the BatteryPage tint behavior tint = if (alreadyGranted) MaterialTheme.colorScheme.primary else @@ -300,7 +300,7 @@ fun NotificationsPage( } } -// ── Page 5: Battery optimisation ────────────────────────────────────────────── +// ── Page 5: Battery optimization ────────────────────────────────────────────── @Composable fun BatteryPage(strings: AppStrings) { val context = LocalContext.current diff --git a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingScreen.kt b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingScreen.kt index 363db7b..399f2c9 100644 --- a/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingScreen.kt +++ b/app/src/main/java/com/bitcointxoko/gudariwallet/ui/onboarding/OnboardingScreen.kt @@ -13,11 +13,9 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.unit.dp import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.viewmodel.compose.viewModel -import androidx.work.WorkInfo import com.bitcointxoko.gudariwallet.LocalAppStrings import com.bitcointxoko.gudariwallet.data.HistoricalSyncStore import com.bitcointxoko.gudariwallet.security.SecretStore -import com.bitcointxoko.gudariwallet.sync.HistoricalSyncWorker import kotlinx.coroutines.launch import timber.log.Timber