mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-21 05:37:07 +00:00
Code Issues Releases Wiki Activity

Improved error reporting

Browse source
This commit is contained in:
M66B 2021-07-27 21:04:48 +02:00
parent 7254f4ef06
commit 412ebca216
1 changed files with 19 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
app/src/main/java/eu/faircode/email/Core.java
View file

@ -2269,7 +2269,7 @@ class Core {
private static void onSynchronizeMessages(
Context context, JSONArray jargs,
EntityAccount account, final EntityFolder folder,
POP3Folder ifolder, POP3Store istore, State state) throws Throwable {
POP3Folder ifolder, POP3Store istore, State state) throws MessagingException, IOException {
DB db = DB.getInstance(context);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean notify_known = prefs.getBoolean("notify_known", false);
@ -2582,7 +2582,7 @@ class Core {
private static void onSynchronizeMessages(
Context context, JSONArray jargs,
EntityAccount account, final EntityFolder folder,
IMAPStore istore, final IMAPFolder ifolder, State state) throws Throwable {
IMAPStore istore, final IMAPFolder ifolder, State state) throws JSONException, MessagingException, IOException {
final DB db = DB.getInstance(context);
try {
SyncStats stats = new SyncStats();
@ -4989,9 +4989,9 @@ class Core {
join(thread);
}
void ensureRunning(String reason) throws Throwable {
void ensureRunning(String reason) {
if (!recoverable && unrecoverable != null)
throw unrecoverable;
throw new OperationCanceledExceptionEx(reason, unrecoverable);
if (!running)
throw new OperationCanceledException(reason);
}
@ -5122,6 +5122,21 @@ class Core {
}
}
static class OperationCanceledExceptionEx extends OperationCanceledException {
private Throwable cause;
OperationCanceledExceptionEx(String message, Throwable cause) {
super(message);
this.cause = cause;
}
@Nullable
@Override
public Throwable getCause() {
return this.cause;
}
}
private static class SyncStats {
long search_ms;
int flags;