diff options
author | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-17 20:17:54 +0100 |
---|---|---|
committer | Christian Schneppe <christian.schneppe@pix-art.de> | 2019-11-17 20:17:54 +0100 |
commit | 6690201edee3ea0446b6f8c8f87cf017644c4a42 (patch) | |
tree | 9a3d98b1e25000565e2cc6f820d7cd8bb4d1d23b /src/main/java/de/pixart/messenger/ui/ConversationFragment.java | |
parent | c0c45b4eabe8658e5e4a68127c9c7e05fb20a624 (diff) |
fix user in textselection quotes
Diffstat (limited to '')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index 4c5cfddad..a60a7e6cd 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -1177,13 +1177,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke messageListAdapter = new MessageAdapter((XmppActivity) getActivity(), this.messageList); messageListAdapter.setOnContactPictureClicked(this); messageListAdapter.setOnContactPictureLongClicked(this); - messageListAdapter.setOnQuoteListener(text -> quoteText(text, getUsername(selectedMessage))); + messageListAdapter.setOnQuoteListener(ConversationFragment.this::quoteText); binding.messagesView.setAdapter(messageListAdapter); registerForContextMenu(binding.messagesView); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) { this.binding.textinput.setCustomInsertionActionModeCallback(new EditMessageActionModeCallback(this.binding.textinput)); } - return binding.getRoot(); } @@ -3152,7 +3151,10 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke popupMenu.show(); } - private String getUsername(Message message) { + public String getUsername(Message message) { + if (message == null) { + return null; + } String user; try { final Contact contact = message.getContact(); |