Merge pull request #400 from xsrc/development

Smarter nickname highlight insert in confernces

1 files changed, 3 insertions, 6 deletions

diff --git a/src/eu/siacs/conversations/ui/ConversationFragment.java b/src/eu/siacs/conversations/ui/ConversationFragment.java
index 9309db9c..f4af7277 100644
--- a/src/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/eu/siacs/conversations/ui/ConversationFragment.java
@@ -287,14 +287,11 @@ public class ConversationFragment extends Fragment {
 
 	protected void highlightInConference(String nick) {
 		String oldString = mEditMessage.getText().toString().trim();
-		if (oldString.isEmpty()) {
-			mEditMessage.setText(nick + ": ");
+		if (oldString.isEmpty() || mEditMessage.getSelectionStart() == 0) {
+			mEditMessage.getText().insert(0, nick + ": ");
 		} else {
-			mEditMessage.setText(oldString + " " + nick + " ");
+			mEditMessage.getText().insert(mEditMessage.getSelectionStart(), nick + " ");
 		}
-		int position = mEditMessage.length();
-		Editable etext = mEditMessage.getText();
-		Selection.setSelection(etext, position);
 	}
 
 	@Override