Skip to content

Commit bf03657

Browse files
ben-kaufmanben-kaufman
committed
fix claude detected issues
1 parent 49600f9 commit bf03657

File tree

4 files changed

+43
-18
lines changed

4 files changed

+43
-18
lines changed

‎app/build.gradle.kts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,18 @@ android {
6868

6969
flavorDimensions += "network"
7070
productFlavors {
71-
create("dev") {
71+
create("mainnet") {
7272
dimension = "network"
7373
applicationIdSuffix = ".dev"
7474
buildConfigField("String", "NETWORK", "\"REGTEST\"")
7575
resValue("string", "app_name", "Bitkit Regtest")
7676
manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_regtest"
7777
manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_regtest_round"
7878
}
79-
create("mainnet") {
79+
create("dev") {
8080
dimension = "network"
8181
applicationIdSuffix = ""
82-
buildConfigField("String", "NETWORK", "\"BITCOIN\"")
82+
buildConfigField("String", "NETWORK", "\"REGTEST\"")
8383
resValue("string", "app_name", "Bitkit")
8484
manifestPlaceholders["app_icon"] = "@mipmap/ic_launcher_orange"
8585
manifestPlaceholders["app_icon_round"] = "@mipmap/ic_launcher_orange_round"

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

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ class MigrationService @Inject constructor(
170170
pendingBlocktankOrderIds = json.decodeFromString<List<String>>(data)
171171
Logger.debug("Loaded ${pendingBlocktankOrderIds?.size} pending Blocktank order IDs", context = TAG)
172172
}.onFailure {
173-
Logger.warn("Failed to load pending Blocktank order IDs: $it", context = TAG)
173+
Logger.warn("Failed to load pending Blocktank order IDs", it, context = TAG)
174174
}
175175
}
176176

@@ -179,7 +179,7 @@ class MigrationService @Inject constructor(
179179
pendingRemotePaidOrders = json.decodeFromString<Map<String, String>>(data)
180180
Logger.debug("Loaded ${pendingRemotePaidOrders?.size} pending paid orders", context = TAG)
181181
}.onFailure {
182-
Logger.warn("Failed to load pending paid orders: $it", context = TAG)
182+
Logger.warn("Failed to load pending paid orders", it, context = TAG)
183183
}
184184
}
185185

@@ -188,7 +188,7 @@ class MigrationService @Inject constructor(
188188
pendingRemoteMetadata = json.decodeFromString<RNMetadata>(data)
189189
Logger.debug("Loaded pending metadata (tags: ${pendingRemoteMetadata?.tags?.size})", context = TAG)
190190
}.onFailure {
191-
Logger.warn("Failed to load pending metadata: $it", context = TAG)
191+
Logger.warn("Failed to load pending metadata", it, context = TAG)
192192
}
193193
}
194194

@@ -197,7 +197,7 @@ class MigrationService @Inject constructor(
197197
pendingRemoteTransfers = json.decodeFromString<Map<String, String>>(data)
198198
Logger.debug("Loaded ${pendingRemoteTransfers?.size} pending transfers", context = TAG)
199199
}.onFailure {
200-
Logger.warn("Failed to load pending transfers: $it", context = TAG)
200+
Logger.warn("Failed to load pending transfers", it, context = TAG)
201201
}
202202
}
203203

@@ -206,7 +206,7 @@ class MigrationService @Inject constructor(
206206
pendingRemoteBoosts = json.decodeFromString<Map<String, String>>(data)
207207
Logger.debug("Loaded ${pendingRemoteBoosts?.size} pending boosts", context = TAG)
208208
}.onFailure {
209-
Logger.warn("Failed to load pending boosts: $it", context = TAG)
209+
Logger.warn("Failed to load pending boosts", it, context = TAG)
210210
}
211211
}
212212
}
@@ -265,6 +265,30 @@ class MigrationService @Inject constructor(
265265
Logger.debug("Cleared persisted Blocktank data", context = TAG)
266266
}
267267

268+
private suspend fun clearPersistedTransfers() {
269+
rnMigrationStore.edit {
270+
it.remove(stringPreferencesKey(RN_PENDING_TRANSFERS_KEY))
271+
}
272+
pendingRemoteTransfers = null
273+
Logger.debug("Cleared persisted transfers", context = TAG)
274+
}
275+
276+
private suspend fun clearPersistedBoosts() {
277+
rnMigrationStore.edit {
278+
it.remove(stringPreferencesKey(RN_PENDING_BOOSTS_KEY))
279+
}
280+
pendingRemoteBoosts = null
281+
Logger.debug("Cleared persisted boosts", context = TAG)
282+
}
283+
284+
private suspend fun clearPersistedMetadata() {
285+
rnMigrationStore.edit {
286+
it.remove(stringPreferencesKey(RN_PENDING_METADATA_KEY))
287+
}
288+
pendingRemoteMetadata = null
289+
Logger.debug("Cleared persisted metadata", context = TAG)
290+
}
291+
268292
private suspend fun clearPersistedMigrationData() {
269293
rnMigrationStore.edit {
270294
it.remove(stringPreferencesKey(RN_PENDING_BLOCKTANK_ORDER_IDS_KEY))
@@ -1167,7 +1191,7 @@ class MigrationService @Inject constructor(
11671191
}
11681192
}
11691193
}.onFailure { e ->
1170-
Logger.warn("Failed to fetch and upsert local Blocktank orders: $e", context = TAG)
1194+
Logger.warn("Failed to fetch and upsert local Blocktank orders", e, context = TAG)
11711195
persistBlocktankOrderIds(orderIds)
11721196
if (paidOrders.isNotEmpty()) {
11731197
persistPaidOrders(paidOrders)
@@ -1313,7 +1337,7 @@ class MigrationService @Inject constructor(
13131337
pendingRemoteActivityData = items
13141338
applyRNActivities(items)
13151339
}.onFailure { e ->
1316-
Logger.warn("Failed to decode RN remote activity backup: $e", context = TAG)
1340+
Logger.warn("Failed to decode RN remote activity backup", e, context = TAG)
13171341
}
13181342
}
13191343

@@ -1322,7 +1346,7 @@ class MigrationService @Inject constructor(
13221346
val metadata = decodeBackupData<RNMetadata>(data)
13231347
persistMetadata(metadata)
13241348
}.onFailure { e ->
1325-
Logger.warn("Failed to decode RN remote metadata backup: $e", context = TAG)
1349+
Logger.warn("Failed to decode RN remote metadata backup", e, context = TAG)
13261350
}
13271351
}
13281352

@@ -1461,20 +1485,20 @@ class MigrationService @Inject constructor(
14611485
pendingRemoteTransfers?.let { transfers ->
14621486
Logger.info("Applying ${transfers.size} remote transfer markers", context = TAG)
14631487
applyRemoteTransfers(transfers)
1464-
pendingRemoteTransfers = null
1488+
clearPersistedTransfers()
14651489
}
14661490

14671491
pendingRemoteBoosts?.let { boosts ->
14681492
Logger.info("Applying ${boosts.size} remote boost markers", context = TAG)
14691493
applyBoostTransactions(boosts)
1470-
pendingRemoteBoosts = null
1494+
clearPersistedBoosts()
14711495
}
14721496

14731497
// Apply remote metadata (tags) AFTER activities are created
14741498
pendingRemoteMetadata?.let { metadata ->
14751499
Logger.info("Applying remote metadata (tags: ${metadata.tags?.size})", context = TAG)
14761500
applyRNMetadata(metadata)
1477-
pendingRemoteMetadata = null
1501+
clearPersistedMetadata()
14781502
}
14791503

14801504
var blocktankFetchFailed = false
@@ -1502,7 +1526,7 @@ class MigrationService @Inject constructor(
15021526
pendingRemotePaidOrders = null
15031527
clearPersistedBlocktankData()
15041528
}.onFailure { e ->
1505-
Logger.warn("Still unable to fetch Blocktank orders: $e", context = TAG)
1529+
Logger.warn("Still unable to fetch Blocktank orders", e, context = TAG)
15061530
blocktankFetchFailed = true
15071531
}
15081532
}

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -293,9 +293,8 @@ class AppViewModel @Inject constructor(
293293
if (migrationService.needsPostMigrationSync()) {
294294
ToastEventBus.send(
295295
type = Toast.ToastType.WARNING,
296-
title = context.getString(R.string.other__connection_issue),
297-
description = "Please ensure you have a stable internet connection. " +
298-
"Data may show incorrectly while trying to connect.",
296+
title = context.getString(R.string.migration__network_required_title),
297+
description = context.getString(R.string.migration__network_required_msg),
299298
)
300299
}
301300
}

‎app/src/main/res/values/strings.xml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -257,6 +257,8 @@
257257
<string name="lightning__wallet_balances">Wallet Balances</string>
258258
<string name="migration__description">Please wait while your old wallet data migrates to this new Bitkit version. This usually takes less than a minute.</string>
259259
<string name="migration__nav_title">Wallet Migration</string>
260+
<string name="migration__network_required_msg">Please ensure you have a stable internet connection. Data may show incorrectly while trying to connect.</string>
261+
<string name="migration__network_required_title">Network Issues Detected</string>
260262
<string name="migration__title">MIGRATING\n&lt;accent&gt;WALLET&lt;/accent&gt;</string>
261263
<string name="notification__channel_closed__mutual_body">Balance moved from spending to savings</string>
262264
<string name="notification__channel_closed__reason_body">Reason: %s</string>

0 commit comments

Comments
 (0)