diff --git a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt index 4d3883aa..e21900ff 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/EmojiReactionRepositoryImpl.kt @@ -19,6 +19,7 @@ package dev.octoshrimpy.quik.repository import android.content.Context +import com.klinker.android.send_message.Utils import com.squareup.moshi.Moshi import dev.octoshrimpy.quik.manager.KeyManager import dev.octoshrimpy.quik.model.EmojiReaction @@ -251,6 +252,17 @@ class EmojiReactionRepositoryImpl @Inject constructor( return null } + /** + * The address to attribute a reaction to. For incoming reactions this is the message sender; + * for our own outgoing reactions [Message.address] is the recipient, so use our own number + * instead so the reaction shows as coming from us. + */ + private fun reactionSenderAddress(reactionMessage: Message): String = + if (reactionMessage.isMe()) + Utils.getMyPhoneNumber(context).takeUnless { it.isNullOrEmpty() } ?: reactionMessage.address + else + reactionMessage.address + private fun removeEmojiReaction( reactionMessage: Message, reaction: ParsedEmojiReaction, @@ -262,8 +274,9 @@ class EmojiReactionRepositoryImpl @Inject constructor( return } + val senderAddress = reactionSenderAddress(reactionMessage) val existingReaction = targetMessage.emojiReactions.find { candidate -> - candidate.senderAddress == reactionMessage.address && candidate.emoji == reaction.emoji + candidate.senderAddress == senderAddress && candidate.emoji == reaction.emoji } if (existingReaction != null) { @@ -291,7 +304,7 @@ class EmojiReactionRepositoryImpl @Inject constructor( val reaction = EmojiReaction().apply { id = keyManager.newId() reactionMessageId = reactionMessage.id - senderAddress = reactionMessage.address + senderAddress = reactionSenderAddress(reactionMessage) emoji = parsedReaction.emoji originalMessageText = parsedReaction.originalMessage threadId = reactionMessage.threadId diff --git a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt index 39b2d0d0..13710cc4 100644 --- a/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt +++ b/data/src/main/java/com/moez/QKSMS/repository/MessageRepositoryImpl.kt @@ -614,6 +614,29 @@ open class MessageRepositoryImpl @Inject constructor( Timber.v("created message id ${message.id} from uri $messageUri") + // Parse outgoing reactions on the sender's own device. Sent messages don't arrive back as + // incoming, so without this they'd never be parsed (only on a full reparse). This attaches + // the reaction to its target locally and marks the reaction message as hidden. + reactions.parseEmojiReaction(body)?.let { parsedReaction -> + Realm.getDefaultInstance().use { realm -> + realm.where(Message::class.java) + .equalTo("id", message.id) + .findFirst() + ?.let { savedMessage -> + val targetMessage = reactions.findTargetMessage( + savedMessage.threadId, + parsedReaction.originalMessage, + realm, + parsedReaction.quikSenderAddress, + parsedReaction.quikTimestamp, + ) + realm.executeTransaction { + reactions.saveEmojiReaction(savedMessage, parsedReaction, targetMessage, realm) + } + } + } + } + if (delayMs > 0) { // if delaying val sendTime = (now() + delayMs) diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt index a1ab0563..c8caaa95 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeActivity.kt @@ -772,14 +772,18 @@ class ComposeActivity : QkThemedActivity(), ComposeView { .show() }) - // Anchor near the long-pressed message if its view is on screen, else the message list + // Anchor above the long-pressed message if its view is on screen; else center on the list val position = messageAdapter.data?.second?.indexOfLast { it.id == messageId } ?: -1 - val anchor = position + val messageView = position .takeIf { it != -1 } ?.let { binding.messageList.layoutManager?.findViewByPosition(it) } - ?: binding.messageList - popup.showAtLocation(anchor, Gravity.CENTER, 0, 0) + if (messageView != null) { + row.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED) + popup.showAsDropDown(messageView, 0, -(messageView.height + row.measuredHeight)) + } else { + popup.showAtLocation(binding.messageList, Gravity.CENTER, 0, 0) + } } override fun onCreateOptionsMenu(menu: Menu?): Boolean { diff --git a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt index 4506a49e..3e9b35b0 100644 --- a/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt +++ b/presentation/src/main/java/com/moez/QKSMS/feature/compose/ComposeViewModel.kt @@ -766,12 +766,17 @@ class ComposeViewModel @Inject constructor( .mapNotNull { messageId -> messageRepo.getMessage(messageId) } .withLatestFrom(conversation) { message, conv -> message.emojiReactions.map { reaction -> - val contactName = conv.recipients - .firstOrNull { recipient -> - phoneNumberUtils.compare(recipient.address, reaction.senderAddress) - } - ?.getDisplayName() - ?: reaction.senderAddress + val contactName = when { + // our own reactions are stored against our own number, so show "Me" + messageRepo.getMessage(reaction.reactionMessageId)?.isMe() == true -> + context.getString(R.string.compose_reaction_me) + else -> conv.recipients + .firstOrNull { recipient -> + phoneNumberUtils.compare(recipient.address, reaction.senderAddress) + } + ?.getDisplayName() + ?: reaction.senderAddress + } "${reaction.emoji} $contactName" } } @@ -787,28 +792,30 @@ class ComposeViewModel @Inject constructor( // message comes back to this device and is parsed as a reaction (isEmojiReaction = true), // so it is hidden from the conversation automatically. view.sendReactionIntent + // permission checks touch the UI, so keep them on the main thread + .observeOn(AndroidSchedulers.mainThread()) + .filter { + when { + !permissionManager.isDefaultSms() -> { view.requestDefaultSms(); false } + !permissionManager.hasSendSms() -> { view.requestSmsPermission(); false } + else -> true + } + } + // sending and realm access happen off the main thread .observeOn(Schedulers.io()) .withLatestFrom(state, conversation) { pair, state, conversation -> Triple(pair, state, conversation) } .autoDisposable(view.scope()) .subscribe { (pair, state, conversation) -> - if (!permissionManager.isDefaultSms()) { - view.requestDefaultSms() - return@subscribe - } - if (!permissionManager.hasSendSms()) { - view.requestSmsPermission() - return@subscribe - } - val (messageId, emoji) = pair val targetMessage = messageRepo.getMessage(messageId) ?: return@subscribe val addresses = conversation.recipients.map { it.address } if (addresses.isEmpty()) return@subscribe val subId = state.subscription?.subscriptionId ?: -1 - val sendAsGroup = (addresses.size > 1) && state.sendAsGroup + // always send a group reaction in a group thread so it reaches everyone + val sendAsGroup = addresses.size > 1 val body = reactions.buildReactionBody(emoji, targetMessage) messageRepo.sendNewMessages(subId, addresses, body, emptyList(), sendAsGroup) diff --git a/presentation/src/main/res/values/strings.xml b/presentation/src/main/res/values/strings.xml index 981fae9c..e1fd3fe3 100644 --- a/presentation/src/main/res/values/strings.xml +++ b/presentation/src/main/res/values/strings.xml @@ -155,6 +155,7 @@ Clear Message details Reactions + Me Custom reaction Type or paste an emoji Send