diff options
author | Christian Schneppe <christian@pix-art.de> | 2017-11-20 20:46:02 +0100 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2017-11-20 20:46:02 +0100 |
commit | 3f4baf530f36a55dbba8d5e60a103dc1577188dc (patch) | |
tree | 95b89eb9cfaad496af0760a10a3cbef792564266 /src/main/java/de/pixart/messenger/ui | |
parent | 979e02fdc46573e260114e0f9112dcf326753d62 (diff) |
do not quote quotes
Diffstat (limited to 'src/main/java/de/pixart/messenger/ui')
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/ConversationFragment.java | 5 | ||||
-rw-r--r-- | src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java | 3 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java index dae0e4b73..455590cc5 100644 --- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java +++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java @@ -72,6 +72,7 @@ import de.pixart.messenger.ui.XmppActivity.OnValueEdited; import de.pixart.messenger.ui.adapter.MessageAdapter; import de.pixart.messenger.ui.adapter.MessageAdapter.OnContactPictureClicked; import de.pixart.messenger.ui.adapter.MessageAdapter.OnContactPictureLongClicked; +import de.pixart.messenger.utils.MessageUtils; import de.pixart.messenger.utils.NickValidityChecker; import de.pixart.messenger.utils.StylingHelper; import de.pixart.messenger.utils.UIHelper; @@ -601,7 +602,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa } private void quoteMessage(Message message) { - quoteText(message.getMergedBody().toString()); + quoteText(MessageUtils.prepareQuote(message)); } @Override @@ -642,7 +643,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa MenuItem showErrorMessage = menu.findItem(R.id.show_error_message); if (!treatAsFile && !encrypted && !m.isGeoUri() && !m.treatAsDownloadable()) { copyMessage.setVisible(true); - quoteMessage.setVisible(true); + quoteMessage.setVisible(MessageUtils.prepareQuote(m).length() > 0); } if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) { retryDecryption.setVisible(true); diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java index a1961dbe2..fdb57e692 100644 --- a/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java +++ b/src/main/java/de/pixart/messenger/ui/adapter/MessageAdapter.java @@ -300,8 +300,7 @@ public class MessageAdapter extends ArrayAdapter<Message> implements CopyTextVie viewHolder.indicator.setVisibility(View.VISIBLE); } - String formatedTime = UIHelper.readableTimeDifferenceFull(getContext(), - message.getMergedTimeSent()); + String formatedTime = UIHelper.readableTimeDifferenceFull(getContext(), message.getMergedTimeSent()); if (message.getStatus() <= Message.STATUS_RECEIVED) { if ((filesize != null) && (info != null)) { viewHolder.time.setText(formatedTime + " \u00B7 " + filesize + " \u00B7 " + info); |