- 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")

1 files changed, 19 insertions, 14 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index c6e7ab33..352652de 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Locale;
 
+import de.tzur.conversations.Settings;
 import eu.siacs.conversations.entities.Account;
 
 import android.content.SharedPreferences;
@@ -58,20 +59,24 @@ 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()) {
-                    account.setResource(resource);
-                    if (!account.isOptionSet(Account.OPTION_DISABLED)) {
-						xmppConnectionService.reconnectAccount(account, false);
-					}
-				}
-			}
-		} else if (name.equals("keep_foreground_service")) {
-			xmppConnectionService.toggleForegroundService();
-		}
+        switch (name) {
+            case "resource":
+                String resource = preferences.getString("resource", "mobile")
+                        .toLowerCase(Locale.US);
+                if (xmppConnectionServiceBound) {
+                    for (Account account : xmppConnectionService.getAccounts()) {
+                        account.setResource(resource);
+                        if (!account.isOptionSet(Account.OPTION_DISABLED)) {
+                            xmppConnectionService.reconnectAccount(account, false);
+                        }
+                    }
+                }
+                break;
+            case "keep_foreground_service":
+                xmppConnectionService.toggleForegroundService();
+                break;
+        }
+        Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
 	}
 
 }