Access to preferences moved to global utility class ConversationsPlusPreferences. Unused imports removed. Unnecessary references to XmppConnectionService removed. Bug in call order in StartConversationActivity for the setting hide_offline fixed.

1 files changed, 3 insertions, 23 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
index 8341e631..f0e5992f 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
@@ -16,7 +16,6 @@ import android.content.DialogInterface.OnClickListener;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
 import android.content.ServiceConnection;
-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.content.res.Resources;
@@ -36,7 +35,6 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.SystemClock;
-import android.preference.PreferenceManager;
 import android.text.InputType;
 import android.util.DisplayMetrics;
 import android.util.Log;
@@ -63,8 +61,8 @@ import java.util.Hashtable;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
-import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.Config;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.Account;
 import de.thedevstack.conversationsplus.entities.Contact;
@@ -98,8 +96,6 @@ public abstract class XmppActivity extends Activity {
 	protected int mColorGreen;
 	protected int mPrimaryColor;
 
-	protected boolean mUseSubject = true;
-
 	private DisplayMetrics metrics;
 	protected int mTheme;
 	protected boolean mUsingEnterKey = false;
@@ -345,10 +341,7 @@ public abstract class XmppActivity extends Activity {
 		mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
 		this.mTheme = findTheme();
 		setTheme(this.mTheme);
-		this.mUsingEnterKey = usingEnterKey();
-		mUseSubject = getPreferences().getBoolean("use_subject", true);
-		
-        Settings.initSettingsClassWithPreferences(getPreferences());
+		this.mUsingEnterKey = ConversationsPlusPreferences.displayEnterKey();
 		
 		final ActionBar ab = getActionBar();
 		if (ab!=null) {
@@ -356,19 +349,6 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
-	protected boolean usingEnterKey() {
-		return getPreferences().getBoolean("display_enter_key", false);
-	}
-
-	protected SharedPreferences getPreferences() {
-		return PreferenceManager
-			.getDefaultSharedPreferences(getApplicationContext());
-	}
-
-	public boolean useSubjectToIdentifyConference() {
-		return mUseSubject;
-	}
-
 	public void switchToConversation(Conversation conversation) {
 		switchToConversation(conversation, null, false);
 	}
@@ -786,7 +766,7 @@ public abstract class XmppActivity extends Activity {
 	}
 
 	protected int findTheme() {
-		if (getPreferences().getBoolean("use_larger_font", false)) {
+		if (ConversationsPlusPreferences.useLargerFont()) {
 			return R.style.ConversationsTheme_LargerText;
 		} else {
 			return R.style.ConversationsTheme;