mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent crash

This commit is contained in:
M66B 2020-11-21 07:48:34 +01:00
parent 853606f803
commit 9b0c4e572e
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/src/main/java/eu/faircode/email/SimpleTask.java
View File

@ -130,8 +130,7 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
try { try {
onPreExecute(args); onPreExecute(args);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); error(args, ex);
onException(args, ex);
} }
future = getExecutor(context).submit(new Runnable() { future = getExecutor(context).submit(new Runnable() {
@ -195,8 +194,7 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
try { try {
onPostExecute(args); onPostExecute(args);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); error(args, ex);
onException(args, ex);
} finally { } finally {
try { try {
if (ex == null) { if (ex == null) {
@ -209,10 +207,9 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
onExecuted(args, (T) data); onExecuted(args, (T) data);
} else } else
onException(args, ex); error(args, ex);
} catch (Throwable ex) { } catch (Throwable ex) {
Log.e(ex); error(args, ex);
onException(args, ex);
} }
} }
} }
@ -221,6 +218,15 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
}); });
} }
void error(Bundle args, Throwable ex) {
try {
Log.e(ex);
onException(args, ex);
} catch (Throwable exex) {
Log.e(exex);
}
}
void cancel(Context context) { void cancel(Context context) {
if (future != null) if (future != null)
if (future.cancel(false)) { if (future.cancel(false)) {