nettika/geary
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'mjog/phantom-parent-folders' into 'mainline'

Browse source 
Geary.ImapEngine.GenericAccount: Fix duplicate folders on first load

See merge request GNOME/geary!500
This commit is contained in:
Michael Gratton 2020-04-23 01:59:36 +00:00
commit 11754cb63b
1 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/engine/imap-engine/imap-engine-generic-account.vala
View file

@ -1079,11 +1079,20 @@ internal class Geary.ImapEngine.UpdateRemoteFolders : AccountOperation {
}
public override async void execute(Cancellable cancellable) throws Error {
Gee.Map<FolderPath, Geary.Folder> existing_folders =
Geary.traverse<Geary.Folder>(this.account.list_folders())
.to_hash_map<FolderPath>(f => f.path);
Gee.Map<FolderPath, Imap.Folder> remote_folders =
new Gee.HashMap<FolderPath, Imap.Folder>();
// Use sorted maps here to a) aid debugging, and b) ensure
// that parent folders are processed before child folders
var existing_folders = new Gee.TreeMap<FolderPath,Folder>(
(a,b) => a.compare_to(b)
);
var remote_folders = new Gee.TreeMap<FolderPath,Imap.Folder>(
(a,b) => a.compare_to(b)
);
Geary.traverse<Geary.Folder>(
this.account.list_folders()
).add_all_to_map<FolderPath>(
existing_folders, f => f.path
);
GenericAccount account = (GenericAccount) this.account;
Imap.AccountSession remote = yield account.claim_account_session(