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

Convert Recipient to kotlin.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-04-03 12:23:55 -04:00
parent b50eab230d
commit 3ba2b46bb0
100 changed files with 1513 additions and 2020 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -154,7 +154,7 @@ public class SignalBaseIdentityKeyStore {
}
public @NonNull Optional<IdentityRecord> getIdentityRecord(@NonNull Recipient recipient) {
if (recipient.hasServiceId()) {
if (recipient.getHasServiceId()) {
IdentityStoreRecord record = cache.get(recipient.requireServiceId().toString());
return Optional.ofNullable(record).map(r -> r.toIdentityRecord(recipient.getId()));
} else {
@@ -169,7 +169,7 @@ public class SignalBaseIdentityKeyStore {
public @NonNull IdentityRecordList getIdentityRecords(@NonNull List<Recipient> recipients) {
List<String> addressNames = recipients.stream()
.filter(Recipient::hasServiceId)
.filter(Recipient::getHasServiceId)
.map(Recipient::requireServiceId)
.map(ServiceId::toString)
.collect(Collectors.toList());
@@ -181,7 +181,7 @@ public class SignalBaseIdentityKeyStore {
List<IdentityRecord> records = new ArrayList<>(recipients.size());
for (Recipient recipient : recipients) {
if (recipient.hasServiceId()) {
if (recipient.getHasServiceId()) {
IdentityStoreRecord record = cache.get(recipient.requireServiceId().toString());
if (record != null) {
@@ -202,7 +202,7 @@ public class SignalBaseIdentityKeyStore {
public void setApproval(@NonNull RecipientId recipientId, boolean nonBlockingApproval) {
Recipient recipient = Recipient.resolved(recipientId);
if (recipient.hasServiceId()) {
if (recipient.getHasServiceId()) {
cache.setApproval(recipient.requireServiceId().toString(), recipientId, nonBlockingApproval);
} else {
Log.w(TAG, "[setApproval] No serviceId for " + recipient.getId(), new Throwable());
@@ -212,7 +212,7 @@ public class SignalBaseIdentityKeyStore {
public void setVerified(@NonNull RecipientId recipientId, IdentityKey identityKey, VerifiedStatus verifiedStatus) {
Recipient recipient = Recipient.resolved(recipientId);
if (recipient.hasServiceId()) {
if (recipient.getHasServiceId()) {
cache.setVerified(recipient.requireServiceId().toString(), recipientId, identityKey, verifiedStatus);
} else {
Log.w(TAG, "[setVerified] No serviceId for " + recipient.getId(), new Throwable());

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

@@ -136,15 +136,15 @@ public class TextSecureSessionStore implements SignalServiceSessionStore {
try (SignalSessionLock.Lock unused = ReentrantSessionLock.INSTANCE.acquire()) {
Recipient recipient = Recipient.resolved(recipientId);
if (recipient.hasAci()) {
if (recipient.getHasAci()) {
archiveSession(new SignalProtocolAddress(recipient.requireAci().toString(), deviceId));
}
if (recipient.hasPni()) {
if (recipient.getHasPni()) {
archiveSession(new SignalProtocolAddress(recipient.requirePni().toString(), deviceId));
}
if (recipient.hasE164()) {
if (recipient.getHasE164()) {
archiveSession(new SignalProtocolAddress(recipient.requireE164(), deviceId));
}
}