diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-01-20 22:42:53 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-01-20 22:42:53 +0100 |
| commit | 46bbf1ce5f5d6adbf21674c0b6f38243cb8d9fc7 (patch) | |
| tree | a9629270cb551f0a1e0d764ef3b31295fc2223b1 /src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java | |
| parent | e8ca2a1ae3259c66991f69d62c470ca611ee4659 (diff) | |
- Avoiding accessing shared preferences to know if emoticons should be parsed for every single message
- Adding support to show online status in Conversations overview (configurable via the setting "send_button_status")
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 | 6 |
1 files changed, 3 insertions, 3 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 88c5c93d..2771c4de 100644 --- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java +++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java @@ -24,6 +24,7 @@ import android.widget.Toast; import java.util.List; +import de.tzur.conversations.Settings; import eu.siacs.conversations.Config; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; @@ -226,9 +227,8 @@ public class MessageAdapter extends ArrayAdapter<Message> { viewHolder.messageBody.setVisibility(View.VISIBLE); if (message.getBody() != null) { if (message.getType() != Message.TYPE_PRIVATE) { - boolean parseEmoticons = PreferenceManager - .getDefaultSharedPreferences(getContext()).getBoolean("parse_emoticons", true); - viewHolder.messageBody.setText(parseEmoticons ? UIHelper + boolean parseEmoticons = Settings.PARSE_EMOTICONS; + viewHolder.messageBody.setText(parseEmoticons ? UIHelper .transformAsciiEmoticons(getContext(), message.getMergedBody()) : message.getMergedBody()); } else { |