Avoid NullPointerException and creation of Date instances (f228abd3) · Commits · e / os / Mail

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -866,6 +866,7 @@ public class MessagingController {
		if (K9.DEBUG)
		Log.v(K9.LOG_TAG, "SYNC: Remote message count for folder " + folder + " is " + remoteMessageCount);
		final Date earliestDate = account.getEarliestPollDate();
		long earliestTimestamp = earliestDate != null ? earliestDate.getTime() : 0L;


		int remoteStart = 1;
		@@ -895,9 +896,8 @@ public class MessagingController {
		for (MessagingListener l : getListeners(listener)) {
		l.synchronizeMailboxHeadersProgress(account, folder, headerProgress.get(), messageCount);
		}
		Long localMessageDateRaw = localUidMap.get(thisMess.getUid());
		Date localMessageDate = localMessageDateRaw != null ? new Date(localMessageDateRaw) : null;
		if (localMessageDate == null \|\| !localMessageDate.before(earliestDate)) {
		Long localMessageTimestamp = localUidMap.get(thisMess.getUid());
		if (localMessageTimestamp == null \|\| localMessageTimestamp >= earliestTimestamp) {
		remoteMessages.add(thisMess);
		remoteUidMap.put(thisMess.getUid(), thisMess);
		}