aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Gultsch <daniel@gultsch.de>2014-08-31 17:40:29 +0200
committerDaniel Gultsch <daniel@gultsch.de>2014-08-31 17:40:29 +0200
commit4793081c2c89c669241f7f4998d7c745e03f49e3 (patch)
tree2a0ca59e293dca85165cb9d2496b719a88a98874
parent1ac5be485502e7d6d4c117335e083c684739e6af (diff)
parent3e3451bcffb56740f46d447aaa0356b81ca573c7 (diff)
Merge pull request #400 from xsrc/development
Smarter nickname highlight insert in confernces
-rw-r--r--src/eu/siacs/conversations/ui/ConversationFragment.java9
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 9309db9cf..f4af72773 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