Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-02-23 19:26:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Several sender key performance improvements.

Browse Source 
- Remove extra unnecessary sync message
- Add a bulk session retrieval method
- Do the encrypt in a transaction
This commit is contained in:
Greyson Parrelli
2021-08-23 11:05:06 -04:00
committed by Alex Hart
parent 194975d068
commit 2068fa8041
7 changed files with 93 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalProtocolStoreImpl.java
View File

@@ -2,6 +2,7 @@ package org.thoughtcrime.securesms.crypto.storage;
import android.content.Context;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libsignal.IdentityKey;
import org.whispersystems.libsignal.IdentityKeyPair;
@@ -102,6 +103,11 @@ public class SignalProtocolStoreImpl implements SignalServiceDataStore {
return sessionStore.getSubDeviceSessions(number);
}
@Override
public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(List<String> addressNames) {
return sessionStore.getAllAddressesWithActiveSessions(addressNames);
}
@Override
public void storeSession(SignalProtocolAddress axolotlAddress, SessionRecord record) {
sessionStore.storeSession(axolotlAddress, record);
@@ -181,4 +187,13 @@ public class SignalProtocolStoreImpl implements SignalServiceDataStore {
public boolean isMultiDevice() {
return TextSecurePreferences.isMultiDevice(context);
}
@Override
public Transaction beginTransaction() {
DatabaseFactory.getInstance(context).getRawDatabase().beginTransaction();
return () -> {
DatabaseFactory.getInstance(context).getRawDatabase().setTransactionSuccessful();
DatabaseFactory.getInstance(context).getRawDatabase().endTransaction();
};
}
}

20
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
View File

@@ -3,6 +3,7 @@ package org.thoughtcrime.securesms.crypto.storage;
import android.content.Context;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.database.DatabaseFactory;
@@ -16,6 +17,8 @@ import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.signalservice.api.SignalServiceSessionStore;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
public class TextSecureSessionStore implements SignalServiceSessionStore {
@@ -97,6 +100,17 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
}
}
@Override
public Set<SignalProtocolAddress> getAllAddressesWithActiveSessions(List<String> addressNames) {
synchronized (LOCK) {
List<SessionDatabase.SessionRow> rows = DatabaseFactory.getSessionDatabase(context).getAllFor(addressNames);
return rows.stream()
.filter(row -> isActive(row.getRecord()))
.map(row -> new SignalProtocolAddress(row.getAddress(), row.getDeviceId()))
.collect(Collectors.toSet());
}
}
@Override
public void archiveSession(SignalProtocolAddress address) {
synchronized (LOCK) {
@@ -145,4 +159,10 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
}
}
}
private static boolean isActive(@Nullable SessionRecord record) {
return record != null &&
record.hasSenderChain() &&
record.getSessionVersion() == CiphertextMessage.CURRENT_VERSION;
}
}

22
app/src/main/java/org/thoughtcrime/securesms/database/SessionDatabase.java
View File

@@ -119,7 +119,27 @@ public class SessionDatabase extends Database {
try {
results.add(new SessionRow(CursorUtil.requireString(cursor, ADDRESS),
CursorUtil.requireInt(cursor, DEVICE),
new SessionRecord(cursor.getBlob(cursor.getColumnIndexOrThrow(RECORD)))));
new SessionRecord(CursorUtil.requireBlob(cursor, RECORD))));
} catch (IOException e) {
Log.w(TAG, e);
}
}
}
return results;
}
public @NonNull List<SessionRow> getAllFor(@NonNull List<String> addressNames) {
SQLiteDatabase database = databaseHelper.getSignalReadableDatabase();
SqlUtil.Query query = SqlUtil.buildCollectionQuery(ADDRESS, addressNames);
List<SessionRow> results = new LinkedList<>();
try (Cursor cursor = database.query(TABLE_NAME, null, query.getWhere(), query.getWhereArgs(), null, null, null)) {
while (cursor.moveToNext()) {
try {
results.add(new SessionRow(CursorUtil.requireString(cursor, ADDRESS),
CursorUtil.requireInt(cursor, DEVICE),
new SessionRecord(CursorUtil.requireBlob(cursor, RECORD))));
} catch (IOException e) {
Log.w(TAG, e);
}

14
app/src/main/java/org/thoughtcrime/securesms/messages/GroupSendUtil.java
View File

@@ -10,7 +10,6 @@ import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.crypto.SenderKeyUtil;
import org.thoughtcrime.securesms.crypto.UnidentifiedAccessUtil;
import org.thoughtcrime.securesms.database.DatabaseFactory;
import org.thoughtcrime.securesms.database.GroupDatabase;
import org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
import org.thoughtcrime.securesms.database.MessageSendLogDatabase;
import org.thoughtcrime.securesms.database.model.MessageId;
@@ -50,10 +49,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicReference;
import java.util.stream.Collectors;
public final class GroupSendUtil {
@@ -228,14 +225,19 @@ public final class GroupSendUtil {
throw new CancelationException();
}
if (legacyTargets.size() > 0 || TextSecurePreferences.isMultiDevice(context)) {
Log.i(TAG, "Need to do " + legacyTargets.size() + " legacy sends.");
boolean onlyTargetIsSelfWithLinkedDevice = legacyTargets.isEmpty() && senderKeyTargets.isEmpty() && TextSecurePreferences.isMultiDevice(context);
if (legacyTargets.size() > 0 || onlyTargetIsSelfWithLinkedDevice) {
if (legacyTargets.size() > 0) {
Log.i(TAG, "Need to do " + legacyTargets.size() + " legacy sends.");
} else {
Log.i(TAG, "Need to do a legacy send to send a sync message for a group of only ourselves.");
}
List<SignalServiceAddress> targets = legacyTargets.stream().map(r -> recipients.getAddress(r.getId())).collect(Collectors.toList());
List<Optional<UnidentifiedAccessPair>> access = legacyTargets.stream().map(r -> recipients.getAccessPair(r.getId())).collect(Collectors.toList());
boolean recipientUpdate = isRecipientUpdate || allResults.size() > 0;
final MessageSendLogDatabase messageLogDatabase = DatabaseFactory.getMessageLogDatabase(context);
final AtomicLong entryId = new AtomicLong(-1);
final boolean includeInMessageLog = sendOperation.shouldIncludeInMessageLog();