diff options
| author | Daniel Gultsch <daniel@gultsch.de> | 2015-01-25 19:30:00 +0100 |
|---|---|---|
| committer | Daniel Gultsch <daniel@gultsch.de> | 2015-01-25 19:30:00 +0100 |
| commit | 155914470118e0d68f3e042644beadeb7590b666 (patch) | |
| tree | c62cdc977e984bb245969315fabe7d631277fd3e /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | 14fc520ec086a64739892f3aa8bb1837cbd21471 (diff) | |
| parent | 29331e49b9fa97949e14f2a326b26c69a4ca3022 (diff) | |
Merge pull request #933 from betheg/mergeable
fix mergable() for /me command.
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java')
| -rw-r--r-- | src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java index 1d4e2493..442c6ecf 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -220,7 +220,8 @@ public class MessageAdapter extends ArrayAdapter<Message> { viewHolder.messageBody.setVisibility(View.VISIBLE); if (message.getBody() != null) { final String nick = UIHelper.getMessageDisplayName(message); - final String formattedBody = message.getMergedBody().replaceAll("^/me ", nick + " "); + final String formattedBody = message.getMergedBody().replaceAll("^" + Message.ME_COMMAND, + nick + " "); if (message.getType() != Message.TYPE_PRIVATE) { if (message.hasMeCommand()) { final Spannable span = new SpannableString(formattedBody); |