diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 827158f75a..4f00ac7120 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -272,7 +272,6 @@ android { buildConfigField("String", "STRIPE_PUBLISHABLE_KEY", "\"pk_live_6cmGZopuTsV8novGgJJW9JpC00vLIgtQ1D\"") buildConfigField("boolean", "TRACING_ENABLED", "false") buildConfigField("boolean", "LINK_DEVICE_UX_ENABLED", "false") - buildConfigField("boolean", "USE_STRING_ID", "false") ndk { abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64") diff --git a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java index 51c8cb9829..b50e66d6d5 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java +++ b/app/src/main/java/org/thoughtcrime/securesms/dependencies/ApplicationDependencyProvider.java @@ -191,7 +191,6 @@ public class ApplicationDependencyProvider implements AppDependencies.Provider { RemoteConfig.maxIncrementalMacsPerEnvelope(), RemoteConfig::useMessageSendRestFallback, RemoteConfig.useBinaryId(), - BuildConfig.USE_STRING_ID, new PreKeyRepository( keysApi, protocolStore.aci(), 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 df2a3a3e4e..055ddb8876 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceContactUpdateJob.java @@ -13,7 +13,6 @@ import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; import org.signal.libsignal.protocol.IdentityKey; import org.signal.libsignal.zkgroup.profiles.ProfileKey; -import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.conversation.colors.ChatColorsMapper; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.database.RecipientTable; @@ -151,7 +150,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob { Uri updateUri = null; try { - DeviceContactsOutputStream out = new DeviceContactsOutputStream(writeDetails.outputStream, RemoteConfig.useBinaryId(), BuildConfig.USE_STRING_ID); + DeviceContactsOutputStream out = new DeviceContactsOutputStream(writeDetails.outputStream, RemoteConfig.useBinaryId()); Recipient recipient = Recipient.resolved(recipientId); if (recipient.getRegistered() == RecipientTable.RegisteredState.NOT_REGISTERED) { @@ -216,7 +215,7 @@ public class MultiDeviceContactUpdateJob extends BaseJob { Uri updateUri = null; try { - DeviceContactsOutputStream out = new DeviceContactsOutputStream(writeDetails.outputStream, RemoteConfig.useBinaryId(), BuildConfig.USE_STRING_ID); + DeviceContactsOutputStream out = new DeviceContactsOutputStream(writeDetails.outputStream, RemoteConfig.useBinaryId()); List recipients = SignalDatabase.recipients().getRecipientsForMultiDeviceSync(); Map inboxPositions = SignalDatabase.threads().getInboxPositions(); Set archived = SignalDatabase.threads().getArchivedRecipients(); diff --git a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceDeleteSyncJob.kt b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceDeleteSyncJob.kt index 5c7019a2aa..29c2982938 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceDeleteSyncJob.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceDeleteSyncJob.kt @@ -13,7 +13,6 @@ import org.signal.core.util.Base64 import org.signal.core.util.UuidUtil import org.signal.core.util.logging.Log import org.signal.core.util.orNull -import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.attachments.DatabaseAttachment import org.thoughtcrime.securesms.database.SignalDatabase import org.thoughtcrime.securesms.database.ThreadTable @@ -378,16 +377,8 @@ class MultiDeviceDeleteSyncJob private constructor( private fun Recipient.toDeleteSyncConversationId(): ConversationIdentifier? { return when { isGroup -> ConversationIdentifier(threadGroupId = requireGroupId().decodedId.toByteString()) - hasAci -> if (BuildConfig.USE_STRING_ID) { - ConversationIdentifier(threadServiceId = requireAci().toString()) - } else { - ConversationIdentifier(threadServiceIdBinary = requireAci().toByteString()) - } - hasPni -> if (BuildConfig.USE_STRING_ID) { - ConversationIdentifier(threadServiceId = requirePni().toString()) - } else { - ConversationIdentifier(threadServiceIdBinary = requirePni().toByteString()) - } + hasAci -> ConversationIdentifier(threadServiceIdBinary = requireAci().toByteString()) + hasPni -> ConversationIdentifier(threadServiceIdBinary = requirePni().toByteString()) hasE164 -> ConversationIdentifier(threadE164 = requireE164()) else -> null } @@ -395,11 +386,7 @@ class MultiDeviceDeleteSyncJob private constructor( private fun DeleteSyncJobData.AddressableMessage.toDeleteSyncMessage(): AddressableMessage? { val author: Recipient = Recipient.resolved(RecipientId.from(authorRecipientId)) - val authorServiceId = if (BuildConfig.USE_STRING_ID) { - author.aci.orNull()?.toString() ?: author.pni.orNull()?.toString() - } else { - author.aci.orNull()?.toByteString() ?: author.pni.orNull()?.toByteString() - } + val authorServiceId: ByteString? = author.aci.orNull()?.toByteString() ?: author.pni.orNull()?.toByteString() val authorE164: String? = if (authorServiceId == null) { author.e164.orNull() @@ -411,19 +398,11 @@ class MultiDeviceDeleteSyncJob private constructor( Log.w(TAG, "Unable to send sync message without serviceId or e164 recipient: ${author.id}") null } else { - if (BuildConfig.USE_STRING_ID) { - AddressableMessage( - authorServiceId = authorServiceId as String?, - authorE164 = authorE164, - sentTimestamp = sentTimestamp - ) - } else { - AddressableMessage( - authorServiceIdBinary = authorServiceId as ByteString?, - authorE164 = authorE164, - sentTimestamp = sentTimestamp - ) - } + AddressableMessage( + authorServiceIdBinary = authorServiceId, + authorE164 = authorE164, + sentTimestamp = sentTimestamp + ) } } 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 ab560fdde2..bf441ced69 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java +++ b/app/src/main/java/org/thoughtcrime/securesms/jobs/MultiDeviceProfileKeyUpdateJob.java @@ -7,7 +7,6 @@ import androidx.annotation.Nullable; import org.signal.core.util.logging.Log; import org.signal.libsignal.zkgroup.profiles.ProfileKey; import org.signal.network.service.CdnService; -import org.thoughtcrime.securesms.BuildConfig; import org.thoughtcrime.securesms.crypto.ProfileKeyUtil; import org.thoughtcrime.securesms.dependencies.AppDependencies; import org.thoughtcrime.securesms.jobmanager.Job; @@ -79,7 +78,7 @@ public class MultiDeviceProfileKeyUpdateJob extends BaseJob { } ByteArrayOutputStream baos = new ByteArrayOutputStream(); - DeviceContactsOutputStream out = new DeviceContactsOutputStream(baos, RemoteConfig.useBinaryId(), BuildConfig.USE_STRING_ID); + DeviceContactsOutputStream out = new DeviceContactsOutputStream(baos, RemoteConfig.useBinaryId()); out.write(new DeviceContact(Optional.ofNullable(SignalStore.account().getAci()), Optional.ofNullable(SignalStore.account().getE164()), diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt index aa98f4fb3a..284d1626c7 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageDecryptor.kt @@ -39,7 +39,6 @@ import org.signal.libsignal.protocol.message.CiphertextMessage import org.signal.libsignal.protocol.message.DecryptionErrorMessage import org.signal.libsignal.protocol.message.SenderKeyDistributionMessage import org.signal.libsignal.zkgroup.groups.GroupMasterKey -import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.R import org.thoughtcrime.securesms.crypto.ReentrantSessionLock import org.thoughtcrime.securesms.crypto.SealedSenderAccessUtil @@ -162,7 +161,6 @@ object MessageDecryptor { val envelope = if (cipherResult?.metadata?.sourceServiceId != null) { envelope.newBuilder() - .sourceServiceId(if (BuildConfig.USE_STRING_ID) cipherResult.metadata.sourceServiceId.toString() else null) .sourceServiceIdBinary(if (RemoteConfig.useBinaryId) cipherResult.metadata.sourceServiceId.toByteString() else null) .sourceDeviceId(cipherResult.metadata.sourceDeviceId) .build() diff --git a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.kt b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.kt index ee360ee9d0..293f6bad5e 100644 --- a/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.kt +++ b/app/src/main/java/org/thoughtcrime/securesms/storage/StorageSyncModels.kt @@ -9,7 +9,6 @@ import org.signal.core.util.isNullOrEmpty import org.signal.core.util.logging.Log import org.signal.libsignal.zkgroup.InvalidInputException import org.signal.libsignal.zkgroup.groups.GroupMasterKey -import org.thoughtcrime.securesms.BuildConfig import org.thoughtcrime.securesms.components.settings.app.chats.folders.ChatFolderRecord import org.thoughtcrime.securesms.components.settings.app.usernamelinks.UsernameQrCodeColorScheme import org.thoughtcrime.securesms.conversation.colors.AvatarColor @@ -139,7 +138,7 @@ object StorageSyncModels { RecipientType.INDIVIDUAL -> { AccountRecord.PinnedConversation( contact = AccountRecord.PinnedConversation.Contact( - serviceId = settings.serviceId?.toString().takeIf { BuildConfig.USE_STRING_ID } ?: "", + serviceId = "", e164 = settings.e164 ?: "", serviceIdBinary = settings.serviceId?.toByteString().takeIf { RemoteConfig.useBinaryId } ?: ByteString.EMPTY ) @@ -194,9 +193,9 @@ object StorageSyncModels { } return SignalContactRecord.newBuilder(recipient.syncExtras.storageProto).apply { - aci = recipient.aci?.toString().takeIf { BuildConfig.USE_STRING_ID } ?: "" + aci = "" e164 = recipient.e164 ?: "" - pni = recipient.pni?.toStringWithoutPrefix().takeIf { BuildConfig.USE_STRING_ID } ?: "" + pni = "" profileKey = recipient.profileKey?.toByteString() ?: ByteString.EMPTY givenName = recipient.signalProfileName.givenName familyName = recipient.signalProfileName.familyName @@ -304,14 +303,7 @@ object StorageSyncModels { return SignalStoryDistributionListRecord.newBuilder(recipient.syncExtras.storageProto).apply { identifier = UuidUtil.toByteArray(record.distributionId.asUuid()).toByteString() name = record.name - recipientServiceIds = if (BuildConfig.USE_STRING_ID) { - record.getMembersToSync() - .map { Recipient.resolved(it) } - .filter { it.hasServiceId } - .map { it.requireServiceId().toString() } - } else { - emptyList() - } + recipientServiceIds = emptyList() recipientServiceIdsBinary = if (RemoteConfig.useBinaryId) { record.getMembersToSync() .map { Recipient.resolved(it) } @@ -521,7 +513,7 @@ object StorageSyncModels { RecipientType.INDIVIDUAL -> { RemoteRecipient( contact = RemoteRecipient.Contact( - serviceId = recipient.serviceId?.toString().takeIf { BuildConfig.USE_STRING_ID } ?: "", + serviceId = "", e164 = recipient.e164 ?: "", serviceIdBinary = recipient.serviceId?.toByteString().takeIf { RemoteConfig.useBinaryId } ?: ByteString.EMPTY ) diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java index 7aff11349b..09f1f38af5 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/SignalServiceMessageSender.java @@ -192,7 +192,6 @@ public class SignalServiceMessageSender { private final int maxIncrementalMacsPerEnvelope; private final BooleanSupplier useRestFallback; private final boolean useBinaryId; - private final boolean useStringId; public SignalServiceMessageSender(PushServiceSocket pushServiceSocket, SignalServiceDataStore store, @@ -205,7 +204,6 @@ public class SignalServiceMessageSender { int maxIncrementalMacsPerEnvelope, BooleanSupplier useRestFallback, boolean useBinaryId, - boolean useStringId, PreKeyRepository preKeyRepository) { CredentialsProvider credentialsProvider = pushServiceSocket.getCredentialsProvider(); @@ -227,7 +225,6 @@ public class SignalServiceMessageSender { this.preKeyRepository = preKeyRepository; this.useRestFallback = useRestFallback; this.useBinaryId = useBinaryId; - this.useStringId = useStringId; } /** @@ -1061,7 +1058,6 @@ public class SignalServiceMessageSender { DataMessage.Quote.Builder quoteBuilder = new DataMessage.Quote.Builder() .id(message.getQuote().get().getId()) .text(message.getQuote().get().getText()) - .authorAci(useStringId ? message.getQuote().get().getAuthor().toString() : null) .authorAciBinary(useBinaryId ? message.getQuote().get().getAuthor().toByteString() : null) .type(message.getQuote().get().getType().getProtoType()); @@ -1069,19 +1065,11 @@ public class SignalServiceMessageSender { if (mentions != null && !mentions.isEmpty()) { List bodyRanges = new ArrayList<>(quoteBuilder.bodyRanges); for (SignalServiceDataMessage.Mention mention : mentions) { - if (useStringId) { - bodyRanges.add(new BodyRange.Builder() - .start(mention.getStart()) - .length(mention.getLength()) - .mentionAci(mention.getServiceId().toString()) - .build()); - } else { - bodyRanges.add(new BodyRange.Builder() - .start(mention.getStart()) - .length(mention.getLength()) - .mentionAciBinary(mention.getServiceId().toByteString()) - .build()); - } + bodyRanges.add(new BodyRange.Builder() + .start(mention.getStart()) + .length(mention.getLength()) + .mentionAciBinary(mention.getServiceId().toByteString()) + .build()); } quoteBuilder.bodyRanges(bodyRanges); @@ -1138,19 +1126,11 @@ public class SignalServiceMessageSender { if (message.getMentions().isPresent()) { List bodyRanges = new ArrayList<>(builder.bodyRanges); for (SignalServiceDataMessage.Mention mention : message.getMentions().get()) { - if (useStringId) { - bodyRanges.add(new BodyRange.Builder() - .start(mention.getStart()) - .length(mention.getLength()) - .mentionAci(mention.getServiceId().toString()) - .build()); - } else { - bodyRanges.add(new BodyRange.Builder() - .start(mention.getStart()) - .length(mention.getLength()) - .mentionAciBinary(mention.getServiceId().toByteString()) - .build()); - } + bodyRanges.add(new BodyRange.Builder() + .start(mention.getStart()) + .length(mention.getLength()) + .mentionAciBinary(mention.getServiceId().toByteString()) + .build()); } builder.bodyRanges(bodyRanges); builder.requiredProtocolVersion(Math.max(DataMessage.ProtocolVersion.MENTIONS.getValue(), builder.requiredProtocolVersion)); @@ -1186,7 +1166,6 @@ public class SignalServiceMessageSender { .emoji(message.getReaction().get().getEmoji()) .remove(message.getReaction().get().isRemove()) .targetSentTimestamp(message.getReaction().get().getTargetSentTimestamp()) - .targetAuthorAci(useStringId ? message.getReaction().get().getTargetAuthor().toString() : null) .targetAuthorAciBinary(useBinaryId ? message.getReaction().get().getTargetAuthor().toByteString() : null); builder.reaction(reactionBuilder.build()); @@ -1231,7 +1210,6 @@ public class SignalServiceMessageSender { SignalServiceDataMessage.StoryContext storyContext = message.getStoryContext().get(); builder.storyContext(new DataMessage.StoryContext.Builder() - .authorAci(useStringId ? storyContext.getAuthorServiceId().toString() : null) .authorAciBinary(useBinaryId ? storyContext.getAuthorServiceId().toByteString() : null) .sentTimestamp(storyContext.getSentTimestamp()) .build()); @@ -1456,7 +1434,6 @@ public class SignalServiceMessageSender { } unidentifiedDeliveryStatuses.add(new SyncMessage.Sent.UnidentifiedDeliveryStatus.Builder() - .destinationServiceId(useStringId ? result.getAddress().getServiceId().toString() : null) .destinationServiceIdBinary(useBinaryId ? result.getAddress().getServiceId().toByteString() : null) .unidentified(false) .destinationPniIdentityKey(identity) @@ -1466,7 +1443,6 @@ public class SignalServiceMessageSender { sentMessage.unidentifiedStatus(unidentifiedDeliveryStatuses); if (recipient.isPresent()) { - sentMessage.destinationServiceId(useStringId ? recipient.get().getServiceId().toString() : null); sentMessage.destinationServiceIdBinary(useBinaryId ? recipient.get().getServiceId().toByteString() : null); if (recipient.get().getNumber().isPresent()) { sentMessage.destinationE164(recipient.get().getNumber().get()); @@ -1506,7 +1482,6 @@ public class SignalServiceMessageSender { private SyncMessage.Sent.StoryMessageRecipient createStoryMessageRecipient(SignalServiceStoryMessageRecipient storyMessageRecipient) { return new SyncMessage.Sent.StoryMessageRecipient.Builder() .distributionListIds(storyMessageRecipient.getDistributionListIds()) - .destinationServiceId(useStringId ? storyMessageRecipient.getSignalServiceAddress().getIdentifier() : null) .destinationServiceIdBinary(useBinaryId ? storyMessageRecipient.getSignalServiceAddress().getServiceId().toByteString() : null) .isAllowedToReply(storyMessageRecipient.isAllowedToReply()) .build(); @@ -1520,7 +1495,6 @@ public class SignalServiceMessageSender { readMessages.stream() .map(readMessage -> new SyncMessage.Read.Builder() .timestamp(readMessage.getTimestamp()) - .senderAci(useStringId ? readMessage.getSenderAci().toString() : null) .senderAciBinary(useBinaryId ? readMessage.getSenderAci().toByteString() : null) .build()) .collect(Collectors.toList()) @@ -1537,7 +1511,6 @@ public class SignalServiceMessageSender { readMessages.stream() .map(readMessage -> new SyncMessage.Viewed.Builder() .timestamp(readMessage.getTimestamp()) - .senderAci(useStringId ? readMessage.getSender().toString() : null) .senderAciBinary(useBinaryId ? readMessage.getSender().toByteString() : null) .build()) .collect(Collectors.toList()) @@ -1552,7 +1525,6 @@ public class SignalServiceMessageSender { builder.viewOnceOpen(new SyncMessage.ViewOnceOpen.Builder() .timestamp(readMessage.getTimestamp()) - .senderAci(useStringId ? readMessage.getSender().toString() : null) .senderAciBinary(useBinaryId ? readMessage.getSender().toByteString() : null) .build()); @@ -1564,7 +1536,6 @@ public class SignalServiceMessageSender { SyncMessage.Builder syncMessage = createSyncMessageBuilder(); SyncMessage.Blocked.Builder blockedMessage = new SyncMessage.Blocked.Builder(); - blockedMessage.acis(useStringId ? blocked.individuals.stream().filter(a -> a.getAci() != null).map(a -> a.getAci().toString()).collect(Collectors.toList()) : Collections.emptyList()); blockedMessage.acisBinary(useBinaryId ? blocked.individuals.stream().filter(a -> a.getAci() != null).map(a -> a.getAci().toByteString()).collect(Collectors.toList()) : Collections.emptyList()); blockedMessage.numbers(blocked.individuals.stream().filter(a -> a.getE164() != null).map(a -> a.getE164()).collect(Collectors.toList())); blockedMessage.groupIds(blocked.groupIds.stream().map(ByteString::of).collect(Collectors.toList())); @@ -1662,7 +1633,6 @@ public class SignalServiceMessageSender { } if (message.getPerson().isPresent()) { - responseMessage.threadAci(useStringId ? message.getPerson().get().toString() : null); responseMessage.threadAciBinary(useBinaryId ? message.getPerson().get().toByteString() : null); } @@ -1756,7 +1726,6 @@ public class SignalServiceMessageSender { verifiedMessageBuilder.nullMessage(ByteString.of(nullMessage)); verifiedMessageBuilder.identityKey(ByteString.of(verifiedMessage.getIdentityKey().serialize())); - verifiedMessageBuilder.destinationAci(useStringId ? verifiedMessage.getDestination().getServiceId().toString() : null); verifiedMessageBuilder.destinationAciBinary(useBinaryId ? verifiedMessage.getDestination().getServiceId().toByteString() : null); diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java index ca851cd5d5..2c0f3d3c7f 100644 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java +++ b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsOutputStream.java @@ -17,12 +17,10 @@ import okio.ByteString; public class DeviceContactsOutputStream extends ChunkedOutputStream { private final boolean useBinaryId; - private final boolean useStringId; - public DeviceContactsOutputStream(OutputStream out, boolean useBinaryId, boolean useStringId) { + public DeviceContactsOutputStream(OutputStream out, boolean useBinaryId) { super(out); this.useBinaryId = useBinaryId; - this.useStringId = useStringId; } public void write(DeviceContact contact) throws IOException { @@ -44,7 +42,6 @@ public class DeviceContactsOutputStream extends ChunkedOutputStream { ContactDetails.Builder contactDetails = new ContactDetails.Builder(); if (contact.getAci().isPresent()) { - contactDetails.aci(useStringId ? contact.getAci().get().toString() : null); contactDetails.aciBinary(useBinaryId ? contact.getAci().get().toByteString() : null); } diff --git a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java index 0d1e8d61e0..4816e4252d 100644 --- a/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java +++ b/lib/libsignal-service/src/test/java/org/whispersystems/signalservice/api/messages/multidevice/DeviceContactsInputStreamTest.java @@ -17,7 +17,7 @@ public class DeviceContactsInputStreamTest { @Test public void read() throws IOException, InvalidInputException { ByteArrayOutputStream byteArrayOut = new ByteArrayOutputStream(); - DeviceContactsOutputStream output = new DeviceContactsOutputStream(byteArrayOut, true, true); + DeviceContactsOutputStream output = new DeviceContactsOutputStream(byteArrayOut, true); Optional aciFirst = Optional.of(ACI.from(UUID.randomUUID())); Optional e164First = Optional.of("+1404555555"); Optional aciSecond = Optional.of(ACI.from(UUID.randomUUID()));