From 4aebdc5fa0826e986561b438f6f369f02afc781d Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Mon, 16 Mar 2020 20:39:12 +0100 Subject: fix message quotes from SearchActivity --- src/main/java/de/pixart/messenger/ui/SearchActivity.java | 11 +++++++---- src/main/java/de/pixart/messenger/ui/XmppActivity.java | 4 ++-- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/src/main/java/de/pixart/messenger/ui/SearchActivity.java b/src/main/java/de/pixart/messenger/ui/SearchActivity.java index 8fd76df2e..dce7b370c 100644 --- a/src/main/java/de/pixart/messenger/ui/SearchActivity.java +++ b/src/main/java/de/pixart/messenger/ui/SearchActivity.java @@ -33,6 +33,7 @@ import android.os.Bundle; import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; +import android.util.Log; import android.view.ContextMenu; import android.view.Menu; import android.view.MenuItem; @@ -47,6 +48,7 @@ import java.lang.ref.WeakReference; import java.util.ArrayList; import java.util.List; +import de.pixart.messenger.Config; import de.pixart.messenger.R; import de.pixart.messenger.databinding.ActivitySearchBinding; import de.pixart.messenger.entities.Contact; @@ -64,6 +66,7 @@ import de.pixart.messenger.ui.util.ShareUtil; import de.pixart.messenger.ui.util.StyledAttributes; import de.pixart.messenger.utils.FtsUtils; import de.pixart.messenger.utils.MessageUtils; +import de.pixart.messenger.utils.UIHelper; import static de.pixart.messenger.ui.util.SoftKeyboardUtils.hideSoftKeyboard; import static de.pixart.messenger.ui.util.SoftKeyboardUtils.showKeyboard; @@ -115,9 +118,7 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc searchField.addTextChangedListener(this); searchField.setHint(R.string.search_messages); searchField.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_AUTO_COMPLETE); - if (term == null) { - showKeyboard(searchField); - } + showKeyboard(searchField); return super.onCreateOptionsMenu(menu); } @@ -150,7 +151,8 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc @Override public boolean onContextItemSelected(MenuItem item) { final Message message = selectedMessageReference.get(); - final String user = selectedMessageReference.get().getConversation().getContact().getDisplayName(); + final boolean multi = message.getConversation().getMode() == Conversational.MODE_MULTI; + final String user = multi ? UIHelper.getDisplayedMucCounterpart(message.getCounterpart()) : null; if (message != null) { switch (item.getItemId()) { case R.id.open_conversation: @@ -183,6 +185,7 @@ public class SearchActivity extends XmppActivity implements TextWatcher, OnSearc } private void quote(Message message, String user) { + Log.d(Config.LOGTAG, "Quote User: " + user); switchToConversationAndQuote(wrap(message.getConversation()), MessageUtils.prepareQuote(message), user); } diff --git a/src/main/java/de/pixart/messenger/ui/XmppActivity.java b/src/main/java/de/pixart/messenger/ui/XmppActivity.java index 398b0caef..b530dc051 100644 --- a/src/main/java/de/pixart/messenger/ui/XmppActivity.java +++ b/src/main/java/de/pixart/messenger/ui/XmppActivity.java @@ -529,10 +529,10 @@ public abstract class XmppActivity extends ActionBarActivity { intent.putExtra(Intent.EXTRA_TEXT, text); if (asQuote) { intent.putExtra(ConversationsActivity.EXTRA_AS_QUOTE, true); - intent.putExtra(ConversationsActivity.EXTRA_ACCOUNT, nick); + intent.putExtra(ConversationsActivity.EXTRA_USER, nick); } } - if (nick != null) { + if (nick != null && !asQuote) { intent.putExtra(ConversationsActivity.EXTRA_NICK, nick); intent.putExtra(ConversationsActivity.EXTRA_IS_PRIVATE_MESSAGE, pm); } -- cgit v1.2.3