Simplify LocalFolder.getAllMessageUids() (b0574804) · Commits · e / os / Mail

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

+2 −3

Original line number	Diff line number	Diff line
		@@ -896,7 +896,7 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
		}
		}

		public List<String> getAllMessageUids(final boolean includeDeleted) throws MessagingException {
		public List<String> getAllMessageUids() throws MessagingException {
		try {
		return localStore.database.execute(false, new DbCallback<List<String>>() {
		@Override
		@@ -910,8 +910,7 @@ public class LocalFolder extends Folder<LocalMessage> implements Serializable {
		cursor = db.rawQuery(
		"SELECT uid " +
		"FROM messages " +
		"WHERE empty = 0 AND " +
		(includeDeleted ? "" : "deleted = 0 AND ") +
		"WHERE empty = 0 AND deleted = 0 AND " +
		"folder_id = ? ORDER BY date DESC",
		new String[] { Long.toString(mFolderId) });

+1 −1

Original line number	Diff line number	Diff line
		@@ -31,7 +31,7 @@ class MigrationTo55 {
		FetchProfile fp = new FetchProfile();
		fp.add(FetchProfile.Item.BODY);
		for (LocalFolder folder : folders) {
		List<String> messageUids = folder.getAllMessageUids(false);
		List<String> messageUids = folder.getAllMessageUids();
		for (String messageUid : messageUids) {
		LocalMessage localMessage = folder.getMessage(messageUid);
		folder.fetch(Collections.singletonList(localMessage), fp, null);