From 21f722767d1d6a1c79c5dfb56c566dfebcfb56e1 Mon Sep 17 00:00:00 2001 From: davotoula Date: Thu, 4 Jun 2026 08:46:51 +0200 Subject: [PATCH] refactor: use lambda Log overload for interpolated log calls --- .../com/vitorpamplona/amethyst/model/LocalCache.kt | 12 ++++++------ .../service/relayClient/RelayProxyClientConnector.kt | 2 +- .../service/scheduledposts/ScheduledPostStore.kt | 2 +- .../service/scheduledposts/ScheduledPostWorker.kt | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt index f7847f225a..1a99f3bf5f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt @@ -1873,11 +1873,11 @@ object LocalCache : ILocalCache, ICacheProvider { if (result is LnZapReceiptValidator.Result.Invalid && result.reason != LnZapReceiptValidator.Result.Reason.MISMATCHED_LNURL ) { - Log.w("ZP", "dropping zap receipt ${event.id}: ${result.reason} ${result.detail ?: ""}") + Log.w("ZP") { "dropping zap receipt ${event.id}: ${result.reason} ${result.detail ?: ""}" } return false } if (result is LnZapReceiptValidator.Result.Invalid) { - Log.w("ZP", "zap receipt ${event.id} has mismatched lnurl tag (accepting per SHOULD)") + Log.w("ZP") { "zap receipt ${event.id} has mismatched lnurl tag (accepting per SHOULD)" } } note.loadEvent(event, author, repliesTo) @@ -1908,7 +1908,7 @@ object LocalCache : ILocalCache, ICacheProvider { try { val info = resolver.resolve(recipientLnurlpUrl) if (info == null) { - Log.w("ZP", "could not fetch lnurlp for ${event.id}; not crediting") + Log.w("ZP") { "could not fetch lnurlp for ${event.id}; not crediting" } return@launch } val result = @@ -1920,11 +1920,11 @@ object LocalCache : ILocalCache, ICacheProvider { if (result is LnZapReceiptValidator.Result.Invalid && result.reason != LnZapReceiptValidator.Result.Reason.MISMATCHED_LNURL ) { - Log.w("ZP", "dropping zap receipt ${event.id}: ${result.reason} ${result.detail ?: ""}") + Log.w("ZP") { "dropping zap receipt ${event.id}: ${result.reason} ${result.detail ?: ""}" } return@launch } if (result is LnZapReceiptValidator.Result.Invalid) { - Log.w("ZP", "zap receipt ${event.id} has mismatched lnurl tag (accepting per SHOULD)") + Log.w("ZP") { "zap receipt ${event.id} has mismatched lnurl tag (accepting per SHOULD)" } } repliesTo.forEach { it.addZap(zapRequest, note) } } catch (t: Throwable) { @@ -2221,7 +2221,7 @@ object LocalCache : ILocalCache, ICacheProvider { if (wasVerified || justVerify(event)) { val expectedServicePubkey = event.walletServicePubKey() ?: run { - Log.w("LocalCache", "NWC request ${event.id} has no `p` tag; cannot register for response.") + Log.w("LocalCache") { "NWC request ${event.id} has no `p` tag; cannot register for response." } return false } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/RelayProxyClientConnector.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/RelayProxyClientConnector.kt index 69c9b0b9e9..f1f2eee12b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/RelayProxyClientConnector.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/RelayProxyClientConnector.kt @@ -111,7 +111,7 @@ class RelayProxyClientConnector( lastTorConnection = it.torConnection lastClearConnection = it.clearConnection - Log.d("ManageRelayServices", "Relay Services have changed, reconnecting relays that need to (transportChanged=$transportChanged)") + Log.d("ManageRelayServices") { "Relay Services have changed, reconnecting relays that need to (transportChanged=$transportChanged)" } client.reconnect( onlyIfChanged = true, ignoreRetryDelays = transportChanged, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostStore.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostStore.kt index 1f2a386148..d5898b181b 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostStore.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostStore.kt @@ -257,7 +257,7 @@ class ScheduledPostStore( Log.w(TAG) { "Failed to delete existing $storageFile before rename retry" } } if (!tmp.renameTo(storageFile)) { - Log.e(TAG, "Failed to rename $tmp to $storageFile") + Log.e(TAG) { "Failed to rename $tmp to $storageFile" } if (!tmp.delete()) { Log.w(TAG) { "Failed to clean up temp file $tmp after rename failure" } } diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostWorker.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostWorker.kt index f104116d02..b9b339332f 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostWorker.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/scheduledposts/ScheduledPostWorker.kt @@ -141,7 +141,7 @@ class ScheduledPostWorker( } val account = appModules.accountsCache.accounts.value[post.accountPubkey] if (account == null) { - Log.w(TAG, "Account ${post.accountPubkey} not loaded; releasing ${post.id} for retry") + Log.w(TAG) { "Account ${post.accountPubkey} not loaded; releasing ${post.id} for retry" } store.releaseClaim(post.id) continue } @@ -164,7 +164,7 @@ class ScheduledPostWorker( val msg = "no relay acknowledged within ${OK_TIMEOUT_SEC}s" store.markFailed(post.id, msg) ScheduledPostNotifier.notifyFailed(applicationContext, post, msg) - Log.w(TAG, "client.publish(${post.id}) failed: $msg") + Log.w(TAG) { "client.publish(${post.id}) failed: $msg" } } } catch (e: CancellationException) { throw e