Modernize libtextsecure layout

signalapp · Nov 12, 2014 · f9934bd · f9934bd
1 parent 1182052
commit f9934bd
Show file tree

Hide file tree

Showing 65 changed files with 0 additions and 136 deletions.
diff --git a/libtextsecure/build.gradle b/libtextsecure/build.gradle
@@ -35,27 +35,6 @@ android {
         sourceCompatibility JavaVersion.VERSION_1_7
         targetCompatibility JavaVersion.VERSION_1_7
     }
-
-    android {
-        sourceSets {
-            main {
-                manifest.srcFile 'AndroidManifest.xml'
-                java.srcDirs = ['src']
-                resources.srcDirs = ['src']
-                aidl.srcDirs = ['src']
-                renderscript.srcDirs = ['src']
-                res.srcDirs = ['res']
-                assets.srcDirs = ['assets']
-                jniLibs.srcDirs = ['libs']
-            }
-            androidTest {
-                java.srcDirs = ['androidTest/java']
-                resources.srcDirs = ['androidTest/java']
-                aidl.srcDirs = ['androidTest/java']
-                renderscript.srcDirs = ['androidTest/java']
-            }
-        }
-    }
 }
 
 tasks.whenTaskAdded { task ->

diff --git a/libtextsecure/build.xml b/libtextsecure/build.xml
diff --git a/libtextsecure/proguard-project.txt b/libtextsecure/proguard-project.txt
diff --git a/libtextsecure/res/values/strings.xml b/libtextsecure/res/values/strings.xml
diff --git a/...secure/push/PushTransportDetailsTest.java → ...secure/push/PushTransportDetailsTest.java b/...secure/push/PushTransportDetailsTest.java → ...secure/push/PushTransportDetailsTest.java
diff --git a/libtextsecure/AndroidManifest.xml → libtextsecure/src/main/AndroidManifest.xml b/libtextsecure/AndroidManifest.xml → libtextsecure/src/main/AndroidManifest.xml
diff --git a/...tsecure/api/TextSecureAccountManager.java → ...tsecure/api/TextSecureAccountManager.java b/...tsecure/api/TextSecureAccountManager.java → ...tsecure/api/TextSecureAccountManager.java
diff --git a/...secure/api/TextSecureMessageReceiver.java → ...secure/api/TextSecureMessageReceiver.java b/...secure/api/TextSecureMessageReceiver.java → ...secure/api/TextSecureMessageReceiver.java
diff --git a/...xtsecure/api/TextSecureMessageSender.java → ...xtsecure/api/TextSecureMessageSender.java b/...xtsecure/api/TextSecureMessageSender.java → ...xtsecure/api/TextSecureMessageSender.java
diff --git a/...i/crypto/AttachmentCipherInputStream.java → ...i/crypto/AttachmentCipherInputStream.java b/...i/crypto/AttachmentCipherInputStream.java → ...i/crypto/AttachmentCipherInputStream.java
diff --git a/.../crypto/AttachmentCipherOutputStream.java → .../crypto/AttachmentCipherOutputStream.java b/.../crypto/AttachmentCipherOutputStream.java → .../crypto/AttachmentCipherOutputStream.java
diff --git a/...xtsecure/api/crypto/TextSecureCipher.java → ...xtsecure/api/crypto/TextSecureCipher.java b/...xtsecure/api/crypto/TextSecureCipher.java → ...xtsecure/api/crypto/TextSecureCipher.java
diff --git a/...pi/crypto/UntrustedIdentityException.java → ...pi/crypto/UntrustedIdentityException.java b/...pi/crypto/UntrustedIdentityException.java → ...pi/crypto/UntrustedIdentityException.java
diff --git a/...re/api/messages/TextSecureAttachment.java → ...re/api/messages/TextSecureAttachment.java b/...re/api/messages/TextSecureAttachment.java → ...re/api/messages/TextSecureAttachment.java
diff --git a/...messages/TextSecureAttachmentPointer.java → ...messages/TextSecureAttachmentPointer.java b/...messages/TextSecureAttachmentPointer.java → ...messages/TextSecureAttachmentPointer.java
diff --git a/.../messages/TextSecureAttachmentStream.java → .../messages/TextSecureAttachmentStream.java b/.../messages/TextSecureAttachmentStream.java → .../messages/TextSecureAttachmentStream.java
diff --git a/...cure/api/messages/TextSecureEnvelope.java → ...cure/api/messages/TextSecureEnvelope.java b/...cure/api/messages/TextSecureEnvelope.java → ...cure/api/messages/TextSecureEnvelope.java
diff --git a/...tsecure/api/messages/TextSecureGroup.java → ...tsecure/api/messages/TextSecureGroup.java b/...tsecure/api/messages/TextSecureGroup.java → ...tsecure/api/messages/TextSecureGroup.java
diff --git a/...ecure/api/messages/TextSecureMessage.java → ...ecure/api/messages/TextSecureMessage.java b/...ecure/api/messages/TextSecureMessage.java → ...ecure/api/messages/TextSecureMessage.java
diff --git a/...ms/textsecure/push/AccountAttributes.java → ...ms/textsecure/push/AccountAttributes.java b/...ms/textsecure/push/AccountAttributes.java → ...ms/textsecure/push/AccountAttributes.java
diff --git a/.../textsecure/push/ContactTokenDetails.java → .../textsecure/push/ContactTokenDetails.java b/.../textsecure/push/ContactTokenDetails.java → .../textsecure/push/ContactTokenDetails.java
diff --git a/...tsecure/push/ContactTokenDetailsList.java → ...tsecure/push/ContactTokenDetailsList.java b/...tsecure/push/ContactTokenDetailsList.java → ...tsecure/push/ContactTokenDetailsList.java
diff --git a/...ems/textsecure/push/ContactTokenList.java → ...ems/textsecure/push/ContactTokenList.java b/...ems/textsecure/push/ContactTokenList.java → ...ems/textsecure/push/ContactTokenList.java
diff --git a/...ms/textsecure/push/MismatchedDevices.java → ...ms/textsecure/push/MismatchedDevices.java b/...ms/textsecure/push/MismatchedDevices.java → ...ms/textsecure/push/MismatchedDevices.java
diff --git a/.../textsecure/push/OutgoingPushMessage.java → .../textsecure/push/OutgoingPushMessage.java b/.../textsecure/push/OutgoingPushMessage.java → .../textsecure/push/OutgoingPushMessage.java
diff --git a/...tsecure/push/OutgoingPushMessageList.java → ...tsecure/push/OutgoingPushMessageList.java b/...tsecure/push/OutgoingPushMessageList.java → ...tsecure/push/OutgoingPushMessageList.java
diff --git a/...systems/textsecure/push/PreKeyEntity.java → ...systems/textsecure/push/PreKeyEntity.java b/...systems/textsecure/push/PreKeyEntity.java → ...systems/textsecure/push/PreKeyEntity.java
diff --git a/...stems/textsecure/push/PreKeyResponse.java → ...stems/textsecure/push/PreKeyResponse.java b/...stems/textsecure/push/PreKeyResponse.java → ...stems/textsecure/push/PreKeyResponse.java
diff --git a/...s/textsecure/push/PreKeyResponseItem.java → ...s/textsecure/push/PreKeyResponseItem.java b/...s/textsecure/push/PreKeyResponseItem.java → ...s/textsecure/push/PreKeyResponseItem.java
diff --git a/...rsystems/textsecure/push/PreKeyState.java → ...rsystems/textsecure/push/PreKeyState.java b/...rsystems/textsecure/push/PreKeyState.java → ...rsystems/textsecure/push/PreKeyState.java
diff --git a/...systems/textsecure/push/PreKeyStatus.java → ...systems/textsecure/push/PreKeyStatus.java b/...systems/textsecure/push/PreKeyStatus.java → ...systems/textsecure/push/PreKeyStatus.java
diff --git a/...rsystems/textsecure/push/PushAddress.java → ...rsystems/textsecure/push/PushAddress.java b/...rsystems/textsecure/push/PushAddress.java → ...rsystems/textsecure/push/PushAddress.java
diff --git a/...s/textsecure/push/PushAttachmentData.java → ...s/textsecure/push/PushAttachmentData.java b/...s/textsecure/push/PushAttachmentData.java → ...s/textsecure/push/PushAttachmentData.java
diff --git a/...extsecure/push/PushAttachmentPointer.java → ...extsecure/push/PushAttachmentPointer.java b/...extsecure/push/PushAttachmentPointer.java → ...extsecure/push/PushAttachmentPointer.java
diff --git a/...spersystems/textsecure/push/PushBody.java → ...spersystems/textsecure/push/PushBody.java b/...spersystems/textsecure/push/PushBody.java → ...spersystems/textsecure/push/PushBody.java
diff --git a/...ms/textsecure/push/PushMessageProtos.java → ...ms/textsecure/push/PushMessageProtos.java b/...ms/textsecure/push/PushMessageProtos.java → ...ms/textsecure/push/PushMessageProtos.java
diff --git a/.../textsecure/push/PushMessageResponse.java → .../textsecure/push/PushMessageResponse.java b/.../textsecure/push/PushMessageResponse.java → .../textsecure/push/PushMessageResponse.java
diff --git a/...ms/textsecure/push/PushServiceSocket.java → ...ms/textsecure/push/PushServiceSocket.java b/...ms/textsecure/push/PushServiceSocket.java → ...ms/textsecure/push/PushServiceSocket.java
diff --git a/...textsecure/push/PushTransportDetails.java → ...textsecure/push/PushTransportDetails.java b/...textsecure/push/PushTransportDetails.java → ...textsecure/push/PushTransportDetails.java
diff --git a/...s/textsecure/push/SignedPreKeyEntity.java → ...s/textsecure/push/SignedPreKeyEntity.java b/...s/textsecure/push/SignedPreKeyEntity.java → ...s/textsecure/push/SignedPreKeyEntity.java
diff --git a/...systems/textsecure/push/StaleDevices.java → ...systems/textsecure/push/StaleDevices.java b/...systems/textsecure/push/StaleDevices.java → ...systems/textsecure/push/StaleDevices.java
diff --git a/...ecure/push/UnregisteredUserException.java → ...ecure/push/UnregisteredUserException.java b/...ecure/push/UnregisteredUserException.java → ...ecure/push/UnregisteredUserException.java
diff --git a/...eptions/AuthorizationFailedException.java → ...eptions/AuthorizationFailedException.java b/...eptions/AuthorizationFailedException.java → ...eptions/AuthorizationFailedException.java
diff --git a/...sh/exceptions/EncapsulatedExceptions.java → ...sh/exceptions/EncapsulatedExceptions.java b/...sh/exceptions/EncapsulatedExceptions.java → ...sh/exceptions/EncapsulatedExceptions.java
diff --git a/...xceptions/ExpectationFailedException.java → ...xceptions/ExpectationFailedException.java b/...xceptions/ExpectationFailedException.java → ...xceptions/ExpectationFailedException.java
diff --git a/...xceptions/MismatchedDevicesException.java → ...xceptions/MismatchedDevicesException.java b/...xceptions/MismatchedDevicesException.java → ...xceptions/MismatchedDevicesException.java
diff --git a/...s/NonSuccessfulResponseCodeException.java → ...s/NonSuccessfulResponseCodeException.java b/...s/NonSuccessfulResponseCodeException.java → ...s/NonSuccessfulResponseCodeException.java
diff --git a/...re/push/exceptions/NotFoundException.java → ...re/push/exceptions/NotFoundException.java b/...re/push/exceptions/NotFoundException.java → ...re/push/exceptions/NotFoundException.java
diff --git a/...push/exceptions/PushNetworkException.java → ...push/exceptions/PushNetworkException.java b/...push/exceptions/PushNetworkException.java → ...push/exceptions/PushNetworkException.java
diff --git a/...e/push/exceptions/RateLimitException.java → ...e/push/exceptions/RateLimitException.java b/...e/push/exceptions/RateLimitException.java → ...e/push/exceptions/RateLimitException.java
diff --git a/...ush/exceptions/StaleDevicesException.java → ...ush/exceptions/StaleDevicesException.java b/...ush/exceptions/StaleDevicesException.java → ...ush/exceptions/StaleDevicesException.java
diff --git a/...extsecure/storage/CanonicalRecipient.java → ...extsecure/storage/CanonicalRecipient.java b/...extsecure/storage/CanonicalRecipient.java → ...extsecure/storage/CanonicalRecipient.java
diff --git a/...s/textsecure/storage/RecipientDevice.java → ...s/textsecure/storage/RecipientDevice.java b/...s/textsecure/storage/RecipientDevice.java → ...s/textsecure/storage/RecipientDevice.java
diff --git a/...hispersystems/textsecure/util/Base64.java → ...hispersystems/textsecure/util/Base64.java b/...hispersystems/textsecure/util/Base64.java → ...hispersystems/textsecure/util/Base64.java
diff --git a/...secure/util/BlacklistingTrustManager.java → ...secure/util/BlacklistingTrustManager.java b/...secure/util/BlacklistingTrustManager.java → ...secure/util/BlacklistingTrustManager.java
diff --git a/...rsystems/textsecure/util/Conversions.java → ...rsystems/textsecure/util/Conversions.java b/...rsystems/textsecure/util/Conversions.java → ...rsystems/textsecure/util/Conversions.java
diff --git a/...ystems/textsecure/util/DirectoryUtil.java → ...ystems/textsecure/util/DirectoryUtil.java b/...ystems/textsecure/util/DirectoryUtil.java → ...ystems/textsecure/util/DirectoryUtil.java
diff --git a/...s/textsecure/util/FutureTaskListener.java → ...s/textsecure/util/FutureTaskListener.java b/...s/textsecure/util/FutureTaskListener.java → ...s/textsecure/util/FutureTaskListener.java
diff --git a/...g/whispersystems/textsecure/util/Hex.java → ...g/whispersystems/textsecure/util/Hex.java b/...g/whispersystems/textsecure/util/Hex.java → ...g/whispersystems/textsecure/util/Hex.java
diff --git a/...xtsecure/util/InvalidNumberException.java → ...xtsecure/util/InvalidNumberException.java b/...xtsecure/util/InvalidNumberException.java → ...xtsecure/util/InvalidNumberException.java
diff --git a/...textsecure/util/ListenableFutureTask.java → ...textsecure/util/ListenableFutureTask.java b/...textsecure/util/ListenableFutureTask.java → ...textsecure/util/ListenableFutureTask.java
diff --git a/...textsecure/util/PhoneNumberFormatter.java → ...textsecure/util/PhoneNumberFormatter.java b/...textsecure/util/PhoneNumberFormatter.java → ...textsecure/util/PhoneNumberFormatter.java
diff --git a/.../whispersystems/textsecure/util/Util.java → .../whispersystems/textsecure/util/Util.java b/.../whispersystems/textsecure/util/Util.java → .../whispersystems/textsecure/util/Util.java
diff --git a/...e/zxing/integration/IntentIntegrator.java → ...e/zxing/integration/IntentIntegrator.java b/...e/zxing/integration/IntentIntegrator.java → ...e/zxing/integration/IntentIntegrator.java
diff --git a/...ecure/zxing/integration/IntentResult.java → ...ecure/zxing/integration/IntentResult.java b/...ecure/zxing/integration/IntentResult.java → ...ecure/zxing/integration/IntentResult.java