Convert OpenMode from an Enum to static ints for perf improvement. (bbad298b) · Commits · e / os / Mail

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -69,7 +69,7 @@ public class FolderInfoHolder implements Comparable<FolderInfoHolder> {
		public void populate(Context context, Folder folder, Account account, int unreadCount) {

		try {
		folder.open(Folder.OpenMode.READ_WRITE);
		folder.open(Folder.OPEN_MODE_RW);
		// unreadCount = folder.getUnreadMessageCount();
		} catch (MessagingException me) {
		Log.e(K9.LOG_TAG, "Folder.getUnreadMessageCount() failed", me);

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -465,7 +465,7 @@ public class FolderList extends K9ListActivity {
		return;
		}
		localFolder = account.getLocalStore().getFolder(folderName);
		localFolder.open(Folder.OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);
		localFolder.clearAllMessages();
		} catch (Exception e) {
		Log.e(K9.LOG_TAG, "Exception while clearing folder", e);

src/com/fsck/k9/activity/setup/FolderSettings.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -11,8 +11,9 @@ import android.util.Log;
		import com.fsck.k9.*;
		import com.fsck.k9.activity.FolderInfoHolder;
		import com.fsck.k9.activity.K9PreferenceActivity;
		import com.fsck.k9.mail.Folder;
		import com.fsck.k9.mail.Folder.FolderClass;
		import com.fsck.k9.mail.Folder.OpenMode;

		import com.fsck.k9.mail.MessagingException;
		import com.fsck.k9.mail.Store;
		import com.fsck.k9.mail.store.LocalStore;
		@@ -57,7 +58,7 @@ public class FolderSettings extends K9PreferenceActivity {
		try {
		LocalStore localStore = mAccount.getLocalStore();
		mFolder = localStore.getFolder(folderName);
		mFolder.open(OpenMode.READ_WRITE);
		mFolder.open(Folder.OPEN_MODE_RW);
		} catch (MessagingException me) {
		Log.e(K9.LOG_TAG, "Unable to edit folder " + folderName + " preferences", me);
		return;

src/com/fsck/k9/controller/MessagingController.java

+37 −37

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ import com.fsck.k9.mail.FetchProfile;
		import com.fsck.k9.mail.Flag;
		import com.fsck.k9.mail.Folder;
		import com.fsck.k9.mail.Folder.FolderType;
		import com.fsck.k9.mail.Folder.OpenMode;

		import com.fsck.k9.mail.Message;
		import com.fsck.k9.mail.Message.RecipientType;
		import com.fsck.k9.mail.CertificateValidationException;
		@@ -991,7 +991,7 @@ public class MessagingController implements Runnable {
		final LocalStore localStore = account.getLocalStore();
		tLocalFolder = localStore.getFolder(folder);
		final LocalFolder localFolder = tLocalFolder;
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);
		localFolder.updateLastUid();
		Message[] localMessages = localFolder.getMessages(null);
		HashMap<String, Message> localUidMap = new HashMap<String, Message>();
		@@ -1039,7 +1039,7 @@ public class MessagingController implements Runnable {
		if (K9.DEBUG)
		Log.v(K9.LOG_TAG, "SYNC: About to open remote folder " + folder);

		remoteFolder.open(OpenMode.READ_WRITE);
		remoteFolder.open(Folder.OPEN_MODE_RW);
		if (Account.EXPUNGE_ON_POLL.equals(account.getExpungePolicy())) {
		if (K9.DEBUG)
		Log.d(K9.LOG_TAG, "SYNC: Expunging folder " + account.getDescription() + ":" + folder);
		@@ -2074,8 +2074,8 @@ public class MessagingController implements Runnable {
		return;
		}
		}
		remoteFolder.open(OpenMode.READ_WRITE);
		if (remoteFolder.getMode() != OpenMode.READ_WRITE) {
		remoteFolder.open(Folder.OPEN_MODE_RW);
		if (remoteFolder.getMode() != Folder.OPEN_MODE_RW) {
		return;
		}

		@@ -2307,8 +2307,8 @@ public class MessagingController implements Runnable {
		if (!remoteSrcFolder.exists()) {
		throw new MessagingException("processingPendingMoveOrCopy: remoteFolder " + srcFolder + " does not exist", true);
		}
		remoteSrcFolder.open(OpenMode.READ_WRITE);
		if (remoteSrcFolder.getMode() != OpenMode.READ_WRITE) {
		remoteSrcFolder.open(Folder.OPEN_MODE_RW);
		if (remoteSrcFolder.getMode() != Folder.OPEN_MODE_RW) {
		throw new MessagingException("processingPendingMoveOrCopy: could not open remoteSrcFolder " + srcFolder + " read/write", true);
		}

		@@ -2415,8 +2415,8 @@ public class MessagingController implements Runnable {
		}

		try {
		remoteFolder.open(OpenMode.READ_WRITE);
		if (remoteFolder.getMode() != OpenMode.READ_WRITE) {
		remoteFolder.open(Folder.OPEN_MODE_RW);
		if (remoteFolder.getMode() != Folder.OPEN_MODE_RW) {
		return;
		}
		List<Message> messages = new ArrayList<Message>();
		@@ -2459,8 +2459,8 @@ public class MessagingController implements Runnable {
		if (!remoteFolder.exists()) {
		return;
		}
		remoteFolder.open(OpenMode.READ_WRITE);
		if (remoteFolder.getMode() != OpenMode.READ_WRITE) {
		remoteFolder.open(Folder.OPEN_MODE_RW);
		if (remoteFolder.getMode() != Folder.OPEN_MODE_RW) {
		return;
		}
		Message remoteMessage = null;
		@@ -2506,8 +2506,8 @@ public class MessagingController implements Runnable {
		if (!remoteFolder.exists()) {
		return;
		}
		remoteFolder.open(OpenMode.READ_WRITE);
		if (remoteFolder.getMode() != OpenMode.READ_WRITE) {
		remoteFolder.open(Folder.OPEN_MODE_RW);
		if (remoteFolder.getMode() != Folder.OPEN_MODE_RW) {
		return;
		}
		remoteFolder.expunge();
		@@ -2544,8 +2544,8 @@ public class MessagingController implements Runnable {
		if (!remoteSrcFolder.exists()) {
		throw new MessagingException("processPendingMoveOrCopyOld: remoteFolder " + srcFolder + " does not exist", true);
		}
		remoteSrcFolder.open(OpenMode.READ_WRITE);
		if (remoteSrcFolder.getMode() != OpenMode.READ_WRITE) {
		remoteSrcFolder.open(Folder.OPEN_MODE_RW);
		if (remoteSrcFolder.getMode() != Folder.OPEN_MODE_RW) {
		throw new MessagingException("processPendingMoveOrCopyOld: could not open remoteSrcFolder " + srcFolder + " read/write", true);
		}

		@@ -2570,8 +2570,8 @@ public class MessagingController implements Runnable {
		return;
		}

		remoteDestFolder.open(OpenMode.READ_WRITE);
		if (remoteDestFolder.getMode() != OpenMode.READ_WRITE) {
		remoteDestFolder.open(Folder.OPEN_MODE_RW);
		if (remoteDestFolder.getMode() != Folder.OPEN_MODE_RW) {
		throw new MessagingException("processPendingMoveOrCopyOld: could not open remoteDestFolder " + srcFolder + " read/write", true);
		}

		@@ -2591,7 +2591,7 @@ public class MessagingController implements Runnable {
		try {
		Store localStore = account.getLocalStore();
		localFolder = (LocalFolder) localStore.getFolder(folder);
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);
		Message[] messages = localFolder.getMessages(null, false);
		for (Message message : messages) {
		if (!message.isSet(Flag.SEEN)) {
		@@ -2617,8 +2617,8 @@ public class MessagingController implements Runnable {
		if (!remoteFolder.exists() \|\| !remoteFolder.isFlagSupported(Flag.SEEN)) {
		return;
		}
		remoteFolder.open(OpenMode.READ_WRITE);
		if (remoteFolder.getMode() != OpenMode.READ_WRITE) {
		remoteFolder.open(Folder.OPEN_MODE_RW);
		if (remoteFolder.getMode() != Folder.OPEN_MODE_RW) {
		return;
		}

		@@ -2883,7 +2883,7 @@ public class MessagingController implements Runnable {
		try {
		Store localStore = account.getLocalStore();
		localFolder = localStore.getFolder(folderName);
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		// Allows for re-allowing sending of messages that could not be sent
		if (flag == Flag.FLAGGED && !newState &&
		@@ -2950,7 +2950,7 @@ public class MessagingController implements Runnable {
		try {
		LocalStore localStore = account.getLocalStore();
		localFolder = localStore.getFolder(folderName);
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		Message message = localFolder.getMessage(uid);
		if (message != null) {
		@@ -2993,7 +2993,7 @@ public class MessagingController implements Runnable {
		try {
		LocalStore localStore = account.getLocalStore();
		localFolder = localStore.getFolder(folder);
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		Message message = localFolder.getMessage(uid);

		@@ -3036,7 +3036,7 @@ public class MessagingController implements Runnable {

		Store remoteStore = account.getRemoteStore();
		remoteFolder = remoteStore.getFolder(folder);
		remoteFolder.open(OpenMode.READ_WRITE);
		remoteFolder.open(Folder.OPEN_MODE_RW);

		// Get the remote message and fully download it
		Message remoteMessage = remoteFolder.getMessage(uid);
		@@ -3098,7 +3098,7 @@ public class MessagingController implements Runnable {
		try {
		LocalStore localStore = account.getLocalStore();
		LocalFolder localFolder = localStore.getFolder(folder);
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		LocalMessage message = localFolder.getMessage(uid);
		if (message == null
		@@ -3224,7 +3224,7 @@ public class MessagingController implements Runnable {
		Store remoteStore = account.getRemoteStore();
		localFolder = localStore.getFolder(message.getFolder().getName());
		remoteFolder = remoteStore.getFolder(message.getFolder().getName());
		remoteFolder.open(OpenMode.READ_WRITE);
		remoteFolder.open(Folder.OPEN_MODE_RW);

		//FIXME: This is an ugly hack that won't be needed once the Message objects have been united.
		Message remoteMessage = remoteFolder.getMessage(message.getUid());
		@@ -3266,7 +3266,7 @@ public class MessagingController implements Runnable {
		try {
		LocalStore localStore = account.getLocalStore();
		LocalFolder localFolder = localStore.getFolder(account.getOutboxFolderName());
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);
		localFolder.appendMessages(new Message[] { message });
		Message localMessage = localFolder.getMessage(message.getUid());
		localMessage.setFlag(Flag.X_DOWNLOADED_FULL, true);
		@@ -3468,7 +3468,7 @@ public class MessagingController implements Runnable {
		return false;
		}

		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		if (localFolder.getMessageCount() > 0) {
		return true;
		@@ -3498,7 +3498,7 @@ public class MessagingController implements Runnable {
		for (MessagingListener l : getListeners()) {
		l.sendPendingMessagesStarted(account);
		}
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		Message[] localMessages = localFolder.getMessages(null);
		int progress = 0;
		@@ -3967,7 +3967,7 @@ public class MessagingController implements Runnable {
		try {
		LocalStore localStore = account.getLocalStore();
		localFolder = localStore.getFolder(account.getDraftsFolderName());
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);
		String uid = localFolder.getMessageUidById(id);
		if (uid != null) {
		Message message = localFolder.getMessage(uid);
		@@ -4155,7 +4155,7 @@ public class MessagingController implements Runnable {
		Folder remoteFolder = remoteStore.getFolder(account.getTrashFolderName());
		try {
		if (remoteFolder.exists()) {
		remoteFolder.open(OpenMode.READ_WRITE);
		remoteFolder.open(Folder.OPEN_MODE_RW);
		remoteFolder.setFlags(new Flag [] { Flag.DELETED }, true);
		if (Account.EXPUNGE_IMMEDIATELY.equals(account.getExpungePolicy())) {
		remoteFolder.expunge();
		@@ -4181,7 +4181,7 @@ public class MessagingController implements Runnable {
		try {
		Store localStore = account.getLocalStore();
		localFolder = (LocalFolder) localStore.getFolder(account.getTrashFolderName());
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		boolean isTrashLocalOnly = isTrashLocalOnly(account);
		if (isTrashLocalOnly) {
		@@ -4399,7 +4399,7 @@ public class MessagingController implements Runnable {

		Store localStore = account.getLocalStore();
		for (final Folder folder : localStore.getPersonalNamespaces(false)) {
		folder.open(Folder.OpenMode.READ_WRITE);
		folder.open(Folder.OPEN_MODE_RW);
		folder.refresh(prefs);

		Folder.FolderClass fDisplayClass = folder.getDisplayClass();
		@@ -4485,7 +4485,7 @@ public class MessagingController implements Runnable {
		// once
		final LocalStore localStore = account.getLocalStore();
		tLocalFolder = localStore.getFolder(folder.getName());
		tLocalFolder.open(Folder.OpenMode.READ_WRITE);
		tLocalFolder.open(Folder.OPEN_MODE_RW);

		if (!ignoreLastCheckedTime && tLocalFolder.getLastChecked() >
		(System.currentTimeMillis() - accountInterval)) {
		@@ -5091,7 +5091,7 @@ public class MessagingController implements Runnable {
		try {
		LocalStore localStore = account.getLocalStore();
		LocalFolder localFolder = localStore.getFolder(account.getDraftsFolderName());
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		if (existingDraftId != INVALID_MESSAGE_ID) {
		String uid = localFolder.getMessageUidById(existingDraftId);
		@@ -5216,7 +5216,7 @@ public class MessagingController implements Runnable {

		continue;
		}
		folder.open(Folder.OpenMode.READ_WRITE);
		folder.open(Folder.OPEN_MODE_RW);
		folder.refresh(prefs);

		Folder.FolderClass fDisplayClass = folder.getDisplayClass();
		@@ -5320,7 +5320,7 @@ public class MessagingController implements Runnable {
		try {
		LocalStore localStore = account.getLocalStore();
		localFolder = localStore.getFolder(remoteFolder.getName());
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);

		account.setRingNotified(false);
		int newCount = downloadMessages(account, remoteFolder, localFolder, messages, flagSyncOnly);

src/com/fsck/k9/controller/MessagingControllerPushReceiver.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -8,7 +8,7 @@ import com.fsck.k9.Account;
		import com.fsck.k9.K9;
		import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
		import com.fsck.k9.mail.Folder;
		import com.fsck.k9.mail.Folder.OpenMode;

		import com.fsck.k9.mail.Message;
		import com.fsck.k9.mail.PushReceiver;
		import com.fsck.k9.mail.store.LocalStore;
		@@ -88,7 +88,7 @@ public class MessagingControllerPushReceiver implements PushReceiver {
		try {
		LocalStore localStore = account.getLocalStore();
		localFolder = localStore.getFolder(folderName);
		localFolder.open(OpenMode.READ_WRITE);
		localFolder.open(Folder.OPEN_MODE_RW);
		return localFolder.getPushState();
		} catch (Exception e) {
		Log.e(K9.LOG_TAG, "Unable to get push state from account " + account.getDescription()