Skip to content

Commit fb31319

Browse files
moxie0moxie0
committed
Put everything under either internal or api.
1 parent 08ed90c commit fb31319

77 files changed

Lines changed: 377 additions & 384 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎androidTest/java/org/thoughtcrime/securesms/jobs/CleanPreKeysJobTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
99
import org.whispersystems.libaxolotl.state.SignedPreKeyStore;
1010
import org.whispersystems.textsecure.api.TextSecureAccountManager;
11-
import org.whispersystems.textsecure.push.SignedPreKeyEntity;
12-
import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
11+
import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
12+
import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
1313

1414
import java.io.IOException;
1515
import java.util.LinkedList;

‎androidTest/java/org/thoughtcrime/securesms/jobs/DeliveryReceiptJobTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
import org.mockito.Mockito;
77
import org.thoughtcrime.securesms.crypto.MasterSecret;
88
import org.whispersystems.textsecure.api.TextSecureMessageSender;
9-
import org.whispersystems.textsecure.push.PushAddress;
10-
import org.whispersystems.textsecure.push.exceptions.NotFoundException;
11-
import org.whispersystems.textsecure.push.exceptions.PushNetworkException;
9+
import org.whispersystems.textsecure.api.push.PushAddress;
10+
import org.whispersystems.textsecure.api.push.exceptions.NotFoundException;
11+
import org.whispersystems.textsecure.api.push.exceptions.PushNetworkException;
1212

1313
import java.io.IOException;
1414

‎libtextsecure/protobuf/IncomingPushMessageSignal.proto‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package textsecure;
22

3-
option java_package = "org.whispersystems.textsecure.push";
3+
option java_package = "org.whispersystems.textsecure.internal.push";
44
option java_outer_classname = "PushMessageProtos";
55

66
message IncomingPushMessageSignal {

‎libtextsecure/protobuf/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11

22
all:
3-
protoc --java_out=../src/ IncomingPushMessageSignal.proto
3+
protoc --java_out=../src/main/java/ IncomingPushMessageSignal.proto

‎libtextsecure/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
package org.whispersystems.textsecure.push;
22

33
import android.test.AndroidTestCase;
4-
import android.util.Base64;
4+
5+
import org.whispersystems.textsecure.internal.push.PushTransportDetails;
56

67
import java.security.NoSuchAlgorithmException;
78
import java.security.SecureRandom;

‎libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@
2020
import org.whispersystems.libaxolotl.state.PreKeyRecord;
2121
import org.whispersystems.libaxolotl.state.SignedPreKeyRecord;
2222
import org.whispersystems.libaxolotl.util.guava.Optional;
23-
import org.whispersystems.textsecure.push.ContactTokenDetails;
24-
import org.whispersystems.textsecure.push.PushServiceSocket;
25-
import org.whispersystems.textsecure.push.SignedPreKeyEntity;
23+
import org.whispersystems.textsecure.api.push.ContactTokenDetails;
24+
import org.whispersystems.textsecure.internal.push.PushServiceSocket;
25+
import org.whispersystems.textsecure.api.push.SignedPreKeyEntity;
2626

2727
import java.io.IOException;
2828
import java.util.List;

‎libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
import org.whispersystems.libaxolotl.InvalidMessageException;
2020
import org.whispersystems.textsecure.api.crypto.AttachmentCipherInputStream;
2121
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentPointer;
22-
import org.whispersystems.textsecure.push.PushServiceSocket;
22+
import org.whispersystems.textsecure.internal.push.PushServiceSocket;
2323

2424
import java.io.File;
2525
import java.io.IOException;

‎libtextsecure/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -32,28 +32,28 @@
3232
import org.whispersystems.textsecure.api.messages.TextSecureAttachmentStream;
3333
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
3434
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
35-
import org.whispersystems.textsecure.push.MismatchedDevices;
36-
import org.whispersystems.textsecure.push.OutgoingPushMessage;
37-
import org.whispersystems.textsecure.push.OutgoingPushMessageList;
38-
import org.whispersystems.textsecure.push.PushAddress;
39-
import org.whispersystems.textsecure.push.PushAttachmentData;
40-
import org.whispersystems.textsecure.push.PushBody;
41-
import org.whispersystems.textsecure.push.PushServiceSocket;
42-
import org.whispersystems.textsecure.push.StaleDevices;
43-
import org.whispersystems.textsecure.push.UnregisteredUserException;
44-
import org.whispersystems.textsecure.push.exceptions.EncapsulatedExceptions;
45-
import org.whispersystems.textsecure.push.exceptions.MismatchedDevicesException;
46-
import org.whispersystems.textsecure.push.exceptions.StaleDevicesException;
35+
import org.whispersystems.textsecure.api.push.PushAddress;
36+
import org.whispersystems.textsecure.internal.push.MismatchedDevices;
37+
import org.whispersystems.textsecure.internal.push.OutgoingPushMessage;
38+
import org.whispersystems.textsecure.internal.push.OutgoingPushMessageList;
39+
import org.whispersystems.textsecure.internal.push.PushAttachmentData;
40+
import org.whispersystems.textsecure.internal.push.PushBody;
41+
import org.whispersystems.textsecure.internal.push.PushServiceSocket;
42+
import org.whispersystems.textsecure.internal.push.StaleDevices;
43+
import org.whispersystems.textsecure.api.push.exceptions.UnregisteredUserException;
44+
import org.whispersystems.textsecure.api.push.exceptions.EncapsulatedExceptions;
45+
import org.whispersystems.textsecure.internal.push.exceptions.MismatchedDevicesException;
46+
import org.whispersystems.textsecure.internal.push.exceptions.StaleDevicesException;
4747
import org.whispersystems.textsecure.internal.util.Util;
4848

4949
import java.io.IOException;
5050
import java.util.LinkedList;
5151
import java.util.List;
5252

53-
import static org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal.Type;
54-
import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent;
55-
import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
56-
import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext;
53+
import static org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal.Type;
54+
import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent;
55+
import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.AttachmentPointer;
56+
import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext;
5757

5858
public class TextSecureMessageSender {
5959

‎libtextsecure/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,13 +36,13 @@
3636
import org.whispersystems.textsecure.api.messages.TextSecureEnvelope;
3737
import org.whispersystems.textsecure.api.messages.TextSecureGroup;
3838
import org.whispersystems.textsecure.api.messages.TextSecureMessage;
39-
import org.whispersystems.textsecure.push.PushTransportDetails;
39+
import org.whispersystems.textsecure.internal.push.PushTransportDetails;
4040

4141
import java.util.LinkedList;
4242
import java.util.List;
4343

44-
import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent;
45-
import static org.whispersystems.textsecure.push.PushMessageProtos.PushMessageContent.GroupContext.Type.DELIVER;
44+
import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent;
45+
import static org.whispersystems.textsecure.internal.push.PushMessageProtos.PushMessageContent.GroupContext.Type.DELIVER;
4646

4747
public class TextSecureCipher {
4848

‎libtextsecure/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.google.protobuf.ByteString;
2222

2323
import org.whispersystems.libaxolotl.InvalidVersionException;
24-
import org.whispersystems.textsecure.push.PushMessageProtos.IncomingPushMessageSignal;
24+
import org.whispersystems.textsecure.internal.push.PushMessageProtos.IncomingPushMessageSignal;
2525
import org.whispersystems.textsecure.internal.util.Base64;
2626
import org.whispersystems.textsecure.internal.util.Hex;
2727

0 commit comments

Comments
 (0)