diff options
author | lookshe <github@lookshe.org> | 2015-08-16 17:30:06 +0200 |
---|---|---|
committer | lookshe <github@lookshe.org> | 2015-08-16 17:30:06 +0200 |
commit | ea1debd8f72903bfbcc631713d803c27be433f20 (patch) | |
tree | f1846b8b9f450cda92e7baa6c6a2d233225998b6 /src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | |
parent | b67060989302daf9850e84e2d4d4320e99bdfb83 (diff) |
Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon module
Diffstat (limited to 'src/main/java/eu/siacs/conversations/ui/SettingsActivity.java')
-rw-r--r-- | src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java index f3d5d8bd..df2933c9 100644 --- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java +++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java @@ -12,6 +12,7 @@ import de.duenndns.ssl.MemorizingTrustManager; import eu.siacs.conversations.R; import eu.siacs.conversations.entities.Account; import eu.siacs.conversations.xmpp.XmppConnection; +import github.ankushsachdeva.emojicon.EmojiconHandler; import android.app.AlertDialog; import android.app.Fragment; @@ -165,8 +166,11 @@ public class SettingsActivity extends XmppActivity implements } break; case "dont_trust_system_cas": - xmppConnectionService.updateMemorizingTrustmanager(); - reconnectAccounts(); + xmppConnectionService.updateMemorizingTrustmanager(); + reconnectAccounts(); + break; + case "parse_emoticons": + EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS); break; } } |