diff --git a/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java b/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
index 7814379a1d..a8a8b1d85f 100644
--- a/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
+++ b/androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
@@ -8,8 +8,8 @@ import org.whispersystems.libaxolotl.ecc.Curve;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.SignedPreKeyEntity;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import java.io.IOException;
import java.util.LinkedList;
diff --git a/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java b/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
index 60c2b0be43..3f0ed91c8b 100644
--- a/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
+++ b/androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
@@ -6,9 +6,9 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mockito;
import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.whispersystems.textsecure.api.TextSecureMessageSender;
-import org.whispersystems.textsecure.push.PushAddress;
-import org.whispersystems.textsecure.push.exceptions.NotFoundException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import java.io.IOException;
diff --git a/libtextsecure/protobuf/IncomingPushMessageSignal.proto b/libtextsecure/protobuf/IncomingPushMessageSignal.proto
index 88a4c5ed4d..15b6898e93 100644
--- a/libtextsecure/protobuf/IncomingPushMessageSignal.proto
+++ b/libtextsecure/protobuf/IncomingPushMessageSignal.proto
@@ -1,6 +1,6 @@
package textsecure;
-option java_package = "org.whispersystems.textsecure.push";
+option java_package = "org.whispersystems.textsecure.internal.push";
option java_outer_classname = "PushMessageProtos";
message IncomingPushMessageSignal {
diff --git a/libtextsecure/protobuf/Makefile b/libtextsecure/protobuf/Makefile
index 55640f5437..c9b2b6bfcd 100644
--- a/libtextsecure/protobuf/Makefile
+++ b/libtextsecure/protobuf/Makefile
@@ -1,3 +1,3 @@
all:
- protoc --java_out=../src/ IncomingPushMessageSignal.proto
+ protoc --java_out=../src/main/java/ IncomingPushMessageSignal.proto
diff --git a/libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java b/libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java
index 137352c78d..8f58ba8c6b 100644
--- a/libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java
+++ b/libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java
@@ -1,7 +1,8 @@
package org.whispersystems.textsecure.push;
import android.test.AndroidTestCase;
-import android.util.Base64;
+
+import org.whispersystems.textsecure.internal.push.PushTransportDetails;
import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
index 7734d4c526..e305650caa 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
@@ -20,9 +20,9 @@ import org.whispersystems.libaxolotl.IdentityKey;
import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.util.guava.Optional;
-import org.whispersystems.textsecure.push.ContactTokenDetails;
-import org.whispersystems.textsecure.push.PushServiceSocket;
-import org.whispersystems.textsecure.push.SignedPreKeyEntity;
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
import java.io.IOException;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java
index 1956823675..ccaa96ae79 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java
@@ -19,7 +19,7 @@ package org.whispersystems.textsecure.api;
import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.textsecure.api.crypto.AttachmentCipherInputStream;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer;
-import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
import java.io.File;
import java.io.IOException;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java
index 769b4881e4..6560f82c88 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java
@@ -32,28 +32,28 @@ import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
-import org.whispersystems.textsecure.push.MismatchedDevices;
-import org.whispersystems.textsecure.push.OutgoingPushMessage;
-import org.whispersystems.textsecure.push.OutgoingPushMessageList;
-import org.whispersystems.textsecure.push.PushAddress;
-import org.whispersystems.textsecure.push.PushAttachmentData;
-import org.whispersystems.textsecure.push.PushBody;
-import org.whispersystems.textsecure.push.PushServiceSocket;
-import org.whispersystems.textsecure.push.StaleDevices;
-import org.whispersystems.textsecure.push.UnregisteredUserException;
-import org.whispersystems.textsecure.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.textsecure.push.exceptions.MismatchedDevicesException;
-import org.whispersystems.textsecure.push.exceptions.StaleDevicesException;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.internal.push.MismatchedDevices;
+import org.whispersystems.textsecure.internal.push.OutgoingPushMessage;
+import org.whispersystems.textsecure.internal.push.OutgoingPushMessageList;
+import org.whispersystems.textsecure.internal.push.PushAttachmentData;
+import org.whispersystems.textsecure.internal.push.PushBody;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
+import org.whispersystems.textsecure.internal.push.StaleDevices;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
+import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.textsecure.internal.push.exceptions.MismatchedDevicesException;
+import org.whispersystems.textsecure.internal.push.exceptions.StaleDevicesException;
import org.whispersystems.textsecure.internal.util.Util;
import java.io.IOException;
import java.util.LinkedList;
import java.util.List;
-import static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
public class TextSecureMessageSender {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java
index 8596663c57..af2be1dc32 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java
@@ -36,13 +36,13 @@ import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer;
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
-import org.whispersystems.textsecure.push.PushTransportDetails;
+import org.whispersystems.textsecure.internal.push.PushTransportDetails;
import java.util.LinkedList;
import java.util.List;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.DELIVER;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.DELIVER;
public class TextSecureCipher {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java
index e1394d93d3..a796f1a062 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java
@@ -21,7 +21,7 @@ import android.util.Log;
import com.google.protobuf.ByteString;
import org.whispersystems.libaxolotl.InvalidVersionException;
-import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
+import org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal;
import org.whispersystems.textsecure.internal.util.Base64;
import org.whispersystems.textsecure.internal.util.Hex;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetails.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java
similarity index 91%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetails.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java
index e11df4295f..f0a52b63c3 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetails.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.api.push;
import com.google.thoughtcrimegson.Gson;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAddress.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/PushAddress.java
similarity index 93%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAddress.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/PushAddress.java
index 67200eda80..f1a8b5e21e 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAddress.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/PushAddress.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.api.push;
public class PushAddress {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/SignedPreKeyEntity.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java
similarity index 95%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/SignedPreKeyEntity.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java
index 6acc232e21..e691809c75 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/SignedPreKeyEntity.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.api.push;
import com.google.thoughtcrimegson.GsonBuilder;
import com.google.thoughtcrimegson.JsonDeserializationContext;
@@ -11,6 +11,7 @@ import com.google.thoughtcrimegson.JsonSerializer;
import org.whispersystems.libaxolotl.ecc.ECPublicKey;
import org.whispersystems.textsecure.internal.util.Base64;
+import org.whispersystems.textsecure.internal.push.PreKeyEntity;
import java.io.IOException;
import java.lang.reflect.Type;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java
similarity index 72%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java
index 9c16269298..8928c26c8a 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push.exceptions;
+package org.whispersystems.textsecure.api.push.exceptions;
public class AuthorizationFailedException extends NonSuccessfulResponseCodeException {
public AuthorizationFailedException(String s) {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java
similarity index 87%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java
index 9913dc6014..731be26257 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java
@@ -1,7 +1,6 @@
-package org.whispersystems.textsecure.push.exceptions;
+package org.whispersystems.textsecure.api.push.exceptions;
import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
-import org.whispersystems.textsecure.push.UnregisteredUserException;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java
similarity index 59%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java
index 8334f55117..e1a8258473 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push.exceptions;
+package org.whispersystems.textsecure.api.push.exceptions;
public class ExpectationFailedException extends NonSuccessfulResponseCodeException {
}
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java
similarity index 80%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java
index bb5773c38b..a479ebf062 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push.exceptions;
+package org.whispersystems.textsecure.api.push.exceptions;
import java.io.IOException;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java
new file mode 100644
index 0000000000..36499d1a9d
--- /dev/null
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java
@@ -0,0 +1,7 @@
+package org.whispersystems.textsecure.api.push.exceptions;
+
+public class NotFoundException extends NonSuccessfulResponseCodeException {
+ public NotFoundException(String s) {
+ super(s);
+ }
+}
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java
similarity index 79%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java
index fd51be93ee..9e7e2ff584 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push.exceptions;
+package org.whispersystems.textsecure.api.push.exceptions;
import java.io.IOException;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java
new file mode 100644
index 0000000000..be69b29184
--- /dev/null
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java
@@ -0,0 +1,8 @@
+package org.whispersystems.textsecure.api.push.exceptions;
+
+
+public class RateLimitException extends NonSuccessfulResponseCodeException {
+ public RateLimitException(String s) {
+ super(s);
+ }
+}
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/UnregisteredUserException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java
similarity index 85%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/UnregisteredUserException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java
index 9b3131527e..f16a6908ad 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/UnregisteredUserException.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.api.push.exceptions;
import java.io.IOException;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/AccountAttributes.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java
similarity index 91%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/AccountAttributes.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java
index 0e00bbb0f7..64c26c6a5c 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/AccountAttributes.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
public class AccountAttributes {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetailsList.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java
similarity index 65%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetailsList.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java
index 4c9f0da7fb..d0c5b45348 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetailsList.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java
@@ -1,4 +1,6 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
+
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenList.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java
similarity index 83%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenList.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java
index ac912e14a1..ae08897b40 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenList.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/MismatchedDevices.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java
similarity index 84%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/MismatchedDevices.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java
index 714a76d754..c3c793c22d 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/MismatchedDevices.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessage.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java
similarity index 93%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessage.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java
index c22033da54..4dece5999c 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessage.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java
@@ -14,9 +14,10 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
+import org.whispersystems.textsecure.api.push.PushAddress;
import org.whispersystems.textsecure.internal.util.Base64;
public class OutgoingPushMessage {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessageList.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java
similarity index 93%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessageList.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java
index e6dbd65527..69a578af44 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessageList.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyEntity.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java
similarity index 97%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyEntity.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java
index f3c99dcab1..c7fc2be511 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyEntity.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder;
import com.google.thoughtcrimegson.JsonDeserializationContext;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponse.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java
similarity index 97%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponse.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java
index d8acdf3e3a..59a017ab19 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponse.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder;
import com.google.thoughtcrimegson.JsonDeserializationContext;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponseItem.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java
similarity index 83%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponseItem.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java
index 439c8a402b..ee40abdd4f 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponseItem.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java
@@ -1,7 +1,9 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
+
public class PreKeyResponseItem {
private int deviceId;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyState.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java
similarity index 88%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyState.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java
index 5c4f1b29f8..cb19cb9c95 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyState.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java
@@ -1,8 +1,9 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder;
import org.whispersystems.libaxolotl.IdentityKey;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyStatus.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java
similarity index 71%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyStatus.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java
index 1a361e1fae..b28c23c689 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyStatus.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
public class PreKeyStatus {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentData.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java
similarity index 92%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentData.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java
index d644e8ee89..f2efe638e0 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentData.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import java.io.InputStream;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentPointer.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentPointer.java
similarity index 96%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentPointer.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentPointer.java
index 30e893861b..9a2c7fd464 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentPointer.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentPointer.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import android.os.Parcel;
import android.os.Parcelable;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushBody.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java
similarity index 90%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushBody.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java
index a93a27aa1a..cf7c186803 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushBody.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
public class PushBody {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageProtos.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java
similarity index 79%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageProtos.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java
index d5e8939714..8c8b78034a 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageProtos.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java
@@ -1,7 +1,7 @@
// Generated by the protocol buffer compiler. DO NOT EDIT!
// source: IncomingPushMessageSignal.proto
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
public final class PushMessageProtos {
private PushMessageProtos() {}
@@ -19,7 +19,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.IncomingPushMessageSignal.Type type = 1;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type getType();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type getType();
// optional string source = 2;
/**
@@ -142,7 +142,7 @@ public final class PushMessageProtos {
}
case 8: {
int rawValue = input.readEnum();
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type value = org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type.valueOf(rawValue);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type value = org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type.valueOf(rawValue);
if (value == null) {
unknownFields.mergeVarintField(1, rawValue);
} else {
@@ -190,14 +190,14 @@ public final class PushMessageProtos {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.class, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Builder.class);
}
public static com.google.protobuf.Parser PARSER =
@@ -308,7 +308,7 @@ public final class PushMessageProtos {
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.getDescriptor().getEnumTypes().get(0);
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.getDescriptor().getEnumTypes().get(0);
}
private static final Type[] VALUES = values();
@@ -336,7 +336,7 @@ public final class PushMessageProtos {
private int bitField0_;
// optional .textsecure.IncomingPushMessageSignal.Type type = 1;
public static final int TYPE_FIELD_NUMBER = 1;
- private org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type type_;
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type type_;
/**
* optional .textsecure.IncomingPushMessageSignal.Type type = 1;
*/
@@ -346,7 +346,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.IncomingPushMessageSignal.Type type = 1;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type getType() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type getType() {
return type_;
}
@@ -493,7 +493,7 @@ public final class PushMessageProtos {
}
private void initFields() {
- type_ = org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
+ type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
source_ = "";
sourceDevice_ = 0;
relay_ = "";
@@ -575,53 +575,53 @@ public final class PushMessageProtos {
return super.writeReplace();
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(byte[] data)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseDelimitedFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseDelimitedFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -630,7 +630,7 @@ public final class PushMessageProtos {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal prototype) {
+ public static Builder newBuilder(org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -646,20 +646,20 @@ public final class PushMessageProtos {
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder
- implements org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignalOrBuilder {
+ implements org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignalOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.class, org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Builder.class);
}
- // Construct using org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.newBuilder()
+ // Construct using org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -679,7 +679,7 @@ public final class PushMessageProtos {
public Builder clear() {
super.clear();
- type_ = org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
+ type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
bitField0_ = (bitField0_ & ~0x00000001);
source_ = "";
bitField0_ = (bitField0_ & ~0x00000002);
@@ -700,23 +700,23 @@ public final class PushMessageProtos {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_IncomingPushMessageSignal_descriptor;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal getDefaultInstanceForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.getDefaultInstance();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal getDefaultInstanceForType() {
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.getDefaultInstance();
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal build() {
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal result = buildPartial();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal build() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal buildPartial() {
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal result = new org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal(this);
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal buildPartial() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal result = new org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -749,16 +749,16 @@ public final class PushMessageProtos {
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal) {
- return mergeFrom((org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal)other);
+ if (other instanceof org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal) {
+ return mergeFrom((org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal other) {
- if (other == org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal other) {
+ if (other == org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.getDefaultInstance()) return this;
if (other.hasType()) {
setType(other.getType());
}
@@ -793,11 +793,11 @@ public final class PushMessageProtos {
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal parsedMessage = null;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal) e.getUnfinishedMessage();
+ parsedMessage = (org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -809,7 +809,7 @@ public final class PushMessageProtos {
private int bitField0_;
// optional .textsecure.IncomingPushMessageSignal.Type type = 1;
- private org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type type_ = org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
/**
* optional .textsecure.IncomingPushMessageSignal.Type type = 1;
*/
@@ -819,13 +819,13 @@ public final class PushMessageProtos {
/**
* optional .textsecure.IncomingPushMessageSignal.Type type = 1;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type getType() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type getType() {
return type_;
}
/**
* optional .textsecure.IncomingPushMessageSignal.Type type = 1;
*/
- public Builder setType(org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type value) {
+ public Builder setType(org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type value) {
if (value == null) {
throw new NullPointerException();
}
@@ -839,7 +839,7 @@ public final class PushMessageProtos {
*/
public Builder clearType() {
bitField0_ = (bitField0_ & ~0x00000001);
- type_ = org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
+ type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type.UNKNOWN;
onChanged();
return this;
}
@@ -1143,12 +1143,12 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- java.util.List
+ java.util.List
getAttachmentsList();
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index);
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
@@ -1156,12 +1156,12 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- java.util.List
+ java.util.List
getAttachmentsOrBuilderList();
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
int index);
// optional .textsecure.PushMessageContent.GroupContext group = 3;
@@ -1172,11 +1172,11 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext getGroup();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext getGroup();
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder getGroupOrBuilder();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder getGroupOrBuilder();
// optional uint32 flags = 4;
/**
@@ -1246,18 +1246,18 @@ public final class PushMessageProtos {
}
case 18: {
if (!((mutable_bitField0_ & 0x00000002) == 0x00000002)) {
- attachments_ = new java.util.ArrayList();
+ attachments_ = new java.util.ArrayList();
mutable_bitField0_ |= 0x00000002;
}
- attachments_.add(input.readMessage(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.PARSER, extensionRegistry));
+ attachments_.add(input.readMessage(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.PARSER, extensionRegistry));
break;
}
case 26: {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder subBuilder = null;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder subBuilder = null;
if (((bitField0_ & 0x00000002) == 0x00000002)) {
subBuilder = group_.toBuilder();
}
- group_ = input.readMessage(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.PARSER, extensionRegistry);
+ group_ = input.readMessage(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(group_);
group_ = subBuilder.buildPartial();
@@ -1287,14 +1287,14 @@ public final class PushMessageProtos {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.class, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.Builder.class);
}
public static com.google.protobuf.Parser PARSER =
@@ -1360,7 +1360,7 @@ public final class PushMessageProtos {
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.getDescriptor().getEnumTypes().get(0);
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.getDescriptor().getEnumTypes().get(0);
}
private static final Flags[] VALUES = values();
@@ -1503,14 +1503,14 @@ public final class PushMessageProtos {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.class, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder.class);
}
public static com.google.protobuf.Parser PARSER =
@@ -1663,53 +1663,53 @@ public final class PushMessageProtos {
return super.writeReplace();
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(byte[] data)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseDelimitedFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseDelimitedFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -1718,7 +1718,7 @@ public final class PushMessageProtos {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer prototype) {
+ public static Builder newBuilder(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -1734,20 +1734,20 @@ public final class PushMessageProtos {
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder
- implements org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder {
+ implements org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.class, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder.class);
}
- // Construct using org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.newBuilder()
+ // Construct using org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -1782,23 +1782,23 @@ public final class PushMessageProtos {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_AttachmentPointer_descriptor;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getDefaultInstanceForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer getDefaultInstanceForType() {
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer build() {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer result = buildPartial();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer build() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer buildPartial() {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer result = new org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer(this);
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer buildPartial() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer result = new org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -1819,16 +1819,16 @@ public final class PushMessageProtos {
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer) {
- return mergeFrom((org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer)other);
+ if (other instanceof org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer) {
+ return mergeFrom((org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer other) {
- if (other == org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer other) {
+ if (other == org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance()) return this;
if (other.hasId()) {
setId(other.getId());
}
@@ -1852,11 +1852,11 @@ public final class PushMessageProtos {
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer parsedMessage = null;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer) e.getUnfinishedMessage();
+ parsedMessage = (org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -2042,7 +2042,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type getType();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type getType();
// optional string name = 3;
/**
@@ -2087,11 +2087,11 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAvatar();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAvatar();
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAvatarOrBuilder();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAvatarOrBuilder();
}
/**
* Protobuf type {@code textsecure.PushMessageContent.GroupContext}
@@ -2151,7 +2151,7 @@ public final class PushMessageProtos {
}
case 16: {
int rawValue = input.readEnum();
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type value = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.valueOf(rawValue);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type value = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.valueOf(rawValue);
if (value == null) {
unknownFields.mergeVarintField(2, rawValue);
} else {
@@ -2174,11 +2174,11 @@ public final class PushMessageProtos {
break;
}
case 42: {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder subBuilder = null;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder subBuilder = null;
if (((bitField0_ & 0x00000008) == 0x00000008)) {
subBuilder = avatar_.toBuilder();
}
- avatar_ = input.readMessage(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.PARSER, extensionRegistry);
+ avatar_ = input.readMessage(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.PARSER, extensionRegistry);
if (subBuilder != null) {
subBuilder.mergeFrom(avatar_);
avatar_ = subBuilder.buildPartial();
@@ -2203,14 +2203,14 @@ public final class PushMessageProtos {
}
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.class, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder.class);
}
public static com.google.protobuf.Parser PARSER =
@@ -2303,7 +2303,7 @@ public final class PushMessageProtos {
}
public static final com.google.protobuf.Descriptors.EnumDescriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDescriptor().getEnumTypes().get(0);
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDescriptor().getEnumTypes().get(0);
}
private static final Type[] VALUES = values();
@@ -2347,7 +2347,7 @@ public final class PushMessageProtos {
// optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
public static final int TYPE_FIELD_NUMBER = 2;
- private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type type_;
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type type_;
/**
* optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
*/
@@ -2357,7 +2357,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type getType() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type getType() {
return type_;
}
@@ -2436,7 +2436,7 @@ public final class PushMessageProtos {
// optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
public static final int AVATAR_FIELD_NUMBER = 5;
- private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer avatar_;
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer avatar_;
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
@@ -2446,22 +2446,22 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAvatar() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAvatar() {
return avatar_;
}
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAvatarOrBuilder() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAvatarOrBuilder() {
return avatar_;
}
private void initFields() {
id_ = com.google.protobuf.ByteString.EMPTY;
- type_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
+ type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
name_ = "";
members_ = com.google.protobuf.LazyStringArrayList.EMPTY;
- avatar_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
+ avatar_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
}
private byte memoizedIsInitialized = -1;
public final boolean isInitialized() {
@@ -2536,53 +2536,53 @@ public final class PushMessageProtos {
return super.writeReplace();
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(byte[] data)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseDelimitedFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseDelimitedFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -2591,7 +2591,7 @@ public final class PushMessageProtos {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext prototype) {
+ public static Builder newBuilder(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -2607,20 +2607,20 @@ public final class PushMessageProtos {
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder
- implements org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder {
+ implements org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.class, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder.class);
}
- // Construct using org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.newBuilder()
+ // Construct using org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -2643,14 +2643,14 @@ public final class PushMessageProtos {
super.clear();
id_ = com.google.protobuf.ByteString.EMPTY;
bitField0_ = (bitField0_ & ~0x00000001);
- type_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
+ type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
bitField0_ = (bitField0_ & ~0x00000002);
name_ = "";
bitField0_ = (bitField0_ & ~0x00000004);
members_ = com.google.protobuf.LazyStringArrayList.EMPTY;
bitField0_ = (bitField0_ & ~0x00000008);
if (avatarBuilder_ == null) {
- avatar_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
+ avatar_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
} else {
avatarBuilder_.clear();
}
@@ -2664,23 +2664,23 @@ public final class PushMessageProtos {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_GroupContext_descriptor;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext getDefaultInstanceForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext getDefaultInstanceForType() {
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext build() {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext result = buildPartial();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext build() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext buildPartial() {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext result = new org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext(this);
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext buildPartial() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext result = new org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -2715,16 +2715,16 @@ public final class PushMessageProtos {
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext) {
- return mergeFrom((org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext)other);
+ if (other instanceof org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext) {
+ return mergeFrom((org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext other) {
- if (other == org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext other) {
+ if (other == org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance()) return this;
if (other.hasId()) {
setId(other.getId());
}
@@ -2761,11 +2761,11 @@ public final class PushMessageProtos {
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext parsedMessage = null;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext) e.getUnfinishedMessage();
+ parsedMessage = (org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -2813,7 +2813,7 @@ public final class PushMessageProtos {
}
// optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
- private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type type_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
/**
* optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
*/
@@ -2823,13 +2823,13 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type getType() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type getType() {
return type_;
}
/**
* optional .textsecure.PushMessageContent.GroupContext.Type type = 2;
*/
- public Builder setType(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type value) {
+ public Builder setType(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type value) {
if (value == null) {
throw new NullPointerException();
}
@@ -2843,7 +2843,7 @@ public final class PushMessageProtos {
*/
public Builder clearType() {
bitField0_ = (bitField0_ & ~0x00000002);
- type_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
+ type_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.UNKNOWN;
onChanged();
return this;
}
@@ -3016,9 +3016,9 @@ public final class PushMessageProtos {
}
// optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
- private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer avatar_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer avatar_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder> avatarBuilder_;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder> avatarBuilder_;
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
@@ -3028,7 +3028,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAvatar() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAvatar() {
if (avatarBuilder_ == null) {
return avatar_;
} else {
@@ -3038,7 +3038,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- public Builder setAvatar(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
+ public Builder setAvatar(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (avatarBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3055,7 +3055,7 @@ public final class PushMessageProtos {
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
public Builder setAvatar(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
if (avatarBuilder_ == null) {
avatar_ = builderForValue.build();
onChanged();
@@ -3068,12 +3068,12 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- public Builder mergeAvatar(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
+ public Builder mergeAvatar(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (avatarBuilder_ == null) {
if (((bitField0_ & 0x00000010) == 0x00000010) &&
- avatar_ != org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance()) {
+ avatar_ != org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance()) {
avatar_ =
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.newBuilder(avatar_).mergeFrom(value).buildPartial();
} else {
avatar_ = value;
}
@@ -3089,7 +3089,7 @@ public final class PushMessageProtos {
*/
public Builder clearAvatar() {
if (avatarBuilder_ == null) {
- avatar_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
+ avatar_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance();
onChanged();
} else {
avatarBuilder_.clear();
@@ -3100,7 +3100,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder getAvatarBuilder() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder getAvatarBuilder() {
bitField0_ |= 0x00000010;
onChanged();
return getAvatarFieldBuilder().getBuilder();
@@ -3108,7 +3108,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAvatarOrBuilder() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAvatarOrBuilder() {
if (avatarBuilder_ != null) {
return avatarBuilder_.getMessageOrBuilder();
} else {
@@ -3119,11 +3119,11 @@ public final class PushMessageProtos {
* optional .textsecure.PushMessageContent.AttachmentPointer avatar = 5;
*/
private com.google.protobuf.SingleFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>
getAvatarFieldBuilder() {
if (avatarBuilder_ == null) {
avatarBuilder_ = new com.google.protobuf.SingleFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>(
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>(
avatar_,
getParentForChildren(),
isClean());
@@ -3189,17 +3189,17 @@ public final class PushMessageProtos {
// repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
public static final int ATTACHMENTS_FIELD_NUMBER = 2;
- private java.util.List attachments_;
+ private java.util.List attachments_;
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public java.util.List getAttachmentsList() {
+ public java.util.List getAttachmentsList() {
return attachments_;
}
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public java.util.List
+ public java.util.List
getAttachmentsOrBuilderList() {
return attachments_;
}
@@ -3212,20 +3212,20 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index) {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index) {
return attachments_.get(index);
}
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
int index) {
return attachments_.get(index);
}
// optional .textsecure.PushMessageContent.GroupContext group = 3;
public static final int GROUP_FIELD_NUMBER = 3;
- private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext group_;
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext group_;
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
@@ -3235,13 +3235,13 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext getGroup() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext getGroup() {
return group_;
}
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder getGroupOrBuilder() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder getGroupOrBuilder() {
return group_;
}
@@ -3264,7 +3264,7 @@ public final class PushMessageProtos {
private void initFields() {
body_ = "";
attachments_ = java.util.Collections.emptyList();
- group_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
+ group_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
flags_ = 0;
}
private byte memoizedIsInitialized = -1;
@@ -3328,53 +3328,53 @@ public final class PushMessageProtos {
return super.writeReplace();
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(
com.google.protobuf.ByteString data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(
com.google.protobuf.ByteString data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(byte[] data)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(byte[] data)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(
byte[] data,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws com.google.protobuf.InvalidProtocolBufferException {
return PARSER.parseFrom(data, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseDelimitedFrom(java.io.InputStream input)
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseDelimitedFrom(java.io.InputStream input)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseDelimitedFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseDelimitedFrom(
java.io.InputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
return PARSER.parseDelimitedFrom(input, extensionRegistry);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(
com.google.protobuf.CodedInputStream input)
throws java.io.IOException {
return PARSER.parseFrom(input);
}
- public static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parseFrom(
+ public static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parseFrom(
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
@@ -3383,7 +3383,7 @@ public final class PushMessageProtos {
public static Builder newBuilder() { return Builder.create(); }
public Builder newBuilderForType() { return newBuilder(); }
- public static Builder newBuilder(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent prototype) {
+ public static Builder newBuilder(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent prototype) {
return newBuilder().mergeFrom(prototype);
}
public Builder toBuilder() { return newBuilder(this); }
@@ -3399,20 +3399,20 @@ public final class PushMessageProtos {
*/
public static final class Builder extends
com.google.protobuf.GeneratedMessage.Builder
- implements org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContentOrBuilder {
+ implements org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContentOrBuilder {
public static final com.google.protobuf.Descriptors.Descriptor
getDescriptor() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
}
protected com.google.protobuf.GeneratedMessage.FieldAccessorTable
internalGetFieldAccessorTable() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_fieldAccessorTable
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_fieldAccessorTable
.ensureFieldAccessorsInitialized(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.class, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.Builder.class);
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.class, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.Builder.class);
}
- // Construct using org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.newBuilder()
+ // Construct using org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.newBuilder()
private Builder() {
maybeForceBuilderInitialization();
}
@@ -3443,7 +3443,7 @@ public final class PushMessageProtos {
attachmentsBuilder_.clear();
}
if (groupBuilder_ == null) {
- group_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
+ group_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
} else {
groupBuilder_.clear();
}
@@ -3459,23 +3459,23 @@ public final class PushMessageProtos {
public com.google.protobuf.Descriptors.Descriptor
getDescriptorForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.internal_static_textsecure_PushMessageContent_descriptor;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent getDefaultInstanceForType() {
- return org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.getDefaultInstance();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent getDefaultInstanceForType() {
+ return org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.getDefaultInstance();
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent build() {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent result = buildPartial();
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent build() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent result = buildPartial();
if (!result.isInitialized()) {
throw newUninitializedMessageException(result);
}
return result;
}
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent buildPartial() {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent result = new org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent(this);
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent buildPartial() {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent result = new org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent(this);
int from_bitField0_ = bitField0_;
int to_bitField0_ = 0;
if (((from_bitField0_ & 0x00000001) == 0x00000001)) {
@@ -3509,16 +3509,16 @@ public final class PushMessageProtos {
}
public Builder mergeFrom(com.google.protobuf.Message other) {
- if (other instanceof org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent) {
- return mergeFrom((org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent)other);
+ if (other instanceof org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent) {
+ return mergeFrom((org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent)other);
} else {
super.mergeFrom(other);
return this;
}
}
- public Builder mergeFrom(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent other) {
- if (other == org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.getDefaultInstance()) return this;
+ public Builder mergeFrom(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent other) {
+ if (other == org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.getDefaultInstance()) return this;
if (other.hasBody()) {
bitField0_ |= 0x00000001;
body_ = other.body_;
@@ -3568,11 +3568,11 @@ public final class PushMessageProtos {
com.google.protobuf.CodedInputStream input,
com.google.protobuf.ExtensionRegistryLite extensionRegistry)
throws java.io.IOException {
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent parsedMessage = null;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent parsedMessage = null;
try {
parsedMessage = PARSER.parsePartialFrom(input, extensionRegistry);
} catch (com.google.protobuf.InvalidProtocolBufferException e) {
- parsedMessage = (org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent) e.getUnfinishedMessage();
+ parsedMessage = (org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent) e.getUnfinishedMessage();
throw e;
} finally {
if (parsedMessage != null) {
@@ -3658,22 +3658,22 @@ public final class PushMessageProtos {
}
// repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
- private java.util.List attachments_ =
+ private java.util.List attachments_ =
java.util.Collections.emptyList();
private void ensureAttachmentsIsMutable() {
if (!((bitField0_ & 0x00000002) == 0x00000002)) {
- attachments_ = new java.util.ArrayList(attachments_);
+ attachments_ = new java.util.ArrayList(attachments_);
bitField0_ |= 0x00000002;
}
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder> attachmentsBuilder_;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder> attachmentsBuilder_;
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public java.util.List getAttachmentsList() {
+ public java.util.List getAttachmentsList() {
if (attachmentsBuilder_ == null) {
return java.util.Collections.unmodifiableList(attachments_);
} else {
@@ -3693,7 +3693,7 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index) {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer getAttachments(int index) {
if (attachmentsBuilder_ == null) {
return attachments_.get(index);
} else {
@@ -3704,7 +3704,7 @@ public final class PushMessageProtos {
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
public Builder setAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
+ int index, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (attachmentsBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3721,7 +3721,7 @@ public final class PushMessageProtos {
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
public Builder setAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
+ int index, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
attachments_.set(index, builderForValue.build());
@@ -3734,7 +3734,7 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public Builder addAttachments(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
+ public Builder addAttachments(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (attachmentsBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3751,7 +3751,7 @@ public final class PushMessageProtos {
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
public Builder addAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
+ int index, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer value) {
if (attachmentsBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3768,7 +3768,7 @@ public final class PushMessageProtos {
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
public Builder addAttachments(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
attachments_.add(builderForValue.build());
@@ -3782,7 +3782,7 @@ public final class PushMessageProtos {
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
public Builder addAttachments(
- int index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
+ int index, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder builderForValue) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
attachments_.add(index, builderForValue.build());
@@ -3796,7 +3796,7 @@ public final class PushMessageProtos {
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
public Builder addAllAttachments(
- java.lang.Iterable values) {
+ java.lang.Iterable values) {
if (attachmentsBuilder_ == null) {
ensureAttachmentsIsMutable();
super.addAll(values, attachments_);
@@ -3835,14 +3835,14 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder getAttachmentsBuilder(
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder getAttachmentsBuilder(
int index) {
return getAttachmentsFieldBuilder().getBuilder(index);
}
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder getAttachmentsOrBuilder(
int index) {
if (attachmentsBuilder_ == null) {
return attachments_.get(index); } else {
@@ -3852,7 +3852,7 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public java.util.List
+ public java.util.List
getAttachmentsOrBuilderList() {
if (attachmentsBuilder_ != null) {
return attachmentsBuilder_.getMessageOrBuilderList();
@@ -3863,31 +3863,31 @@ public final class PushMessageProtos {
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder addAttachmentsBuilder() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder addAttachmentsBuilder() {
return getAttachmentsFieldBuilder().addBuilder(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance());
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance());
}
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder addAttachmentsBuilder(
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder addAttachmentsBuilder(
int index) {
return getAttachmentsFieldBuilder().addBuilder(
- index, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance());
+ index, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.getDefaultInstance());
}
/**
* repeated .textsecure.PushMessageContent.AttachmentPointer attachments = 2;
*/
- public java.util.List
+ public java.util.List
getAttachmentsBuilderList() {
return getAttachmentsFieldBuilder().getBuilderList();
}
private com.google.protobuf.RepeatedFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>
getAttachmentsFieldBuilder() {
if (attachmentsBuilder_ == null) {
attachmentsBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>(
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointerOrBuilder>(
attachments_,
((bitField0_ & 0x00000002) == 0x00000002),
getParentForChildren(),
@@ -3898,9 +3898,9 @@ public final class PushMessageProtos {
}
// optional .textsecure.PushMessageContent.GroupContext group = 3;
- private org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext group_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
+ private org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext group_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
private com.google.protobuf.SingleFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder> groupBuilder_;
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder> groupBuilder_;
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
@@ -3910,7 +3910,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext getGroup() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext getGroup() {
if (groupBuilder_ == null) {
return group_;
} else {
@@ -3920,7 +3920,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- public Builder setGroup(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext value) {
+ public Builder setGroup(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext value) {
if (groupBuilder_ == null) {
if (value == null) {
throw new NullPointerException();
@@ -3937,7 +3937,7 @@ public final class PushMessageProtos {
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
public Builder setGroup(
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder builderForValue) {
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder builderForValue) {
if (groupBuilder_ == null) {
group_ = builderForValue.build();
onChanged();
@@ -3950,12 +3950,12 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- public Builder mergeGroup(org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext value) {
+ public Builder mergeGroup(org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext value) {
if (groupBuilder_ == null) {
if (((bitField0_ & 0x00000004) == 0x00000004) &&
- group_ != org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance()) {
+ group_ != org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance()) {
group_ =
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial();
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.newBuilder(group_).mergeFrom(value).buildPartial();
} else {
group_ = value;
}
@@ -3971,7 +3971,7 @@ public final class PushMessageProtos {
*/
public Builder clearGroup() {
if (groupBuilder_ == null) {
- group_ = org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
+ group_ = org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.getDefaultInstance();
onChanged();
} else {
groupBuilder_.clear();
@@ -3982,7 +3982,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder getGroupBuilder() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder getGroupBuilder() {
bitField0_ |= 0x00000004;
onChanged();
return getGroupFieldBuilder().getBuilder();
@@ -3990,7 +3990,7 @@ public final class PushMessageProtos {
/**
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
- public org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder getGroupOrBuilder() {
+ public org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder getGroupOrBuilder() {
if (groupBuilder_ != null) {
return groupBuilder_.getMessageOrBuilder();
} else {
@@ -4001,11 +4001,11 @@ public final class PushMessageProtos {
* optional .textsecure.PushMessageContent.GroupContext group = 3;
*/
private com.google.protobuf.SingleFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder>
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder>
getGroupFieldBuilder() {
if (groupBuilder_ == null) {
groupBuilder_ = new com.google.protobuf.SingleFieldBuilder<
- org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Builder, org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder>(
+ org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Builder, org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContextOrBuilder>(
group_,
getParentForChildren(),
isClean());
@@ -4108,8 +4108,8 @@ public final class PushMessageProtos {
"tsecure.PushMessageContent.AttachmentPoi" +
"nter\"6\n\004Type\022\013\n\007UNKNOWN\020\000\022\n\n\006UPDATE\020\001\022\013\n",
"\007DELIVER\020\002\022\010\n\004QUIT\020\003\"\030\n\005Flags\022\017\n\013END_SES" +
- "SION\020\001B7\n\"org.whispersystems.textsecure." +
- "pushB\021PushMessageProtos"
+ "SION\020\001B@\n+org.whispersystems.textsecure." +
+ "internal.pushB\021PushMessageProtos"
};
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageResponse.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageResponse.java
similarity index 82%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageResponse.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageResponse.java
index 9df2c9d1b0..b06f5e9338 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageResponse.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageResponse.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushServiceSocket.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java
similarity index 95%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushServiceSocket.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java
index 77c6041119..6891159a41 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushServiceSocket.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import android.util.Log;
@@ -27,17 +27,21 @@ import org.whispersystems.libaxolotl.ecc.ECPublicKey;
import org.whispersystems.libaxolotl.state.PreKeyBundle;
import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
+import org.whispersystems.textsecure.api.push.PushAddress;
import org.whispersystems.textsecure.api.crypto.AttachmentCipherOutputStream;
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
+import org.whispersystems.textsecure.internal.push.exceptions.MismatchedDevicesException;
+import org.whispersystems.textsecure.internal.push.exceptions.StaleDevicesException;
import org.whispersystems.textsecure.internal.util.Base64;
import org.whispersystems.textsecure.internal.util.Util;
-import org.whispersystems.textsecure.push.exceptions.AuthorizationFailedException;
-import org.whispersystems.textsecure.push.exceptions.ExpectationFailedException;
-import org.whispersystems.textsecure.push.exceptions.MismatchedDevicesException;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.NotFoundException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
-import org.whispersystems.textsecure.push.exceptions.RateLimitException;
-import org.whispersystems.textsecure.push.exceptions.StaleDevicesException;
+import org.whispersystems.textsecure.api.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.textsecure.api.push.exceptions.ExpectationFailedException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.RateLimitException;
import org.whispersystems.textsecure.internal.util.BlacklistingTrustManager;
import java.io.File;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushTransportDetails.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java
similarity index 98%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushTransportDetails.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java
index d9f7f3cfb4..23270ede19 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushTransportDetails.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java
@@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import android.util.Log;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/StaleDevices.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java
similarity index 75%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/StaleDevices.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java
index f0f0d00ce2..af3efbdcc9 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/StaleDevices.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java
@@ -1,4 +1,4 @@
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
import java.util.List;
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java
similarity index 61%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java
index cb02cc441a..dea5c5eb5d 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java
@@ -1,6 +1,7 @@
-package org.whispersystems.textsecure.push.exceptions;
+package org.whispersystems.textsecure.internal.push.exceptions;
-import org.whispersystems.textsecure.push.MismatchedDevices;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.internal.push.MismatchedDevices;
public class MismatchedDevicesException extends NonSuccessfulResponseCodeException {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java
similarity index 57%
rename from libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java
rename to libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java
index 43f0333601..3f6912b673 100644
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java
+++ b/libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java
@@ -1,7 +1,7 @@
-package org.whispersystems.textsecure.push.exceptions;
+package org.whispersystems.textsecure.internal.push.exceptions;
-import org.whispersystems.textsecure.push.StaleDevices;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.internal.push.StaleDevices;
public class StaleDevicesException extends NonSuccessfulResponseCodeException {
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NotFoundException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NotFoundException.java
deleted file mode 100644
index c1e98e413f..0000000000
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NotFoundException.java
+++ /dev/null
@@ -1,9 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-
-public class NotFoundException extends NonSuccessfulResponseCodeException {
- public NotFoundException(String s) {
- super(s);
- }
-}
diff --git a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/RateLimitException.java b/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/RateLimitException.java
deleted file mode 100644
index c90de25f3b..0000000000
--- a/libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/RateLimitException.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package org.whispersystems.textsecure.push.exceptions;
-
-
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-
-public class RateLimitException extends NonSuccessfulResponseCodeException {
- public RateLimitException(String s) {
- super(s);
- }
-}
diff --git a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
index da77fcd705..ebb6a056d1 100644
--- a/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
+++ b/src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
@@ -67,7 +67,7 @@ import org.thoughtcrime.securesms.util.Trimmer;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.exceptions.AuthorizationFailedException;
+import org.whispersystems.textsecure.api.push.exceptions.AuthorizationFailedException;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/AutoInitiateActivity.java b/src/org/thoughtcrime/securesms/AutoInitiateActivity.java
index d185830add..8b64f29a67 100644
--- a/src/org/thoughtcrime/securesms/AutoInitiateActivity.java
+++ b/src/org/thoughtcrime/securesms/AutoInitiateActivity.java
@@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.MemoryCleaner;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libaxolotl.state.SessionStore;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
/**
* Activity which prompts the user to initiate a secure
diff --git a/src/org/thoughtcrime/securesms/ConversationActivity.java b/src/org/thoughtcrime/securesms/ConversationActivity.java
index ef954a93c4..fdedcc0a2d 100644
--- a/src/org/thoughtcrime/securesms/ConversationActivity.java
+++ b/src/org/thoughtcrime/securesms/ConversationActivity.java
@@ -108,7 +108,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.libaxolotl.state.SessionStore;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
import java.io.IOException;
import java.util.LinkedList;
@@ -116,7 +116,7 @@ import java.util.List;
import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
import static org.thoughtcrime.securesms.recipients.Recipient.RecipientModifiedListener;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
/**
* Activity for displaying a message thread, as well as
diff --git a/src/org/thoughtcrime/securesms/GroupCreateActivity.java b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
index 2e1c89f3a5..daafff0112 100644
--- a/src/org/thoughtcrime/securesms/GroupCreateActivity.java
+++ b/src/org/thoughtcrime/securesms/GroupCreateActivity.java
@@ -80,7 +80,7 @@ import java.util.Set;
import ws.com.google.android.mms.MmsException;
import static org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
/**
* Activity to create and update groups
diff --git a/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java b/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
index a64b390d9b..98d1dbf3f4 100644
--- a/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
+++ b/src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
@@ -38,8 +38,8 @@ import org.thoughtcrime.securesms.util.Dialogs;
import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.exceptions.ExpectationFailedException;
-import org.whispersystems.textsecure.push.exceptions.RateLimitException;
+import org.whispersystems.textsecure.api.push.exceptions.ExpectationFailedException;
+import org.whispersystems.textsecure.api.push.exceptions.RateLimitException;
import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
index c4b8008bf4..5f3143aaeb 100644
--- a/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
+++ b/src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
@@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.util.MemoryCleaner;
import org.whispersystems.libaxolotl.IdentityKey;
import org.whispersystems.libaxolotl.state.SessionRecord;
import org.whispersystems.libaxolotl.state.SessionStore;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
/**
* Activity for verifying identity keys.
diff --git a/src/org/thoughtcrime/securesms/crypto/KeyExchangeInitiator.java b/src/org/thoughtcrime/securesms/crypto/KeyExchangeInitiator.java
index 8a4067fbf8..ccb50c816a 100644
--- a/src/org/thoughtcrime/securesms/crypto/KeyExchangeInitiator.java
+++ b/src/org/thoughtcrime/securesms/crypto/KeyExchangeInitiator.java
@@ -37,7 +37,7 @@ import org.whispersystems.libaxolotl.state.PreKeyStore;
import org.whispersystems.libaxolotl.state.SessionRecord;
import org.whispersystems.libaxolotl.state.SessionStore;
import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
public class KeyExchangeInitiator {
diff --git a/src/org/thoughtcrime/securesms/crypto/MmsCipher.java b/src/org/thoughtcrime/securesms/crypto/MmsCipher.java
index 33752c2553..56a49df641 100644
--- a/src/org/thoughtcrime/securesms/crypto/MmsCipher.java
+++ b/src/org/thoughtcrime/securesms/crypto/MmsCipher.java
@@ -18,7 +18,7 @@ import org.whispersystems.libaxolotl.protocol.CiphertextMessage;
import org.whispersystems.libaxolotl.protocol.WhisperMessage;
import org.whispersystems.libaxolotl.state.AxolotlStore;
import org.whispersystems.libaxolotl.util.guava.Optional;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/crypto/SmsCipher.java b/src/org/thoughtcrime/securesms/crypto/SmsCipher.java
index b3b923c324..59c93b162f 100644
--- a/src/org/thoughtcrime/securesms/crypto/SmsCipher.java
+++ b/src/org/thoughtcrime/securesms/crypto/SmsCipher.java
@@ -30,7 +30,7 @@ import org.whispersystems.libaxolotl.protocol.KeyExchangeMessage;
import org.whispersystems.libaxolotl.protocol.PreKeyWhisperMessage;
import org.whispersystems.libaxolotl.protocol.WhisperMessage;
import org.whispersystems.libaxolotl.state.AxolotlStore;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
index 74987a95e5..c26a24845c 100644
--- a/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
+++ b/src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
@@ -9,7 +9,7 @@ import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.libaxolotl.state.SessionRecord;
import org.whispersystems.libaxolotl.state.SessionState;
import org.whispersystems.libaxolotl.state.SessionStore;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
import org.thoughtcrime.securesms.util.Conversions;
import java.io.File;
diff --git a/src/org/thoughtcrime/securesms/database/GroupDatabase.java b/src/org/thoughtcrime/securesms/database/GroupDatabase.java
index 3adbb46f26..060224be79 100644
--- a/src/org/thoughtcrime/securesms/database/GroupDatabase.java
+++ b/src/org/thoughtcrime/securesms/database/GroupDatabase.java
@@ -8,7 +8,6 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper;
import android.graphics.Bitmap;
-import android.graphics.BitmapFactory;
import android.util.Log;
import org.thoughtcrime.securesms.recipients.Recipient;
@@ -26,9 +25,6 @@ import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom;
import java.util.LinkedList;
import java.util.List;
-import java.util.Set;
-
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
public class GroupDatabase extends Database {
diff --git a/src/org/thoughtcrime/securesms/database/TextSecureDirectory.java b/src/org/thoughtcrime/securesms/database/TextSecureDirectory.java
index 69e0096bda..61c7173d1c 100644
--- a/src/org/thoughtcrime/securesms/database/TextSecureDirectory.java
+++ b/src/org/thoughtcrime/securesms/database/TextSecureDirectory.java
@@ -9,7 +9,7 @@ import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.util.Log;
-import org.whispersystems.textsecure.push.ContactTokenDetails;
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
diff --git a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
index 8bfd6aff05..46177342a4 100644
--- a/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
+++ b/src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
@@ -29,8 +29,8 @@ import java.util.List;
import java.util.Set;
import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
public class GroupMessageProcessor {
diff --git a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
index 2791bb5c68..c0ff321ae6 100644
--- a/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
@@ -18,8 +18,8 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.textsecure.api.TextSecureMessageReceiver;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import java.io.File;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
index f6d9725c66..56c740f251 100644
--- a/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
@@ -21,8 +21,8 @@ import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.textsecure.api.crypto.AttachmentCipherInputStream;
-import org.whispersystems.textsecure.push.PushServiceSocket;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
import java.io.File;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
index 4132572a56..d3229b6ed1 100644
--- a/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
@@ -11,9 +11,9 @@ import org.whispersystems.libaxolotl.InvalidKeyIdException;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.SignedPreKeyEntity;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import java.io.IOException;
import java.util.Collections;
diff --git a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
index 61b16eec5b..c596ded6c9 100644
--- a/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
@@ -15,7 +15,7 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.IdentityKeyPair;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/DeliveryReceiptJob.java b/src/org/thoughtcrime/securesms/jobs/DeliveryReceiptJob.java
index 857b83a5df..e16cd17d8b 100644
--- a/src/org/thoughtcrime/securesms/jobs/DeliveryReceiptJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/DeliveryReceiptJob.java
@@ -3,18 +3,13 @@ package org.thoughtcrime.securesms.jobs;
import android.content.Context;
import android.util.Log;
-import org.thoughtcrime.securesms.Release;
import org.thoughtcrime.securesms.dependencies.InjectableType;
-import org.thoughtcrime.securesms.dependencies.TextSecureCommunicationModule;
-import org.thoughtcrime.securesms.push.TextSecurePushTrustStore;
-import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.jobqueue.requirements.NetworkRequirement;
-import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureMessageSender;
-import org.whispersystems.textsecure.push.PushAddress;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java b/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
index 4a38585a68..4d78773a49 100644
--- a/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
@@ -14,7 +14,7 @@ import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
public class GcmRefreshJob extends ContextJob {
diff --git a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
index 700dbc06ea..43ce9d6df6 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
@@ -24,9 +24,9 @@ import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
-import org.whispersystems.textsecure.push.PushAddress;
-import org.whispersystems.textsecure.push.PushMessageProtos;
-import org.whispersystems.textsecure.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.internal.push.PushMessageProtos;
+import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
index 0a82b326d1..6f86a8b442 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
@@ -24,8 +24,8 @@ import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
-import org.whispersystems.textsecure.push.PushAddress;
-import org.whispersystems.textsecure.push.UnregisteredUserException;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushReceiveJob.java b/src/org/thoughtcrime/securesms/jobs/PushReceiveJob.java
index a91f36123a..348760132f 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushReceiveJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushReceiveJob.java
@@ -12,7 +12,7 @@ import org.whispersystems.libaxolotl.InvalidVersionException;
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
import org.thoughtcrime.securesms.database.TextSecureDirectory;
import org.thoughtcrime.securesms.database.NotInDirectoryException;
-import org.whispersystems.textsecure.push.ContactTokenDetails;
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
index 2f3dd2f1f6..5cd4924105 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushSendJob.java
@@ -16,7 +16,7 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
import org.thoughtcrime.securesms.database.TextSecureDirectory;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.ByteArrayInputStream;
diff --git a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
index 8bf0aa9cde..7441eea590 100644
--- a/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
@@ -22,8 +22,8 @@ import org.whispersystems.libaxolotl.state.AxolotlStore;
import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
-import org.whispersystems.textsecure.push.PushAddress;
-import org.whispersystems.textsecure.push.UnregisteredUserException;
+import org.whispersystems.textsecure.api.push.PushAddress;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.IOException;
diff --git a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
index d7f7db4cc0..4ea11a0e8f 100644
--- a/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
+++ b/src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
@@ -16,8 +16,8 @@ import org.whispersystems.libaxolotl.IdentityKeyPair;
import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
import java.io.IOException;
import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java b/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
index 6a7bda52b1..2033e788b5 100644
--- a/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
+++ b/src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
@@ -10,7 +10,7 @@ import ws.com.google.android.mms.ContentType;
import ws.com.google.android.mms.pdu.PduBody;
import ws.com.google.android.mms.pdu.PduPart;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
public class OutgoingGroupMediaMessage extends OutgoingSecureMediaMessage {
diff --git a/src/org/thoughtcrime/securesms/push/TextSecurePushTrustStore.java b/src/org/thoughtcrime/securesms/push/TextSecurePushTrustStore.java
index a1333bdedd..6859fcd397 100644
--- a/src/org/thoughtcrime/securesms/push/TextSecurePushTrustStore.java
+++ b/src/org/thoughtcrime/securesms/push/TextSecurePushTrustStore.java
@@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.push;
import android.content.Context;
import org.thoughtcrime.securesms.R;
-import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
import java.io.InputStream;
diff --git a/src/org/thoughtcrime/securesms/service/RegistrationService.java b/src/org/thoughtcrime/securesms/service/RegistrationService.java
index 0c31b0c8c5..0887c7376f 100644
--- a/src/org/thoughtcrime/securesms/service/RegistrationService.java
+++ b/src/org/thoughtcrime/securesms/service/RegistrationService.java
@@ -26,7 +26,7 @@ import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.util.KeyHelper;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.exceptions.ExpectationFailedException;
+import org.whispersystems.textsecure.api.push.exceptions.ExpectationFailedException;
import java.io.IOException;
import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java b/src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java
index a36f942545..c9f971fda1 100644
--- a/src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java
@@ -1,12 +1,6 @@
package org.thoughtcrime.securesms.sms;
-import com.google.protobuf.ByteString;
-
-import org.thoughtcrime.securesms.util.GroupUtil;
-
-import java.io.IOException;
-
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
public class IncomingGroupMessage extends IncomingTextMessage {
diff --git a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
index b021703901..114d227229 100644
--- a/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
+++ b/src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
@@ -7,7 +7,7 @@ import android.telephony.SmsMessage;
import org.thoughtcrime.securesms.util.GroupUtil;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.api.push.PushAddress;
import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/sms/MessageSender.java b/src/org/thoughtcrime/securesms/sms/MessageSender.java
index f1915e19c4..61b8e9e47d 100644
--- a/src/org/thoughtcrime/securesms/sms/MessageSender.java
+++ b/src/org/thoughtcrime/securesms/sms/MessageSender.java
@@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.jobqueue.JobManager;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.ContactTokenDetails;
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
import org.thoughtcrime.securesms.util.DirectoryUtil;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
diff --git a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java
index 2ca6afa46f..f152aa1021 100644
--- a/src/org/thoughtcrime/securesms/util/DirectoryHelper.java
+++ b/src/org/thoughtcrime/securesms/util/DirectoryHelper.java
@@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.TextSecureDirectory;
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
import org.thoughtcrime.securesms.recipients.Recipients;
import org.whispersystems.textsecure.api.TextSecureAccountManager;
-import org.whispersystems.textsecure.push.ContactTokenDetails;
+import org.whispersystems.textsecure.api.push.ContactTokenDetails;
import org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.util.List;
diff --git a/src/org/thoughtcrime/securesms/util/GroupUtil.java b/src/org/thoughtcrime/securesms/util/GroupUtil.java
index ccebccff2d..c0562f0fc8 100644
--- a/src/org/thoughtcrime/securesms/util/GroupUtil.java
+++ b/src/org/thoughtcrime/securesms/util/GroupUtil.java
@@ -7,7 +7,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
import java.io.IOException;
import java.util.List;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
public class GroupUtil {