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

Remove deprecated blocked field from DeviceContact.

Browse Source
This commit is contained in:
Greyson Parrelli
2024-03-12 12:15:49 -04:00
committed by Cody Henthorne
parent 0544c1f249
commit aeae6ac292
8 changed files with 2 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt
View File

@@ -122,8 +122,6 @@ class MultiDeviceContactSyncJob(parameters: Parameters, private val attachmentPo
}
}
recipients.setBlocked(recipient.id, contact.isBlocked)
val threadRecord = threads.getThreadRecord(threads.getThreadIdFor(recipient.id))
if (threadRecord != null && contact.isArchived != threadRecord.isArchived) {
if (contact.isArchived) {

3
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java
View File

@@ -168,7 +168,6 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
Optional.of(ChatColorsMapper.getMaterialColor(recipient.getChatColors()).serialize()),
verifiedMessage,
ProfileKeyUtil.profileKeyOptional(recipient.getProfileKey()),
recipient.isBlocked(),
recipient.getExpiresInSeconds() > 0 ? Optional.of(recipient.getExpiresInSeconds())
: Optional.empty(),
Optional.ofNullable(inboxPositions.get(recipientId)),
@@ -235,7 +234,6 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
Optional.of(ChatColorsMapper.getMaterialColor(recipient.getChatColors()).serialize()),
verified,
profileKey,
blocked,
expireTimer,
inboxPosition,
archived.contains(recipient.getId())));
@@ -253,7 +251,6 @@ public class MultiDeviceContactUpdateJob extends BaseJob {
Optional.of(ChatColorsMapper.getMaterialColor(self.getChatColors()).serialize()),
Optional.empty(),
ProfileKeyUtil.profileKeyOptionalOrThrow(self.getProfileKey()),
false,
self.getExpiresInSeconds() > 0 ? Optional.of(self.getExpiresInSeconds()) : Optional.empty(),
Optional.ofNullable(inboxPositions.get(self.getId())),
archived.contains(self.getId())));

1
app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java
View File

@@ -84,7 +84,6 @@ public class MultiDeviceProfileKeyUpdateJob extends BaseJob {
Optional.empty(),
Optional.empty(),
profileKey,
false,
Optional.empty(),
Optional.empty(),
false));