sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #400 from xsrc/development 

Smarter nickname highlight insert in confernces
This commit is contained in:
Daniel Gultsch 2014-08-31 17:40:29 +02:00
parent 1ac5be4855 3e3451bcff
commit 4793081c2c
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/eu/siacs/conversations/ui/ConversationFragment.java
View File

@ -287,14 +287,11 @@ public class ConversationFragment extends Fragment {
protected void highlightInConference(String nick) { protected void highlightInConference(String nick) {
String oldString = mEditMessage.getText().toString().trim(); String oldString = mEditMessage.getText().toString().trim();
if (oldString.isEmpty()) { if (oldString.isEmpty() || mEditMessage.getSelectionStart() == 0) {
mEditMessage.setText(nick + ": "); mEditMessage.getText().insert(0, nick + ": ");
} else { } else {
mEditMessage.setText(oldString + " " + nick + " "); mEditMessage.getText().insert(mEditMessage.getSelectionStart(), nick + " ");
} }
int position = mEditMessage.length();
Editable etext = mEditMessage.getText();
Selection.setSelection(etext, position);
} }
@Override @Override