modified highlight nick behaviour to better work with quotes

1 files changed, 13 insertions, 7 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index b40092b16..da1d7e77d 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -874,16 +874,22 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
     }
 
     protected void highlightInConference(String nick) {
-        String oldString = mEditMessage.getText().toString().trim();
-        if (oldString.isEmpty() || mEditMessage.getSelectionStart() == 0) {
+        final Editable editable = mEditMessage.getText();
+        String oldString = editable.toString().trim();
+        final int pos = mEditMessage.getSelectionStart();
+        if (oldString.isEmpty() || pos == 0) {
             mEditMessage.getText().insert(0, nick + ": ");
         } else {
-            if (mEditMessage.getText().charAt(
-                    mEditMessage.getSelectionStart() - 1) != ' ') {
-                nick = " " + nick;
+            final char before = editable.charAt(pos - 1);
+            final char after = editable.length() > pos ? editable.charAt(pos) : '\0';
+            if (before == '\n') {
+                editable.insert(pos, nick + ": ");
+            } else {
+                editable.insert(pos, (Character.isWhitespace(before) ? "" : " ") + nick + (Character.isWhitespace(after) ? "" : " "));
+                if (Character.isWhitespace(after)) {
+                    mEditMessage.setSelection(mEditMessage.getSelectionStart() + 1);
+                }
             }
-            mEditMessage.getText().insert(mEditMessage.getSelectionStart(),
-                    nick + " ");
         }
     }