do not quote quotes

3 files changed, 58 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);
diff --git a/src/main/java/de/pixart/messenger/utils/MessageUtils.java b/src/main/java/de/pixart/messenger/utils/MessageUtils.java
new file mode 100644
index 000000000..1cf692f4d
--- /dev/null
+++ b/src/main/java/de/pixart/messenger/utils/MessageUtils.java
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2017, Daniel Gultsch All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ * list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ * this list of conditions and the following disclaimer in the documentation and/or
+ * other materials provided with the distribution.
+ *
+ * 3. Neither the name of the copyright holder nor the names of its contributors
+ * may be used to endorse or promote products derived from this software without
+ * specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+package de.pixart.messenger.utils;
+
+import de.pixart.messenger.entities.Message;
+
+public class MessageUtils {
+    public static String prepareQuote(Message message) {
+        final StringBuilder builder = new StringBuilder();
+        final String body = message.getMergedBody().toString();
+        for (String line : body.split("\n")) {
+            if (line.length() <= 0) {
+                continue;
+            }
+            final char c = line.charAt(0);
+            if (c == '>' && UIHelper.isPositionFollowedByQuoteableCharacter(line, 0)
+                    || (c == '\u00bb' && !UIHelper.isPositionFollowedByQuote(line, 0))) {
+                continue;
+            }
+            if (builder.length() != 0) {
+                builder.append('\n');
+            }
+            builder.append(line.trim());
+        }
+        return builder.toString();
+    }
+}
\ No newline at end of file