Merge trz/rename into trz/rebase

1 files changed, 3 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
index df2933c9..ce003bfe 100644
--- a/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
@@ -6,6 +6,7 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.Locale;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.tzur.conversations.Settings;
 import de.duenndns.ssl.MemorizingTrustManager;
 
@@ -15,7 +16,6 @@ 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;
@@ -135,11 +135,10 @@ public class SettingsActivity extends XmppActivity implements
 	public void onSharedPreferenceChanged(SharedPreferences preferences,
 			String name) {
         // need to synchronize the settings class first
-        Settings.synchronizeSettingsClassWithPreferences(getPreferences(), name);
+        Settings.synchronizeSettingsClassWithPreferences(preferences, name);
         switch (name) {
             case "resource":
-                String resource = preferences.getString("resource", "mobile")
-                        .toLowerCase(Locale.US);
+                String resource = ConversationsPlusPreferences.resource().toLowerCase(Locale.US);
                 if (xmppConnectionServiceBound) {
                     for (Account account : xmppConnectionService.getAccounts()) {
                         account.setResource(resource);