narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

avoid unnecessary roster sync in OMEMO code. fixed startup performance regression

Browse source
This commit is contained in:
Daniel Gultsch 2017-07-29 13:50:32 +02:00
parent 837c212931
commit f5da4791ad
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/eu/siacs/conversations/crypto/axolotl/AxolotlService.java
View file

@ -218,14 +218,12 @@ public class AxolotlService implements OnAdvancedStreamFeaturesLoaded {
deviceIds = store.getSubDeviceSessions(address); deviceIds = store.getSubDeviceSessions(address);
putDevicesForJid(address, deviceIds, store); putDevicesForJid(address, deviceIds, store);
} }
} }
@Override @Override
public void put(SignalProtocolAddress address, XmppAxolotlSession value) { public void put(SignalProtocolAddress address, XmppAxolotlSession value) {
super.put(address, value); super.put(address, value);
value.setNotFresh(); value.setNotFresh();
xmppConnectionService.syncRosterToDisk(account); //TODO why?
} }
public void put(XmppAxolotlSession session) { public void put(XmppAxolotlSession session) {

4
src/main/java/eu/siacs/conversations/persistance/DatabaseBackend.java
View file

@ -956,7 +956,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
public List<String> getKnownSignalAddresses(Account account) { public List<String> getKnownSignalAddresses(Account account) {
List<String> addresses = new ArrayList<>(); List<String> addresses = new ArrayList<>();
String[] colums = {SQLiteAxolotlStore.NAME}; String[] colums = {"DISTINCT "+SQLiteAxolotlStore.NAME};
String[] selectionArgs = {account.getUuid()}; String[] selectionArgs = {account.getUuid()};
Cursor cursor = getReadableDatabase().query(SQLiteAxolotlStore.SESSION_TABLENAME, Cursor cursor = getReadableDatabase().query(SQLiteAxolotlStore.SESSION_TABLENAME,
colums, colums,
@ -965,7 +965,7 @@ public class DatabaseBackend extends SQLiteOpenHelper {
null,null,null null,null,null
); );
while (cursor.moveToNext()) { while (cursor.moveToNext()) {
addresses.add(cursor.getString(cursor.getColumnIndex(SQLiteAxolotlStore.NAME))); addresses.add(cursor.getString(0));
} }
cursor.close(); cursor.close();
return addresses; return addresses;