mirror/thunderbird-android
0
0
Fork 0
mirror of https://github.com/thunderbird/thunderbird-android.git synced 2024-09-20 04:02:14 +02:00
Code

Merge pull request #3863 from k9mail/GH-3861_fix_deleting_folders

Browse Source 
Fix deleting folders
This commit is contained in:
cketti 2019-01-09 23:49:32 +01:00 committed by GitHub
commit 88c12325b9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/core/src/main/java/com/fsck/k9/mailstore/K9BackendStorage.kt
View File

@ -49,7 +49,10 @@ class K9BackendStorage(
folderServerIds.asSequence()
.filterNot { account.isSpecialFolder(it) }
.map { localStore.getFolder(it) }
.forEach { it.delete() }
.forEach {
it.delete()
it.delete(true)
}
specialFolderUpdater.updateSpecialFolders()
}

2
app/core/src/main/java/com/fsck/k9/mailstore/LocalFolder.java
View File

@ -1906,7 +1906,7 @@ public class LocalFolder extends Folder<LocalMessage> {
@Override
public Void doDbWork(final SQLiteDatabase db) throws WrappedException, UnavailableStorageException {
try {
// We need to open the folder first to make sure we've got it's id
// We need to open the folder first to make sure we've got its id
open(OPEN_MODE_RO);
List<LocalMessage> messages = getMessages(null);
for (LocalMessage message : messages) {