Implements FS#189: Move calls of getPreferences to ConversationsPlusPreferences

1 files changed, 0 insertions, 22 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
index f2ee20a0..726facac 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/XmppActivity.java
@@ -104,11 +104,8 @@ public abstract class XmppActivity extends Activity {
 	public boolean xmppConnectionServiceBound = false;
 	protected boolean registeredListeners = false;
 
-	protected boolean mUseSubject = true;
-
 	private DisplayMetrics metrics;
 	protected int mTheme;
-	protected boolean mUsingEnterKey = false;
 
 	private long mLastUiRefresh = 0;
 	private Handler mRefreshUiHandler = new Handler();
@@ -353,8 +350,6 @@ public abstract class XmppActivity extends Activity {
 		ExceptionHelper.init(getApplicationContext());
 		this.mTheme = findTheme();
 		setTheme(this.mTheme);
-		this.mUsingEnterKey = ConversationsPlusPreferences.displayEnterKey();
-		mUseSubject = getPreferences().getBoolean("use_subject", true);
 		final ActionBar ab = getActionBar();
 		if (ab!=null) {
 			ab.setDisplayHomeAsUpEnabled(true);
@@ -383,19 +378,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);
 	}
@@ -957,10 +939,6 @@ public abstract class XmppActivity extends Activity {
 		}
 	}
 
-	protected boolean neverCompressPictures() {
-		return getPreferences().getString("picture_compression", "auto").equals("never");
-	}
-
 	protected void unregisterNdefPushMessageCallback() {
 		NfcAdapter nfcAdapter = NfcAdapter.getDefaultAdapter(this);
 		if (nfcAdapter != null && nfcAdapter.isEnabled()) {