Fixes Issue 1413 (86f3b28f) · Commits · e / os / Mail

src/com/fsck/k9/MessagingController.java

+52 −45

Original line number	Diff line number	Diff line
		@@ -449,7 +449,7 @@ public class MessagingController implements Runnable
		{
		listener.listFoldersFailed(account, e.getMessage());
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		return;
		}
		finally
		@@ -543,7 +543,7 @@ public class MessagingController implements Runnable
		{
		l.listFoldersFailed(account, "");
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		finally
		{
		@@ -694,7 +694,7 @@ public class MessagingController implements Runnable
		{
		listener.listLocalMessagesFailed(account, folder, e.getMessage());
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		finally
		{
		@@ -775,7 +775,7 @@ public class MessagingController implements Runnable
		catch (MessagingException me)
		{
		Log.e(K9.LOG_TAG, "Unable to restrict search folders in Account " + account.getDescription() + ", searching all", me);
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);
		}

		}
		@@ -809,7 +809,7 @@ public class MessagingController implements Runnable
		catch (Exception e)
		{
		listener.listLocalMessagesFailed(account, null, e.getMessage());
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		finally
		{
		@@ -831,7 +831,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException me)
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);

		throw new RuntimeException("Unable to set visible limit on folder", me);
		}
		@@ -848,7 +848,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException e)
		{
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		Log.e(K9.LOG_TAG, "Unable to reset visible limits", e);
		}
		@@ -917,7 +917,7 @@ public class MessagingController implements Runnable
		}
		catch (Exception e)
		{
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		Log.e(K9.LOG_TAG, "Failure processing command, but allow message sync attempt", e);
		commandException = e;
		@@ -1170,7 +1170,7 @@ public class MessagingController implements Runnable
		folder,
		rootMessage);
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		Log.e(K9.LOG_TAG, "Failed synchronizing folder " +
		account.getDescription() + ":" + folder + " @ " + new Date());

		@@ -1391,7 +1391,7 @@ public class MessagingController implements Runnable
		catch (Exception e)
		{
		Log.e(K9.LOG_TAG, "Error while storing downloaded message.", e);
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		}
		}
		@@ -1476,7 +1476,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException me)
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);

		Log.e(K9.LOG_TAG, "SYNC: fetch small messages", me);
		}
		@@ -1717,7 +1717,7 @@ public class MessagingController implements Runnable
		}
		catch (Exception e)
		{
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		throw new RuntimeException("Unable to enqueue pending command", e);
		}
		@@ -1737,7 +1737,7 @@ public class MessagingController implements Runnable
		{
		Log.e(K9.LOG_TAG, "processPendingCommands", me);

		addErrorMessage(account, me);
		addErrorMessage(account, null, me);

		/*
		* Ignore any exceptions from the commands. Commands will be processed
		@@ -1828,7 +1828,7 @@ public class MessagingController implements Runnable
		{
		if (me.isPermanentFailure())
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);
		Log.e(K9.LOG_TAG, "Failure of command '" + command + "' was permanent, removing command from queue");
		localStore.removePendingCommand(processingCommand);
		}
		@@ -1850,7 +1850,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException me)
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);
		Log.e(K9.LOG_TAG, "Could not process command '" + processingCommand + "'", me);
		throw me;
		}
		@@ -2489,7 +2489,7 @@ public class MessagingController implements Runnable

		static long uidfill = 0;
		static AtomicBoolean loopCatch = new AtomicBoolean();
		public void addErrorMessage(Account account, Throwable t)
		public void addErrorMessage(Account account, String subject, Throwable t)
		{
		if (K9.ENABLE_ERROR_FOLDER == false)
		{
		@@ -2519,7 +2519,14 @@ public class MessagingController implements Runnable
		ps.close();
		message.setBody(new TextBody(baos.toString()));
		message.setFlag(Flag.X_DOWNLOADED_FULL, true);
		if (subject != null)
		{
		message.setSubject(subject);
		}
		else
		{
		message.setSubject(rootCauseMessage);
		}

		long nowTime = System.currentTimeMillis();
		Date nowDate = new Date(nowTime);
		@@ -2687,7 +2694,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException me)
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);

		throw new RuntimeException(me);
		}
		@@ -2711,7 +2718,7 @@ public class MessagingController implements Runnable
		catch (MessagingException me)
		{
		Log.e(K9.LOG_TAG, "Unable to clear pending command", me);
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);
		}
		}

		@@ -2802,7 +2809,7 @@ public class MessagingController implements Runnable
		{
		listener.loadMessageForViewFailed(account, folder, uid, e);
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		}
		finally
		@@ -2911,7 +2918,7 @@ public class MessagingController implements Runnable
		{
		listener.loadMessageForViewFailed(account, folder, uid, e);
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		}
		}
		@@ -3033,7 +3040,7 @@ public class MessagingController implements Runnable
		{
		listener.loadAttachmentFailed(account, message, part, tag, me.getMessage());
		}
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);

		}
		finally
		@@ -3082,7 +3089,7 @@ public class MessagingController implements Runnable
		{
		// TODO general failed
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		}
		}
		@@ -3286,7 +3293,7 @@ public class MessagingController implements Runnable
		localFolder.getName(),
		getRootCauseMessage(e));
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		}
		}
		@@ -3300,7 +3307,7 @@ public class MessagingController implements Runnable
		localFolder.getName(),
		getRootCauseMessage(e));
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		/*
		* We ignore this exception because a future refresh will retry this
		@@ -3347,7 +3354,7 @@ public class MessagingController implements Runnable
		{
		l.sendPendingMessagesFailed(account);
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);

		}
		finally
		@@ -3575,7 +3582,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException me)
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);

		throw new RuntimeException("Error moving message", me);
		}
		@@ -3608,7 +3615,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException me)
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);
		}
		finally
		{
		@@ -3750,7 +3757,7 @@ public class MessagingController implements Runnable
		}
		catch (MessagingException me)
		{
		addErrorMessage(account, me);
		addErrorMessage(account, null, me);

		throw new RuntimeException("Error deleting message from local store.", me);
		}
		@@ -3833,7 +3840,7 @@ public class MessagingController implements Runnable
		{
		Log.e(K9.LOG_TAG, "emptyTrash failed", e);

		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		finally
		{
		@@ -4022,7 +4029,7 @@ public class MessagingController implements Runnable
		if (modeMismatch(aDisplayMode, fDisplayClass))
		{
		// Never sync a folder that isn't displayed
		if (K9.DEBUG)
		if (K9.DEBUG && false)
		Log.v(K9.LOG_TAG, "Not syncing folder " + folder.getName() +
		" which is in display mode " + fDisplayClass + " while account is in display mode " + aDisplayMode);

		@@ -4032,7 +4039,7 @@ public class MessagingController implements Runnable
		if (modeMismatch(aSyncMode, fSyncClass))
		{
		// Do not sync folders in the wrong class
		if (K9.DEBUG)
		if (K9.DEBUG && false)
		Log.v(K9.LOG_TAG, "Not syncing folder " + folder.getName() +
		" which is in sync mode " + fSyncClass + " while account is in sync mode " + aSyncMode);

		@@ -4112,7 +4119,7 @@ public class MessagingController implements Runnable

		Log.e(K9.LOG_TAG, "Exception while processing folder " +
		account.getDescription() + ":" + folder.getName(), e);
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		finally
		{
		@@ -4129,7 +4136,7 @@ public class MessagingController implements Runnable
		catch (MessagingException e)
		{
		Log.e(K9.LOG_TAG, "Unable to synchronize account " + account.getName(), e);
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		finally
		{
		@@ -4151,7 +4158,7 @@ public class MessagingController implements Runnable
		catch (Exception e)
		{
		Log.e(K9.LOG_TAG, "Unable to synchronize mail", e);
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		putBackground("finalize sync", null, new Runnable()
		{
		@@ -4389,7 +4396,7 @@ public class MessagingController implements Runnable
		catch (MessagingException e)
		{
		Log.e(K9.LOG_TAG, "Unable to save message as draft.", e);
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		return localMessage;
		}
		@@ -4687,7 +4694,7 @@ public class MessagingController implements Runnable
		{
		l.synchronizeMailboxFailed(account, remoteFolder.getName(), errorMessage);
		}
		addErrorMessage(account, e);
		addErrorMessage(account, null, e);
		}
		finally
		{

src/com/fsck/k9/MessagingControllerPushReceiver.java

+1 −7

Original line number	Diff line number	Diff line
		@@ -84,18 +84,12 @@ public class MessagingControllerPushReceiver implements PushReceiver
		public void pushError(String errorMessage, Exception e)
		{
		String errMess = errorMessage;
		String body = null;

		if (errMess == null && e != null)
		{
		errMess = e.getMessage();
		}
		body = errMess;
		if (e != null)
		{
		body = e.toString();
		}
		controller.addErrorMessage(account, errMess, body);
		controller.addErrorMessage(account, errMess, e);
		}

		public String getPushState(String folderName)

src/com/fsck/k9/mail/store/ImapResponseParser.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -552,7 +552,7 @@ public class ImapResponseParser

		public String toString()
		{
		return "#" + mTag + "# " + super.toString();
		return "#" + (mCommandContinuationRequested ? "+" : mTag) + "# " + super.toString();
		}
		}
		}

src/com/fsck/k9/mail/store/ImapStore.java

+18 −13

Original line number	Diff line number	Diff line
		@@ -62,6 +62,9 @@ public class ImapStore extends Store

		private static final int IDLE_READ_TIMEOUT = 29 * 60 * 1000; // 29 minutes
		private static final int IDLE_REFRESH_INTERVAL = 20 * 60 * 1000; // 20 minutes
		private static final int IDLE_FAILURE_COUNT_LIMIT = 10;
		private static int MAX_DELAY_TIME = 5 * 60 * 1000; // 5 minutes
		private static int NORMAL_DELAY_TIME = 5000;

		private static final Flag[] PERMANENT_FLAGS = { Flag.DELETED, Flag.SEEN };

		@@ -1776,7 +1779,7 @@ public class ImapStore extends Store

		protected String getLogId()
		{
		String id = getName() + "/" + Thread.currentThread().getName();
		String id = getAccount().getDescription() + ":" + getName() + "/" + Thread.currentThread().getName();
		if (mConnection != null)
		{
		id += "/" + mConnection.getLogId();
		@@ -2492,9 +2495,6 @@ public class ImapStore extends Store
		}
		}

		public static int MAX_DELAY_TIME = 50000;
		public static int NORMAL_DELAY_TIME = 2500;

		public class ImapFolderPusher extends ImapFolder implements UntaggedHandler
		{
		final PushReceiver receiver;
		@@ -2503,6 +2503,7 @@ public class ImapStore extends Store
		final AtomicBoolean idling = new AtomicBoolean(false);
		final AtomicBoolean doneSent = new AtomicBoolean(false);
		final AtomicInteger delayTime = new AtomicInteger(NORMAL_DELAY_TIME);
		final AtomicInteger idleFailureCount = new AtomicInteger(0);
		List<ImapResponse> storedUntaggedResponses = new ArrayList<ImapResponse>();

		public ImapFolderPusher(ImapStore store, String name, PushReceiver nReceiver)
		@@ -2639,6 +2640,7 @@ public class ImapStore extends Store
		processUntaggedResponses(untaggedResponses);
		}
		delayTime.set(NORMAL_DELAY_TIME);
		idleFailureCount.set(0);
		}
		}
		}
		@@ -2662,7 +2664,7 @@ public class ImapStore extends Store
		}
		else
		{
		receiver.pushError("Push error: " + e.getMessage(), null);
		receiver.pushError("Push error for " + getName(), e);
		Log.e(K9.LOG_TAG, "Got exception while idling for " + getLogId(), e);
		int delayTimeInt = delayTime.get();
		receiver.sleep(delayTimeInt);
		@@ -2672,6 +2674,12 @@ public class ImapStore extends Store
		delayTimeInt = MAX_DELAY_TIME;
		}
		delayTime.set(delayTimeInt);
		if (idleFailureCount.incrementAndGet() > IDLE_FAILURE_COUNT_LIMIT)
		{
		Log.e(K9.LOG_TAG, "Disabling pusher for " + getLogId() + " after " + idleFailureCount.get() + " consecutive errors");
		receiver.pushError("Push disabled for " + getName() + " after " + idleFailureCount.get() + " consecutive errors", e);
		stop.set(true);
		}

		}
		}
		@@ -2971,9 +2979,7 @@ public class ImapStore extends Store
		}
		}
		}
		else if (response.size() > 0)
		{
		if ("idling".equals(response.get(0)))
		else if (response.mCommandContinuationRequested)
		{
		if (K9.DEBUG)
		Log.d(K9.LOG_TAG, "Idling " + getLogId());
		@@ -2984,7 +2990,6 @@ public class ImapStore extends Store
		}
		}
		}
		}
		@Override
		public Pusher getPusher(PushReceiver receiver)
		{

src/com/fsck/k9/service/SleepService.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -117,7 +117,7 @@ public class SleepService extends CoreService
		{
		long timeout = sleepDatum.timeout;
		if (K9.DEBUG)
		Log.d(K9.LOG_TAG, "SleepService Acquring wakeLock for id for " + timeout + "ms");
		Log.d(K9.LOG_TAG, "SleepService Acquiring wakeLock for " + timeout + "ms");
		wakeLock.acquire(timeout);
		}
		}