From 105bca735bb329402fefba5aacb6b81cee124cf3 Mon Sep 17 00:00:00 2001 From: cketti Date: Sat, 20 Dec 2014 01:09:49 +0100 Subject: [PATCH] Move 'mail' package to library project --- k9mail-library/build.gradle | 41 +++++++++++++++++++ k9mail-library/src/main/AndroidManifest.xml | 2 + .../main/java/com/fsck/k9/mail/Address.java | 0 .../main/java/com/fsck/k9/mail/AuthType.java | 0 .../java/com/fsck/k9/mail/Authentication.java | 0 .../mail/AuthenticationFailedException.java | 0 .../src/main/java/com/fsck/k9/mail/Body.java | 0 .../main/java/com/fsck/k9/mail/BodyPart.java | 0 .../k9/mail/CertificateChainException.java | 0 .../mail/CertificateValidationException.java | 0 .../java/com/fsck/k9/mail/CompositeBody.java | 0 .../com/fsck/k9/mail/ConnectionSecurity.java | 0 .../java/com/fsck/k9/mail/FetchProfile.java | 0 .../src/main/java/com/fsck/k9/mail/Flag.java | 0 .../main/java/com/fsck/k9/mail/Folder.java | 0 .../main/java/com/fsck/k9/mail/K9MailLib.java | 0 .../main/java/com/fsck/k9/mail/Message.java | 0 .../k9/mail/MessageRetrievalListener.java | 0 .../com/fsck/k9/mail/MessagingException.java | 0 .../main/java/com/fsck/k9/mail/Multipart.java | 0 .../src/main/java/com/fsck/k9/mail/Part.java | 0 .../java/com/fsck/k9/mail/PushReceiver.java | 0 .../main/java/com/fsck/k9/mail/Pusher.java | 0 .../java/com/fsck/k9/mail/ServerSettings.java | 0 .../src/main/java/com/fsck/k9/mail/Store.java | 0 .../main/java/com/fsck/k9/mail/Transport.java | 0 .../java/com/fsck/k9/mail/filter/Base64.java | 0 .../k9/mail/filter/Base64OutputStream.java | 0 .../k9/mail/filter/CountingOutputStream.java | 0 .../filter/EOLConvertingOutputStream.java | 0 .../mail/filter/FixedLengthInputStream.java | 0 .../java/com/fsck/k9/mail/filter/Hex.java | 0 .../k9/mail/filter/LineWrapOutputStream.java | 0 .../k9/mail/filter/PeekableInputStream.java | 0 .../fsck/k9/mail/filter/SmtpDataStuffing.java | 0 .../k9/mail/internet/BinaryTempFileBody.java | 0 .../internet/BinaryTempFileMessageBody.java | 0 .../fsck/k9/mail/internet/CharsetSupport.java | 0 .../fsck/k9/mail/internet/DecoderUtil.java | 0 .../fsck/k9/mail/internet/EncoderUtil.java | 0 .../Iso2022JpToShiftJisInputStream.java | 0 .../com/fsck/k9/mail/internet/JisSupport.java | 0 .../k9/mail/internet/MessageExtractor.java | 0 .../fsck/k9/mail/internet/MimeBodyPart.java | 0 .../com/fsck/k9/mail/internet/MimeHeader.java | 0 .../fsck/k9/mail/internet/MimeMessage.java | 0 .../fsck/k9/mail/internet/MimeMultipart.java | 0 .../fsck/k9/mail/internet/MimeUtility.java | 0 .../com/fsck/k9/mail/internet/TextBody.java | 0 .../com/fsck/k9/mail/internet/Viewable.java | 0 .../k9/mail/power/TracingPowerManager.java | 0 .../mail/ssl/DefaultTrustedSocketFactory.java | 0 .../fsck/k9/mail/ssl/KeyChainKeyManager.java | 0 .../com/fsck/k9/mail/ssl/LocalKeyStore.java | 0 .../fsck/k9/mail/ssl/TrustManagerFactory.java | 0 .../k9/mail/ssl/TrustedSocketFactory.java | 0 .../com/fsck/k9/mail/store/RemoteStore.java | 0 .../com/fsck/k9/mail/store/StoreConfig.java | 0 .../fsck/k9/mail/store/imap/ImapCommands.java | 0 .../k9/mail/store/imap/ImapConnection.java | 0 .../k9/mail/store/imap/ImapException.java | 0 .../com/fsck/k9/mail/store/imap/ImapList.java | 0 .../fsck/k9/mail/store/imap/ImapResponse.java | 0 .../mail/store/imap/ImapResponseCallback.java | 0 .../mail/store/imap/ImapResponseParser.java | 0 .../fsck/k9/mail/store/imap/ImapStore.java | 0 .../fsck/k9/mail/store/imap/ImapUtility.java | 0 .../k9/mail/store/imap/UntaggedHandler.java | 0 .../fsck/k9/mail/store/pop3/Pop3Store.java | 0 .../store/webdav/WebDavSocketFactory.java | 0 .../k9/mail/store/webdav/WebDavStore.java | 0 .../fsck/k9/mail/transport/SmtpTransport.java | 0 .../k9/mail/transport/WebDavTransport.java | 0 .../k9/mail/transport/imap/ImapSettings.java | 0 k9mail/build.gradle | 5 +-- settings.gradle | 1 + 76 files changed, 45 insertions(+), 4 deletions(-) create mode 100644 k9mail-library/build.gradle create mode 100644 k9mail-library/src/main/AndroidManifest.xml rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Address.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/AuthType.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Authentication.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Body.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/BodyPart.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/CertificateChainException.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/CertificateValidationException.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/CompositeBody.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/FetchProfile.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Flag.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Folder.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/K9MailLib.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Message.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/MessagingException.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Multipart.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Part.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/PushReceiver.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Pusher.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/ServerSettings.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Store.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/Transport.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/Base64.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/Hex.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/JisSupport.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/TextBody.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/internet/Viewable.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/RemoteStore.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/StoreConfig.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapCommands.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapException.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapList.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapResponse.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseCallback.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/ImapUtility.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/imap/UntaggedHandler.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java (100%) rename {k9mail => k9mail-library}/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java (100%) diff --git a/k9mail-library/build.gradle b/k9mail-library/build.gradle new file mode 100644 index 0000000000..ac3740679a --- /dev/null +++ b/k9mail-library/build.gradle @@ -0,0 +1,41 @@ +apply plugin: 'com.android.library' + +repositories { + jcenter() +} + +dependencies { + compile 'org.apache.james:apache-mime4j-core:0.7.2' + compile 'org.apache.james:apache-mime4j-dom:0.7.2' + compile 'commons-io:commons-io:2.0.1' + compile 'com.jcraft:jzlib:1.0.7' + compile 'com.beetstra.jutf7:jutf7:1.0.0' +} + +android { + compileSdkVersion 21 + buildToolsVersion '21.1.2' + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 17 + } + + lintOptions { + abortOnError false + lintConfig file("$rootProject.projectDir/config/lint/lint.xml") + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_6 + targetCompatibility JavaVersion.VERSION_1_6 + } + + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/LICENSE' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/NOTICE' + exclude 'META-INF/NOTICE.txt' + } +} diff --git a/k9mail-library/src/main/AndroidManifest.xml b/k9mail-library/src/main/AndroidManifest.xml new file mode 100644 index 0000000000..147efd7d70 --- /dev/null +++ b/k9mail-library/src/main/AndroidManifest.xml @@ -0,0 +1,2 @@ + + diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Address.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Address.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Address.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Address.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/AuthType.java b/k9mail-library/src/main/java/com/fsck/k9/mail/AuthType.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/AuthType.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/AuthType.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Authentication.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Authentication.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Authentication.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Authentication.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Body.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Body.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Body.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Body.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/BodyPart.java b/k9mail-library/src/main/java/com/fsck/k9/mail/BodyPart.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/BodyPart.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/BodyPart.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/CertificateChainException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/CertificateChainException.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/CertificateChainException.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/CertificateChainException.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/CertificateValidationException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/CertificateValidationException.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/CertificateValidationException.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/CertificateValidationException.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/CompositeBody.java b/k9mail-library/src/main/java/com/fsck/k9/mail/CompositeBody.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/CompositeBody.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/CompositeBody.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/FetchProfile.java b/k9mail-library/src/main/java/com/fsck/k9/mail/FetchProfile.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/FetchProfile.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/FetchProfile.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Flag.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Flag.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Flag.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Flag.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Folder.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Folder.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Folder.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Folder.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/K9MailLib.java b/k9mail-library/src/main/java/com/fsck/k9/mail/K9MailLib.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/K9MailLib.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/K9MailLib.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Message.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Message.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Message.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Message.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java b/k9mail-library/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/MessagingException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/MessagingException.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/MessagingException.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/MessagingException.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Multipart.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Multipart.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Multipart.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Multipart.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Part.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Part.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Part.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Part.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java b/k9mail-library/src/main/java/com/fsck/k9/mail/PushReceiver.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/PushReceiver.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Pusher.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Pusher.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Pusher.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Pusher.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/ServerSettings.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ServerSettings.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/ServerSettings.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/ServerSettings.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Store.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Store.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Store.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Store.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/Transport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/Transport.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/Base64.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/Base64.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/Base64.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/Base64.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/Hex.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/Hex.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/Hex.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/Hex.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java b/k9mail-library/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/JisSupport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/JisSupport.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/JisSupport.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/JisSupport.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/TextBody.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/TextBody.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/TextBody.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/TextBody.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/internet/Viewable.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/Viewable.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/internet/Viewable.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/internet/Viewable.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java b/k9mail-library/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/RemoteStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/RemoteStore.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/RemoteStore.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/RemoteStore.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/StoreConfig.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/StoreConfig.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/StoreConfig.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/StoreConfig.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapCommands.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapCommands.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapCommands.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapCommands.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapException.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapException.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapException.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapList.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapList.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapList.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapList.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponse.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapResponse.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponse.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapResponse.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseCallback.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseCallback.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseCallback.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseCallback.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapUtility.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapUtility.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapUtility.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapUtility.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/imap/UntaggedHandler.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/UntaggedHandler.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/imap/UntaggedHandler.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/UntaggedHandler.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java diff --git a/k9mail/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java similarity index 100% rename from k9mail/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java rename to k9mail-library/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java diff --git a/k9mail/build.gradle b/k9mail/build.gradle index 119e1d738f..0eea0bdd8c 100644 --- a/k9mail/build.gradle +++ b/k9mail/build.gradle @@ -8,14 +8,11 @@ repositories { } dependencies { + compile project(':k9mail-library') compile project(':plugins:Android-PullToRefresh:library') compile project(':plugins:HoloColorPicker') compile project(':plugins:openpgp-api-library') - compile 'org.apache.james:apache-mime4j-core:0.7.2' - compile 'org.apache.james:apache-mime4j-dom:0.7.2' compile 'commons-io:commons-io:2.0.1' - compile 'com.jcraft:jzlib:1.0.7' - compile 'com.beetstra.jutf7:jutf7:1.0.0' compile 'com.android.support:support-v4:21.0.2' compile 'com.android.support:support-v13:21.0.2' compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2' diff --git a/settings.gradle b/settings.gradle index b0523ca272..a39b9d813d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,5 @@ include ':k9mail' +include ':k9mail-library' include ':plugins:Android-PullToRefresh:library' include ':plugins:HoloColorPicker' include ':plugins:openpgp-api-library'