wbrawner/thunderbird-android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Change MessagingController.deleteMessagesSynchronous() to use folder ID

Browse source
This commit is contained in:
cketti 2020-06-12 18:09:37 +02:00
parent 31ad75c539
commit 00fc6708cc
5 changed files with 22 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
app/core/src/main/java/com/fsck/k9/controller/MessagingController.java
View file

@ -1857,7 +1857,7 @@ public class MessagingController {
String uid = localFolder.getMessageUidById(id);
if (uid != null) {
MessageReference messageReference = new MessageReference(account.getUuid(), folderId, uid, null);
deleteMessage(messageReference, null);
deleteMessage(messageReference);
}
} catch (MessagingException me) {
Timber.e(me, "Error deleting draft");
@ -1865,26 +1865,18 @@ public class MessagingController {
}
public void deleteThreads(final List<MessageReference> messages) {
actOnMessagesGroupedByAccountAndFolder(messages, new MessageActor() {
@Override
public void act(final Account account, final LocalFolder messageFolder,
final List<LocalMessage> accountMessages) {
suppressMessages(account, accountMessages);
putBackground("deleteThreads", null, new Runnable() {
@Override
public void run() {
deleteThreadsSynchronous(account, messageFolder.getServerId(), accountMessages);
}
});
}
actOnMessagesGroupedByAccountAndFolder(messages, (account, messageFolder, accountMessages) -> {
suppressMessages(account, accountMessages);
putBackground("deleteThreads", null, () ->
deleteThreadsSynchronous(account, messageFolder.getDatabaseId(), accountMessages)
);
});
}
private void deleteThreadsSynchronous(Account account, String folderServerId, List<LocalMessage> messages) {
private void deleteThreadsSynchronous(Account account, long folderId, List<LocalMessage> messages) {
try {
List<LocalMessage> messagesToDelete = collectMessagesInThreads(account, messages);
deleteMessagesSynchronous(account, folderServerId, messagesToDelete, null);
deleteMessagesSynchronous(account, folderId, messagesToDelete);
} catch (MessagingException e) {
Timber.e(e, "Something went wrong while deleting threads");
}
@ -1908,26 +1900,16 @@ public class MessagingController {
return messagesInThreads;
}
public void deleteMessage(MessageReference message, final MessagingListener listener) {
deleteMessages(Collections.singletonList(message), listener);
public void deleteMessage(MessageReference message) {
deleteMessages(Collections.singletonList(message));
}
public void deleteMessages(List<MessageReference> messages, final MessagingListener listener) {
actOnMessagesGroupedByAccountAndFolder(messages, new MessageActor() {
@Override
public void act(final Account account, final LocalFolder messageFolder,
final List<LocalMessage> accountMessages) {
suppressMessages(account, accountMessages);
putBackground("deleteMessages", null, new Runnable() {
@Override
public void run() {
deleteMessagesSynchronous(account, messageFolder.getServerId(), accountMessages, listener);
}
});
}
public void deleteMessages(List<MessageReference> messages) {
actOnMessagesGroupedByAccountAndFolder(messages, (account, messageFolder, accountMessages) -> {
suppressMessages(account, accountMessages);
putBackground("deleteMessages", null, () ->
deleteMessagesSynchronous(account, messageFolder.getDatabaseId(), accountMessages)
);
});
}
@ -1960,9 +1942,7 @@ public class MessagingController {
}
private void deleteMessagesSynchronous(final Account account, final String folder,
final List<LocalMessage> messages,
MessagingListener listener) {
private void deleteMessagesSynchronous(Account account, long folderId, List<LocalMessage> messages) {
try {
List<LocalMessage> localOnlyMessages = new ArrayList<>();
List<LocalMessage> syncedMessages = new ArrayList<>();
@ -1980,9 +1960,8 @@ public class MessagingController {
Backend backend = getBackend(account);
LocalStore localStore = localStoreProvider.getInstance(account);
LocalFolder localFolder = localStore.getFolder(folder);
LocalFolder localFolder = localStore.getFolder(folderId);
localFolder.open();
long folderId = localFolder.getDatabaseId();
Map<String, String> uidMap = null;
Long trashFolderId = account.getTrashFolderId();

2
app/core/src/main/java/com/fsck/k9/notification/NotificationActionService.java
View file

@ -181,7 +181,7 @@ public class NotificationActionService extends Service {
List<String> messageReferenceStrings = intent.getStringArrayListExtra(EXTRA_MESSAGE_REFERENCES);
List<MessageReference> messageReferences = toMessageReferenceList(messageReferenceStrings);
controller.deleteMessages(messageReferences, null);
controller.deleteMessages(messageReferences);
}
private void archiveMessages(Intent intent, Account account, MessagingController controller) {

2
app/k9mail/src/main/java/com/fsck/k9/external/MessageProvider.java vendored
View file

@ -166,7 +166,7 @@ public class MessageProvider extends ContentProvider {
if (myAccount != null) {
MessageReference messageReference = new MessageReference(myAccount.getUuid(), folderId, msgUid, null);
MessagingController controller = MessagingController.getInstance(getContext());
controller.deleteMessage(messageReference, null);
controller.deleteMessage(messageReference);
}
// FIXME return the actual number of deleted messages

2
app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.java
View file

@ -727,7 +727,7 @@ public class MessageListFragment extends Fragment implements OnItemClickListener
if (showingThreadedList) {
messagingController.deleteThreads(messages);
} else {
messagingController.deleteMessages(messages, null);
messagingController.deleteMessages(messages);
}
}

2
app/ui/legacy/src/main/java/com/fsck/k9/ui/messageview/MessageViewFragment.java
View file

@ -317,7 +317,7 @@ public class MessageViewFragment extends Fragment implements ConfirmationDialogF
mFragmentListener.disableDeleteAction();
LocalMessage messageToDelete = mMessage;
mFragmentListener.showNextMessageOrReturn();
mController.deleteMessage(mMessageReference, null);
mController.deleteMessage(mMessageReference);
}
}