Some assorted warning fixes. (890e0e22) · Commits · e / os / Mail

src/com/fsck/k9/Account.java

+0 −24

Original line number	Diff line number	Diff line
		@@ -218,12 +218,6 @@ public class Account implements BaseAccount {

		private ColorChip mFlaggedUnreadColorChip;
		private ColorChip mFlaggedReadColorChip;
		private ColorChip mToMeUnreadColorChip;
		private ColorChip mToMeReadColorChip;
		private ColorChip mCcMeUnreadColorChip;
		private ColorChip mCcMeReadColorChip;
		private ColorChip mFromMeUnreadColorChip;
		private ColorChip mFromMeReadColorChip;
		private ColorChip mCheckmarkChip;


		@@ -851,12 +845,6 @@ public class Account implements BaseAccount {
		public synchronized void cacheChips() {
		mReadColorChip = new ColorChip(mChipColor, true, ColorChip.CIRCULAR);
		mUnreadColorChip = new ColorChip(mChipColor, false, ColorChip.CIRCULAR);
		mToMeReadColorChip = new ColorChip(mChipColor, true, ColorChip.RIGHT_POINTING);
		mToMeUnreadColorChip = new ColorChip(mChipColor, false,ColorChip.RIGHT_POINTING);
		mCcMeReadColorChip = new ColorChip(mChipColor, true, ColorChip.RIGHT_NOTCH);
		mCcMeUnreadColorChip = new ColorChip(mChipColor, false,ColorChip.RIGHT_NOTCH);
		mFromMeReadColorChip = new ColorChip(mChipColor, true, ColorChip.LEFT_POINTING);
		mFromMeUnreadColorChip = new ColorChip(mChipColor, false,ColorChip.LEFT_POINTING);
		mFlaggedReadColorChip = new ColorChip(mChipColor, true, ColorChip.STAR);
		mFlaggedUnreadColorChip = new ColorChip(mChipColor, false, ColorChip.STAR);
		mCheckmarkChip = new ColorChip(mChipColor, true, ColorChip.CHECKMARK);
		@@ -878,24 +866,12 @@ public class Account implements BaseAccount {
		if (messageRead) {
		if (messageFlagged) {
		chip = mFlaggedReadColorChip;
		// } else if (toMe) {
		// chip = mToMeReadColorChip;
		// } else if (ccMe) {
		// chip = mCcMeReadColorChip;
		// } else if (fromMe) {
		// chip = mFromMeReadColorChip;
		} else {
		chip = mReadColorChip;
		}
		} else {
		if (messageFlagged) {
		chip = mFlaggedUnreadColorChip;
		// } else if (toMe) {
		// chip = mToMeUnreadColorChip;
		// } else if (ccMe) {
		// chip = mCcMeUnreadColorChip;
		// } else if (fromMe) {
		// chip = mFromMeUnreadColorChip;
		} else {
		chip = mUnreadColorChip;
		}

src/com/fsck/k9/PRNGFixes.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -142,6 +142,7 @@ public final class PRNGFixes {
		* all requests to the Linux PRNG.
		*/
		private static class LinuxPRNGSecureRandomProvider extends Provider {
		private static final long serialVersionUID = 6538669771360998378L;

		public LinuxPRNGSecureRandomProvider() {
		super("LinuxPRNG",
		@@ -175,6 +176,8 @@ public final class PRNGFixes {
		* duplicated PRNG output.
		*/

		private static final long serialVersionUID = 628140755730642770L;

		private static final File URANDOM_FILE = new File("/dev/urandom");

		private static final Object sLock = new Object();

src/com/fsck/k9/activity/FolderInfoHolder.java

+0 −3

Original line number	Diff line number	Diff line
		package com.fsck.k9.activity;

		import android.content.Context;
		import android.util.Log;

		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.MessagingException;

		public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
		public String name;

src/com/fsck/k9/activity/MessageCompose.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -2157,6 +2157,8 @@ public class MessageCompose extends K9Activity implements OnClickListener,
		performSave();
		break;
		}
		case NONE:
		break;
		}
		}

src/com/fsck/k9/activity/MessageList.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -163,7 +163,6 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
		private LocalSearch mSearch;
		private boolean mSingleFolderMode;
		private boolean mSingleAccountMode;
		private boolean mStars = true;

		private ProgressBar mActionBarProgress;
		private MenuItem mMenuButtonCheckMail;
		@@ -490,7 +489,6 @@ public class MessageList extends K9FragmentActivity implements MessageListFragme
		@Override
		public void onResume() {
		super.onResume();
		mStars = K9.messageListStars();

		if (!(this instanceof Search)) {
		//necessary b/c no guarantee Search.onStop will be called before MessageList.onResume