From 8279092070974292b852473abc0df5025b5be04d Mon Sep 17 00:00:00 2001 From: cketti Date: Tue, 18 Jan 2011 23:54:49 +0000 Subject: [PATCH] Fixed lots of warnings (unused imports/variables, missing annotations, etc.) --- src/com/fsck/k9/K9.java | 2 +- src/com/fsck/k9/Preferences.java | 1 - src/com/fsck/k9/activity/FolderListFilter.java | 1 - src/com/fsck/k9/activity/MessageCompose.java | 2 -- src/com/fsck/k9/activity/MessageInfoHolder.java | 5 ++--- src/com/fsck/k9/activity/MessageView.java | 2 -- src/com/fsck/k9/activity/setup/AccountSettings.java | 12 +++++------- .../fsck/k9/activity/setup/AccountSetupBasics.java | 1 + .../fsck/k9/activity/setup/AccountSetupIncoming.java | 4 +--- .../fsck/k9/activity/setup/AccountSetupOutgoing.java | 1 + src/com/fsck/k9/activity/setup/Prefs.java | 1 - src/com/fsck/k9/controller/MessagingController.java | 4 ++-- src/com/fsck/k9/helper/HtmlConverter.java | 1 - src/com/fsck/k9/helper/MessageHelper.java | 4 ---- src/com/fsck/k9/mail/internet/DecoderUtil.java | 1 - src/com/fsck/k9/mail/internet/MimeHeader.java | 1 - src/com/fsck/k9/mail/internet/MimeMessage.java | 1 + src/com/fsck/k9/mail/internet/MimeUtility.java | 1 - src/com/fsck/k9/mail/store/LocalStore.java | 3 --- src/com/fsck/k9/provider/AttachmentProvider.java | 1 - src/com/fsck/k9/view/MessageHeader.java | 2 +- src/com/fsck/k9/view/MessageWebView.java | 8 +------- 22 files changed, 16 insertions(+), 43 deletions(-) diff --git a/src/com/fsck/k9/K9.java b/src/com/fsck/k9/K9.java index 58c104b5d..8bd3aa548 100644 --- a/src/com/fsck/k9/K9.java +++ b/src/com/fsck/k9/K9.java @@ -599,7 +599,7 @@ public class K9 extends Application try { - Class strictMode = Class.forName("android.os.StrictMode"); + Class strictMode = Class.forName("android.os.StrictMode"); Method enableDefaults = strictMode.getMethod("enableDefaults"); enableDefaults.invoke(strictMode); } diff --git a/src/com/fsck/k9/Preferences.java b/src/com/fsck/k9/Preferences.java index 20a7da66d..5769267f8 100644 --- a/src/com/fsck/k9/Preferences.java +++ b/src/com/fsck/k9/Preferences.java @@ -3,7 +3,6 @@ package com.fsck.k9; import java.util.ArrayList; import java.util.Collection; -import java.util.Collections; import java.util.List; import android.content.Context; import android.content.SharedPreferences; diff --git a/src/com/fsck/k9/activity/FolderListFilter.java b/src/com/fsck/k9/activity/FolderListFilter.java index 2283b9239..cf248b201 100644 --- a/src/com/fsck/k9/activity/FolderListFilter.java +++ b/src/com/fsck/k9/activity/FolderListFilter.java @@ -77,7 +77,6 @@ public class FolderListFilter extends Filter final int wordCount = words.length; final ArrayList values = mOriginalValues; - final int count = values.size(); final ArrayList newValues = new ArrayList(); diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/src/com/fsck/k9/activity/MessageCompose.java index d8561b63c..5f9ebc2ba 100644 --- a/src/com/fsck/k9/activity/MessageCompose.java +++ b/src/com/fsck/k9/activity/MessageCompose.java @@ -2934,8 +2934,6 @@ public class MessageCompose extends K9Activity implements OnClickListener, OnFoc */ private InsertableHtmlContent quoteOriginalHtmlMessage(final Message originalMessage, final String messageBody, final QuoteStyle quoteStyle) throws MessagingException { - String body = messageBody == null ? "" : messageBody; - InsertableHtmlContent insertable = findInsertionPoints(messageBody); if (quoteStyle == QuoteStyle.PREFIX) diff --git a/src/com/fsck/k9/activity/MessageInfoHolder.java b/src/com/fsck/k9/activity/MessageInfoHolder.java index 4085bd92c..d12ca12ff 100644 --- a/src/com/fsck/k9/activity/MessageInfoHolder.java +++ b/src/com/fsck/k9/activity/MessageInfoHolder.java @@ -1,8 +1,7 @@ package com.fsck.k9.activity; -import com.fsck.k9.helper.MessageHelper; -import java.util.Date; -import com.fsck.k9.mail.Message; +import java.util.Date; +import com.fsck.k9.helper.MessageHelper; import com.fsck.k9.mail.store.LocalStore.LocalMessage; public class MessageInfoHolder diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index 885921f8b..8de9300b5 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -11,7 +11,6 @@ import android.content.res.Configuration; import android.database.Cursor; import android.net.Uri; import android.os.Bundle; -import android.os.Environment; import android.os.Handler; import android.util.Config; import android.util.Log; @@ -83,7 +82,6 @@ public class MessageView extends K9Activity implements OnClickListener private Menu optionsMenu = null; private Listener mListener = new Listener(); private MessageViewHandler mHandler = new MessageViewHandler(); - private FontSizes mFontSizes = K9.getFontSizes(); private Contacts mContacts; private StorageManager.StorageListener mStorageListener = new StorageListenerImplementation(); diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index 52a4a4265..089938bfd 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -32,10 +32,8 @@ import com.fsck.k9.crypto.Apg; import com.fsck.k9.mail.Store; import com.fsck.k9.service.MailService; -import com.fsck.k9.mail.store.LocalStore; import com.fsck.k9.mail.store.StorageManager; import com.fsck.k9.mail.store.LocalStore.LocalFolder; -import com.fsck.k9.mail.store.StorageManager.StorageProvider; public class AccountSettings extends K9PreferenceActivity @@ -966,6 +964,8 @@ public class AccountSettings extends K9PreferenceActivity List folders = new LinkedList(); String[] allFolderValues; String[] allFolderLabels; + + @Override protected Void doInBackground(Void... params) { try @@ -997,7 +997,7 @@ public class AccountSettings extends K9PreferenceActivity return null; } - + @Override protected void onPreExecute() { mAutoExpandFolder = (ListPreference)findPreference(PREFERENCE_AUTO_EXPAND_FOLDER); @@ -1016,6 +1016,8 @@ public class AccountSettings extends K9PreferenceActivity mTrashFolder.setEnabled(false); } + + @Override protected void onPostExecute(Void res) { initListPreference(mAutoExpandFolder, mAccount.getAutoExpandFolderName(), allFolderLabels,allFolderValues); @@ -1032,10 +1034,6 @@ public class AccountSettings extends K9PreferenceActivity mSentFolder.setEnabled(true); mSpamFolder.setEnabled(true); mTrashFolder.setEnabled(true); - } - } - - } diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java index f7c385790..2df9c811a 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupBasics.java @@ -274,6 +274,7 @@ public class AccountSetupBasics extends K9Activity } } + @Override protected void onNext() { String email = mEmailView.getText().toString(); diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java index 0d61b4390..67f229d49 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java @@ -13,17 +13,14 @@ import android.view.View.OnClickListener; import android.widget.*; import com.fsck.k9.*; -import com.fsck.k9.activity.ChooseFolder; import com.fsck.k9.activity.K9Activity; import com.fsck.k9.helper.Utility; -import com.fsck.k9.mail.store.StorageManager; import java.io.UnsupportedEncodingException; import java.net.URI; import java.net.URISyntaxException; import java.net.URLDecoder; import java.net.URLEncoder; -import java.util.Map; public class AccountSetupIncoming extends K9Activity implements OnClickListener { @@ -462,6 +459,7 @@ public class AccountSetupIncoming extends K9Activity implements OnClickListener } } + @Override protected void onNext() { try diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java index 349b422cb..42a31d733 100644 --- a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java +++ b/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java @@ -330,6 +330,7 @@ public class AccountSetupOutgoing extends K9Activity implements OnClickListener, } } + @Override protected void onNext() { int securityType = (Integer)((SpinnerOption)mSecurityTypeView.getSelectedItem()).value; diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/src/com/fsck/k9/activity/setup/Prefs.java index 910cfe5fb..c81fc6f37 100644 --- a/src/com/fsck/k9/activity/setup/Prefs.java +++ b/src/com/fsck/k9/activity/setup/Prefs.java @@ -15,7 +15,6 @@ import android.preference.ListPreference; import android.preference.Preference; import android.view.KeyEvent; import android.widget.Toast; -import android.widget.TimePicker; import com.fsck.k9.K9; import com.fsck.k9.Preferences; diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index e112dab8b..faa1c8f56 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -1546,8 +1546,8 @@ public class MessagingController implements Runnable final LocalFolder localFolder, final Folder remoteFolder, final Account account, - final List unsyncedMessages, - final ArrayList syncFlagMessages, + final List unsyncedMessages, + final ArrayList syncFlagMessages, boolean flagSyncOnly) throws MessagingException { if (message.isSet(Flag.DELETED)) diff --git a/src/com/fsck/k9/helper/HtmlConverter.java b/src/com/fsck/k9/helper/HtmlConverter.java index 5938ea07c..de7d28ed3 100644 --- a/src/com/fsck/k9/helper/HtmlConverter.java +++ b/src/com/fsck/k9/helper/HtmlConverter.java @@ -9,7 +9,6 @@ import java.io.IOException; import java.io.StringReader; import java.util.Collections; import java.util.HashSet; -import java.util.List; import java.util.Set; import java.util.regex.Matcher; diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/src/com/fsck/k9/helper/MessageHelper.java index 36ce47ec2..c9b0c84de 100644 --- a/src/com/fsck/k9/helper/MessageHelper.java +++ b/src/com/fsck/k9/helper/MessageHelper.java @@ -40,13 +40,10 @@ public class MessageHelper private DateFormat mDateFormat; - private DateFormat mTimeFormat; - private MessageHelper(final Context context) { mContext = context; mDateFormat = DateFormatter.getDateFormat(mContext); - mTimeFormat = android.text.format.DateFormat.getTimeFormat(mContext); mTodayDateFormat = android.text.format.DateFormat.getTimeFormat(mContext); } @@ -58,7 +55,6 @@ public class MessageHelper { LocalMessage message = (LocalMessage) m; target.message = message; - Date date = message.getSentDate(); target.compareDate = message.getSentDate(); if (target.compareDate == null) { diff --git a/src/com/fsck/k9/mail/internet/DecoderUtil.java b/src/com/fsck/k9/mail/internet/DecoderUtil.java index 7d108bb18..22f0011dd 100644 --- a/src/com/fsck/k9/mail/internet/DecoderUtil.java +++ b/src/com/fsck/k9/mail/internet/DecoderUtil.java @@ -6,7 +6,6 @@ import com.fsck.k9.K9; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.MessagingException; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.UnsupportedEncodingException; import org.apache.james.mime4j.decoder.Base64InputStream; diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java index 49803b9b9..1f4e905a5 100644 --- a/src/com/fsck/k9/mail/internet/MimeHeader.java +++ b/src/com/fsck/k9/mail/internet/MimeHeader.java @@ -2,7 +2,6 @@ package com.fsck.k9.mail.internet; import com.fsck.k9.helper.Utility; -import com.fsck.k9.mail.MessagingException; import org.apache.james.mime4j.codec.EncoderUtil; import java.io.BufferedWriter; diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/src/com/fsck/k9/mail/internet/MimeMessage.java index a5029baaa..20b4a4dc7 100644 --- a/src/com/fsck/k9/mail/internet/MimeMessage.java +++ b/src/com/fsck/k9/mail/internet/MimeMessage.java @@ -501,6 +501,7 @@ public class MimeMessage extends Message } } + @Override public void setCharset(String charset) throws MessagingException { if (mBody instanceof Multipart) diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java index d2f6311bf..72eca8f9c 100644 --- a/src/com/fsck/k9/mail/internet/MimeUtility.java +++ b/src/com/fsck/k9/mail/internet/MimeUtility.java @@ -1,7 +1,6 @@ package com.fsck.k9.mail.internet; -import android.os.Build.VERSION; import android.util.Log; import com.fsck.k9.K9; import com.fsck.k9.mail.*; diff --git a/src/com/fsck/k9/mail/store/LocalStore.java b/src/com/fsck/k9/mail/store/LocalStore.java index beb22c2fc..11b6c48f9 100644 --- a/src/com/fsck/k9/mail/store/LocalStore.java +++ b/src/com/fsck/k9/mail/store/LocalStore.java @@ -28,7 +28,6 @@ import android.net.Uri; import android.util.Log; import com.fsck.k9.Account; -import com.fsck.k9.Account.FolderMode; import com.fsck.k9.AccountStats; import com.fsck.k9.K9; import com.fsck.k9.Preferences; @@ -41,7 +40,6 @@ import com.fsck.k9.mail.BodyPart; import com.fsck.k9.mail.FetchProfile; import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Folder; -import com.fsck.k9.mail.Folder.FolderClass; import com.fsck.k9.mail.Message; import com.fsck.k9.mail.Message.RecipientType; import com.fsck.k9.mail.MessagingException; @@ -1295,7 +1293,6 @@ public class LocalStore extends Store implements Serializable private FolderClass mSyncClass = FolderClass.INHERITED; private FolderClass mPushClass = FolderClass.SECOND_CLASS; private boolean mInTopGroup = false; - private String prefId = null; private String mPushState = null; private boolean mIntegrate = false; // mLastUid is used during syncs. It holds the highest UID within the local folder so we diff --git a/src/com/fsck/k9/provider/AttachmentProvider.java b/src/com/fsck/k9/provider/AttachmentProvider.java index 6953dc136..abdfac6c9 100644 --- a/src/com/fsck/k9/provider/AttachmentProvider.java +++ b/src/com/fsck/k9/provider/AttachmentProvider.java @@ -5,7 +5,6 @@ import android.content.ContentValues; import android.content.Context; import android.database.Cursor; import android.database.MatrixCursor; -import android.database.sqlite.SQLiteDatabase; import android.graphics.Bitmap; import android.graphics.BitmapFactory; import android.net.Uri; diff --git a/src/com/fsck/k9/view/MessageHeader.java b/src/com/fsck/k9/view/MessageHeader.java index 984c41155..abb59f0d9 100644 --- a/src/com/fsck/k9/view/MessageHeader.java +++ b/src/com/fsck/k9/view/MessageHeader.java @@ -2,7 +2,6 @@ package com.fsck.k9.view; import android.content.Context; import android.graphics.Typeface; -import android.graphics.drawable.Drawable; import android.text.SpannableString; import android.text.SpannableStringBuilder; import android.text.style.StyleSpan; @@ -32,6 +31,7 @@ import java.util.LinkedList; import java.util.List; import java.util.Set; import java.text.DateFormat; + public class MessageHeader extends LinearLayout { private Context mContext; diff --git a/src/com/fsck/k9/view/MessageWebView.java b/src/com/fsck/k9/view/MessageWebView.java index dd8f6afb3..4c8f9c256 100644 --- a/src/com/fsck/k9/view/MessageWebView.java +++ b/src/com/fsck/k9/view/MessageWebView.java @@ -13,13 +13,6 @@ import com.fsck.k9.R; import java.lang.reflect.Method; -/** - * Created by IntelliJ IDEA. - * User: jesse - * Date: 12/25/10 - * Time: 3:57 PM - * To change this template use File | Settings | File Templates. - */ public class MessageWebView extends WebView { @@ -125,6 +118,7 @@ public class MessageWebView extends WebView * Emulate the shift key being pressed to trigger the text selection mode * of a WebView. */ + @Override public void emulateShiftHeld() { try