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, 99 insertions, 127 deletions

diff --git a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
index 5e529f3c..212bc76a 100644
--- a/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
+++ b/src/main/java/de/thedevstack/conversationsplus/services/XmppConnectionService.java
@@ -6,7 +6,6 @@ import android.app.PendingIntent;
 import android.app.Service;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.net.ConnectivityManager;
@@ -20,7 +19,6 @@ import android.os.Looper;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.os.SystemClock;
-import android.preference.PreferenceManager;
 import android.provider.ContactsContract;
 import android.util.Log;
 import android.util.LruCache;
@@ -49,6 +47,7 @@ import java.util.Map;
 import java.util.concurrent.CopyOnWriteArrayList;
 
 import de.duenndns.ssl.MemorizingTrustManager;
+import de.thedevstack.conversationsplus.ConversationsPlusPreferences;
 import de.tzur.conversations.Settings;
 import de.thedevstack.conversationsplus.Config;
 import de.thedevstack.conversationsplus.R;
@@ -175,7 +174,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			}
 		}
 	};
-	private final IqGenerator mIqGenerator = new IqGenerator(this);
+	private final IqGenerator mIqGenerator = new IqGenerator();
 	public DatabaseBackend databaseBackend;
 	public OnContactStatusChanged onContactStatusChanged = new OnContactStatusChanged() {
 
@@ -222,8 +221,8 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			}
 		}
 	};
-	private MessageGenerator mMessageGenerator = new MessageGenerator(this);
-	private PresenceGenerator mPresenceGenerator = new PresenceGenerator(this);
+	private MessageGenerator mMessageGenerator = new MessageGenerator();
+	private PresenceGenerator mPresenceGenerator = new PresenceGenerator();
 	private List<Account> accounts;
 	private JingleConnectionManager mJingleConnectionManager = new JingleConnectionManager(
 			this);
@@ -343,7 +342,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void attachLocationToConversation(final Conversation conversation,
 											 final Uri uri,
 											 final UiCallback<Message> callback) {
-		int encryption = conversation.getNextEncryption(forceEncryption());
+		int encryption = conversation.getNextEncryption(ConversationsPlusPreferences.forceEncryption());
 		if (encryption == Message.ENCRYPTION_PGP) {
 			encryption = Message.ENCRYPTION_DECRYPTED;
 		}
@@ -362,12 +361,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			final Uri uri,
 			final UiCallback<Message> callback) {
 		final Message message;
-		if (conversation.getNextEncryption(forceEncryption()) == Message.ENCRYPTION_PGP) {
+		boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
+		if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
 			message = new Message(conversation, "",
 					Message.ENCRYPTION_DECRYPTED);
 		} else {
 			message = new Message(conversation, "",
-					conversation.getNextEncryption(forceEncryption()));
+					conversation.getNextEncryption(forceEncryption));
 		}
 		message.setCounterpart(conversation.getNextCounterpart());
 		message.setType(Message.TYPE_FILE);
@@ -403,12 +403,13 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void attachImageToConversation(final Conversation conversation,
 			final Uri uri, final UiCallback<Message> callback) {
 		final Message message;
-		if (conversation.getNextEncryption(forceEncryption()) == Message.ENCRYPTION_PGP) {
+        final boolean forceEncryption = ConversationsPlusPreferences.forceEncryption();
+		if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
 			message = new Message(conversation, "",
 					Message.ENCRYPTION_DECRYPTED);
 		} else {
 			message = new Message(conversation, "",
-					conversation.getNextEncryption(forceEncryption()));
+					conversation.getNextEncryption(forceEncryption));
 		}
 		message.setCounterpart(conversation.getNextCounterpart());
 		message.setType(Message.TYPE_IMAGE);
@@ -418,7 +419,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			public void run() {
 				try {
 					getFileBackend().copyImageToPrivateStorage(message, uri);
-					if (conversation.getNextEncryption(forceEncryption()) == Message.ENCRYPTION_PGP) {
+					if (conversation.getNextEncryption(forceEncryption) == Message.ENCRYPTION_PGP) {
 						getPgpEngine().encrypt(message, callback);
 					} else {
 						callback.success(message);
@@ -462,7 +463,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 					mNotificationService.clear();
 					break;
 				case ACTION_DISABLE_FOREGROUND:
-					getPreferences().edit().putBoolean("keep_foreground_service",false).commit();
+					ConversationsPlusPreferences.commitKeepForegroundService(false);
 					toggleForegroundService();
 					break;
 				case ACTION_TRY_AGAIN:
@@ -555,7 +556,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	private void resetAllAttemptCounts(boolean reallyAll) {
-		Log.d(Config.LOGTAG,"resetting all attepmt counts");
+		Log.d(Config.LOGTAG, "resetting all attepmt counts");
 		for(Account account : accounts) {
 			if (account.hasErrorStatus() || reallyAll) {
 				final XmppConnection connection = account.getXmppConnection();
@@ -628,7 +629,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void toggleForegroundService() {
-		if (getPreferences().getBoolean("keep_foreground_service",false)) {
+		if (ConversationsPlusPreferences.keepForegroundService()) {
 			startForeground(NotificationService.FOREGROUND_NOTIFICATION_ID, this.mNotificationService.createForegroundNotification());
 		} else {
 			stopForeground(true);
@@ -638,7 +639,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	@Override
 	public void onTaskRemoved(final Intent rootIntent) {
 		super.onTaskRemoved(rootIntent);
-		if (!getPreferences().getBoolean("keep_foreground_service",false)) {
+		if (!ConversationsPlusPreferences.keepForegroundService()) {
 			this.logoutAndSave();
 		}
 	}
@@ -672,9 +673,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public XmppConnection createConnection(final Account account) {
-		final SharedPreferences sharedPref = getPreferences();
-		account.setResource(sharedPref.getString("resource", "mobile")
-				.toLowerCase(Locale.getDefault()));
+		account.setResource(ConversationsPlusPreferences.resource().toLowerCase(Locale.getDefault()));
 		final XmppConnection connection = new XmppConnection(account, this);
 		connection.setOnMessagePacketReceivedListener(this.mMessageParser);
 		connection.setOnStatusChangedListener(this.statusListener);
@@ -688,7 +687,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void sendChatState(Conversation conversation) {
-		if (sendChatStates()) {
+		if (ConversationsPlusPreferences.chatStates()) {
 			MessagePacket packet = mMessageGenerator.generateChatState(conversation);
 			sendMessagePacket(conversation.getAccount(), packet);
 		}
@@ -813,14 +812,14 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			}
 		} else {
 			conversation.add(message);
-			if (saveInDb && (message.getEncryption() == Message.ENCRYPTION_NONE || saveEncryptedMessages())) {
+			if (saveInDb && (message.getEncryption() == Message.ENCRYPTION_NONE || !ConversationsPlusPreferences.dontSaveEncrypted())) {
 				databaseBackend.createMessage(message);
 			}
 			updateConversationUi();
 		}
 		if (packet != null) {
 			if (conversation.setOutgoingChatState(Config.DEFAULT_CHATSTATE)) {
-				if (this.sendChatStates()) {
+				if (ConversationsPlusPreferences.chatStates()) {
 					packet.addChild(ChatState.toElement(conversation.getOutgoingChatState()));
 				}
 			}
@@ -1213,17 +1212,17 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	public void updateAccountPasswordOnServer(final Account account, final String newPassword, final OnAccountPasswordChanged callback) {
 		final IqPacket iq = getIqGenerator().generateSetPassword(account, newPassword);
 		sendIqPacket(account, iq, new OnIqPacketReceived() {
-			@Override
-			public void onIqPacketReceived(final Account account, final IqPacket packet) {
-				if (packet.getType() == IqPacket.TYPE.RESULT) {
-					account.setPassword(newPassword);
-					databaseBackend.updateAccount(account);
-					callback.onPasswordChangeSucceeded();
-				} else {
-					callback.onPasswordChangeFailed();
-				}
-			}
-		});
+            @Override
+            public void onIqPacketReceived(final Account account, final IqPacket packet) {
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    account.setPassword(newPassword);
+                    databaseBackend.updateAccount(account);
+                    callback.onPasswordChangeSucceeded();
+                } else {
+                    callback.onPasswordChangeFailed();
+                }
+            }
+        });
 	}
 
 	public void deleteAccount(final Account account) {
@@ -1558,7 +1557,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 			conversation.getMucOptions().setOffline();
 			conversation.deregisterWithBookmark();
 			Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid()
-					+ ": leaving muc " + conversation.getJid());
+                    + ": leaving muc " + conversation.getJid());
 		} else {
 			account.pendingConferenceLeaves.add(conversation);
 		}
@@ -1642,23 +1641,23 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		request.setTo(conversation.getJid().toBareJid());
 		request.query("http://jabber.org/protocol/disco#info");
 		sendIqPacket(conversation.getAccount(), request, new OnIqPacketReceived() {
-			@Override
-			public void onIqPacketReceived(Account account, IqPacket packet) {
-				if (packet.getType() != IqPacket.TYPE.ERROR) {
-					ArrayList<String> features = new ArrayList<>();
-					for (Element child : packet.query().getChildren()) {
-						if (child != null && child.getName().equals("feature")) {
-							String var = child.getAttribute("var");
-							if (var != null) {
-								features.add(var);
-							}
-						}
-					}
-					conversation.getMucOptions().updateFeatures(features);
-					updateConversationUi();
-				}
-			}
-		});
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                if (packet.getType() != IqPacket.TYPE.ERROR) {
+                    ArrayList<String> features = new ArrayList<>();
+                    for (Element child : packet.query().getChildren()) {
+                        if (child != null && child.getName().equals("feature")) {
+                            String var = child.getAttribute("var");
+                            if (var != null) {
+                                features.add(var);
+                            }
+                        }
+                    }
+                    conversation.getMucOptions().updateFeatures(features);
+                    updateConversationUi();
+                }
+            }
+        });
 	}
 
 	public void pushConferenceConfiguration(final Conversation conversation, final Bundle options, final OnConferenceOptionsPushed callback) {
@@ -1802,9 +1801,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void createContact(Contact contact) {
-		SharedPreferences sharedPref = getPreferences();
-		boolean autoGrant = sharedPref.getBoolean("grant_new_contacts", true);
-		if (autoGrant) {
+		if (ConversationsPlusPreferences.grantNewContacts()) {
 			contact.setOption(Contact.Options.PREEMPTIVE_GRANT);
 			contact.setOption(Contact.Options.ASKING);
 		}
@@ -1820,27 +1817,27 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 						+ otrSession.getSessionID().getUserID());
 		conversation.findUnsentMessagesWithOtrEncryption(new Conversation.OnMessageFound() {
 
-			@Override
-			public void onMessageFound(Message message) {
-				SessionID id = otrSession.getSessionID();
-				try {
-					message.setCounterpart(Jid.fromString(id.getAccountID() + "/" + id.getUserID()));
-				} catch (InvalidJidException e) {
-					return;
-				}
-				if (message.needsUploading()) {
-					mJingleConnectionManager.createNewConnection(message);
-				} else {
-					MessagePacket outPacket = mMessageGenerator.generateOtrChat(message, true);
-					if (outPacket != null) {
-						message.setStatus(Message.STATUS_SEND);
-						databaseBackend.updateMessage(message);
-						sendMessagePacket(account, outPacket);
-					}
-				}
-				updateConversationUi();
-			}
-		});
+            @Override
+            public void onMessageFound(Message message) {
+                SessionID id = otrSession.getSessionID();
+                try {
+                    message.setCounterpart(Jid.fromString(id.getAccountID() + "/" + id.getUserID()));
+                } catch (InvalidJidException e) {
+                    return;
+                }
+                if (message.needsUploading()) {
+                    mJingleConnectionManager.createNewConnection(message);
+                } else {
+                    MessagePacket outPacket = mMessageGenerator.generateOtrChat(message, true);
+                    if (outPacket != null) {
+                        message.setStatus(Message.STATUS_SEND);
+                        databaseBackend.updateMessage(message);
+                        sendMessagePacket(account, outPacket);
+                    }
+                }
+                updateConversationUi();
+            }
+        });
 	}
 
 	public boolean renewSymmetricKey(Conversation conversation) {
@@ -2040,31 +2037,31 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	private void fetchAvatarVcard(final Account account, final Avatar avatar, final UiCallback<Avatar> callback) {
 		IqPacket packet = this.mIqGenerator.retrieveVcardAvatar(avatar);
 		this.sendIqPacket(account, packet, new OnIqPacketReceived() {
-			@Override
-			public void onIqPacketReceived(Account account, IqPacket packet) {
-				synchronized (mInProgressAvatarFetches) {
-					mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
-				}
-				if (packet.getType() == IqPacket.TYPE.RESULT) {
-					Element vCard = packet.findChild("vCard", "vcard-temp");
-					Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
-					String image = photo != null ? photo.findChildContent("BINVAL") : null;
-					if (image != null) {
-						avatar.image = image;
-						if (getFileBackend().save(avatar)) {
-							Log.d(Config.LOGTAG, account.getJid().toBareJid()
-									+ ": successfully fetched vCard avatar for " + avatar.owner);
-							Contact contact = account.getRoster()
-									.getContact(avatar.owner);
-							contact.setAvatar(avatar);
-							getAvatarService().clear(contact);
-							updateConversationUi();
-							updateRosterUi();
-						}
-					}
-				}
-			}
-		});
+            @Override
+            public void onIqPacketReceived(Account account, IqPacket packet) {
+                synchronized (mInProgressAvatarFetches) {
+                    mInProgressAvatarFetches.remove(generateFetchKey(account, avatar));
+                }
+                if (packet.getType() == IqPacket.TYPE.RESULT) {
+                    Element vCard = packet.findChild("vCard", "vcard-temp");
+                    Element photo = vCard != null ? vCard.findChild("PHOTO") : null;
+                    String image = photo != null ? photo.findChildContent("BINVAL") : null;
+                    if (image != null) {
+                        avatar.image = image;
+                        if (getFileBackend().save(avatar)) {
+                            Log.d(Config.LOGTAG, account.getJid().toBareJid()
+                                    + ": successfully fetched vCard avatar for " + avatar.owner);
+                            Contact contact = account.getRoster()
+                                    .getContact(avatar.owner);
+                            contact.setAvatar(avatar);
+                            getAvatarService().clear(contact);
+                            updateConversationUi();
+                            updateRosterUi();
+                        }
+                    }
+                }
+            }
+        });
 	}
 
 	public void checkForAvatar(Account account, final UiCallback<Avatar> callback) {
@@ -2158,14 +2155,14 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 	}
 
 	public void invite(Conversation conversation, Jid contact) {
-		Log.d(Config.LOGTAG,conversation.getAccount().getJid().toBareJid()+": inviting "+contact+" to "+conversation.getJid().toBareJid());
+		Log.d(Config.LOGTAG, conversation.getAccount().getJid().toBareJid() + ": inviting " + contact + " to " + conversation.getJid().toBareJid());
 		MessagePacket packet = mMessageGenerator.invite(conversation, contact);
 		sendMessagePacket(conversation.getAccount(), packet);
 	}
 
 	public void directInvite(Conversation conversation, Jid jid) {
 		MessagePacket packet = mMessageGenerator.directInvite(conversation, jid);
-		sendMessagePacket(conversation.getAccount(),packet);
+		sendMessagePacket(conversation.getAccount(), packet);
 	}
 
 	public void resetSendingToWaiting(Account account) {
@@ -2224,30 +2221,6 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 		updateConversationUi();
 	}
 
-	public SharedPreferences getPreferences() {
-		return PreferenceManager
-				.getDefaultSharedPreferences(getApplicationContext());
-	}
-
-	public boolean forceEncryption() {
-		return getPreferences().getBoolean("force_encryption", false);
-	}
-	public boolean confirmMessages() {
-		return getPreferences().getBoolean("confirm_messages", true);
-	}
-
-	public boolean sendChatStates() {
-		return getPreferences().getBoolean("chat_states", false);
-	}
-
-	public boolean saveEncryptedMessages() {
-		return !getPreferences().getBoolean("dont_save_encrypted", false);
-	}
-
-	public boolean indicateReceived() {
-		return getPreferences().getBoolean("indicate_received", false);
-	}
-
 	public int unreadCount() {
 		int count = 0;
 		for(Conversation conversation : getConversations()) {
@@ -2357,8 +2330,7 @@ public class XmppConnectionService extends Service implements OnPhoneContactsLoa
 
 	public void updateMemorizingTrustmanager() {
 		final MemorizingTrustManager tm;
-		final boolean dontTrustSystemCAs = getPreferences().getBoolean("dont_trust_system_cas", false);
-		if (dontTrustSystemCAs) {
+		if (ConversationsPlusPreferences.dontTrustSystemCAs()) {
 			 tm = new MemorizingTrustManager(getApplicationContext(), null);
 		} else {
 			tm = new MemorizingTrustManager(getApplicationContext());