From 3505ea6b8fc15c3fac1f6b92e403d6618ec4d3f2 Mon Sep 17 00:00:00 2001 From: M66B Date: Sat, 1 Dec 2018 15:27:25 +0100 Subject: [PATCH] Debug info on error --- app/src/main/java/eu/faircode/email/ActivityView.java | 3 +++ .../main/java/eu/faircode/email/ServiceSynchronize.java | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index f82d75294b..b458a42fc6 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -370,6 +370,9 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB if ("unified".equals(action)) getSupportFragmentManager().popBackStack("unified", 0); + else if ("error".equals(action)) + onDebugInfo(); + else if (action.startsWith("thread")) { ViewModelMessages model = ViewModelProviders.of(this).get(ViewModelMessages.class); model.setMessages(null); diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java index 7915439611..a56861e9a8 100644 --- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java +++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java @@ -611,12 +611,14 @@ public class ServiceSynchronize extends LifecycleService { } private Notification.Builder getNotificationError(String action, Throwable ex) { - return getNotificationError(action, new Date().getTime(), ex); + return getNotificationError(action, new Date().getTime(), ex, true); } - private Notification.Builder getNotificationError(String action, long when, Throwable ex) { + private Notification.Builder getNotificationError(String action, long when, Throwable ex, boolean debug) { // Build pending intent Intent intent = new Intent(this, ActivitySetup.class); + if (debug) + intent.setAction("error"); intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent pi = PendingIntent.getActivity( this, ActivitySetup.REQUEST_ERROR, intent, PendingIntent.FLAG_UPDATE_CURRENT); @@ -832,7 +834,7 @@ public class ServiceSynchronize extends LifecycleService { if (now - account.last_connected > ACCOUNT_ERROR_AFTER * 60 * 1000L) { NotificationManager nm = getSystemService(NotificationManager.class); nm.notify("receive", account.id.intValue(), - getNotificationError(account.name, account.last_connected, ex).build()); + getNotificationError(account.name, account.last_connected, ex, false).build()); } }