diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java deleted file mode 100644 index 5396ebe328..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/account/PniKeyDistributionRequest.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.whispersystems.signalservice.api.account; - -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.databind.annotation.JsonDeserialize; -import com.fasterxml.jackson.databind.annotation.JsonSerialize; - -import org.signal.libsignal.protocol.IdentityKey; -import org.whispersystems.signalservice.api.push.SignedPreKeyEntity; -import org.whispersystems.signalservice.internal.push.KyberPreKeyEntity; -import org.whispersystems.signalservice.internal.push.OutgoingPushMessage; -import org.signal.network.util.JsonUtil; - -import java.util.List; -import java.util.Map; - -public final class PniKeyDistributionRequest { - @JsonProperty - @JsonSerialize(using = JsonUtil.IdentityKeySerializer.class) - @JsonDeserialize(using = JsonUtil.IdentityKeyDeserializer.class) - private IdentityKey pniIdentityKey; - - @JsonProperty - private List deviceMessages; - - @JsonProperty - private Map devicePniSignedPrekeys; - - @JsonProperty("devicePniPqLastResortPrekeys") - private Map devicePniLastResortKyberPrekeys; - - @JsonProperty - private Map pniRegistrationIds; - - @JsonProperty - private boolean signatureValidOnEachSignedPreKey; - - @SuppressWarnings("unused") - public PniKeyDistributionRequest() {} - - public PniKeyDistributionRequest(IdentityKey pniIdentityKey, - List deviceMessages, - Map devicePniSignedPrekeys, - Map devicePniLastResortKyberPrekeys, - Map pniRegistrationIds, - boolean signatureValidOnEachSignedPreKey) - { - this.pniIdentityKey = pniIdentityKey; - this.deviceMessages = deviceMessages; - this.devicePniSignedPrekeys = devicePniSignedPrekeys; - this.devicePniLastResortKyberPrekeys = devicePniLastResortKyberPrekeys; - this.pniRegistrationIds = pniRegistrationIds; - this.signatureValidOnEachSignedPreKey = signatureValidOnEachSignedPreKey; - } - - public IdentityKey getPniIdentityKey() { - return pniIdentityKey; - } - - public List getDeviceMessages() { - return deviceMessages; - } - - public Map getDevicePniSignedPrekeys() { - return devicePniSignedPrekeys; - } - - public Map getPniRegistrationIds() { - return pniRegistrationIds; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java deleted file mode 100644 index 8b6859f0c2..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/push/ContactTokenDetails.java +++ /dev/null @@ -1,69 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -package org.whispersystems.signalservice.api.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * A class that represents a contact's registration state. - */ -public class ContactTokenDetails { - - @JsonProperty - private String token; - - @JsonProperty - private String relay; - - @JsonProperty - private String number; - - @JsonProperty - private boolean voice; - - @JsonProperty - private boolean video; - - public ContactTokenDetails() {} - - /** - * @return The "anonymized" token (truncated hash) that's transmitted to the server. - */ - public String getToken() { - return token; - } - - /** - * @return The federated server this contact is registered with, or null if on your server. - */ - public String getRelay() { - return relay; - } - - /** - * @return Whether this contact supports secure voice calls. - */ - public boolean isVoice() { - return voice; - } - - public boolean isVideo() { - return video; - } - - public void setNumber(String number) { - this.number = number; - } - - /** - * @return This contact's username (e164 formatted number). - */ - public String getNumber() { - return number; - } - -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java deleted file mode 100644 index a330477872..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/api/subscriptions/SubscriptionLevels.java +++ /dev/null @@ -1,62 +0,0 @@ -package org.whispersystems.signalservice.api.subscriptions; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -import org.whispersystems.signalservice.api.profiles.SignalServiceProfile; - -import java.math.BigDecimal; -import java.util.Map; - -/** - * Available subscription levels. - */ -public final class SubscriptionLevels { - - /** - * Reserved level for boost badge. - */ - public static final String BOOST_LEVEL = "1"; - - private final Map levels; - - @JsonCreator - public SubscriptionLevels(@JsonProperty("levels") Map levels) { - this.levels = levels; - } - - public Map getLevels() { - return levels; - } - - /** - * An available subscription level - */ - public static final class Level { - private final String name; - private final SignalServiceProfile.Badge badge; - private final Map currencies; - - @JsonCreator - public Level(@JsonProperty("name") String name, - @JsonProperty("badge") SignalServiceProfile.Badge badge, - @JsonProperty("currencies") Map currencies) - { - this.name = name; - this.badge = badge; - this.currencies = currencies; - } - - public String getName() { - return name; - } - - public SignalServiceProfile.Badge getBadge() { - return badge; - } - - public Map getCurrencies() { - return currencies; - } - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java deleted file mode 100644 index 7b22fceb42..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/crypto/SignatureBodyEntity.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.whispersystems.signalservice.internal.contacts.crypto; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class SignatureBodyEntity { - - @JsonProperty - private byte[] isvEnclaveQuoteBody; - - @JsonProperty - private String isvEnclaveQuoteStatus; - - @JsonProperty - private Long version; - - @JsonProperty - private String timestamp; - - @JsonProperty - private String advisoryURL; - - @JsonProperty - private String[] advisoryIDs; - - public byte[] getIsvEnclaveQuoteBody() { - return isvEnclaveQuoteBody; - } - - public String getIsvEnclaveQuoteStatus() { - return isvEnclaveQuoteStatus; - } - - public String getAdvisoryUrl() { - return advisoryURL; - } - - public String[] getAdvisoryIds() { - return advisoryIDs; - } - - public Long getVersion() { - return version; - } - - public String getTimestamp() { - return timestamp; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java deleted file mode 100644 index 4d45b79c8c..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryRequest.java +++ /dev/null @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2017 Open Whisper Systems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.Map; - -public class DiscoveryRequest { - - @JsonProperty - private int addressCount; - - @JsonProperty - private byte[] commitment; - - @JsonProperty - private byte[] iv; - - @JsonProperty - private byte[] data; - - @JsonProperty - private byte[] mac; - - @JsonProperty - private Map envelopes; - - public DiscoveryRequest() { } - - public DiscoveryRequest(int addressCount, byte[] commitment, byte[] iv, byte[] data, byte[] mac, Map envelopes) { - this.addressCount = addressCount; - this.commitment = commitment; - this.iv = iv; - this.data = data; - this.mac = mac; - this.envelopes = envelopes; - } - - public byte[] getCommitment() { - return commitment; - } - - public byte[] getIv() { - return iv; - } - - public byte[] getData() { - return data; - } - - public byte[] getMac() { - return mac; - } - - public int getAddressCount() { - return addressCount; - } - - @Override - public String toString() { - return "{ addressCount: " + addressCount + ", envelopes: " + envelopes.size() + " }"; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java deleted file mode 100644 index 431873bccd..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/DiscoveryResponse.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2017 Open Whisper Systems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import org.signal.core.util.Hex; - -public class DiscoveryResponse { - - @JsonProperty - private byte[] requestId; - - @JsonProperty - private byte[] iv; - - @JsonProperty - private byte[] data; - - @JsonProperty - private byte[] mac; - - public DiscoveryResponse() {} - - public byte[] getRequestId() { - return requestId; - } - - public byte[] getIv() { - return iv; - } - - public byte[] getData() { - return data; - } - - public byte[] getMac() { - return mac; - } - - public String toString() { - return "{iv: " + (iv == null ? null : Hex.toString(iv)) + ", data: " + (data == null ? null: Hex.toString(data)) + ", mac: " + (mac == null ? null : Hex.toString(mac)) + "}"; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java deleted file mode 100644 index aef91904c0..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupRequest.java +++ /dev/null @@ -1,59 +0,0 @@ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import org.signal.core.util.Hex; - -public class KeyBackupRequest { - - @JsonProperty - private byte[] requestId; - - @JsonProperty - private byte[] iv; - - @JsonProperty - private byte[] data; - - @JsonProperty - private byte[] mac; - - @JsonProperty - private String type; - - public KeyBackupRequest() { - } - - public KeyBackupRequest(byte[] requestId, byte[] iv, byte[] data, byte[] mac, String type) { - this.requestId = requestId; - this.iv = iv; - this.data = data; - this.mac = mac; - this.type = type; - } - - public byte[] getRequestId() { - return requestId; - } - - public byte[] getIv() { - return iv; - } - - public byte[] getData() { - return data; - } - - public byte[] getMac() { - return mac; - } - - public String getType() { - return type; - } - - public String toString() { - return "{ type:" + type + ", requestId: " + Hex.toString(requestId) + ", iv: " + Hex.toString(iv) + ", data: " + Hex.toString(data) + ", mac: " + Hex.toString(mac) + "}"; - } - -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java deleted file mode 100644 index 29bda6522c..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/KeyBackupResponse.java +++ /dev/null @@ -1,41 +0,0 @@ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import org.signal.core.util.Hex; - -public class KeyBackupResponse { - - @JsonProperty - private byte[] iv; - - @JsonProperty - private byte[] data; - - @JsonProperty - private byte[] mac; - - public KeyBackupResponse() {} - - public KeyBackupResponse(byte[] iv, byte[] data, byte[] mac) { - this.iv = iv; - this.data = data; - this.mac = mac; - } - - public byte[] getIv() { - return iv; - } - - public byte[] getData() { - return data; - } - - public byte[] getMac() { - return mac; - } - - public String toString() { - return "{iv: " + (iv == null ? null : Hex.toString(iv)) + ", data: " + (data == null ? null: Hex.toString(data)) + ", mac: " + (mac == null ? null : Hex.toString(mac)) + "}"; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java deleted file mode 100644 index ed1984cb06..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/MultiRemoteAttestationResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import java.util.Map; - -public class MultiRemoteAttestationResponse { - - @JsonProperty - private Map attestations; - - public Map getAttestations() { - return attestations; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java deleted file mode 100644 index 9244a6b409..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/QueryEnvelope.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class QueryEnvelope { - - @JsonProperty - private byte[] requestId; - - @JsonProperty - private byte[] iv; - - @JsonProperty - private byte[] data; - - @JsonProperty - private byte[] mac; - - public QueryEnvelope() { } - - public QueryEnvelope(byte[] requestId, byte[] iv, byte[] data, byte[] mac) { - this.requestId = requestId; - this.iv = iv; - this.data = data; - this.mac = mac; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java deleted file mode 100644 index b5eb6804b0..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationRequest.java +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Copyright (C) 2017 Open Whisper Systems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class RemoteAttestationRequest { - - @JsonProperty - private byte[] clientPublic; - - @JsonProperty - private int iasVersion; - - public RemoteAttestationRequest() {} - - public RemoteAttestationRequest(byte[] clientPublic) { - this.clientPublic = clientPublic; - this.iasVersion = 4; - } - - public byte[] getClientPublic() { - return clientPublic; - } - -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java deleted file mode 100644 index 229a549d35..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/RemoteAttestationResponse.java +++ /dev/null @@ -1,103 +0,0 @@ -/* - * Copyright (C) 2017 Open Whisper Systems - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Affero General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Affero General Public License for more details. - * - * You should have received a copy of the GNU Affero General Public License - * along with this program. If not, see . - */ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class RemoteAttestationResponse { - - @JsonProperty - private byte[] serverEphemeralPublic; - - @JsonProperty - private byte[] serverStaticPublic; - - @JsonProperty - private byte[] quote; - - @JsonProperty - private byte[] iv; - - @JsonProperty - private byte[] ciphertext; - - @JsonProperty - private byte[] tag; - - @JsonProperty - private String signature; - - @JsonProperty - private String certificates; - - @JsonProperty - private String signatureBody; - - public RemoteAttestationResponse(byte[] serverEphemeralPublic, byte[] serverStaticPublic, - byte[] iv, byte[] ciphertext, byte[] tag, - byte[] quote, String signature, String certificates, String signatureBody) - { - this.serverEphemeralPublic = serverEphemeralPublic; - this.serverStaticPublic = serverStaticPublic; - this.iv = iv; - this.ciphertext = ciphertext; - this.tag = tag; - this.quote = quote; - this.signature = signature; - this.certificates = certificates; - this.signatureBody = signatureBody; - } - - public RemoteAttestationResponse() {} - - public byte[] getServerEphemeralPublic() { - return serverEphemeralPublic; - } - - public byte[] getServerStaticPublic() { - return serverStaticPublic; - } - - public byte[] getQuote() { - return quote; - } - - public byte[] getIv() { - return iv; - } - - public byte[] getCiphertext() { - return ciphertext; - } - - public byte[] getTag() { - return tag; - } - - public String getSignature() { - return signature; - } - - public String getCertificates() { - return certificates; - } - - public String getSignatureBody() { - return signatureBody; - } - -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java deleted file mode 100644 index 483e705c52..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/contacts/entities/TokenResponse.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.whispersystems.signalservice.internal.contacts.entities; - -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonProperty; - -public class TokenResponse { - - @JsonProperty - private byte[] backupId; - - @JsonProperty - private byte[] token; - - @JsonProperty - private int tries; - - @JsonCreator - public TokenResponse() { - } - - public TokenResponse(byte[] backupId, byte[] token, int tries) { - this.backupId = backupId; - this.token = token; - this.tries = tries; - } - - public byte[] getBackupId() { - return backupId; - } - - public byte[] getToken() { - return token; - } - - public int getTries() { - return tries; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java deleted file mode 100644 index f4fbecde0e..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/AttachmentV2UploadAttributes.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.whispersystems.signalservice.internal.push; - - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class AttachmentV2UploadAttributes { - @JsonProperty - private String url; - - @JsonProperty - private String key; - - @JsonProperty - private String credential; - - @JsonProperty - private String acl; - - @JsonProperty - private String algorithm; - - @JsonProperty - private String date; - - @JsonProperty - private String policy; - - @JsonProperty - private String signature; - - @JsonProperty - private String attachmentId; - - @JsonProperty - private String attachmentIdString; - - public AttachmentV2UploadAttributes() {} - - public String getUrl() { - return url; - } - - public String getKey() { - return key; - } - - public String getCredential() { - return credential; - } - - public String getAcl() { - return acl; - } - - public String getAlgorithm() { - return algorithm; - } - - public String getDate() { - return date; - } - - public String getPolicy() { - return policy; - } - - public String getSignature() { - return signature; - } - - public String getAttachmentId() { - return attachmentId; - } - - public String getAttachmentIdString() { - return attachmentIdString; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java deleted file mode 100644 index 061265bdd2..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/CdsiResourceExhaustedResponse.java +++ /dev/null @@ -1,15 +0,0 @@ -package org.whispersystems.signalservice.internal.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * Response for {@link org.whispersystems.signalservice.api.push.exceptions.CdsiResourceExhaustedException} - */ -public class CdsiResourceExhaustedResponse { - @JsonProperty("retry_after") - private int retryAfter; - - public int getRetryAfter() { - return retryAfter; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java deleted file mode 100644 index 05dfb02ba5..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactDiscoveryFailureReason.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.whispersystems.signalservice.internal.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class ContactDiscoveryFailureReason { - - @JsonProperty - private final String reason; - - public ContactDiscoveryFailureReason(String reason) { - this.reason = reason == null ? "" : reason; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java deleted file mode 100644 index a9f314e12c..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/ContactTokenDetailsList.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright (C) 2014-2016 Open Whisper Systems - * - * Licensed according to the LICENSE file in this repository. - */ - -package org.whispersystems.signalservice.internal.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -import org.whispersystems.signalservice.api.push.ContactTokenDetails; - -import java.util.List; - -public class ContactTokenDetailsList { - - @JsonProperty - private List contacts; - - public ContactTokenDetailsList() {} - - public List getContacts() { - return contacts; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java deleted file mode 100644 index 2eec89344f..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/GetAciByUsernameResponse.java +++ /dev/null @@ -1,18 +0,0 @@ -package org.whispersystems.signalservice.internal.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -/** - * JSON POJO that represents the returned ACI from a call to - * /v1/account/username/[username] - */ -public class GetAciByUsernameResponse { - @JsonProperty - private String uuid; - - public GetAciByUsernameResponse() {} - - public String getUuid() { - return uuid; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java deleted file mode 100644 index b7a93d0738..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameRequest.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.whispersystems.signalservice.internal.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -class SetUsernameRequest { - @JsonProperty - private String nickname; - - @JsonProperty - private String existingUsername; - - SetUsernameRequest(String nickname, String existingUsername) { - this.nickname = nickname; - this.existingUsername = existingUsername; - } - - String getNickname() { - return nickname; - } - - String getExistingUsername() { - return existingUsername; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java deleted file mode 100644 index 974c0057d4..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SetUsernameResponse.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.whispersystems.signalservice.internal.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -class SetUsernameResponse { - @JsonProperty - private String username; - - SetUsernameResponse() {} - - String getUsername() { - return username; - } -} diff --git a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java b/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java deleted file mode 100644 index 07a91cddd0..0000000000 --- a/lib/libsignal-service/src/main/java/org/whispersystems/signalservice/internal/push/SignalServiceEnvelopeEntity.java +++ /dev/null @@ -1,110 +0,0 @@ -package org.whispersystems.signalservice.internal.push; - -import com.fasterxml.jackson.annotation.JsonProperty; - -public class SignalServiceEnvelopeEntity { - - @JsonProperty - private int type; - - @JsonProperty - private String relay; - - @JsonProperty - private long timestamp; - - @JsonProperty - private String source; - - @JsonProperty - private String sourceUuid; - - @JsonProperty - private int sourceDevice; - - @JsonProperty - private String destinationUuid; - - @JsonProperty - private byte[] message; - - @JsonProperty - private byte[] content; - - @JsonProperty - private long serverTimestamp; - - @JsonProperty - private String guid; - - @JsonProperty - private Boolean urgent; - - @JsonProperty - private Boolean story; - - @JsonProperty - private byte[] reportSpamToken; - - public SignalServiceEnvelopeEntity() {} - - public int getType() { - return type; - } - - public String getRelay() { - return relay; - } - - public long getTimestamp() { - return timestamp; - } - - public String getSourceE164() { - return source; - } - - public String getSourceUuid() { - return sourceUuid; - } - - public boolean hasSource() { - return sourceUuid != null; - } - - public int getSourceDevice() { - return sourceDevice; - } - - public byte[] getMessage() { - return message; - } - - public byte[] getContent() { - return content; - } - - public long getServerTimestamp() { - return serverTimestamp; - } - - public String getServerUuid() { - return guid; - } - - public String getDestinationUuid() { - return destinationUuid; - } - - public boolean isUrgent() { - return urgent == null || urgent; - } - - public boolean isStory() { - return story != null && story; - } - - public byte[] getReportSpamToken() { - return reportSpamToken; - } -}