From 7431302b6b85a4489aab0a1f28f0b2a8f77aca48 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Fri, 27 Feb 2015 17:56:33 -0800 Subject: [PATCH] Move into 'java' and 'android' modules. --- android/build.gradle | 53 +++++++++++++++++ {src => android/src}/main/AndroidManifest.xml | 0 build.gradle | 58 +++---------------- java/build.gradle | 44 ++++++++++++++ .../push/PushTransportDetailsTest.java | 0 .../api/TextSecureAccountManager.java | 0 .../textsecure/api/TextSecureMessagePipe.java | 0 .../api/TextSecureMessageReceiver.java | 0 .../api/TextSecureMessageSender.java | 0 .../crypto/AttachmentCipherInputStream.java | 0 .../crypto/AttachmentCipherOutputStream.java | 0 .../api/crypto/TextSecureCipher.java | 0 .../crypto/UntrustedIdentityException.java | 0 .../api/messages/TextSecureAttachment.java | 0 .../messages/TextSecureAttachmentPointer.java | 0 .../messages/TextSecureAttachmentStream.java | 0 .../api/messages/TextSecureEnvelope.java | 0 .../api/messages/TextSecureGroup.java | 0 .../api/messages/TextSecureMessage.java | 0 .../api/push/ContactTokenDetails.java | 0 .../api/push/SignedPreKeyEntity.java | 0 .../api/push/TextSecureAddress.java | 0 .../textsecure/api/push/TrustStore.java | 0 .../AuthorizationFailedException.java | 0 .../exceptions/EncapsulatedExceptions.java | 0 .../ExpectationFailedException.java | 0 .../exceptions/NetworkFailureException.java | 0 .../NonSuccessfulResponseCodeException.java | 0 .../push/exceptions/NotFoundException.java | 0 .../push/exceptions/PushNetworkException.java | 0 .../push/exceptions/RateLimitException.java | 0 .../exceptions/UnregisteredUserException.java | 0 .../api/util/CredentialsProvider.java | 0 .../api/util/InvalidNumberException.java | 0 .../api/util/PhoneNumberFormatter.java | 0 .../internal/crypto/ProvisioningCipher.java | 0 .../internal/push/AccountAttributes.java | 0 .../push/ContactTokenDetailsList.java | 0 .../internal/push/ContactTokenList.java | 0 .../textsecure/internal/push/DeviceCode.java | 0 .../internal/push/MismatchedDevices.java | 0 .../internal/push/OutgoingPushMessage.java | 0 .../push/OutgoingPushMessageList.java | 0 .../internal/push/PreKeyEntity.java | 0 .../internal/push/PreKeyResponse.java | 0 .../internal/push/PreKeyResponseItem.java | 0 .../textsecure/internal/push/PreKeyState.java | 0 .../internal/push/PreKeyStatus.java | 0 .../internal/push/ProvisioningMessage.java | 0 .../internal/push/ProvisioningProtos.java | 0 .../internal/push/PushAttachmentData.java | 0 .../textsecure/internal/push/PushBody.java | 0 .../internal/push/PushMessageProtos.java | 0 .../internal/push/PushServiceSocket.java | 0 .../internal/push/PushTransportDetails.java | 0 .../internal/push/SendMessageResponse.java | 0 .../internal/push/StaleDevices.java | 0 .../MismatchedDevicesException.java | 0 .../exceptions/StaleDevicesException.java | 0 .../textsecure/internal/util/Base64.java | 0 .../util/BlacklistingTrustManager.java | 0 .../textsecure/internal/util/Hex.java | 0 .../textsecure/internal/util/JsonUtil.java | 0 .../util/StaticCredentialsProvider.java | 0 .../textsecure/internal/util/Util.java | 0 .../websocket/OkHttpClientWrapper.java | 0 .../websocket/WebSocketConnection.java | 0 .../websocket/WebSocketEventListener.java | 0 .../internal/websocket/WebSocketProtos.java | 0 settings.gradle | 1 + 70 files changed, 107 insertions(+), 49 deletions(-) create mode 100644 android/build.gradle rename {src => android/src}/main/AndroidManifest.xml (100%) create mode 100644 java/build.gradle rename {src => java/src}/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/TextSecureMessagePipe.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/messages/TextSecureGroup.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/messages/TextSecureMessage.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/TextSecureAddress.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/TrustStore.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/NetworkFailureException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/util/CredentialsProvider.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/util/InvalidNumberException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/crypto/ProvisioningCipher.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/DeviceCode.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/ProvisioningMessage.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/ProvisioningProtos.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PushBody.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/SendMessageResponse.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/util/Base64.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/util/BlacklistingTrustManager.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/util/Hex.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/util/JsonUtil.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/util/StaticCredentialsProvider.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/util/Util.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/websocket/OkHttpClientWrapper.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketConnection.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketEventListener.java (100%) rename {src => java/src}/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketProtos.java (100%) create mode 100644 settings.gradle diff --git a/android/build.gradle b/android/build.gradle new file mode 100644 index 0000000000..9081c1f25b --- /dev/null +++ b/android/build.gradle @@ -0,0 +1,53 @@ +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:1.1.0' + } +} + +apply plugin: 'com.android.library' +apply plugin: 'maven' + +repositories { + mavenCentral() + mavenLocal() +} + +dependencies { + compile 'org.whispersystems:axolotl-android:1.1.1' + compile (project(':java')) { + exclude group: 'org.whispersystems', module: 'axolotl-java' + } +} + +android { + compileSdkVersion 21 + buildToolsVersion '21.1.2' + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } +} + +tasks.whenTaskAdded { task -> + if (task.name.equals("lint")) { + task.enabled = false + } +} + +version '0.1' +group 'org.whispersystems.textsecure' +archivesBaseName = 'libtextsecure' + +uploadArchives { + repositories { + mavenDeployer { + repository(url: mavenLocal().getUrl()) + } + } +} + diff --git a/src/main/AndroidManifest.xml b/android/src/main/AndroidManifest.xml similarity index 100% rename from src/main/AndroidManifest.xml rename to android/src/main/AndroidManifest.xml diff --git a/build.gradle b/build.gradle index 4c6212f32c..bb0cd956f1 100644 --- a/build.gradle +++ b/build.gradle @@ -1,53 +1,13 @@ -buildscript { - repositories { - mavenCentral() - } +subprojects { + ext.version_number = "1.0.0" + ext.group_info = "org.whispersystems" + ext.axolotl_version = "1.1.1" - dependencies { - classpath 'com.android.tools.build:gradle:1.0.0' - } -} - -apply plugin: 'com.android.library' -apply plugin: 'maven' - -repositories { - mavenCentral() -} - -dependencies { - compile 'com.google.protobuf:protobuf-java:2.5.0' - compile 'com.googlecode.libphonenumber:libphonenumber:6.1' - compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0' - - compile 'org.whispersystems:axolotl-android:1.0.0' - compile 'com.squareup.okhttp:okhttp:2.2.0' -} - -android { - compileSdkVersion 21 - buildToolsVersion '21.1.2' - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - -tasks.whenTaskAdded { task -> - if (task.name.equals("lint")) { - task.enabled = false - } -} - -version '0.1' -group 'org.whispersystems.textsecure' -archivesBaseName = 'libtextsecure' - -uploadArchives { - repositories { - mavenDeployer { - repository(url: mavenLocal().getUrl()) + if (JavaVersion.current().isJava8Compatible()) { + allprojects { + tasks.withType(Javadoc) { + options.addStringOption('Xdoclint:none', '-quiet') + } } } } diff --git a/java/build.gradle b/java/build.gradle new file mode 100644 index 0000000000..eb914ef8f0 --- /dev/null +++ b/java/build.gradle @@ -0,0 +1,44 @@ +buildscript { + repositories { + mavenCentral() + } + + dependencies { + classpath 'com.android.tools.build:gradle:1.1.0' + } +} + +apply plugin: 'java' +apply plugin: 'maven' + +repositories { + mavenCentral() +} + +dependencies { + compile 'com.google.protobuf:protobuf-java:2.5.0' + compile 'com.googlecode.libphonenumber:libphonenumber:6.1' + compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0' + + compile 'org.whispersystems:axolotl-java:1.1.1' + compile 'com.squareup.okhttp:okhttp:2.2.0' +} + + +tasks.whenTaskAdded { task -> + if (task.name.equals("lint")) { + task.enabled = false + } +} + +version '0.1' +group 'org.whispersystems.textsecure' +archivesBaseName = 'libtextsecure' + +uploadArchives { + repositories { + mavenDeployer { + repository(url: mavenLocal().getUrl()) + } + } +} diff --git a/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java b/java/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java similarity index 100% rename from src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java rename to java/src/androidTest/java/org/whispersystems/textsecure/push/PushTransportDetailsTest.java diff --git a/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java b/java/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java rename to java/src/main/java/org/whispersystems/textsecure/api/TextSecureAccountManager.java diff --git a/src/main/java/org/whispersystems/textsecure/api/TextSecureMessagePipe.java b/java/src/main/java/org/whispersystems/textsecure/api/TextSecureMessagePipe.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/TextSecureMessagePipe.java rename to java/src/main/java/org/whispersystems/textsecure/api/TextSecureMessagePipe.java diff --git a/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java b/java/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java rename to java/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageReceiver.java diff --git a/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java b/java/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java rename to java/src/main/java/org/whispersystems/textsecure/api/TextSecureMessageSender.java diff --git a/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java b/java/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java rename to java/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherInputStream.java diff --git a/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java b/java/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java rename to java/src/main/java/org/whispersystems/textsecure/api/crypto/AttachmentCipherOutputStream.java diff --git a/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java b/java/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java rename to java/src/main/java/org/whispersystems/textsecure/api/crypto/TextSecureCipher.java diff --git a/src/main/java/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java b/java/src/main/java/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java rename to java/src/main/java/org/whispersystems/textsecure/api/crypto/UntrustedIdentityException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java b/java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java rename to java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachment.java diff --git a/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java b/java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java rename to java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentPointer.java diff --git a/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java b/java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java rename to java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureAttachmentStream.java diff --git a/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java b/java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java rename to java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureEnvelope.java diff --git a/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureGroup.java b/java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureGroup.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/messages/TextSecureGroup.java rename to java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureGroup.java diff --git a/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureMessage.java b/java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureMessage.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/messages/TextSecureMessage.java rename to java/src/main/java/org/whispersystems/textsecure/api/messages/TextSecureMessage.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java b/java/src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/ContactTokenDetails.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java b/java/src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/SignedPreKeyEntity.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/TextSecureAddress.java b/java/src/main/java/org/whispersystems/textsecure/api/push/TextSecureAddress.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/TextSecureAddress.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/TextSecureAddress.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/TrustStore.java b/java/src/main/java/org/whispersystems/textsecure/api/push/TrustStore.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/TrustStore.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/TrustStore.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/AuthorizationFailedException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/EncapsulatedExceptions.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/ExpectationFailedException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NetworkFailureException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NetworkFailureException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/NetworkFailureException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NetworkFailureException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NonSuccessfulResponseCodeException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/NotFoundException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/PushNetworkException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/RateLimitException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java b/java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java rename to java/src/main/java/org/whispersystems/textsecure/api/push/exceptions/UnregisteredUserException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/util/CredentialsProvider.java b/java/src/main/java/org/whispersystems/textsecure/api/util/CredentialsProvider.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/util/CredentialsProvider.java rename to java/src/main/java/org/whispersystems/textsecure/api/util/CredentialsProvider.java diff --git a/src/main/java/org/whispersystems/textsecure/api/util/InvalidNumberException.java b/java/src/main/java/org/whispersystems/textsecure/api/util/InvalidNumberException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/util/InvalidNumberException.java rename to java/src/main/java/org/whispersystems/textsecure/api/util/InvalidNumberException.java diff --git a/src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java b/java/src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java rename to java/src/main/java/org/whispersystems/textsecure/api/util/PhoneNumberFormatter.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/crypto/ProvisioningCipher.java b/java/src/main/java/org/whispersystems/textsecure/internal/crypto/ProvisioningCipher.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/crypto/ProvisioningCipher.java rename to java/src/main/java/org/whispersystems/textsecure/internal/crypto/ProvisioningCipher.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/AccountAttributes.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenDetailsList.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/ContactTokenList.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/DeviceCode.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/DeviceCode.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/DeviceCode.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/DeviceCode.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/MismatchedDevices.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessage.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/OutgoingPushMessageList.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyEntity.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponse.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyResponseItem.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyState.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PreKeyStatus.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningMessage.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningMessage.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningMessage.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningMessage.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningProtos.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningProtos.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningProtos.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/ProvisioningProtos.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PushAttachmentData.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PushBody.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PushMessageProtos.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PushServiceSocket.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/PushTransportDetails.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/SendMessageResponse.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/SendMessageResponse.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/SendMessageResponse.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/SendMessageResponse.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/StaleDevices.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/MismatchedDevicesException.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java b/java/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java rename to java/src/main/java/org/whispersystems/textsecure/internal/push/exceptions/StaleDevicesException.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/util/Base64.java b/java/src/main/java/org/whispersystems/textsecure/internal/util/Base64.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/util/Base64.java rename to java/src/main/java/org/whispersystems/textsecure/internal/util/Base64.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/util/BlacklistingTrustManager.java b/java/src/main/java/org/whispersystems/textsecure/internal/util/BlacklistingTrustManager.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/util/BlacklistingTrustManager.java rename to java/src/main/java/org/whispersystems/textsecure/internal/util/BlacklistingTrustManager.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/util/Hex.java b/java/src/main/java/org/whispersystems/textsecure/internal/util/Hex.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/util/Hex.java rename to java/src/main/java/org/whispersystems/textsecure/internal/util/Hex.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/util/JsonUtil.java b/java/src/main/java/org/whispersystems/textsecure/internal/util/JsonUtil.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/util/JsonUtil.java rename to java/src/main/java/org/whispersystems/textsecure/internal/util/JsonUtil.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/util/StaticCredentialsProvider.java b/java/src/main/java/org/whispersystems/textsecure/internal/util/StaticCredentialsProvider.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/util/StaticCredentialsProvider.java rename to java/src/main/java/org/whispersystems/textsecure/internal/util/StaticCredentialsProvider.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/util/Util.java b/java/src/main/java/org/whispersystems/textsecure/internal/util/Util.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/util/Util.java rename to java/src/main/java/org/whispersystems/textsecure/internal/util/Util.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/websocket/OkHttpClientWrapper.java b/java/src/main/java/org/whispersystems/textsecure/internal/websocket/OkHttpClientWrapper.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/websocket/OkHttpClientWrapper.java rename to java/src/main/java/org/whispersystems/textsecure/internal/websocket/OkHttpClientWrapper.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketConnection.java b/java/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketConnection.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketConnection.java rename to java/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketConnection.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketEventListener.java b/java/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketEventListener.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketEventListener.java rename to java/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketEventListener.java diff --git a/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketProtos.java b/java/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketProtos.java similarity index 100% rename from src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketProtos.java rename to java/src/main/java/org/whispersystems/textsecure/internal/websocket/WebSocketProtos.java diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000000..d0f6114229 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':java', ':android' \ No newline at end of file