v0.53.6

app/build.gradle

@@ -13,8 +13,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk 26
         targetSdk 33
-        versionCode 184
-        versionName "0.53.0"
+        versionCode 190
+        versionName "0.53.6"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables {
@@ -140,6 +140,8 @@ dependencies {
 
     // view videos
     implementation 'com.google.android.exoplayer:exoplayer:2.18.7'
+    // important for proxy / tor
+    implementation 'com.google.android.exoplayer:extension-okhttp:2.18.7'
 
     // Load images from the web.
     implementation "io.coil-kt:coil-compose:$coil_version"

app/src/main/java/com/vitorpamplona/amethyst/ServiceManager.kt

@@ -1,5 +1,12 @@
 package com.vitorpamplona.amethyst
 
+import android.content.Context
+import android.os.Build
+import coil.Coil
+import coil.ImageLoader
+import coil.decode.GifDecoder
+import coil.decode.ImageDecoderDecoder
+import coil.decode.SvgDecoder
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.service.HttpClient
@@ -19,14 +26,33 @@ import com.vitorpamplona.amethyst.service.relays.Client
 object ServiceManager {
     private var account: Account? = null
 
-    fun start(account: Account) {
+    fun start(account: Account, context: Context) {
         this.account = account
-        start()
+        start(context)
     }
 
-    fun start() {
+    fun start(context: Context) {
         val myAccount = account
+
+        // Resets Proxy Use
         HttpClient.start(account)
+        Coil.setImageLoader {
+            ImageLoader.Builder(context).components {
+                if (Build.VERSION.SDK_INT >= 28) {
+                    add(ImageDecoderDecoder.Factory())
+                } else {
+                    add(GifDecoder.Factory())
+                }
+                add(SvgDecoder.Factory())
+            } // .logger(DebugLogger())
+                .okHttpClient { HttpClient.getHttpClient() }
+                .respectCacheHeaders(false)
+                .build()
+        }
+
+        // Initializes video cache.
+        VideoCache.init(context.applicationContext)
+
         if (myAccount != null) {
             Client.connect(myAccount.activeRelays() ?: myAccount.convertLocalRelays())
 

app/src/main/java/com/vitorpamplona/amethyst/VideoCache.kt

@@ -2,10 +2,11 @@ package com.vitorpamplona.amethyst
 
 import android.content.Context
 import com.google.android.exoplayer2.database.StandaloneDatabaseProvider
-import com.google.android.exoplayer2.upstream.DefaultHttpDataSource
+import com.google.android.exoplayer2.ext.okhttp.OkHttpDataSource
 import com.google.android.exoplayer2.upstream.cache.CacheDataSource
 import com.google.android.exoplayer2.upstream.cache.LeastRecentlyUsedCacheEvictor
 import com.google.android.exoplayer2.upstream.cache.SimpleCache
+import com.vitorpamplona.amethyst.service.HttpClient
 
 object VideoCache {
 
@@ -31,7 +32,14 @@ object VideoCache {
             cacheDataSourceFactory = CacheDataSource.Factory()
                 .setCache(simpleCache)
                 .setUpstreamDataSourceFactory(
-                    DefaultHttpDataSource.Factory().setAllowCrossProtocolRedirects(true)
+                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
+                )
+                .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
+        } else {
+            cacheDataSourceFactory = CacheDataSource.Factory()
+                .setCache(simpleCache)
+                .setUpstreamDataSourceFactory(
+                    OkHttpDataSource.Factory(HttpClient.getHttpClient())
                 )
                 .setFlags(CacheDataSource.FLAG_IGNORE_CACHE_ON_ERROR)
         }

app/src/main/java/com/vitorpamplona/amethyst/model/Account.kt

@@ -909,15 +909,7 @@ class Account(
     fun decryptContent(note: Note): String? {
         val event = note.event
         return if (event is PrivateDmEvent && loggedIn.privKey != null) {
-            var pubkeyToUse = event.pubKey
-
-            val recepientPK = event.verifiedRecipientPubKey()
-
-            if (note.author == userProfile() && recepientPK != null) {
-                pubkeyToUse = recepientPK
-            }
-
-            event.plainContent(loggedIn.privKey!!, pubkeyToUse.hexToByteArray())
+            event.plainContent(loggedIn.privKey!!, event.talkingWith(userProfile().pubkeyHex).hexToByteArray())
         } else if (event is LnZapRequestEvent && loggedIn.privKey != null) {
             decryptZapContentAuthor(note)?.content()
         } else {

app/src/main/java/com/vitorpamplona/amethyst/service/model/PrivateDmEvent.kt

@@ -29,6 +29,10 @@ class PrivateDmEvent(
 
     fun verifiedRecipientPubKey() = recipientPubKey()?.runCatching { Hex.decode(this[1]).toHexKey() }?.getOrNull() // makes sure its a valid one
 
+    fun talkingWith(oneSideHex: String): HexKey {
+        return if (pubKey == oneSideHex) verifiedRecipientPubKey() ?: pubKey else pubKey
+    }
+
     /**
      * To be fully compatible with nip-04, we read e-tags that are in violation to nip-18.
      *

app/src/main/java/com/vitorpamplona/amethyst/service/nip19/Nip19.kt

@@ -1,6 +1,7 @@
 package com.vitorpamplona.amethyst.service.nip19
 
 import android.util.Log
+import androidx.compose.runtime.Immutable
 import com.vitorpamplona.amethyst.model.hexToByteArray
 import com.vitorpamplona.amethyst.model.toHexKey
 import nostr.postr.Bech32
@@ -15,6 +16,7 @@ object Nip19 {
 
     val nip19regex = Pattern.compile("(nostr:)?@?(nsec1|npub1|nevent1|naddr1|note1|nprofile1|nrelay1)([qpzry9x8gf2tvdw0s3jn54khce6mua7l]+)([\\S]*)", Pattern.CASE_INSENSITIVE)
 
+    @Immutable
     data class Return(
         val type: Type,
         val hex: String,

app/src/main/java/com/vitorpamplona/amethyst/ui/MainActivity.kt

@@ -2,7 +2,6 @@ package com.vitorpamplona.amethyst.ui
 
 import android.content.Context
 import android.content.Intent
-import android.os.Build.VERSION.SDK_INT
 import android.os.Bundle
 import androidx.activity.compose.setContent
 import androidx.activity.result.contract.ActivityResultContracts
@@ -12,15 +11,8 @@ import androidx.compose.material.Surface
 import androidx.compose.ui.Modifier
 import androidx.fragment.app.FragmentActivity
 import androidx.lifecycle.viewmodel.compose.viewModel
-import coil.Coil
-import coil.ImageLoader
-import coil.decode.GifDecoder
-import coil.decode.ImageDecoderDecoder
-import coil.decode.SvgDecoder
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
-import com.vitorpamplona.amethyst.VideoCache
-import com.vitorpamplona.amethyst.service.HttpClient
 import com.vitorpamplona.amethyst.service.model.ChannelCreateEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMessageEvent
 import com.vitorpamplona.amethyst.service.model.ChannelMetadataEvent
@@ -49,23 +41,6 @@ class MainActivity : FragmentActivity() {
 
         val startingPage = uriToRoute(uri)
 
-        // Initializes video cache.
-        VideoCache.init(this.applicationContext)
-
-        Coil.setImageLoader {
-            ImageLoader.Builder(this).components {
-                if (SDK_INT >= 28) {
-                    add(ImageDecoderDecoder.Factory())
-                } else {
-                    add(GifDecoder.Factory())
-                }
-                add(SvgDecoder.Factory())
-            } // .logger(DebugLogger())
-                .okHttpClient { HttpClient.getHttpClient() }
-                .respectCacheHeaders(false)
-                .build()
-        }
-
         LocalPreferences.migrateSingleUserPrefs()
 
         setContent {
@@ -73,7 +48,7 @@ class MainActivity : FragmentActivity() {
                 // A surface container using the 'background' color from the theme
                 Surface(modifier = Modifier.fillMaxSize(), color = MaterialTheme.colors.background) {
                     val accountStateViewModel: AccountStateViewModel = viewModel {
-                        AccountStateViewModel()
+                        AccountStateViewModel(this@MainActivity)
                     }
 
                     AccountScreen(accountStateViewModel, startingPage)
@@ -92,7 +67,7 @@ class MainActivity : FragmentActivity() {
 
         // Only starts after login
         GlobalScope.launch(Dispatchers.IO) {
-            ServiceManager.start()
+            ServiceManager.start(this@MainActivity)
         }
 
         PushNotificationUtils().init(LocalPreferences.allSavedAccounts())

app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt

@@ -365,40 +365,8 @@ private fun RenderContentAsMarkdown(content: String, backgroundColor: Color, tag
     }
 
     nip19References.forEach {
-        var baseUser by remember(it) { mutableStateOf<User?>(null) }
-        var baseNote by remember(it) { mutableStateOf<Note?>(null) }
-
-        LaunchedEffect(key1 = it.hex) {
-            withContext(Dispatchers.IO) {
-                if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
-                    LocalCache.checkGetOrCreateNote(it.hex)?.let { note ->
-                        baseNote = note
-                    }
-                }
-
-                if (it.type == Nip19.Type.USER) {
-                    LocalCache.checkGetOrCreateUser(it.hex)?.let { user ->
-                        baseUser = user
-                    }
-                }
-            }
-        }
-
-        baseNote?.let {
-            val noteState by it.live().metadata.observeAsState()
-            if (noteState?.note?.event != null) {
-                LaunchedEffect(key1 = noteState) {
-                    refresh++
-                }
-            }
-        }
-        baseUser?.let {
-            val userState by it.live().metadata.observeAsState()
-            if (userState?.user?.info != null) {
-                LaunchedEffect(key1 = userState) {
-                    refresh++
-                }
-            }
+        ObserveNIP19(it) {
+            refresh++
         }
     }
 
@@ -423,6 +391,72 @@ private fun RenderContentAsMarkdown(content: String, backgroundColor: Color, tag
     }
 }
 
+@Composable
+fun ObserveNIP19(
+    it: Nip19.Return,
+    onRefresh: () -> Unit
+) {
+    if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
+        ObserveNIP19Event(it, onRefresh)
+    } else if (it.type == Nip19.Type.USER) {
+        ObserveNIP19User(it, onRefresh)
+    }
+}
+
+@Composable
+private fun ObserveNIP19Event(
+    it: Nip19.Return,
+    onRefresh: () -> Unit
+) {
+    var baseNote by remember(it) { mutableStateOf<Note?>(null) }
+
+    LaunchedEffect(key1 = it.hex) {
+        withContext(Dispatchers.IO) {
+            if (it.type == Nip19.Type.NOTE || it.type == Nip19.Type.EVENT || it.type == Nip19.Type.ADDRESS) {
+                LocalCache.checkGetOrCreateNote(it.hex)?.let { note ->
+                    baseNote = note
+                }
+            }
+        }
+    }
+
+    baseNote?.let { note ->
+        val noteState by note.live().metadata.observeAsState()
+        if (noteState?.note?.event != null) {
+            LaunchedEffect(key1 = noteState) {
+                onRefresh()
+            }
+        }
+    }
+}
+
+@Composable
+private fun ObserveNIP19User(
+    it: Nip19.Return,
+    onRefresh: () -> Unit
+) {
+    var baseUser by remember(it) { mutableStateOf<User?>(null) }
+
+    LaunchedEffect(key1 = it.hex) {
+        withContext(Dispatchers.IO) {
+            if (it.type == Nip19.Type.USER) {
+                LocalCache.checkGetOrCreateUser(it.hex)?.let { user ->
+                    baseUser = user
+                }
+            }
+        }
+    }
+
+    baseUser?.let { user ->
+        val userState by user.live().metadata.observeAsState()
+        if (userState?.user?.info != null) {
+            LaunchedEffect(key1 = userState) {
+                onRefresh()
+            }
+        }
+    }
+}
+
 private fun getDisplayNameAndNIP19FromTag(tag: String, tags: List<List<String>>): Pair<String, String>? {
     val matcher = tagIndex.matcher(tag)
     val (index, suffix) = try {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/ChatroomListKnownFeedFilter.kt

@@ -72,10 +72,7 @@ object ChatroomListKnownFeedFilter : AdditiveFeedFilter<Note>() {
 
             newRelevantPrivateMessages.forEach { newNotePair ->
                 oldList.forEach { oldNote ->
-                    val oldAuthor = oldNote.author?.pubkeyHex
-                    val oldRecipient = (oldNote.event as? PrivateDmEvent)?.verifiedRecipientPubKey()
-
-                    val oldRoom = if (oldAuthor == me.pubkeyHex) oldRecipient else oldAuthor
+                    val oldRoom = (oldNote.event as? PrivateDmEvent)?.talkingWith(me.pubkeyHex)
 
                     if (
                         (newNotePair.key == oldRoom) && (newNotePair.value.createdAt() ?: 0) > (oldNote.createdAt() ?: 0)
@@ -85,7 +82,7 @@ object ChatroomListKnownFeedFilter : AdditiveFeedFilter<Note>() {
                 }
             }
 
-            myNewList
+            sort(myNewList.toSet()).take(1000)
         }
 
         Log.d("Time", "${this.javaClass.simpleName} Modified Additive Feed in $elapsed with ${feed.size} objects")
@@ -132,13 +129,10 @@ object ChatroomListKnownFeedFilter : AdditiveFeedFilter<Note>() {
 
         val newRelevantPrivateMessages = mutableMapOf<String, Note>()
         newItems.filter { it.event is PrivateDmEvent }.forEach { newNote ->
-            val newAuthor = newNote.author?.pubkeyHex
-            val newRecipient = (newNote.event as? PrivateDmEvent)?.verifiedRecipientPubKey()
-
-            val roomUserHex = if (newAuthor == me.pubkeyHex) newRecipient else newAuthor
+            val roomUserHex = (newNote.event as? PrivateDmEvent)?.talkingWith(me.pubkeyHex)
             val roomUser = roomUserHex?.let { LocalCache.users[it] }
 
-            if (roomUserHex != null && (newAuthor == me.pubkeyHex || roomUserHex in followingKeySet || me.hasSentMessagesTo(roomUser)) && !account.isHidden(roomUserHex)) {
+            if (roomUserHex != null && (newNote.author?.pubkeyHex == me.pubkeyHex || roomUserHex in followingKeySet || me.hasSentMessagesTo(roomUser)) && !account.isHidden(roomUserHex)) {
                 val lastNote = newRelevantPrivateMessages.get(roomUserHex)
                 if (lastNote != null) {
                     if ((newNote.createdAt() ?: 0) > (lastNote.createdAt() ?: 0)) {

app/src/main/java/com/vitorpamplona/amethyst/ui/dal/HiddenAccountsFeedFilter.kt

@@ -7,4 +7,5 @@ object HiddenAccountsFeedFilter : FeedFilter<User>() {
     lateinit var account: Account
 
     override fun feed() = account.hiddenUsers()
+        .sortedWith(compareBy({ it.toBestDisplayName() }, { it.pubkeyHex }))
 }

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.navigation
 
+import android.content.Context
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -43,6 +44,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.font.FontWeight
@@ -335,6 +337,8 @@ fun ListContent(
         AccountBackupDialog(account, onClose = { backupDialogOpen = false })
     }
 
+    val context = LocalContext.current
+
     if (conectOrbotDialogOpen) {
         ConnectOrbotDialog(
             onClose = { conectOrbotDialogOpen = false },
@@ -342,7 +346,7 @@ fun ListContent(
                 conectOrbotDialogOpen = false
                 disconnectTorDialog = false
                 checked = true
-                enableTor(account, true, proxyPort)
+                enableTor(account, true, proxyPort, context = context)
             },
             proxyPort
         )
@@ -364,7 +368,7 @@ fun ListContent(
                     onClick = {
                         disconnectTorDialog = false
                         checked = false
-                        enableTor(account, false, proxyPort)
+                        enableTor(account, false, proxyPort, context)
                     }
                 ) {
                     Text(text = stringResource(R.string.yes))
@@ -386,13 +390,14 @@ fun ListContent(
 private fun enableTor(
     account: Account,
     checked: Boolean,
-    portNumber: MutableState<String>
+    portNumber: MutableState<String>,
+    context: Context
 ) {
     account.proxyPort = portNumber.value.toInt()
     account.proxy = HttpClient.initProxy(checked, "127.0.0.1", account.proxyPort)
     LocalPreferences.saveToEncryptedStorage(account)
     ServiceManager.pause()
-    ServiceManager.start()
+    ServiceManager.start(context)
 }
 
 @Composable
@@ -467,7 +472,7 @@ fun BottomContent(user: User, scaffoldState: ScaffoldState, nav: (String) -> Uni
         ) {
             Text(
                 modifier = Modifier.padding(start = 16.dp),
-                text = "v" + BuildConfig.VERSION_NAME,
+                text = "v" + BuildConfig.VERSION_NAME + "-" + BuildConfig.FLAVOR.uppercase(),
                 fontSize = 12.sp,
                 fontWeight = FontWeight.Bold
             )

app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/Routes.kt

@@ -13,6 +13,7 @@ import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.model.Account
 import com.vitorpamplona.amethyst.model.Note
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.ui.dal.AdditiveFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.ChatroomListKnownFeedFilter
 import com.vitorpamplona.amethyst.ui.dal.HomeNewThreadFeedFilter
@@ -127,17 +128,25 @@ open class LatestItem {
         if (newestItem == null) {
             newestItemPerAccount = newestItemPerAccount + Pair(
                 account.userProfile().pubkeyHex,
-                filter.feed().firstOrNull { it.createdAt() != null }
+                filterMore(filter.feed()).firstOrNull { it.createdAt() != null }
             )
         } else {
             newestItemPerAccount = newestItemPerAccount + Pair(
                 account.userProfile().pubkeyHex,
-                filter.sort(filter.applyFilter(newNotes) + newestItem).first()
+                filter.sort(filterMore(filter.applyFilter(newNotes)) + newestItem).first()
             )
         }
 
         return newestItemPerAccount[account.userProfile().pubkeyHex]
     }
+
+    open fun filterMore(newItems: Set<Note>): Set<Note> {
+        return newItems
+    }
+
+    open fun filterMore(newItems: List<Note>): List<Note> {
+        return newItems
+    }
 }
 
 object HomeLatestItem : LatestItem() {
@@ -180,10 +189,20 @@ object MessagesLatestItem : LatestItem() {
 
         val newestItem = updateNewestItem(newNotes, account, ChatroomListKnownFeedFilter)
 
-        val lastTime = cache.load("Room/${newestItem?.author?.pubkeyHex}")
+        val roomUserHex = (newestItem?.event as? PrivateDmEvent)?.talkingWith(account.userProfile().pubkeyHex)
+
+        val lastTime = cache.load("Room/$roomUserHex")
 
         return (newestItem?.createdAt() ?: 0) > lastTime
     }
+
+    override fun filterMore(newItems: Set<Note>): Set<Note> {
+        return newItems.filter { it.event is PrivateDmEvent }.toSet()
+    }
+
+    override fun filterMore(newItems: List<Note>): List<Note> {
+        return newItems.filter { it.event is PrivateDmEvent }
+    }
 }
 
 fun getRouteWithArguments(navController: NavHostController): String? {

app/src/main/java/com/vitorpamplona/amethyst/ui/note/MessageSetCompose.kt

@@ -27,6 +27,7 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.NotificationCache
 import com.vitorpamplona.amethyst.R
+import com.vitorpamplona.amethyst.service.model.PrivateDmEvent
 import com.vitorpamplona.amethyst.ui.screen.MessageSetCard
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.newItemBackgroundColor
@@ -99,9 +100,11 @@ fun MessageSetCompose(messageSetCard: MessageSetCard, routeForLastRead: String,
                 MessageIcon()
 
                 Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
+                    val routeForLastRead = "Room/${(baseNote.event as? PrivateDmEvent)?.talkingWith(loggedIn.pubkeyHex)}"
+
                     NoteCompose(
                         baseNote = baseNote,
-                        routeForLastRead = null,
+                        routeForLastRead = routeForLastRead,
                         isBoostedNote = true,
                         addMarginTop = false,
                         parentBackgroundColor = backgroundColor,

app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt

@@ -442,20 +442,7 @@ fun routeFor(note: Note, loggedIn: User): String? {
             return "Channel/${it.idHex}"
         }
     } else if (noteEvent is PrivateDmEvent) {
-        val replyAuthorBase =
-            (note.event as? PrivateDmEvent)
-                ?.verifiedRecipientPubKey()
-                ?.let { LocalCache.getOrCreateUser(it) }
-
-        var userToComposeOn = note.author!!
-
-        if (replyAuthorBase != null) {
-            if (note.author == loggedIn) {
-                userToComposeOn = replyAuthorBase
-            }
-        }
-
-        return "Room/${userToComposeOn.pubkeyHex}"
+        return "Room/${noteEvent.talkingWith(loggedIn.pubkeyHex)}"
     } else {
         return "Note/${note.idHex}"
     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/AccountStateViewModel.kt

@@ -1,5 +1,6 @@
 package com.vitorpamplona.amethyst.ui.screen
 
+import android.content.Context
 import androidx.lifecycle.ViewModel
 import com.vitorpamplona.amethyst.LocalPreferences
 import com.vitorpamplona.amethyst.ServiceManager
@@ -21,7 +22,7 @@ import nostr.postr.Persona
 import nostr.postr.bechToBytes
 import java.util.regex.Pattern
 
-class AccountStateViewModel() : ViewModel() {
+class AccountStateViewModel(val context: Context) : ViewModel() {
     private val _accountContent = MutableStateFlow<AccountState>(AccountState.LoggedOff)
     val accountContent = _accountContent.asStateFlow()
 
@@ -85,7 +86,7 @@ class AccountStateViewModel() : ViewModel() {
         }
         val scope = CoroutineScope(Job() + Dispatchers.IO)
         scope.launch {
-            ServiceManager.start(account)
+            ServiceManager.start(account, context)
         }
         GlobalScope.launch(Dispatchers.Main) {
             account.saveable.observeForever(saveListener)

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/ThreadFeedView.kt

@@ -307,7 +307,7 @@ fun NoteMaster(
             if (noteEvent is BadgeDefinitionEvent) {
                 BadgeDisplay(baseNote = note)
             } else if (noteEvent is LongTextNoteEvent) {
-                Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp)) {
+                Row(modifier = Modifier.padding(start = 12.dp, end = 12.dp, top = 10.dp, bottom = 12.dp)) {
                     Column {
                         noteEvent.image()?.let {
                             AsyncImage(
@@ -337,7 +337,8 @@ fun NoteMaster(
                                 text = it,
                                 modifier = Modifier
                                     .fillMaxWidth()
-                                    .padding(top = 10.dp)
+                                    .padding(top = 10.dp),
+                                color = Color.Gray
                             )
                         }
                     }

app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/HiddenUsersScreen.kt

@@ -11,12 +11,17 @@ import androidx.compose.material.Tab
 import androidx.compose.material.TabRow
 import androidx.compose.material.Text
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.DisposableEffect
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.livedata.observeAsState
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalLifecycleOwner
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
+import androidx.lifecycle.Lifecycle
+import androidx.lifecycle.LifecycleEventObserver
 import androidx.lifecycle.viewmodel.compose.viewModel
 import com.vitorpamplona.amethyst.R
 import com.vitorpamplona.amethyst.ui.dal.HiddenAccountsFeedFilter
@@ -30,10 +35,34 @@ fun HiddenUsersScreen(accountViewModel: AccountViewModel, nav: (String) -> Unit)
     val accountState by accountViewModel.accountLiveData.observeAsState()
     val account = accountState?.account
 
+    val lifeCycleOwner = LocalLifecycleOwner.current
+    val feedViewModel: NostrHiddenAccountsFeedViewModel = viewModel()
+
     if (account != null) {
         HiddenAccountsFeedFilter.account = account
 
-        val feedViewModel: NostrHiddenAccountsFeedViewModel = viewModel()
+        LaunchedEffect(accountViewModel) {
+            HiddenAccountsFeedFilter.account = account
+            feedViewModel.invalidateData()
+        }
+
+        DisposableEffect(accountViewModel) {
+            val observer = LifecycleEventObserver { _, event ->
+                if (event == Lifecycle.Event.ON_RESUME) {
+                    println("Hidden Users Start")
+                    HiddenAccountsFeedFilter.account = account
+                    feedViewModel.invalidateData()
+                }
+                if (event == Lifecycle.Event.ON_PAUSE) {
+                    println("Hidden Users Stop")
+                }
+            }
+
+            lifeCycleOwner.lifecycle.addObserver(observer)
+            onDispose {
+                lifeCycleOwner.lifecycle.removeObserver(observer)
+            }
+        }
 
         Column(Modifier.fillMaxHeight()) {
             Column(modifier = Modifier.padding(start = 10.dp, end = 10.dp)) {