From 8471fbd9b747c68aa5e333cb277a6a0dc6d9c878 Mon Sep 17 00:00:00 2001
From: Daniel Gultsch <daniel@gultsch.de>
Date: Sun, 1 Nov 2015 14:22:01 +0100
Subject: [PATCH 1/2] updated FAQ to account for incompatible server

---
 README.md | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/README.md b/README.md
index 12129a201..443dd0d7e 100644
--- a/README.md
+++ b/README.md
@@ -134,6 +134,18 @@ which can point to any hostname port combination. If your server doesn’t provi
 those please contact your admin and have them read
 [this](http://prosody.im/doc/dns#srv_records)
 
+#### I get 'Incompatible Server'
+
+As regular user you should be picking a different server. The server you selected
+is probably insecure and/or very old.
+
+If you are a server administrator you should make sure that your server provides
+STARTTLS. XMPP over TLS (on a different port) is not sufficient.
+
+On rare occasions this error message might also be caused by a server not providing
+a login (SASL) mechanism that Conversations is able to handle. Conversations supports
+SCRAM-SHA1, PLAIN, EXTERNAL (client certs) and DIGEST-MD5.
+
 #### Conversations doesn't work for me. Where can I get help?
 
 You can join our conference room on `conversations@conference.siacs.eu`.

From c6e54e7e5a3e402553d2f57e2997fb80d029d559 Mon Sep 17 00:00:00 2001
From: Andreas Straub <andy@strb.org>
Date: Fri, 6 Nov 2015 14:50:55 +0100
Subject: [PATCH 2/2] Move migration 19 before 17

Migration 17 depends on Account deserialization, so any migrations that
touch the accounts table need to be applied beforehand.

Re-writing the migration to work directly on the database would lead to
a lot of code duplication, so it's not worth it at this time, but might
become necessary later on to avoid dependency cycles.
---
 .../siacs/conversations/persistance/DatabaseBackend.java | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
index fdbfe4fee..0e133d192 100644
--- a/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
+++ b/src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
@@ -304,6 +304,12 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
 					+ Message.CARBON + " INTEGER");
 		}
+		if (oldVersion < 19 && newVersion >= 19) {
+			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN "+ Account.DISPLAY_NAME+ " TEXT");
+		}
+		/* Any migrations that alter the Account table need to happen BEFORE this migration, as it
+		 * depends on account de-serialization.
+		 */
 		if (oldVersion < 17 && newVersion >= 17) {
 			List<Account> accounts = getAccounts(db);
 			for (Account account : accounts) {
@@ -325,9 +331,6 @@ public class DatabaseBackend extends SQLiteOpenHelper {
 		if (oldVersion < 18 && newVersion >= 18) {
 			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "+ Message.READ+ " NUMBER DEFAULT 1");
 		}
-		if (oldVersion < 19 && newVersion >= 19) {
-			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN "+ Account.DISPLAY_NAME+ " TEXT");
-		}
 	}
 
 	public static synchronized DatabaseBackend getInstance(Context context) {