Merge pull request #668 from SamWhited/auth-pinning

Auth mechanism pinning

18 files changed, 295 insertions, 280 deletions

diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java
index b56d2a466..850cacc2a 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/DigestMd5.java
@@ -17,7 +17,13 @@ public class DigestMd5 extends SaslMechanism {
 		super(tagWriter, account, rng);
 	}
 
-	public static String getMechanism() {
+	@Override
+	public int getPriority() {
+		return 10;
+	}
+
+	@Override
+	public String getMechanism() {
 		return "DIGEST-MD5";
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java b/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java
index f7e7ee8ae..c7dedc5e4 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/Plain.java
@@ -12,7 +12,13 @@ public class Plain extends SaslMechanism {
 		super(tagWriter, account, null);
 	}
 
-	public static String getMechanism() {
+	@Override
+	public int getPriority() {
+		return 0;
+	}
+
+	@Override
+	public String getMechanism() {
 		return "PLAIN";
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java
index 7dd5e99c3..14d8b944b 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/SaslMechanism.java
@@ -44,6 +44,15 @@ public abstract class SaslMechanism {
 		this.rng = rng;
 	}
 
+	/**
+	 * The priority is used to pin the authentication mechanism. If authentication fails, it MAY be retried with another
+	 * mechanism of the same priority, but MUST NOT be tried with a mechanism of lower priority (to prevent downgrade
+	 * attacks).
+	 * @return An arbitrary int representing the priority
+	 */
+	public abstract int getPriority();
+
+	public abstract String getMechanism();
 	public String getClientFirstMessage() {
 		return "";
 	}
diff --git a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
index 2073de2d8..f3589fa28 100644
--- a/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
+++ b/src/main/java/eu/siacs/conversations/crypto/sasl/ScramSha1.java
@@ -43,7 +43,13 @@ public class ScramSha1 extends SaslMechanism {
 		clientFirstMessageBare = "";
 	}
 
-	public static String getMechanism() {
+	@Override
+	public int getPriority() {
+		return 20;
+	}
+
+	@Override
+	public String getMechanism() {
 		return "SCRAM-SHA-1";
 	}
 
diff --git a/src/main/java/eu/siacs/conversations/entities/Account.java b/src/main/java/eu/siacs/conversations/entities/Account.java
index 8b6a7bd72..10f2940c2 100644
--- a/src/main/java/eu/siacs/conversations/entities/Account.java
+++ b/src/main/java/eu/siacs/conversations/entities/Account.java
@@ -34,30 +34,83 @@ public class Account extends AbstractEntity {
 	public static final String KEYS = "keys";
 	public static final String AVATAR = "avatar";
 
+	public static final String PINNED_MECHANISM_KEY = "pinned_mechanism";
+
 	public static final int OPTION_USETLS = 0;
 	public static final int OPTION_DISABLED = 1;
 	public static final int OPTION_REGISTER = 2;
 	public static final int OPTION_USECOMPRESSION = 3;
 
-	public static final int STATUS_CONNECTING = 0;
-	public static final int STATUS_DISABLED = -2;
-	public static final int STATUS_OFFLINE = -1;
-	public static final int STATUS_ONLINE = 1;
-	public static final int STATUS_NO_INTERNET = 2;
-	public static final int STATUS_UNAUTHORIZED = 3;
-	public static final int STATUS_SERVER_NOT_FOUND = 5;
-
-	public static final int STATUS_REGISTRATION_FAILED = 7;
-	public static final int STATUS_REGISTRATION_CONFLICT = 8;
-	public static final int STATUS_REGISTRATION_SUCCESSFULL = 9;
-	public static final int STATUS_REGISTRATION_NOT_SUPPORTED = 10;
+	public static enum State {
+		DISABLED,
+		OFFLINE,
+		CONNECTING,
+		ONLINE,
+		NO_INTERNET,
+		UNAUTHORIZED(true),
+		SERVER_NOT_FOUND(true),
+		REGISTRATION_FAILED(true),
+		REGISTRATION_CONFLICT(true),
+		REGISTRATION_SUCCESSFUL,
+		REGISTRATION_NOT_SUPPORTED(true),
+		SECURITY_ERROR(true),
+		INCOMPATIBLE_SERVER(true);
+
+		private boolean isError;
+
+		public boolean isError() {
+			return this.isError;
+		}
+
+		private State(final boolean isError) {
+			this.isError = isError;
+		}
+
+		private State() {
+			this(false);
+		}
+
+		public int getReadableId() {
+			switch (this) {
+				case DISABLED:
+					return R.string.account_status_disabled;
+				case ONLINE:
+					return R.string.account_status_online;
+				case CONNECTING:
+					return R.string.account_status_connecting;
+				case OFFLINE:
+					return R.string.account_status_offline;
+				case UNAUTHORIZED:
+					return R.string.account_status_unauthorized;
+				case SERVER_NOT_FOUND:
+					return R.string.account_status_not_found;
+				case NO_INTERNET:
+					return R.string.account_status_no_internet;
+				case REGISTRATION_FAILED:
+					return R.string.account_status_regis_fail;
+				case REGISTRATION_CONFLICT:
+					return R.string.account_status_regis_conflict;
+				case REGISTRATION_SUCCESSFUL:
+					return R.string.account_status_regis_success;
+				case REGISTRATION_NOT_SUPPORTED:
+					return R.string.account_status_regis_not_sup;
+				case SECURITY_ERROR:
+					return R.string.account_status_security_error;
+				case INCOMPATIBLE_SERVER:
+					return R.string.account_status_incompatible_server;
+				default:
+					return R.string.account_status_unknown;
+			}
+		}
+	}
+
 	public List<Conversation> pendingConferenceJoins = new CopyOnWriteArrayList<>();
 	public List<Conversation> pendingConferenceLeaves = new CopyOnWriteArrayList<>();
 	protected Jid jid;
 	protected String password;
 	protected int options = 0;
 	protected String rosterVersion;
-	protected int status = -1;
+	protected State status = State.OFFLINE;
 	protected JSONObject keys = new JSONObject();
 	protected String avatar;
 	protected boolean online = false;
@@ -79,8 +132,8 @@ public class Account extends AbstractEntity {
 	}
 
 	public Account(final String uuid, final Jid jid,
-				   final String password, final int options, final String rosterVersion, final String keys,
-				   final String avatar) {
+			final String password, final int options, final String rosterVersion, final String keys,
+			final String avatar) {
 		this.uuid = uuid;
 		this.jid = jid;
 		if (jid.isBareJid()) {
@@ -149,28 +202,24 @@ public class Account extends AbstractEntity {
 		this.password = password;
 	}
 
-	public int getStatus() {
+	public State getStatus() {
 		if (isOptionSet(OPTION_DISABLED)) {
-			return STATUS_DISABLED;
+			return State.DISABLED;
 		} else {
 			return this.status;
 		}
 	}
 
-	public void setStatus(final int status) {
+	public void setStatus(final State status) {
 		this.status = status;
 	}
 
 	public boolean errorStatus() {
-		int s = getStatus();
-		return (s == STATUS_REGISTRATION_FAILED
-				|| s == STATUS_REGISTRATION_CONFLICT
-				|| s == STATUS_REGISTRATION_NOT_SUPPORTED
-				|| s == STATUS_SERVER_NOT_FOUND || s == STATUS_UNAUTHORIZED);
+		return getStatus().isError();
 	}
 
 	public boolean hasErrorStatus() {
-		return getXmppConnection() != null && getStatus() > STATUS_NO_INTERNET && (getXmppConnection().getAttempt() >= 2);
+		return getXmppConnection() != null && getStatus().isError() && getXmppConnection().getAttempt() >= 2;
 	}
 
 	public String getResource() {
@@ -250,7 +299,7 @@ public class Account extends AbstractEntity {
 		if (this.otrFingerprint == null) {
 			try {
 				DSAPublicKey pubkey = (DSAPublicKey) this.otrEngine
-						.getPublicKey();
+					.getPublicKey();
 				if (pubkey == null) {
 					return null;
 				}
@@ -350,39 +399,9 @@ public class Account extends AbstractEntity {
 		return this.avatar;
 	}
 
-	public int getReadableStatusId() {
-		switch (getStatus()) {
-
-			case Account.STATUS_DISABLED:
-				return R.string.account_status_disabled;
-			case Account.STATUS_ONLINE:
-				return R.string.account_status_online;
-			case Account.STATUS_CONNECTING:
-				return R.string.account_status_connecting;
-			case Account.STATUS_OFFLINE:
-				return R.string.account_status_offline;
-			case Account.STATUS_UNAUTHORIZED:
-				return R.string.account_status_unauthorized;
-			case Account.STATUS_SERVER_NOT_FOUND:
-				return R.string.account_status_not_found;
-			case Account.STATUS_NO_INTERNET:
-				return R.string.account_status_no_internet;
-			case Account.STATUS_REGISTRATION_FAILED:
-				return R.string.account_status_regis_fail;
-			case Account.STATUS_REGISTRATION_CONFLICT:
-				return R.string.account_status_regis_conflict;
-			case Account.STATUS_REGISTRATION_SUCCESSFULL:
-				return R.string.account_status_regis_success;
-			case Account.STATUS_REGISTRATION_NOT_SUPPORTED:
-				return R.string.account_status_regis_not_sup;
-			default:
-				return R.string.account_status_unknown;
-		}
-	}
-
 	public void activateGracePeriod() {
 		this.mEndGracePeriod = SystemClock.elapsedRealtime()
-				+ (Config.CARBON_GRACE_PERIOD * 1000);
+			+ (Config.CARBON_GRACE_PERIOD * 1000);
 	}
 
 	public void deactivateGracePeriod() {
diff --git a/src/main/java/eu/siacs/conversations/services/NotificationService.java b/src/main/java/eu/siacs/conversations/services/NotificationService.java
index 8b544efc7..c23a95b9e 100644
--- a/src/main/java/eu/siacs/conversations/services/NotificationService.java
+++ b/src/main/java/eu/siacs/conversations/services/NotificationService.java
@@ -365,7 +365,7 @@ public class NotificationService {
 	}
 
 	private boolean inMiniGracePeriod(Account account) {
-		int miniGrace = account.getStatus() == Account.STATUS_ONLINE ? Config.MINI_GRACE_PERIOD
+		int miniGrace = account.getStatus() == Account.State.ONLINE ? Config.MINI_GRACE_PERIOD
 				: Config.MINI_GRACE_PERIOD * 2;
 		return SystemClock.elapsedRealtime() < (this.mLastNotification + miniGrace);
 	}
diff --git a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
index 42ec4f77a..0c5dfd961 100644
--- a/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
+++ b/src/main/java/eu/siacs/conversations/services/XmppConnectionService.java
@@ -156,7 +156,7 @@ public class XmppConnectionService extends Service {
 			if (mOnAccountUpdate != null) {
 				mOnAccountUpdate.onAccountUpdate();
 			}
-			if (account.getStatus() == Account.STATUS_ONLINE) {
+			if (account.getStatus() == Account.State.ONLINE) {
 				for (Conversation conversation : account.pendingConferenceLeaves) {
 					leaveMuc(conversation);
 				}
@@ -184,17 +184,17 @@ public class XmppConnectionService extends Service {
 				}
 				syncDirtyContacts(account);
 				scheduleWakeupCall(Config.PING_MAX_INTERVAL, true);
-			} else if (account.getStatus() == Account.STATUS_OFFLINE) {
+			} else if (account.getStatus() == Account.State.OFFLINE) {
 				resetSendingToWaiting(account);
 				if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 					int timeToReconnect = mRandom.nextInt(50) + 10;
 					scheduleWakeupCall(timeToReconnect, false);
 				}
-			} else if (account.getStatus() == Account.STATUS_REGISTRATION_SUCCESSFULL) {
+			} else if (account.getStatus() == Account.State.REGISTRATION_SUCCESSFUL) {
 				databaseBackend.updateAccount(account);
 				reconnectAccount(account, true);
-			} else if ((account.getStatus() != Account.STATUS_CONNECTING)
-					&& (account.getStatus() != Account.STATUS_NO_INTERNET)) {
+			} else if ((account.getStatus() != Account.State.CONNECTING)
+					&& (account.getStatus() != Account.State.NO_INTERNET)) {
 				if (connection != null) {
 					int next = connection.getTimeToNextAttempt();
 					Log.d(Config.LOGTAG, account.getJid().toBareJid()
@@ -203,7 +203,7 @@ public class XmppConnectionService extends Service {
 							+ (connection.getAttempt() + 1) + " time");
 					scheduleWakeupCall((int) (next * 1.2), false);
 				}
-			}
+					}
 			UIHelper.showErrorNotification(getApplicationContext(),
 					getAccounts());
 		}
@@ -261,11 +261,11 @@ public class XmppConnectionService extends Service {
 				if (conversation.getAccount() == account) {
 					for (Message message : conversation.getMessages()) {
 						if ((message.getStatus() == Message.STATUS_UNSEND || message
-								.getStatus() == Message.STATUS_WAITING)
+									.getStatus() == Message.STATUS_WAITING)
 								&& message.getUuid().equals(uuid)) {
 							markMessage(message, Message.STATUS_SEND);
 							return;
-						}
+								}
 					}
 				}
 			}
@@ -279,8 +279,8 @@ public class XmppConnectionService extends Service {
 		if (pgpServiceConnection.isBound()) {
 			if (this.mPgpEngine == null) {
 				this.mPgpEngine = new PgpEngine(new OpenPgpApi(
-						getApplicationContext(),
-						pgpServiceConnection.getService()), this);
+							getApplicationContext(),
+							pgpServiceConnection.getService()), this);
 			}
 			return mPgpEngine;
 		} else {
@@ -340,7 +340,7 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void attachImageToConversation(final Conversation conversation,
-											 final Uri uri, final UiCallback<Message> callback) {
+			final Uri uri, final UiCallback<Message> callback) {
 		final Message message;
 		if (conversation.getNextEncryption(forceEncryption()) == Message.ENCRYPTION_PGP) {
 			message = new Message(conversation, "",
@@ -399,22 +399,22 @@ public class XmppConnectionService extends Service {
 		for (Account account : accounts) {
 			if (!account.isOptionSet(Account.OPTION_DISABLED)) {
 				if (!hasInternetConnection()) {
-					account.setStatus(Account.STATUS_NO_INTERNET);
+					account.setStatus(Account.State.NO_INTERNET);
 					if (statusListener != null) {
 						statusListener.onStatusChanged(account);
 					}
 				} else {
-					if (account.getStatus() == Account.STATUS_NO_INTERNET) {
-						account.setStatus(Account.STATUS_OFFLINE);
+					if (account.getStatus() == Account.State.NO_INTERNET) {
+						account.setStatus(Account.State.OFFLINE);
 						if (statusListener != null) {
 							statusListener.onStatusChanged(account);
 						}
 					}
-					if (account.getStatus() == Account.STATUS_ONLINE) {
+					if (account.getStatus() == Account.State.ONLINE) {
 						long lastReceived = account.getXmppConnection()
-								.getLastPacketReceived();
+							.getLastPacketReceived();
 						long lastSent = account.getXmppConnection()
-								.getLastPingSent();
+							.getLastPingSent();
 						if (lastSent - lastReceived >= Config.PING_TIMEOUT * 1000) {
 							Log.d(Config.LOGTAG, account.getJid()
 									+ ": ping timeout");
@@ -423,15 +423,15 @@ public class XmppConnectionService extends Service {
 							account.getXmppConnection().sendPing();
 							this.scheduleWakeupCall(2, false);
 						}
-					} else if (account.getStatus() == Account.STATUS_OFFLINE) {
+					} else if (account.getStatus() == Account.State.OFFLINE) {
 						if (account.getXmppConnection() == null) {
 							account.setXmppConnection(this
 									.createConnection(account));
 						}
 						new Thread(account.getXmppConnection()).start();
-					} else if ((account.getStatus() == Account.STATUS_CONNECTING)
+					} else if ((account.getStatus() == Account.State.CONNECTING)
 							&& ((SystemClock.elapsedRealtime() - account
-							.getXmppConnection().getLastConnect()) / 1000 >= Config.CONNECT_TIMEOUT)) {
+									.getXmppConnection().getLastConnect()) / 1000 >= Config.CONNECT_TIMEOUT)) {
 						Log.d(Config.LOGTAG, account.getJid()
 								+ ": time out during connect reconnecting");
 						reconnectAccount(account, true);
@@ -449,9 +449,9 @@ public class XmppConnectionService extends Service {
 			}
 		}
 		/*PowerManager pm = (PowerManager) this.getSystemService(Context.POWER_SERVICE);
-		if (!pm.isScreenOn()) {
+			if (!pm.isScreenOn()) {
 			removeStaleListeners();
-		}*/
+			}*/
 		if (wakeLock.isHeld()) {
 			try {
 				wakeLock.release();
@@ -463,7 +463,7 @@ public class XmppConnectionService extends Service {
 
 	public boolean hasInternetConnection() {
 		ConnectivityManager cm = (ConnectivityManager) getApplicationContext()
-				.getSystemService(Context.CONNECTIVITY_SERVICE);
+			.getSystemService(Context.CONNECTIVITY_SERVICE);
 		NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
 		return activeNetwork != null && activeNetwork.isConnected();
 	}
@@ -487,7 +487,7 @@ public class XmppConnectionService extends Service {
 		};
 
 		this.databaseBackend = DatabaseBackend
-				.getInstance(getApplicationContext());
+			.getInstance(getApplicationContext());
 		this.accounts = databaseBackend.getAccounts();
 
 		for (Account account : this.accounts) {
@@ -534,7 +534,7 @@ public class XmppConnectionService extends Service {
 		}
 		Context context = getApplicationContext();
 		AlarmManager alarmManager = (AlarmManager) context
-				.getSystemService(Context.ALARM_SERVICE);
+			.getSystemService(Context.ALARM_SERVICE);
 		Intent intent = new Intent(context, EventReceiver.class);
 		alarmManager.cancel(PendingIntent.getBroadcast(context, 0, intent, 0));
 		Log.d(Config.LOGTAG, "good bye");
@@ -545,7 +545,7 @@ public class XmppConnectionService extends Service {
 		long timeToWake = SystemClock.elapsedRealtime() + seconds * 1000;
 		Context context = getApplicationContext();
 		AlarmManager alarmManager = (AlarmManager) context
-				.getSystemService(Context.ALARM_SERVICE);
+			.getSystemService(Context.ALARM_SERVICE);
 
 		if (ping) {
 			if (this.pingIntent == null) {
@@ -566,7 +566,7 @@ public class XmppConnectionService extends Service {
 							context, 0, this.pingIntent, 0);
 					alarmManager.set(AlarmManager.ELAPSED_REALTIME_WAKEUP,
 							timeToWake, pendingPingIntent);
-				}
+						}
 			}
 		} else {
 			Intent intent = new Intent(context, EventReceiver.class);
@@ -591,7 +591,7 @@ public class XmppConnectionService extends Service {
 		connection.setOnJinglePacketReceivedListener(this.jingleListener);
 		connection.setOnBindListener(this.mOnBindListener);
 		connection
-				.setOnMessageAcknowledgeListener(this.mOnMessageAcknowledgedListener);
+			.setOnMessageAcknowledgeListener(this.mOnMessageAcknowledgedListener);
 		return connection;
 	}
 
@@ -602,7 +602,7 @@ public class XmppConnectionService extends Service {
 		MessagePacket packet = null;
 		boolean saveInDb = true;
 		boolean send = false;
-		if (account.getStatus() == Account.STATUS_ONLINE
+		if (account.getStatus() == Account.State.ONLINE
 				&& account.getXmppConnection() != null) {
 			if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) {
 				if (message.getCounterpart() != null) {
@@ -614,8 +614,8 @@ public class XmppConnectionService extends Service {
 						} else if (conv.hasValidOtrSession()
 								&& conv.getOtrSession().getSessionStatus() == SessionStatus.ENCRYPTED) {
 							mJingleConnectionManager
-									.createNewConnection(message);
-						}
+								.createNewConnection(message);
+								}
 					} else {
 						mJingleConnectionManager.createNewConnection(message);
 					}
@@ -656,7 +656,7 @@ public class XmppConnectionService extends Service {
 			if (!account.getXmppConnection().getFeatures().sm()
 					&& conv.getMode() != Conversation.MODE_MULTI) {
 				message.setStatus(Message.STATUS_SEND);
-			}
+					}
 		} else {
 			message.setStatus(Message.STATUS_WAITING);
 			if (message.getType() == Message.TYPE_TEXT) {
@@ -673,7 +673,7 @@ public class XmppConnectionService extends Service {
 					if (!conv.hasValidOtrSession()
 							&& message.getCounterpart() != null) {
 						conv.startOtrSession(this, message.getCounterpart().getResourcepart(), false);
-					}
+							}
 				}
 			}
 
@@ -683,7 +683,7 @@ public class XmppConnectionService extends Service {
 			if (message.getEncryption() == Message.ENCRYPTION_NONE
 					|| saveEncryptedMessages()) {
 				databaseBackend.createMessage(message);
-			}
+					}
 		}
 		if ((send) && (packet != null)) {
 			sendMessagePacket(account, packet);
@@ -705,7 +705,7 @@ public class XmppConnectionService extends Service {
 		MessagePacket packet = null;
 		if (message.getEncryption() == Message.ENCRYPTION_OTR) {
 			Presences presences = message.getConversation().getContact()
-					.getPresences();
+				.getPresences();
 			if (!message.getConversation().hasValidOtrSession()) {
 				if ((message.getCounterpart() != null)
 						&& (presences.has(message.getCounterpart().getResourcepart()))) {
@@ -732,7 +732,7 @@ public class XmppConnectionService extends Service {
 					} catch (InvalidJidException e) {
 
 					}
-				}
+						}
 			}
 		} else if (message.getType() == Message.TYPE_TEXT) {
 			if (message.getEncryption() == Message.ENCRYPTION_NONE) {
@@ -740,7 +740,7 @@ public class XmppConnectionService extends Service {
 			} else if ((message.getEncryption() == Message.ENCRYPTION_DECRYPTED)
 					|| (message.getEncryption() == Message.ENCRYPTION_PGP)) {
 				packet = mMessageGenerator.generatePgpChat(message, true);
-			}
+					}
 		} else if (message.getType() == Message.TYPE_IMAGE || message.getType() == Message.TYPE_FILE) {
 			Contact contact = message.getConversation().getContact();
 			Presences presences = contact.getPresences();
@@ -787,7 +787,7 @@ public class XmppConnectionService extends Service {
 
 					@Override
 					public void onIqPacketReceived(final Account account,
-												   IqPacket packet) {
+							IqPacket packet) {
 						Element query = packet.findChild("query");
 						if (query != null) {
 							account.getRoster().markAllAsNotInRoster();
@@ -863,11 +863,11 @@ public class XmppConnectionService extends Service {
 									break;
 								}
 								final Contact contact = account.getRoster()
-										.getContact(jid);
+									.getContact(jid);
 								String systemAccount = phoneContact
-										.getInt("phoneid")
-										+ "#"
-										+ phoneContact.getString("lookup");
+									.getInt("phoneid")
+									+ "#"
+									+ phoneContact.getString("lookup");
 								contact.setSystemAccount(systemAccount);
 								contact.setPhotoUri(phoneContact
 										.getString("photouri"));
@@ -887,7 +887,7 @@ public class XmppConnectionService extends Service {
 				accountLookupTable.put(account.getUuid(), account);
 			}
 			this.conversations = databaseBackend
-					.getConversations(Conversation.STATUS_AVAILABLE);
+				.getConversations(Conversation.STATUS_AVAILABLE);
 			for (Conversation conv : this.conversations) {
 				Account account = accountLookupTable.get(conv.getAccountUuid());
 				conv.setAccount(account);
@@ -905,7 +905,7 @@ public class XmppConnectionService extends Service {
 				if (!getFileBackend().isFileAvailable(message)) {
 					message.setDownloadable(new DownloadablePlaceholder(Downloadable.STATUS_DELETED));
 				}
-			}
+					}
 		}
 	}
 
@@ -920,7 +920,7 @@ public class XmppConnectionService extends Service {
 						updateConversationUi();
 					}
 					return;
-				}
+						}
 			}
 		}
 	}
@@ -930,7 +930,7 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void populateWithOrderedConversations(List<Conversation> list,
-												 boolean includeConferences) {
+			boolean includeConferences) {
 		list.clear();
 		if (includeConferences) {
 			list.addAll(getConversations());
@@ -981,19 +981,19 @@ public class XmppConnectionService extends Service {
 	}
 
 	public Conversation find(final List<Conversation> haystack,
-							 final Account account,
-							 final Jid jid) {
+			final Account account,
+			final Jid jid) {
 		for (Conversation conversation : haystack) {
 			if ((account == null || conversation.getAccount() == account)
 					&& (conversation.getContactJid().toBareJid().equals(jid.toBareJid()))) {
 				return conversation;
-			}
+					}
 		}
 		return null;
 	}
 
 	public Conversation findOrCreateConversation(final Account account, final Jid jid,
-												 final boolean muc) {
+			final boolean muc) {
 		Conversation conversation = find(account, jid);
 		if (conversation != null) {
 			return conversation;
@@ -1008,7 +1008,7 @@ public class XmppConnectionService extends Service {
 				conversation.setMode(Conversation.MODE_SINGLE);
 			}
 			conversation.setMessages(databaseBackend.getMessages(conversation,
-					50));
+						50));
 			this.databaseBackend.updateConversation(conversation);
 		} else {
 			String conversationName;
@@ -1034,7 +1034,7 @@ public class XmppConnectionService extends Service {
 
 	public void archiveConversation(Conversation conversation) {
 		if (conversation.getMode() == Conversation.MODE_MULTI) {
-			if (conversation.getAccount().getStatus() == Account.STATUS_ONLINE) {
+			if (conversation.getAccount().getStatus() == Account.State.ONLINE) {
 				Bookmark bookmark = conversation.getBookmark();
 				if (bookmark != null && bookmark.autojoin()) {
 					bookmark.setAutojoin(false);
@@ -1139,9 +1139,9 @@ public class XmppConnectionService extends Service {
 			OnConversationUpdate listener) {
 		/*if (!isScreenOn()) {
 			Log.d(Config.LOGTAG,
-					"ignoring setOnConversationListChangedListener");
+			"ignoring setOnConversationListChangedListener");
 			return;
-		}*/
+			}*/
 		synchronized (this.convChangedListenerCount) {
 			if (checkListeners()) {
 				switchToForeground();
@@ -1150,7 +1150,7 @@ public class XmppConnectionService extends Service {
 			this.mNotificationService.setIsInForeground(true);
 			this.convChangedListenerCount++;
 		}
-	}
+			}
 
 	public void removeOnConversationListChangedListener() {
 		synchronized (this.convChangedListenerCount) {
@@ -1170,7 +1170,7 @@ public class XmppConnectionService extends Service {
 		/*if (!isScreenOn()) {
 			Log.d(Config.LOGTAG, "ignoring setOnAccountListChangedListener");
 			return;
-		}*/
+			}*/
 		synchronized (this.accountChangedListenerCount) {
 			if (checkListeners()) {
 				switchToForeground();
@@ -1197,7 +1197,7 @@ public class XmppConnectionService extends Service {
 		/*if (!isScreenOn()) {
 			Log.d(Config.LOGTAG, "ignoring setOnRosterUpdateListener");
 			return;
-		}*/
+			}*/
 		synchronized (this.rosterChangedListenerCount) {
 			if (checkListeners()) {
 				switchToForeground();
@@ -1227,7 +1227,7 @@ public class XmppConnectionService extends Service {
 
 	private void switchToForeground() {
 		for (Account account : getAccounts()) {
-			if (account.getStatus() == Account.STATUS_ONLINE) {
+			if (account.getStatus() == Account.State.ONLINE) {
 				XmppConnection connection = account.getXmppConnection();
 				if (connection != null && connection.getFeatures().csi()) {
 					connection.sendActive();
@@ -1239,7 +1239,7 @@ public class XmppConnectionService extends Service {
 
 	private void switchToBackground() {
 		for (Account account : getAccounts()) {
-			if (account.getStatus() == Account.STATUS_ONLINE) {
+			if (account.getStatus() == Account.State.ONLINE) {
 				XmppConnection connection = account.getXmppConnection();
 				if (connection != null && connection.getFeatures().csi()) {
 					connection.sendInactive();
@@ -1252,7 +1252,7 @@ public class XmppConnectionService extends Service {
 
 	private boolean isScreenOn() {
 		PowerManager pm = (PowerManager) this
-				.getSystemService(Context.POWER_SERVICE);
+			.getSystemService(Context.POWER_SERVICE);
 		return pm.isScreenOn();
 	}
 
@@ -1262,7 +1262,7 @@ public class XmppConnectionService extends Service {
 			if ((conversation.getMode() == Conversation.MODE_MULTI)
 					&& (conversation.getAccount() == account)) {
 				joinMuc(conversation);
-			}
+					}
 		}
 	}
 
@@ -1270,7 +1270,7 @@ public class XmppConnectionService extends Service {
 		Account account = conversation.getAccount();
 		account.pendingConferenceJoins.remove(conversation);
 		account.pendingConferenceLeaves.remove(conversation);
-		if (account.getStatus() == Account.STATUS_ONLINE) {
+		if (account.getStatus() == Account.State.ONLINE) {
 			Log.d(Config.LOGTAG,
 					"joining conversation " + conversation.getContactJid());
 			String nick = conversation.getMucOptions().getProposedNick();
@@ -1363,7 +1363,7 @@ public class XmppConnectionService extends Service {
 		} else {
 			conversation.setContactJid(options.getJoinJid());
 			databaseBackend.updateConversation(conversation);
-			if (conversation.getAccount().getStatus() == Account.STATUS_ONLINE) {
+			if (conversation.getAccount().getStatus() == Account.State.ONLINE) {
 				Bookmark bookmark = conversation.getBookmark();
 				if (bookmark != null) {
 					bookmark.setNick(nick);
@@ -1378,7 +1378,7 @@ public class XmppConnectionService extends Service {
 		Account account = conversation.getAccount();
 		account.pendingConferenceJoins.remove(conversation);
 		account.pendingConferenceLeaves.remove(conversation);
-		if (account.getStatus() == Account.STATUS_ONLINE) {
+		if (account.getStatus() == Account.State.ONLINE) {
 			PresencePacket packet = new PresencePacket();
 			packet.setTo(conversation.getMucOptions().getJoinJid());
 			packet.setFrom(conversation.getAccount().getJid());
@@ -1394,8 +1394,8 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void disconnect(Account account, boolean force) {
-		if ((account.getStatus() == Account.STATUS_ONLINE)
-				|| (account.getStatus() == Account.STATUS_DISABLED)) {
+		if ((account.getStatus() == Account.State.ONLINE)
+				|| (account.getStatus() == Account.State.DISABLED)) {
 			if (!force) {
 				List<Conversation> conversations = getConversations();
 				for (Conversation conversation : conversations) {
@@ -1413,7 +1413,7 @@ public class XmppConnectionService extends Service {
 				}
 			}
 			account.getXmppConnection().disconnect(force);
-		}
+				}
 	}
 
 	@Override
@@ -1453,8 +1453,8 @@ public class XmppConnectionService extends Service {
 		Session otrSession = conversation.getOtrSession();
 		Log.d(Config.LOGTAG,
 				account.getJid().toBareJid() + " otr session established with "
-						+ conversation.getContactJid() + "/"
-						+ otrSession.getSessionID().getUserID());
+				+ conversation.getContactJid() + "/"
+				+ otrSession.getSessionID().getUserID());
 		for (Message msg : messages) {
 			if ((msg.getStatus() == Message.STATUS_UNSEND || msg.getStatus() == Message.STATUS_WAITING)
 					&& (msg.getEncryption() == Message.ENCRYPTION_OTR)) {
@@ -1466,7 +1466,7 @@ public class XmppConnectionService extends Service {
 				}
 				if (msg.getType() == Message.TYPE_TEXT) {
 					MessagePacket outPacket = mMessageGenerator
-							.generateOtrChat(msg, true);
+						.generateOtrChat(msg, true);
 					if (outPacket != null) {
 						msg.setStatus(Message.STATUS_SEND);
 						databaseBackend.updateMessage(msg);
@@ -1475,7 +1475,7 @@ public class XmppConnectionService extends Service {
 				} else if (msg.getType() == Message.TYPE_IMAGE || msg.getType() == Message.TYPE_FILE) {
 					mJingleConnectionManager.createNewConnection(msg);
 				}
-			}
+					}
 		}
 		updateConversationUi();
 	}
@@ -1496,7 +1496,7 @@ public class XmppConnectionService extends Service {
 			try {
 				packet.setBody(otrSession
 						.transformSending(CryptoHelper.FILETRANSFER
-								+ CryptoHelper.bytesToHex(symmetricKey)));
+							+ CryptoHelper.bytesToHex(symmetricKey)));
 				sendMessagePacket(account, packet);
 				conversation.setSymmetricKey(symmetricKey);
 				return true;
@@ -1511,11 +1511,11 @@ public class XmppConnectionService extends Service {
 		contact.resetOption(Contact.Options.DIRTY_DELETE);
 		contact.setOption(Contact.Options.DIRTY_PUSH);
 		Account account = contact.getAccount();
-		if (account.getStatus() == Account.STATUS_ONLINE) {
+		if (account.getStatus() == Account.State.ONLINE) {
 			boolean ask = contact.getOption(Contact.Options.ASKING);
 			boolean sendUpdates = contact
-					.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
-					&& contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
+				.getOption(Contact.Options.PENDING_SUBSCRIPTION_REQUEST)
+				&& contact.getOption(Contact.Options.PREEMPTIVE_GRANT);
 			IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
 			iq.query("jabber:iq:roster").addChild(contact.asElement());
 			account.getXmppConnection().sendIqPacket(iq, null);
@@ -1531,11 +1531,11 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void publishAvatar(Account account, Uri image,
-							  final UiCallback<Avatar> callback) {
+			final UiCallback<Avatar> callback) {
 		final Bitmap.CompressFormat format = Config.AVATAR_FORMAT;
 		final int size = Config.AVATAR_SIZE;
 		final Avatar avatar = getFileBackend()
-				.getPepAvatar(image, size, format);
+			.getPepAvatar(image, size, format);
 		if (avatar != null) {
 			avatar.height = size;
 			avatar.width = size;
@@ -1557,12 +1557,12 @@ public class XmppConnectionService extends Service {
 				public void onIqPacketReceived(Account account, IqPacket result) {
 					if (result.getType() == IqPacket.TYPE_RESULT) {
 						IqPacket packet = XmppConnectionService.this.mIqGenerator
-								.publishAvatarMetadata(avatar);
+							.publishAvatarMetadata(avatar);
 						sendIqPacket(account, packet, new OnIqPacketReceived() {
 
 							@Override
 							public void onIqPacketReceived(Account account,
-														   IqPacket result) {
+									IqPacket result) {
 								if (result.getType() == IqPacket.TYPE_RESULT) {
 									if (account.setAvatar(avatar.getFilename())) {
 										databaseBackend.updateAccount(account);
@@ -1592,14 +1592,14 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void fetchAvatar(Account account, final Avatar avatar,
-							final UiCallback<Avatar> callback) {
+			final UiCallback<Avatar> callback) {
 		IqPacket packet = this.mIqGenerator.retrieveAvatar(avatar);
 		sendIqPacket(account, packet, new OnIqPacketReceived() {
 
 			@Override
 			public void onIqPacketReceived(Account account, IqPacket result) {
 				final String ERROR = account.getJid().toBareJid()
-						+ ": fetching avatar for " + avatar.owner + " failed ";
+					+ ": fetching avatar for " + avatar.owner + " failed ";
 				if (result.getType() == IqPacket.TYPE_RESULT) {
 					avatar.image = mIqParser.avatarData(result);
 					if (avatar.image != null) {
@@ -1613,7 +1613,7 @@ public class XmppConnectionService extends Service {
 								updateAccountUi();
 							} else {
 								Contact contact = account.getRoster()
-										.getContact(avatar.owner);
+									.getContact(avatar.owner);
 								contact.setAvatar(avatar.getFilename());
 								getAvatarService().clear(contact);
 								updateConversationUi();
@@ -1648,7 +1648,7 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void checkForAvatar(Account account,
-							   final UiCallback<Avatar> callback) {
+			final UiCallback<Avatar> callback) {
 		IqPacket packet = this.mIqGenerator.retrieveAvatarMetaData(null);
 		this.sendIqPacket(account, packet, new OnIqPacketReceived() {
 
@@ -1687,7 +1687,7 @@ public class XmppConnectionService extends Service {
 		contact.resetOption(Contact.Options.DIRTY_PUSH);
 		contact.setOption(Contact.Options.DIRTY_DELETE);
 		Account account = contact.getAccount();
-		if (account.getStatus() == Account.STATUS_ONLINE) {
+		if (account.getStatus() == Account.State.ONLINE) {
 			IqPacket iq = new IqPacket(IqPacket.TYPE_SET);
 			Element item = iq.query("jabber:iq:roster").addChild("item");
 			item.setAttribute("jid", contact.getJid().toString());
@@ -1736,14 +1736,14 @@ public class XmppConnectionService extends Service {
 					if (message.getType() != Message.TYPE_IMAGE
 							&& message.getStatus() == Message.STATUS_UNSEND) {
 						markMessage(message, Message.STATUS_WAITING);
-					}
+							}
 				}
 			}
 		}
 	}
 
 	public boolean markMessage(final Account account, final Jid recipient, final String uuid,
-							   final int status) {
+			final int status) {
 		if (uuid == null) {
 			return false;
 		} else {
@@ -1751,24 +1751,24 @@ public class XmppConnectionService extends Service {
 				if (conversation.getContactJid().equals(recipient)
 						&& conversation.getAccount().equals(account)) {
 					return markMessage(conversation, uuid, status);
-				}
+						}
 			}
 			return false;
 		}
 	}
 
 	public boolean markMessage(Conversation conversation, String uuid,
-							   int status) {
+			int status) {
 		if (uuid == null) {
 			return false;
 		} else {
 			for (Message message : conversation.getMessages()) {
 				if (uuid.equals(message.getUuid())
 						|| (message.getStatus() >= Message.STATUS_SEND && uuid
-						.equals(message.getRemoteMsgId()))) {
+							.equals(message.getRemoteMsgId()))) {
 					markMessage(message, status);
 					return true;
-				}
+							}
 			}
 			return false;
 		}
@@ -1777,9 +1777,9 @@ public class XmppConnectionService extends Service {
 	public void markMessage(Message message, int status) {
 		if (status == Message.STATUS_SEND_FAILED
 				&& (message.getStatus() == Message.STATUS_SEND_RECEIVED || message
-				.getStatus() == Message.STATUS_SEND_DISPLAYED)) {
+					.getStatus() == Message.STATUS_SEND_DISPLAYED)) {
 			return;
-		}
+					}
 		message.setStatus(status);
 		databaseBackend.updateMessage(message);
 		updateConversationUi();
@@ -1787,7 +1787,7 @@ public class XmppConnectionService extends Service {
 
 	public SharedPreferences getPreferences() {
 		return PreferenceManager
-				.getDefaultSharedPreferences(getApplicationContext());
+			.getDefaultSharedPreferences(getApplicationContext());
 	}
 
 	public boolean forceEncryption() {
@@ -1864,7 +1864,7 @@ public class XmppConnectionService extends Service {
 			if (message.getEncryption() == Message.ENCRYPTION_OTR
 					&& message.getStatus() == Message.STATUS_WAITING) {
 				markMessage(message, Message.STATUS_SEND_FAILED);
-			}
+					}
 		}
 	}
 
@@ -1885,9 +1885,9 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void replyWithNotAcceptable(Account account, MessagePacket packet) {
-		if (account.getStatus() == Account.STATUS_ONLINE) {
+		if (account.getStatus() == Account.State.ONLINE) {
 			MessagePacket error = this.mMessageGenerator
-					.generateNotAcceptable(packet);
+				.generateNotAcceptable(packet);
 			sendMessagePacket(account, error);
 		}
 	}
@@ -1949,7 +1949,7 @@ public class XmppConnectionService extends Service {
 	}
 
 	public void sendIqPacket(Account account, IqPacket packet,
-							 OnIqPacketReceived callback) {
+			OnIqPacketReceived callback) {
 		XmppConnection connection = account.getXmppConnection();
 		if (connection != null) {
 			connection.sendIqPacket(packet, callback);
diff --git a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
index 57152b264..e7254933e 100644
--- a/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ChooseContactActivity.java
@@ -130,7 +130,7 @@ public class ChooseContactActivity extends XmppActivity {
 	protected void filterContacts(String needle) {
 		this.contacts.clear();
 		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.STATUS_DISABLED) {
+			if (account.getStatus() != Account.State.DISABLED) {
 				for (Contact contact : account.getRoster().getContacts()) {
 					if (contact.showInRoster() && contact.match(needle)) {
 						this.contacts.add(contact);
diff --git a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
index 8cd68cff9..96fb7b618 100644
--- a/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ContactDetailsActivity.java
@@ -266,7 +266,7 @@ public class ContactDetailsActivity extends XmppActivity implements OnAccountUpd
 				receive.setChecked(false);
 			}
 		}
-		if (contact.getAccount().getStatus() == Account.STATUS_ONLINE) {
+		if (contact.getAccount().getStatus() == Account.State.ONLINE) {
 			receive.setEnabled(true);
 			send.setEnabled(true);
 		} else {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index bc609fb3a..0742e17e3 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -544,7 +544,7 @@ public class ConversationFragment extends Fragment {
 			} else if (conversation.getMode() == Conversation.MODE_SINGLE) {
 				makeFingerprintWarning();
 			} else if (!conversation.getMucOptions().online()
-					&& conversation.getAccount().getStatus() == Account.STATUS_ONLINE) {
+					&& conversation.getAccount().getStatus() == Account.State.ONLINE) {
 				int error = conversation.getMucOptions().getError();
 				switch (error) {
 					case MucOptions.ERROR_NICK_IN_USE:
@@ -648,7 +648,7 @@ public class ConversationFragment extends Fragment {
 	public void updateSendButton() {
 		Conversation c = this.conversation;
 		if (activity.useSendButtonToIndicateStatus() && c != null
-				&& c.getAccount().getStatus() == Account.STATUS_ONLINE) {
+				&& c.getAccount().getStatus() == Account.State.ONLINE) {
 			if (c.getMode() == Conversation.MODE_SINGLE) {
 				switch (c.getContact().getMostAvailableStatus()) {
 					case Presences.CHAT:
diff --git a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
index b179c47b6..dc8185994 100644
--- a/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/EditAccountActivity.java
@@ -62,7 +62,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 		@Override
 		public void onClick(View v) {
 			if (mAccount != null
-					&& mAccount.getStatus() == Account.STATUS_DISABLED) {
+					&& mAccount.getStatus() == Account.State.DISABLED) {
 				mAccount.setOption(Account.OPTION_DISABLED, false);
 				xmppConnectionService.updateAccount(mAccount);
 				return;
@@ -139,13 +139,13 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 				@Override
 				public void run() {
 					if (mAccount != null
-							&& mAccount.getStatus() != Account.STATUS_ONLINE
+							&& mAccount.getStatus() != Account.State.ONLINE
 							&& mFetchingAvatar) {
 						startActivity(new Intent(getApplicationContext(),
 								ManageAccountActivity.class));
 						finish();
 					} else if (jidToEdit == null && mAccount != null
-							&& mAccount.getStatus() == Account.STATUS_ONLINE) {
+							&& mAccount.getStatus() == Account.State.ONLINE) {
 						if (!mFetchingAvatar) {
 							mFetchingAvatar = true;
 							xmppConnectionService.checkForAvatar(mAccount,
@@ -231,12 +231,12 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 
 	protected void updateSaveButton() {
 		if (mAccount != null
-				&& mAccount.getStatus() == Account.STATUS_CONNECTING) {
+				&& mAccount.getStatus() == Account.State.CONNECTING) {
 			this.mSaveButton.setEnabled(false);
 			this.mSaveButton.setTextColor(getSecondaryTextColor());
 			this.mSaveButton.setText(R.string.account_status_connecting);
 		} else if (mAccount != null
-				&& mAccount.getStatus() == Account.STATUS_DISABLED) {
+				&& mAccount.getStatus() == Account.State.DISABLED) {
 			this.mSaveButton.setEnabled(true);
 			this.mSaveButton.setTextColor(getPrimaryTextColor());
 			this.mSaveButton.setText(R.string.enable);
@@ -245,7 +245,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			this.mSaveButton.setTextColor(getPrimaryTextColor());
 			if (jidToEdit != null) {
 				if (mAccount != null
-						&& mAccount.getStatus() == Account.STATUS_ONLINE) {
+						&& mAccount.getStatus() == Account.State.ONLINE) {
 					this.mSaveButton.setText(R.string.save);
 					if (!accountInfoEdited()) {
 						this.mSaveButton.setEnabled(false);
@@ -379,7 +379,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			this.mRegisterNew.setVisibility(View.GONE);
 			this.mRegisterNew.setChecked(false);
 		}
-		if (this.mAccount.getStatus() == Account.STATUS_ONLINE
+		if (this.mAccount.getStatus() == Account.State.ONLINE
 				&& !this.mFetchingAvatar) {
 			this.mStats.setVisibility(View.VISIBLE);
 			this.mSessionEst.setText(UIHelper.readableTimeDifference(
@@ -428,8 +428,7 @@ public class EditAccountActivity extends XmppActivity implements OnAccountUpdate
 			}
 		} else {
 			if (this.mAccount.errorStatus()) {
-				this.mAccountJid.setError(getString(this.mAccount
-						.getReadableStatusId()));
+				this.mAccountJid.setError(getString(this.mAccount.getStatus().getReadableId()));
 				this.mAccountJid.requestFocus();
 			}
 			this.mStats.setVisibility(View.GONE);
diff --git a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
index 191e0b82a..766b39619 100644
--- a/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
@@ -555,7 +555,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	protected void onBackendConnected() {
 		this.mActivatedAccounts.clear();
 		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.STATUS_DISABLED) {
+			if (account.getStatus() != Account.State.DISABLED) {
 				this.mActivatedAccounts.add(account.getJid().toBareJid().toString());
 			}
 		}
@@ -646,7 +646,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	protected void filterContacts(String needle) {
 		this.contacts.clear();
 		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.STATUS_DISABLED) {
+			if (account.getStatus() != Account.State.DISABLED) {
 				for (Contact contact : account.getRoster().getContacts()) {
 					if (contact.showInRoster() && contact.match(needle)) {
 						this.contacts.add(contact);
@@ -661,7 +661,7 @@ public class StartConversationActivity extends XmppActivity implements OnRosterU
 	protected void filterConferences(String needle) {
 		this.conferences.clear();
 		for (Account account : xmppConnectionService.getAccounts()) {
-			if (account.getStatus() != Account.STATUS_DISABLED) {
+			if (account.getStatus() != Account.State.DISABLED) {
 				for (Bookmark bookmark : account.getBookmarks()) {
 					if (bookmark.match(needle)) {
 						this.conferences.add(bookmark);
diff --git a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
index 31884bd27..af3194e9f 100644
--- a/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/VerifyOTRActivity.java
@@ -143,7 +143,7 @@ public class VerifyOTRActivity extends XmppActivity implements XmppConnectionSer
 	}
 
 	protected boolean isAccountOnline() {
-		if (this.mAccount.getStatus() != Account.STATUS_ONLINE) {
+		if (this.mAccount.getStatus() != Account.State.ONLINE) {
 			Toast.makeText(this,R.string.not_connected_try_again,Toast.LENGTH_SHORT).show();
 			return false;
 		} else {
diff --git a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
index 992ff9799..98c9cdde0 100644
--- a/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/XmppActivity.java
@@ -517,7 +517,7 @@ public abstract class XmppActivity extends Activity {
 			if (presences.size() == 0) {
 				if (!contact.getOption(Contact.Options.TO)
 						&& !contact.getOption(Contact.Options.ASKING)
-						&& contact.getAccount().getStatus() == Account.STATUS_ONLINE) {
+						&& contact.getAccount().getStatus() == Account.State.ONLINE) {
 					showAskForPresenceDialog(contact);
 				} else if (!contact.getOption(Contact.Options.TO)
 						|| !contact.getOption(Contact.Options.FROM)) {
diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
index d0ba3374f..139f36575 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java
@@ -36,67 +36,19 @@ public class AccountAdapter extends ArrayAdapter<Account> {
 		ImageView imageView = (ImageView) view.findViewById(R.id.account_image);
 		imageView.setImageBitmap(activity.avatarService().get(account,
 				activity.getPixel(48)));
-		switch (account.getStatus()) {
-		case Account.STATUS_DISABLED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_disabled));
-			statusView.setTextColor(activity.getSecondaryTextColor());
-			break;
-		case Account.STATUS_ONLINE:
-			statusView.setText(getContext().getString(
-					R.string.account_status_online));
-			statusView.setTextColor(activity.getPrimaryColor());
-			break;
-		case Account.STATUS_CONNECTING:
-			statusView.setText(getContext().getString(
-					R.string.account_status_connecting));
-			statusView.setTextColor(activity.getSecondaryTextColor());
-			break;
-		case Account.STATUS_OFFLINE:
-			statusView.setText(getContext().getString(
-					R.string.account_status_offline));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_UNAUTHORIZED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_unauthorized));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_SERVER_NOT_FOUND:
-			statusView.setText(getContext().getString(
-					R.string.account_status_not_found));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_NO_INTERNET:
-			statusView.setText(getContext().getString(
-					R.string.account_status_no_internet));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_FAILED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_fail));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_CONFLICT:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_conflict));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_SUCCESSFULL:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_success));
-			statusView.setTextColor(activity.getSecondaryTextColor());
-			break;
-		case Account.STATUS_REGISTRATION_NOT_SUPPORTED:
-			statusView.setText(getContext().getString(
-					R.string.account_status_regis_not_sup));
-			statusView.setTextColor(activity.getWarningTextColor());
-			break;
-		default:
-			statusView.setText("");
-			break;
-		}
-
+        statusView.setText(getContext().getString(account.getStatus().getReadableId()));
+        switch (account.getStatus()) {
+            case ONLINE:
+                statusView.setTextColor(activity.getPrimaryColor());
+                break;
+            case DISABLED:
+            case CONNECTING:
+                statusView.setTextColor(activity.getSecondaryTextColor());
+                break;
+            default:
+                statusView.setTextColor(activity.getWarningTextColor());
+                break;
+        }
 		return view;
 	}
 }
diff --git a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
index 9fb9db75e..4dd7cfc74 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/XmppConnection.java
@@ -12,6 +12,8 @@ import android.util.Log;
 import android.util.SparseArray;
 
 import org.apache.http.conn.ssl.StrictHostnameVerifier;
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.xmlpull.v1.XmlPullParserException;
 
 import java.io.IOException;
@@ -120,15 +122,15 @@ public class XmppConnection implements Runnable {
 		applicationContext = service.getApplicationContext();
 	}
 
-	protected void changeStatus(int nextStatus) {
+	protected void changeStatus(final Account.State nextStatus) {
 		if (account.getStatus() != nextStatus) {
-			if ((nextStatus == Account.STATUS_OFFLINE)
-					&& (account.getStatus() != Account.STATUS_CONNECTING)
-					&& (account.getStatus() != Account.STATUS_ONLINE)
-					&& (account.getStatus() != Account.STATUS_DISABLED)) {
+			if ((nextStatus == Account.State.OFFLINE)
+					&& (account.getStatus() != Account.State.CONNECTING)
+					&& (account.getStatus() != Account.State.ONLINE)
+					&& (account.getStatus() != Account.State.DISABLED)) {
 				return;
-					}
-			if (nextStatus == Account.STATUS_ONLINE) {
+			}
+			if (nextStatus == Account.State.ONLINE) {
 				this.attempt = 0;
 			}
 			account.setStatus(nextStatus);
@@ -151,12 +153,12 @@ public class XmppConnection implements Runnable {
 			tagReader = new XmlReader(wakeLock);
 			tagWriter = new TagWriter();
 			packetCallbacks.clear();
-			this.changeStatus(Account.STATUS_CONNECTING);
+			this.changeStatus(Account.State.CONNECTING);
 			Bundle result = DNSHelper.getSRVRecord(account.getServer());
 			ArrayList<Parcelable> values = result.getParcelableArrayList("values");
 			if ("timeout".equals(result.getString("error"))) {
 				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": dns timeout");
-				this.changeStatus(Account.STATUS_OFFLINE);
+				this.changeStatus(Account.State.OFFLINE);
 				return;
 			} else if (values != null) {
 				int i = 0;
@@ -197,7 +199,7 @@ public class XmppConnection implements Runnable {
 					}
 				}
 				if (socketError) {
-					this.changeStatus(Account.STATUS_SERVER_NOT_FOUND);
+					this.changeStatus(Account.State.SERVER_NOT_FOUND);
 					if (wakeLock.isHeld()) {
 						try {
 							wakeLock.release();
@@ -212,7 +214,7 @@ public class XmppConnection implements Runnable {
 			} else {
 				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 						+ ": timeout in DNS resolution");
-				changeStatus(Account.STATUS_OFFLINE);
+				changeStatus(Account.State.OFFLINE);
 				return;
 			}
 			OutputStream out = socket.getOutputStream();
@@ -236,7 +238,7 @@ public class XmppConnection implements Runnable {
 				socket.close();
 			}
 		} catch (UnknownHostException e) {
-			this.changeStatus(Account.STATUS_SERVER_NOT_FOUND);
+			this.changeStatus(Account.State.SERVER_NOT_FOUND);
 			if (wakeLock.isHeld()) {
 				try {
 					wakeLock.release();
@@ -245,7 +247,7 @@ public class XmppConnection implements Runnable {
 			}
 		} catch (final IOException | XmlPullParserException e) {
 			Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
-			this.changeStatus(Account.STATUS_OFFLINE);
+			this.changeStatus(Account.State.OFFLINE);
 			if (wakeLock.isHeld()) {
 				try {
 					wakeLock.release();
@@ -254,7 +256,7 @@ public class XmppConnection implements Runnable {
 			}
 		} catch (NoSuchAlgorithmException e) {
 			Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": " + e.getMessage());
-			this.changeStatus(Account.STATUS_OFFLINE);
+			this.changeStatus(Account.State.OFFLINE);
 			Log.d(Config.LOGTAG, "compression exception " + e.getMessage());
 			if (wakeLock.isHeld()) {
 				try {
@@ -293,13 +295,15 @@ public class XmppConnection implements Runnable {
 									Log.e(Config.LOGTAG, String.valueOf(e));
 								}
 								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": logged in");
+								account.setKey(Account.PINNED_MECHANISM_KEY,
+                                        String.valueOf(saslMechanism.getPriority()));
 								tagReader.reset();
 								sendStartStream();
 								processStream(tagReader.readTag());
 								break;
 							} else if (nextTag.isStart("failure")) {
 								tagReader.readElement(nextTag);
-								changeStatus(Account.STATUS_UNAUTHORIZED);
+								changeStatus(Account.State.UNAUTHORIZED);
 							} else if (nextTag.isStart("challenge")) {
 								final String challenge = tagReader.readElement(nextTag).getContent();
 								final Element response = new Element("response");
@@ -376,7 +380,7 @@ public class XmppConnection implements Runnable {
 								tagReader.readElement(nextTag);
 								Log.d(Config.LOGTAG, account.getJid().toBareJid().toString() + ": resumption failed");
 								streamId = null;
-								if (account.getStatus() != Account.STATUS_ONLINE) {
+								if (account.getStatus() != Account.State.ONLINE) {
 									sendBindRequest();
 								}
 							} else if (nextTag.isStart("iq")) {
@@ -388,8 +392,8 @@ public class XmppConnection implements Runnable {
 							}
 							nextTag = tagReader.readTag();
 						}
-						if (account.getStatus() == Account.STATUS_ONLINE) {
-							account. setStatus(Account.STATUS_OFFLINE);
+						if (account.getStatus() == Account.State.ONLINE) {
+							account. setStatus(Account.State.OFFLINE);
 							if (statusListener != null) {
 								statusListener.onStatusChanged(account);
 							}
@@ -407,7 +411,7 @@ public class XmppConnection implements Runnable {
 			public void onIqPacketReceived(Account account, IqPacket packet) {
 				Log.d(Config.LOGTAG, account.getJid().toBareJid().toString()
 						+ ": online with resource " + account.getResource());
-				changeStatus(Account.STATUS_ONLINE);
+				changeStatus(Account.State.ONLINE);
 			}
 		});
 	}
@@ -592,12 +596,13 @@ public class XmppConnection implements Runnable {
 							}
 							sslSocket.setEnabledProtocols(supportProtocols);
 
-							if (verifier != null
-									&& !verifier.verify(account.getServer().getDomainpart(),
-										sslSocket.getSession())) {
-								sslSocket.close();
-								throw new IOException("host mismatch in TLS connection");
-									}
+                            if (verifier != null
+                                    && !verifier.verify(account.getServer().getDomainpart(),
+                                    sslSocket.getSession())) {
+                                account.setStatus(Account.State.SECURITY_ERROR);
+                                sslSocket.close();
+                                throw new IOException("Host mismatch in TLS connection");
+                            }
 							tagReader.setInputStream(sslSocket.getInputStream());
 							tagWriter.setOutputStream(sslSocket.getOutputStream());
 							sendStartStream();
@@ -624,7 +629,7 @@ public class XmppConnection implements Runnable {
 			sendRegistryRequest();
 		} else if (!this.streamFeatures.hasChild("register")
 				&& account.isOptionSet(Account.OPTION_REGISTER)) {
-			changeStatus(Account.STATUS_REGISTRATION_NOT_SUPPORTED);
+			changeStatus(Account.State.REGISTRATION_NOT_SUPPORTED);
 			disconnect(true);
 		} else if (this.streamFeatures.hasChild("mechanisms")
 				&& shouldAuthenticate && enabledEncryption) {
@@ -632,23 +637,33 @@ public class XmppConnection implements Runnable {
 					.findChild("mechanisms"));
 			final Element auth = new Element("auth");
 			auth.setAttribute("xmlns", "urn:ietf:params:xml:ns:xmpp-sasl");
-			if (mechanisms.contains(ScramSha1.getMechanism())) {
+			if (mechanisms.contains("SCRAM-SHA-1")) {
 				saslMechanism = new ScramSha1(tagWriter, account, mXmppConnectionService.getRNG());
-				Log.d(Config.LOGTAG, "Authenticating with " + ScramSha1.getMechanism());
-				auth.setAttribute("mechanism", ScramSha1.getMechanism());
-			} else if (mechanisms.contains(DigestMd5.getMechanism())) {
-				Log.d(Config.LOGTAG, "Authenticating with " + DigestMd5.getMechanism());
+			} else if (mechanisms.contains("DIGEST-MD5")) {
 				saslMechanism = new DigestMd5(tagWriter, account, mXmppConnectionService.getRNG());
-				auth.setAttribute("mechanism", DigestMd5.getMechanism());
-			} else if (mechanisms.contains(Plain.getMechanism())) {
-				Log.d(Config.LOGTAG, "Authenticating with " + Plain.getMechanism());
+			} else if (mechanisms.contains("PLAIN")) {
 				saslMechanism = new Plain(tagWriter, account);
-				auth.setAttribute("mechanism", Plain.getMechanism());
 			}
-            if (!saslMechanism.getClientFirstMessage().isEmpty()) {
-                auth.setContent(saslMechanism.getClientFirstMessage());
-            }
-            tagWriter.writeElement(auth);
+			final JSONObject keys = account.getKeys();
+			try {
+				if (keys.has(Account.PINNED_MECHANISM_KEY) &&
+						keys.getInt(Account.PINNED_MECHANISM_KEY) > saslMechanism.getPriority() ) {
+					Log.e(Config.LOGTAG, "Auth failed. Authentication mechanism " + saslMechanism.getMechanism() +
+							" has lower priority (" + String.valueOf(saslMechanism.getPriority()) +
+							") than pinned priority (" + keys.getInt(Account.PINNED_MECHANISM_KEY) +
+							"). Possible downgrade attack?");
+					disconnect(true);
+					account.setStatus(Account.State.SECURITY_ERROR);
+				}
+			} catch (final JSONException e) {
+				Log.d(Config.LOGTAG, "Parse error while checking pinned auth mechanism");
+			}
+			Log.d(Config.LOGTAG, "Authenticating with " + saslMechanism.getMechanism());
+			auth.setAttribute("mechanism", saslMechanism.getMechanism());
+			if (!saslMechanism.getClientFirstMessage().isEmpty()) {
+				auth.setContent(saslMechanism.getClientFirstMessage());
+			}
+			tagWriter.writeElement(auth);
 		} else if (this.streamFeatures.hasChild("sm", "urn:xmpp:sm:"
 					+ smVersion)
 				&& streamId != null) {
@@ -658,6 +673,7 @@ public class XmppConnection implements Runnable {
 		} else if (this.streamFeatures.hasChild("bind") && shouldBind) {
 			sendBindRequest();
 		} else {
+			account.setStatus(Account.State.INCOMPATIBLE_SERVER);
 			Log.d(Config.LOGTAG, account.getJid().toBareJid()
 					+ ": incompatible server. disconnecting");
 			disconnect(true);
@@ -721,20 +737,20 @@ public class XmppConnection implements Runnable {
 							if (packet.getType() == IqPacket.TYPE_RESULT) {
 								account.setOption(Account.OPTION_REGISTER,
 										false);
-								changeStatus(Account.STATUS_REGISTRATION_SUCCESSFULL);
+								changeStatus(Account.State.REGISTRATION_SUCCESSFUL);
 							} else if (packet.hasChild("error")
 									&& (packet.findChild("error")
 										.hasChild("conflict"))) {
-								changeStatus(Account.STATUS_REGISTRATION_CONFLICT);
+								changeStatus(Account.State.REGISTRATION_CONFLICT);
 							} else {
-								changeStatus(Account.STATUS_REGISTRATION_FAILED);
+								changeStatus(Account.State.REGISTRATION_FAILED);
 								Log.d(Config.LOGTAG, packet.toString());
 							}
 							disconnect(true);
 						}
 					});
 				} else {
-					changeStatus(Account.STATUS_REGISTRATION_FAILED);
+					changeStatus(Account.State.REGISTRATION_FAILED);
 					disconnect(true);
 					Log.d(Config.LOGTAG, account.getJid().toBareJid()
 							+ ": could not register. instructions are"
diff --git a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
index e4e00e433..3a1ba778b 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/jingle/JingleConnection.java
@@ -917,7 +917,7 @@ public class JingleConnection implements Downloadable {
 	}
 
 	public boolean start() {
-		if (account.getStatus() == Account.STATUS_ONLINE) {
+		if (account.getStatus() == Account.State.ONLINE) {
 			if (mJingleStatus == JINGLE_STATUS_INITIATED) {
 				new Thread(new Runnable() {
 
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index e720101c1..db9f95d45 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -141,6 +141,8 @@
     <string name="account_status_regis_conflict">Username already in use</string>
     <string name="account_status_regis_success">Registration completed</string>
     <string name="account_status_regis_not_sup">Server does not support registration</string>
+    <string name="account_status_security_error">Security error</string>
+    <string name="account_status_incompatible_server">Incompatible server</string>
     <string name="encryption_choice_none">Plain text</string>
     <string name="encryption_choice_otr">OTR</string>
     <string name="encryption_choice_pgp">OpenPGP</string>