narayana/anotherim
narayana/anotherim
3
2
Fork 0
Code Issues 3 Pull requests Actions Packages Projects Releases 4 Wiki Activity

use comma seperation for multiple mentions

Browse source
This commit is contained in:
Daniel Gultsch 2017-04-06 18:06:07 +02:00
parent 65b3655a8b
commit d91c314ac2
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
View file

@ -9,8 +9,6 @@ import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.IntentSender.SendIntentException; import android.content.IntentSender.SendIntentException;
import android.net.Uri;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Handler; import android.os.Handler;
import android.support.v13.view.inputmethod.InputConnectionCompat; import android.support.v13.view.inputmethod.InputConnectionCompat;
@ -34,7 +32,6 @@ import android.widget.AbsListView;
import android.widget.AbsListView.OnScrollListener; import android.widget.AbsListView.OnScrollListener;
import android.widget.AdapterView; import android.widget.AdapterView;
import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.AdapterContextMenuInfo;
import android.widget.EditText;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.ListView; import android.widget.ListView;
import android.widget.PopupMenu; import android.widget.PopupMenu;
@ -840,16 +837,20 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
String oldString = editable.toString().trim(); String oldString = editable.toString().trim();
final int pos = mEditMessage.getSelectionStart(); final int pos = mEditMessage.getSelectionStart();
if (oldString.isEmpty() || pos == 0) { if (oldString.isEmpty() || pos == 0) {
mEditMessage.getText().insert(0, nick + ": "); editable.insert(0, nick + ": ");
} else { } else {
final char before = editable.charAt(pos - 1); final char before = editable.charAt(pos - 1);
final char after = editable.length() > pos ? editable.charAt(pos) : '\0'; final char after = editable.length() > pos ? editable.charAt(pos) : '\0';
if (before == '\n') { if (before == '\n') {
editable.insert(pos, nick + ": "); editable.insert(pos, nick + ": ");
} else { } else {
editable.insert(pos,(Character.isWhitespace(before)? "" : " ") + nick + (Character.isWhitespace(after) ? "" : " ")); if (pos > 2 && editable.subSequence(pos-2,pos).toString().equals(": ")) {
if (Character.isWhitespace(after)) { editable.insert(pos-2,", "+nick);
mEditMessage.setSelection(mEditMessage.getSelectionStart()+1); } else {
editable.insert(pos, (Character.isWhitespace(before) ? "" : " ") + nick + (Character.isWhitespace(after) ? "" : " "));
if (Character.isWhitespace(after)) {
mEditMessage.setSelection(mEditMessage.getSelectionStart() + 1);
}
} }
} }
} }