Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-06 04:45:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
M66B
2020-10-05 15:44:37 +02:00
parent a9937508ca
commit 795c0840d9
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -485,11 +485,7 @@ class Core {
db.operation().deleteOperation(op.id);
// Cleanup messages
if (message != null &&
(ex instanceof MessageRemovedException ||
ex instanceof MessageRemovedIOException ||
ex.getCause() instanceof MessageRemovedException ||
ex.getCause() instanceof MessageRemovedIOException))
if (message != null && MessageHelper.isRemoved(ex))
db.message().deleteMessage(message.id);
db.setTransactionSuccessful();

10
app/src/main/java/eu/faircode/email/MessageHelper.java
View File

@@ -2389,6 +2389,16 @@ public class MessageHelper {
return email;
}
static boolean isRemoved(Throwable ex) {
while (ex != null) {
if (ex instanceof MessageRemovedException ||
ex instanceof MessageRemovedIOException)
return true;
ex = ex.getCause();
}
return false;
}
static boolean equalEmail(Address a1, Address a2) {
String email1 = ((InternetAddress) a1).getAddress();
String email2 = ((InternetAddress) a2).getAddress();