moparisthebest/k-9
1
0
Fork 0
mirror of https://github.com/moparisthebest/k-9 synced 2024-11-15 22:15:15 -05:00
Code Issues Releases Wiki Activity

do not throw exception in MessagingController per review comment

Browse Source
This commit is contained in:
Art O Cathain 2015-07-01 16:57:13 +01:00
parent 7fc8767a5c
commit 32cc97207c
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
k9mail/src/main/java/com/fsck/k9/provider/MessageProvider.java
View File

@ -1035,7 +1035,7 @@ public class MessageProvider extends ContentProvider {
}
if (myAccount == null) {
throw new IllegalArgumentException("Could not find account with id " + accountId);
Log.e(K9.LOG_TAG, "Could not find account with id " + accountId);
}
// get localstore parameter
@ -1048,16 +1048,14 @@ public class MessageProvider extends ContentProvider {
}
msg = lf.getMessage(msgUid);
} catch (MessagingException e) {
throw new RuntimeException(e);
}
if (msg == null) {
throw new IllegalArgumentException("Could not find message with id " + msgUid);
Log.e(K9.LOG_TAG, "Unable to retrieve message", e);
}
// launch command to delete the message
MessagingController controller = MessagingController.getInstance(getContext());
controller.deleteMessages(Collections.singletonList(msg), null);
if ((myAccount != null) && (msg != null)) {
MessagingController controller = MessagingController.getInstance(getContext());
controller.deleteMessages(Collections.singletonList(msg), null);
}
// FIXME return the actual number of deleted messages
return 0;