Put everything under either internal or api.

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.api.push.SignedPreKeyEntity;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
 
 import java.io.IOException;
 import java.util.LinkedList;

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.api.push.PushAddress;
-import org.whispersystems.textsecure.push.exceptions.NotFoundException;
+import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
 
 import java.io.IOException;
 

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 {

libtextsecure/protobuf/Makefile

@@ -1,3 +1,3 @@
 
 all:
-	protoc --java_out=../src/ IncomingPushMessageSignal.proto
+	protoc --java_out=../src/main/java/ IncomingPushMessageSignal.proto

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;

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.api.push.ContactTokenDetails;
-import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
-import org.whispersystems.textsecure.push.SignedPreKeyEntity;
+import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
 
 import java.io.IOException;
 import java.util.List;

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;

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.api.push.PushAddress;
-import org.whispersystems.textsecure.push.OutgoingPushMessage;
+import org.whispersystems.textsecure.internal.push.MismatchedDevices;
-import org.whispersystems.textsecure.push.OutgoingPushMessageList;
+import org.whispersystems.textsecure.internal.push.OutgoingPushMessage;
-import org.whispersystems.textsecure.push.PushAddress;
+import org.whispersystems.textsecure.internal.push.OutgoingPushMessageList;
-import org.whispersystems.textsecure.push.PushAttachmentData;
+import org.whispersystems.textsecure.internal.push.PushAttachmentData;
-import org.whispersystems.textsecure.push.PushBody;
+import org.whispersystems.textsecure.internal.push.PushBody;
-import org.whispersystems.textsecure.push.PushServiceSocket;
+import org.whispersystems.textsecure.internal.push.PushServiceSocket;
-import org.whispersystems.textsecure.push.StaleDevices;
+import org.whispersystems.textsecure.internal.push.StaleDevices;
-import org.whispersystems.textsecure.push.UnregisteredUserException;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
-import org.whispersystems.textsecure.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
-import org.whispersystems.textsecure.push.exceptions.MismatchedDevicesException;
+import org.whispersystems.textsecure.internal.push.exceptions.MismatchedDevicesException;
-import org.whispersystems.textsecure.push.exceptions.StaleDevicesException;
+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.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
 
 public class TextSecureMessageSender {
 

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.internal.push.PushMessageProtos.PushMessageContent;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.DELIVER;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.DELIVER;
 
 public class TextSecureCipher {
 

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;
 

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;
 

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 {
 

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;

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) {

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;
 

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 {
 }

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;
 

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);
+  }
+}

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;
 

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);
+  }
+}

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;

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 {
 

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;
 

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;
 

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;
 

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 <http://www.gnu.org/licenses/>.
  */
-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 {

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;
 

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;

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;

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;

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;
 

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 {
 

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;
 

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;

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 {
 

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;
 

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 <http://www.gnu.org/licenses/>.
  */
-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.api.push.exceptions.AuthorizationFailedException;
-import org.whispersystems.textsecure.push.exceptions.ExpectationFailedException;
+import org.whispersystems.textsecure.api.push.exceptions.ExpectationFailedException;
-import org.whispersystems.textsecure.push.exceptions.MismatchedDevicesException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
-import org.whispersystems.textsecure.push.exceptions.NotFoundException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.RateLimitException;
-import org.whispersystems.textsecure.push.exceptions.RateLimitException;
-import org.whispersystems.textsecure.push.exceptions.StaleDevicesException;
 import org.whispersystems.textsecure.internal.util.BlacklistingTrustManager;
 
 import java.io.File;

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 <http://www.gnu.org/licenses/>.
  */
-package org.whispersystems.textsecure.push;
+package org.whispersystems.textsecure.internal.push;
 
 import android.util.Log;
 

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;
 

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 {
 

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.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.internal.push.StaleDevices;
 
 public class StaleDevicesException extends NonSuccessfulResponseCodeException {
 

libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NotFoundException.java

@@ -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);
-  }
-}

libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/RateLimitException.java

@@ -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);
-  }
-}

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;
 

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

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

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

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.api.push.exceptions.ExpectationFailedException;
-import org.whispersystems.textsecure.push.exceptions.RateLimitException;
+import org.whispersystems.textsecure.api.push.exceptions.RateLimitException;
 import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
 
 import java.io.IOException;

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.

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 {
 

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;
 

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;
 

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;

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 {
 

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;
 

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.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
 
 public class GroupMessageProcessor {
 

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.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
 
 import java.io.File;
 import java.io.IOException;

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.internal.push.PushServiceSocket;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
 
 import java.io.File;
 import java.io.IOException;

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.api.push.SignedPreKeyEntity;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
 
 import java.io.IOException;
 import java.util.Collections;

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;
 

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.api.push.PushAddress;
-import org.whispersystems.textsecure.push.exceptions.NonSuccessfulResponseCodeException;
+import org.whispersystems.textsecure.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
 
 import java.io.IOException;
 

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 {
 

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.api.push.PushAddress;
-import org.whispersystems.textsecure.push.PushMessageProtos;
+import org.whispersystems.textsecure.internal.push.PushMessageProtos;
-import org.whispersystems.textsecure.push.exceptions.EncapsulatedExceptions;
+import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
 import org.whispersystems.textsecure.api.util.InvalidNumberException;
 
 import java.io.IOException;

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.api.push.PushAddress;
-import org.whispersystems.textsecure.push.UnregisteredUserException;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.textsecure.api.util.InvalidNumberException;
 
 import java.io.IOException;

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;
 

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;

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.api.push.PushAddress;
-import org.whispersystems.textsecure.push.UnregisteredUserException;
+import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
 import org.whispersystems.textsecure.api.util.InvalidNumberException;
 
 import java.io.IOException;

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.api.push.exceptions.NonSuccessfulResponseCodeException;
-import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
+import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
 
 import java.io.IOException;
 import java.util.List;

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 {
 

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;
 

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;

src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java

@@ -1,12 +1,6 @@
 package org.thoughtcrime.securesms.sms;
 
-import com.google.protobuf.ByteString;
+import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
-
-import org.thoughtcrime.securesms.util.GroupUtil;
-
-import java.io.IOException;
-
-import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
 
 public class IncomingGroupMessage extends IncomingTextMessage {
 

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;
 

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;
 

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;

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 {