thedevstack/PiratX-Archive
Archived
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

small quotes fixes

Browse source
This commit is contained in:
Christian Schneppe 2019-12-12 19:37:04 +01:00
parent 0c9d000689
commit 6c3565392a
No known key found for this signature in database
GPG key ID: F30B8D686B44D87E
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java
View file

@ -216,7 +216,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
String filesize = null; String filesize = null;
String info = null; String info = null;
boolean error = false; boolean error = false;
viewHolder.user.setText(UIHelper.getMessageDisplayName(message)); viewHolder.user.setText(UIHelper.getDisplayedMucCounterpart(message.getCounterpart()));
if (viewHolder.indicatorReceived != null) { if (viewHolder.indicatorReceived != null) {
viewHolder.indicatorReceived.setVisibility(View.GONE); viewHolder.indicatorReceived.setVisibility(View.GONE);
viewHolder.indicatorRead.setVisibility(View.GONE); viewHolder.indicatorRead.setVisibility(View.GONE);
@ -998,7 +998,8 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
throw new AssertionError("Unknown view type"); throw new AssertionError("Unknown view type");
} }
if (viewHolder.messageBody != null) { if (viewHolder.messageBody != null) {
listSelectionManager.onCreate(viewHolder.messageBody, new MessageBodyActionModeCallback(viewHolder.messageBody, viewHolder.user)); final boolean multi = message.getConversation().getMode() == Conversation.MODE_MULTI;
listSelectionManager.onCreate(viewHolder.messageBody, new MessageBodyActionModeCallback(viewHolder.messageBody, viewHolder.user, multi));
viewHolder.messageBody.setCopyHandler(this); viewHolder.messageBody.setCopyHandler(this);
} }
view.setTag(viewHolder); view.setTag(viewHolder);
@ -1340,10 +1341,12 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
private final TextView messageBody; private final TextView messageBody;
private final TextView messageUser; private final TextView messageUser;
private final boolean multiuser;
public MessageBodyActionModeCallback(TextView messgebody, TextView user) { public MessageBodyActionModeCallback(TextView messgebody, TextView user, final boolean multi) {
this.messageBody = messgebody; this.messageBody = messgebody;
this.messageUser = user; this.messageUser = user;
this.multiuser = multi;
} }
@Override @Override
@ -1369,7 +1372,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie
int end = messageBody.getSelectionEnd(); int end = messageBody.getSelectionEnd();
if (end > start) { if (end > start) {
String text = transformText(messageBody.getText(), start, end, false); String text = transformText(messageBody.getText(), start, end, false);
String user = messageUser.getText().toString(); String user = multiuser ? messageUser.getText().toString() : null;
if (onQuoteListener != null) { if (onQuoteListener != null) {
onQuoteListener.onQuote(text, user); onQuoteListener.onQuote(text, user);
} }