Signal/Android
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Android.git synced 2026-04-20 08:39:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add migration to cleanup some inconsistent DB state.

Browse Source
This commit is contained in:
Greyson Parrelli
2023-07-12 13:49:16 -04:00
committed by Clark Chen
parent 1b63bdec12
commit 6ca9cb6da1
9 changed files with 107 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/org/thoughtcrime/securesms/crypto/storage/SignalBaseIdentityKeyStore.java
View File

@@ -112,18 +112,14 @@ public class SignalBaseIdentityKeyStore {
}
public void saveIdentityWithoutSideEffects(@NonNull RecipientId recipientId,
@NonNull ServiceId serviceId,
IdentityKey identityKey,
VerifiedStatus verifiedStatus,
boolean firstUse,
long timestamp,
boolean nonBlockingApproval)
{
Recipient recipient = Recipient.resolved(recipientId);
if (recipient.hasServiceId()) {
cache.save(recipient.requireServiceId().toString(), recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval);
} else {
Log.w(TAG, "[saveIdentity] No serviceId for " + recipient.getId(), new Throwable());
}
cache.save(serviceId.toString(), recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval);
}
public boolean isTrustedIdentity(SignalProtocolAddress address, IdentityKey identityKey, IdentityKeyStore.Direction direction) {

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

@@ -11,6 +11,7 @@ import org.thoughtcrime.securesms.database.identity.IdentityRecordList;
import org.thoughtcrime.securesms.database.model.IdentityRecord;
import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.recipients.RecipientId;
import org.whispersystems.signalservice.api.push.ServiceId;
import java.util.List;
import java.util.Optional;
@@ -50,13 +51,14 @@ public class SignalIdentityKeyStore implements IdentityKeyStore {
}
public void saveIdentityWithoutSideEffects(@NonNull RecipientId recipientId,
@NonNull ServiceId serviceId,
IdentityKey identityKey,
VerifiedStatus verifiedStatus,
boolean firstUse,
long timestamp,
boolean nonBlockingApproval)
{
baseStore.saveIdentityWithoutSideEffects(recipientId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval);
baseStore.saveIdentityWithoutSideEffects(recipientId, serviceId, identityKey, verifiedStatus, firstUse, timestamp, nonBlockingApproval);
}
@Override