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.

9 files changed, 107 insertions, 143 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java
index bf0c126e..e8d822c8 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ContactDetailsActivity.java
@@ -6,10 +6,8 @@ import android.content.Context;
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.IntentSender.SendIntentException;
-import android.content.SharedPreferences;
 import android.net.Uri;
 import android.os.Bundle;
-import android.preference.PreferenceManager;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.CommonDataKinds;
 import android.provider.ContactsContract.Contacts;
@@ -32,6 +30,7 @@ import org.openintents.openpgp.util.OpenPgpUtils;
 
 import java.util.List;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.crypto.PgpEngine;
 import de.thedevstack.conversationsplus.entities.Account;
@@ -208,8 +207,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 			getActionBar().setDisplayHomeAsUpEnabled(true);
 		}
 
-		final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
-		this.showDynamicTags = preferences.getBoolean("show_dynamic_tags",false);
+		this.showDynamicTags = ConversationsPlusPreferences.showDynamicTags();
 	}
 
 	@Override
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
index 2aeeb9c7..4f30cda3 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationActivity.java
@@ -28,6 +28,8 @@ import android.widget.PopupMenu.OnMenuItemClickListener;
 import android.widget.Toast;
 
 import net.java.otr4j.session.SessionStatus;
+
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.timroes.android.listview.EnhancedListView;
 
 import java.util.ArrayList;
@@ -47,7 +49,6 @@ import de.thedevstack.conversationsplus.services.XmppConnectionService.OnRosterU
 import de.thedevstack.conversationsplus.ui.adapter.ConversationAdapter;
 import de.thedevstack.conversationsplus.utils.ExceptionHelper;
 import de.thedevstack.conversationsplus.xmpp.OnUpdateBlocklist;
-import github.ankushsachdeva.emojicon.EmojiconEditText;
 
 public class ConversationActivity extends XmppActivity
 	implements OnAccountUpdate, OnConversationUpdate, OnRosterUpdate, OnUpdateBlocklist, XmppConnectionService.OnShowErrorToast {
@@ -297,12 +298,12 @@ public class ConversationActivity extends XmppActivity
 	public void switchToConversation(Conversation conversation) {
 		setSelectedConversation(conversation);
 		runOnUiThread(new Runnable() {
-			@Override
-			public void run() {
-				ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
-				openConversation();
-			}
-		});
+            @Override
+            public void run() {
+                ConversationActivity.this.mConversationFragment.reInit(getSelectedConversation());
+                openConversation();
+            }
+        });
 	}
 
 	private void updateActionBarTitle() {
@@ -316,7 +317,7 @@ public class ConversationActivity extends XmppActivity
 			if (titleShouldBeName && conversation != null) {
 				ab.setDisplayHomeAsUpEnabled(true);
 				ab.setHomeButtonEnabled(true);
-				if (conversation.getMode() == Conversation.MODE_SINGLE || useSubjectToIdentifyConference()) {
+				if (conversation.getMode() == Conversation.MODE_SINGLE || ConversationsPlusPreferences.useSubject()) {
 					ab.setTitle(conversation.getName());
 				} else {
 					ab.setTitle(conversation.getJid().toBareJid().toString());
@@ -377,7 +378,7 @@ public class ConversationActivity extends XmppActivity
 		} else {
 			menuAdd.setVisible(!isConversationsOverviewHideable());
 			if (this.getSelectedConversation() != null) {
-				if (this.getSelectedConversation().getNextEncryption(forceEncryption()) != Message.ENCRYPTION_NONE) {
+				if (this.getSelectedConversation().getNextEncryption(ConversationsPlusPreferences.forceEncryption()) != Message.ENCRYPTION_NONE) {
 					if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 						menuSecure.setIcon(R.drawable.ic_lock_white_24dp);
 					} else {
@@ -477,20 +478,20 @@ public class ConversationActivity extends XmppActivity
 	public void attachFile(final int attachmentChoice) {
 		switch (attachmentChoice) {
 			case ATTACHMENT_CHOICE_LOCATION:
-				getPreferences().edit().putString("recently_used_quick_action","location").apply();
+				ConversationsPlusPreferences.applyRecentlyUsedQuickAction("location");
 				break;
 			case ATTACHMENT_CHOICE_RECORD_VOICE:
-				getPreferences().edit().putString("recently_used_quick_action","voice").apply();
+                ConversationsPlusPreferences.applyRecentlyUsedQuickAction("voice");
 				break;
 			case ATTACHMENT_CHOICE_TAKE_PHOTO:
-				getPreferences().edit().putString("recently_used_quick_action","photo").apply();
+                ConversationsPlusPreferences.applyRecentlyUsedQuickAction("photo");
 				break;
 			case ATTACHMENT_CHOICE_CHOOSE_IMAGE:
-				getPreferences().edit().putString("recently_used_quick_action","picture").apply();
+                ConversationsPlusPreferences.applyRecentlyUsedQuickAction("picture");
 				break;
 		}
 		final Conversation conversation = getSelectedConversation();
-		final int encryption = conversation.getNextEncryption(forceEncryption());
+		final int encryption = conversation.getNextEncryption(ConversationsPlusPreferences.forceEncryption());
 		if (encryption == Message.ENCRYPTION_PGP) {
 			if (hasPgp()) {
 				if (conversation.getContact().getPgpKeyId() != 0) {
@@ -627,19 +628,19 @@ public class ConversationActivity extends XmppActivity
 		builder.setView(dialogView);
 		builder.setNegativeButton(getString(R.string.cancel), null);
 		builder.setPositiveButton(getString(R.string.delete_messages),
-				new OnClickListener() {
+                new OnClickListener() {
 
-					@Override
-					public void onClick(DialogInterface dialog, int which) {
-						ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
-						if (endConversationCheckBox.isChecked()) {
-							endConversation(conversation);
-						} else {
-							updateConversationList();
-							ConversationActivity.this.mConversationFragment.updateMessages();
-						}
-					}
-				});
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        ConversationActivity.this.xmppConnectionService.clearConversationHistory(conversation);
+                        if (endConversationCheckBox.isChecked()) {
+                            endConversation(conversation);
+                        } else {
+                            updateConversationList();
+                            ConversationActivity.this.mConversationFragment.updateMessages();
+                        }
+                    }
+                });
 		builder.create().show();
 	}
 
@@ -766,14 +767,15 @@ public class ConversationActivity extends XmppActivity
 			MenuItem otr = popup.getMenu().findItem(R.id.encryption_choice_otr);
 			MenuItem none = popup.getMenu().findItem(R.id.encryption_choice_none);
 			MenuItem pgp = popup.getMenu().findItem(R.id.encryption_choice_pgp);
+			boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
 			if (conversation.getMode() == Conversation.MODE_MULTI) {
 				otr.setEnabled(false);
 			} else {
-				if (forceEncryption()) {
+				if (forceEncryption) {
 					none.setVisible(false);
 				}
 			}
-			switch (conversation.getNextEncryption(forceEncryption())) {
+			switch (conversation.getNextEncryption(forceEncryption)) {
 				case Message.ENCRYPTION_NONE:
 					none.setChecked(true);
 					break;
@@ -797,24 +799,24 @@ public class ConversationActivity extends XmppActivity
 		final int[] durations = getResources().getIntArray(
 				R.array.mute_options_durations);
 		builder.setItems(R.array.mute_options_descriptions,
-				new OnClickListener() {
+                new OnClickListener() {
 
-					@Override
-					public void onClick(final DialogInterface dialog, final int which) {
-						final long till;
-						if (durations[which] == -1) {
-							till = Long.MAX_VALUE;
-						} else {
-							till = System.currentTimeMillis() + (durations[which] * 1000);
-						}
-						conversation.setMutedTill(till);
-						ConversationActivity.this.xmppConnectionService.databaseBackend
-							.updateConversation(conversation);
-						updateConversationList();
-						ConversationActivity.this.mConversationFragment.updateMessages();
-						invalidateOptionsMenu();
-					}
-				});
+                    @Override
+                    public void onClick(final DialogInterface dialog, final int which) {
+                        final long till;
+                        if (durations[which] == -1) {
+                            till = Long.MAX_VALUE;
+                        } else {
+                            till = System.currentTimeMillis() + (durations[which] * 1000);
+                        }
+                        conversation.setMutedTill(till);
+                        ConversationActivity.this.xmppConnectionService.databaseBackend
+                                .updateConversation(conversation);
+                        updateConversationList();
+                        ConversationActivity.this.mConversationFragment.updateMessages();
+                        invalidateOptionsMenu();
+                    }
+                });
 		builder.create().show();
 	}
 
@@ -872,7 +874,7 @@ public class ConversationActivity extends XmppActivity
 	public void onResume() {
 		super.onResume();
 		final int theme = findTheme();
-		final boolean usingEnterKey = usingEnterKey();
+		final boolean usingEnterKey = ConversationsPlusPreferences.displayEnterKey();
 		if (this.mTheme != theme || usingEnterKey != mUsingEnterKey) {
 			recreate();
 		}
@@ -895,7 +897,7 @@ public class ConversationActivity extends XmppActivity
 					conversation.getUuid());
 		}
 		savedInstanceState.putBoolean(STATE_PANEL_OPEN,
-				isConversationsOverviewVisable());
+                isConversationsOverviewVisable());
 		if (this.mPendingImageUris.size() >= 1) {
 			savedInstanceState.putString(STATE_PENDING_URI, this.mPendingImageUris.get(0).toString());
 		}
@@ -1079,23 +1081,23 @@ public class ConversationActivity extends XmppActivity
 		if (conversation == null) {
 			return;
 		}
-		xmppConnectionService.attachLocationToConversation(conversation,uri, new UiCallback<Message>() {
+		xmppConnectionService.attachLocationToConversation(conversation, uri, new UiCallback<Message>() {
 
-			@Override
-			public void success(Message message) {
-				xmppConnectionService.sendMessage(message);
-			}
+            @Override
+            public void success(Message message) {
+                xmppConnectionService.sendMessage(message);
+            }
 
-			@Override
-			public void error(int errorCode, Message object) {
+            @Override
+            public void error(int errorCode, Message object) {
 
-			}
+            }
 
-			@Override
-			public void userInputRequried(PendingIntent pi, Message object) {
+            @Override
+            public void userInputRequried(PendingIntent pi, Message object) {
 
-			}
-		});
+            }
+        });
 	}
 
 	private void attachFileToConversation(Conversation conversation, Uri uri) {
@@ -1105,22 +1107,22 @@ public class ConversationActivity extends XmppActivity
 		prepareFileToast = Toast.makeText(getApplicationContext(),getText(R.string.preparing_file), Toast.LENGTH_LONG);
 		prepareFileToast.show();
 		xmppConnectionService.attachFileToConversation(conversation, uri, new UiCallback<Message>() {
-			@Override
-			public void success(Message message) {
-				hidePrepareFileToast();
-				xmppConnectionService.sendMessage(message);
-			}
+            @Override
+            public void success(Message message) {
+                hidePrepareFileToast();
+                xmppConnectionService.sendMessage(message);
+            }
 
-			@Override
-			public void error(int errorCode, Message message) {
-				displayErrorDialog(errorCode);
-			}
+            @Override
+            public void error(int errorCode, Message message) {
+                displayErrorDialog(errorCode);
+            }
 
-			@Override
-			public void userInputRequried(PendingIntent pi, Message message) {
+            @Override
+            public void userInputRequried(PendingIntent pi, Message message) {
 
-			}
-		});
+            }
+        });
 	}
 
 	private void attachImageToConversation(Conversation conversation, Uri uri) {
@@ -1208,18 +1210,6 @@ public class ConversationActivity extends XmppActivity
 				});
 	}
 
-	public boolean forceEncryption() {
-		return getPreferences().getBoolean("force_encryption", false);
-	}
-
-	public boolean useSendButtonToIndicateStatus() {
-		return getPreferences().getBoolean("send_button_status", false);
-	}
-
-	public boolean indicateReceived() {
-		return getPreferences().getBoolean("indicate_received", false);
-	}
-
 	@Override
 	protected void refreshUiReal() {
 		updateConversationList();
@@ -1273,10 +1263,6 @@ public class ConversationActivity extends XmppActivity
 		xmppConnectionService.sendUnblockRequest(conversation);
 	}
 
-	public boolean enterIsSend() {
-		return getPreferences().getBoolean("enter_is_send",false);
-	}
-
 	@Override
 	public void onShowErrorToast(final int resId) {
 		runOnUiThread(new Runnable() {
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
index d715aee2..3fbe59f4 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/ConversationFragment.java
@@ -12,7 +12,6 @@ import android.content.IntentSender.SendIntentException;
 import android.os.Bundle;
 import android.support.v4.widget.SwipeRefreshLayout;
 import android.text.InputType;
-import android.util.Log;
 import android.view.ContextMenu;
 import android.view.ContextMenu.ContextMenuInfo;
 import android.view.Gravity;
@@ -42,6 +41,7 @@ import java.util.List;
 import java.util.NoSuchElementException;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.dialogs.MessageDetailsDialog;
 import de.thedevstack.conversationsplus.ui.listeners.ConversationSwipeRefreshListener;
 import de.thedevstack.conversationsplus.Config;
@@ -213,16 +213,17 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 		if (body.length() == 0 || this.conversation == null) {
 			return;
 		}
-		Message message = new Message(conversation, body, conversation.getNextEncryption(activity.forceEncryption()));
+		boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
+		Message message = new Message(conversation, body, conversation.getNextEncryption(forceEncryption));
 		if (conversation.getMode() == Conversation.MODE_MULTI) {
 			if (conversation.getNextCounterpart() != null) {
 				message.setCounterpart(conversation.getNextCounterpart());
 				message.setType(Message.TYPE_PRIVATE);
 			}
 		}
-		if (conversation.getNextEncryption(activity.forceEncryption()) == Message.ENCRYPTION_OTR) {
-			sendOtrMessage(message);
-		} else if (conversation.getNextEncryption(activity.forceEncryption()) == Message.ENCRYPTION_PGP) {
+		if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_OTR) {
+            sendOtrMessage(message);
+		} else if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
 			sendPgpMessage(message);
 		} else {
 			sendPlainTextMessage(message);
@@ -236,7 +237,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
                     R.string.send_private_message_to,
                     conversation.getNextCounterpart().getResourcepart()));
 		} else {
-			switch (conversation.getNextEncryption(activity.forceEncryption())) {
+			switch (conversation.getNextEncryption(ConversationsPlusPreferences.forceEncryption())) {
 				case Message.ENCRYPTION_NONE:
 					mEditMessage
 							.setHint(getString(R.string.send_plain_text_message));
@@ -255,7 +256,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 	}
 
 	private void setupIme() {
-		if (((ConversationActivity) getActivity()).usingEnterKey()) {
+		if (ConversationsPlusPreferences.displayEnterKey()) {
 			mEditMessage.setInputType(mEditMessage.getInputType() & (~InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE));
 		} else {
 			mEditMessage.setInputType(mEditMessage.getInputType() | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE);
@@ -963,11 +964,11 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 				if (conference && c.getNextCounterpart() != null) {
 					action = SendButtonAction.CANCEL;
 				} else {
-					String setting = activity.getPreferences().getString("quick_action", "recent");
+					String setting = ConversationsPlusPreferences.quickAction();
 					if (!setting.equals("none") && UIHelper.receivedLocationQuestion(conversation.getLatestMessage())) {
 						setting = "location";
 					} else if (setting.equals("recent")) {
-						setting = activity.getPreferences().getString("recently_used_quick_action", "text");
+						setting = ConversationsPlusPreferences.recentlyUsedQuickAction();
 					}
 					switch (setting) {
 						case "photo":
@@ -991,7 +992,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 				action = SendButtonAction.TEXT;
 			}
 		}
-		if (activity.useSendButtonToIndicateStatus() && c != null
+		if (ConversationsPlusPreferences.sendButtonStatus() && c != null
 				&& c.getAccount().getStatus() == Account.State.ONLINE) {
 			if (c.getMode() == Conversation.MODE_SINGLE) {
 				status = c.getContact().getMostAvailableStatus();
@@ -1178,7 +1179,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
 
 	@Override
 	public boolean onEnterPressed() {
-		if (activity.enterIsSend()) {
+		if (ConversationsPlusPreferences.enterIsSend()) {
 			sendMessage();
 			return true;
 		} else {
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
index 46a68f65..c364ff00 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/SettingsActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/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 de.thedevstack.conversationsplus.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);
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
index c5ac3985..4cd24a4b 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/StartConversationActivity.java
@@ -53,6 +53,7 @@ import java.util.Collections;
 import java.util.List;
 
 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.Blockable;
@@ -185,6 +186,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.activity_start_conversation);
+        this.mHideOfflineContacts = ConversationsPlusPreferences.hideOffline();
 		mViewPager = (ViewPager) findViewById(R.id.start_conversation_view_pager);
 		ActionBar actionBar = getActionBar();
 		actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
@@ -241,7 +243,6 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				}
 			});
 
-		this.mHideOfflineContacts = getPreferences().getBoolean("hide_offline", false);
 
 	}
 
@@ -533,12 +534,13 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 				new IntentIntegrator(this).initiateScan();
 				return true;
 			case R.id.action_hide_offline:
-				mHideOfflineContacts = !item.isChecked();
-				getPreferences().edit().putBoolean("hide_offline", mHideOfflineContacts).commit();
+				mHideOfflineContacts = !item.isChecked(); // the item is the menu item which is displayed, the inversion here calculates the new value
+				ConversationsPlusPreferences.commitHideOffline(mHideOfflineContacts);
 				if (mSearchEditText != null) {
 					filter(mSearchEditText.getText().toString());
 				}
-				invalidateOptionsMenu();
+				invalidateOptionsMenu(); // Since the selection of this item changed the checked value, the options menu is now invalid
+				return true;
 		}
 		return super.onOptionsItemSelected(item);
 	}
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;
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
index dab291cc..1fc6e066 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ConversationAdapter.java
@@ -21,6 +21,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.thedevstack.conversationsplus.ui.listeners.ShowResourcesListDialogListener;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.R;
@@ -59,7 +60,7 @@ public class ConversationAdapter extends ArrayAdapter<Conversation> {
             view.findViewById(R.id.conversationListRowFrame).setBackgroundColor(c);
 		}
 		TextView convName = (TextView) view.findViewById(R.id.conversation_name);
-		if (conversation.getMode() == Conversation.MODE_SINGLE || activity.useSubjectToIdentifyConference()) {
+		if (conversation.getMode() == Conversation.MODE_SINGLE || ConversationsPlusPreferences.useSubject()) {
 			convName.setText(conversation.getName());
 		} else {
 			convName.setText(conversation.getJid().toBareJid().toString());
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java
index 114e5cff..3f342528 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/ListItemAdapter.java
@@ -4,6 +4,7 @@ import java.lang.ref.WeakReference;
 import java.util.List;
 import java.util.concurrent.RejectedExecutionException;
 
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.R;
 import de.thedevstack.conversationsplus.entities.ListItem;
@@ -12,13 +13,11 @@ import de.thedevstack.conversationsplus.utils.UIHelper;
 import de.thedevstack.conversationsplus.xmpp.jid.Jid;
 
 import android.content.Context;
-import android.content.SharedPreferences;
 import android.content.res.Resources;
 import android.graphics.Bitmap;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.os.AsyncTask;
-import android.preference.PreferenceManager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -46,8 +45,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
 	public ListItemAdapter(XmppActivity activity, List<ListItem> objects) {
 		super(activity, 0, objects);
 		this.activity = activity;
-		SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-		this.showDynamicTags = preferences.getBoolean("show_dynamic_tags",false);
+		this.showDynamicTags = ConversationsPlusPreferences.showDynamicTags();
 	}
 
 	@Override
diff --git a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
index 48debdaf..550e3c4e 100644
--- a/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
+++ b/src/main/java/de/thedevstack/conversationsplus/ui/adapter/MessageAdapter.java
@@ -25,8 +25,7 @@ import android.widget.Toast;
 
 import java.util.List;
 
-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;
@@ -129,12 +128,12 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 				info = getContext().getString(R.string.offering);
 				break;
 			case Message.STATUS_SEND_RECEIVED:
-				if (activity.indicateReceived()) {
+				if (ConversationsPlusPreferences.indicateReceived()) {
 					viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
 				}
 				break;
 			case Message.STATUS_SEND_DISPLAYED:
-				if (activity.indicateReceived()) {
+				if (ConversationsPlusPreferences.indicateReceived()) {
 					viewHolder.indicatorReceived.setVisibility(View.VISIBLE);
 				}
 				break;