check if encrypted pgp file get deleted

Daniel Gultsch created

Change summary

src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java    |    2 
src/main/java/eu/siacs/conversations/entities/Conversation.java          |   18 
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java    | 1502 
src/main/java/eu/siacs/conversations/services/XmppConnectionService.java |    4 
src/main/java/eu/siacs/conversations/ui/ConversationFragment.java        |    2 
5 files changed, 762 insertions(+), 766 deletions(-)

Detailed changes

src/main/java/eu/siacs/conversations/crypto/PgpDecryptionService.java 🔗

@@ -209,10 +209,10 @@ public class PgpDecryptionService {
 							URL url = message.getFileParams().url;
 							mXmppConnectionService.getFileBackend().updateFileParams(message, url);
 							message.setEncryption(Message.ENCRYPTION_DECRYPTED);
+							mXmppConnectionService.updateMessage(message);
 							if (!inputFile.delete()) {
 								Log.w(Config.LOGTAG,"unable to delete pgp encrypted source file "+inputFile.getAbsolutePath());
 							}
-							mXmppConnectionService.updateMessage(message);
 							skipNotificationPush = true;
 							mXmppConnectionService.getFileBackend().updateMediaScanner(outputFile, () -> notifyIfPending(message));
 							break;

src/main/java/eu/siacs/conversations/entities/Conversation.java 🔗

@@ -179,20 +179,6 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 		}
 	}
 
-	public void findMessagesWithFiles(final OnMessageFound onMessageFound) {
-		final ArrayList<Message> results = new ArrayList<>();
-		synchronized (this.messages) {
-			for (final Message m : this.messages) {
-				if (m.isFileOrImage() && m.getEncryption() != Message.ENCRYPTION_PGP) {
-					results.add(m);
-				}
-			}
-		}
-		for(Message result : results) {
-			onMessageFound.onMessageFound(result);
-		}
-	}
-
 	public Message findMessageWithFileAndUuid(final String uuid) {
 		synchronized (this.messages) {
 			for (final Message message : this.messages) {
@@ -208,11 +194,15 @@ public class Conversation extends AbstractEntity implements Blockable, Comparabl
 
 	public boolean markAsDeleted(final List<String> uuids) {
 		boolean deleted = false;
+		final PgpDecryptionService pgpDecryptionService = account.getPgpDecryptionService();
 		synchronized (this.messages) {
 			for(Message message : this.messages) {
 				if (uuids.contains(message.getUuid())) {
 					message.setDeleted(true);
 					deleted = true;
+					if (message.getEncryption() == Message.ENCRYPTION_PGP && pgpDecryptionService != null) {
+						pgpDecryptionService.discard(message);
+					}
 				}
 			}
 		}

src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java 🔗

@@ -63,762 +63,768 @@ import rocks.xmpp.addr.Jid;
 
 public class DatabaseBackend extends SQLiteOpenHelper {
 
-	private static final String DATABASE_NAME = "history";
-	private static final int DATABASE_VERSION = 44;
-	private static DatabaseBackend instance = null;
-	private static String CREATE_CONTATCS_STATEMENT = "create table "
-			+ Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, "
-			+ Contact.SERVERNAME + " TEXT, " + Contact.SYSTEMNAME + " TEXT,"
-			+ Contact.JID + " TEXT," + Contact.KEYS + " TEXT,"
-			+ Contact.PHOTOURI + " TEXT," + Contact.OPTIONS + " NUMBER,"
-			+ Contact.SYSTEMACCOUNT + " NUMBER, " + Contact.AVATAR + " TEXT, "
-			+ Contact.LAST_PRESENCE + " TEXT, " + Contact.LAST_TIME + " NUMBER, "
-			+ Contact.GROUPS + " TEXT, FOREIGN KEY(" + Contact.ACCOUNT + ") REFERENCES "
-			+ Account.TABLENAME + "(" + Account.UUID
-			+ ") ON DELETE CASCADE, UNIQUE(" + Contact.ACCOUNT + ", "
-			+ Contact.JID + ") ON CONFLICT REPLACE);";
-
-	private static String CREATE_DISCOVERY_RESULTS_STATEMENT = "create table "
-			+ ServiceDiscoveryResult.TABLENAME + "("
-			+ ServiceDiscoveryResult.HASH + " TEXT, "
-			+ ServiceDiscoveryResult.VER + " TEXT, "
-			+ ServiceDiscoveryResult.RESULT + " TEXT, "
-			+ "UNIQUE(" + ServiceDiscoveryResult.HASH + ", "
-			+ ServiceDiscoveryResult.VER + ") ON CONFLICT REPLACE);";
-
-	private static String CREATE_PRESENCE_TEMPLATES_STATEMENT = "CREATE TABLE "
-			+ PresenceTemplate.TABELNAME + "("
-			+ PresenceTemplate.UUID + " TEXT, "
-			+ PresenceTemplate.LAST_USED + " NUMBER,"
-			+ PresenceTemplate.MESSAGE + " TEXT,"
-			+ PresenceTemplate.STATUS + " TEXT,"
-			+ "UNIQUE(" + PresenceTemplate.MESSAGE + "," + PresenceTemplate.STATUS + ") ON CONFLICT REPLACE);";
-
-	private static String CREATE_PREKEYS_STATEMENT = "CREATE TABLE "
-			+ SQLiteAxolotlStore.PREKEY_TABLENAME + "("
-			+ SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-			+ SQLiteAxolotlStore.ID + " INTEGER, "
-			+ SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-			+ SQLiteAxolotlStore.ACCOUNT
-			+ ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-			+ "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-			+ SQLiteAxolotlStore.ID
-			+ ") ON CONFLICT REPLACE"
-			+ ");";
-
-	private static String CREATE_SIGNED_PREKEYS_STATEMENT = "CREATE TABLE "
-			+ SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME + "("
-			+ SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-			+ SQLiteAxolotlStore.ID + " INTEGER, "
-			+ SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-			+ SQLiteAxolotlStore.ACCOUNT
-			+ ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-			+ "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-			+ SQLiteAxolotlStore.ID
-			+ ") ON CONFLICT REPLACE" +
-			");";
-
-	private static String CREATE_SESSIONS_STATEMENT = "CREATE TABLE "
-			+ SQLiteAxolotlStore.SESSION_TABLENAME + "("
-			+ SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-			+ SQLiteAxolotlStore.NAME + " TEXT, "
-			+ SQLiteAxolotlStore.DEVICE_ID + " INTEGER, "
-			+ SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-			+ SQLiteAxolotlStore.ACCOUNT
-			+ ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-			+ "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-			+ SQLiteAxolotlStore.NAME + ", "
-			+ SQLiteAxolotlStore.DEVICE_ID
-			+ ") ON CONFLICT REPLACE"
-			+ ");";
-
-	private static String CREATE_IDENTITIES_STATEMENT = "CREATE TABLE "
-			+ SQLiteAxolotlStore.IDENTITIES_TABLENAME + "("
-			+ SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
-			+ SQLiteAxolotlStore.NAME + " TEXT, "
-			+ SQLiteAxolotlStore.OWN + " INTEGER, "
-			+ SQLiteAxolotlStore.FINGERPRINT + " TEXT, "
-			+ SQLiteAxolotlStore.CERTIFICATE + " BLOB, "
-			+ SQLiteAxolotlStore.TRUST + " TEXT, "
-			+ SQLiteAxolotlStore.ACTIVE + " NUMBER, "
-			+ SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER,"
-			+ SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
-			+ SQLiteAxolotlStore.ACCOUNT
-			+ ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
-			+ "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
-			+ SQLiteAxolotlStore.NAME + ", "
-			+ SQLiteAxolotlStore.FINGERPRINT
-			+ ") ON CONFLICT IGNORE"
-			+ ");";
-
-	private static String RESOLVER_RESULTS_TABLENAME = "resolver_results";
-
-	private static String CREATE_RESOLVER_RESULTS_TABLE = "create table " + RESOLVER_RESULTS_TABLENAME + "("
-			+ Resolver.Result.DOMAIN + " TEXT,"
-			+ Resolver.Result.HOSTNAME + " TEXT,"
-			+ Resolver.Result.IP + " BLOB,"
-			+ Resolver.Result.PRIORITY + " NUMBER,"
-			+ Resolver.Result.DIRECT_TLS + " NUMBER,"
-			+ Resolver.Result.AUTHENTICATED + " NUMBER,"
-			+ Resolver.Result.PORT + " NUMBER,"
-			+ "UNIQUE(" + Resolver.Result.DOMAIN + ") ON CONFLICT REPLACE"
-			+ ");";
-
-	private static String CREATE_MESSAGE_TIME_INDEX = "create INDEX message_time_index ON " + Message.TABLENAME + "(" + Message.TIME_SENT + ")";
-	private static String CREATE_MESSAGE_CONVERSATION_INDEX = "create INDEX message_conversation_index ON " + Message.TABLENAME + "(" + Message.CONVERSATION + ")";
-	private static String CREATE_MESSAGE_DELETED_INDEX = "create index message_deleted_index ON "+ Message.TABLENAME + "(" + Message.DELETED + ")";
-	private static String CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX = "create INDEX message_file_path_index ON " + Message.TABLENAME + "(" + Message.RELATIVE_FILE_PATH + ")";
-	private static String CREATE_MESSAGE_TYPE_INDEX = "create INDEX message_type_index ON " + Message.TABLENAME + "(" + Message.TYPE + ")";
-
-	private static String CREATE_MESSAGE_INDEX_TABLE = "CREATE VIRTUAL TABLE messages_index USING FTS4(uuid TEXT PRIMARY KEY, body TEXT)";
-	private static String CREATE_MESSAGE_INSERT_TRIGGER = "CREATE TRIGGER after_message_insert AFTER INSERT ON " + Message.TABLENAME + " BEGIN INSERT INTO messages_index (uuid,body) VALUES (new.uuid,new.body); END;";
-	private static String CREATE_MESSAGE_UPDATE_TRIGGER = "CREATE TRIGGER after_message_update UPDATE of uuid,body ON " + Message.TABLENAME + " BEGIN update messages_index set body=new.body,uuid=new.uuid WHERE uuid=old.uuid; END;";
-	private static String COPY_PREEXISTING_ENTRIES = "INSERT into messages_index(uuid,body) select uuid,body FROM " + Message.TABLENAME + ";";
-
-	private DatabaseBackend(Context context) {
-		super(context, DATABASE_NAME, null, DATABASE_VERSION);
-	}
-
-	private static ContentValues createFingerprintStatusContentValues(FingerprintStatus.Trust trust, boolean active) {
-		ContentValues values = new ContentValues();
-		values.put(SQLiteAxolotlStore.TRUST, trust.toString());
-		values.put(SQLiteAxolotlStore.ACTIVE, active ? 1 : 0);
-		return values;
-	}
-
-	public static synchronized DatabaseBackend getInstance(Context context) {
-		if (instance == null) {
-			instance = new DatabaseBackend(context);
-		}
-		return instance;
-	}
-
-	@Override
-	public void onConfigure(SQLiteDatabase db) {
-		db.execSQL("PRAGMA foreign_keys=ON");
-		db.rawQuery("PRAGMA secure_delete=ON",null);
-	}
-
-	@Override
-	public void onCreate(SQLiteDatabase db) {
-		db.execSQL("create table " + Account.TABLENAME + "(" + Account.UUID + " TEXT PRIMARY KEY,"
-				+ Account.USERNAME + " TEXT,"
-				+ Account.SERVER + " TEXT,"
-				+ Account.PASSWORD + " TEXT,"
-				+ Account.DISPLAY_NAME + " TEXT, "
-				+ Account.STATUS + " TEXT,"
-				+ Account.STATUS_MESSAGE + " TEXT,"
-				+ Account.ROSTERVERSION + " TEXT,"
-				+ Account.OPTIONS + " NUMBER, "
-				+ Account.AVATAR + " TEXT, "
-				+ Account.KEYS + " TEXT, "
-				+ Account.HOSTNAME + " TEXT, "
-				+ Account.RESOURCE + " TEXT,"
-				+ Account.PORT + " NUMBER DEFAULT 5222)");
-		db.execSQL("create table " + Conversation.TABLENAME + " ("
-				+ Conversation.UUID + " TEXT PRIMARY KEY, " + Conversation.NAME
-				+ " TEXT, " + Conversation.CONTACT + " TEXT, "
-				+ Conversation.ACCOUNT + " TEXT, " + Conversation.CONTACTJID
-				+ " TEXT, " + Conversation.CREATED + " NUMBER, "
-				+ Conversation.STATUS + " NUMBER, " + Conversation.MODE
-				+ " NUMBER, " + Conversation.ATTRIBUTES + " TEXT, FOREIGN KEY("
-				+ Conversation.ACCOUNT + ") REFERENCES " + Account.TABLENAME
-				+ "(" + Account.UUID + ") ON DELETE CASCADE);");
-		db.execSQL("create table " + Message.TABLENAME + "( " + Message.UUID
-				+ " TEXT PRIMARY KEY, " + Message.CONVERSATION + " TEXT, "
-				+ Message.TIME_SENT + " NUMBER, " + Message.COUNTERPART
-				+ " TEXT, " + Message.TRUE_COUNTERPART + " TEXT,"
-				+ Message.BODY + " TEXT, " + Message.ENCRYPTION + " NUMBER, "
-				+ Message.STATUS + " NUMBER," + Message.TYPE + " NUMBER, "
-				+ Message.RELATIVE_FILE_PATH + " TEXT, "
-				+ Message.SERVER_MSG_ID + " TEXT, "
-				+ Message.FINGERPRINT + " TEXT, "
-				+ Message.CARBON + " INTEGER, "
-				+ Message.EDITED + " TEXT, "
-				+ Message.READ + " NUMBER DEFAULT 1, "
-				+ Message.OOB + " INTEGER, "
-				+ Message.ERROR_MESSAGE + " TEXT,"
-				+ Message.READ_BY_MARKERS + " TEXT,"
-				+ Message.MARKABLE + " NUMBER DEFAULT 0,"
-				+ Message.DELETED + " NUMBER DEFAULT 0,"
-				+ Message.REMOTE_MSG_ID + " TEXT, FOREIGN KEY("
-				+ Message.CONVERSATION + ") REFERENCES "
-				+ Conversation.TABLENAME + "(" + Conversation.UUID
-				+ ") ON DELETE CASCADE);");
-		db.execSQL(CREATE_MESSAGE_TIME_INDEX);
-		db.execSQL(CREATE_MESSAGE_CONVERSATION_INDEX);
-		db.execSQL(CREATE_MESSAGE_DELETED_INDEX);
-		db.execSQL(CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX);
-		db.execSQL(CREATE_MESSAGE_TYPE_INDEX);
-		db.execSQL(CREATE_CONTATCS_STATEMENT);
-		db.execSQL(CREATE_DISCOVERY_RESULTS_STATEMENT);
-		db.execSQL(CREATE_SESSIONS_STATEMENT);
-		db.execSQL(CREATE_PREKEYS_STATEMENT);
-		db.execSQL(CREATE_SIGNED_PREKEYS_STATEMENT);
-		db.execSQL(CREATE_IDENTITIES_STATEMENT);
-		db.execSQL(CREATE_PRESENCE_TEMPLATES_STATEMENT);
-		db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
-		db.execSQL(CREATE_MESSAGE_INDEX_TABLE);
-		db.execSQL(CREATE_MESSAGE_INSERT_TRIGGER);
-		db.execSQL(CREATE_MESSAGE_UPDATE_TRIGGER);
-	}
-
-	@Override
-	public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-		if (oldVersion < 2 && newVersion >= 2) {
-			db.execSQL("update " + Account.TABLENAME + " set "
-					+ Account.OPTIONS + " = " + Account.OPTIONS + " | 8");
-		}
-		if (oldVersion < 3 && newVersion >= 3) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-					+ Message.TYPE + " NUMBER");
-		}
-		if (oldVersion < 5 && newVersion >= 5) {
-			db.execSQL("DROP TABLE " + Contact.TABLENAME);
-			db.execSQL(CREATE_CONTATCS_STATEMENT);
-			db.execSQL("UPDATE " + Account.TABLENAME + " SET "
-					+ Account.ROSTERVERSION + " = NULL");
-		}
-		if (oldVersion < 6 && newVersion >= 6) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-					+ Message.TRUE_COUNTERPART + " TEXT");
-		}
-		if (oldVersion < 7 && newVersion >= 7) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-					+ Message.REMOTE_MSG_ID + " TEXT");
-			db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-					+ Contact.AVATAR + " TEXT");
-			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN "
-					+ Account.AVATAR + " TEXT");
-		}
-		if (oldVersion < 8 && newVersion >= 8) {
-			db.execSQL("ALTER TABLE " + Conversation.TABLENAME + " ADD COLUMN "
-					+ Conversation.ATTRIBUTES + " TEXT");
-		}
-		if (oldVersion < 9 && newVersion >= 9) {
-			db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-					+ Contact.LAST_TIME + " NUMBER");
-			db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-					+ Contact.LAST_PRESENCE + " TEXT");
-		}
-		if (oldVersion < 10 && newVersion >= 10) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-					+ Message.RELATIVE_FILE_PATH + " TEXT");
-		}
-		if (oldVersion < 11 && newVersion >= 11) {
-			db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
-					+ Contact.GROUPS + " TEXT");
-			db.execSQL("delete from " + Contact.TABLENAME);
-			db.execSQL("update " + Account.TABLENAME + " set " + Account.ROSTERVERSION + " = NULL");
-		}
-		if (oldVersion < 12 && newVersion >= 12) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-					+ Message.SERVER_MSG_ID + " TEXT");
-		}
-		if (oldVersion < 13 && newVersion >= 13) {
-			db.execSQL("delete from " + Contact.TABLENAME);
-			db.execSQL("update " + Account.TABLENAME + " set " + Account.ROSTERVERSION + " = NULL");
-		}
-		if (oldVersion < 14 && newVersion >= 14) {
-			canonicalizeJids(db);
-		}
-		if (oldVersion < 15 && newVersion >= 15) {
-			recreateAxolotlDb(db);
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
-					+ Message.FINGERPRINT + " TEXT");
-		}
-		if (oldVersion < 16 && newVersion >= 16) {
-			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");
-		}
-		if (oldVersion < 20 && newVersion >= 20) {
-			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.HOSTNAME + " TEXT");
-			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.PORT + " NUMBER DEFAULT 5222");
-		}
-		if (oldVersion < 26 && newVersion >= 26) {
-			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.STATUS + " TEXT");
-			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.STATUS_MESSAGE + " TEXT");
-		}
-		if (oldVersion < 40 && newVersion >= 40) {
-			db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.RESOURCE + " 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 && newVersion < 31) {
-			List<Account> accounts = getAccounts(db);
-			for (Account account : accounts) {
-				String ownDeviceIdString = account.getKey(SQLiteAxolotlStore.JSONKEY_REGISTRATION_ID);
-				if (ownDeviceIdString == null) {
-					continue;
-				}
-				int ownDeviceId = Integer.valueOf(ownDeviceIdString);
-				SignalProtocolAddress ownAddress = new SignalProtocolAddress(account.getJid().asBareJid().toString(), ownDeviceId);
-				deleteSession(db, account, ownAddress);
-				IdentityKeyPair identityKeyPair = loadOwnIdentityKeyPair(db, account);
-				if (identityKeyPair != null) {
-					String[] selectionArgs = {
-							account.getUuid(),
-							CryptoHelper.bytesToHex(identityKeyPair.getPublicKey().serialize())
-					};
-					ContentValues values = new ContentValues();
-					values.put(SQLiteAxolotlStore.TRUSTED, 2);
-					db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, values,
-							SQLiteAxolotlStore.ACCOUNT + " = ? AND "
-									+ SQLiteAxolotlStore.FINGERPRINT + " = ? ",
-							selectionArgs);
-				} else {
-					Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": could not load own identity key pair");
-				}
-			}
-		}
-		if (oldVersion < 18 && newVersion >= 18) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.READ + " NUMBER DEFAULT 1");
-		}
-
-		if (oldVersion < 21 && newVersion >= 21) {
-			List<Account> accounts = getAccounts(db);
-			for (Account account : accounts) {
-				account.unsetPgpSignature();
-				db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
-						+ "=?", new String[]{account.getUuid()});
-			}
-		}
-
-		if (oldVersion >= 15 && oldVersion < 22 && newVersion >= 22) {
-			db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.CERTIFICATE);
-		}
-
-		if (oldVersion < 23 && newVersion >= 23) {
-			db.execSQL(CREATE_DISCOVERY_RESULTS_STATEMENT);
-		}
-
-		if (oldVersion < 24 && newVersion >= 24) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.EDITED + " TEXT");
-		}
-
-		if (oldVersion < 25 && newVersion >= 25) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.OOB + " INTEGER");
-		}
-
-		if (oldVersion < 26 && newVersion >= 26) {
-			db.execSQL(CREATE_PRESENCE_TEMPLATES_STATEMENT);
-		}
-
-		if (oldVersion < 27 && newVersion >= 27) {
-			db.execSQL("DELETE FROM " + ServiceDiscoveryResult.TABLENAME);
-		}
-
-		if (oldVersion < 28 && newVersion >= 28) {
-			canonicalizeJids(db);
-		}
-
-		if (oldVersion < 29 && newVersion >= 29) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.ERROR_MESSAGE + " TEXT");
-		}
-		if (oldVersion >= 15 && oldVersion < 31 && newVersion >= 31) {
-			db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.TRUST + " TEXT");
-			db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.ACTIVE + " NUMBER");
-			HashMap<Integer, ContentValues> migration = new HashMap<>();
-			migration.put(0, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
-			migration.put(1, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
-			migration.put(2, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, true));
-			migration.put(3, createFingerprintStatusContentValues(FingerprintStatus.Trust.COMPROMISED, false));
-			migration.put(4, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
-			migration.put(5, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
-			migration.put(6, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, false));
-			migration.put(7, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, true));
-			migration.put(8, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, false));
-			for (Map.Entry<Integer, ContentValues> entry : migration.entrySet()) {
-				String whereClause = SQLiteAxolotlStore.TRUSTED + "=?";
-				String[] where = {String.valueOf(entry.getKey())};
-				db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, entry.getValue(), whereClause, where);
-			}
-
-		}
-		if (oldVersion >= 15 && oldVersion < 32 && newVersion >= 32) {
-			db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER");
-			ContentValues defaults = new ContentValues();
-			defaults.put(SQLiteAxolotlStore.LAST_ACTIVATION, System.currentTimeMillis());
-			db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, defaults, null, null);
-		}
-		if (oldVersion >= 15 && oldVersion < 33 && newVersion >= 33) {
-			String whereClause = SQLiteAxolotlStore.OWN + "=1";
-			db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED, true), whereClause, null);
-		}
-
-		if (oldVersion < 34 && newVersion >= 34) {
-			db.execSQL(CREATE_MESSAGE_TIME_INDEX);
-
-			final File oldPicturesDirectory = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/Conversations/");
-			final File oldFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/");
-			final File newFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Files/");
-			final File newVideosDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Videos/");
-			if (oldPicturesDirectory.exists() && oldPicturesDirectory.isDirectory()) {
-				final File newPicturesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Images/");
-				newPicturesDirectory.getParentFile().mkdirs();
-				if (oldPicturesDirectory.renameTo(newPicturesDirectory)) {
-					Log.d(Config.LOGTAG, "moved " + oldPicturesDirectory.getAbsolutePath() + " to " + newPicturesDirectory.getAbsolutePath());
-				}
-			}
-			if (oldFilesDirectory.exists() && oldFilesDirectory.isDirectory()) {
-				newFilesDirectory.mkdirs();
-				newVideosDirectory.mkdirs();
-				final File[] files = oldFilesDirectory.listFiles();
-				if (files == null) {
-					return;
-				}
-				for (File file : files) {
-					if (file.getName().equals(".nomedia")) {
-						if (file.delete()) {
-							Log.d(Config.LOGTAG, "deleted nomedia file in " + oldFilesDirectory.getAbsolutePath());
-						}
-					} else if (file.isFile()) {
-						final String name = file.getName();
-						boolean isVideo = false;
-						int start = name.lastIndexOf('.') + 1;
-						if (start < name.length()) {
-							String mime = MimeUtils.guessMimeTypeFromExtension(name.substring(start));
-							isVideo = mime != null && mime.startsWith("video/");
-						}
-						File dst = new File((isVideo ? newVideosDirectory : newFilesDirectory).getAbsolutePath() + "/" + file.getName());
-						if (file.renameTo(dst)) {
-							Log.d(Config.LOGTAG, "moved " + file + " to " + dst);
-						}
-					}
-				}
-			}
-		}
-		if (oldVersion < 35 && newVersion >= 35) {
-			db.execSQL(CREATE_MESSAGE_CONVERSATION_INDEX);
-		}
-		if (oldVersion < 36 && newVersion >= 36) {
-			List<Account> accounts = getAccounts(db);
-			for (Account account : accounts) {
-				account.setOption(Account.OPTION_REQUIRES_ACCESS_MODE_CHANGE, true);
-				account.setOption(Account.OPTION_LOGGED_IN_SUCCESSFULLY, false);
-				db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
-						+ "=?", new String[]{account.getUuid()});
-			}
-		}
-
-		if (oldVersion < 37 && newVersion >= 37) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.READ_BY_MARKERS + " TEXT");
-		}
-
-		if (oldVersion < 38 && newVersion >= 38) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.MARKABLE + " NUMBER DEFAULT 0");
-		}
-
-		if (oldVersion < 39 && newVersion >= 39) {
-			db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
-		}
-
-		if (oldVersion < 41 && newVersion >= 41) {
-			db.execSQL(CREATE_MESSAGE_INDEX_TABLE);
-			db.execSQL(CREATE_MESSAGE_INSERT_TRIGGER);
-			db.execSQL(CREATE_MESSAGE_UPDATE_TRIGGER);
-			db.execSQL(COPY_PREEXISTING_ENTRIES);
-		}
-
-		if (oldVersion < 42 && newVersion >= 42) {
-			db.execSQL("DROP TRIGGER IF EXISTS after_message_delete");
-		}
-		if (QuickConversationsService.isQuicksy() && oldVersion < 43 && newVersion >= 43) {
-			List<Account> accounts = getAccounts(db);
-			for (Account account : accounts) {
-				account.setOption(Account.OPTION_MAGIC_CREATE, true);
-				db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
-						+ "=?", new String[]{account.getUuid()});
-			}
-		}
-
-		if (oldVersion < 44 && newVersion >= 44) {
-			db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.DELETED + " NUMBER DEFAULT 0");
-			db.execSQL(CREATE_MESSAGE_DELETED_INDEX);
-			db.execSQL(CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX);
-			db.execSQL(CREATE_MESSAGE_TYPE_INDEX);
-		}
-	}
-
-	private void canonicalizeJids(SQLiteDatabase db) {
-		// migrate db to new, canonicalized JID domainpart representation
-
-		// Conversation table
-		Cursor cursor = db.rawQuery("select * from " + Conversation.TABLENAME, new String[0]);
-		while (cursor.moveToNext()) {
-			String newJid;
-			try {
-				newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID))).toString();
-			} catch (IllegalArgumentException ignored) {
-				Log.e(Config.LOGTAG, "Failed to migrate Conversation CONTACTJID "
-						+ cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID))
-						+ ": " + ignored + ". Skipping...");
-				continue;
-			}
-
-			String updateArgs[] = {
-					newJid,
-					cursor.getString(cursor.getColumnIndex(Conversation.UUID)),
-			};
-			db.execSQL("update " + Conversation.TABLENAME
-					+ " set " + Conversation.CONTACTJID + " = ? "
-					+ " where " + Conversation.UUID + " = ?", updateArgs);
-		}
-		cursor.close();
-
-		// Contact table
-		cursor = db.rawQuery("select * from " + Contact.TABLENAME, new String[0]);
-		while (cursor.moveToNext()) {
-			String newJid;
-			try {
-				newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Contact.JID))).toString();
-			} catch (IllegalArgumentException ignored) {
-				Log.e(Config.LOGTAG, "Failed to migrate Contact JID "
-						+ cursor.getString(cursor.getColumnIndex(Contact.JID))
-						+ ": " + ignored + ". Skipping...");
-				continue;
-			}
-
-			String updateArgs[] = {
-					newJid,
-					cursor.getString(cursor.getColumnIndex(Contact.ACCOUNT)),
-					cursor.getString(cursor.getColumnIndex(Contact.JID)),
-			};
-			db.execSQL("update " + Contact.TABLENAME
-					+ " set " + Contact.JID + " = ? "
-					+ " where " + Contact.ACCOUNT + " = ? "
-					+ " AND " + Contact.JID + " = ?", updateArgs);
-		}
-		cursor.close();
-
-		// Account table
-		cursor = db.rawQuery("select * from " + Account.TABLENAME, new String[0]);
-		while (cursor.moveToNext()) {
-			String newServer;
-			try {
-				newServer = Jid.of(
-						cursor.getString(cursor.getColumnIndex(Account.USERNAME)),
-						cursor.getString(cursor.getColumnIndex(Account.SERVER)),
-						null
-				).getDomain();
-			} catch (IllegalArgumentException ignored) {
-				Log.e(Config.LOGTAG, "Failed to migrate Account SERVER "
-						+ cursor.getString(cursor.getColumnIndex(Account.SERVER))
-						+ ": " + ignored + ". Skipping...");
-				continue;
-			}
-
-			String updateArgs[] = {
-					newServer,
-					cursor.getString(cursor.getColumnIndex(Account.UUID)),
-			};
-			db.execSQL("update " + Account.TABLENAME
-					+ " set " + Account.SERVER + " = ? "
-					+ " where " + Account.UUID + " = ?", updateArgs);
-		}
-		cursor.close();
-	}
-
-	public void createConversation(Conversation conversation) {
-		SQLiteDatabase db = this.getWritableDatabase();
-		db.insert(Conversation.TABLENAME, null, conversation.getContentValues());
-	}
-
-	public void createMessage(Message message) {
-		SQLiteDatabase db = this.getWritableDatabase();
-		db.insert(Message.TABLENAME, null, message.getContentValues());
-	}
-
-	public void createAccount(Account account) {
-		SQLiteDatabase db = this.getWritableDatabase();
-		db.insert(Account.TABLENAME, null, account.getContentValues());
-	}
-
-	public void insertDiscoveryResult(ServiceDiscoveryResult result) {
-		SQLiteDatabase db = this.getWritableDatabase();
-		db.insert(ServiceDiscoveryResult.TABLENAME, null, result.getContentValues());
-	}
-
-	public ServiceDiscoveryResult findDiscoveryResult(final String hash, final String ver) {
-		SQLiteDatabase db = this.getReadableDatabase();
-		String[] selectionArgs = {hash, ver};
-		Cursor cursor = db.query(ServiceDiscoveryResult.TABLENAME, null,
-				ServiceDiscoveryResult.HASH + "=? AND " + ServiceDiscoveryResult.VER + "=?",
-				selectionArgs, null, null, null);
-		if (cursor.getCount() == 0) {
-			cursor.close();
-			return null;
-		}
-		cursor.moveToFirst();
-
-		ServiceDiscoveryResult result = null;
-		try {
-			result = new ServiceDiscoveryResult(cursor);
-		} catch (JSONException e) { /* result is still null */ }
-
-		cursor.close();
-		return result;
-	}
-
-	public void saveResolverResult(String domain, Resolver.Result result) {
-		SQLiteDatabase db = this.getWritableDatabase();
-		ContentValues contentValues = result.toContentValues();
-		contentValues.put(Resolver.Result.DOMAIN, domain);
-		db.insert(RESOLVER_RESULTS_TABLENAME, null, contentValues);
-	}
-
-	public synchronized Resolver.Result findResolverResult(String domain) {
-		SQLiteDatabase db = this.getReadableDatabase();
-		String where = Resolver.Result.DOMAIN + "=?";
-		String[] whereArgs = {domain};
-		final Cursor cursor = db.query(RESOLVER_RESULTS_TABLENAME, null, where, whereArgs, null, null, null);
-		Resolver.Result result = null;
-		if (cursor != null) {
-			try {
-				if (cursor.moveToFirst()) {
-					result = Resolver.Result.fromCursor(cursor);
-				}
-			} catch (Exception e ) {
-				Log.d(Config.LOGTAG,"unable to find cached resolver result in database "+e.getMessage());
-				return null;
-			} finally {
-				cursor.close();
-			}
-		}
-		return result;
-	}
-
-	public void insertPresenceTemplate(PresenceTemplate template) {
-		SQLiteDatabase db = this.getWritableDatabase();
-		String whereToDelete = PresenceTemplate.MESSAGE + "=?";
-		String[] whereToDeleteArgs = {template.getStatusMessage()};
-		db.delete(PresenceTemplate.TABELNAME, whereToDelete, whereToDeleteArgs);
-		db.delete(PresenceTemplate.TABELNAME, PresenceTemplate.UUID + " not in (select " + PresenceTemplate.UUID + " from " + PresenceTemplate.TABELNAME + " order by " + PresenceTemplate.LAST_USED + " desc limit 9)", null);
-		db.insert(PresenceTemplate.TABELNAME, null, template.getContentValues());
-	}
-
-	public List<PresenceTemplate> getPresenceTemplates() {
-		ArrayList<PresenceTemplate> templates = new ArrayList<>();
-		SQLiteDatabase db = this.getReadableDatabase();
-		Cursor cursor = db.query(PresenceTemplate.TABELNAME, null, null, null, null, null, PresenceTemplate.LAST_USED + " desc");
-		while (cursor.moveToNext()) {
-			templates.add(PresenceTemplate.fromCursor(cursor));
-		}
-		cursor.close();
-		return templates;
-	}
-
-	public CopyOnWriteArrayList<Conversation> getConversations(int status) {
-		CopyOnWriteArrayList<Conversation> list = new CopyOnWriteArrayList<>();
-		SQLiteDatabase db = this.getReadableDatabase();
-		String[] selectionArgs = {Integer.toString(status)};
-		Cursor cursor = db.rawQuery("select * from " + Conversation.TABLENAME
-				+ " where " + Conversation.STATUS + " = ? and " + Conversation.CONTACTJID + " is not null order by "
-				+ Conversation.CREATED + " desc", selectionArgs);
-		while (cursor.moveToNext()) {
-			final Conversation conversation = Conversation.fromCursor(cursor);
-			if (conversation.getJid() instanceof InvalidJid) {
-				continue;
-			}
-			list.add(conversation);
-		}
-		cursor.close();
-		return list;
-	}
-
-	public ArrayList<Message> getMessages(Conversation conversations, int limit) {
-		return getMessages(conversations, limit, -1);
-	}
-
-	public ArrayList<Message> getMessages(Conversation conversation, int limit, long timestamp) {
-		ArrayList<Message> list = new ArrayList<>();
-		SQLiteDatabase db = this.getReadableDatabase();
-		Cursor cursor;
-		if (timestamp == -1) {
-			String[] selectionArgs = {conversation.getUuid()};
-			cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
-					+ "=?", selectionArgs, null, null, Message.TIME_SENT
-					+ " DESC", String.valueOf(limit));
-		} else {
-			String[] selectionArgs = {conversation.getUuid(),
-					Long.toString(timestamp)};
-			cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
-							+ "=? and " + Message.TIME_SENT + "<?", selectionArgs,
-					null, null, Message.TIME_SENT + " DESC",
-					String.valueOf(limit));
-		}
-		if (cursor.getCount() > 0) {
-			cursor.moveToLast();
-			do {
-				Message message = Message.fromCursor(cursor, conversation);
-				if (message != null) {
-					list.add(message);
-				}
-			} while (cursor.moveToPrevious());
-		}
-		cursor.close();
-		return list;
-	}
-
-	public Cursor getMessageSearchCursor(List<String> term) {
-		SQLiteDatabase db = this.getReadableDatabase();
-		String SQL = "SELECT " + Message.TABLENAME + ".*," + Conversation.TABLENAME + '.' + Conversation.CONTACTJID + ',' + Conversation.TABLENAME + '.' + Conversation.ACCOUNT + ',' + Conversation.TABLENAME + '.' + Conversation.MODE + " FROM " + Message.TABLENAME + " join " + Conversation.TABLENAME + " on " + Message.TABLENAME + '.' + Message.CONVERSATION + '=' + Conversation.TABLENAME + '.' + Conversation.UUID + " join messages_index ON messages_index.uuid=messages.uuid where " + Message.ENCRYPTION + " NOT IN(" + Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE + ',' + Message.ENCRYPTION_PGP + ',' + Message.ENCRYPTION_DECRYPTION_FAILED + ','+Message.ENCRYPTION_AXOLOTL_FAILED+") AND " + Message.TYPE + " IN(" + Message.TYPE_TEXT + ',' + Message.TYPE_PRIVATE + ") AND messages_index.body MATCH ? ORDER BY " + Message.TIME_SENT + " DESC limit " + Config.MAX_SEARCH_RESULTS;
-		Log.d(Config.LOGTAG, "search term: " + FtsUtils.toMatchString(term));
-		return db.rawQuery(SQL, new String[]{FtsUtils.toMatchString(term)});
-	}
-
-	public Iterable<Message> getMessagesIterable(final Conversation conversation) {
-		return () -> {
-			class MessageIterator implements Iterator<Message> {
-				private SQLiteDatabase db = getReadableDatabase();
-				private String[] selectionArgs = {conversation.getUuid()};
-				private Cursor cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
-						+ "=?", selectionArgs, null, null, Message.TIME_SENT
-						+ " ASC", null);
-
-				private MessageIterator() {
-					cursor.moveToFirst();
-				}
-
-				@Override
-				public boolean hasNext() {
-					return !cursor.isAfterLast();
-				}
-
-				@Override
-				public Message next() {
-					Message message = Message.fromCursor(cursor, conversation);
-					cursor.moveToNext();
-					return message;
-				}
-
-				@Override
-				public void remove() {
-					throw new UnsupportedOperationException();
-				}
-			}
-			return new MessageIterator();
-		};
-	}
-
-	public List<String> markFileAsDeleted(final File file, final boolean internal) {
+    private static final String DATABASE_NAME = "history";
+    private static final int DATABASE_VERSION = 44;
+    private static DatabaseBackend instance = null;
+    private static String CREATE_CONTATCS_STATEMENT = "create table "
+            + Contact.TABLENAME + "(" + Contact.ACCOUNT + " TEXT, "
+            + Contact.SERVERNAME + " TEXT, " + Contact.SYSTEMNAME + " TEXT,"
+            + Contact.JID + " TEXT," + Contact.KEYS + " TEXT,"
+            + Contact.PHOTOURI + " TEXT," + Contact.OPTIONS + " NUMBER,"
+            + Contact.SYSTEMACCOUNT + " NUMBER, " + Contact.AVATAR + " TEXT, "
+            + Contact.LAST_PRESENCE + " TEXT, " + Contact.LAST_TIME + " NUMBER, "
+            + Contact.GROUPS + " TEXT, FOREIGN KEY(" + Contact.ACCOUNT + ") REFERENCES "
+            + Account.TABLENAME + "(" + Account.UUID
+            + ") ON DELETE CASCADE, UNIQUE(" + Contact.ACCOUNT + ", "
+            + Contact.JID + ") ON CONFLICT REPLACE);";
+
+    private static String CREATE_DISCOVERY_RESULTS_STATEMENT = "create table "
+            + ServiceDiscoveryResult.TABLENAME + "("
+            + ServiceDiscoveryResult.HASH + " TEXT, "
+            + ServiceDiscoveryResult.VER + " TEXT, "
+            + ServiceDiscoveryResult.RESULT + " TEXT, "
+            + "UNIQUE(" + ServiceDiscoveryResult.HASH + ", "
+            + ServiceDiscoveryResult.VER + ") ON CONFLICT REPLACE);";
+
+    private static String CREATE_PRESENCE_TEMPLATES_STATEMENT = "CREATE TABLE "
+            + PresenceTemplate.TABELNAME + "("
+            + PresenceTemplate.UUID + " TEXT, "
+            + PresenceTemplate.LAST_USED + " NUMBER,"
+            + PresenceTemplate.MESSAGE + " TEXT,"
+            + PresenceTemplate.STATUS + " TEXT,"
+            + "UNIQUE(" + PresenceTemplate.MESSAGE + "," + PresenceTemplate.STATUS + ") ON CONFLICT REPLACE);";
+
+    private static String CREATE_PREKEYS_STATEMENT = "CREATE TABLE "
+            + SQLiteAxolotlStore.PREKEY_TABLENAME + "("
+            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
+            + SQLiteAxolotlStore.ID + " INTEGER, "
+            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
+            + SQLiteAxolotlStore.ACCOUNT
+            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
+            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
+            + SQLiteAxolotlStore.ID
+            + ") ON CONFLICT REPLACE"
+            + ");";
+
+    private static String CREATE_SIGNED_PREKEYS_STATEMENT = "CREATE TABLE "
+            + SQLiteAxolotlStore.SIGNED_PREKEY_TABLENAME + "("
+            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
+            + SQLiteAxolotlStore.ID + " INTEGER, "
+            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
+            + SQLiteAxolotlStore.ACCOUNT
+            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
+            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
+            + SQLiteAxolotlStore.ID
+            + ") ON CONFLICT REPLACE" +
+            ");";
+
+    private static String CREATE_SESSIONS_STATEMENT = "CREATE TABLE "
+            + SQLiteAxolotlStore.SESSION_TABLENAME + "("
+            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
+            + SQLiteAxolotlStore.NAME + " TEXT, "
+            + SQLiteAxolotlStore.DEVICE_ID + " INTEGER, "
+            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
+            + SQLiteAxolotlStore.ACCOUNT
+            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
+            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
+            + SQLiteAxolotlStore.NAME + ", "
+            + SQLiteAxolotlStore.DEVICE_ID
+            + ") ON CONFLICT REPLACE"
+            + ");";
+
+    private static String CREATE_IDENTITIES_STATEMENT = "CREATE TABLE "
+            + SQLiteAxolotlStore.IDENTITIES_TABLENAME + "("
+            + SQLiteAxolotlStore.ACCOUNT + " TEXT,  "
+            + SQLiteAxolotlStore.NAME + " TEXT, "
+            + SQLiteAxolotlStore.OWN + " INTEGER, "
+            + SQLiteAxolotlStore.FINGERPRINT + " TEXT, "
+            + SQLiteAxolotlStore.CERTIFICATE + " BLOB, "
+            + SQLiteAxolotlStore.TRUST + " TEXT, "
+            + SQLiteAxolotlStore.ACTIVE + " NUMBER, "
+            + SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER,"
+            + SQLiteAxolotlStore.KEY + " TEXT, FOREIGN KEY("
+            + SQLiteAxolotlStore.ACCOUNT
+            + ") REFERENCES " + Account.TABLENAME + "(" + Account.UUID + ") ON DELETE CASCADE, "
+            + "UNIQUE( " + SQLiteAxolotlStore.ACCOUNT + ", "
+            + SQLiteAxolotlStore.NAME + ", "
+            + SQLiteAxolotlStore.FINGERPRINT
+            + ") ON CONFLICT IGNORE"
+            + ");";
+
+    private static String RESOLVER_RESULTS_TABLENAME = "resolver_results";
+
+    private static String CREATE_RESOLVER_RESULTS_TABLE = "create table " + RESOLVER_RESULTS_TABLENAME + "("
+            + Resolver.Result.DOMAIN + " TEXT,"
+            + Resolver.Result.HOSTNAME + " TEXT,"
+            + Resolver.Result.IP + " BLOB,"
+            + Resolver.Result.PRIORITY + " NUMBER,"
+            + Resolver.Result.DIRECT_TLS + " NUMBER,"
+            + Resolver.Result.AUTHENTICATED + " NUMBER,"
+            + Resolver.Result.PORT + " NUMBER,"
+            + "UNIQUE(" + Resolver.Result.DOMAIN + ") ON CONFLICT REPLACE"
+            + ");";
+
+    private static String CREATE_MESSAGE_TIME_INDEX = "create INDEX message_time_index ON " + Message.TABLENAME + "(" + Message.TIME_SENT + ")";
+    private static String CREATE_MESSAGE_CONVERSATION_INDEX = "create INDEX message_conversation_index ON " + Message.TABLENAME + "(" + Message.CONVERSATION + ")";
+    private static String CREATE_MESSAGE_DELETED_INDEX = "create index message_deleted_index ON " + Message.TABLENAME + "(" + Message.DELETED + ")";
+    private static String CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX = "create INDEX message_file_path_index ON " + Message.TABLENAME + "(" + Message.RELATIVE_FILE_PATH + ")";
+    private static String CREATE_MESSAGE_TYPE_INDEX = "create INDEX message_type_index ON " + Message.TABLENAME + "(" + Message.TYPE + ")";
+
+    private static String CREATE_MESSAGE_INDEX_TABLE = "CREATE VIRTUAL TABLE messages_index USING FTS4(uuid TEXT PRIMARY KEY, body TEXT)";
+    private static String CREATE_MESSAGE_INSERT_TRIGGER = "CREATE TRIGGER after_message_insert AFTER INSERT ON " + Message.TABLENAME + " BEGIN INSERT INTO messages_index (uuid,body) VALUES (new.uuid,new.body); END;";
+    private static String CREATE_MESSAGE_UPDATE_TRIGGER = "CREATE TRIGGER after_message_update UPDATE of uuid,body ON " + Message.TABLENAME + " BEGIN update messages_index set body=new.body,uuid=new.uuid WHERE uuid=old.uuid; END;";
+    private static String COPY_PREEXISTING_ENTRIES = "INSERT into messages_index(uuid,body) select uuid,body FROM " + Message.TABLENAME + ";";
+
+    private DatabaseBackend(Context context) {
+        super(context, DATABASE_NAME, null, DATABASE_VERSION);
+    }
+
+    private static ContentValues createFingerprintStatusContentValues(FingerprintStatus.Trust trust, boolean active) {
+        ContentValues values = new ContentValues();
+        values.put(SQLiteAxolotlStore.TRUST, trust.toString());
+        values.put(SQLiteAxolotlStore.ACTIVE, active ? 1 : 0);
+        return values;
+    }
+
+    public static synchronized DatabaseBackend getInstance(Context context) {
+        if (instance == null) {
+            instance = new DatabaseBackend(context);
+        }
+        return instance;
+    }
+
+    @Override
+    public void onConfigure(SQLiteDatabase db) {
+        db.execSQL("PRAGMA foreign_keys=ON");
+        db.rawQuery("PRAGMA secure_delete=ON", null);
+    }
+
+    @Override
+    public void onCreate(SQLiteDatabase db) {
+        db.execSQL("create table " + Account.TABLENAME + "(" + Account.UUID + " TEXT PRIMARY KEY,"
+                + Account.USERNAME + " TEXT,"
+                + Account.SERVER + " TEXT,"
+                + Account.PASSWORD + " TEXT,"
+                + Account.DISPLAY_NAME + " TEXT, "
+                + Account.STATUS + " TEXT,"
+                + Account.STATUS_MESSAGE + " TEXT,"
+                + Account.ROSTERVERSION + " TEXT,"
+                + Account.OPTIONS + " NUMBER, "
+                + Account.AVATAR + " TEXT, "
+                + Account.KEYS + " TEXT, "
+                + Account.HOSTNAME + " TEXT, "
+                + Account.RESOURCE + " TEXT,"
+                + Account.PORT + " NUMBER DEFAULT 5222)");
+        db.execSQL("create table " + Conversation.TABLENAME + " ("
+                + Conversation.UUID + " TEXT PRIMARY KEY, " + Conversation.NAME
+                + " TEXT, " + Conversation.CONTACT + " TEXT, "
+                + Conversation.ACCOUNT + " TEXT, " + Conversation.CONTACTJID
+                + " TEXT, " + Conversation.CREATED + " NUMBER, "
+                + Conversation.STATUS + " NUMBER, " + Conversation.MODE
+                + " NUMBER, " + Conversation.ATTRIBUTES + " TEXT, FOREIGN KEY("
+                + Conversation.ACCOUNT + ") REFERENCES " + Account.TABLENAME
+                + "(" + Account.UUID + ") ON DELETE CASCADE);");
+        db.execSQL("create table " + Message.TABLENAME + "( " + Message.UUID
+                + " TEXT PRIMARY KEY, " + Message.CONVERSATION + " TEXT, "
+                + Message.TIME_SENT + " NUMBER, " + Message.COUNTERPART
+                + " TEXT, " + Message.TRUE_COUNTERPART + " TEXT,"
+                + Message.BODY + " TEXT, " + Message.ENCRYPTION + " NUMBER, "
+                + Message.STATUS + " NUMBER," + Message.TYPE + " NUMBER, "
+                + Message.RELATIVE_FILE_PATH + " TEXT, "
+                + Message.SERVER_MSG_ID + " TEXT, "
+                + Message.FINGERPRINT + " TEXT, "
+                + Message.CARBON + " INTEGER, "
+                + Message.EDITED + " TEXT, "
+                + Message.READ + " NUMBER DEFAULT 1, "
+                + Message.OOB + " INTEGER, "
+                + Message.ERROR_MESSAGE + " TEXT,"
+                + Message.READ_BY_MARKERS + " TEXT,"
+                + Message.MARKABLE + " NUMBER DEFAULT 0,"
+                + Message.DELETED + " NUMBER DEFAULT 0,"
+                + Message.REMOTE_MSG_ID + " TEXT, FOREIGN KEY("
+                + Message.CONVERSATION + ") REFERENCES "
+                + Conversation.TABLENAME + "(" + Conversation.UUID
+                + ") ON DELETE CASCADE);");
+        db.execSQL(CREATE_MESSAGE_TIME_INDEX);
+        db.execSQL(CREATE_MESSAGE_CONVERSATION_INDEX);
+        db.execSQL(CREATE_MESSAGE_DELETED_INDEX);
+        db.execSQL(CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX);
+        db.execSQL(CREATE_MESSAGE_TYPE_INDEX);
+        db.execSQL(CREATE_CONTATCS_STATEMENT);
+        db.execSQL(CREATE_DISCOVERY_RESULTS_STATEMENT);
+        db.execSQL(CREATE_SESSIONS_STATEMENT);
+        db.execSQL(CREATE_PREKEYS_STATEMENT);
+        db.execSQL(CREATE_SIGNED_PREKEYS_STATEMENT);
+        db.execSQL(CREATE_IDENTITIES_STATEMENT);
+        db.execSQL(CREATE_PRESENCE_TEMPLATES_STATEMENT);
+        db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
+        db.execSQL(CREATE_MESSAGE_INDEX_TABLE);
+        db.execSQL(CREATE_MESSAGE_INSERT_TRIGGER);
+        db.execSQL(CREATE_MESSAGE_UPDATE_TRIGGER);
+    }
+
+    @Override
+    public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
+        if (oldVersion < 2 && newVersion >= 2) {
+            db.execSQL("update " + Account.TABLENAME + " set "
+                    + Account.OPTIONS + " = " + Account.OPTIONS + " | 8");
+        }
+        if (oldVersion < 3 && newVersion >= 3) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
+                    + Message.TYPE + " NUMBER");
+        }
+        if (oldVersion < 5 && newVersion >= 5) {
+            db.execSQL("DROP TABLE " + Contact.TABLENAME);
+            db.execSQL(CREATE_CONTATCS_STATEMENT);
+            db.execSQL("UPDATE " + Account.TABLENAME + " SET "
+                    + Account.ROSTERVERSION + " = NULL");
+        }
+        if (oldVersion < 6 && newVersion >= 6) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
+                    + Message.TRUE_COUNTERPART + " TEXT");
+        }
+        if (oldVersion < 7 && newVersion >= 7) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
+                    + Message.REMOTE_MSG_ID + " TEXT");
+            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
+                    + Contact.AVATAR + " TEXT");
+            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN "
+                    + Account.AVATAR + " TEXT");
+        }
+        if (oldVersion < 8 && newVersion >= 8) {
+            db.execSQL("ALTER TABLE " + Conversation.TABLENAME + " ADD COLUMN "
+                    + Conversation.ATTRIBUTES + " TEXT");
+        }
+        if (oldVersion < 9 && newVersion >= 9) {
+            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
+                    + Contact.LAST_TIME + " NUMBER");
+            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
+                    + Contact.LAST_PRESENCE + " TEXT");
+        }
+        if (oldVersion < 10 && newVersion >= 10) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
+                    + Message.RELATIVE_FILE_PATH + " TEXT");
+        }
+        if (oldVersion < 11 && newVersion >= 11) {
+            db.execSQL("ALTER TABLE " + Contact.TABLENAME + " ADD COLUMN "
+                    + Contact.GROUPS + " TEXT");
+            db.execSQL("delete from " + Contact.TABLENAME);
+            db.execSQL("update " + Account.TABLENAME + " set " + Account.ROSTERVERSION + " = NULL");
+        }
+        if (oldVersion < 12 && newVersion >= 12) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
+                    + Message.SERVER_MSG_ID + " TEXT");
+        }
+        if (oldVersion < 13 && newVersion >= 13) {
+            db.execSQL("delete from " + Contact.TABLENAME);
+            db.execSQL("update " + Account.TABLENAME + " set " + Account.ROSTERVERSION + " = NULL");
+        }
+        if (oldVersion < 14 && newVersion >= 14) {
+            canonicalizeJids(db);
+        }
+        if (oldVersion < 15 && newVersion >= 15) {
+            recreateAxolotlDb(db);
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN "
+                    + Message.FINGERPRINT + " TEXT");
+        }
+        if (oldVersion < 16 && newVersion >= 16) {
+            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");
+        }
+        if (oldVersion < 20 && newVersion >= 20) {
+            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.HOSTNAME + " TEXT");
+            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.PORT + " NUMBER DEFAULT 5222");
+        }
+        if (oldVersion < 26 && newVersion >= 26) {
+            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.STATUS + " TEXT");
+            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.STATUS_MESSAGE + " TEXT");
+        }
+        if (oldVersion < 40 && newVersion >= 40) {
+            db.execSQL("ALTER TABLE " + Account.TABLENAME + " ADD COLUMN " + Account.RESOURCE + " 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 && newVersion < 31) {
+            List<Account> accounts = getAccounts(db);
+            for (Account account : accounts) {
+                String ownDeviceIdString = account.getKey(SQLiteAxolotlStore.JSONKEY_REGISTRATION_ID);
+                if (ownDeviceIdString == null) {
+                    continue;
+                }
+                int ownDeviceId = Integer.valueOf(ownDeviceIdString);
+                SignalProtocolAddress ownAddress = new SignalProtocolAddress(account.getJid().asBareJid().toString(), ownDeviceId);
+                deleteSession(db, account, ownAddress);
+                IdentityKeyPair identityKeyPair = loadOwnIdentityKeyPair(db, account);
+                if (identityKeyPair != null) {
+                    String[] selectionArgs = {
+                            account.getUuid(),
+                            CryptoHelper.bytesToHex(identityKeyPair.getPublicKey().serialize())
+                    };
+                    ContentValues values = new ContentValues();
+                    values.put(SQLiteAxolotlStore.TRUSTED, 2);
+                    db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, values,
+                            SQLiteAxolotlStore.ACCOUNT + " = ? AND "
+                                    + SQLiteAxolotlStore.FINGERPRINT + " = ? ",
+                            selectionArgs);
+                } else {
+                    Log.d(Config.LOGTAG, account.getJid().asBareJid() + ": could not load own identity key pair");
+                }
+            }
+        }
+        if (oldVersion < 18 && newVersion >= 18) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.READ + " NUMBER DEFAULT 1");
+        }
+
+        if (oldVersion < 21 && newVersion >= 21) {
+            List<Account> accounts = getAccounts(db);
+            for (Account account : accounts) {
+                account.unsetPgpSignature();
+                db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
+                        + "=?", new String[]{account.getUuid()});
+            }
+        }
+
+        if (oldVersion >= 15 && oldVersion < 22 && newVersion >= 22) {
+            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.CERTIFICATE);
+        }
+
+        if (oldVersion < 23 && newVersion >= 23) {
+            db.execSQL(CREATE_DISCOVERY_RESULTS_STATEMENT);
+        }
+
+        if (oldVersion < 24 && newVersion >= 24) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.EDITED + " TEXT");
+        }
+
+        if (oldVersion < 25 && newVersion >= 25) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.OOB + " INTEGER");
+        }
+
+        if (oldVersion < 26 && newVersion >= 26) {
+            db.execSQL(CREATE_PRESENCE_TEMPLATES_STATEMENT);
+        }
+
+        if (oldVersion < 27 && newVersion >= 27) {
+            db.execSQL("DELETE FROM " + ServiceDiscoveryResult.TABLENAME);
+        }
+
+        if (oldVersion < 28 && newVersion >= 28) {
+            canonicalizeJids(db);
+        }
+
+        if (oldVersion < 29 && newVersion >= 29) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.ERROR_MESSAGE + " TEXT");
+        }
+        if (oldVersion >= 15 && oldVersion < 31 && newVersion >= 31) {
+            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.TRUST + " TEXT");
+            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.ACTIVE + " NUMBER");
+            HashMap<Integer, ContentValues> migration = new HashMap<>();
+            migration.put(0, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
+            migration.put(1, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, true));
+            migration.put(2, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, true));
+            migration.put(3, createFingerprintStatusContentValues(FingerprintStatus.Trust.COMPROMISED, false));
+            migration.put(4, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
+            migration.put(5, createFingerprintStatusContentValues(FingerprintStatus.Trust.TRUSTED, false));
+            migration.put(6, createFingerprintStatusContentValues(FingerprintStatus.Trust.UNTRUSTED, false));
+            migration.put(7, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, true));
+            migration.put(8, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED_X509, false));
+            for (Map.Entry<Integer, ContentValues> entry : migration.entrySet()) {
+                String whereClause = SQLiteAxolotlStore.TRUSTED + "=?";
+                String[] where = {String.valueOf(entry.getKey())};
+                db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, entry.getValue(), whereClause, where);
+            }
+
+        }
+        if (oldVersion >= 15 && oldVersion < 32 && newVersion >= 32) {
+            db.execSQL("ALTER TABLE " + SQLiteAxolotlStore.IDENTITIES_TABLENAME + " ADD COLUMN " + SQLiteAxolotlStore.LAST_ACTIVATION + " NUMBER");
+            ContentValues defaults = new ContentValues();
+            defaults.put(SQLiteAxolotlStore.LAST_ACTIVATION, System.currentTimeMillis());
+            db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, defaults, null, null);
+        }
+        if (oldVersion >= 15 && oldVersion < 33 && newVersion >= 33) {
+            String whereClause = SQLiteAxolotlStore.OWN + "=1";
+            db.update(SQLiteAxolotlStore.IDENTITIES_TABLENAME, createFingerprintStatusContentValues(FingerprintStatus.Trust.VERIFIED, true), whereClause, null);
+        }
+
+        if (oldVersion < 34 && newVersion >= 34) {
+            db.execSQL(CREATE_MESSAGE_TIME_INDEX);
+
+            final File oldPicturesDirectory = new File(Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_PICTURES) + "/Conversations/");
+            final File oldFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/");
+            final File newFilesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Files/");
+            final File newVideosDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Videos/");
+            if (oldPicturesDirectory.exists() && oldPicturesDirectory.isDirectory()) {
+                final File newPicturesDirectory = new File(Environment.getExternalStorageDirectory() + "/Conversations/Media/Conversations Images/");
+                newPicturesDirectory.getParentFile().mkdirs();
+                if (oldPicturesDirectory.renameTo(newPicturesDirectory)) {
+                    Log.d(Config.LOGTAG, "moved " + oldPicturesDirectory.getAbsolutePath() + " to " + newPicturesDirectory.getAbsolutePath());
+                }
+            }
+            if (oldFilesDirectory.exists() && oldFilesDirectory.isDirectory()) {
+                newFilesDirectory.mkdirs();
+                newVideosDirectory.mkdirs();
+                final File[] files = oldFilesDirectory.listFiles();
+                if (files == null) {
+                    return;
+                }
+                for (File file : files) {
+                    if (file.getName().equals(".nomedia")) {
+                        if (file.delete()) {
+                            Log.d(Config.LOGTAG, "deleted nomedia file in " + oldFilesDirectory.getAbsolutePath());
+                        }
+                    } else if (file.isFile()) {
+                        final String name = file.getName();
+                        boolean isVideo = false;
+                        int start = name.lastIndexOf('.') + 1;
+                        if (start < name.length()) {
+                            String mime = MimeUtils.guessMimeTypeFromExtension(name.substring(start));
+                            isVideo = mime != null && mime.startsWith("video/");
+                        }
+                        File dst = new File((isVideo ? newVideosDirectory : newFilesDirectory).getAbsolutePath() + "/" + file.getName());
+                        if (file.renameTo(dst)) {
+                            Log.d(Config.LOGTAG, "moved " + file + " to " + dst);
+                        }
+                    }
+                }
+            }
+        }
+        if (oldVersion < 35 && newVersion >= 35) {
+            db.execSQL(CREATE_MESSAGE_CONVERSATION_INDEX);
+        }
+        if (oldVersion < 36 && newVersion >= 36) {
+            List<Account> accounts = getAccounts(db);
+            for (Account account : accounts) {
+                account.setOption(Account.OPTION_REQUIRES_ACCESS_MODE_CHANGE, true);
+                account.setOption(Account.OPTION_LOGGED_IN_SUCCESSFULLY, false);
+                db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
+                        + "=?", new String[]{account.getUuid()});
+            }
+        }
+
+        if (oldVersion < 37 && newVersion >= 37) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.READ_BY_MARKERS + " TEXT");
+        }
+
+        if (oldVersion < 38 && newVersion >= 38) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.MARKABLE + " NUMBER DEFAULT 0");
+        }
+
+        if (oldVersion < 39 && newVersion >= 39) {
+            db.execSQL(CREATE_RESOLVER_RESULTS_TABLE);
+        }
+
+        if (oldVersion < 41 && newVersion >= 41) {
+            db.execSQL(CREATE_MESSAGE_INDEX_TABLE);
+            db.execSQL(CREATE_MESSAGE_INSERT_TRIGGER);
+            db.execSQL(CREATE_MESSAGE_UPDATE_TRIGGER);
+            db.execSQL(COPY_PREEXISTING_ENTRIES);
+        }
+
+        if (oldVersion < 42 && newVersion >= 42) {
+            db.execSQL("DROP TRIGGER IF EXISTS after_message_delete");
+        }
+        if (QuickConversationsService.isQuicksy() && oldVersion < 43 && newVersion >= 43) {
+            List<Account> accounts = getAccounts(db);
+            for (Account account : accounts) {
+                account.setOption(Account.OPTION_MAGIC_CREATE, true);
+                db.update(Account.TABLENAME, account.getContentValues(), Account.UUID
+                        + "=?", new String[]{account.getUuid()});
+            }
+        }
+
+        if (oldVersion < 44 && newVersion >= 44) {
+            db.execSQL("ALTER TABLE " + Message.TABLENAME + " ADD COLUMN " + Message.DELETED + " NUMBER DEFAULT 0");
+            db.execSQL(CREATE_MESSAGE_DELETED_INDEX);
+            db.execSQL(CREATE_MESSAGE_RELATIVE_FILE_PATH_INDEX);
+            db.execSQL(CREATE_MESSAGE_TYPE_INDEX);
+        }
+    }
+
+    private void canonicalizeJids(SQLiteDatabase db) {
+        // migrate db to new, canonicalized JID domainpart representation
+
+        // Conversation table
+        Cursor cursor = db.rawQuery("select * from " + Conversation.TABLENAME, new String[0]);
+        while (cursor.moveToNext()) {
+            String newJid;
+            try {
+                newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID))).toString();
+            } catch (IllegalArgumentException ignored) {
+                Log.e(Config.LOGTAG, "Failed to migrate Conversation CONTACTJID "
+                        + cursor.getString(cursor.getColumnIndex(Conversation.CONTACTJID))
+                        + ": " + ignored + ". Skipping...");
+                continue;
+            }
+
+            String updateArgs[] = {
+                    newJid,
+                    cursor.getString(cursor.getColumnIndex(Conversation.UUID)),
+            };
+            db.execSQL("update " + Conversation.TABLENAME
+                    + " set " + Conversation.CONTACTJID + " = ? "
+                    + " where " + Conversation.UUID + " = ?", updateArgs);
+        }
+        cursor.close();
+
+        // Contact table
+        cursor = db.rawQuery("select * from " + Contact.TABLENAME, new String[0]);
+        while (cursor.moveToNext()) {
+            String newJid;
+            try {
+                newJid = Jid.of(cursor.getString(cursor.getColumnIndex(Contact.JID))).toString();
+            } catch (IllegalArgumentException ignored) {
+                Log.e(Config.LOGTAG, "Failed to migrate Contact JID "
+                        + cursor.getString(cursor.getColumnIndex(Contact.JID))
+                        + ": " + ignored + ". Skipping...");
+                continue;
+            }
+
+            String updateArgs[] = {
+                    newJid,
+                    cursor.getString(cursor.getColumnIndex(Contact.ACCOUNT)),
+                    cursor.getString(cursor.getColumnIndex(Contact.JID)),
+            };
+            db.execSQL("update " + Contact.TABLENAME
+                    + " set " + Contact.JID + " = ? "
+                    + " where " + Contact.ACCOUNT + " = ? "
+                    + " AND " + Contact.JID + " = ?", updateArgs);
+        }
+        cursor.close();
+
+        // Account table
+        cursor = db.rawQuery("select * from " + Account.TABLENAME, new String[0]);
+        while (cursor.moveToNext()) {
+            String newServer;
+            try {
+                newServer = Jid.of(
+                        cursor.getString(cursor.getColumnIndex(Account.USERNAME)),
+                        cursor.getString(cursor.getColumnIndex(Account.SERVER)),
+                        null
+                ).getDomain();
+            } catch (IllegalArgumentException ignored) {
+                Log.e(Config.LOGTAG, "Failed to migrate Account SERVER "
+                        + cursor.getString(cursor.getColumnIndex(Account.SERVER))
+                        + ": " + ignored + ". Skipping...");
+                continue;
+            }
+
+            String updateArgs[] = {
+                    newServer,
+                    cursor.getString(cursor.getColumnIndex(Account.UUID)),
+            };
+            db.execSQL("update " + Account.TABLENAME
+                    + " set " + Account.SERVER + " = ? "
+                    + " where " + Account.UUID + " = ?", updateArgs);
+        }
+        cursor.close();
+    }
+
+    public void createConversation(Conversation conversation) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        db.insert(Conversation.TABLENAME, null, conversation.getContentValues());
+    }
+
+    public void createMessage(Message message) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        db.insert(Message.TABLENAME, null, message.getContentValues());
+    }
+
+    public void createAccount(Account account) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        db.insert(Account.TABLENAME, null, account.getContentValues());
+    }
+
+    public void insertDiscoveryResult(ServiceDiscoveryResult result) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        db.insert(ServiceDiscoveryResult.TABLENAME, null, result.getContentValues());
+    }
+
+    public ServiceDiscoveryResult findDiscoveryResult(final String hash, final String ver) {
+        SQLiteDatabase db = this.getReadableDatabase();
+        String[] selectionArgs = {hash, ver};
+        Cursor cursor = db.query(ServiceDiscoveryResult.TABLENAME, null,
+                ServiceDiscoveryResult.HASH + "=? AND " + ServiceDiscoveryResult.VER + "=?",
+                selectionArgs, null, null, null);
+        if (cursor.getCount() == 0) {
+            cursor.close();
+            return null;
+        }
+        cursor.moveToFirst();
+
+        ServiceDiscoveryResult result = null;
+        try {
+            result = new ServiceDiscoveryResult(cursor);
+        } catch (JSONException e) { /* result is still null */ }
+
+        cursor.close();
+        return result;
+    }
+
+    public void saveResolverResult(String domain, Resolver.Result result) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        ContentValues contentValues = result.toContentValues();
+        contentValues.put(Resolver.Result.DOMAIN, domain);
+        db.insert(RESOLVER_RESULTS_TABLENAME, null, contentValues);
+    }
+
+    public synchronized Resolver.Result findResolverResult(String domain) {
+        SQLiteDatabase db = this.getReadableDatabase();
+        String where = Resolver.Result.DOMAIN + "=?";
+        String[] whereArgs = {domain};
+        final Cursor cursor = db.query(RESOLVER_RESULTS_TABLENAME, null, where, whereArgs, null, null, null);
+        Resolver.Result result = null;
+        if (cursor != null) {
+            try {
+                if (cursor.moveToFirst()) {
+                    result = Resolver.Result.fromCursor(cursor);
+                }
+            } catch (Exception e) {
+                Log.d(Config.LOGTAG, "unable to find cached resolver result in database " + e.getMessage());
+                return null;
+            } finally {
+                cursor.close();
+            }
+        }
+        return result;
+    }
+
+    public void insertPresenceTemplate(PresenceTemplate template) {
+        SQLiteDatabase db = this.getWritableDatabase();
+        String whereToDelete = PresenceTemplate.MESSAGE + "=?";
+        String[] whereToDeleteArgs = {template.getStatusMessage()};
+        db.delete(PresenceTemplate.TABELNAME, whereToDelete, whereToDeleteArgs);
+        db.delete(PresenceTemplate.TABELNAME, PresenceTemplate.UUID + " not in (select " + PresenceTemplate.UUID + " from " + PresenceTemplate.TABELNAME + " order by " + PresenceTemplate.LAST_USED + " desc limit 9)", null);
+        db.insert(PresenceTemplate.TABELNAME, null, template.getContentValues());
+    }
+
+    public List<PresenceTemplate> getPresenceTemplates() {
+        ArrayList<PresenceTemplate> templates = new ArrayList<>();
+        SQLiteDatabase db = this.getReadableDatabase();
+        Cursor cursor = db.query(PresenceTemplate.TABELNAME, null, null, null, null, null, PresenceTemplate.LAST_USED + " desc");
+        while (cursor.moveToNext()) {
+            templates.add(PresenceTemplate.fromCursor(cursor));
+        }
+        cursor.close();
+        return templates;
+    }
+
+    public CopyOnWriteArrayList<Conversation> getConversations(int status) {
+        CopyOnWriteArrayList<Conversation> list = new CopyOnWriteArrayList<>();
+        SQLiteDatabase db = this.getReadableDatabase();
+        String[] selectionArgs = {Integer.toString(status)};
+        Cursor cursor = db.rawQuery("select * from " + Conversation.TABLENAME
+                + " where " + Conversation.STATUS + " = ? and " + Conversation.CONTACTJID + " is not null order by "
+                + Conversation.CREATED + " desc", selectionArgs);
+        while (cursor.moveToNext()) {
+            final Conversation conversation = Conversation.fromCursor(cursor);
+            if (conversation.getJid() instanceof InvalidJid) {
+                continue;
+            }
+            list.add(conversation);
+        }
+        cursor.close();
+        return list;
+    }
+
+    public ArrayList<Message> getMessages(Conversation conversations, int limit) {
+        return getMessages(conversations, limit, -1);
+    }
+
+    public ArrayList<Message> getMessages(Conversation conversation, int limit, long timestamp) {
+        ArrayList<Message> list = new ArrayList<>();
+        SQLiteDatabase db = this.getReadableDatabase();
+        Cursor cursor;
+        if (timestamp == -1) {
+            String[] selectionArgs = {conversation.getUuid()};
+            cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
+                    + "=?", selectionArgs, null, null, Message.TIME_SENT
+                    + " DESC", String.valueOf(limit));
+        } else {
+            String[] selectionArgs = {conversation.getUuid(),
+                    Long.toString(timestamp)};
+            cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
+                            + "=? and " + Message.TIME_SENT + "<?", selectionArgs,
+                    null, null, Message.TIME_SENT + " DESC",
+                    String.valueOf(limit));
+        }
+        if (cursor.getCount() > 0) {
+            cursor.moveToLast();
+            do {
+                Message message = Message.fromCursor(cursor, conversation);
+                if (message != null) {
+                    list.add(message);
+                }
+            } while (cursor.moveToPrevious());
+        }
+        cursor.close();
+        return list;
+    }
+
+    public Cursor getMessageSearchCursor(List<String> term) {
+        SQLiteDatabase db = this.getReadableDatabase();
+        String SQL = "SELECT " + Message.TABLENAME + ".*," + Conversation.TABLENAME + '.' + Conversation.CONTACTJID + ',' + Conversation.TABLENAME + '.' + Conversation.ACCOUNT + ',' + Conversation.TABLENAME + '.' + Conversation.MODE + " FROM " + Message.TABLENAME + " join " + Conversation.TABLENAME + " on " + Message.TABLENAME + '.' + Message.CONVERSATION + '=' + Conversation.TABLENAME + '.' + Conversation.UUID + " join messages_index ON messages_index.uuid=messages.uuid where " + Message.ENCRYPTION + " NOT IN(" + Message.ENCRYPTION_AXOLOTL_NOT_FOR_THIS_DEVICE + ',' + Message.ENCRYPTION_PGP + ',' + Message.ENCRYPTION_DECRYPTION_FAILED + ',' + Message.ENCRYPTION_AXOLOTL_FAILED + ") AND " + Message.TYPE + " IN(" + Message.TYPE_TEXT + ',' + Message.TYPE_PRIVATE + ") AND messages_index.body MATCH ? ORDER BY " + Message.TIME_SENT + " DESC limit " + Config.MAX_SEARCH_RESULTS;
+        Log.d(Config.LOGTAG, "search term: " + FtsUtils.toMatchString(term));
+        return db.rawQuery(SQL, new String[]{FtsUtils.toMatchString(term)});
+    }
+
+    public Iterable<Message> getMessagesIterable(final Conversation conversation) {
+        return () -> {
+            class MessageIterator implements Iterator<Message> {
+                private SQLiteDatabase db = getReadableDatabase();
+                private String[] selectionArgs = {conversation.getUuid()};
+                private Cursor cursor = db.query(Message.TABLENAME, null, Message.CONVERSATION
+                        + "=?", selectionArgs, null, null, Message.TIME_SENT
+                        + " ASC", null);
+
+                private MessageIterator() {
+                    cursor.moveToFirst();
+                }
+
+                @Override
+                public boolean hasNext() {
+                    return !cursor.isAfterLast();
+                }
+
+                @Override
+                public Message next() {
+                    Message message = Message.fromCursor(cursor, conversation);
+                    cursor.moveToNext();
+                    return message;
+                }
+
+                @Override
+                public void remove() {
+                    throw new UnsupportedOperationException();
+                }
+            }
+            return new MessageIterator();
+        };
+    }
+
+    public List<String> markFileAsDeleted(final File file, final boolean internal) {
         SQLiteDatabase db = this.getReadableDatabase();
         String selection;
         String[] selectionArgs;
         if (internal) {
-            selection = Message.RELATIVE_FILE_PATH+" IN(?,?) and type in (1,2)";
-            selectionArgs = new String[]{file.getAbsolutePath(),file.getName()};
+            final String name = file.getName();
+            if (name.endsWith(".pgp")) {
+                selection = "(" + Message.RELATIVE_FILE_PATH + " IN(?,?) OR (" + Message.RELATIVE_FILE_PATH + "=? and encryption in(1,4))) and type in (1,2)";
+                selectionArgs = new String[]{file.getAbsolutePath(), name, name.substring(0, name.length() - 4)};
+            } else {
+                selection = Message.RELATIVE_FILE_PATH + " IN(?,?) and type in (1,2)";
+                selectionArgs = new String[]{file.getAbsolutePath(), name};
+            }
         } else {
-            selection = Message.RELATIVE_FILE_PATH+"=? and type in (1,2)";
+            selection = Message.RELATIVE_FILE_PATH + "=? and type in (1,2)";
             selectionArgs = new String[]{file.getAbsolutePath()};
         }
         final List<String> uuids = new ArrayList<>();
-        Cursor cursor = db.query(Message.TABLENAME,new String[]{Message.UUID},selection,selectionArgs,null,null,null);
-        while(cursor != null && cursor.moveToNext()) {
+        Cursor cursor = db.query(Message.TABLENAME, new String[]{Message.UUID}, selection, selectionArgs, null, null, null);
+        while (cursor != null && cursor.moveToNext()) {
             uuids.add(cursor.getString(0));
         }
         if (cursor != null) {

src/main/java/eu/siacs/conversations/services/XmppConnectionService.java 🔗

@@ -1635,8 +1635,8 @@ public class XmppConnectionService extends Service {
         final File file = new File(path);
         final boolean isInternalFile = fileBackend.isInternalFile(file);
         final List<String> uuids = databaseBackend.markFileAsDeleted(file, isInternalFile);
-		Log.d(Config.LOGTAG, "deleted file " + path+" internal="+isInternalFile+", database hits="+uuids.size());
-		markUuidsAsDeletedFiles(uuids);
+        Log.d(Config.LOGTAG, "deleted file " + path+" internal="+isInternalFile+", database hits="+uuids.size());
+        markUuidsAsDeletedFiles(uuids);
 	}
 
 	private void markUuidsAsDeletedFiles(List<String> uuids) {

src/main/java/eu/siacs/conversations/ui/ConversationFragment.java 🔗

@@ -1089,7 +1089,7 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
                     copyLink.setVisible(true);
                 }
             }
-            if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED) {
+            if (m.getEncryption() == Message.ENCRYPTION_DECRYPTION_FAILED && !deleted) {
                 retryDecryption.setVisible(true);
             }
             if (!showError