Make sure duplicate folders aren't displayed (c8632b8b) · Commits · e / os / Mail

k9mail/src/main/java/io/eelo/mail/activity/FolderList.java

+19 −1

Original line number	Diff line number	Diff line
		@@ -2,9 +2,11 @@ package io.eelo.mail.activity;

		import java.util.ArrayList;
		import java.util.Collections;
		import java.util.HashSet;
		import java.util.LinkedList;
		import java.util.List;
		import java.util.Locale;
		import java.util.Set;

		import android.annotation.SuppressLint;
		import android.app.ActionBar;
		@@ -135,8 +137,24 @@ public class FolderList extends K9ListActivity {
		public void newFolders(final List<FolderInfoHolder> newFolders) {
		runOnUiThread(new Runnable() {
		public void run() {
		Set<String> folderNamesSet = new HashSet<>();
		ArrayList<FolderInfoHolder> folders = new ArrayList<>();

		for (FolderInfoHolder folder : newFolders) {
		folderNamesSet.add(folder.displayName);
		}

		for (String folderName : folderNamesSet) {
		for (FolderInfoHolder folder : newFolders) {
		if (folderName.equals(folder.displayName)) {
		folders.add(folder);
		break;
		}
		}
		}

		adapter.mFolders.clear();
		adapter.mFolders.addAll(newFolders);
		adapter.mFolders.addAll(folders);
		adapter.mFilteredFolders = adapter.mFolders;
		handler.dataChanged();
		}