From 3b81731771cbcd350e5c1fd280bfc57525d2e151 Mon Sep 17 00:00:00 2001
From: davotoula <david.kaspar@gmail.com>
Date: Sat, 28 Mar 2026 16:21:39 +0100
Subject: [PATCH] perf: convert 194 interpolated Log.d() calls to lambda
 overloads

Defers string construction until after the level check, avoiding
allocation when debug logging is filtered in release/benchmark builds.

Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
---
 .../notifications/PushDistributorHandler.kt   |  2 +-
 .../notifications/PushMessageReceiver.kt      | 12 +++----
 .../com/vitorpamplona/amethyst/Amethyst.kt    |  8 ++---
 .../com/vitorpamplona/amethyst/DebugUtils.kt  | 31 +++++++------------
 .../amethyst/LocalPreferences.kt              | 14 ++++-----
 .../amethyst/model/LocalCache.kt              | 16 +++++-----
 .../edits/PrivateStorageRelayListState.kt     |  4 +--
 .../nip01UserMetadata/UserMetadataState.kt    |  4 +--
 .../nip02FollowLists/Kind3FollowListState.kt  |  4 +--
 .../amethyst/model/nip03Timestamp/OtsState.kt |  2 +-
 .../model/nip17Dms/DmRelayListState.kt        |  4 +--
 .../blockedRelays/BlockedRelayListState.kt    |  4 +--
 .../geohashLists/GeohashListState.kt          |  4 +--
 .../hashtagLists/HashtagListState.kt          |  4 +--
 .../indexerRelays/IndexerRelayListState.kt    |  4 +--
 .../nip51Lists/muteList/MuteListState.kt      |  4 +--
 .../relayFeeds/RelayFeedListState.kt          |  4 +--
 .../searchRelays/SearchRelayListState.kt      |  4 +--
 .../trustedRelays/TrustedRelayListState.kt    |  4 +--
 .../nip65RelayList/Nip65RelayListState.kt     |  4 +--
 .../nip72Communities/CommunityListState.kt    |  4 +--
 .../nip78AppSpecific/AppSpecificState.kt      |  4 +--
 .../NipA3PaymentTargetsState.kt               |  4 +--
 .../TrustProviderListState.kt                 |  2 +-
 .../service/broadcast/BroadcastTracker.kt     | 18 +++++------
 .../service/connectivity/ConnectivityFlow.kt  |  6 ++--
 .../service/lnurl/LightningAddressResolver.kt |  2 +-
 .../amethyst/service/location/LocationFlow.kt |  4 +--
 .../service/location/ReverseGeolocation.kt    |  6 ++--
 .../amethyst/service/logging/LogMonitor.kt    |  2 +-
 .../EventNotificationConsumer.kt              | 24 +++++++-------
 .../service/notifications/PokeyReceiver.kt    |  2 +-
 .../service/notifications/RegisterAccounts.kt |  6 ++--
 .../service/okhttp/LoggingInterceptor.kt      |  2 +-
 .../playback/composable/GetVideoController.kt |  4 +--
 .../playback/service/PlaybackServiceClient.kt |  6 ++--
 .../relayClient/RelayProxyClientConnector.kt  |  2 +-
 .../authCommand/model/AuthCoordinator.kt      |  4 +--
 .../relayClient/speedLogger/FrameStat.kt      |  4 +--
 .../service/uploads/MediaCompressor.kt        |  6 ++--
 .../service/uploads/MetadataStripper.kt       |  8 ++---
 .../service/uploads/UploadOrchestrator.kt     |  2 +-
 .../service/uploads/VideoCompressionHelper.kt | 18 +++++------
 .../vitorpamplona/amethyst/ui/MainActivity.kt | 10 +++---
 .../uploads/VoiceAnonymizationController.kt   |  4 +--
 .../ui/feeds/ChannelFeedContentState.kt       |  2 +-
 .../amethyst/ui/note/UsernameDisplay.kt       |  2 +-
 .../amethyst/ui/screen/AccountScreen.kt       |  2 +-
 .../amethyst/ui/screen/TopNavFilterState.kt   |  2 +-
 .../amethyst/ui/screen/UserFeedViewModel.kt   |  8 ++---
 .../privateDM/send/ChatNewMessageViewModel.kt |  2 +-
 .../send/ChannelNewMessageViewModel.kt        |  2 +-
 .../nip23LongForm/LongFormPostViewModel.kt    |  2 +-
 .../nip99Classifieds/NewProductViewModel.kt   |  2 +-
 .../loggedIn/home/ShortNotePostViewModel.kt   |  4 +--
 .../loggedIn/home/VoiceReplyViewModel.kt      |  4 +--
 .../loggedIn/home/live/LiveStatusIndicator.kt |  2 +-
 .../notifications/CardFeedContentState.kt     |  2 +-
 .../notifications/NotificationSummaryState.kt |  2 +-
 .../NewPublicMessageViewModel.kt              |  2 +-
 .../profile/relays/RelayFeedViewModel.kt      |  2 +-
 .../loggedIn/settings/StringFeedViewModel.kt  |  6 ++--
 .../amethyst/ui/tor/TorService.kt             |  4 +--
 .../PushNotificationReceiverService.kt        |  2 +-
 .../model/emphChat/EphemeralChatListState.kt  |  2 +-
 .../nip02FollowList/Kind3FollowListState.kt   |  4 +--
 .../nip28PublicChats/PublicChatListState.kt   |  4 +--
 .../nip65RelayList/Nip65RelayListState.kt     |  4 +--
 .../amethyst/commons/utils/DebugUtils.kt      |  4 +--
 .../commons/viewmodels/FeedViewModel.kt       |  8 ++---
 .../viewmodels/ListChangeFeedViewModel.kt     |  4 +--
 .../accessories/NostrClientPublishExt.kt      | 10 +++---
 .../relay/client/accessories/RelayLogger.kt   | 16 +++++-----
 .../relay/client/reqs/stats/RelayReqStats.kt  |  2 +-
 .../okhttp/OkHttpBitcoinExplorer.kt           |  4 +--
 .../relay/NostrClientRepeatSubTest.kt         |  4 +--
 .../NostrClientSubscriptionAsFlowTest.kt      |  4 +--
 ...trClientSubscriptionUntilEoseAsFlowTest.kt |  4 +--
 78 files changed, 205 insertions(+), 214 deletions(-)

diff --git a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt
index ac14ef95b..5da1c62fb 100644
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt
+++ b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt
@@ -46,7 +46,7 @@ object PushDistributorHandler : PushDistributorActions {
 
     fun setEndpoint(newEndpoint: String) {
         endpointInternal = newEndpoint
-        Log.d("PushHandler", "New endpoint saved : $endpointInternal")
+        Log.d("PushHandler") { "New endpoint saved : $endpointInternal" }
     }
 
     fun removeEndpoint() {
diff --git a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt
index fe5cf2cd2..dffba6b57 100644
--- a/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt
+++ b/amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt
@@ -53,7 +53,7 @@ class PushMessageReceiver : MessagingReceiver() {
         instance: String,
     ) {
         val messageStr = message.content.decodeToString()
-        Log.d(TAG, "New message $messageStr for Instance: $instance")
+        Log.d(TAG) { "New message $messageStr for Instance: $instance" }
         scope.launch {
             try {
                 parseMessage(messageStr)?.let {
@@ -61,7 +61,7 @@ class PushMessageReceiver : MessagingReceiver() {
                 }
             } catch (e: Exception) {
                 if (e is CancellationException) throw e
-                Log.d(TAG, "Message could not be parsed: ${e.message}")
+                Log.d(TAG) { "Message could not be parsed: ${e.message}" }
             }
         }
     }
@@ -87,7 +87,7 @@ class PushMessageReceiver : MessagingReceiver() {
     ) {
         val sanitizedEndpoint = if (endpoint.url.endsWith("?up=1")) endpoint.url.dropLast(5) else endpoint.url
         if (sanitizedEndpoint != pushHandler.getSavedEndpoint()) {
-            Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint")
+            Log.d(TAG) { "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint" }
             pushHandler.setEndpoint(sanitizedEndpoint)
             scope.launch(Dispatchers.IO) {
                 PushNotificationUtils.checkAndInit(sanitizedEndpoint, LocalPreferences.allSavedAccounts()) {
@@ -97,7 +97,7 @@ class PushMessageReceiver : MessagingReceiver() {
                 NotificationUtils.getOrCreateDMChannel(appContext)
             }
         } else {
-            Log.d(TAG, "Same endpoint provided:- $endpoint for Instance: $instance $sanitizedEndpoint")
+            Log.d(TAG) { "Same endpoint provided:- $endpoint for Instance: $instance $sanitizedEndpoint" }
         }
     }
 
@@ -106,7 +106,7 @@ class PushMessageReceiver : MessagingReceiver() {
         reason: FailedReason,
         instance: String,
     ) {
-        Log.d(TAG, "Registration failed for Instance: $instance")
+        Log.d(TAG) { "Registration failed for Instance: $instance" }
         pushHandler.forceRemoveDistributor(context)
     }
 
@@ -115,7 +115,7 @@ class PushMessageReceiver : MessagingReceiver() {
         instance: String,
     ) {
         val removedEndpoint = pushHandler.getSavedEndpoint()
-        Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
+        Log.d(TAG) { "Endpoint: $removedEndpoint removed for Instance: $instance" }
         Log.d(TAG, "App is unregistered. ")
         pushHandler.forceRemoveDistributor(context)
         pushHandler.removeEndpoint()
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
index b6a8b5f93..8e488a83a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/Amethyst.kt
@@ -28,7 +28,7 @@ import com.vitorpamplona.quartz.utils.LogLevel
 class Amethyst : Application() {
     init {
         Log.minLevel = if (BuildConfig.DEBUG) LogLevel.DEBUG else LogLevel.ERROR
-        Log.d("AmethystApp", "Creating App $this")
+        Log.d("AmethystApp") { "Creating App $this" }
     }
 
     companion object {
@@ -38,7 +38,7 @@ class Amethyst : Application() {
 
     override fun onCreate() {
         super.onCreate()
-        Log.d("AmethystApp", "onCreate $this")
+        Log.d("AmethystApp") { "onCreate $this" }
         instance = AppModules(this)
 
         if (isDebug) {
@@ -50,7 +50,7 @@ class Amethyst : Application() {
 
     override fun onTerminate() {
         super.onTerminate()
-        Log.d("AmethystApp", "onTerminate $this")
+        Log.d("AmethystApp") { "onTerminate $this" }
         instance.terminate(this)
     }
 
@@ -61,7 +61,7 @@ class Amethyst : Application() {
      */
     override fun onTrimMemory(level: Int) {
         super.onTrimMemory(level)
-        Log.d("AmethystApp", "onTrimMemory $level")
+        Log.d("AmethystApp") { "onTrimMemory $level" }
         instance.trim()
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt
index 7e2b8dc3f..9a3efa00c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/DebugUtils.kt
@@ -46,19 +46,19 @@ fun debugState(context: Context) {
 
     val jvmHeapAllocatedMb = totalMemoryMb - freeMemoryMb
 
-    Log.d(STATE_DUMP_TAG, "Total Heap Allocated: $jvmHeapAllocatedMb/$maxMemoryMb MB")
+    Log.d(STATE_DUMP_TAG) { "Total Heap Allocated: $jvmHeapAllocatedMb/$maxMemoryMb MB" }
 
     val nativeHeap = Debug.getNativeHeapAllocatedSize() / (1024 * 1024)
     val maxNative = Debug.getNativeHeapSize() / (1024 * 1024)
 
-    Log.d(STATE_DUMP_TAG, "Total Native Heap Allocated: $nativeHeap/$maxNative MB")
+    Log.d(STATE_DUMP_TAG) { "Total Native Heap Allocated: $nativeHeap/$maxNative MB" }
 
     val activityManager: ActivityManager? = context.getSystemService()
     if (activityManager != null) {
         val isLargeHeap = (context.applicationInfo.flags and ApplicationInfo.FLAG_LARGE_HEAP) != 0
         val memClass = if (isLargeHeap) activityManager.largeMemoryClass else activityManager.memoryClass
 
-        Log.d(STATE_DUMP_TAG, "Memory Class $memClass MB (largeHeap $isLargeHeap)")
+        Log.d(STATE_DUMP_TAG) { "Memory Class $memClass MB (largeHeap $isLargeHeap)" }
     }
 
     Log.d(
@@ -68,14 +68,8 @@ fun debugState(context: Context) {
                 .size() + "/" + normalizedUrls.size(),
     )
 
-    Log.d(
-        STATE_DUMP_TAG,
-        "Image Disk Cache ${(Amethyst.instance.diskCache.size) / (1024 * 1024)}/${(Amethyst.instance.diskCache.maxSize) / (1024 * 1024)} MB",
-    )
-    Log.d(
-        STATE_DUMP_TAG,
-        "Image Memory Cache ${(Amethyst.instance.memoryCache.size) / (1024 * 1024)}/${(Amethyst.instance.memoryCache.maxSize) / (1024 * 1024)} MB",
-    )
+    Log.d(STATE_DUMP_TAG) { "Image Disk Cache ${(Amethyst.instance.diskCache.size) / (1024 * 1024)}/${(Amethyst.instance.diskCache.maxSize) / (1024 * 1024)} MB" }
+    Log.d(STATE_DUMP_TAG) { "Image Memory Cache ${(Amethyst.instance.memoryCache.size) / (1024 * 1024)}/${(Amethyst.instance.memoryCache.maxSize) / (1024 * 1024)} MB" }
 
     Log.d(
         STATE_DUMP_TAG,
@@ -130,13 +124,12 @@ fun debugState(context: Context) {
             LocalCache.ephemeralChannels.values().sumOf { it.notes.size() },
     )
     LocalCache.chatroomList.forEach { key, room ->
-        Log.d(
-            STATE_DUMP_TAG,
+        Log.d(STATE_DUMP_TAG) {
             "Private Chats $key: " +
                 room.rooms.size() +
                 " / " +
-                room.rooms.sumOf { key, value -> value.messages.size },
-        )
+                room.rooms.sumOf { key, value -> value.messages.size }
+        }
     }
     Log.d(
         STATE_DUMP_TAG,
@@ -173,10 +166,10 @@ fun debugState(context: Context) {
             .sumByGroup(groupMap = { _, it -> it.event?.kind }, sumOf = { _, it -> it.event?.countMemory()?.toLong() ?: 0L })
 
     qttNotes.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
-        Log.d(STATE_DUMP_TAG, "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes[kind]?.div((1024 * 1024))}MB ")
+        Log.d(STATE_DUMP_TAG) { "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesNotes[kind]?.div((1024 * 1024))}MB " }
     }
     qttAddressables.toList().sortedByDescending { bytesNotes[it.first] }.forEach { (kind, qtt) ->
-        Log.d(STATE_DUMP_TAG, "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesAddressables[kind]?.div((1024 * 1024))}MB ")
+        Log.d(STATE_DUMP_TAG) { "Kind ${kind.toString().padStart(5,' ')}:\t${qtt.toString().padStart(6,' ')} elements\t${bytesAddressables[kind]?.div((1024 * 1024))}MB " }
     }
 }
 
@@ -188,7 +181,7 @@ inline fun <T> logTime(
     if (isDebug) {
         val (result, elapsed) = measureTimedValue(block)
         if (elapsed.inWholeMilliseconds > minToReportMs) {
-            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: $debugMessage")
+            Log.d("DEBUG-TIME") { "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: $debugMessage" }
         }
         result
     } else {
@@ -203,7 +196,7 @@ inline fun <T> logTime(
     if (isDebug) {
         val (result, elapsed) = measureTimedValue(block)
         if (elapsed.inWholeMilliseconds > minToReportMs) {
-            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: ${debugMessage(result)}")
+            Log.d("DEBUG-TIME") { "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: ${debugMessage(result)}" }
         }
         result
     } else {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
index 10a061da6..ae91ab5db 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/LocalPreferences.kt
@@ -282,7 +282,7 @@ object LocalPreferences {
      */
     @SuppressLint("ApplySharedPref")
     suspend fun deleteAccount(accountInfo: AccountInfo) {
-        Log.d("LocalPreferences", "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}")
+        Log.d("LocalPreferences") { "Saving to encrypted storage updatePrefsForLogout ${accountInfo.npub}" }
         withContext(Dispatchers.IO) {
             encryptedPreferences(accountInfo.npub).edit(commit = true) { clear() }
             removeAccount(accountInfo)
@@ -446,18 +446,18 @@ object LocalPreferences {
     }
 
     private suspend fun innerLoadCurrentAccountFromEncryptedStorage(npub: String?): AccountSettings? {
-        Log.d("LocalPreferences", "Load account from file $npub")
+        Log.d("LocalPreferences") { "Load account from file $npub" }
         val result =
             withContext(Dispatchers.IO) {
                 return@withContext with(encryptedPreferences(npub)) {
-                    Log.d("LocalPreferences", "Load account from file $npub - opened file")
+                    Log.d("LocalPreferences") { "Load account from file $npub - opened file" }
                     val privKey = getString(PrefKeys.NOSTR_PRIVKEY, null)
                     val pubKey = getString(PrefKeys.NOSTR_PUBKEY, null) ?: return@with null
                     val externalSignerPackageName = getString(PrefKeys.SIGNER_PACKAGE_NAME, null) ?: if (getBoolean(PrefKeys.LOGIN_WITH_EXTERNAL_SIGNER, false)) "com.greenart7c3.nostrsigner" else null
 
                     val keyPair = KeyPair(privKey = privKey?.hexToByteArray(), pubKey = pubKey.hexToByteArray())
 
-                    Log.d("LocalPreferences", "Load account from file $npub - keys ready")
+                    Log.d("LocalPreferences") { "Load account from file $npub - keys ready" }
 
                     val stripLocationOnUpload = getBoolean(PrefKeys.STRIP_LOCATION_ON_UPLOAD, true)
                     val hideDeleteRequestDialog = getBoolean(PrefKeys.HIDE_DELETE_REQUEST_DIALOG, false)
@@ -495,7 +495,7 @@ object LocalPreferences {
                     val latestPaymentTargetsStr = getString(PrefKeys.LATEST_PAYMENT_TARGETS, null)
                     val lastReadPerRouteStr = getString(PrefKeys.LAST_READ_PER_ROUTE, null)
 
-                    Log.d("LocalPreferences", "Load account from file $npub - before parsing events")
+                    Log.d("LocalPreferences") { "Load account from file $npub - before parsing events" }
 
                     val defaultHomeFollowList = async { parseOrNull<TopFilter>(defaultHomeFollowListStr) ?: TopFilter.AllFollows }
                     val defaultStoriesFollowList = async { parseOrNull<TopFilter>(defaultStoriesFollowListStr) ?: TopFilter.Global }
@@ -532,7 +532,7 @@ object LocalPreferences {
                             } ?: mapOf()
                         }
 
-                    Log.d("LocalPreferences", "Load account from file $npub - asyncs created")
+                    Log.d("LocalPreferences") { "Load account from file $npub - asyncs created" }
 
                     return@with AccountSettings(
                         keyPair = keyPair,
@@ -574,7 +574,7 @@ object LocalPreferences {
                     )
                 }
             }
-        Log.d("LocalPreferences", "Loaded account from file $npub")
+        Log.d("LocalPreferences") { "Loaded account from file $npub" }
         return result
     }
 
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 c8e05f1f7..49c78b9fb 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -2582,17 +2582,17 @@ object LocalCache : ILocalCache, ICacheProvider {
     }
 
     fun cleanMemory() {
-        Log.d("LargeCache", "Notes cleanup started. Current size: ${notes.size()}")
+        Log.d("LargeCache") { "Notes cleanup started. Current size: ${notes.size()}" }
         notes.cleanUp()
-        Log.d("LargeCache", "Notes cleanup completed. Remaining size: ${notes.size()}")
+        Log.d("LargeCache") { "Notes cleanup completed. Remaining size: ${notes.size()}" }
 
-        Log.d("LargeCache", "Addressables cleanup started. Current size: ${addressables.size()}")
+        Log.d("LargeCache") { "Addressables cleanup started. Current size: ${addressables.size()}" }
         addressables.cleanUp()
-        Log.d("LargeCache", "Addressables cleanup completed. Remaining size: ${addressables.size()}")
+        Log.d("LargeCache") { "Addressables cleanup completed. Remaining size: ${addressables.size()}" }
 
-        Log.d("LargeCache", "Users cleanup started. Current size: ${users.size()}")
+        Log.d("LargeCache") { "Users cleanup started. Current size: ${users.size()}" }
         users.cleanUp()
-        Log.d("LargeCache", "Users cleanup completed. Remaining size: ${users.size()}")
+        Log.d("LargeCache") { "Users cleanup completed. Remaining size: ${users.size()}" }
     }
 
     fun cleanObservers() {
@@ -2998,7 +2998,7 @@ object LocalCache : ILocalCache, ICacheProvider {
                     getNoteIfExists(deletionEvent.id)?.let { note ->
                         if (!note.hasRelay(relay.url)) {
                             if (isDebug) {
-                                Log.d("LocalCache", "Updating ${relay.url.url} with a Deletion Event ${event.id} ${deletionEvent.id} because of ${event.toJson()} with ${deletionEvent.toJson()}")
+                                Log.d("LocalCache") { "Updating ${relay.url.url} with a Deletion Event ${event.id} ${deletionEvent.id} because of ${event.toJson()} with ${deletionEvent.toJson()}" }
                             }
                             relay.sendIfConnected(EventCmd(deletionEvent))
                             note.addRelay(relay.url)
@@ -3015,7 +3015,7 @@ object LocalCache : ILocalCache, ICacheProvider {
                 note.event?.let { existingEvent ->
                     if (existingEvent.createdAt > event.createdAt && !note.hasRelay(relay.url) && !deletionIndex.hasBeenDeleted(event) && !event.isExpired()) {
                         if (isDebug) {
-                            Log.d("LocalCache", "Updating ${relay.url.url} with a new version of ${event.kind} ${event.id} to ${existingEvent.id}")
+                            Log.d("LocalCache") { "Updating ${relay.url.url} with a new version of ${event.kind} ${event.id} to ${existingEvent.id}" }
                         }
 
                         relay.sendIfConnected(EventCmd(existingEvent))
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListState.kt
index 80c35d16f..255230349 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/edits/PrivateStorageRelayListState.kt
@@ -91,7 +91,7 @@ class PrivateStorageRelayListState(
 
     init {
         settings.backupPrivateHomeRelayList?.let { event ->
-            Log.d("AccountRegisterObservers", "Loading saved private home relay list ${event.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved private home relay list ${event.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) {
                 LocalCache.justConsumeMyOwnEvent(event)
@@ -101,7 +101,7 @@ class PrivateStorageRelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Private Home Relay List Collector Start")
             getPrivateOutboxRelayListFlow().collect { noteState ->
-                Log.d("AccountRegisterObservers", "Updating Private Home Relay List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Private Home Relay List for ${signer.pubKey}" }
                 (noteState.note.event as? PrivateOutboxRelayListEvent)?.let {
                     settings.updatePrivateHomeRelayList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/UserMetadataState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/UserMetadataState.kt
index 7c7a1c235..d3179dd07 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/UserMetadataState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip01UserMetadata/UserMetadataState.kt
@@ -132,7 +132,7 @@ class UserMetadataState(
 
     init {
         settings.backupUserMetadata?.let {
-            Log.d("AccountRegisterObservers", "Loading saved user metadata ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved user metadata ${it.toJson()}" }
 
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
@@ -142,7 +142,7 @@ class UserMetadataState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Kind 0 Collector Start")
             getUserMetadataFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Kind 0 ${user.toBestDisplayName()}")
+                Log.d("AccountRegisterObservers") { "Updating Kind 0 ${user.toBestDisplayName()}" }
                 (it.note.event as? MetadataEvent)?.let {
                     settings.updateUserMetadata(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/Kind3FollowListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/Kind3FollowListState.kt
index 35fd21cd4..d4b257652 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/Kind3FollowListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip02FollowLists/Kind3FollowListState.kt
@@ -162,7 +162,7 @@ class Kind3FollowListState(
 
     init {
         settings.backupContactList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved ${it.tags.size} contacts")
+            Log.d("AccountRegisterObservers") { "Loading saved ${it.tags.size} contacts" }
 
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
@@ -172,7 +172,7 @@ class Kind3FollowListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Kind 3 Collector Start")
             getFollowListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Kind 3 ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Kind 3 ${signer.pubKey}" }
                 (it.note.event as? ContactListEvent)?.let {
                     settings.updateContactListTo(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip03Timestamp/OtsState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip03Timestamp/OtsState.kt
index 423943d4d..3396f6e31 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip03Timestamp/OtsState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip03Timestamp/OtsState.kt
@@ -55,7 +55,7 @@ class OtsState(
     }
 
     suspend fun updateAttestations(): List<OtsEvent> {
-        Log.d("Pending Attestations", "Updating ${settings.pendingAttestations.value.size} pending attestations")
+        Log.d("Pending Attestations") { "Updating ${settings.pendingAttestations.value.size} pending attestations" }
 
         return settings.pendingAttestations.value.toList().mapNotNull { (key, value) ->
             val otsState = OtsEvent.upgrade(Base64.getDecoder().decode(value), key, otsResolver())
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmRelayListState.kt
index 324ddde21..5d1ebccea 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmRelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip17Dms/DmRelayListState.kt
@@ -88,7 +88,7 @@ class DmRelayListState(
 
     init {
         settings.backupDMRelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved DM Relay List ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved DM Relay List ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) {
                 LocalCache.justConsumeMyOwnEvent(it)
@@ -98,7 +98,7 @@ class DmRelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "NIP-17 Relay List Collector Start")
             getDMRelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating DM Relay List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating DM Relay List for ${signer.pubKey}" }
                 (it.note.event as? ChatMessageRelayListEvent)?.let {
                     settings.updateDMRelayList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListState.kt
index f126d6461..8bc4cec59 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/blockedRelays/BlockedRelayListState.kt
@@ -93,7 +93,7 @@ class BlockedRelayListState(
 
     init {
         settings.backupBlockedRelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved Blocked relay list ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved Blocked relay list ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
         }
@@ -101,7 +101,7 @@ class BlockedRelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Blocked Relay List Collector Start")
             getBlockedRelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Blocked Relay List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Blocked Relay List for ${signer.pubKey}" }
                 (it.note.event as? BlockedRelayListEvent)?.let {
                     settings.updateBlockedRelayList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt
index 669eb5898..a17373083 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/geohashLists/GeohashListState.kt
@@ -106,7 +106,7 @@ class GeohashListState(
 
     init {
         settings.backupGeohashList?.let { event ->
-            Log.d("AccountRegisterObservers", "Loading saved Geohash list ${event.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved Geohash list ${event.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) {
                 LocalCache.justConsumeMyOwnEvent(event)
@@ -116,7 +116,7 @@ class GeohashListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Geohash List Collector Start")
             getGeohashListFlow().collect { noteState ->
-                Log.d("AccountRegisterObservers", "Geohash List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Geohash List for ${signer.pubKey}" }
                 (noteState.note.event as? GeohashListEvent)?.let {
                     settings.updateGeohashListTo(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt
index 7d5d490ec..b43e1d319 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/hashtagLists/HashtagListState.kt
@@ -106,7 +106,7 @@ class HashtagListState(
 
     init {
         settings.backupHashtagList?.let { event ->
-            Log.d("AccountRegisterObservers", "Loading saved Hashtag list ${event.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved Hashtag list ${event.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) {
                 LocalCache.justConsumeMyOwnEvent(event)
@@ -116,7 +116,7 @@ class HashtagListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Hashtag List Collector Start")
             getHashtagListFlow().collect {
-                Log.d("AccountRegisterObservers", "Hashtag List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Hashtag List for ${signer.pubKey}" }
                 (it.note.event as? HashtagListEvent)?.let {
                     settings.updateHashtagListTo(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/indexerRelays/IndexerRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/indexerRelays/IndexerRelayListState.kt
index aef44173c..4f739918e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/indexerRelays/IndexerRelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/indexerRelays/IndexerRelayListState.kt
@@ -103,7 +103,7 @@ class IndexerRelayListState(
 
     init {
         settings.backupIndexRelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved index relay list ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved index relay list ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
         }
@@ -111,7 +111,7 @@ class IndexerRelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Index Relay List Collector Start")
             getIndexerRelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Index Relay List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Index Relay List for ${signer.pubKey}" }
                 (it.note.event as? IndexerRelayListEvent)?.let {
                     settings.updateIndexRelayList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/muteList/MuteListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/muteList/MuteListState.kt
index f71705966..3115c9383 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/muteList/MuteListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/muteList/MuteListState.kt
@@ -141,7 +141,7 @@ class MuteListState(
 
     init {
         settings.backupMuteList?.let { event ->
-            Log.d("AccountRegisterObservers", "Loading saved mute list ${event.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved mute list ${event.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) {
                 LocalCache.justConsumeMyOwnEvent(event)
@@ -151,7 +151,7 @@ class MuteListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Mute List Collector Start")
             getMuteListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Mute List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Mute List for ${signer.pubKey}" }
                 (it.note.event as? MuteListEvent)?.let {
                     settings.updateMuteList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayFeeds/RelayFeedListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayFeeds/RelayFeedListState.kt
index de9b52c16..7860cfd29 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayFeeds/RelayFeedListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/relayFeeds/RelayFeedListState.kt
@@ -115,7 +115,7 @@ class RelayFeedListState(
 
     init {
         settings.backupRelayFeedsList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved relay feeds list ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved relay feeds list ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
         }
@@ -123,7 +123,7 @@ class RelayFeedListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Relay feeds list Collector Start")
             getRelayFeedsListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Relay feeds list for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Relay feeds list for ${signer.pubKey}" }
                 (it.note.event as? RelayFeedsListEvent)?.let {
                     settings.updateRelayFeedList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/searchRelays/SearchRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/searchRelays/SearchRelayListState.kt
index 5824016c3..4fbba2ef2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/searchRelays/SearchRelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/searchRelays/SearchRelayListState.kt
@@ -103,7 +103,7 @@ class SearchRelayListState(
 
     init {
         settings.backupSearchRelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved search relay list ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved search relay list ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { LocalCache.justConsumeMyOwnEvent(it) }
         }
@@ -111,7 +111,7 @@ class SearchRelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Search Relay List Collector Start")
             getSearchRelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Search Relay List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Search Relay List for ${signer.pubKey}" }
                 (it.note.event as? SearchRelayListEvent)?.let {
                     settings.updateSearchRelayList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/trustedRelays/TrustedRelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/trustedRelays/TrustedRelayListState.kt
index bce1af25d..65a5c80c4 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/trustedRelays/TrustedRelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip51Lists/trustedRelays/TrustedRelayListState.kt
@@ -90,7 +90,7 @@ class TrustedRelayListState(
 
     init {
         settings.backupTrustedRelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved Trusted relay list ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved Trusted relay list ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
         }
@@ -98,7 +98,7 @@ class TrustedRelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Trusted Relay List Collector Start")
             getTrustedRelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Trusted Relay List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Trusted Relay List for ${signer.pubKey}" }
                 (it.note.event as? TrustedRelayListEvent)?.let {
                     settings.updateTrustedRelayList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt
index c0a913fd6..6add6cd3e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip65RelayList/Nip65RelayListState.kt
@@ -144,7 +144,7 @@ class Nip65RelayListState(
 
     init {
         settings.backupNIP65RelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved nip65 relay list ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved nip65 relay list ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
         }
@@ -152,7 +152,7 @@ class Nip65RelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "NIP-65 Relay List Collector Start")
             getNIP65RelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating NIP-65 List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating NIP-65 List for ${signer.pubKey}" }
                 (it.note.event as? AdvertisedRelayListEvent)?.let {
                     settings.updateNIP65RelayList(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip72Communities/CommunityListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip72Communities/CommunityListState.kt
index a4fd1285a..97a5c2dfb 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip72Communities/CommunityListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip72Communities/CommunityListState.kt
@@ -155,7 +155,7 @@ class CommunityListState(
 
     init {
         settings.backupCommunityList?.let { event ->
-            Log.d("AccountRegisterObservers", "Loading saved Community list ${event.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved Community list ${event.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) {
                 LocalCache.justConsumeMyOwnEvent(event)
@@ -165,7 +165,7 @@ class CommunityListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Community List Collector Start")
             getCommunityListFlow().collect {
-                Log.d("AccountRegisterObservers", "Community List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Community List for ${signer.pubKey}" }
                 (it.note.event as? CommunityListEvent)?.let {
                     settings.updateCommunityListTo(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip78AppSpecific/AppSpecificState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip78AppSpecific/AppSpecificState.kt
index d68d64f9c..8a745aed6 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip78AppSpecific/AppSpecificState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nip78AppSpecific/AppSpecificState.kt
@@ -65,7 +65,7 @@ class AppSpecificState(
     init {
         if (settings.isWriteable()) {
             settings.backupAppSpecificData?.let { event ->
-                Log.d("AccountRegisterObservers", "Loading saved app specific data ${event.toJson()}")
+                Log.d("AccountRegisterObservers") { "Loading saved app specific data ${event.toJson()}" }
                 @OptIn(DelicateCoroutinesApi::class)
                 scope.launch(Dispatchers.IO) {
                     LocalCache.justConsumeMyOwnEvent(event)
@@ -84,7 +84,7 @@ class AppSpecificState(
                 Log.d("AccountRegisterObservers", "AppSpecificData Collector Start")
                 getAppSpecificDataFlow().collect {
                     try {
-                        Log.d("AccountRegisterObservers", "Updating AppSpecificData for ${signer.pubKey}")
+                        Log.d("AccountRegisterObservers") { "Updating AppSpecificData for ${signer.pubKey}" }
                         (it.note.event as? AppSpecificDataEvent)?.let {
                             val decrypted = signer.decrypt(it.content, it.pubKey)
                             try {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nipA3PaymentTargets/NipA3PaymentTargetsState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nipA3PaymentTargets/NipA3PaymentTargetsState.kt
index 58bb30514..aa7481521 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nipA3PaymentTargets/NipA3PaymentTargetsState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/nipA3PaymentTargets/NipA3PaymentTargetsState.kt
@@ -46,7 +46,7 @@ class NipA3PaymentTargetsState(
 
     init {
         settings.backupNipA3PaymentTargets?.let {
-            Log.d("AccountRegisterObservers", "Loading saved nipA3 Payment targets ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved nipA3 Payment targets ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
         }
@@ -54,7 +54,7 @@ class NipA3PaymentTargetsState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "nipA3 Payment targets Collector Start")
             getNipA3PaymentTargetsFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating nipA3 Payment targets for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating nipA3 Payment targets for ${signer.pubKey}" }
                 (it.note.event as? PaymentTargetsEvent)?.let { paymentTargetsEvent ->
                     settings.updateNIPA3PaymentTargets(paymentTargetsEvent)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt
index 3cd914034..324ad09ae 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/model/trustedAssertions/TrustProviderListState.kt
@@ -124,7 +124,7 @@ class TrustProviderListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "TrustProviderList Collector Start")
             getTrustProviderListFlow().collect { noteState ->
-                Log.d("AccountRegisterObservers", "TrustProviderList List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "TrustProviderList List for ${signer.pubKey}" }
                 (noteState.note.event as? TrustProviderListEvent)?.let {
                     settings.updateTrustProviderListTo(it)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/broadcast/BroadcastTracker.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/broadcast/BroadcastTracker.kt
index 7c9e15c08..bfede508e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/broadcast/BroadcastTracker.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/broadcast/BroadcastTracker.kt
@@ -85,7 +85,7 @@ class BroadcastTracker {
         // Add to active broadcasts and cache event for retries
         _activeBroadcasts.update { (it + broadcast).toImmutableList() }
 
-        Log.d(TAG, "Starting broadcast $trackingId (kind ${event.kind}) to ${relays.size} relays")
+        Log.d(TAG) { "Starting broadcast $trackingId (kind ${event.kind}) to ${relays.size} relays" }
 
         val resultChannel = Channel<RelayResponse>(UNLIMITED)
 
@@ -102,7 +102,7 @@ class BroadcastTracker {
                                 result = RelayResult.Error(errorMessage),
                             ),
                         )
-                        Log.d(TAG, "[$trackingId] Cannot connect to ${relay.url}: $errorMessage")
+                        Log.d(TAG) { "[$trackingId] Cannot connect to ${relay.url}: $errorMessage" }
                     }
                 }
 
@@ -114,7 +114,7 @@ class BroadcastTracker {
                                 result = RelayResult.Error("Relay disconnected before completion"),
                             ),
                         )
-                        Log.d(TAG, "[$trackingId] Disconnected from ${relay.url}")
+                        Log.d(TAG) { "[$trackingId] Disconnected from ${relay.url}" }
                     }
                 }
 
@@ -135,7 +135,7 @@ class BroadcastTracker {
                                         RelayResult.Error(msg.message)
                                     }
                                 resultChannel.trySend(RelayResponse(relay.url, result))
-                                Log.d(TAG, "[$trackingId] Response from ${relay.url}: success=${msg.success} message=${msg.message}")
+                                Log.d(TAG) { "[$trackingId] Response from ${relay.url}: success=${msg.success} message=${msg.message}" }
                             }
                         }
                     }
@@ -190,7 +190,7 @@ class BroadcastTracker {
                 list.map { if (it.id == trackingId) finalBroadcast else it }.toImmutableList()
             }
 
-            Log.d(TAG, "Broadcast $trackingId complete: ${finalBroadcast.successCount}/${finalBroadcast.totalRelays} success")
+            Log.d(TAG) { "Broadcast $trackingId complete: ${finalBroadcast.successCount}/${finalBroadcast.totalRelays} success" }
         } finally {
             client.removeConnectionListener(subscription)
         }
@@ -278,7 +278,7 @@ class BroadcastTracker {
                                 result = RelayResult.Error(errorMessage),
                             ),
                         )
-                        Log.d(TAG, "[${broadcast.id}] Retry cannot connect to ${relay.url}: $errorMessage")
+                        Log.d(TAG) { "[${broadcast.id}] Retry cannot connect to ${relay.url}: $errorMessage" }
                     }
                 }
 
@@ -290,7 +290,7 @@ class BroadcastTracker {
                                 result = RelayResult.Error("Relay disconnected before completion"),
                             ),
                         )
-                        Log.d(TAG, "[${broadcast.id}] Retry disconnected from ${relay.url}")
+                        Log.d(TAG) { "[${broadcast.id}] Retry disconnected from ${relay.url}" }
                     }
                 }
 
@@ -311,7 +311,7 @@ class BroadcastTracker {
                                         RelayResult.Error(msg.message)
                                     }
                                 resultChannel.trySend(RelayResponse(relay.url, result))
-                                Log.d(TAG, "[${broadcast.id}] Retry response from ${relay.url}: success=${msg.success}")
+                                Log.d(TAG) { "[${broadcast.id}] Retry response from ${relay.url}: success=${msg.success}" }
                             }
                         }
                     }
@@ -383,7 +383,7 @@ class BroadcastTracker {
             list.map { if (it.id == broadcast.id) finalBroadcast else it }.toImmutableList()
         }
 
-        Log.d(TAG, "Retry complete for ${broadcast.id}: ${finalBroadcast.successCount}/${finalBroadcast.totalRelays} success")
+        Log.d(TAG) { "Retry complete for ${broadcast.id}: ${finalBroadcast.successCount}/${finalBroadcast.totalRelays} success" }
 
         return finalBroadcast
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt
index 2c72217f1..a3d140e5b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/connectivity/ConnectivityFlow.kt
@@ -48,7 +48,7 @@ class ConnectivityFlow(
                 object : ConnectivityManager.NetworkCallback() {
                     override fun onAvailable(network: Network) {
                         super.onAvailable(network)
-                        Log.d("ConnectivityFlow", "onAvailable ${network.networkHandle}")
+                        Log.d("ConnectivityFlow") { "onAvailable ${network.networkHandle}" }
                         connectivityManager.getNetworkCapabilities(network)?.let {
                             trySend(ConnectivityStatus.Active(network.networkHandle, it.isMeteredOrMobileData()))
                         }
@@ -60,13 +60,13 @@ class ConnectivityFlow(
                     ) {
                         super.onCapabilitiesChanged(network, networkCapabilities)
                         val isMobile = networkCapabilities.isMeteredOrMobileData()
-                        Log.d("ConnectivityFlow", "onCapabilitiesChanged ${network.networkHandle} $isMobile")
+                        Log.d("ConnectivityFlow") { "onCapabilitiesChanged ${network.networkHandle} $isMobile" }
                         trySend(ConnectivityStatus.Active(network.networkHandle, isMobile))
                     }
 
                     override fun onLost(network: Network) {
                         super.onLost(network)
-                        Log.d("ConnectivityFlow", "onLost ${network.networkHandle} ")
+                        Log.d("ConnectivityFlow") { "onLost ${network.networkHandle} " }
                         trySend(ConnectivityStatus.Off)
                     }
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
index da9cc9ae5..c37e4b4de 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/lnurl/LightningAddressResolver.kt
@@ -188,7 +188,7 @@ class LightningAddressResolver {
             }
 
         if (errorMessage == null) {
-            Log.d("LightningAddressResolver", "Error parsing LNResponse: $body")
+            Log.d("LightningAddressResolver") { "Error parsing LNResponse: $body" }
         }
 
         return errorMessage
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/LocationFlow.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/LocationFlow.kt
index 480efa4ce..87ab766ce 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/LocationFlow.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/LocationFlow.kt
@@ -48,13 +48,13 @@ class LocationFlow(
 
             val locationCallback =
                 LocationListener { location ->
-                    Log.d("LocationFlow", "onLocationChanged $location")
+                    Log.d("LocationFlow") { "onLocationChanged $location" }
                     launch { send(location) }
                 }
 
             locationManager.allProviders.forEach {
                 val location = locationManager.getLastKnownLocation(it)
-                Log.d("LocationFlow", "Last Known location is $location")
+                Log.d("LocationFlow") { "Last Known location is $location" }
                 if (location != null) {
                     send(location)
                 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/ReverseGeolocation.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/ReverseGeolocation.kt
index cdf1e95d3..6a57764e9 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/ReverseGeolocation.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/location/ReverseGeolocation.kt
@@ -53,7 +53,7 @@ class ReverseGeolocation {
             val locationCallback =
                 object : Geocoder.GeocodeListener {
                     override fun onGeocode(addresses: List<Address>) {
-                        Log.d("ReverseGeoLocation", "Found ${addresses.size} new addresses")
+                        Log.d("ReverseGeoLocation") { "Found ${addresses.size} new addresses" }
                         onReady(addresses)
                     }
 
@@ -64,7 +64,7 @@ class ReverseGeolocation {
                     }
                 }
 
-            Log.d("ReverseGeoLocation", "Execute Async $location")
+            Log.d("ReverseGeoLocation") { "Execute Async $location" }
             Geocoder(context).getFromLocation(
                 location.latitude,
                 location.longitude,
@@ -77,7 +77,7 @@ class ReverseGeolocation {
             location: Location,
             context: Context,
         ): List<Address>? {
-            Log.d("ReverseGeoLocation", "Execute Sync $location")
+            Log.d("ReverseGeoLocation") { "Execute Sync $location" }
             return try {
                 Geocoder(context).getFromLocation(
                     location.latitude,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/logging/LogMonitor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/logging/LogMonitor.kt
index 8d0b882a0..21fddb7c0 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/logging/LogMonitor.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/logging/LogMonitor.kt
@@ -60,7 +60,7 @@ class LogMonitor : Printer {
             val endTime = System.currentTimeMillis()
 
             if (x.indexOf("com.vitorpamplona.amethyst") > 0) {
-                Log.d("block-canary", "Looper ${endTime - mStartTimestamp}ms for $x")
+                Log.d("block-canary") { "Looper ${endTime - mStartTimestamp}ms for $x" }
             }
 
             mPrintingStarted = false
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt
index 2ccd1a069..d1696c702 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt
@@ -67,14 +67,14 @@ class EventNotificationConsumer(
         LocalPreferences.allSavedAccounts().forEach {
             if (!matchAccount && (it.hasPrivKey || it.loggedInWithExternalSigner)) {
                 LocalPreferences.loadAccountConfigFromEncryptedStorage(it.npub)?.let { acc ->
-                    Log.d(TAG, "New Notification Testing if for ${it.npub}")
+                    Log.d(TAG) { "New Notification Testing if for ${it.npub}" }
                     try {
                         val account = Amethyst.instance.accountsCache.loadAccount(acc)
                         consumeIfMatchesAccount(event, account)
                         matchAccount = true
                     } catch (e: Exception) {
                         if (e is CancellationException) throw e
-                        Log.d(TAG, "Message was not for user ${it.npub}: ${e.message}")
+                        Log.d(TAG) { "Message was not for user ${it.npub}: ${e.message}" }
                     }
                 }
             }
@@ -94,14 +94,14 @@ class EventNotificationConsumer(
         account: Account,
     ) {
         val consumed = LocalCache.hasConsumed(notificationEvent)
-        Log.d(TAG, "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${account.signer.pubKey} consumed= $consumed")
+        Log.d(TAG) { "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${account.signer.pubKey} consumed= $consumed" }
         if (!consumed) {
             Log.d(TAG, "New Notification was verified")
             if (!notificationManager().areNotificationsEnabled()) return
             Log.d(TAG, "Notifications are enabled")
 
             unwrapAndConsume(notificationEvent, account.signer)?.let { innerEvent ->
-                Log.d(TAG, "Unwrapped consume ${innerEvent.javaClass.simpleName}")
+                Log.d(TAG) { "Unwrapped consume ${innerEvent.javaClass.simpleName}" }
 
                 when (innerEvent) {
                     is PrivateDmEvent -> notify(innerEvent, account)
@@ -124,14 +124,14 @@ class EventNotificationConsumer(
         LocalPreferences.allSavedAccounts().forEach {
             if (!matchAccount && (it.hasPrivKey || it.loggedInWithExternalSigner) && it.npub in npubs) {
                 LocalPreferences.loadAccountConfigFromEncryptedStorage(it.npub)?.let { accountSettings ->
-                    Log.d(TAG, "New Notification Testing if for ${it.npub}")
+                    Log.d(TAG) { "New Notification Testing if for ${it.npub}" }
                     try {
                         val account = Amethyst.instance.accountsCache.loadAccount(accountSettings)
                         consumeNotificationEvent(event, account)
                         matchAccount = true
                     } catch (e: Exception) {
                         if (e is CancellationException) throw e
-                        Log.d(TAG, "Message was not for user ${it.npub}: ${e.message}")
+                        Log.d(TAG) { "Message was not for user ${it.npub}: ${e.message}" }
                     }
                 }
             }
@@ -365,7 +365,7 @@ class EventNotificationConsumer(
         account: Account,
     ) {
         Log.d(TAG, "New Zap to Notify")
-        Log.d(TAG, "Notify Start ${event.toNostrUri()}")
+        Log.d(TAG) { "Notify Start ${event.toNostrUri()}" }
         LocalCache.getNoteIfExists(event.id) ?: return
 
         Log.d(TAG, "Notify Not Notified Yet")
@@ -378,7 +378,7 @@ class EventNotificationConsumer(
         val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
         val noteZapped = event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
 
-        Log.d(TAG, "Notify ZapRequest $noteZapRequest zapped $noteZapped")
+        Log.d(TAG) { "Notify ZapRequest $noteZapRequest zapped $noteZapped" }
 
         if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
 
@@ -387,11 +387,11 @@ class EventNotificationConsumer(
         if (event.isTaggedUser(account.signer.pubKey)) {
             val amount = showAmount(event.amount)
 
-            Log.d(TAG, "Notify Amount $amount")
+            Log.d(TAG) { "Notify Amount $amount" }
 
             (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
                 decryptZapContentAuthor(event, account.signer)?.let { decryptedEvent ->
-                    Log.d(TAG, "Notify Decrypted if Private Zap ${event.id}")
+                    Log.d(TAG) { "Notify Decrypted if Private Zap ${event.id}" }
 
                     val author = LocalCache.getOrCreateUser(decryptedEvent.pubKey)
                     val senderInfo = Pair(author, decryptedEvent.content.ifBlank { null })
@@ -428,7 +428,7 @@ class EventNotificationConsumer(
                                         .hexToByteArray()
                                         .toNpub()
 
-                            Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
+                            Log.d(TAG) { "Notify ${event.id} $content $title $noteUri" }
 
                             notificationManager()
                                 .sendZapNotification(
@@ -463,7 +463,7 @@ class EventNotificationConsumer(
                                     .hexToByteArray()
                                     .toNpub()
 
-                        Log.d(TAG, "Notify ${event.id} $title $noteUri")
+                        Log.d(TAG) { "Notify ${event.id} $title $noteUri" }
 
                         notificationManager()
                             .sendZapNotification(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/PokeyReceiver.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/PokeyReceiver.kt
index 08b78c4df..d2f23c8e1 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/PokeyReceiver.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/PokeyReceiver.kt
@@ -69,7 +69,7 @@ class PokeyReceiver : BroadcastReceiver() {
     ) {
         if (intent.action == POKEY_ACTION) { // it's best practice to verify intent action before performing any operation
             val eventStr = intent.getStringExtra("EVENT")
-            Log.d(TAG, "New Pokey Notification Arrived $eventStr")
+            Log.d(TAG) { "New Pokey Notification Arrived $eventStr" }
 
             if (eventStr == null) return
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
index 042f24aef..7f734a02f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt
@@ -78,7 +78,7 @@ class RegisterAccounts(
             accounts
                 .mapNotNull { account ->
                     if (account.hasPrivKey || account.loggedInWithExternalSigner) {
-                        Log.d(tag, "Register Account ${account.npub}")
+                        Log.d(tag) { "Register Account ${account.npub}" }
 
                         val acc = LocalPreferences.loadAccountConfigFromEncryptedStorage(account.npub)
                         if (acc != null && acc.isWriteable()) {
@@ -87,10 +87,10 @@ class RegisterAccounts(
 
                             if (isDebug) {
                                 val readRelays = nip65Read.joinToString(", ") { it.url }
-                                Log.d(tag, "Register Account ${account.npub} NIP65 Reads $readRelays")
+                                Log.d(tag) { "Register Account ${account.npub} NIP65 Reads $readRelays" }
 
                                 val dmRelays = nip17Read.joinToString(", ") { it.url }
-                                Log.d(tag, "Register Account ${account.npub} NIP17 Reads $dmRelays")
+                                Log.d(tag) { "Register Account ${account.npub} NIP17 Reads $dmRelays" }
                             }
 
                             val relays = (nip65Read + nip17Read)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LoggingInterceptor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LoggingInterceptor.kt
index 114ee76b4..1982c7399 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LoggingInterceptor.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/okhttp/LoggingInterceptor.kt
@@ -41,7 +41,7 @@ class LoggingInterceptor : Interceptor {
         val response: Response = chain.proceed(request)
         val t2 = System.nanoTime()
 
-        Log.d("OkHttpLog", "Req $port ${request.url} in ${(t2 - t1) / 1e6}ms")
+        Log.d("OkHttpLog") { "Req $port ${request.url} in ${(t2 - t1) / 1e6}ms" }
 
         return response
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/GetVideoController.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/GetVideoController.kt
index 3375b7919..b561a4538 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/GetVideoController.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/composable/GetVideoController.kt
@@ -47,7 +47,7 @@ fun GetVideoController(
                 keepPlaying = mediaItem.src.keepPlaying,
                 context = context,
             ).onEach { state ->
-                Log.d("PlaybackService", "Controller instance: ${state.controller}")
+                Log.d("PlaybackService") { "Controller instance: ${state.controller}" }
 
                 if (BackgroundMedia.isPlaying()) {
                     // There is a video playing, start this one on mute.
@@ -57,7 +57,7 @@ fun GetVideoController(
                     // There is no other video playing. Use the default mute state to
                     // decide if sound is on or not.
                     state.controller.volume = if (muted) 0f else 1f
-                    Log.d("PlaybackService", "OnEach $muted")
+                    Log.d("PlaybackService") { "OnEach $muted" }
                 }
 
                 if (play) {
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackServiceClient.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackServiceClient.kt
index 1b3bd3934..d3daa7ff6 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackServiceClient.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/playback/service/PlaybackServiceClient.kt
@@ -67,14 +67,14 @@ object PlaybackServiceClient {
                 .setConnectionHints(bundle)
                 .buildAsync()
 
-        Log.d("PlaybackService", "Preparing Controller $id $videoUri")
+        Log.d("PlaybackService") { "Preparing Controller $id $videoUri" }
 
         controllerFuture.addListener(
             {
                 try {
                     val controller = controllerFuture.get(5, TimeUnit.SECONDS)
 
-                    Log.d("PlaybackService", "Controller Ready $id $videoUri")
+                    Log.d("PlaybackService") { "Controller Ready $id $videoUri" }
 
                     // checks if the player is still active before engaging further
                     trySend(
@@ -92,7 +92,7 @@ object PlaybackServiceClient {
         )
 
         awaitClose {
-            Log.d("PlaybackService", "Releasing Controller $id $videoUri")
+            Log.d("PlaybackService") { "Releasing Controller $id $videoUri" }
             try {
                 MediaController.releaseFuture(controllerFuture)
             } catch (e: Exception) {
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 512f85a3b..ae6fc1831 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
@@ -74,7 +74,7 @@ class RelayProxyClientConnector(
                 if (it.connectivity is ConnectivityStatus.StartingService) {
                     // ignore
                 } else if (it.connectivity is ConnectivityStatus.Off) {
-                    Log.d("ManageRelayServices", "Connectivity Off: Pausing Relay Services ${it.connectivity}")
+                    Log.d("ManageRelayServices") { "Connectivity Off: Pausing Relay Services ${it.connectivity}" }
                     if (client.isActive()) {
                         client.disconnect()
                     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/AuthCoordinator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/AuthCoordinator.kt
index 2437c21a2..80c11d79d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/AuthCoordinator.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/authCommand/model/AuthCoordinator.kt
@@ -80,7 +80,7 @@ class AuthCoordinator(
         if (account == null) return
 
         if (isDebug) {
-            Log.d("AuthCoordinator", "Watch $account")
+            Log.d("AuthCoordinator") { "Watch $account" }
         }
 
         authWithAccounts.add(account)
@@ -91,7 +91,7 @@ class AuthCoordinator(
         if (account == null) return
 
         if (isDebug) {
-            Log.d("AuthCoordinator", "Unwatch $account")
+            Log.d("AuthCoordinator") { "Unwatch $account" }
         }
 
         authWithAccounts.remove(account)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/FrameStat.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/FrameStat.kt
index cc5f24019..79cdf51a2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/FrameStat.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/relayClient/speedLogger/FrameStat.kt
@@ -57,10 +57,10 @@ class FrameStat {
     }
 
     fun log() {
-        Log.d(TAG, "Events Per Second: ${eventCount.get()}")
+        Log.d(TAG) { "Events Per Second: ${eventCount.get()}" }
         kinds.forEach { key, value ->
             if (value.count.get() > 0) {
-                Log.d(TAG, "-- Kind $key $value")
+                Log.d(TAG) { "-- Kind $key $value" }
             }
         }
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt
index 119bc7400..5b25944a3 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MediaCompressor.kt
@@ -92,7 +92,7 @@ class MediaCompressor {
 
         var tempFile: File? = null
         return try {
-            Log.d("MediaCompressor", "Using image compression $mediaQuality")
+            Log.d("MediaCompressor") { "Using image compression $mediaQuality" }
             tempFile = MediaCompressorFileUtils.from(uri, context)
             val compressedImageFile =
                 Compressor.compress(context, tempFile) {
@@ -101,11 +101,11 @@ class MediaCompressor {
             if (tempFile != compressedImageFile && !tempFile.delete()) {
                 Log.w("MediaCompressor", "Failed to delete temp file: ${tempFile.absolutePath}")
             }
-            Log.d("MediaCompressor", "Image compression success. New size [${compressedImageFile.length()}]")
+            Log.d("MediaCompressor") { "Image compression success. New size [${compressedImageFile.length()}]" }
             MediaCompressorResult(compressedImageFile.toUri(), MimeTypes.IMAGE_JPEG, compressedImageFile.length())
         } catch (e: Exception) {
             if (e is CancellationException) throw e
-            Log.d("MediaCompressor", "Image compression failed: ${e.message}")
+            Log.d("MediaCompressor") { "Image compression failed: ${e.message}" }
             if (tempFile?.delete() == false) {
                 Log.w("MediaCompressor", "Failed to delete temp file: ${tempFile.absolutePath}")
             }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
index 9e603f514..0e1abd7d2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/MetadataStripper.kt
@@ -225,7 +225,7 @@ object MetadataStripper {
             if (tempFile?.delete() == false) {
                 Log.w("MetadataStripper", "Failed to delete temp file: ${tempFile.absolutePath}")
             }
-            Log.d("MetadataStripper", "Failed to strip image metadata: ${e.message}")
+            Log.d("MetadataStripper") { "Failed to strip image metadata: ${e.message}" }
             StrippingResult(uri, false)
         }
     }
@@ -260,7 +260,7 @@ object MetadataStripper {
             StrippingResult(tempOutputFile.toUri(), true)
         } catch (e: Exception) {
             if (e is CancellationException) throw e
-            Log.d("MetadataStripper", "Failed to strip video metadata: ${e.message}")
+            Log.d("MetadataStripper") { "Failed to strip video metadata: ${e.message}" }
             StrippingResult(uri, false)
         }
     }
@@ -293,7 +293,7 @@ object MetadataStripper {
             StrippingResult(tempOutputFile.toUri(), true)
         } catch (e: Exception) {
             if (e is CancellationException) throw e
-            Log.d("MetadataStripper", "Failed to strip audio metadata: ${e.message}")
+            Log.d("MetadataStripper") { "Failed to strip audio metadata: ${e.message}" }
             StrippingResult(uri, false)
         }
     }
@@ -387,7 +387,7 @@ object MetadataStripper {
             if (tempInputFile?.delete() == false) {
                 Log.w("MetadataStripper", "Failed to delete temp file: ${tempInputFile.absolutePath}")
             }
-            Log.d("MetadataStripper", "Failed to strip MP3 metadata: ${e.message}")
+            Log.d("MetadataStripper") { "Failed to strip MP3 metadata: ${e.message}" }
             StrippingResult(uri, false)
         }
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/UploadOrchestrator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/UploadOrchestrator.kt
index b56d78932..e0e5ad0f9 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/UploadOrchestrator.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/UploadOrchestrator.kt
@@ -339,7 +339,7 @@ class UploadOrchestrator {
             val path = tempUri.path ?: return
             val file = File(path)
             if (file.delete()) {
-                Log.d("UploadOrchestrator", "Deleted temp file: $path")
+                Log.d("UploadOrchestrator") { "Deleted temp file: $path" }
             }
         } catch (e: Exception) {
             Log.w("UploadOrchestrator", "Failed to delete temp file: ${tempUri.path}", e)
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt
index 90a559045..c78f7dddc 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/service/uploads/VideoCompressionHelper.kt
@@ -98,7 +98,7 @@ data class CompressionRule(
         val codecMultiplier = if (useH265) 0.75f else 1.0f
         val finalMultiplier = framerateMultiplier * codecMultiplier
 
-        Log.d("VideoCompressionHelper", "framerate: $framerate, useH265: $useH265, Bitrate multiplier: $finalMultiplier")
+        Log.d("VideoCompressionHelper") { "framerate: $framerate, useH265: $useH265, Bitrate multiplier: $finalMultiplier" }
 
         return (bitrateMbps * finalMultiplier * MBPS_TO_BPS_MULTIPLIER).toInt()
     }
@@ -162,13 +162,12 @@ object VideoCompressionHelper {
                         .getValue(info.resolution.getStandard())
 
                 val bitrateBps = rule.getBitrateBps(info.framerate, useH265)
-                Log.d(LOG_TAG, "Bitrate: ${bitrateBps}bps for ${info.resolution.getStandard()} quality=$mediaQuality framerate=${info.framerate}fps useH265=$useH265.")
+                Log.d(LOG_TAG) { "Bitrate: ${bitrateBps}bps for ${info.resolution.getStandard()} quality=$mediaQuality framerate=${info.framerate}fps useH265=$useH265." }
 
-                Log.d(
-                    LOG_TAG,
+                Log.d(LOG_TAG) {
                     "Resizer: ${info.resolution.width}x${info.resolution.height} -> " +
-                        "shortSide=${rule.shortSide} (${rule.description})",
-                )
+                        "shortSide=${rule.shortSide} (${rule.description})"
+                }
                 val resizer = VideoResizer.limitShortSide(rule.shortSide.toDouble())
 
                 Pair(bitrateBps, resizer)
@@ -258,11 +257,10 @@ object VideoCompressionHelper {
                                         )
                                     }
 
-                                    Log.d(
-                                        LOG_TAG,
+                                    Log.d(LOG_TAG) {
                                         "Compression success: Original [$originalSize] -> " +
-                                            "Compressed [$size] ($reductionPercent% reduction)",
-                                    )
+                                            "Compressed [$size] ($reductionPercent% reduction)"
+                                    }
 
                                     if (continuation.isActive) {
                                         continuation.resume(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
index 26327122b..933dda809 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt
@@ -60,7 +60,7 @@ class MainActivity : AppCompatActivity() {
         enableEdgeToEdge()
         super.onCreate(savedInstanceState)
 
-        Log.d("ActivityLifecycle", "MainActivity.onCreate $this")
+        Log.d("ActivityLifecycle") { "MainActivity.onCreate $this" }
 
         setContent {
             StringResSetup()
@@ -74,14 +74,14 @@ class MainActivity : AppCompatActivity() {
     override fun onResume() {
         super.onResume()
 
-        Log.d("ActivityLifecycle", "MainActivity.onResume $this")
+        Log.d("ActivityLifecycle") { "MainActivity.onResume $this" }
 
         // starts muted every time
         DEFAULT_MUTED_SETTING.value = true
     }
 
     override fun onPause() {
-        Log.d("ActivityLifecycle", "MainActivity.onPause $this")
+        Log.d("ActivityLifecycle") { "MainActivity.onPause $this" }
 
         @OptIn(DelicateCoroutinesApi::class)
         GlobalScope.launch(Dispatchers.IO) {
@@ -106,11 +106,11 @@ class MainActivity : AppCompatActivity() {
         //    serviceManager.trimMemory()
         // }
 
-        Log.d("ActivityLifecycle", "MainActivity.onStop $this")
+        Log.d("ActivityLifecycle") { "MainActivity.onStop $this" }
     }
 
     override fun onDestroy() {
-        Log.d("ActivityLifecycle", "MainActivity.onDestroy $this")
+        Log.d("ActivityLifecycle") { "MainActivity.onDestroy $this" }
 
         BackgroundMedia.removeBackgroundControllerAndReleaseIt()
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/VoiceAnonymizationController.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/VoiceAnonymizationController.kt
index 5f7188d03..29ec80aec 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/VoiceAnonymizationController.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/uploads/VoiceAnonymizationController.kt
@@ -61,7 +61,7 @@ class VoiceAnonymizationController(
         preset: VoicePreset,
         originalFile: File?,
     ) {
-        Log.d(logTag, "selectPreset called with: ${preset.name}, pitchFactor: ${preset.pitchFactor}")
+        Log.d(logTag) { "selectPreset called with: ${preset.name}, pitchFactor: ${preset.pitchFactor}" }
         if (processingPreset != null || preset == selectedPreset) return
 
         if (preset == VoicePreset.NONE) {
@@ -110,7 +110,7 @@ class VoiceAnonymizationController(
             try {
                 if (result.file.exists()) {
                     if (result.file.delete()) {
-                        Log.d(logTag, "Deleted distorted file: ${result.file.absolutePath}")
+                        Log.d(logTag) { "Deleted distorted file: ${result.file.absolutePath}" }
                     } else {
                         Log.w(logTag, "Failed to delete distorted file: ${result.file.absolutePath}")
                     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/ChannelFeedContentState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/ChannelFeedContentState.kt
index 7b53a2fdd..106cd2ba8 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/ChannelFeedContentState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/feeds/ChannelFeedContentState.kt
@@ -176,7 +176,7 @@ class ChannelFeedContentState(
     }
 
     fun destroy() {
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
         bundlerInsert.cancel()
         bundler.cancel()
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt
index 14c5ed899..a41fad4c9 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UsernameDisplay.kt
@@ -174,5 +174,5 @@ private fun speak(
         .speak(message)
         .highlight()
         .onDone { Log.d("TextToSpeak", "speak: done") }
-        .onError { Log.d("TextToSpeak", "speak error: $it") }
+        .onError { Log.d("TextToSpeak") { "speak error: $it" } }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt
index ecae95ec2..fa098494a 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountScreen.kt
@@ -48,7 +48,7 @@ fun AccountScreen(accountSessionManager: AccountSessionManager) {
 
     val accountState by accountSessionManager.accountContent.collectAsStateWithLifecycle()
 
-    Log.d("ActivityLifecycle", "AccountScreen $accountState $accountSessionManager")
+    Log.d("ActivityLifecycle") { "AccountScreen $accountState $accountSessionManager" }
 
     Crossfade(
         targetState = accountState,
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/TopNavFilterState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/TopNavFilterState.kt
index 13f27017a..8a81b1a7c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/TopNavFilterState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/TopNavFilterState.kt
@@ -238,7 +238,7 @@ class TopNavFilterState(
             .stateIn(scope, SharingStarted.Eagerly, defaultLists)
 
     fun destroy() {
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 }
 
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
index f918cd9e9..d43caec0c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/UserFeedViewModel.kt
@@ -99,24 +99,24 @@ open class UserFeedViewModel(
     }
 
     init {
-        Log.d("Init", "${this.javaClass.simpleName}")
+        Log.d("Init") { "${this.javaClass.simpleName}" }
         viewModelScope.launch(Dispatchers.IO) {
             LocalCache.live.newEventBundles.collect { newNotes ->
-                Log.d("Rendering Metrics", "Update feeds: ${this@UserFeedViewModel.javaClass.simpleName} with ${newNotes.size}")
+                Log.d("Rendering Metrics") { "Update feeds: ${this@UserFeedViewModel.javaClass.simpleName} with ${newNotes.size}" }
                 invalidateData()
             }
         }
 
         viewModelScope.launch(Dispatchers.IO) {
             LocalCache.live.deletedEventBundles.collect { newNotes ->
-                Log.d("Rendering Metrics", "Delete from feeds: ${this@UserFeedViewModel.javaClass.simpleName} with ${newNotes.size}")
+                Log.d("Rendering Metrics") { "Delete from feeds: ${this@UserFeedViewModel.javaClass.simpleName} with ${newNotes.size}" }
                 invalidateData()
             }
         }
     }
 
     override fun onCleared() {
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
         bundler.cancel()
         super.onCleared()
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
index 13130e854..62c0698eb 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/privateDM/send/ChatNewMessageViewModel.kt
@@ -801,7 +801,7 @@ class ChatNewMessageViewModel :
 
     override fun onCleared() {
         super.onCleared()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 
     // NIP-04 sending is deprecated. NIP-17 is always used.
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelNewMessageViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelNewMessageViewModel.kt
index 5b293355b..94309697b 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelNewMessageViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chats/publicChannels/send/ChannelNewMessageViewModel.kt
@@ -663,7 +663,7 @@ open class ChannelNewMessageViewModel :
 
     override fun onCleared() {
         super.onCleared()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 
     fun updateZapPercentage(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/LongFormPostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/LongFormPostViewModel.kt
index ddbcdc910..3974700ec 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/LongFormPostViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip23LongForm/LongFormPostViewModel.kt
@@ -687,7 +687,7 @@ class LongFormPostViewModel :
 
     override fun onCleared() {
         super.onCleared()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 
     override fun updateZapPercentage(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductViewModel.kt
index 826fa4eaa..d0b7fd87c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/discover/nip99Classifieds/NewProductViewModel.kt
@@ -608,7 +608,7 @@ open class NewProductViewModel :
 
     override fun onCleared() {
         super.onCleared()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 
     override fun updateZapPercentage(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
index 11601d54c..cd6c1729c 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/ShortNotePostViewModel.kt
@@ -1271,7 +1271,7 @@ open class ShortNotePostViewModel :
         voiceLocalFile?.let { file ->
             try {
                 if (file.delete()) {
-                    Log.d("ShortNotePostViewModel", "Deleted voice file: ${file.absolutePath}")
+                    Log.d("ShortNotePostViewModel") { "Deleted voice file: ${file.absolutePath}" }
                 }
             } catch (e: Exception) {
                 Log.w("ShortNotePostViewModel", "Failed to delete voice file: ${file.absolutePath}", e)
@@ -1365,7 +1365,7 @@ open class ShortNotePostViewModel :
 
     override fun onCleared() {
         super.onCleared()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 
     override fun updateZapPercentage(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/VoiceReplyViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/VoiceReplyViewModel.kt
index d44630a46..39c0e3919 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/VoiceReplyViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/VoiceReplyViewModel.kt
@@ -157,7 +157,7 @@ class VoiceReplyViewModel : ViewModel() {
             try {
                 if (file.exists()) {
                     file.delete()
-                    Log.d("VoiceReplyViewModel", "Deleted voice file: ${file.absolutePath}")
+                    Log.d("VoiceReplyViewModel") { "Deleted voice file: ${file.absolutePath}" }
                 }
             } catch (e: Exception) {
                 Log.w("VoiceReplyViewModel", "Failed to delete voice file: ${file.absolutePath}", e)
@@ -315,6 +315,6 @@ class VoiceReplyViewModel : ViewModel() {
     override fun onCleared() {
         cancel()
         super.onCleared()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
index 04365cac6..923835b1f 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/home/live/LiveStatusIndicator.kt
@@ -106,7 +106,7 @@ private suspend fun checkChannelIsOnline(
                 }
             }
         } catch (e: Exception) {
-            Log.d("LiveStatusIndicator", "Network error checking channel ${channel.toBestDisplayName()}: ${e.message}")
+            Log.d("LiveStatusIndicator") { "Network error checking channel ${channel.toBestDisplayName()}: ${e.message}" }
             // Return false if any network error occurs
             false
         }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedContentState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedContentState.kt
index a0cd1da9d..ad7de41b2 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedContentState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/CardFeedContentState.kt
@@ -463,7 +463,7 @@ class CardFeedContentState(
     }
 
     fun destroy() {
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
         clear()
         bundlerInsert.cancel()
         bundler.cancel()
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt
index f112a4173..09cdd19ca 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/NotificationSummaryState.kt
@@ -271,6 +271,6 @@ class NotificationSummaryState(
 
     fun destroy() {
         bundlerInsert.cancel()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
index 28daa1bf2..9c58dd396 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/notifications/publicMessages/NewPublicMessageViewModel.kt
@@ -657,7 +657,7 @@ class NewPublicMessageViewModel :
 
     override fun onCleared() {
         super.onCleared()
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
     }
 
     override fun updateZapPercentage(
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/relays/RelayFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/relays/RelayFeedViewModel.kt
index 30579bda9..e1dc0546d 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/relays/RelayFeedViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/profile/relays/RelayFeedViewModel.kt
@@ -195,7 +195,7 @@ class RelayFeedViewModel :
     }
 
     override fun onCleared() {
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
         super.onCleared()
     }
 }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/StringFeedViewModel.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/StringFeedViewModel.kt
index 631ee4fd3..3cd6bea29 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/StringFeedViewModel.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/settings/StringFeedViewModel.kt
@@ -101,20 +101,20 @@ open class StringFeedViewModel(
         Log.d("Init", this.javaClass.simpleName)
         viewModelScope.launch(Dispatchers.IO) {
             LocalCache.live.newEventBundles.collect { newNotes ->
-                Log.d("Rendering Metrics", "Update feeds: ${this@StringFeedViewModel.javaClass.simpleName} with ${newNotes.size}")
+                Log.d("Rendering Metrics") { "Update feeds: ${this@StringFeedViewModel.javaClass.simpleName} with ${newNotes.size}" }
                 invalidateData()
             }
         }
         viewModelScope.launch(Dispatchers.IO) {
             LocalCache.live.deletedEventBundles.collect { newNotes ->
-                Log.d("Rendering Metrics", "Delete feeds: ${this@StringFeedViewModel.javaClass.simpleName} with ${newNotes.size}")
+                Log.d("Rendering Metrics") { "Delete feeds: ${this@StringFeedViewModel.javaClass.simpleName} with ${newNotes.size}" }
                 invalidateData()
             }
         }
     }
 
     override fun onCleared() {
-        Log.d("Init", "OnCleared: ${this.javaClass.simpleName}")
+        Log.d("Init") { "OnCleared: ${this.javaClass.simpleName}" }
         bundler.cancel()
         super.onCleared()
     }
diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
index ccdea4a0f..e25508d0e 100644
--- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
+++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/tor/TorService.kt
@@ -65,7 +65,7 @@ class TorService(
                             active.torControlConnection = torService.torControlConnection
 
                             trySend(active)
-                            Log.d("TorService", "Tor Service Connected ${torService.socksPort}")
+                            Log.d("TorService") { "Tor Service Connected ${torService.socksPort}" }
                         }
                     }
 
@@ -86,7 +86,7 @@ class TorService(
                 try {
                     context.unbindService(serviceConnection)
                 } catch (e: Exception) {
-                    Log.d("TorService", "Failed to unbind Tor Service: ${e.message}")
+                    Log.d("TorService") { "Failed to unbind Tor Service: ${e.message}" }
                 }
                 launch {
                     context.stopService(currentIntent)
diff --git a/amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt b/amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt
index 7ba915c3e..197dbd4d2 100644
--- a/amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt
+++ b/amethyst/src/play/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationReceiverService.kt
@@ -49,7 +49,7 @@ class PushNotificationReceiverService : FirebaseMessagingService() {
 
     // this is called when a message is received
     override fun onMessageReceived(remoteMessage: RemoteMessage) {
-        Log.d("PushNotificationService", "Notification received $remoteMessage")
+        Log.d("PushNotificationService") { "Notification received $remoteMessage" }
         scope.launch(Dispatchers.IO) {
             parseMessage(remoteMessage.data)?.let { receiveIfNew(it) }
         }
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/emphChat/EphemeralChatListState.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/emphChat/EphemeralChatListState.kt
index 11f888e9a..e8cccecac 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/emphChat/EphemeralChatListState.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/emphChat/EphemeralChatListState.kt
@@ -124,7 +124,7 @@ class EphemeralChatListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "EphemeralChatList Collector Start")
             getEphemeralChatListFlow().collect { noteState ->
-                Log.d("AccountRegisterObservers", "EphemeralChatList List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "EphemeralChatList List for ${signer.pubKey}" }
                 (noteState.note.event as? EphemeralChatListEvent)?.let {
                     settings.updateEphemeralChatListTo(it)
                 }
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip02FollowList/Kind3FollowListState.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip02FollowList/Kind3FollowListState.kt
index c7e3b6066..509e2e1c3 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip02FollowList/Kind3FollowListState.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip02FollowList/Kind3FollowListState.kt
@@ -161,7 +161,7 @@ class Kind3FollowListState(
 
     init {
         settings.backupContactList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved ${it.tags.size} contacts")
+            Log.d("AccountRegisterObservers") { "Loading saved ${it.tags.size} contacts" }
 
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
@@ -171,7 +171,7 @@ class Kind3FollowListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Kind 3 Collector Start")
             getFollowListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating Kind 3 ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating Kind 3 ${signer.pubKey}" }
                 (it.note.event as? ContactListEvent)?.let {
                     settings.updateContactListTo(it)
                 }
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip28PublicChats/PublicChatListState.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip28PublicChats/PublicChatListState.kt
index 3b981be8a..2a676de5f 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip28PublicChats/PublicChatListState.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip28PublicChats/PublicChatListState.kt
@@ -129,7 +129,7 @@ class PublicChatListState(
 
     init {
         settings.channelList()?.let { event ->
-            Log.d("AccountRegisterObservers", "Loading saved channel list ${event.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved channel list ${event.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) {
                 cache.justConsumeMyOwnEvent(event)
@@ -139,7 +139,7 @@ class PublicChatListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "Channel List Collector Start")
             getChannelListFlow().collect {
-                Log.d("AccountRegisterObservers", "Channel List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Channel List for ${signer.pubKey}" }
                 (it.note.event as? ChannelListEvent)?.let {
                     settings.updateChannelListTo(it)
                 }
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip65RelayList/Nip65RelayListState.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip65RelayList/Nip65RelayListState.kt
index b93f17d53..f21bf18a7 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip65RelayList/Nip65RelayListState.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/model/nip65RelayList/Nip65RelayListState.kt
@@ -142,7 +142,7 @@ class Nip65RelayListState(
 
     init {
         settings.backupNIP65RelayList?.let {
-            Log.d("AccountRegisterObservers", "Loading saved nip65 relay list ${it.toJson()}")
+            Log.d("AccountRegisterObservers") { "Loading saved nip65 relay list ${it.toJson()}" }
             @OptIn(DelicateCoroutinesApi::class)
             scope.launch(Dispatchers.IO) { cache.justConsumeMyOwnEvent(it) }
         }
@@ -150,7 +150,7 @@ class Nip65RelayListState(
         scope.launch(Dispatchers.IO) {
             Log.d("AccountRegisterObservers", "NIP-65 Relay List Collector Start")
             getNIP65RelayListFlow().collect {
-                Log.d("AccountRegisterObservers", "Updating NIP-65 List for ${signer.pubKey}")
+                Log.d("AccountRegisterObservers") { "Updating NIP-65 List for ${signer.pubKey}" }
                 (it.note.event as? AdvertisedRelayListEvent)?.let {
                     settings.updateNIP65RelayList(it)
                 }
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/utils/DebugUtils.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/utils/DebugUtils.kt
index 06b41ee58..875250fff 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/utils/DebugUtils.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/utils/DebugUtils.kt
@@ -39,7 +39,7 @@ inline fun <T> logTime(
     if (isDebug) {
         val (result, elapsed) = measureTimedValue(block)
         if (elapsed.inWholeMilliseconds > minToReportMs) {
-            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: $debugMessage")
+            Log.d("DEBUG-TIME") { "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: $debugMessage" }
         }
         result
     } else {
@@ -54,7 +54,7 @@ inline fun <T> logTime(
     if (isDebug) {
         val (result, elapsed) = measureTimedValue(block)
         if (elapsed.inWholeMilliseconds > minToReportMs) {
-            Log.d("DEBUG-TIME", "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: ${debugMessage(result)}")
+            Log.d("DEBUG-TIME") { "${elapsed.toString(DurationUnit.MILLISECONDS, 3).padStart(12)}: ${debugMessage(result)}" }
         }
         result
     } else {
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/FeedViewModel.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/FeedViewModel.kt
index 35c088b47..47ff0d18f 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/FeedViewModel.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/FeedViewModel.kt
@@ -49,24 +49,24 @@ abstract class FeedViewModel(
     override fun invalidateData(ignoreIfDoing: Boolean) = feedState.invalidateData(ignoreIfDoing)
 
     init {
-        Log.d("Init", "Starting new Model: ${this::class.simpleName}")
+        Log.d("Init") { "Starting new Model: ${this::class.simpleName}" }
         viewModelScope.launch(Dispatchers.IO) {
             cacheProvider.getEventStream().newEventBundles.collect { newNotes ->
-                Log.d("Rendering Metrics", "Update feeds: ${this@FeedViewModel::class.simpleName} with ${newNotes.size}")
+                Log.d("Rendering Metrics") { "Update feeds: ${this@FeedViewModel::class.simpleName} with ${newNotes.size}" }
                 feedState.updateFeedWith(newNotes)
             }
         }
 
         viewModelScope.launch(Dispatchers.IO) {
             cacheProvider.getEventStream().deletedEventBundles.collect { newNotes ->
-                Log.d("Rendering Metrics", "Delete from feeds: ${this@FeedViewModel::class.simpleName} with ${newNotes.size}")
+                Log.d("Rendering Metrics") { "Delete from feeds: ${this@FeedViewModel::class.simpleName} with ${newNotes.size}" }
                 feedState.deleteFromFeed(newNotes)
             }
         }
     }
 
     override fun onCleared() {
-        Log.d("Init", "OnCleared: ${this::class.simpleName}")
+        Log.d("Init") { "OnCleared: ${this::class.simpleName}" }
         super.onCleared()
     }
 }
diff --git a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/ListChangeFeedViewModel.kt b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/ListChangeFeedViewModel.kt
index 4bce8f7a1..7e8f5ec8c 100644
--- a/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/ListChangeFeedViewModel.kt
+++ b/commons/src/commonMain/kotlin/com/vitorpamplona/amethyst/commons/viewmodels/ListChangeFeedViewModel.kt
@@ -46,14 +46,14 @@ abstract class ListChangeFeedViewModel(
     override fun invalidateData(ignoreIfDoing: Boolean) = feedState.invalidateData(ignoreIfDoing)
 
     init {
-        Log.d("Init", "Starting new Model: ${this::class.simpleName}")
+        Log.d("Init") { "Starting new Model: ${this::class.simpleName}" }
         // Trigger initial load so empty rooms show Empty instead of Loading
         viewModelScope.launch(Dispatchers.IO) {
             feedState.invalidateData(ignoreIfDoing = false)
         }
         viewModelScope.launch(Dispatchers.IO) {
             localFilter.changesFlow().collect {
-                Log.d("Init", "Collecting changes to: ${this@ListChangeFeedViewModel::class.simpleName}")
+                Log.d("Init") { "Collecting changes to: ${this@ListChangeFeedViewModel::class.simpleName}" }
                 when (it) {
                     is ListChange.Addition -> feedState.updateFeedWith(setOf(it.item))
                     is ListChange.Deletion -> feedState.deleteFromFeed(setOf(it.item))
diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/NostrClientPublishExt.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/NostrClientPublishExt.kt
index cdbfbf68f..5904626a7 100644
--- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/NostrClientPublishExt.kt
+++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/NostrClientPublishExt.kt
@@ -59,7 +59,7 @@ suspend fun INostrClient.publishAndConfirmDetailed(
 ): Map<NormalizedRelayUrl, Boolean> {
     val resultChannel = Channel<Result>(UNLIMITED)
 
-    Log.d("publishAndConfirm", "Waiting for ${relayList.size} responses")
+    Log.d("publishAndConfirm") { "Waiting for ${relayList.size} responses" }
 
     val subscription =
         object : RelayConnectionListener {
@@ -69,14 +69,14 @@ suspend fun INostrClient.publishAndConfirmDetailed(
             ) {
                 if (relay.url in relayList) {
                     resultChannel.trySend(Result(relay.url, false))
-                    Log.d("publishAndConfirm", "Error from relay ${relay.url}: $errorMessage")
+                    Log.d("publishAndConfirm") { "Error from relay ${relay.url}: $errorMessage" }
                 }
             }
 
             override fun onDisconnected(relay: IRelayClient) {
                 if (relay.url in relayList) {
                     resultChannel.trySend(Result(relay.url, false))
-                    Log.d("publishAndConfirm", "Disconnected from relay ${relay.url}")
+                    Log.d("publishAndConfirm") { "Disconnected from relay ${relay.url}" }
                 }
             }
 
@@ -91,7 +91,7 @@ suspend fun INostrClient.publishAndConfirmDetailed(
                     is OkMessage -> {
                         if (msg.eventId == event.id) {
                             resultChannel.trySend(Result(relay.url, msg.success))
-                            Log.d("publishAndConfirm", "onSendResponse Received response for ${msg.eventId} from relay ${relay.url} message ${msg.message} success ${msg.success}")
+                            Log.d("publishAndConfirm") { "onSendResponse Received response for ${msg.eventId} from relay ${relay.url} message ${msg.message} success ${msg.success}" }
                         }
                     }
                 }
@@ -136,7 +136,7 @@ suspend fun INostrClient.publishAndConfirmDetailed(
     // Clean up the channel
     resultChannel.close()
 
-    Log.d("publishAndConfirm", "Finished with ${receivedResults.size} results")
+    Log.d("publishAndConfirm") { "Finished with ${receivedResults.size} results" }
 
     return receivedResults
 }
diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/RelayLogger.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/RelayLogger.kt
index 34f32dcd5..c622e648f 100644
--- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/RelayLogger.kt
+++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/accessories/RelayLogger.kt
@@ -57,13 +57,13 @@ class RelayLogger(
                 val logTag = logTag(relay.url)
 
                 when (msg) {
-                    is EventMessage -> if (debugReceiving) Log.d(logTag, "Received: $msgStr")
-                    is EoseMessage -> if (debugReceiving) Log.d(logTag, "EOSE: ${msg.subId}")
+                    is EventMessage -> if (debugReceiving) Log.d(logTag) { "Received: $msgStr" }
+                    is EoseMessage -> if (debugReceiving) Log.d(logTag) { "EOSE: ${msg.subId}" }
                     is NoticeMessage -> Log.w(logTag, "Notice: ${msg.message}")
-                    is OkMessage -> if (debugReceiving) Log.d(logTag, "OK: ${msg.eventId} ${msg.success} ${msg.message}")
-                    is AuthMessage -> if (debugReceiving) Log.d(logTag, "Auth: ${msg.challenge}")
-                    is NotifyMessage -> if (debugReceiving) Log.d(logTag, "Notify: ${msg.message}")
-                    is CountMessage -> if (debugReceiving) Log.d(logTag, "Count: ${msg.result.count} approx: ${msg.result.approximate} hll: ${msg.result.hll != null}")
+                    is OkMessage -> if (debugReceiving) Log.d(logTag) { "OK: ${msg.eventId} ${msg.success} ${msg.message}" }
+                    is AuthMessage -> if (debugReceiving) Log.d(logTag) { "Auth: ${msg.challenge}" }
+                    is NotifyMessage -> if (debugReceiving) Log.d(logTag) { "Notify: ${msg.message}" }
+                    is CountMessage -> if (debugReceiving) Log.d(logTag) { "Count: ${msg.result.count} approx: ${msg.result.approximate} hll: ${msg.result.hll != null}" }
                     is ClosedMessage -> Log.w(logTag, "Closed: ${msg.subId} ${msg.message}")
                 }
             }
@@ -76,7 +76,7 @@ class RelayLogger(
             ) {
                 if (success) {
                     if (debugSending) {
-                        Log.d(logTag(relay.url), "Sent (${cmdStr.length} chars): $cmdStr")
+                        Log.d(logTag(relay.url)) { "Sent (${cmdStr.length} chars): $cmdStr" }
                     }
                 } else {
                     Log.e(logTag(relay.url), "Failure sending (${cmdStr.length} chars): $cmdStr")
@@ -92,7 +92,7 @@ class RelayLogger(
                 pingMillis: Int,
                 compressed: Boolean,
             ) {
-                Log.d(logTag(relay.url), "OnOpen (ping: ${pingMillis}ms${if (compressed) ", using compression" else ""})")
+                Log.d(logTag(relay.url)) { "OnOpen (ping: ${pingMillis}ms${if (compressed) ", using compression" else ""})" }
             }
 
             override fun onDisconnected(relay: IRelayClient) {
diff --git a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/stats/RelayReqStats.kt b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/stats/RelayReqStats.kt
index 4b34d2273..2da8b3ca6 100644
--- a/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/stats/RelayReqStats.kt
+++ b/quartz/src/commonMain/kotlin/com/vitorpamplona/quartz/nip01Core/relay/client/reqs/stats/RelayReqStats.kt
@@ -51,7 +51,7 @@ class RelayReqStats(
 
     fun printStats() =
         stats.printCounter { subId, kind, counter ->
-            Log.d("RelaySubStats", "$subId, kind $kind: $counter")
+            Log.d("RelaySubStats") { "$subId, kind $kind: $counter" }
         }
 
     init {
diff --git a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip03Timestamp/okhttp/OkHttpBitcoinExplorer.kt b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip03Timestamp/okhttp/OkHttpBitcoinExplorer.kt
index 581e98962..176fac5da 100644
--- a/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip03Timestamp/okhttp/OkHttpBitcoinExplorer.kt
+++ b/quartz/src/jvmAndroid/kotlin/com/vitorpamplona/quartz/nip03Timestamp/okhttp/OkHttpBitcoinExplorer.kt
@@ -60,7 +60,7 @@ class OkHttpBitcoinExplorer(
 
         return client.newCall(request).execute().use {
             if (it.isSuccessful) {
-                Log.d("OkHttpBlockstreamExplorer", "$baseAPI/block/$hash")
+                Log.d("OkHttpBlockstreamExplorer") { "$baseAPI/block/$hash" }
 
                 val jsonObject = JacksonMapper.mapper.readTree(it.body.string())
 
@@ -104,7 +104,7 @@ class OkHttpBitcoinExplorer(
             if (it.isSuccessful) {
                 val blockHash = it.body.string()
 
-                Log.d("OkHttpBlockstreamExplorer", "$url $blockHash")
+                Log.d("OkHttpBlockstreamExplorer") { "$url $blockHash" }
 
                 cache.putHeight(height, blockHash)
                 blockHash
diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt
index 0554d866b..40f607361 100644
--- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt
+++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientRepeatSubTest.kt
@@ -60,7 +60,7 @@ class NostrClientRepeatSubTest : BaseNostrClientTest() {
                         msgStr: String,
                         msg: Message,
                     ) {
-                        Log.d("Test", "Receiving message: $msgStr")
+                        Log.d("Test") { "Receiving message: $msgStr" }
                         when (msg) {
                             is EventMessage -> {
                                 if (mySubId == msg.subId) {
@@ -116,7 +116,7 @@ class NostrClientRepeatSubTest : BaseNostrClientTest() {
                 launch {
                     withTimeoutOrNull(30000) {
                         while (events.size < 112) {
-                            Log.d("Test", "Processing message ${events.size}")
+                            Log.d("Test") { "Processing message ${events.size}" }
                             // simulates an update in the middle of the sub
                             if (events.size == 1) {
                                 client.subscribe(mySubId, filtersShouldIgnore)
diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt
index e3d767fde..7a2aa0156 100644
--- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt
+++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionAsFlowTest.kt
@@ -64,7 +64,7 @@ class NostrClientSubscriptionAsFlowTest : BaseNostrClientTest() {
             val job =
                 launch {
                     flow.collect {
-                        Log.d("ZZ", "List timestamp deltas ${it.printDates()}")
+                        Log.d("ZZ") { "List timestamp deltas ${it.printDates()}" }
                         feedStates = it
                     }
                 }
@@ -103,7 +103,7 @@ class NostrClientSubscriptionAsFlowTest : BaseNostrClientTest() {
             val job =
                 launch {
                     flow.debounce(100).collect {
-                        Log.d("ZZ", "List timestamp deltas ${it.printDates()}")
+                        Log.d("ZZ") { "List timestamp deltas ${it.printDates()}" }
                         feedStates = it
                     }
                 }
diff --git a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt
index 289d9d2cb..f1d0eda67 100644
--- a/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt
+++ b/quartz/src/jvmAndroidTest/kotlin/com/vitorpamplona/quartz/nip01Core/relay/NostrClientSubscriptionUntilEoseAsFlowTest.kt
@@ -64,7 +64,7 @@ class NostrClientSubscriptionUntilEoseAsFlowTest : BaseNostrClientTest() {
             val job =
                 launch {
                     flow.collect {
-                        Log.d("ZZ", "List timestamp deltas ${it.printDates()}")
+                        Log.d("ZZ") { "List timestamp deltas ${it.printDates()}" }
                         feedStates = it
                     }
                 }
@@ -103,7 +103,7 @@ class NostrClientSubscriptionUntilEoseAsFlowTest : BaseNostrClientTest() {
             val job =
                 launch {
                     flow.debounce(100).collect {
-                        Log.d("ZZ", "List timestamp deltas ${it.printDates()}")
+                        Log.d("ZZ") { "List timestamp deltas ${it.printDates()}" }
                         feedStates = it
                     }
                 }