diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt index 59fbd5c3dd..23f8c4f1f5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactSyncJob.kt @@ -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) { diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java index 721c06a87a..f0c6663845 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -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()))); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java index 5b3082b05a..511cea5064 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java @@ -84,7 +84,6 @@ public class MultiDeviceProfileKeyUpdateJob extends BaseJob { Optional.empty(), Optional.empty(), profileKey, - false, Optional.empty(), Optional.empty(), false)); diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java index e977f6ddff..2fcabe9395 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContact.java @@ -23,7 +23,6 @@ public class DeviceContact { private final Optional color; private final Optional verified; private final Optional profileKey; - private final boolean blocked; private final Optional expirationTimer; private final Optional inboxPosition; private final boolean archived; @@ -35,7 +34,6 @@ public class DeviceContact { Optional color, Optional verified, Optional profileKey, - boolean blocked, Optional expirationTimer, Optional inboxPosition, boolean archived) @@ -51,7 +49,6 @@ public class DeviceContact { this.color = color; this.verified = verified; this.profileKey = profileKey; - this.blocked = blocked; this.expirationTimer = expirationTimer; this.inboxPosition = inboxPosition; this.archived = archived; @@ -85,10 +82,6 @@ public class DeviceContact { return profileKey; } - public boolean isBlocked() { - return blocked; - } - public Optional getExpirationTimer() { return expirationTimer; } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java index bda562959a..69fb58eb72 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStream.java @@ -53,7 +53,6 @@ public class DeviceContactsInputStream extends ChunkedInputStream { Optional color = details.color != null ? Optional.of(details.color) : Optional.empty(); Optional verified = Optional.empty(); Optional profileKey = Optional.empty(); - boolean blocked = false; Optional expireTimer = Optional.empty(); Optional inboxPosition = Optional.empty(); boolean archived = false; @@ -107,10 +106,9 @@ public class DeviceContactsInputStream extends ChunkedInputStream { inboxPosition = Optional.of(details.inboxPosition); } - blocked = details.blocked; archived = details.archived; - return new DeviceContact(aci, e164, name, avatar, color, verified, profileKey, blocked, expireTimer, inboxPosition, archived); + return new DeviceContact(aci, e164, name, avatar, color, verified, profileKey, expireTimer, inboxPosition, archived); } } diff --git a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java index 4ffd7708ae..5e2d4bf6ea 100644 --- a/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java +++ b/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java @@ -93,7 +93,6 @@ public class DeviceContactsOutputStream extends ChunkedOutputStream { contactDetails.inboxPosition(contact.getInboxPosition().get()); } - contactDetails.blocked(contact.isBlocked()); contactDetails.archived(contact.isArchived()); byte[] serializedContactDetails = contactDetails.build().encode(); diff --git a/libsignal-service/src/main/protowire/SignalService.proto b/libsignal-service/src/main/protowire/SignalService.proto index 5e3db8375c..c087a69e3c 100644 --- a/libsignal-service/src/main/protowire/SignalService.proto +++ b/libsignal-service/src/main/protowire/SignalService.proto @@ -741,7 +741,7 @@ message ContactDetails { optional string color = 4; optional Verified verified = 5; optional bytes profileKey = 6; - optional bool blocked = 7; + reserved /*blocked*/ 7; optional uint32 expireTimer = 8; optional uint32 inboxPosition = 10; optional bool archived = 11; diff --git a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java index 66e578263f..801ccf3c73 100644 --- a/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java +++ b/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java @@ -38,7 +38,6 @@ public class DeviceContactsInputStreamTest { Optional.of("ultramarine"), Optional.of(new VerifiedMessage(new SignalServiceAddress(aciFirst.get(), e164First), generateIdentityKey(), VerifiedMessage.VerifiedState.DEFAULT, System.currentTimeMillis())), Optional.of(generateProfileKey()), - false, Optional.of(0), Optional.of(0), false @@ -52,7 +51,6 @@ public class DeviceContactsInputStreamTest { Optional.of("ultramarine"), Optional.of(new VerifiedMessage(new SignalServiceAddress(aciSecond.get(), e164Second), generateIdentityKey(), VerifiedMessage.VerifiedState.DEFAULT, System.currentTimeMillis())), Optional.of(generateProfileKey()), - false, Optional.of(0), Optional.of(0), false