v0.90.3

amethyst/build.gradle

@@ -16,8 +16,8 @@ android {
         applicationId "com.vitorpamplona.amethyst"
         minSdk libs.versions.android.minSdk.get().toInteger()
         targetSdk libs.versions.android.targetSdk.get().toInteger()
-        versionCode 399
-        versionName "0.90.2"
+        versionCode 400
+        versionName "0.90.3"
         buildConfigField "String", "RELEASE_NOTES_ID", "\"5d9a4fd0aba7ffefbf989152479237bd182578e58e59eb2fbfe94f6de8011803\""
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushDistributorHandler.kt

@@ -42,9 +42,8 @@ object PushDistributorHandler : PushDistributorActions {
     private val unifiedPush: UnifiedPush = UnifiedPush
 
     private var endpointInternal = ""
-    val endpoint = endpointInternal
 
-    fun getSavedEndpoint() = endpoint
+    fun getSavedEndpoint() = endpointInternal
 
     fun setEndpoint(newEndpoint: String) {
         endpointInternal = newEndpoint

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushMessageReceiver.kt

@@ -22,7 +22,6 @@ package com.vitorpamplona.amethyst.service.notifications
 
 import android.app.NotificationManager
 import android.content.Context
-import android.content.Intent
 import android.util.Log
 import android.util.LruCache
 import androidx.core.content.ContextCompat
@@ -52,11 +51,13 @@ class PushMessageReceiver : MessagingReceiver() {
         message: ByteArray,
         instance: String,
     ) {
-        val messageStr = String(message)
-        Log.d(TAG, "New message ${message.decodeToString()} for Instance: $instance")
+        val messageStr = message.decodeToString()
+        Log.d(TAG, "New message $messageStr for Instance: $instance")
         scope.launch {
             try {
-                parseMessage(messageStr)?.let { receiveIfNew(it) }
+                parseMessage(messageStr)?.let {
+                    receiveIfNew(it)
+                }
             } catch (e: Exception) {
                 if (e is CancellationException) throw e
                 Log.d(TAG, "Message could not be parsed: ${e.message}")
@@ -83,26 +84,20 @@ class PushMessageReceiver : MessagingReceiver() {
         endpoint: String,
         instance: String,
     ) {
-        Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance")
         val sanitizedEndpoint = endpoint.dropLast(5)
-        pushHandler.setEndpoint(sanitizedEndpoint)
-        scope.launch(Dispatchers.IO) {
-            RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
-            notificationManager().getOrCreateZapChannel(appContext)
-            notificationManager().getOrCreateDMChannel(appContext)
+        if (sanitizedEndpoint != pushHandler.getSavedEndpoint()) {
+            Log.d(TAG, "New endpoint provided:- $endpoint for Instance: $instance ${pushHandler.getSavedEndpoint()} $sanitizedEndpoint")
+            pushHandler.setEndpoint(sanitizedEndpoint)
+            scope.launch(Dispatchers.IO) {
+                RegisterAccounts(LocalPreferences.allSavedAccounts()).go(sanitizedEndpoint)
+                notificationManager().getOrCreateZapChannel(appContext)
+                notificationManager().getOrCreateDMChannel(appContext)
+            }
+        } else {
+            Log.d(TAG, "Same endpoint provided:- $endpoint for Instance: $instance $sanitizedEndpoint")
         }
     }
 
-    override fun onReceive(
-        context: Context,
-        intent: Intent,
-    ) {
-        val intentData = intent.dataString
-        val intentAction = intent.action.toString()
-        Log.d(TAG, "Intent Data:- $intentData Intent Action: $intentAction")
-        super.onReceive(context, intent)
-    }
-
     override fun onRegistrationFailed(
         context: Context,
         instance: String,
@@ -115,7 +110,7 @@ class PushMessageReceiver : MessagingReceiver() {
         context: Context,
         instance: String,
     ) {
-        val removedEndpoint = pushHandler.endpoint
+        val removedEndpoint = pushHandler.getSavedEndpoint()
         Log.d(TAG, "Endpoint: $removedEndpoint removed for Instance: $instance")
         Log.d(TAG, "App is unregistered. ")
         pushHandler.forceRemoveDistributor(context)

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/service/notifications/PushNotificationUtils.kt

@@ -34,6 +34,9 @@ object PushNotificationUtils {
         }
         try {
             if (pushHandler.savedDistributorExists()) {
+                val currentDistributor = PushDistributorHandler.getSavedDistributor()
+                PushDistributorHandler.saveDistributor(currentDistributor)
+
                 RegisterAccounts(accounts).go(pushHandler.getSavedEndpoint())
             }
         } catch (e: Exception) {

amethyst/src/fdroid/java/com/vitorpamplona/amethyst/ui/components/SelectNotificationProvider.kt

@@ -150,9 +150,6 @@ fun SelectNotificationProvider(sharedPreferencesViewModel: SharedPreferencesView
                         )
                     }
                 }
-            } else {
-                val currentDistributor = PushDistributorHandler.getSavedDistributor()
-                PushDistributorHandler.saveDistributor(currentDistributor)
             }
         }
     }

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/EventNotificationConsumer.kt

@@ -44,12 +44,17 @@ import com.vitorpamplona.quartz.events.SealedGossipEvent
 import com.vitorpamplona.quartz.signers.NostrSigner
 import com.vitorpamplona.quartz.utils.TimeUtils
 import java.math.BigDecimal
+import kotlin.coroutines.cancellation.CancellationException
 
 class EventNotificationConsumer(
     private val applicationContext: Context,
 ) {
+    companion object {
+        const val TAG = "EventNotificationConsumer"
+    }
+
     suspend fun consume(event: GiftWrapEvent) {
-        Log.d("EventNotificationConsumer", "New Notification Arrived")
+        Log.d(TAG, "New Notification Arrived")
         if (!LocalCache.justVerify(event)) return
         if (!notificationManager().areNotificationsEnabled()) return
 
@@ -57,14 +62,15 @@ class EventNotificationConsumer(
         // Test with all logged in accounts
         var matchAccount = false
         LocalPreferences.allSavedAccounts().forEach {
-            if (!matchAccount && it.hasPrivKey || it.loggedInWithExternalSigner) {
+            if (!matchAccount && (it.hasPrivKey || it.loggedInWithExternalSigner)) {
                 LocalPreferences.loadCurrentAccountFromEncryptedStorage(it.npub)?.let { acc ->
-                    Log.d("EventNotificationConsumer", "New Notification Testing if for ${it.npub}")
+                    Log.d(TAG, "New Notification Testing if for ${it.npub}")
                     try {
                         consumeIfMatchesAccount(event, acc)
                         matchAccount = true
                     } catch (e: Exception) {
-                        // Not for this account.
+                        if (e is CancellationException) throw e
+                        Log.d(TAG, "Message was not for user ${it.npub}: ${e.message}")
                     }
                 }
             }
@@ -79,26 +85,23 @@ class EventNotificationConsumer(
         // Right now it only registers if Amber has already approved this signature
         val signer = account.createSigner()
 
-        pushWrappedEvent.unwrap(signer) { notificationEvent ->
+        pushWrappedEvent.unwrapThrowing(signer) { notificationEvent ->
             val consumed = LocalCache.hasConsumed(notificationEvent)
             val verified = LocalCache.justVerify(notificationEvent)
-            Log.d("EventNotificationConsumer", "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${signer.pubKey} consumed= $consumed && verified= $verified")
+            Log.d(TAG, "New Notification ${notificationEvent.kind} ${notificationEvent.id} Arrived for ${signer.pubKey} consumed= $consumed && verified= $verified")
             if (!consumed && verified) {
-                Log.d("EventNotificationConsumer", "New Notification was verified")
+                Log.d(TAG, "New Notification was verified")
                 unwrapAndConsume(notificationEvent, signer) { innerEvent ->
-
-                    Log.d("EventNotificationConsumer", "Unwrapped consume $consumed ${innerEvent.javaClass.simpleName}")
-                    if (!consumed) {
-                        if (innerEvent is PrivateDmEvent) {
-                            Log.d("EventNotificationConsumer", "New Nip-04 DM to Notify")
-                            notify(innerEvent, signer, account)
-                        } else if (innerEvent is LnZapEvent) {
-                            Log.d("EventNotificationConsumer", "New Zap to Notify")
-                            notify(innerEvent, signer, account)
-                        } else if (innerEvent is ChatMessageEvent) {
-                            Log.d("EventNotificationConsumer", "New ChatMessage to Notify")
-                            notify(innerEvent, signer, account)
-                        }
+                    Log.d(TAG, "Unwrapped consume $consumed ${innerEvent.javaClass.simpleName}")
+                    if (innerEvent is PrivateDmEvent) {
+                        Log.d(TAG, "New Nip-04 DM to Notify")
+                        notify(innerEvent, signer, account)
+                    } else if (innerEvent is LnZapEvent) {
+                        Log.d(TAG, "New Zap to Notify")
+                        notify(innerEvent, signer, account)
+                    } else if (innerEvent is ChatMessageEvent) {
+                        Log.d(TAG, "New ChatMessage to Notify")
+                        notify(innerEvent, signer, account)
                     }
                 }
             }
@@ -147,6 +150,7 @@ class EventNotificationConsumer(
             // old event being re-broadcasted
             event.pubKey != signer.pubKey
         ) { // from the user
+            Log.d(TAG, "Notifying")
             val myUser = LocalCache.getUserIfExists(signer.pubKey) ?: return
             val chatNote = LocalCache.getNoteIfExists(event.id) ?: return
             val chatRoom = event.chatroomKey(signer.pubKey)
@@ -251,41 +255,41 @@ class EventNotificationConsumer(
         signer: NostrSigner,
         acc: AccountSettings,
     ) {
-        Log.d("EventNotificationConsumer", "Notify Start ${event.toNostrUri()}")
+        Log.d(TAG, "Notify Start ${event.toNostrUri()}")
         val noteZapEvent = LocalCache.getNoteIfExists(event.id) ?: return
 
-        Log.d("EventNotificationConsumer", "Notify Not Notified Yet")
+        Log.d(TAG, "Notify Not Notified Yet")
 
         // old event being re-broadcast
         if (event.createdAt < TimeUtils.fifteenMinutesAgo()) return
 
-        Log.d("EventNotificationConsumer", "Notify Not an old event")
+        Log.d(TAG, "Notify Not an old event")
 
         val noteZapRequest = event.zapRequest?.id?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
         val noteZapped =
             event.zappedPost().firstOrNull()?.let { LocalCache.checkGetOrCreateNote(it) } ?: return
 
-        Log.d("EventNotificationConsumer", "Notify ZapRequest $noteZapRequest zapped $noteZapped")
+        Log.d(TAG, "Notify ZapRequest $noteZapRequest zapped $noteZapped")
 
         if ((event.amount ?: BigDecimal.ZERO) < BigDecimal.TEN) return
 
-        Log.d("EventNotificationConsumer", "Notify Amount Bigger than 10")
+        Log.d(TAG, "Notify Amount Bigger than 10")
 
         if (event.isTaggedUser(signer.pubKey)) {
             val amount = showAmount(event.amount)
 
-            Log.d("EventNotificationConsumer", "Notify Amount $amount")
+            Log.d(TAG, "Notify Amount $amount")
 
             (noteZapRequest.event as? LnZapRequestEvent)?.let { event ->
                 decryptZapContentAuthor(noteZapRequest, signer) {
-                    Log.d("EventNotificationConsumer", "Notify Decrypted if Private Zap ${event.id}")
+                    Log.d(TAG, "Notify Decrypted if Private Zap ${event.id}")
 
                     val author = LocalCache.getOrCreateUser(it.pubKey)
                     val senderInfo = Pair(author, it.content.ifBlank { null })
 
                     if (noteZapped.event?.content() != null) {
                         decryptContent(noteZapped, signer) {
-                            Log.d("EventNotificationConsumer", "Notify Decrypted if Private Note")
+                            Log.d(TAG, "Notify Decrypted if Private Note")
 
                             val zappedContent = it.split("\n").get(0)
 
@@ -311,7 +315,7 @@ class EventNotificationConsumer(
                             val userPicture = senderInfo.first.profilePicture()
                             val noteUri = "nostr:Notifications"
 
-                            Log.d("EventNotificationConsumer", "Notify ${event.id} $content $title $noteUri")
+                            Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
 
                             notificationManager()
                                 .sendZapNotification(
@@ -326,7 +330,7 @@ class EventNotificationConsumer(
                         }
                     } else {
                         // doesn't have a base note to refer to.
-                        Log.d("EventNotificationConsumer", "Notify Zapped note not available")
+                        Log.d(TAG, "Notify Zapped note not available")
 
                         val user = senderInfo.first.toBestDisplayName()
                         var title = stringRes(applicationContext, R.string.app_notification_zaps_channel_message, amount)
@@ -342,7 +346,7 @@ class EventNotificationConsumer(
                         val userPicture = senderInfo.first.profilePicture()
                         val noteUri = "nostr:Notifications"
 
-                        Log.d("EventNotificationConsumer", "Notify ${event.id} $content $title $noteUri")
+                        Log.d(TAG, "Notify ${event.id} $content $title $noteUri")
 
                         notificationManager()
                             .sendZapNotification(

amethyst/src/main/java/com/vitorpamplona/amethyst/service/notifications/RegisterAccounts.kt

@@ -160,6 +160,7 @@ class RegisterAccounts(
             val client = HttpClientManager.getHttpClient()
 
             val isSucess = client.newCall(request).execute().use { it.isSuccessful }
+            Log.i(tag, "Server registration $isSucess")
         } catch (e: java.lang.Exception) {
             if (e is CancellationException) throw e
             Log.e(tag, "Unable to register with push server", e)

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/JoinUserOrChannelView.kt

@@ -75,12 +75,12 @@ import com.vitorpamplona.amethyst.model.LocalCache
 import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
-import com.vitorpamplona.amethyst.ui.note.ChannelName
 import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.SearchIcon
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SearchBarViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.ChannelName
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/actions/relays/RelayInformationDialog.kt

@@ -55,11 +55,11 @@ import com.vitorpamplona.amethyst.ui.actions.CrossfadeIfEnabled
 import com.vitorpamplona.amethyst.ui.components.ClickableEmail
 import com.vitorpamplona.amethyst.ui.components.ClickableUrl
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
-import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.RenderRelayIcon
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.note.timeAgo
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LoadUser
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.DoubleVertSpacer

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

@@ -85,10 +85,10 @@ import com.vitorpamplona.amethyst.model.checkForHashtagWithIcon
 import com.vitorpamplona.amethyst.service.CachedRichTextParser
 import com.vitorpamplona.amethyst.ui.actions.CrossfadeIfEnabled
 import com.vitorpamplona.amethyst.ui.components.markdown.RenderContentAsMarkdown
-import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
 import com.vitorpamplona.amethyst.ui.note.toShortenHex
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LoadUser
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.mockAccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.HalfVertPadding
 import com.vitorpamplona.amethyst.ui.theme.inlinePlaceholder

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/layouts/ChatHeaderLayout.kt

@@ -40,8 +40,8 @@ import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.vitorpamplona.amethyst.R
-import com.vitorpamplona.amethyst.ui.note.NewItemsBubble
 import com.vitorpamplona.amethyst.ui.note.elements.TimeAgo
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.NewItemsBubble
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt

@@ -100,7 +100,6 @@ import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.LoadAddressableNote
 import com.vitorpamplona.amethyst.ui.note.LoadChannel
 import com.vitorpamplona.amethyst.ui.note.LoadCityName
-import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures
 import com.vitorpamplona.amethyst.ui.note.NoteAuthorPicture
 import com.vitorpamplona.amethyst.ui.note.SearchIcon
@@ -124,6 +123,7 @@ import com.vitorpamplona.amethyst.ui.screen.loggedIn.HashtagActionOptions
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.SpinnerSelectionDialog
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LoadRoom
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LoadRoomByAuthor
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LoadUser
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LongChannelHeader
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LongRoomHeader
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.RoomNameOnlyDisplay

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/UserProfilePicture.kt

@@ -43,6 +43,7 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.components.RobohashAsyncImage
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.LoadUser
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.quartz.events.ChatroomKey
 

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

@@ -77,7 +77,6 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.service.NostrSearchEventOrUserDataSource
 import com.vitorpamplona.amethyst.service.checkNotInMainThread
 import com.vitorpamplona.amethyst.ui.note.AboutDisplay
-import com.vitorpamplona.amethyst.ui.note.ChannelName
 import com.vitorpamplona.amethyst.ui.note.ClearTextIcon
 import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.NoteCompose
@@ -85,6 +84,7 @@ import com.vitorpamplona.amethyst.ui.note.SearchIcon
 import com.vitorpamplona.amethyst.ui.note.UserCompose
 import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
 import com.vitorpamplona.amethyst.ui.note.elements.ObserveRelayListForSearchAndDisplayIfNotFound
+import com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms.ChannelName
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChannelScreen.kt

@@ -122,7 +122,6 @@ import com.vitorpamplona.amethyst.ui.components.SensitivityWarning
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
 import com.vitorpamplona.amethyst.ui.components.ZoomableContentView
 import com.vitorpamplona.amethyst.ui.navigation.routeFor
-import com.vitorpamplona.amethyst.ui.note.ChatroomMessageCompose
 import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
 import com.vitorpamplona.amethyst.ui.note.LikeReaction
 import com.vitorpamplona.amethyst.ui.note.LoadChannel

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomFeedView.kt

@@ -43,7 +43,6 @@ import com.vitorpamplona.amethyst.ui.feeds.FeedError
 import com.vitorpamplona.amethyst.ui.feeds.FeedState
 import com.vitorpamplona.amethyst.ui.feeds.LoadingFeed
 import com.vitorpamplona.amethyst.ui.feeds.RefresheableBox
-import com.vitorpamplona.amethyst.ui.note.ChatroomMessageCompose
 import com.vitorpamplona.amethyst.ui.screen.FeedViewModel
 import com.vitorpamplona.amethyst.ui.screen.SaveableFeedState
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomHeaderCompose.kt

@@ -18,7 +18,7 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.amethyst.ui.note
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Box
@@ -66,6 +66,13 @@ import com.vitorpamplona.amethyst.ui.actions.CrossfadeIfEnabled
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.RobohashFallbackAsyncImage
 import com.vitorpamplona.amethyst.ui.layouts.ChatHeaderLayout
+import com.vitorpamplona.amethyst.ui.note.BlankNote
+import com.vitorpamplona.amethyst.ui.note.LoadChannel
+import com.vitorpamplona.amethyst.ui.note.LoadDecryptedContentOrNull
+import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures
+import com.vitorpamplona.amethyst.ui.note.ObserveDraftEvent
+import com.vitorpamplona.amethyst.ui.note.UsernameDisplay
+import com.vitorpamplona.amethyst.ui.note.timeAgo
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.AccountPictureModifier

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomListFeedView.kt

@@ -40,7 +40,6 @@ import com.vitorpamplona.amethyst.ui.feeds.FeedError
 import com.vitorpamplona.amethyst.ui.feeds.FeedState
 import com.vitorpamplona.amethyst.ui.feeds.LoadingFeed
 import com.vitorpamplona.amethyst.ui.feeds.RefresheableBox
-import com.vitorpamplona.amethyst.ui.note.ChatroomHeaderCompose
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.theme.DividerThickness
 import com.vitorpamplona.amethyst.ui.theme.FeedPadding

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomMessageCompose.kt

@@ -18,9 +18,10 @@
  * AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
  * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-package com.vitorpamplona.amethyst.ui.note
+package com.vitorpamplona.amethyst.ui.screen.loggedIn.chatrooms
 
 import androidx.compose.foundation.ExperimentalFoundationApi
+import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.combinedClickable
 import androidx.compose.foundation.layout.Arrangement
@@ -62,6 +63,20 @@ import com.vitorpamplona.amethyst.model.User
 import com.vitorpamplona.amethyst.ui.components.CreateTextWithEmoji
 import com.vitorpamplona.amethyst.ui.components.SensitivityWarning
 import com.vitorpamplona.amethyst.ui.components.TranslatableRichTextViewer
+import com.vitorpamplona.amethyst.ui.note.DisplayDraftChat
+import com.vitorpamplona.amethyst.ui.note.FollowingIcon
+import com.vitorpamplona.amethyst.ui.note.InnerUserPicture
+import com.vitorpamplona.amethyst.ui.note.LikeReaction
+import com.vitorpamplona.amethyst.ui.note.LoadDecryptedContentOrNull
+import com.vitorpamplona.amethyst.ui.note.NoteQuickActionMenu
+import com.vitorpamplona.amethyst.ui.note.ObserveDraftEvent
+import com.vitorpamplona.amethyst.ui.note.RelayBadgesHorizontal
+import com.vitorpamplona.amethyst.ui.note.ReplyReaction
+import com.vitorpamplona.amethyst.ui.note.WatchBlockAndReport
+import com.vitorpamplona.amethyst.ui.note.WatchNoteEvent
+import com.vitorpamplona.amethyst.ui.note.WatchUserFollows
+import com.vitorpamplona.amethyst.ui.note.ZapReaction
+import com.vitorpamplona.amethyst.ui.note.timeAgoShort
 import com.vitorpamplona.amethyst.ui.screen.loggedIn.AccountViewModel
 import com.vitorpamplona.amethyst.ui.stringRes
 import com.vitorpamplona.amethyst.ui.theme.ChatBubbleMaxSizeModifier
@@ -71,7 +86,7 @@ import com.vitorpamplona.amethyst.ui.theme.ChatPaddingInnerQuoteModifier
 import com.vitorpamplona.amethyst.ui.theme.ChatPaddingModifier
 import com.vitorpamplona.amethyst.ui.theme.DoubleHorzSpacer
 import com.vitorpamplona.amethyst.ui.theme.Font12SP
-import com.vitorpamplona.amethyst.ui.theme.HalfHalfTopPadding
+import com.vitorpamplona.amethyst.ui.theme.HalfHalfVertPadding
 import com.vitorpamplona.amethyst.ui.theme.ReactionRowHeightChat
 import com.vitorpamplona.amethyst.ui.theme.RowColSpacing
 import com.vitorpamplona.amethyst.ui.theme.RowColSpacing5dp
@@ -332,7 +347,7 @@ fun ChatBubbleLayout(
                         Row(
                             verticalAlignment = Alignment.CenterVertically,
                             horizontalArrangement = alignment,
-                            modifier = HalfHalfTopPadding.clickable(onClick = onAuthorClick),
+                            modifier = HalfHalfVertPadding.clickable(onClick = onAuthorClick),
                         ) {
                             drawAuthorLine()
                         }
@@ -389,7 +404,8 @@ private fun BubblePreview() {
                             modifier =
                                 Modifier
                                     .size(Size20dp)
-                                    .clip(CircleShape),
+                                    .clip(CircleShape)
+                                    .background(Color.LightGray),
                         )
                     },
                     name = {

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedIn/chatrooms/ChatroomScreen.kt

@@ -93,11 +93,8 @@ import com.vitorpamplona.amethyst.ui.actions.ServerOption
 import com.vitorpamplona.amethyst.ui.actions.UploadFromGallery
 import com.vitorpamplona.amethyst.ui.actions.UrlUserTagTransformation
 import com.vitorpamplona.amethyst.ui.note.ClickableUserPicture
-import com.vitorpamplona.amethyst.ui.note.DisplayRoomSubject
-import com.vitorpamplona.amethyst.ui.note.DisplayUserSetAsSubject
 import com.vitorpamplona.amethyst.ui.note.IncognitoIconOff
 import com.vitorpamplona.amethyst.ui.note.IncognitoIconOn
-import com.vitorpamplona.amethyst.ui.note.LoadUser
 import com.vitorpamplona.amethyst.ui.note.NonClickableUserPictures
 import com.vitorpamplona.amethyst.ui.note.QuickActionAlertDialog
 import com.vitorpamplona.amethyst.ui.note.UserCompose

amethyst/src/main/java/com/vitorpamplona/amethyst/ui/theme/Shape.kt

@@ -107,7 +107,7 @@ val HalfStartPadding = Modifier.padding(start = 5.dp)
 val StdStartPadding = Modifier.padding(start = 10.dp)
 val StdTopPadding = Modifier.padding(top = 10.dp)
 val HalfTopPadding = Modifier.padding(top = 5.dp)
-val HalfHalfTopPadding = Modifier.padding(top = 3.dp)
+val HalfHalfVertPadding = Modifier.padding(vertical = 3.dp)
 
 val HalfPadding = Modifier.padding(5.dp)
 val StdPadding = Modifier.padding(10.dp)

quartz/src/main/java/com/vitorpamplona/quartz/crypto/nip44/Nip44.kt

@@ -20,7 +20,6 @@
  */
 package com.vitorpamplona.quartz.crypto.nip44
 
-import android.util.Log
 import com.vitorpamplona.quartz.crypto.nip04.Nip04
 import com.vitorpamplona.quartz.events.Event
 import fr.acinq.secp256k1.Secp256k1
@@ -85,42 +84,41 @@ class Nip44(
         json: String,
         privateKey: ByteArray,
         pubKey: ByteArray,
-    ): String? =
-        try {
-            val info = Event.mapper.readValue(json, EncryptedInfoString::class.java)
+    ): String? {
+        val info = Event.mapper.readValue(json, EncryptedInfoString::class.java)
 
-            when (info.v) {
-                Nip04.EncryptedInfo.V -> {
-                    val encryptedInfo =
-                        Nip04.EncryptedInfo(
-                            ciphertext = Base64.getDecoder().decode(info.ciphertext),
-                            nonce = Base64.getDecoder().decode(info.nonce),
-                        )
-                    nip04.decrypt(encryptedInfo, privateKey, pubKey)
-                }
-                Nip44v1.EncryptedInfo.V -> {
-                    val encryptedInfo =
-                        Nip44v1.EncryptedInfo(
-                            ciphertext = Base64.getDecoder().decode(info.ciphertext),
-                            nonce = Base64.getDecoder().decode(info.nonce),
-                        )
-                    v1.decrypt(encryptedInfo, privateKey, pubKey)
-                }
-                Nip44v2.EncryptedInfo.V -> {
-                    val encryptedInfo =
-                        Nip44v2.EncryptedInfo(
-                            ciphertext = Base64.getDecoder().decode(info.ciphertext),
-                            nonce = Base64.getDecoder().decode(info.nonce),
-                            mac = Base64.getDecoder().decode(info.mac),
-                        )
-                    v2.decrypt(encryptedInfo, privateKey, pubKey)
-                }
-                else -> null
+        return when (info.v) {
+            Nip04.EncryptedInfo.V -> {
+                val encryptedInfo =
+                    Nip04.EncryptedInfo(
+                        ciphertext = Base64.getDecoder().decode(info.ciphertext),
+                        nonce = Base64.getDecoder().decode(info.nonce),
+                    )
+                nip04.decrypt(encryptedInfo, privateKey, pubKey)
             }
-        } catch (e: Exception) {
-            Log.e("CryptoUtils", "NIP44: Unable to find version and decrypt $json", e)
-            null
+
+            Nip44v1.EncryptedInfo.V -> {
+                val encryptedInfo =
+                    Nip44v1.EncryptedInfo(
+                        ciphertext = Base64.getDecoder().decode(info.ciphertext),
+                        nonce = Base64.getDecoder().decode(info.nonce),
+                    )
+                v1.decrypt(encryptedInfo, privateKey, pubKey)
+            }
+
+            Nip44v2.EncryptedInfo.V -> {
+                val encryptedInfo =
+                    Nip44v2.EncryptedInfo(
+                        ciphertext = Base64.getDecoder().decode(info.ciphertext),
+                        nonce = Base64.getDecoder().decode(info.nonce),
+                        mac = Base64.getDecoder().decode(info.mac),
+                    )
+                v2.decrypt(encryptedInfo, privateKey, pubKey)
+            }
+
+            else -> null
         }
+    }
 
     fun decryptNIP44FromBase64(
         payload: String,
@@ -129,18 +127,13 @@ class Nip44(
     ): String? {
         if (payload.isEmpty()) return null
 
-        return try {
-            val byteArray = Base64.getDecoder().decode(payload)
+        val byteArray = Base64.getDecoder().decode(payload)
 
-            when (byteArray[0].toInt()) {
-                Nip04.EncryptedInfo.V -> nip04.decrypt(payload, privateKey, pubKey)
-                Nip44v1.EncryptedInfo.V -> v1.decrypt(payload, privateKey, pubKey)
-                Nip44v2.EncryptedInfo.V -> v2.decrypt(payload, privateKey, pubKey)
-                else -> null
-            }
-        } catch (e: Exception) {
-            Log.e("CryptoUtils", "NIP44: Unable to find version and decrypt $payload", e)
-            null
+        return when (byteArray[0].toInt()) {
+            Nip04.EncryptedInfo.V -> nip04.decrypt(payload, privateKey, pubKey)
+            Nip44v1.EncryptedInfo.V -> v1.decrypt(payload, privateKey, pubKey)
+            Nip44v2.EncryptedInfo.V -> v2.decrypt(payload, privateKey, pubKey)
+            else -> null
         }
     }
 }

quartz/src/main/java/com/vitorpamplona/quartz/events/GiftWrapEvent.kt

@@ -72,27 +72,34 @@ class GiftWrapEvent(
         onReady: (Event) -> Unit,
     ) = unwrap(signer, onReady)
 
+    fun unwrapThrowing(
+        signer: NostrSigner,
+        onReady: (Event) -> Unit,
+    ) {
+        plainContent(signer) { giftStr ->
+            val gift =
+                try {
+                    fromJson(giftStr)
+                } catch (e: Exception) {
+                    Log.w("GiftWrapEvent", "Couldn't Parse the content " + this.toNostrUri() + " " + giftStr)
+                    return@plainContent
+                }
+
+            if (gift is WrappedEvent) {
+                gift.host = HostStub(this.id, this.pubKey, this.kind)
+            }
+            innerEventId = gift.id
+
+            onReady(gift)
+        }
+    }
+
     fun unwrap(
         signer: NostrSigner,
         onReady: (Event) -> Unit,
     ) {
         try {
-            plainContent(signer) { giftStr ->
-                val gift =
-                    try {
-                        fromJson(giftStr)
-                    } catch (e: Exception) {
-                        Log.w("GiftWrapEvent", "Couldn't Parse the content " + this.toNostrUri() + " " + giftStr)
-                        return@plainContent
-                    }
-
-                if (gift is WrappedEvent) {
-                    gift.host = HostStub(this.id, this.pubKey, this.kind)
-                }
-                innerEventId = gift.id
-
-                onReady(gift)
-            }
+            unwrapThrowing(signer, onReady)
         } catch (e: Exception) {
             Log.w("GiftWrapEvent", "Couldn't Decrypt the content " + this.toNostrUri())
         }