Clean up a bunch of warnings

Bug: 9565838
Change-Id: Ie3a380581e81c63aaa0764875c55bfdccd5f2b13

40 files changed, 69 insertions, 140 deletions

diff --git a/src/com/android/emailcommon/internet/MimeMessage.java b/src/com/android/emailcommon/internet/MimeMessage.java
index b3ee70ee4..7661b0284 100644
--- a/src/com/android/emailcommon/internet/MimeMessage.java
+++ b/src/com/android/emailcommon/internet/MimeMessage.java
@@ -94,7 +94,7 @@ public class MimeMessage extends Message {
      * installed lazily.  Any remote (typically server-assigned) message id takes precedence.
      * @return a long, locally-generated message-ID value
      */
-    private String generateMessageId() {
+    private static String generateMessageId() {
         StringBuffer sb = new StringBuffer();
         sb.append("<");
         for (int i = 0; i < 24; i++) {
@@ -524,7 +524,7 @@ public class MimeMessage extends Message {
         public MimeMessageBuilder() {
         }
 
-        private void expect(Class c) {
+        private void expect(Class<?> c) {
             if (!c.isInstance(stack.peek())) {
                 throw new IllegalStateException("Internal stack error: " + "Expected '"
                         + c.getName() + "' found '" + stack.peek().getClass().getName() + "'");
diff --git a/src/com/android/emailcommon/utility/TextUtilities.java b/src/com/android/emailcommon/utility/TextUtilities.java
index 0aa919098..138623dcd 100755
--- a/src/com/android/emailcommon/utility/TextUtilities.java
+++ b/src/com/android/emailcommon/utility/TextUtilities.java
@@ -545,7 +545,7 @@ public class TextUtilities {
         int mMatchLength = 0;
         int mMatchStart = -1;
 
-        SearchTerm(String term, boolean html) {
+        SearchTerm(String term) {
             mTerm = term;
             mTermLowerCase = term.toLowerCase();
             mLength = term.length();
@@ -575,7 +575,7 @@ public class TextUtilities {
         if (query != null) {
             StringTokenizer st = new StringTokenizer(query);
             while (st.hasMoreTokens()) {
-                terms.add(new SearchTerm(st.nextToken(), html));
+                terms.add(new SearchTerm(st.nextToken()));
             }
         }
 
diff --git a/src/com/android/mail/EmailAddress.java b/src/com/android/mail/EmailAddress.java
index 2c5638885..67e08405d 100644
--- a/src/com/android/mail/EmailAddress.java
+++ b/src/com/android/mail/EmailAddress.java
@@ -86,7 +86,7 @@ public class EmailAddress {
                 address = Html.fromHtml(tokens[0].getAddress()).toString();
             } else {
                 name = "";
-                address = rawAddress == null ? "" : Html.fromHtml(rawAddress).toString();
+                address = Html.fromHtml(rawAddress).toString();
             }
         }
         return new EmailAddress(name, address);
diff --git a/src/com/android/mail/adapter/DrawerItem.java b/src/com/android/mail/adapter/DrawerItem.java
index 06a9365a4..00f76f310 100644
--- a/src/com/android/mail/adapter/DrawerItem.java
+++ b/src/com/android/mail/adapter/DrawerItem.java
@@ -222,7 +222,7 @@ public class DrawerItem {
                 VIEW_WAITING_FOR_SYNC, activity, null, INERT_HEADER, null, -1, false, -1);
     }
 
-    private String waitToString() {
+    private static String waitToString() {
         return "[DrawerItem VIEW_WAITING_FOR_SYNC ]";
     }
 
diff --git a/src/com/android/mail/browse/ConversationCursor.java b/src/com/android/mail/browse/ConversationCursor.java
index f17e42caa..a992f7cc1 100644
--- a/src/com/android/mail/browse/ConversationCursor.java
+++ b/src/com/android/mail/browse/ConversationCursor.java
@@ -341,10 +341,9 @@ public final class ConversationCursor implements Cursor, ConversationCursorOpera
             final Map<Long, Integer> idPositionMap;
             final UnderlyingRowData[] cache;
             final int count;
-            final StringBuilder uriBuilder = new StringBuilder();
             int numCached = 0;
             Utils.traceBeginSection("blockingCaching");
-            if (result != null && super.moveToFirst()) {
+            if (super.moveToFirst()) {
                 count = super.getCount();
                 cache = new UnderlyingRowData[count];
                 int i = 0;
diff --git a/src/com/android/mail/browse/ConversationItemView.java b/src/com/android/mail/browse/ConversationItemView.java
index 79a820a0a..d1d0fbc83 100644
--- a/src/com/android/mail/browse/ConversationItemView.java
+++ b/src/com/android/mail/browse/ConversationItemView.java
@@ -592,10 +592,10 @@ public class ConversationItemView extends View implements SwipeableItemView, Tog
         // Subject.
         createSubject(mHeader.unread);
 
-        if (!mHeader.isLayoutValid(mContext)) {
+        if (!mHeader.isLayoutValid()) {
             setContentDescription();
         }
-        mHeader.validate(mContext);
+        mHeader.validate();
 
         pauseTimer(PERF_TAG_LAYOUT);
         if (sTimer != null && ++sLayoutCount >= PERF_LAYOUT_ITERATIONS) {
@@ -681,7 +681,7 @@ public class ConversationItemView extends View implements SwipeableItemView, Tog
             loadAttachmentPreviews();
         }
 
-        if (mHeader.isLayoutValid(mContext)) {
+        if (mHeader.isLayoutValid()) {
             pauseTimer(PERF_TAG_CALCULATE_TEXTS_BITMAPS);
             return;
         }
@@ -983,9 +983,7 @@ public class ConversationItemView extends View implements SwipeableItemView, Tog
             builder.append(fragmentDisplayText);
         }
         mHeader.styledMessageInfoStringOffset = builder.length();
-        if (messageInfoString != null) {
-            builder.append(messageInfoString);
-        }
+        builder.append(messageInfoString);
         mHeader.styledSendersString = builder;
         return (int)totalWidth;
     }
diff --git a/src/com/android/mail/browse/ConversationItemViewCoordinates.java b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
index 4da7866ef..85b016651 100644
--- a/src/com/android/mail/browse/ConversationItemViewCoordinates.java
+++ b/src/com/android/mail/browse/ConversationItemViewCoordinates.java
@@ -510,7 +510,6 @@ public class ConversationItemViewCoordinates {
     // forConfig's measure/layout
     public static void refreshConversationDimens(Context context) {
         Resources res = context.getResources();
-        float density = res.getDisplayMetrics().scaledDensity;
 
         // Attachment previews height
         sAttachmentPreviewsHeights = new int[ATTACHMENT_PREVIEW_MODE_COUNT];
diff --git a/src/com/android/mail/browse/ConversationItemViewModel.java b/src/com/android/mail/browse/ConversationItemViewModel.java
index fa013229b..303ec5902 100644
--- a/src/com/android/mail/browse/ConversationItemViewModel.java
+++ b/src/com/android/mail/browse/ConversationItemViewModel.java
@@ -149,19 +149,17 @@ public class ConversationItemViewModel {
     static ConversationItemViewModel forConversation(String account, Conversation conv) {
         ConversationItemViewModel header = ConversationItemViewModel.forConversationId(account,
                 conv.id);
-        if (conv != null) {
-            header.conversation = conv;
-            header.unread = !conv.read;
-            header.hasBeenForwarded =
-                    (conv.convFlags & UIProvider.ConversationFlags.FORWARDED)
-                    == UIProvider.ConversationFlags.FORWARDED;
-            header.hasBeenRepliedTo =
-                    (conv.convFlags & UIProvider.ConversationFlags.REPLIED)
-                    == UIProvider.ConversationFlags.REPLIED;
-            header.isInvite =
-                    (conv.convFlags & UIProvider.ConversationFlags.CALENDAR_INVITE)
-                    == UIProvider.ConversationFlags.CALENDAR_INVITE;
-        }
+        header.conversation = conv;
+        header.unread = !conv.read;
+        header.hasBeenForwarded =
+                (conv.convFlags & UIProvider.ConversationFlags.FORWARDED)
+                == UIProvider.ConversationFlags.FORWARDED;
+        header.hasBeenRepliedTo =
+                (conv.convFlags & UIProvider.ConversationFlags.REPLIED)
+                == UIProvider.ConversationFlags.REPLIED;
+        header.isInvite =
+                (conv.convFlags & UIProvider.ConversationFlags.CALENDAR_INVITE)
+                == UIProvider.ConversationFlags.CALENDAR_INVITE;
         return header;
     }
 
@@ -208,7 +206,7 @@ public class ConversationItemViewModel {
     /**
      * Returns the hashcode to compare if the data in the header is valid.
      */
-    private static int getHashCode(Context context, CharSequence dateText, Object convInfo,
+    private static int getHashCode(CharSequence dateText, Object convInfo,
             List<Folder> rawFolders, boolean starred, boolean read, int priority,
             int sendingState) {
         if (dateText == null) {
@@ -233,8 +231,8 @@ public class ConversationItemViewModel {
     /**
      * Marks this header as having valid data and layout.
      */
-    void validate(Context context) {
-        mDataHashCode = getHashCode(context, dateText,
+    void validate() {
+        mDataHashCode = getHashCode(dateText,
                 getConvInfo(), conversation.getRawFolders(), conversation.starred,
                 conversation.read, conversation.priority, conversation.sendingState);
         mLayoutHashCode = getLayoutHashCode();
@@ -243,8 +241,8 @@ public class ConversationItemViewModel {
     /**
      * Returns if the data in this model is valid.
      */
-    boolean isDataValid(Context context) {
-        return mDataHashCode == getHashCode(context, dateText,
+    boolean isDataValid() {
+        return mDataHashCode == getHashCode(dateText,
                 getConvInfo(), conversation.getRawFolders(), conversation.starred,
                 conversation.read, conversation.priority, conversation.sendingState);
     }
@@ -252,8 +250,8 @@ public class ConversationItemViewModel {
     /**
      * Returns if the layout in this model is valid.
      */
-    boolean isLayoutValid(Context context) {
-        return isDataValid(context) && mLayoutHashCode == getLayoutHashCode();
+    boolean isLayoutValid() {
+        return isDataValid() && mLayoutHashCode == getLayoutHashCode();
     }
 
     /**
diff --git a/src/com/android/mail/browse/ConversationPagerController.java b/src/com/android/mail/browse/ConversationPagerController.java
index 62551e0ca..ac23fbae6 100644
--- a/src/com/android/mail/browse/ConversationPagerController.java
+++ b/src/com/android/mail/browse/ConversationPagerController.java
@@ -175,7 +175,7 @@ public class ConversationPagerController {
         }
     }
 
-    public void onConversationSeen(Conversation conv) {
+    public void onConversationSeen() {
         if (mPagerAdapter == null) {
             return;
         }
diff --git a/src/com/android/mail/browse/MessageAttachmentBar.java b/src/com/android/mail/browse/MessageAttachmentBar.java
index b1d26cc9b..5de96cec9 100644
--- a/src/com/android/mail/browse/MessageAttachmentBar.java
+++ b/src/com/android/mail/browse/MessageAttachmentBar.java
@@ -311,7 +311,7 @@ public class MessageAttachmentBar extends FrameLayout implements OnClickListener
         }
     }
 
-    private void setButtonVisible(View button, boolean visible) {
+    private static void setButtonVisible(View button, boolean visible) {
         button.setVisibility(visible ? VISIBLE : GONE);
     }
 
diff --git a/src/com/android/mail/browse/MessageAttachmentTile.java b/src/com/android/mail/browse/MessageAttachmentTile.java
index 501189b75..ece218353 100644
--- a/src/com/android/mail/browse/MessageAttachmentTile.java
+++ b/src/com/android/mail/browse/MessageAttachmentTile.java
@@ -114,10 +114,10 @@ public class MessageAttachmentTile extends AttachmentTile implements OnClickList
 
     @Override
     public void onClick(View v) {
-        onClick(v.getId(), v);
+        onClick();
     }
 
-    private boolean onClick(int res, View v) {
+    private boolean onClick() {
         showAndDownloadAttachments();
         return true;
     }
diff --git a/src/com/android/mail/browse/MessageHeaderView.java b/src/com/android/mail/browse/MessageHeaderView.java
index 09a4c69d2..996290830 100644
--- a/src/com/android/mail/browse/MessageHeaderView.java
+++ b/src/com/android/mail/browse/MessageHeaderView.java
@@ -584,7 +584,7 @@ public class MessageHeaderView extends LinearLayout implements OnClickListener,
         return TextUtils.isEmpty(displayName) ? null : sender.getAddress();
     }
 
-    private void setChildVisibility(int visibility, View... children) {
+    private static void setChildVisibility(int visibility, View... children) {
         for (View v : children) {
             if (v != null) {
                 v.setVisibility(visibility);
diff --git a/src/com/android/mail/compose/AttachmentsView.java b/src/com/android/mail/compose/AttachmentsView.java
index 9e2c4bae4..650622e10 100644
--- a/src/com/android/mail/compose/AttachmentsView.java
+++ b/src/com/android/mail/compose/AttachmentsView.java
@@ -331,8 +331,7 @@ class AttachmentsView extends LinearLayout {
         return attachment.size;
     }
 
-    @VisibleForTesting
-    private int getSizeFromFile(Uri uri, ContentResolver contentResolver) {
+    private static int getSizeFromFile(Uri uri, ContentResolver contentResolver) {
         int size = -1;
         ParcelFileDescriptor file = null;
         try {
@@ -358,7 +357,8 @@ class AttachmentsView extends LinearLayout {
      * @return a cursor to the requested column or null if an exception occurs while trying
      * to query it.
      */
-    private Cursor getOptionalColumn(ContentResolver contentResolver, Uri uri, String columnName) {
+    private static Cursor getOptionalColumn(ContentResolver contentResolver, Uri uri,
+            String columnName) {
         Cursor result = null;
         try {
             result = contentResolver.query(uri, new String[]{columnName}, null, null, null);
diff --git a/src/com/android/mail/compose/CcBccView.java b/src/com/android/mail/compose/CcBccView.java
index cb778ccc7..962201786 100644
--- a/src/com/android/mail/compose/CcBccView.java
+++ b/src/com/android/mail/compose/CcBccView.java
@@ -51,7 +51,7 @@ public class CcBccView extends RelativeLayout {
         mCc.setVisibility(showCc ? View.VISIBLE : View.GONE);
         mBcc.setVisibility(showBcc ? View.VISIBLE : View.GONE);
         if (animate) {
-            animate(showCc, showBcc, ccWasAlreadyShown);
+            animate(ccWasAlreadyShown);
         } else {
             if (showCc) {
                 mCc.setAlpha(1);
@@ -63,7 +63,7 @@ public class CcBccView extends RelativeLayout {
         }
     }
 
-    private void animate(Boolean showCc, boolean showBcc, boolean ccWasAlreadyShown) {
+    private void animate(boolean ccWasAlreadyShown) {
         Resources res = getResources();
         // Then, have cc/ bcc fade in
         int fadeDuration = res.getInteger(R.integer.fadein_cc_bcc_dur);
diff --git a/src/com/android/mail/compose/ComposeActivity.java b/src/com/android/mail/compose/ComposeActivity.java
index 7c15977e8..1f444fac7 100644
--- a/src/com/android/mail/compose/ComposeActivity.java
+++ b/src/com/android/mail/compose/ComposeActivity.java
@@ -1327,7 +1327,7 @@ public class ComposeActivity extends Activity implements OnClickListener, OnNavi
      * @param toReplace Input string
      * @return The string with all "+" characters replaced with "%2B"
      */
-    private String replacePlus(String toReplace) {
+    private static String replacePlus(String toReplace) {
         return toReplace.replace("+", "%2B");
     }
 
diff --git a/src/com/android/mail/compose/QuotedTextView.java b/src/com/android/mail/compose/QuotedTextView.java
index c8ddc3e9e..95079d196 100644
--- a/src/com/android/mail/compose/QuotedTextView.java
+++ b/src/com/android/mail/compose/QuotedTextView.java
@@ -237,7 +237,7 @@ class QuotedTextView extends LinearLayout implements OnClickListener {
         public void onRespondInline(String text);
     }
 
-    private String getHtmlText(Message message) {
+    private static String getHtmlText(Message message) {
         if (message.bodyHtml != null) {
             return message.bodyHtml;
         } else if (message.bodyText != null) {
diff --git a/src/com/android/mail/photomanager/ContactPhotoManager.java b/src/com/android/mail/photomanager/ContactPhotoManager.java
index a45c8cbe4..e5e133f74 100644
--- a/src/com/android/mail/photomanager/ContactPhotoManager.java
+++ b/src/com/android/mail/photomanager/ContactPhotoManager.java
@@ -17,13 +17,7 @@
 package com.android.mail.photomanager;
 
 import android.content.ContentResolver;
-import android.content.ContentUris;
 import android.content.Context;
-import android.database.Cursor;
-import android.provider.ContactsContract;
-import android.provider.ContactsContract.CommonDataKinds.Email;
-import android.provider.ContactsContract.Contacts.Photo;
-import android.provider.ContactsContract.Data;
 import android.text.TextUtils;
 import android.util.LruCache;
 
@@ -37,7 +31,6 @@ import com.google.common.collect.ImmutableMap;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -47,8 +40,6 @@ import java.util.Set;
 public class ContactPhotoManager extends PhotoManager {
     public static final String CONTACT_PHOTO_SERVICE = "contactPhotos";
 
-    private static final String[] COLUMNS = new String[] { Photo._ID, Photo.PHOTO };
-
     /**
      * An LRU cache for photo ids mapped to contact addresses.
      */
@@ -110,16 +101,6 @@ public class ContactPhotoManager extends PhotoManager {
         mPhotoIdCache.evictAll();
     }
 
-    /**
-     * Store the supplied photo id to contact address mapping so that we don't
-     * have to lookup the contact again.
-     * @param id Id of the photo matching the contact
-     * @param contactAddress Email address of the contact
-     */
-    private void cachePhotoId(Long id, String contactAddress) {
-        mPhotoIdCache.put(contactAddress, id);
-    }
-
     public static class ContactIdentifier implements PhotoIdentifier {
         public final String name;
         public final String emailAddress;
@@ -179,22 +160,6 @@ public class ContactPhotoManager extends PhotoManager {
     }
 
     public class ContactPhotoLoaderThread extends PhotoLoaderThread {
-        private static final int PHOTO_PRELOAD_DELAY = 1000;
-        private static final int PRELOAD_BATCH = 25;
-        /**
-         * Maximum number of photos to preload.  If the cache size is 2Mb and
-         * the expected average size of a photo is 4kb, then this number should be 2Mb/4kb = 500.
-         */
-        private static final int MAX_PHOTOS_TO_PRELOAD = 100;
-
-        private final String[] DATA_COLS = new String[] {
-            Email.DATA,                 // 0
-            Email.PHOTO_ID              // 1
-        };
-
-        private static final int DATA_EMAIL_COLUMN = 0;
-        private static final int DATA_PHOTO_ID_COLUMN = 1;
-
         public ContactPhotoLoaderThread(ContentResolver resolver) {
             super(resolver);
         }
diff --git a/src/com/android/mail/photomanager/LetterTileProvider.java b/src/com/android/mail/photomanager/LetterTileProvider.java
index 39d9a40d1..36dc6c2e6 100644
--- a/src/com/android/mail/photomanager/LetterTileProvider.java
+++ b/src/com/android/mail/photomanager/LetterTileProvider.java
@@ -22,7 +22,6 @@ import android.content.res.TypedArray;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
-import android.graphics.Matrix;
 import android.graphics.Paint.Align;
 import android.graphics.Rect;
 import android.graphics.Typeface;
diff --git a/src/com/android/mail/photomanager/MemInfoReader.java b/src/com/android/mail/photomanager/MemInfoReader.java
index 43d7a483a..f53c60c9b 100644
--- a/src/com/android/mail/photomanager/MemInfoReader.java
+++ b/src/com/android/mail/photomanager/MemInfoReader.java
@@ -27,7 +27,7 @@ public class MemInfoReader {
     private long mFreeSize;
     private long mCachedSize;
 
-    private boolean matchText(byte[] buffer, int index, String text) {
+    private static boolean matchText(byte[] buffer, int index, String text) {
         int N = text.length();
         if ((index + N) >= buffer.length) {
             return false;
@@ -40,7 +40,7 @@ public class MemInfoReader {
         return true;
     }
 
-    private long extractMemValue(byte[] buffer, int index) {
+    private static long extractMemValue(byte[] buffer, int index) {
         while (index < buffer.length && buffer[index] != '\n') {
             if (buffer[index] >= '0' && buffer[index] <= '9') {
                 int start = index;
diff --git a/src/com/android/mail/photomanager/PhotoManager.java b/src/com/android/mail/photomanager/PhotoManager.java
index b1e92fdef..46502061f 100644
--- a/src/com/android/mail/photomanager/PhotoManager.java
+++ b/src/com/android/mail/photomanager/PhotoManager.java
@@ -33,16 +33,13 @@ import com.android.mail.utils.LogUtils;
 import com.google.common.base.Objects;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
-import com.google.common.collect.Sets;
 
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -142,16 +139,6 @@ public abstract class PhotoManager implements ComponentCallbacks2, Callback {
     /** Cache size for {@link #sBitmapCache} for devices with "large" RAM. */
     private static final int BITMAP_CACHE_SIZE = 36864 * 48; // 1728K
 
-    /**
-     * {@code true} if ALL entries in {@link #sBitmapHolderCache} are NOT fresh.
-     */
-    private static volatile boolean sBitmapHolderCacheAllUnfresh = true;
-
-    /**
-     * Cache size threshold at which bitmaps will not be preloaded.
-     */
-    private static final int sBitmapHolderCacheRedZoneBytes;
-
     /** For debug: How many times we had to reload cached photo for a stale entry */
     private static final AtomicInteger sStaleCacheOverwrite = new AtomicInteger();
 
@@ -184,7 +171,6 @@ public abstract class PhotoManager implements ComponentCallbacks2, Callback {
                 if (DEBUG) dumpStats();
             }
         };
-        sBitmapHolderCacheRedZoneBytes = (int) (holderCacheSize * 0.75);
         LogUtils.i(TAG, "Cache adj: " + cacheSizeAdjustment);
         if (DEBUG) {
             LogUtils.d(TAG, "Cache size: " + btk(sBitmapHolderCache.maxSize())
@@ -284,7 +270,7 @@ public abstract class PhotoManager implements ComponentCallbacks2, Callback {
      *
      * @return false if the photo needs to be (re)loaded from the provider.
      */
-    private boolean loadCachedPhoto(Request request, boolean fadeIn) {
+    private static boolean loadCachedPhoto(Request request, boolean fadeIn) {
         final Bitmap decoded = sBitmapCache.get(request.bitmapKey);
         if (decoded != null) {
             if (DEBUG) LogUtils.v(TAG, "%s, key=%s decodedSize=%s r=%s thread=%s",
@@ -420,7 +406,6 @@ public abstract class PhotoManager implements ComponentCallbacks2, Callback {
         BitmapHolder holder = new BitmapHolder(bytes);
 
         sBitmapHolderCache.put(key, holder);
-        sBitmapHolderCacheAllUnfresh = false;
     }
 
     // ComponentCallbacks2
diff --git a/src/com/android/mail/providers/Attachment.java b/src/com/android/mail/providers/Attachment.java
index 37ae4473d..b6699a843 100644
--- a/src/com/android/mail/providers/Attachment.java
+++ b/src/com/android/mail/providers/Attachment.java
@@ -352,7 +352,7 @@ public class Attachment implements Parcelable {
         }
     }
 
-    private String stringify(Object object) {
+    private static String stringify(Object object) {
         return object != null ? object.toString() : null;
     }
 
diff --git a/src/com/android/mail/providers/DrawerClosedObserver.java b/src/com/android/mail/providers/DrawerClosedObserver.java
index 2ff8ca31a..55d76fb8f 100644
--- a/src/com/android/mail/providers/DrawerClosedObserver.java
+++ b/src/com/android/mail/providers/DrawerClosedObserver.java
@@ -21,8 +21,6 @@ import android.database.DataSetObserver;
 
 import com.android.mail.ui.AccountController;
 import com.android.mail.ui.RecentFolderController;
-import com.android.mail.utils.LogTag;
-import com.android.mail.utils.LogUtils;
 
 /**
  * Observes when the drawer is closed for the purpose of computing after the drawer is,
@@ -31,8 +29,6 @@ import com.android.mail.utils.LogUtils;
 public abstract class DrawerClosedObserver extends DataSetObserver {
     private AccountController mController;
 
-    private static final String LOG_TAG = LogTag.getLogTag();
-
     /**
      * The no-argument constructor leaves the object unusable till
      * {@link #initialize(RecentFolderController)} is called.
diff --git a/src/com/android/mail/providers/EmlAttachmentProvider.java b/src/com/android/mail/providers/EmlAttachmentProvider.java
index 0c8a7cbd1..a857a69c3 100644
--- a/src/com/android/mail/providers/EmlAttachmentProvider.java
+++ b/src/com/android/mail/providers/EmlAttachmentProvider.java
@@ -229,7 +229,7 @@ public class EmlAttachmentProvider extends ContentProvider {
     /**
      * Adds a new row to the cursor for the specific attachment.
      */
-    private void addRow(MatrixCursor cursor, Attachment attachment) {
+    private static void addRow(MatrixCursor cursor, Attachment attachment) {
         cursor.newRow()
                 .add(attachment.getName())                          // displayName
                 .add(attachment.size)                               // size
diff --git a/src/com/android/mail/providers/Settings.java b/src/com/android/mail/providers/Settings.java
index d07a60e49..e7a102d03 100644
--- a/src/com/android/mail/providers/Settings.java
+++ b/src/com/android/mail/providers/Settings.java
@@ -353,8 +353,6 @@ public class Settings implements Parcelable {
      * {@link UIProvider.ConversationViewMode.DEFAULT}.
      */
     public boolean isOverviewMode() {
-        final boolean isDefined = (conversationViewMode
-                != UIProvider.ConversationViewMode.UNDEFINED);
         final int val = (conversationViewMode != UIProvider.ConversationViewMode.UNDEFINED) ?
                 conversationViewMode : UIProvider.ConversationViewMode.DEFAULT;
         return (val == UIProvider.ConversationViewMode.OVERVIEW);
diff --git a/src/com/android/mail/ui/AbstractActivityController.java b/src/com/android/mail/ui/AbstractActivityController.java
index 928b2f893..d9b51c396 100644
--- a/src/com/android/mail/ui/AbstractActivityController.java
+++ b/src/com/android/mail/ui/AbstractActivityController.java
@@ -2089,7 +2089,7 @@ public abstract class AbstractActivityController implements ActivityController,
         }
     }
 
-    private boolean getShouldShowDrawerIndicator(final int viewMode) {
+    private static boolean getShouldShowDrawerIndicator(final int viewMode) {
         // if search list/conv mode, disable indicator
         // only allow indicator at top level of app
         if (ViewMode.isSearchMode(viewMode)) {
@@ -2099,7 +2099,7 @@ public abstract class AbstractActivityController implements ActivityController,
         }
     }
 
-    private boolean getShouldAllowDrawerPull(final int viewMode) {
+    private static boolean getShouldAllowDrawerPull(final int viewMode) {
         // if search list/conv mode, disable drawer pull
         // allow drawer pull everywhere except conversation mode where the list is hidden
         if (ViewMode.isSearchMode(viewMode)) {
@@ -3246,8 +3246,8 @@ public abstract class AbstractActivityController implements ActivityController,
     protected abstract void hideOrRepositionToastBar(boolean animated);
 
     @Override
-    public void onConversationSeen(Conversation conv) {
-        mPagerController.onConversationSeen(conv);
+    public void onConversationSeen() {
+        mPagerController.onConversationSeen();
     }
 
     @Override
diff --git a/src/com/android/mail/ui/AbstractConversationViewFragment.java b/src/com/android/mail/ui/AbstractConversationViewFragment.java
index 29cedefde..e9a1951f4 100644
--- a/src/com/android/mail/ui/AbstractConversationViewFragment.java
+++ b/src/com/android/mail/ui/AbstractConversationViewFragment.java
@@ -526,7 +526,7 @@ public abstract class AbstractConversationViewFragment extends Fragment implemen
                 }
             }
         }
-        activity.getListHandler().onConversationSeen(mConversation);
+        activity.getListHandler().onConversationSeen();
     }
 
     protected ConversationViewState getNewViewState() {
diff --git a/src/com/android/mail/ui/AnimatedAdapter.java b/src/com/android/mail/ui/AnimatedAdapter.java
index a6c02ac59..9a4a8c10a 100644
--- a/src/com/android/mail/ui/AnimatedAdapter.java
+++ b/src/com/android/mail/ui/AnimatedAdapter.java
@@ -483,7 +483,7 @@ public class AnimatedAdapter extends SimpleCursorAdapter {
         if (hasFadeLeaveBehinds()) {
             if(isPositionFadeLeaveBehind(conv)) {
                 LeaveBehindItem fade  = getFadeLeaveBehindItem(position, conv);
-                fade.startShrinkAnimation(mActivity.getViewMode(), mAnimatorListener);
+                fade.startShrinkAnimation(mAnimatorListener);
                 return fade;
             }
         }
@@ -900,7 +900,6 @@ public class AnimatedAdapter extends SimpleCursorAdapter {
 
     @Override
     public String toString() {
-        final String s = super.toString();
         final StringBuilder sb = new StringBuilder("{");
         sb.append(super.toString());
         sb.append(" mUndoingItems=");
diff --git a/src/com/android/mail/ui/ConversationListCallbacks.java b/src/com/android/mail/ui/ConversationListCallbacks.java
index b93b1c941..370a26519 100644
--- a/src/com/android/mail/ui/ConversationListCallbacks.java
+++ b/src/com/android/mail/ui/ConversationListCallbacks.java
@@ -64,7 +64,7 @@ public interface ConversationListCallbacks {
      * Coordinates actions that might occur in response to a conversation that has finished loading
      * and is now user-visible.
      */
-    void onConversationSeen(Conversation conv);
+    void onConversationSeen();
 
     void registerConversationListObserver(DataSetObserver observer);
     void unregisterConversationListObserver(DataSetObserver observer);
diff --git a/src/com/android/mail/ui/ConversationListFragment.java b/src/com/android/mail/ui/ConversationListFragment.java
index 5afc9f47a..ddb52d73b 100644
--- a/src/com/android/mail/ui/ConversationListFragment.java
+++ b/src/com/android/mail/ui/ConversationListFragment.java
@@ -837,7 +837,7 @@ public final class ConversationListFragment extends ListFragment implements
                 || (mFolder != null && mFolder.isTrash())) {
             mListView.enableSwipe(false);
         } else {
-            int action;
+            final int action;
             mListView.enableSwipe(true);
             if (ConversationListContext.isSearchResult(mViewContext)
                     || (mFolder != null && mFolder.isType(FolderType.SPAM))) {
@@ -858,6 +858,12 @@ public final class ConversationListFragment extends ListFragment implements
                                 break;
                             }
                         }
+
+                        /*
+                         * If we get here, we don't support archive, on either the account or the
+                         * folder, so we want to fall through into the delete case.
+                         */
+                        //$FALL-THROUGH$
                     case Swipe.DELETE:
                     default:
                         action = R.id.delete;
diff --git a/src/com/android/mail/ui/ConversationViewFragment.java b/src/com/android/mail/ui/ConversationViewFragment.java
index 6de375eb8..74ac38a5d 100644
--- a/src/com/android/mail/ui/ConversationViewFragment.java
+++ b/src/com/android/mail/ui/ConversationViewFragment.java
@@ -62,7 +62,6 @@ import com.android.mail.browse.ScrollIndicatorsView;
 import com.android.mail.browse.SuperCollapsedBlock;
 import com.android.mail.browse.WebViewContextMenu;
 import com.android.mail.content.ObjectCursor;
-import com.android.mail.preferences.MailPrefs;
 import com.android.mail.providers.Account;
 import com.android.mail.providers.Address;
 import com.android.mail.providers.Conversation;
@@ -690,8 +689,6 @@ public final class ConversationViewFragment extends AbstractConversationViewFrag
 
         final boolean applyTransforms = shouldApplyTransforms();
 
-        final MailPrefs prefs = MailPrefs.get(getContext());
-
         // If the conversation has specified a base uri, use it here, otherwise use mBaseUri
         return mTemplates.endConversation(mBaseUri, mConversation.getBaseUri(mBaseUri), 320,
                 mWebView.getViewportWidth(), enableContentReadySignal, isOverviewMode(mAccount),
diff --git a/src/com/android/mail/ui/LeaveBehindItem.java b/src/com/android/mail/ui/LeaveBehindItem.java
index ce41e15e2..22d2a31a4 100644
--- a/src/com/android/mail/ui/LeaveBehindItem.java
+++ b/src/com/android/mail/ui/LeaveBehindItem.java
@@ -166,7 +166,7 @@ public class LeaveBehindItem extends FrameLayout implements OnClickListener, Swi
      * @param undo true if an operation is being undone. We animate the item
      *            away during delete. Undoing populates the item.
      */
-    public void startShrinkAnimation(ViewMode viewMode, AnimatorListener listener) {
+    public void startShrinkAnimation(AnimatorListener listener) {
         if (!mAnimating) {
             mAnimating = true;
             final ObjectAnimator height = ObjectAnimator.ofInt(this, "animatedHeight", mHeight, 0);
diff --git a/src/com/android/mail/ui/MailActionBarView.java b/src/com/android/mail/ui/MailActionBarView.java
index 239d770fd..8df832019 100644
--- a/src/com/android/mail/ui/MailActionBarView.java
+++ b/src/com/android/mail/ui/MailActionBarView.java
@@ -538,7 +538,7 @@ public class MailActionBarView extends LinearLayout implements ViewMode.ModeChan
     /**
      * Hides menu items while the drawer is open.
      */
-    private void setMenuItemsToHiddenForOpenDrawer(Menu menu) {
+    private static void setMenuItemsToHiddenForOpenDrawer(Menu menu) {
         final int size = menu.size();
 
         for (int i = 0; i < size; i++) {
diff --git a/src/com/android/mail/ui/MailActivity.java b/src/com/android/mail/ui/MailActivity.java
index 2cf225605..036d32baa 100644
--- a/src/com/android/mail/ui/MailActivity.java
+++ b/src/com/android/mail/ui/MailActivity.java
@@ -137,7 +137,7 @@ public class MailActivity extends AbstractMailActivity implements ControllableAc
     public void onCreate(Bundle savedState) {
         super.onCreate(savedState);
 
-        mViewMode = new ViewMode(this);
+        mViewMode = new ViewMode();
         final boolean tabletUi = Utils.useTabletUI(this.getResources());
         mController = ControllerFactory.forActivity(this, mViewMode, tabletUi);
         mController.onCreate(savedState);
diff --git a/src/com/android/mail/ui/MultiFoldersSelectionDialog.java b/src/com/android/mail/ui/MultiFoldersSelectionDialog.java
index f3e1b83dd..b1b9059a1 100644
--- a/src/com/android/mail/ui/MultiFoldersSelectionDialog.java
+++ b/src/com/android/mail/ui/MultiFoldersSelectionDialog.java
@@ -82,7 +82,7 @@ public class MultiFoldersSelectionDialog extends FolderSelectionDialog {
             final HashSet<String> checked = new HashSet<String>();
             for (final Conversation conversation : mTarget) {
                 final List<Folder> rawFolders = conversation.getRawFolders();
-                if (conversation != null && rawFolders != null && rawFolders.size() > 0) {
+                if (rawFolders != null && rawFolders.size() > 0) {
                     // Parse the raw folders and get all the uris.
                     checked.addAll(Arrays.asList(Folder.getUriArray(rawFolders)));
                 } else {
diff --git a/src/com/android/mail/ui/SwipeHelper.java b/src/com/android/mail/ui/SwipeHelper.java
index 7b8b1daf4..796c686a1 100644
--- a/src/com/android/mail/ui/SwipeHelper.java
+++ b/src/com/android/mail/ui/SwipeHelper.java
@@ -19,7 +19,6 @@ package com.android.mail.ui;
 
 import android.animation.Animator;
 import android.animation.AnimatorListenerAdapter;
-import android.animation.AnimatorSet;
 import android.animation.ObjectAnimator;
 import android.animation.ValueAnimator;
 import android.animation.ValueAnimator.AnimatorUpdateListener;
@@ -32,13 +31,9 @@ import android.view.View;
 import android.view.animation.DecelerateInterpolator;
 
 import com.android.mail.R;
-import com.android.mail.browse.ConversationItemView;
 import com.android.mail.utils.LogUtils;
 import com.android.mail.utils.Utils;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 public class SwipeHelper {
     static final String TAG = "com.android.systemui.SwipeHelper";
     private static final boolean DEBUG_INVALIDATE = false;
@@ -371,7 +366,6 @@ public class SwipeHelper {
             case MotionEvent.ACTION_MOVE:
                 if (mCurrView != null) {
                     float deltaX = ev.getX() - mInitialTouchPosX;
-                    float deltaY = Math.abs(ev.getY() - mInitialTouchPosY);
                     // If the swipe started in the dead region, ignore it.
                     if (mInitialTouchPosX <= (DEAD_REGION_FOR_SWIPE * mDensityScale)){
                             return true;
diff --git a/src/com/android/mail/ui/ViewMode.java b/src/com/android/mail/ui/ViewMode.java
index 98df8095d..ec4303941 100644
--- a/src/com/android/mail/ui/ViewMode.java
+++ b/src/com/android/mail/ui/ViewMode.java
@@ -20,7 +20,6 @@ package com.android.mail.ui;
 import com.android.mail.utils.LogUtils;
 import com.google.common.collect.Lists;
 
-import android.content.Context;
 import android.os.Bundle;
 import java.util.ArrayList;
 
@@ -82,7 +81,7 @@ public class ViewMode {
 
     public static final String LOG_TAG = "ViewMode";
 
-    public ViewMode(Context context) {
+    public ViewMode() {
         // Do nothing
     }
 
diff --git a/src/com/android/mail/utils/AccountUtils.java b/src/com/android/mail/utils/AccountUtils.java
index 7f7e5e4ff..a9ba8a455 100644
--- a/src/com/android/mail/utils/AccountUtils.java
+++ b/src/com/android/mail/utils/AccountUtils.java
@@ -55,8 +55,7 @@ public class AccountUtils {
             final String accountName = accounts[i].name;
             // If the account is in the cached list or the caller requested
             // that we prioritize the list of Account objects, put it in the new list
-            if (prioritizeAccountList
-                    || (existingList != null && existingList.contains(accountName))) {
+            if (prioritizeAccountList || existingList.contains(accountName)) {
                 newAccountList.add(accounts[i]);
             }
         }
diff --git a/src/com/android/mail/utils/Utils.java b/src/com/android/mail/utils/Utils.java
index f43d9101b..f726ab426 100644
--- a/src/com/android/mail/utils/Utils.java
+++ b/src/com/android/mail/utils/Utils.java
@@ -368,9 +368,7 @@ public class Utils {
         SpannableStringBuilder fixedFragment = null;
         int fixedFragmentLength = 0;
         if (draftsFragment.length() != 0 && allowDraft) {
-            if (fixedFragment == null) {
-                fixedFragment = new SpannableStringBuilder();
-            }
+            fixedFragment = new SpannableStringBuilder();
             fixedFragment.append(draftsFragment);
             if (draftsStyle != null) {
                 fixedFragment.setSpan(CharacterStyle.wrap(draftsStyle), 0, fixedFragment.length(),
diff --git a/src/com/android/mail/widget/BaseWidgetProvider.java b/src/com/android/mail/widget/BaseWidgetProvider.java
index 9dde2bbc1..763740cd8 100644
--- a/src/com/android/mail/widget/BaseWidgetProvider.java
+++ b/src/com/android/mail/widget/BaseWidgetProvider.java
@@ -350,7 +350,7 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider {
         if (account != null) {
             Account[] accounts = AccountUtils.getSyncingAccounts(context);
             for (Account existing : accounts) {
-                if (account != null && existing != null && account.uri.equals(existing.uri)) {
+                if (existing != null && account.uri.equals(existing.uri)) {
                     return true;
                 }
             }
diff --git a/src/com/android/mail/widget/WidgetService.java b/src/com/android/mail/widget/WidgetService.java
index d2b9770ae..7d19c68db 100644
--- a/src/com/android/mail/widget/WidgetService.java
+++ b/src/com/android/mail/widget/WidgetService.java
@@ -182,7 +182,7 @@ public class WidgetService extends RemoteViewsService {
         if (account != null) {
             Account[] accounts = AccountUtils.getSyncingAccounts(context);
             for (Account existing : accounts) {
-                if (account != null && existing != null && account.uri.equals(existing.uri)) {
+                if (existing != null && account.uri.equals(existing.uri)) {
                     return true;
                 }
             }