TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put everything under either internal or api.

Browse Source
This commit is contained in:
Moxie Marlinspike 2014-11-12 11:35:54 -08:00
parent 08ed90c5ec
commit fb31319e52
77 changed files with 377 additions and 384 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java
View File

@ -8,8 +8,8 @@ import org.whispersystems.libaxolotl.ecc.Curve;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyStore; import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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.io.IOException;
import java.util.LinkedList; import java.util.LinkedList;

6
androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java
View File

@ -6,9 +6,9 @@ import org.mockito.ArgumentCaptor;
import org.mockito.Mockito; import org.mockito.Mockito;
import org.thoughtcrime.securesms.crypto.MasterSecret; import org.thoughtcrime.securesms.crypto.MasterSecret;
import org.whispersystems.textsecure.api.TextSecureMessageSender; 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; import java.io.IOException;

2
libtextsecure/protobuf/IncomingPushMessageSignal.proto
View File

@ -1,6 +1,6 @@
package textsecure; package textsecure;
option java_package = "org.whispersystems.textsecure.push"; option java_package = "org.whispersystems.textsecure.internal.push";
option java_outer_classname = "PushMessageProtos"; option java_outer_classname = "PushMessageProtos";
message IncomingPushMessageSignal { message IncomingPushMessageSignal {

2
libtextsecure/protobuf/Makefile
View File

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

3
libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java
View File

@ -1,7 +1,8 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.push;
import android.test.AndroidTestCase; import android.test.AndroidTestCase;
import android.util.Base64;
import org.whispersystems.textsecure.internal.push.PushTransportDetails;
import java.security.NoSuchAlgorithmException; import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;

6
libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java
View File

@ -20,9 +20,9 @@ import org.whispersystems.libaxolotl.IdentityKey;
import org.whispersystems.libaxolotl.state.PreKeyRecord; import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.util.guava.Optional; 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.io.IOException;
import java.util.List; import java.util.List;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java
View File

@ -19,7 +19,7 @@ package org.whispersystems.textsecure.api;
import org.whispersystems.libaxolotl.InvalidMessageException; import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.textsecure.api.crypto.AttachmentCipherInputStream; import org.whispersystems.textsecure.api.crypto.AttachmentCipherInputStream;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer; 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.File;
import java.io.IOException; import java.io.IOException;

32
libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java
View File

@ -32,28 +32,28 @@ import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream; import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
import org.whispersystems.textsecure.api.messages.TextSecureGroup; import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.api.messages.TextSecureMessage; 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 org.whispersystems.textsecure.internal.util.Util;
import java.io.IOException; import java.io.IOException;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; 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 { public class TextSecureMessageSender {

6
libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java
View File

@ -36,13 +36,13 @@ import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer;
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope; import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
import org.whispersystems.textsecure.api.messages.TextSecureGroup; import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.api.messages.TextSecureMessage; 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.LinkedList;
import java.util.List; 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 { public class TextSecureCipher {

2
libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java
View File

@ -21,7 +21,7 @@ import android.util.Log;
import com.google.protobuf.ByteString; import com.google.protobuf.ByteString;
import org.whispersystems.libaxolotl.InvalidVersionException; 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.Base64;
import org.whispersystems.textsecure.internal.util.Hex; import org.whispersystems.textsecure.internal.util.Hex;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetails.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.api.push;
import com.google.thoughtcrimegson.Gson; import com.google.thoughtcrimegson.Gson;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAddress.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/PushAddress.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.api.push;
public class PushAddress { public class PushAddress {

3
libtextsecure/src/main/java/org/whispersystems/textsecure/push/SignedPreKeyEntity.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.api.push;
import com.google.thoughtcrimegson.GsonBuilder; import com.google.thoughtcrimegson.GsonBuilder;
import com.google.thoughtcrimegson.JsonDeserializationContext; import com.google.thoughtcrimegson.JsonDeserializationContext;
@ -11,6 +11,7 @@ import com.google.thoughtcrimegson.JsonSerializer;
import org.whispersystems.libaxolotl.ecc.ECPublicKey; import org.whispersystems.libaxolotl.ecc.ECPublicKey;
import org.whispersystems.textsecure.internal.util.Base64; import org.whispersystems.textsecure.internal.util.Base64;
import org.whispersystems.textsecure.internal.push.PreKeyEntity;
import java.io.IOException; import java.io.IOException;
import java.lang.reflect.Type; import java.lang.reflect.Type;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/AuthorizationFailedException.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push.exceptions; package org.whispersystems.textsecure.api.push.exceptions;
public class AuthorizationFailedException extends NonSuccessfulResponseCodeException { public class AuthorizationFailedException extends NonSuccessfulResponseCodeException {
public AuthorizationFailedException(String s) { public AuthorizationFailedException(String s) {

3
libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/EncapsulatedExceptions.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java
View File

@ -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.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.push.UnregisteredUserException;
import java.util.List; import java.util.List;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/ExpectationFailedException.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push.exceptions; package org.whispersystems.textsecure.api.push.exceptions;
public class ExpectationFailedException extends NonSuccessfulResponseCodeException { public class ExpectationFailedException extends NonSuccessfulResponseCodeException {
} }

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/NonSuccessfulResponseCodeException.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push.exceptions; package org.whispersystems.textsecure.api.push.exceptions;
import java.io.IOException; import java.io.IOException;

7
libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java Normal file
View File

@ -0,0 +1,7 @@
package org.whispersystems.textsecure.api.push.exceptions;
public class NotFoundException extends NonSuccessfulResponseCodeException {
public NotFoundException(String s) {
super(s);
}
}

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/PushNetworkException.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push.exceptions; package org.whispersystems.textsecure.api.push.exceptions;
import java.io.IOException; import java.io.IOException;

8
libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java Normal file
View File

@ -0,0 +1,8 @@
package org.whispersystems.textsecure.api.push.exceptions;
public class RateLimitException extends NonSuccessfulResponseCodeException {
public RateLimitException(String s) {
super(s);
}
}

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/UnregisteredUserException.java → libtextsecure/src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.api.push.exceptions;
import java.io.IOException; import java.io.IOException;
import java.util.List; import java.util.List;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/AccountAttributes.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
public class AccountAttributes { public class AccountAttributes {

4
libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenDetailsList.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java
View File

@ -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; import java.util.List;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/ContactTokenList.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import java.util.List; import java.util.List;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/MismatchedDevices.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import java.util.List; import java.util.List;

3
libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessage.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java
View File

@ -14,9 +14,10 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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; import org.whispersystems.textsecure.internal.util.Base64;
public class OutgoingPushMessage { public class OutgoingPushMessage {

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/OutgoingPushMessageList.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import java.util.List; import java.util.List;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyEntity.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder; import com.google.thoughtcrimegson.GsonBuilder;
import com.google.thoughtcrimegson.JsonDeserializationContext; import com.google.thoughtcrimegson.JsonDeserializationContext;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponse.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder; import com.google.thoughtcrimegson.GsonBuilder;
import com.google.thoughtcrimegson.JsonDeserializationContext; import com.google.thoughtcrimegson.JsonDeserializationContext;

4
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyResponseItem.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java
View File

@ -1,7 +1,9 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder; import com.google.thoughtcrimegson.GsonBuilder;
import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
public class PreKeyResponseItem { public class PreKeyResponseItem {
private int deviceId; private int deviceId;

3
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyState.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java
View File

@ -1,8 +1,9 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import com.google.thoughtcrimegson.GsonBuilder; import com.google.thoughtcrimegson.GsonBuilder;
import org.whispersystems.libaxolotl.IdentityKey; import org.whispersystems.libaxolotl.IdentityKey;
import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
import java.util.List; import java.util.List;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PreKeyStatus.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
public class PreKeyStatus { public class PreKeyStatus {

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentData.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import java.io.InputStream; import java.io.InputStream;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushAttachmentPointer.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentPointer.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import android.os.Parcel; import android.os.Parcel;
import android.os.Parcelable; import android.os.Parcelable;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushBody.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
public class PushBody { public class PushBody {

462
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageProtos.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java
View File

File diff suppressed because it is too large Load Diff

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushMessageResponse.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageResponse.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import java.util.List; import java.util.List;

22
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushServiceSocket.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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; 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.PreKeyBundle;
import org.whispersystems.libaxolotl.state.PreKeyRecord; import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; 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.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.Base64;
import org.whispersystems.textsecure.internal.util.Util; 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 org.whispersystems.textsecure.internal.util.BlacklistingTrustManager;
import java.io.File; import java.io.File;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/PushTransportDetails.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java
View File

@ -14,7 +14,7 @@
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>. * 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; import android.util.Log;

2
libtextsecure/src/main/java/org/whispersystems/textsecure/push/StaleDevices.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java
View File

@ -1,4 +1,4 @@
package org.whispersystems.textsecure.push; package org.whispersystems.textsecure.internal.push;
import java.util.List; import java.util.List;

5
libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/MismatchedDevicesException.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java
View File

@ -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 { public class MismatchedDevicesException extends NonSuccessfulResponseCodeException {

6
libtextsecure/src/main/java/org/whispersystems/textsecure/push/exceptions/StaleDevicesException.java → libtextsecure/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java
View File

@ -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 { public class StaleDevicesException extends NonSuccessfulResponseCodeException {

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

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

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

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

2
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@ -67,7 +67,7 @@ import org.thoughtcrime.securesms.util.Trimmer;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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; import java.io.IOException;

2
src/org/thoughtcrime/securesms/AutoInitiateActivity.java
View File

@ -33,7 +33,7 @@ import org.thoughtcrime.securesms.recipients.Recipient;
import org.thoughtcrime.securesms.util.MemoryCleaner; import org.thoughtcrime.securesms.util.MemoryCleaner;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.whispersystems.libaxolotl.state.SessionStore; 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 * Activity which prompts the user to initiate a secure

4
src/org/thoughtcrime/securesms/ConversationActivity.java
View File

@ -108,7 +108,7 @@ import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.libaxolotl.InvalidMessageException; import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.libaxolotl.state.SessionStore; 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.io.IOException;
import java.util.LinkedList; 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.database.GroupDatabase.GroupRecord;
import static org.thoughtcrime.securesms.recipients.Recipient.RecipientModifiedListener; 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 * Activity for displaying a message thread, as well as

2
src/org/thoughtcrime/securesms/GroupCreateActivity.java
View File

@ -80,7 +80,7 @@ import java.util.Set;
import ws.com.google.android.mms.MmsException; import ws.com.google.android.mms.MmsException;
import static org.thoughtcrime.securesms.contacts.ContactAccessor.ContactData; 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 * Activity to create and update groups

4
src/org/thoughtcrime/securesms/RegistrationProgressActivity.java
View File

@ -38,8 +38,8 @@ import org.thoughtcrime.securesms.util.Dialogs;
import org.thoughtcrime.securesms.util.TextSecurePreferences; import org.thoughtcrime.securesms.util.TextSecurePreferences;
import org.thoughtcrime.securesms.util.Util; import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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 org.whispersystems.textsecure.api.util.PhoneNumberFormatter;
import java.io.IOException; import java.io.IOException;

2
src/org/thoughtcrime/securesms/VerifyIdentityActivity.java
View File

@ -32,7 +32,7 @@ import org.thoughtcrime.securesms.util.MemoryCleaner;
import org.whispersystems.libaxolotl.IdentityKey; import org.whispersystems.libaxolotl.IdentityKey;
import org.whispersystems.libaxolotl.state.SessionRecord; import org.whispersystems.libaxolotl.state.SessionRecord;
import org.whispersystems.libaxolotl.state.SessionStore; import org.whispersystems.libaxolotl.state.SessionStore;
import org.whispersystems.textsecure.push.PushAddress; import org.whispersystems.textsecure.api.push.PushAddress;
/** /**
* Activity for verifying identity keys. * Activity for verifying identity keys.

2
src/org/thoughtcrime/securesms/crypto/KeyExchangeInitiator.java
View File

@ -37,7 +37,7 @@ import org.whispersystems.libaxolotl.state.PreKeyStore;
import org.whispersystems.libaxolotl.state.SessionRecord; import org.whispersystems.libaxolotl.state.SessionRecord;
import org.whispersystems.libaxolotl.state.SessionStore; import org.whispersystems.libaxolotl.state.SessionStore;
import org.whispersystems.libaxolotl.state.SignedPreKeyStore; import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
import org.whispersystems.textsecure.push.PushAddress; import org.whispersystems.textsecure.api.push.PushAddress;
public class KeyExchangeInitiator { public class KeyExchangeInitiator {

2
src/org/thoughtcrime/securesms/crypto/MmsCipher.java
View File

@ -18,7 +18,7 @@ import org.whispersystems.libaxolotl.protocol.CiphertextMessage;
import org.whispersystems.libaxolotl.protocol.WhisperMessage; import org.whispersystems.libaxolotl.protocol.WhisperMessage;
import org.whispersystems.libaxolotl.state.AxolotlStore; import org.whispersystems.libaxolotl.state.AxolotlStore;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.push.PushAddress; import org.whispersystems.textsecure.api.push.PushAddress;
import java.io.IOException; import java.io.IOException;

2
src/org/thoughtcrime/securesms/crypto/SmsCipher.java
View File

@ -30,7 +30,7 @@ import org.whispersystems.libaxolotl.protocol.KeyExchangeMessage;
import org.whispersystems.libaxolotl.protocol.PreKeyWhisperMessage; import org.whispersystems.libaxolotl.protocol.PreKeyWhisperMessage;
import org.whispersystems.libaxolotl.protocol.WhisperMessage; import org.whispersystems.libaxolotl.protocol.WhisperMessage;
import org.whispersystems.libaxolotl.state.AxolotlStore; import org.whispersystems.libaxolotl.state.AxolotlStore;
import org.whispersystems.textsecure.push.PushAddress; import org.whispersystems.textsecure.api.push.PushAddress;
import java.io.IOException; import java.io.IOException;

2
src/org/thoughtcrime/securesms/crypto/storage/TextSecureSessionStore.java
View File

@ -9,7 +9,7 @@ import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.libaxolotl.state.SessionRecord; import org.whispersystems.libaxolotl.state.SessionRecord;
import org.whispersystems.libaxolotl.state.SessionState; import org.whispersystems.libaxolotl.state.SessionState;
import org.whispersystems.libaxolotl.state.SessionStore; 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 org.thoughtcrime.securesms.util.Conversions;
import java.io.File; import java.io.File;

4
src/org/thoughtcrime/securesms/database/GroupDatabase.java
View File

@ -8,7 +8,6 @@ import android.database.Cursor;
import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteDatabase;
import android.database.sqlite.SQLiteOpenHelper; import android.database.sqlite.SQLiteOpenHelper;
import android.graphics.Bitmap; import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.util.Log; import android.util.Log;
import org.thoughtcrime.securesms.recipients.Recipient; import org.thoughtcrime.securesms.recipients.Recipient;
@ -26,9 +25,6 @@ import java.security.NoSuchAlgorithmException;
import java.security.SecureRandom; import java.security.SecureRandom;
import java.util.LinkedList; import java.util.LinkedList;
import java.util.List; import java.util.List;
import java.util.Set;
import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
public class GroupDatabase extends Database { public class GroupDatabase extends Database {

2
src/org/thoughtcrime/securesms/database/TextSecureDirectory.java
View File

@ -9,7 +9,7 @@ import android.net.Uri;
import android.provider.ContactsContract.CommonDataKinds.Phone; import android.provider.ContactsContract.CommonDataKinds.Phone;
import android.util.Log; 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.InvalidNumberException;
import org.whispersystems.textsecure.api.util.PhoneNumberFormatter; import org.whispersystems.textsecure.api.util.PhoneNumberFormatter;

4
src/org/thoughtcrime/securesms/groups/GroupMessageProcessor.java
View File

@ -29,8 +29,8 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import static org.thoughtcrime.securesms.database.GroupDatabase.GroupRecord; 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 { public class GroupMessageProcessor {

4
src/org/thoughtcrime/securesms/jobs/AttachmentDownloadJob.java
View File

@ -18,8 +18,8 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.InvalidMessageException; import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.textsecure.api.TextSecureMessageReceiver; import org.whispersystems.textsecure.api.TextSecureMessageReceiver;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer; 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.File;
import java.io.IOException; import java.io.IOException;

4
src/org/thoughtcrime/securesms/jobs/AvatarDownloadJob.java
View File

@ -21,8 +21,8 @@ import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.jobqueue.requirements.NetworkRequirement; import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.InvalidMessageException; import org.whispersystems.libaxolotl.InvalidMessageException;
import org.whispersystems.textsecure.api.crypto.AttachmentCipherInputStream; 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.File;
import java.io.IOException; import java.io.IOException;

6
src/org/thoughtcrime/securesms/jobs/CleanPreKeysJob.java
View File

@ -11,9 +11,9 @@ import org.whispersystems.libaxolotl.InvalidKeyIdException;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyStore; import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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.io.IOException;
import java.util.Collections; import java.util.Collections;

2
src/org/thoughtcrime/securesms/jobs/CreateSignedPreKeyJob.java
View File

@ -15,7 +15,7 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.IdentityKeyPair; import org.whispersystems.libaxolotl.IdentityKeyPair;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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; import java.io.IOException;

11
src/org/thoughtcrime/securesms/jobs/DeliveryReceiptJob.java
View File

@ -3,18 +3,13 @@ package org.thoughtcrime.securesms.jobs;
import android.content.Context; import android.content.Context;
import android.util.Log; import android.util.Log;
import org.thoughtcrime.securesms.Release;
import org.thoughtcrime.securesms.dependencies.InjectableType; 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.JobParameters;
import org.whispersystems.jobqueue.requirements.NetworkRequirement; import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureMessageSender; 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; import java.io.IOException;

2
src/org/thoughtcrime/securesms/jobs/GcmRefreshJob.java
View File

@ -14,7 +14,7 @@ import org.whispersystems.jobqueue.JobParameters;
import org.whispersystems.jobqueue.requirements.NetworkRequirement; import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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 { public class GcmRefreshJob extends ContextJob {

6
src/org/thoughtcrime/securesms/jobs/PushGroupSendJob.java
View File

@ -24,9 +24,9 @@ import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment; import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureGroup; import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.api.messages.TextSecureMessage; 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 org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.IOException; import java.io.IOException;

4
src/org/thoughtcrime/securesms/jobs/PushMediaSendJob.java
View File

@ -24,8 +24,8 @@ import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException; import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment; import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureMessage; 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 org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.IOException; import java.io.IOException;

2
src/org/thoughtcrime/securesms/jobs/PushReceiveJob.java
View File

@ -12,7 +12,7 @@ import org.whispersystems.libaxolotl.InvalidVersionException;
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope; import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
import org.thoughtcrime.securesms.database.TextSecureDirectory; import org.thoughtcrime.securesms.database.TextSecureDirectory;
import org.thoughtcrime.securesms.database.NotInDirectoryException; import org.thoughtcrime.securesms.database.NotInDirectoryException;
import org.whispersystems.textsecure.push.ContactTokenDetails; import org.whispersystems.textsecure.api.push.ContactTokenDetails;
import java.io.IOException; import java.io.IOException;

2
src/org/thoughtcrime/securesms/jobs/PushSendJob.java
View File

@ -16,7 +16,7 @@ import org.whispersystems.jobqueue.requirements.NetworkRequirement;
import org.whispersystems.textsecure.api.messages.TextSecureAttachment; import org.whispersystems.textsecure.api.messages.TextSecureAttachment;
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream; import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
import org.thoughtcrime.securesms.database.TextSecureDirectory; 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 org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;

4
src/org/thoughtcrime/securesms/jobs/PushTextSendJob.java
View File

@ -22,8 +22,8 @@ import org.whispersystems.libaxolotl.state.AxolotlStore;
import org.whispersystems.textsecure.api.TextSecureMessageSender; import org.whispersystems.textsecure.api.TextSecureMessageSender;
import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException; import org.whispersystems.textsecure.api.crypto.UntrustedIdentityException;
import org.whispersystems.textsecure.api.messages.TextSecureMessage; 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 org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.io.IOException; import java.io.IOException;

4
src/org/thoughtcrime/securesms/jobs/RefreshPreKeysJob.java
View File

@ -16,8 +16,8 @@ import org.whispersystems.libaxolotl.IdentityKeyPair;
import org.whispersystems.libaxolotl.state.PreKeyRecord; import org.whispersystems.libaxolotl.state.PreKeyRecord;
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord; import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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.io.IOException;
import java.util.List; import java.util.List;

2
src/org/thoughtcrime/securesms/mms/OutgoingGroupMediaMessage.java
View File

@ -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.PduBody;
import ws.com.google.android.mms.pdu.PduPart; 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 { public class OutgoingGroupMediaMessage extends OutgoingSecureMediaMessage {

2
src/org/thoughtcrime/securesms/push/TextSecurePushTrustStore.java
View File

@ -3,7 +3,7 @@ package org.thoughtcrime.securesms.push;
import android.content.Context; import android.content.Context;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
import org.whispersystems.textsecure.push.PushServiceSocket; import org.whispersystems.textsecure.internal.push.PushServiceSocket;
import java.io.InputStream; import java.io.InputStream;

2
src/org/thoughtcrime/securesms/service/RegistrationService.java
View File

@ -26,7 +26,7 @@ import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
import org.whispersystems.libaxolotl.util.KeyHelper; import org.whispersystems.libaxolotl.util.KeyHelper;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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.io.IOException;
import java.util.List; import java.util.List;

8
src/org/thoughtcrime/securesms/sms/IncomingGroupMessage.java
View File

@ -1,12 +1,6 @@
package org.thoughtcrime.securesms.sms; 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 { public class IncomingGroupMessage extends IncomingTextMessage {

2
src/org/thoughtcrime/securesms/sms/IncomingTextMessage.java
View File

@ -7,7 +7,7 @@ import android.telephony.SmsMessage;
import org.thoughtcrime.securesms.util.GroupUtil; import org.thoughtcrime.securesms.util.GroupUtil;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.messages.TextSecureGroup; import org.whispersystems.textsecure.api.messages.TextSecureGroup;
import org.whispersystems.textsecure.push.PushAddress; import org.whispersystems.textsecure.api.push.PushAddress;
import java.util.List; import java.util.List;

2
src/org/thoughtcrime/securesms/sms/MessageSender.java
View File

@ -44,7 +44,7 @@ import org.thoughtcrime.securesms.util.Util;
import org.whispersystems.jobqueue.JobManager; import org.whispersystems.jobqueue.JobManager;
import org.whispersystems.libaxolotl.util.guava.Optional; import org.whispersystems.libaxolotl.util.guava.Optional;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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.thoughtcrime.securesms.util.DirectoryUtil;
import org.whispersystems.textsecure.api.util.InvalidNumberException; import org.whispersystems.textsecure.api.util.InvalidNumberException;

2
src/org/thoughtcrime/securesms/util/DirectoryHelper.java
View File

@ -10,7 +10,7 @@ import org.thoughtcrime.securesms.database.TextSecureDirectory;
import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory; import org.thoughtcrime.securesms.push.TextSecureCommunicationFactory;
import org.thoughtcrime.securesms.recipients.Recipients; import org.thoughtcrime.securesms.recipients.Recipients;
import org.whispersystems.textsecure.api.TextSecureAccountManager; 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 org.whispersystems.textsecure.api.util.InvalidNumberException;
import java.util.List; import java.util.List;

2
src/org/thoughtcrime/securesms/util/GroupUtil.java
View File

@ -7,7 +7,7 @@ import com.google.protobuf.InvalidProtocolBufferException;
import java.io.IOException; import java.io.IOException;
import java.util.List; 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 { public class GroupUtil {