From 62bddc494de8da7de7f59e789b415d666a210666 Mon Sep 17 00:00:00 2001 From: Christian Schneppe Date: Tue, 1 Aug 2017 13:36:19 +0200 Subject: avoid unnecessary roster sync in OMEMO code. fixed startup performance regression --- src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java | 1 - src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java index 697c0dec5..098586efa 100644 --- a/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java +++ b/src/main/java/de/pixart/messenger/crypto/axolotl/AxolotlService.java @@ -224,7 +224,6 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded { public void put(SignalProtocolAddress address, XmppAxolotlSession value) { super.put(address, value); value.setNotFresh(); - xmppConnectionService.syncRosterToDisk(account); //TODO why? } public void put(XmppAxolotlSession session) { diff --git a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java index 611a0b65d..b23212c83 100644 --- a/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java +++ b/src/main/java/de/pixart/messenger/persistance/DatabaseBackend.java @@ -967,7 +967,7 @@ public class DatabaseBackend extends SQLiteOpenHelper { public List getKnownSignalAddresses(Account account) { List addresses = new ArrayList<>(); - String[] colums = {SQLiteAxolotlStore.NAME}; + String[] colums = {"DISTINCT "+SQLiteAxolotlStore.NAME}; String[] selectionArgs = {account.getUuid()}; Cursor cursor = getReadableDatabase().query(SQLiteAxolotlStore.SESSION_TABLENAME, colums, @@ -976,7 +976,7 @@ public class DatabaseBackend extends SQLiteOpenHelper { null, null, null ); while (cursor.moveToNext()) { - addresses.add(cursor.getString(cursor.getColumnIndex(SQLiteAxolotlStore.NAME))); + addresses.add(cursor.getString(0)); } cursor.close(); return addresses; -- cgit v1.2.3