From a6388ca84fd6a796479246d62c4f7adaf9c827d6 Mon Sep 17 00:00:00 2001 From: Joshua Nelson Date: Fri, 3 Nov 2017 18:23:27 -0400 Subject: [PATCH] Remove unused imports --- .../src/main/java/com/fsck/k9/mail/Transport.java | 8 -------- .../main/java/com/fsck/k9/mail/internet/EncoderUtil.java | 1 - .../java/com/fsck/k9/mail/transport/WebDavTransport.java | 1 - .../com/fsck/k9/mail/internet/MimeMessageParseTest.java | 1 - k9mail/src/main/java/com/fsck/k9/Globals.java | 1 - .../main/java/com/fsck/k9/activity/FolderListFilter.java | 2 -- .../java/com/fsck/k9/activity/MessageReferenceHelper.java | 2 -- .../fsck/k9/activity/loader/AttachmentContentLoader.java | 1 - .../com/fsck/k9/activity/loader/AttachmentInfoLoader.java | 1 - .../fsck/k9/activity/setup/AccountSetupAccountType.java | 1 - .../com/fsck/k9/activity/setup/AccountSetupOutgoing.java | 1 - .../java/com/fsck/k9/activity/setup/SliderPreference.java | 1 - .../java/com/fsck/k9/cache/TemporaryAttachmentStore.java | 1 - .../com/fsck/k9/fragment/ConfirmationDialogFragment.java | 2 -- k9mail/src/main/java/com/fsck/k9/helper/FileHelper.java | 1 - k9mail/src/main/java/com/fsck/k9/helper/Utility.java | 2 -- .../java/com/fsck/k9/mailstore/AttachmentResolver.java | 1 - .../main/java/com/fsck/k9/mailstore/DeferredFileBody.java | 1 - .../com/fsck/k9/mailstore/MessageViewInfoExtractor.java | 1 - .../java/com/fsck/k9/mailstore/StoreSchemaDefinition.java | 4 ---- .../src/main/java/com/fsck/k9/mailstore/TempFileBody.java | 1 - .../com/fsck/k9/mailstore/migrations/MigrationTo35.java | 2 -- .../com/fsck/k9/mailstore/migrations/MigrationTo36.java | 2 -- .../com/fsck/k9/mailstore/migrations/MigrationTo37.java | 2 -- .../com/fsck/k9/mailstore/migrations/MigrationTo39.java | 2 -- .../com/fsck/k9/mailstore/migrations/MigrationTo40.java | 2 -- .../com/fsck/k9/mailstore/migrations/MigrationTo41.java | 1 - .../com/fsck/k9/mailstore/migrations/MigrationTo43.java | 3 --- .../java/com/fsck/k9/message/IdentityHeaderBuilder.java | 1 - .../java/com/fsck/k9/message/IdentityHeaderParser.java | 1 - .../com/fsck/k9/message/extractors/BodyTextExtractor.java | 1 - .../main/java/com/fsck/k9/message/html/HtmlConverter.java | 3 --- .../java/com/fsck/k9/message/quote/HtmlQuoteCreator.java | 1 - .../java/com/fsck/k9/preferences/SettingsExporter.java | 1 - .../java/com/fsck/k9/preferences/SettingsImporter.java | 1 - .../java/com/fsck/k9/provider/AttachmentProvider.java | 2 -- .../com/fsck/k9/provider/AttachmentTempFileProvider.java | 1 - .../java/com/fsck/k9/provider/DecryptedFileProvider.java | 1 - .../src/main/java/com/fsck/k9/service/BootReceiver.java | 2 -- k9mail/src/main/java/com/fsck/k9/service/PushService.java | 1 - .../java/com/fsck/k9/service/RemoteControlReceiver.java | 1 - .../main/java/com/fsck/k9/service/ShutdownReceiver.java | 2 -- .../java/com/fsck/k9/service/StorageGoneReceiver.java | 1 - .../main/java/com/fsck/k9/service/StorageReceiver.java | 1 - .../com/fsck/k9/ui/compose/QuotedMessagePresenter.java | 1 - .../com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java | 2 -- .../fsck/k9/ui/message/LocalMessageExtractorLoader.java | 1 - .../java/com/fsck/k9/ui/message/LocalMessageLoader.java | 1 - .../java/com/fsck/k9/view/ClientCertificateSpinner.java | 1 - k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java | 1 - k9mail/src/main/java/com/fsck/k9/view/ThemeUtils.java | 1 - .../test/java/com/fsck/k9/account/AccountCreatorTest.java | 1 - .../java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java | 1 - .../test/java/com/fsck/k9/helper/IdentityHelperTest.java | 2 -- .../test/java/com/fsck/k9/mailstore/LocalStoreTest.java | 1 - 55 files changed, 83 deletions(-) diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java index 5d7c407e24d..6b60e524377 100644 --- a/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java +++ b/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java @@ -1,14 +1,6 @@ package com.fsck.k9.mail; -import com.fsck.k9.mail.ServerSettings.Type; -import com.fsck.k9.mail.transport.smtp.SmtpTransport; -import com.fsck.k9.mail.transport.WebDavTransport; - -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; -import java.net.URLEncoder; - public abstract class Transport { protected static final int SOCKET_CONNECT_TIMEOUT = 10000; diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java index 239e94e27e9..c271c090d25 100644 --- a/k9mail-library/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java +++ b/k9mail-library/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java @@ -6,7 +6,6 @@ import java.util.BitSet; import org.apache.james.mime4j.Charsets; -import org.apache.james.mime4j.util.CharsetUtil; /** * Static methods for encoding header field values. This includes encoded-words diff --git a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java index 5c9a6492e72..1054818fc23 100644 --- a/k9mail-library/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java +++ b/k9mail-library/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java @@ -4,7 +4,6 @@ import com.fsck.k9.mail.K9MailLib; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; -import com.fsck.k9.mail.ServerSettings; import com.fsck.k9.mail.Transport; import com.fsck.k9.mail.store.StoreConfig; import com.fsck.k9.mail.store.webdav.WebDavHttpClient; diff --git a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java index e8f95d218c7..a6e827477e1 100644 --- a/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java +++ b/k9mail-library/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java @@ -23,7 +23,6 @@ import org.junit.runner.RunWith; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; @RunWith(K9LibRobolectricTestRunner.class) diff --git a/k9mail/src/main/java/com/fsck/k9/Globals.java b/k9mail/src/main/java/com/fsck/k9/Globals.java index 7d7ec227df8..31e74e898f5 100644 --- a/k9mail/src/main/java/com/fsck/k9/Globals.java +++ b/k9mail/src/main/java/com/fsck/k9/Globals.java @@ -2,7 +2,6 @@ import android.content.Context; -import android.support.annotation.VisibleForTesting; public class Globals { diff --git a/k9mail/src/main/java/com/fsck/k9/activity/FolderListFilter.java b/k9mail/src/main/java/com/fsck/k9/activity/FolderListFilter.java index 5314532bb81..359ec7f5d27 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/FolderListFilter.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/FolderListFilter.java @@ -8,8 +8,6 @@ import android.widget.ArrayAdapter; import android.widget.Filter; -import com.fsck.k9.K9; - /** * Filter to search for occurrences of the search-expression in any place of the * folder-name instead of doing just a prefix-search. diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageReferenceHelper.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageReferenceHelper.java index bfeac4af52b..652a4f4ebdb 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/MessageReferenceHelper.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageReferenceHelper.java @@ -6,8 +6,6 @@ import timber.log.Timber; -import com.fsck.k9.K9; - public class MessageReferenceHelper { public static List toMessageReferenceList(List messageReferenceStrings) { diff --git a/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java b/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java index e7ffeb5f972..9f180e51dd8 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java @@ -9,7 +9,6 @@ import android.content.Context; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.activity.misc.Attachment; import com.fsck.k9.activity.misc.Attachment.LoadingState; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java b/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java index ea5eb3ee5a4..1b21ff32406 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java @@ -10,7 +10,6 @@ import android.provider.OpenableColumns; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.activity.misc.Attachment; import com.fsck.k9.activity.misc.Attachment.LoadingState; import com.fsck.k9.mail.internet.MimeUtility; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java index 9173c5a8c60..fab53f933d5 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java @@ -9,7 +9,6 @@ import android.view.View.OnClickListener; import android.widget.Toast; import com.fsck.k9.Account; -import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.R; import com.fsck.k9.activity.K9Activity; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java index 7c53c4c65c5..c24f495ebe4 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java @@ -36,7 +36,6 @@ import com.fsck.k9.mail.ConnectionSecurity; import com.fsck.k9.mail.ServerSettings; import com.fsck.k9.mail.ServerSettings.Type; -import com.fsck.k9.mail.Transport; import com.fsck.k9.mail.TransportUris; import com.fsck.k9.view.ClientCertificateSpinner; import com.fsck.k9.view.ClientCertificateSpinner.OnClientCertificateChangedListener; diff --git a/k9mail/src/main/java/com/fsck/k9/activity/setup/SliderPreference.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/SliderPreference.java index 72e3979c6e7..cf84b352d6b 100644 --- a/k9mail/src/main/java/com/fsck/k9/activity/setup/SliderPreference.java +++ b/k9mail/src/main/java/com/fsck/k9/activity/setup/SliderPreference.java @@ -30,7 +30,6 @@ import android.os.Parcelable; import android.preference.DialogPreference; import android.support.annotation.ArrayRes; -import android.support.annotation.StringRes; import android.util.AttributeSet; import android.view.View; import android.widget.SeekBar; diff --git a/k9mail/src/main/java/com/fsck/k9/cache/TemporaryAttachmentStore.java b/k9mail/src/main/java/com/fsck/k9/cache/TemporaryAttachmentStore.java index 397de27f25a..1b8d3f8d766 100644 --- a/k9mail/src/main/java/com/fsck/k9/cache/TemporaryAttachmentStore.java +++ b/k9mail/src/main/java/com/fsck/k9/cache/TemporaryAttachmentStore.java @@ -7,7 +7,6 @@ import android.content.Context; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.helper.FileHelper; diff --git a/k9mail/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java index db08cff6d75..b8807ec0ad2 100644 --- a/k9mail/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java +++ b/k9mail/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java @@ -10,8 +10,6 @@ import android.os.Bundle; import timber.log.Timber; -import com.fsck.k9.K9; - public class ConfirmationDialogFragment extends DialogFragment implements OnClickListener, OnCancelListener { private ConfirmationDialogFragmentListener mListener; diff --git a/k9mail/src/main/java/com/fsck/k9/helper/FileHelper.java b/k9mail/src/main/java/com/fsck/k9/helper/FileHelper.java index e1a18302a53..72cffbf8508 100644 --- a/k9mail/src/main/java/com/fsck/k9/helper/FileHelper.java +++ b/k9mail/src/main/java/com/fsck/k9/helper/FileHelper.java @@ -9,7 +9,6 @@ import timber.log.Timber; -import com.fsck.k9.K9; import org.apache.commons.io.IOUtils; diff --git a/k9mail/src/main/java/com/fsck/k9/helper/Utility.java b/k9mail/src/main/java/com/fsck/k9/helper/Utility.java index c6a6862946a..bd9f4f42ce5 100644 --- a/k9mail/src/main/java/com/fsck/k9/helper/Utility.java +++ b/k9mail/src/main/java/com/fsck/k9/helper/Utility.java @@ -16,13 +16,11 @@ import android.widget.EditText; import android.widget.TextView; -import com.fsck.k9.K9; import com.fsck.k9.ui.ContactBadge; import com.fsck.k9.mail.Address; import org.apache.james.mime4j.util.MimeUtil; -import java.nio.charset.Charset; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java b/k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java index 6faea95fb51..9166eb0cfd9 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentResolver.java @@ -12,7 +12,6 @@ import android.support.annotation.WorkerThread; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.mail.Body; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Multipart; diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java index 018408bb865..d9bf3b10090 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/DeferredFileBody.java @@ -14,7 +14,6 @@ import android.support.annotation.VisibleForTesting; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.internet.RawDataBody; import com.fsck.k9.mail.internet.SizeAware; diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java b/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java index feeb06946e2..975b56686ca 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/MessageViewInfoExtractor.java @@ -21,7 +21,6 @@ import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MessageExtractor; -import com.fsck.k9.mail.internet.MimeUtility; import com.fsck.k9.mail.internet.Viewable; import com.fsck.k9.mail.internet.Viewable.Flowed; import com.fsck.k9.mailstore.CryptoResultAnnotation.CryptoError; diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/StoreSchemaDefinition.java b/k9mail/src/main/java/com/fsck/k9/mailstore/StoreSchemaDefinition.java index 3dd4ae1ca1e..7e8fd4150cc 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/StoreSchemaDefinition.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/StoreSchemaDefinition.java @@ -2,7 +2,6 @@ import java.util.List; -import java.util.Locale; import android.content.Context; import android.database.sqlite.SQLiteDatabase; @@ -10,7 +9,6 @@ import com.fsck.k9.Account; import com.fsck.k9.BuildConfig; -import com.fsck.k9.K9; import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Folder; import com.fsck.k9.mailstore.migrations.Migrations; @@ -18,8 +16,6 @@ import com.fsck.k9.preferences.Storage; import static com.fsck.k9.mailstore.LocalStore.DB_VERSION; -import static java.lang.String.format; -import static java.util.Locale.US; class StoreSchemaDefinition implements LockableDatabase.SchemaDefinition { diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/TempFileBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/TempFileBody.java index f8c0ea2c0a2..9703951f27c 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/TempFileBody.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/TempFileBody.java @@ -6,7 +6,6 @@ import java.io.FileNotFoundException; import java.io.InputStream; -import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.internet.SizeAware; diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo35.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo35.java index ddda3ea4b0f..03a33bb4fe9 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo35.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo35.java @@ -5,8 +5,6 @@ import android.database.sqlite.SQLiteException; import timber.log.Timber; -import com.fsck.k9.K9; - class MigrationTo35 { public static void updateRemoveXNoSeenInfoFlag(SQLiteDatabase db) { diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo36.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo36.java index 26132737737..5924d37b6e7 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo36.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo36.java @@ -5,8 +5,6 @@ import android.database.sqlite.SQLiteException; import timber.log.Timber; -import com.fsck.k9.K9; - class MigrationTo36 { public static void addAttachmentsContentIdColumn(SQLiteDatabase db) { diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo37.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo37.java index 5fc7319d0e7..1007c0f4e2b 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo37.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo37.java @@ -5,8 +5,6 @@ import android.database.sqlite.SQLiteException; import timber.log.Timber; -import com.fsck.k9.K9; - class MigrationTo37 { public static void addAttachmentsContentDispositionColumn(SQLiteDatabase db) { diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo39.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo39.java index ea6b101cb56..26b3733b54b 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo39.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo39.java @@ -5,8 +5,6 @@ import android.database.sqlite.SQLiteException; import timber.log.Timber; -import com.fsck.k9.K9; - class MigrationTo39 { public static void headersPruneOrphans(SQLiteDatabase db) { diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo40.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo40.java index 9c4253d8dd6..2f8f2592f71 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo40.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo40.java @@ -5,8 +5,6 @@ import android.database.sqlite.SQLiteException; import timber.log.Timber; -import com.fsck.k9.K9; - class MigrationTo40 { public static void addMimeTypeColumn(SQLiteDatabase db) { diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo41.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo41.java index 95f82eadbcf..9904b48d2fb 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo41.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo41.java @@ -7,7 +7,6 @@ import timber.log.Timber; import com.fsck.k9.Account; -import com.fsck.k9.K9; import com.fsck.k9.helper.Utility; import com.fsck.k9.mail.Folder; import com.fsck.k9.preferences.Storage; diff --git a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo43.java b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo43.java index c0566ed7a29..1b6fa93b2bf 100644 --- a/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo43.java +++ b/k9mail/src/main/java/com/fsck/k9/mailstore/migrations/MigrationTo43.java @@ -5,14 +5,11 @@ import android.content.ContentValues; import android.content.Context; -import android.content.SharedPreferences; import android.database.sqlite.SQLiteDatabase; import timber.log.Timber; import com.fsck.k9.Account; -import com.fsck.k9.K9; import com.fsck.k9.R; -import com.fsck.k9.mail.Folder; import com.fsck.k9.mail.Message; import com.fsck.k9.mailstore.LocalFolder; import com.fsck.k9.mailstore.LocalStore; diff --git a/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java b/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java index 343f957bdcd..1cf707013f6 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java +++ b/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderBuilder.java @@ -7,7 +7,6 @@ import com.fsck.k9.Account.QuoteStyle; import com.fsck.k9.Identity; -import com.fsck.k9.K9; import com.fsck.k9.activity.MessageReference; import com.fsck.k9.mail.internet.TextBody; import com.fsck.k9.message.quote.InsertableHtmlContent; diff --git a/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java b/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java index 8669bb4347b..b7bbc613189 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java +++ b/k9mail/src/main/java/com/fsck/k9/message/IdentityHeaderParser.java @@ -8,7 +8,6 @@ import android.net.Uri; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.mail.filter.Base64; diff --git a/k9mail/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java b/k9mail/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java index 4db0973b177..a1af349a40a 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java +++ b/k9mail/src/main/java/com/fsck/k9/message/extractors/BodyTextExtractor.java @@ -3,7 +3,6 @@ import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MessageExtractor; import com.fsck.k9.mail.internet.MimeUtility; diff --git a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java index 0dabd4558c2..9d5d27aa44a 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java +++ b/k9mail/src/main/java/com/fsck/k9/message/html/HtmlConverter.java @@ -2,12 +2,9 @@ import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.Locale; -import java.util.Map; import java.util.Set; -import java.util.regex.Matcher; import java.util.regex.Pattern; import android.text.Annotation; diff --git a/k9mail/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java b/k9mail/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java index 040904637a6..3f7e6a281c7 100644 --- a/k9mail/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java +++ b/k9mail/src/main/java/com/fsck/k9/message/quote/HtmlQuoteCreator.java @@ -8,7 +8,6 @@ import timber.log.Timber; import com.fsck.k9.Account.QuoteStyle; -import com.fsck.k9.K9; import com.fsck.k9.R; import com.fsck.k9.mail.Address; import com.fsck.k9.mail.Message; diff --git a/k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java b/k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java index 4d1e5e96b1f..af459385743 100644 --- a/k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java +++ b/k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java @@ -28,7 +28,6 @@ import com.fsck.k9.Preferences; import com.fsck.k9.helper.FileHelper; import com.fsck.k9.mail.ServerSettings; -import com.fsck.k9.mail.Transport; import com.fsck.k9.mail.store.RemoteStore; import com.fsck.k9.preferences.Settings.InvalidSettingValueException; import com.fsck.k9.preferences.Settings.SettingsDescription; diff --git a/k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java b/k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java index 27dd4ee4912..614b34e1b37 100644 --- a/k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java +++ b/k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java @@ -26,7 +26,6 @@ import com.fsck.k9.mail.AuthType; import com.fsck.k9.mail.ConnectionSecurity; import com.fsck.k9.mail.ServerSettings; -import com.fsck.k9.mail.Transport; import com.fsck.k9.mail.filter.Base64; import com.fsck.k9.mail.store.RemoteStore; import com.fsck.k9.preferences.Settings.InvalidSettingValueException; diff --git a/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java index f01fc573dc0..f0e6a2222e1 100644 --- a/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java +++ b/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java @@ -17,14 +17,12 @@ import com.fsck.k9.Account; import com.fsck.k9.BuildConfig; -import com.fsck.k9.K9; import com.fsck.k9.Preferences; import com.fsck.k9.mail.MessagingException; import com.fsck.k9.mail.internet.MimeUtility; import com.fsck.k9.mailstore.LocalStore; import com.fsck.k9.mailstore.LocalStore.AttachmentInfo; import org.openintents.openpgp.util.OpenPgpApi.OpenPgpDataSource; -import org.openintents.openpgp.util.ParcelFileDescriptorUtil; /** diff --git a/k9mail/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java index 182b1d5a8b1..1ee19935533 100644 --- a/k9mail/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java +++ b/k9mail/src/main/java/com/fsck/k9/provider/AttachmentTempFileProvider.java @@ -5,7 +5,6 @@ import java.io.FileOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.Date; import java.util.Locale; import android.content.BroadcastReceiver; diff --git a/k9mail/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java index ec895069784..a8cd3c3de64 100644 --- a/k9mail/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java +++ b/k9mail/src/main/java/com/fsck/k9/provider/DecryptedFileProvider.java @@ -5,7 +5,6 @@ import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; -import java.util.Date; import java.util.Locale; import android.content.BroadcastReceiver; diff --git a/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java index f81fdb7060f..401bd51f1bf 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java @@ -1,8 +1,6 @@ package com.fsck.k9.service; -import java.util.Date; - import android.app.AlarmManager; import android.app.PendingIntent; import android.content.Context; diff --git a/k9mail/src/main/java/com/fsck/k9/service/PushService.java b/k9mail/src/main/java/com/fsck/k9/service/PushService.java index 70bbc0bcd10..78135abf4a9 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/PushService.java +++ b/k9mail/src/main/java/com/fsck/k9/service/PushService.java @@ -4,7 +4,6 @@ import android.content.Intent; import android.os.IBinder; import timber.log.Timber; -import com.fsck.k9.K9; public class PushService extends CoreService { private static String START_SERVICE = "com.fsck.k9.service.PushService.startService"; diff --git a/k9mail/src/main/java/com/fsck/k9/service/RemoteControlReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlReceiver.java index 754bbe2a41d..a8634d05efc 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/RemoteControlReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlReceiver.java @@ -7,7 +7,6 @@ import timber.log.Timber; import com.fsck.k9.Account; -import com.fsck.k9.K9; import com.fsck.k9.remotecontrol.K9RemoteControl; import com.fsck.k9.Preferences; diff --git a/k9mail/src/main/java/com/fsck/k9/service/ShutdownReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/ShutdownReceiver.java index 77e3120e89e..b3d0ccad66c 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/ShutdownReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/ShutdownReceiver.java @@ -5,8 +5,6 @@ import android.content.Intent; import timber.log.Timber; -import com.fsck.k9.K9; - /** * Capture the system shutdown event in order to properly free resources. * diff --git a/k9mail/src/main/java/com/fsck/k9/service/StorageGoneReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/StorageGoneReceiver.java index 2cf6b91c5de..e103fdf416c 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/StorageGoneReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/StorageGoneReceiver.java @@ -6,7 +6,6 @@ import android.net.Uri; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.mailstore.StorageManager; /** diff --git a/k9mail/src/main/java/com/fsck/k9/service/StorageReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/StorageReceiver.java index 33abff75203..a3a93e47159 100644 --- a/k9mail/src/main/java/com/fsck/k9/service/StorageReceiver.java +++ b/k9mail/src/main/java/com/fsck/k9/service/StorageReceiver.java @@ -6,7 +6,6 @@ import android.net.Uri; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.mailstore.StorageManager; /** diff --git a/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java b/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java index 06e1ba9997f..c4a307503cf 100644 --- a/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/compose/QuotedMessagePresenter.java @@ -10,7 +10,6 @@ import com.fsck.k9.Account; import com.fsck.k9.Account.MessageFormat; import com.fsck.k9.Account.QuoteStyle; -import com.fsck.k9.K9; import com.fsck.k9.activity.MessageCompose; import com.fsck.k9.activity.MessageCompose.Action; import com.fsck.k9.message.extractors.BodyTextExtractor; diff --git a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java index a450b28d444..7adf91ad196 100644 --- a/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/crypto/MessageCryptoAnnotations.java @@ -3,8 +3,6 @@ import java.util.HashMap; -import android.support.annotation.VisibleForTesting; - import com.fsck.k9.mail.Part; import com.fsck.k9.mailstore.CryptoResultAnnotation; diff --git a/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java b/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java index 199ba1053b7..dfd87441b76 100644 --- a/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageExtractorLoader.java @@ -7,7 +7,6 @@ import android.support.annotation.WorkerThread; import timber.log.Timber; -import com.fsck.k9.K9; import com.fsck.k9.mail.Message; import com.fsck.k9.mailstore.LocalMessage; import com.fsck.k9.mailstore.MessageViewInfoExtractor; diff --git a/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java b/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java index 9a6ed65f2ec..322e312abd6 100644 --- a/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java +++ b/k9mail/src/main/java/com/fsck/k9/ui/message/LocalMessageLoader.java @@ -6,7 +6,6 @@ import timber.log.Timber; import com.fsck.k9.Account; -import com.fsck.k9.K9; import com.fsck.k9.activity.MessageReference; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.mail.MessagingException; diff --git a/k9mail/src/main/java/com/fsck/k9/view/ClientCertificateSpinner.java b/k9mail/src/main/java/com/fsck/k9/view/ClientCertificateSpinner.java index b72fb82647f..9b17b4fec86 100644 --- a/k9mail/src/main/java/com/fsck/k9/view/ClientCertificateSpinner.java +++ b/k9mail/src/main/java/com/fsck/k9/view/ClientCertificateSpinner.java @@ -1,7 +1,6 @@ package com.fsck.k9.view; -import com.fsck.k9.K9; import com.fsck.k9.R; import android.app.Activity; diff --git a/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java b/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java index 1ac137b0520..4096eb72068 100644 --- a/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java +++ b/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java @@ -24,7 +24,6 @@ import android.webkit.WebView; import com.fsck.k9.Clock; -import com.fsck.k9.K9; import com.fsck.k9.Throttle; import com.fsck.k9.helper.Utility; diff --git a/k9mail/src/main/java/com/fsck/k9/view/ThemeUtils.java b/k9mail/src/main/java/com/fsck/k9/view/ThemeUtils.java index 1a6771382bb..b38c8c0ef54 100644 --- a/k9mail/src/main/java/com/fsck/k9/view/ThemeUtils.java +++ b/k9mail/src/main/java/com/fsck/k9/view/ThemeUtils.java @@ -5,7 +5,6 @@ import android.content.res.Resources.Theme; import android.support.annotation.AttrRes; import android.support.annotation.ColorInt; -import android.support.annotation.ColorRes; import android.support.annotation.UiThread; import android.util.TypedValue; diff --git a/k9mail/src/test/java/com/fsck/k9/account/AccountCreatorTest.java b/k9mail/src/test/java/com/fsck/k9/account/AccountCreatorTest.java index 287239d8955..5c67ae0e3b4 100644 --- a/k9mail/src/test/java/com/fsck/k9/account/AccountCreatorTest.java +++ b/k9mail/src/test/java/com/fsck/k9/account/AccountCreatorTest.java @@ -3,7 +3,6 @@ import com.fsck.k9.Account.DeletePolicy; import com.fsck.k9.mail.ConnectionSecurity; -import com.fsck.k9.mail.ServerSettings; import com.fsck.k9.mail.ServerSettings.Type; import org.junit.Test; diff --git a/k9mail/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java b/k9mail/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java index c5e823e88a7..e76978ea279 100644 --- a/k9mail/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java +++ b/k9mail/src/test/java/com/fsck/k9/autocrypt/AutocryptHeaderTest.java @@ -3,7 +3,6 @@ import java.util.HashMap; -import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; diff --git a/k9mail/src/test/java/com/fsck/k9/helper/IdentityHelperTest.java b/k9mail/src/test/java/com/fsck/k9/helper/IdentityHelperTest.java index c45de73ee85..4db995759b3 100644 --- a/k9mail/src/test/java/com/fsck/k9/helper/IdentityHelperTest.java +++ b/k9mail/src/test/java/com/fsck/k9/helper/IdentityHelperTest.java @@ -14,14 +14,12 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; import java.io.ByteArrayInputStream; import java.io.InputStream; import java.util.ArrayList; import java.util.List; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; @RunWith(K9RobolectricTestRunner.class) diff --git a/k9mail/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java b/k9mail/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java index d0e196bc124..db28fd6df0a 100644 --- a/k9mail/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java +++ b/k9mail/src/test/java/com/fsck/k9/mailstore/LocalStoreTest.java @@ -3,7 +3,6 @@ import com.fsck.k9.mail.Part; import com.fsck.k9.mail.internet.MimeBodyPart; -import com.fsck.k9.mail.internet.MimeMessage; import com.fsck.k9.mail.internet.MimeMultipart; import org.junit.Test;