From ea1debd8f72903bfbcc631713d803c27be433f20 Mon Sep 17 00:00:00 2001
From: lookshe <github@lookshe.org>
Date: Sun, 16 Aug 2015 17:30:06 +0200
Subject: Fixes FS#12 - Move smiley replacement from UIHelper to Emojicon
 module

---
 src/main/java/eu/siacs/conversations/ui/SettingsActivity.java | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'src/main/java/eu/siacs/conversations/ui/SettingsActivity.java')

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;
 		}
 	}
-- 
cgit v1.2.3