Merge pull request #2693 from k9mail/cleanup-localstore-classes (65dc6d12) · Commits · e / os / Mail

k9mail-library/src/main/java/com/fsck/k9/mail/Message.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -144,8 +144,6 @@ public abstract class Message implements Part, Body {
		@Override
		public abstract void setBody(Body body);

		public abstract long getId();

		public abstract boolean hasAttachments();

		public abstract long getSize();

k9mail-library/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java

+0 −5

Original line number	Diff line number	Diff line
		@@ -688,11 +688,6 @@ public class MimeMessage extends Message {
		return message;
		}

		@Override
		public long getId() {
		return Long.parseLong(mUid); //or maybe .mMessageId?
		}

		@Override
		public boolean hasAttachments() {
		return false;

k9mail/src/main/java/com/fsck/k9/cache/EmailProviderCache.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -126,8 +126,8 @@ public class EmailProviderCache {
		public void hideMessages(List<LocalMessage> messages) {
		synchronized (mHiddenMessageCache) {
		for (LocalMessage message : messages) {
		long messageId = message.getId();
		mHiddenMessageCache.put(messageId, message.getFolder().getId());
		long messageId = message.getDatabaseId();
		mHiddenMessageCache.put(messageId, message.getFolder().getDatabaseId());
		}
		}

		@@ -145,8 +145,8 @@ public class EmailProviderCache {
		synchronized (mHiddenMessageCache) {
		for (Message message : messages) {
		LocalMessage localMessage = (LocalMessage) message;
		long messageId = localMessage.getId();
		long folderId = ((LocalFolder) localMessage.getFolder()).getId();
		long messageId = localMessage.getDatabaseId();
		long folderId = ((LocalFolder) localMessage.getFolder()).getDatabaseId();
		Long hiddenInFolder = mHiddenMessageCache.get(messageId);

		if (hiddenInFolder != null && hiddenInFolder.longValue() == folderId) {

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

+8 −8

Original line number	Diff line number	Diff line
		@@ -305,8 +305,8 @@ public class MessagingController {
		}

		private boolean isMessageSuppressed(LocalMessage message) {
		long messageId = message.getId();
		long folderId = message.getFolder().getId();
		long messageId = message.getDatabaseId();
		long folderId = message.getFolder().getDatabaseId();

		EmailProviderCache cache = EmailProviderCache.getCache(message.getFolder().getAccountUuid(), context);
		return cache.isMessageHidden(messageId, folderId);
		@@ -2511,7 +2511,7 @@ public class MessagingController {
		localFolder.open(Folder.OPEN_MODE_RW);

		LocalMessage message = localFolder.getMessage(uid);
		if (message == null \|\| message.getId() == 0) {
		if (message == null \|\| message.getDatabaseId() == 0) {
		throw new IllegalArgumentException("Message not found: folder=" + folderName + ", uid=" + uid);
		}

		@@ -2530,7 +2530,7 @@ public class MessagingController {
		throws MessagingException {

		if (account.isMarkMessageAsReadOnView() && !message.isSet(Flag.SEEN)) {
		List<Long> messageIds = Collections.singletonList(message.getId());
		List<Long> messageIds = Collections.singletonList(message.getDatabaseId());
		setFlag(account, messageIds, Flag.SEEN, true);

		message.setFlagInternal(Flag.SEEN, true);
		@@ -2721,7 +2721,7 @@ public class MessagingController {
		fp.add(FetchProfile.Item.BODY);

		Timber.i("Scanning folder '%s' (%d) for messages to send",
		account.getOutboxFolderName(), localFolder.getId());
		account.getOutboxFolderName(), localFolder.getDatabaseId());

		Transport transport = transportProvider.getTransport(K9.app, account);

		@@ -2836,11 +2836,11 @@ public class MessagingController {
		message.setFlag(Flag.DELETED, true);
		} else {
		LocalFolder localSentFolder = localStore.getFolder(account.getSentFolderName());
		Timber.i("Moving sent message to folder '%s' (%d)", account.getSentFolderName(), localSentFolder.getId());
		Timber.i("Moving sent message to folder '%s' (%d)", account.getSentFolderName(), localSentFolder.getDatabaseId());

		localFolder.moveMessages(Collections.singletonList(message), localSentFolder);

		Timber.i("Moved sent message to folder '%s' (%d)", account.getSentFolderName(), localSentFolder.getId());
		Timber.i("Moved sent message to folder '%s' (%d)", account.getSentFolderName(), localSentFolder.getDatabaseId());

		PendingCommand command = PendingAppend.create(localSentFolder.getName(), message.getUid());
		queuePendingCommand(account, command);
		@@ -3996,7 +3996,7 @@ public class MessagingController {
		public long getId(Message message) {
		long id;
		if (message instanceof LocalMessage) {
		id = message.getId();
		id = ((LocalMessage) message).getDatabaseId();
		} else {
		Timber.w("MessagingController.getId() called without a LocalMessage");
		id = INVALID_MESSAGE_ID;

k9mail/src/main/java/com/fsck/k9/mailstore/LocalBodyPart.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,7 @@ public class LocalBodyPart extends MimeBodyPart implements LocalPart {
		}

		@Override
		public long getId() {
		public long getPartId() {
		return messagePartId;
		}