From 5b88a99de03d2418a30efd85c632c981ff7c15e1 Mon Sep 17 00:00:00 2001 From: cketti Date: Thu, 4 Nov 2010 03:11:34 +0000 Subject: [PATCH] Got rid of some compiler warnings. --- .../fsck/k9/activity/FolderInfoHolder.java | 62 ------------------- src/com/fsck/k9/activity/MessageView.java | 1 - .../k9/activity/setup/AccountSettings.java | 1 - .../k9/controller/MessagingController.java | 20 ++++-- src/com/fsck/k9/crypto/Apg.java | 1 - src/com/fsck/k9/crypto/None.java | 1 - src/com/fsck/k9/mail/internet/MimeHeader.java | 1 + src/com/fsck/k9/service/MailService.java | 7 +-- 8 files changed, 18 insertions(+), 76 deletions(-) diff --git a/src/com/fsck/k9/activity/FolderInfoHolder.java b/src/com/fsck/k9/activity/FolderInfoHolder.java index 3907213d8..9c6487df8 100644 --- a/src/com/fsck/k9/activity/FolderInfoHolder.java +++ b/src/com/fsck/k9/activity/FolderInfoHolder.java @@ -1,75 +1,13 @@ package com.fsck.k9.activity; -import java.util.ArrayList; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import android.app.AlertDialog; -import android.app.Dialog; import android.content.Context; -import android.content.DialogInterface; -import android.content.Intent; -import android.graphics.Typeface; -import android.graphics.drawable.Drawable; -import android.os.Bundle; -import android.os.Handler; -import android.text.Spannable; -import android.text.style.TextAppearanceSpan; -import android.util.Config; import android.util.Log; -import android.util.TypedValue; -import android.view.ContextMenu; -import android.view.ContextMenu.ContextMenuInfo; -import android.view.GestureDetector; -import android.view.GestureDetector.SimpleOnGestureListener; -import android.view.KeyEvent; -import android.view.LayoutInflater; -import android.view.Menu; -import android.view.MenuItem; -import android.view.MotionEvent; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.Window; -import android.widget.AdapterView; -import android.widget.AdapterView.AdapterContextMenuInfo; -import android.widget.BaseAdapter; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.ImageButton; -import android.widget.ListView; -import android.widget.ProgressBar; -import android.widget.TextView; -import android.widget.Toast; -import android.text.format.DateFormat; import com.fsck.k9.Account; -import com.fsck.k9.AccountStats; -import com.fsck.k9.FontSizes; import com.fsck.k9.K9; -import com.fsck.k9.Preferences; import com.fsck.k9.R; -import com.fsck.k9.SearchSpecification; -import com.fsck.k9.activity.setup.AccountSettings; -import com.fsck.k9.activity.setup.FolderSettings; -import com.fsck.k9.activity.setup.Prefs; -import com.fsck.k9.controller.MessagingController; -import com.fsck.k9.controller.MessagingController.SORT_TYPE; -import com.fsck.k9.controller.MessagingListener; -import com.fsck.k9.helper.Utility; -import com.fsck.k9.mail.Address; -import com.fsck.k9.mail.Flag; import com.fsck.k9.mail.Folder; -import com.fsck.k9.mail.Message; -import com.fsck.k9.mail.Message.RecipientType; import com.fsck.k9.mail.MessagingException; -import com.fsck.k9.mail.store.LocalStore; -import com.fsck.k9.mail.store.LocalStore.LocalFolder; -import com.fsck.k9.mail.store.LocalStore.LocalMessage; public class FolderInfoHolder implements Comparable { diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java index e6ddbf133..dcbe893a8 100644 --- a/src/com/fsck/k9/activity/MessageView.java +++ b/src/com/fsck/k9/activity/MessageView.java @@ -2320,7 +2320,6 @@ public class MessageView extends K9Activity implements OnClickListener if (text != null) { final String emailText = text; - final String mimeType = type; mHandler.post(new Runnable() { public void run() diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/src/com/fsck/k9/activity/setup/AccountSettings.java index f071688d7..014f6dff5 100644 --- a/src/com/fsck/k9/activity/setup/AccountSettings.java +++ b/src/com/fsck/k9/activity/setup/AccountSettings.java @@ -37,7 +37,6 @@ public class AccountSettings extends K9PreferenceActivity private static final int ACTIVITY_MANAGE_IDENTITIES = 2; - private static final String PREFERENCE_TOP_CATERGORY = "account_settings"; private static final String PREFERENCE_DESCRIPTION = "account_description"; private static final String PREFERENCE_COMPOSITION = "composition"; private static final String PREFERENCE_MANAGE_IDENTITIES = "manage_identities"; diff --git a/src/com/fsck/k9/controller/MessagingController.java b/src/com/fsck/k9/controller/MessagingController.java index 8f46e749f..5f2f3f49f 100644 --- a/src/com/fsck/k9/controller/MessagingController.java +++ b/src/com/fsck/k9/controller/MessagingController.java @@ -4295,9 +4295,11 @@ public class MessagingController implements Runnable if (modeMismatch(aDisplayMode, fDisplayClass)) { // Never sync a folder that isn't displayed - if (K9.DEBUG && false) + /* + if (K9.DEBUG) Log.v(K9.LOG_TAG, "Not syncing folder " + folder.getName() + " which is in display mode " + fDisplayClass + " while account is in display mode " + aDisplayMode); + */ continue; } @@ -4305,9 +4307,11 @@ public class MessagingController implements Runnable if (modeMismatch(aSyncMode, fSyncClass)) { // Do not sync folders in the wrong class - if (K9.DEBUG && false) + /* + if (K9.DEBUG) Log.v(K9.LOG_TAG, "Not syncing folder " + folder.getName() + " which is in sync mode " + fSyncClass + " while account is in sync mode " + aSyncMode); + */ continue; } @@ -4939,9 +4943,11 @@ public class MessagingController implements Runnable if (folder.getName().equals(account.getErrorFolderName()) || folder.getName().equals(account.getOutboxFolderName())) { - if (K9.DEBUG && false) + /* + if (K9.DEBUG) Log.v(K9.LOG_TAG, "Not pushing folder " + folder.getName() + " which should never be pushed"); + */ continue; } @@ -4954,9 +4960,11 @@ public class MessagingController implements Runnable if (modeMismatch(aDisplayMode, fDisplayClass)) { // Never push a folder that isn't displayed - if (K9.DEBUG && false) + /* + if (K9.DEBUG) Log.v(K9.LOG_TAG, "Not pushing folder " + folder.getName() + " which is in display class " + fDisplayClass + " while account is in display mode " + aDisplayMode); + */ continue; } @@ -4964,9 +4972,11 @@ public class MessagingController implements Runnable if (modeMismatch(aPushMode, fPushClass)) { // Do not push folders in the wrong class - if (K9.DEBUG && false) + /* + if (K9.DEBUG) Log.v(K9.LOG_TAG, "Not pushing folder " + folder.getName() + " which is in push mode " + fPushClass + " while account is in push mode " + aPushMode); + */ continue; } diff --git a/src/com/fsck/k9/crypto/Apg.java b/src/com/fsck/k9/crypto/Apg.java index 2cf6b73e9..ebdb883ca 100644 --- a/src/com/fsck/k9/crypto/Apg.java +++ b/src/com/fsck/k9/crypto/Apg.java @@ -14,7 +14,6 @@ import android.database.Cursor; import android.net.Uri; import android.widget.Toast; -import com.fsck.k9.Account; import com.fsck.k9.R; import com.fsck.k9.activity.MessageCompose; import com.fsck.k9.activity.MessageView; diff --git a/src/com/fsck/k9/crypto/None.java b/src/com/fsck/k9/crypto/None.java index 21fbe3af1..5b14a6fb5 100644 --- a/src/com/fsck/k9/crypto/None.java +++ b/src/com/fsck/k9/crypto/None.java @@ -3,7 +3,6 @@ package com.fsck.k9.crypto; import android.app.Activity; import android.content.Context; -import com.fsck.k9.Account; import com.fsck.k9.mail.Message; /** diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/src/com/fsck/k9/mail/internet/MimeHeader.java index 03f5c9f01..1b260cf9f 100644 --- a/src/com/fsck/k9/mail/internet/MimeHeader.java +++ b/src/com/fsck/k9/mail/internet/MimeHeader.java @@ -164,6 +164,7 @@ public class MimeHeader this.value = value; } + @Override public String toString() { StringBuilder sb = new StringBuilder("("); diff --git a/src/com/fsck/k9/service/MailService.java b/src/com/fsck/k9/service/MailService.java index 93590bc55..7d2a42aa8 100644 --- a/src/com/fsck/k9/service/MailService.java +++ b/src/com/fsck/k9/service/MailService.java @@ -4,9 +4,6 @@ package com.fsck.k9.service; import java.util.Collection; import java.util.Date; -import android.app.Notification; -import android.app.NotificationManager; -import android.app.PendingIntent; import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; @@ -19,7 +16,6 @@ import android.util.Log; import com.fsck.k9.Account; import com.fsck.k9.K9; import com.fsck.k9.Preferences; -import com.fsck.k9.R; import com.fsck.k9.Account.FolderMode; import com.fsck.k9.controller.MessagingController; import com.fsck.k9.helper.AutoSyncHelper; @@ -244,7 +240,7 @@ public class MailService extends CoreService private void notifyConnectionStatus(boolean hasConnectivity) { - if (true) return; + /* NotificationManager notifMgr = (NotificationManager)getApplication().getSystemService(Context.NOTIFICATION_SERVICE); if (!hasConnectivity) @@ -271,6 +267,7 @@ public class MailService extends CoreService { notifMgr.cancel(K9.CONNECTIVITY_ID); } + */ } @Override