1 files changed, 50 insertions, 37 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index 6e5fe610..f9238f13 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -1,6 +1,21 @@
 package eu.siacs.conversations.ui;
 
+import java.security.KeyStoreException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Locale;
+
+import de.tzur.conversations.Settings;
+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;
 import android.app.FragmentManager;
 import android.content.DialogInterface;
 import android.content.SharedPreferences;
@@ -12,17 +27,6 @@ import android.preference.Preference;
 import android.preference.PreferenceManager;
 import android.widget.Toast;
 
-import java.security.KeyStoreException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.Locale;
-
-import de.duenndns.ssl.MemorizingTrustManager;
-import eu.siacs.conversations.R;
-import eu.siacs.conversations.entities.Account;
-import eu.siacs.conversations.xmpp.XmppConnection;
-
 public class SettingsActivity extends XmppActivity implements
 		OnSharedPreferenceChangeListener {
 	private SettingsFragment mSettingsFragment;
@@ -130,37 +134,46 @@ public class SettingsActivity extends XmppActivity implements
 	@Override
 	public void onSharedPreferenceChanged(SharedPreferences preferences,
 			String name) {
-		if (name.equals("resource")) {
-			String resource = preferences.getString("resource", "mobile")
-					.toLowerCase(Locale.US);
-			if (xmppConnectionServiceBound) {
-				for (Account account : xmppConnectionService.getAccounts()) {
-					if (account.setResource(resource)) {
+        // need to synchronize the settings class first
+        Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
+        switch (name) {
+            case "resource":
+                String resource = preferences.getString("resource", "mobile")
+                        .toLowerCase(Locale.US);
+                if (xmppConnectionServiceBound) {
+                    for (Account account : xmppConnectionService.getAccounts()) {
+                        if (account.setResource(resource)) {
+                            if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+                                XmppConnection connection = account.getXmppConnection();
+                                if (connection != null) {
+                                    connection.resetStreamId();
+                                }
+                                xmppConnectionService.reconnectAccountInBackground(account);
+                            }
+                        }
+                    }
+                }
+                break;
+            case "keep_foreground_service":
+                xmppConnectionService.toggleForegroundService();
+                break;
+			case "confirm_messages":
+				if (xmppConnectionServiceBound) {
+					for (Account account : xmppConnectionService.getAccounts()) {
 						if (!account.isOptionSet(Account.OPTION_DISABLED)) {
-							XmppConnection connection = account.getXmppConnection();
-							if (connection != null) {
-								connection.resetStreamId();
-							}
-							xmppConnectionService.reconnectAccountInBackground(account);
+							xmppConnectionService.sendPresence(account);
 						}
 					}
 				}
-			}
-		} else if (name.equals("keep_foreground_service")) {
-			xmppConnectionService.toggleForegroundService();
-		} else if (name.equals("confirm_messages")) {
-			if (xmppConnectionServiceBound) {
-				for (Account account : xmppConnectionService.getAccounts()) {
-					if (!account.isOptionSet(Account.OPTION_DISABLED)) {
-						xmppConnectionService.sendPresence(account);
-					}
-				}
-			}
-		} else if (name.equals("dont_trust_system_cas")) {
-			xmppConnectionService.updateMemorizingTrustmanager();
-			reconnectAccounts();
+				break;
+			case "dont_trust_system_cas":
+				xmppConnectionService.updateMemorizingTrustmanager();
+				reconnectAccounts();
+				break;
+			case "parse_emoticons":
+				EmojiconHandler.setParseEmoticons(Settings.PARSE_EMOTICONS);
+				break;
 		}
-
 	}
 
 	private void displayToast(final String msg) {