Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2025-12-27 22:43:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clear all sender key knowledge for a device after a 409/410.

Browse Source
This commit is contained in:
Greyson Parrelli
2021-07-29 17:45:20 -04:00
parent 7c8549bf5e
commit d40bb2d9ee
6 changed files with 50 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,8 +12,6 @@ import org.whispersystems.libsignal.state.IdentityKeyStore;
import org.whispersystems.libsignal.state.PreKeyRecord;
import org.whispersystems.libsignal.state.PreKeyStore;
import org.whispersystems.libsignal.state.SessionRecord;
import org.whispersystems.libsignal.state.SessionStore;
import org.whispersystems.libsignal.state.SignalProtocolStore;
import org.whispersystems.libsignal.state.SignedPreKeyRecord;
import org.whispersystems.libsignal.state.SignedPreKeyStore;
import org.whispersystems.signalservice.api.SignalServiceProtocolStore;
@@ -172,7 +170,7 @@ public class SignalProtocolStoreImpl implements SignalServiceProtocolStore {
}
@Override
public void clearSenderKeySharedWith(DistributionId distributionId, Collection<SignalProtocolAddress> addresses) {
senderKeyStore.clearSenderKeySharedWith(distributionId, addresses);
public void clearSenderKeySharedWith(Collection<SignalProtocolAddress> addresses) {
senderKeyStore.clearSenderKeySharedWith(addresses);
}
}

4
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalSenderKeyStore.java
View File

@@ -62,9 +62,9 @@ public final class SignalSenderKeyStore implements SignalServiceSenderKeyStore {
}
@Override
public void clearSenderKeySharedWith(DistributionId distributionId, Collection<SignalProtocolAddress> addresses) {
public void clearSenderKeySharedWith(Collection<SignalProtocolAddress> addresses) {
synchronized (LOCK) {
DatabaseFactory.getSenderKeySharedDatabase(context).delete(distributionId, addresses);
DatabaseFactory.getSenderKeySharedDatabase(context).deleteAllFor(addresses);
}
}

21
app/src/main/java/org/thoughtcrime/securesms/database/SenderKeySharedDatabase.java
View File

@@ -118,7 +118,26 @@ public class SenderKeySharedDatabase extends Database {
}
/**
* Clear all shared statuses for a given recipientId.
* Clear the shared status for all distributionIds for a set of addresses.
*/
public void deleteAllFor(@NonNull Collection<SignalProtocolAddress> addresses) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();
String query = ADDRESS + " = ? AND " + DEVICE + " = ?";
db.beginTransaction();
try {
for (SignalProtocolAddress address : addresses) {
db.delete(TABLE_NAME, query, SqlUtil.buildArgs(address.getName(), address.getDeviceId()));
}
db.setTransactionSuccessful();
} finally {
db.endTransaction();
}
}
/**
* Clear the shared status for all distributionIds for a given recipientId.
*/
public void deleteAllFor(@NonNull RecipientId recipientId) {
SQLiteDatabase db = databaseHelper.getWritableDatabase();

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

@@ -252,7 +252,7 @@ public final class GroupSendUtil {
allResults.addAll(results);
int successCount = (int) results.stream().filter(SendMessageResult::isSuccess).count();
Log.d(TAG, "Successfully using 1:1 to " + successCount + "/" + targets.size() + " legacy targets.");
Log.d(TAG, "Successfully sent using 1:1 to " + successCount + "/" + targets.size() + " legacy targets.");
}
return allResults;