From 22f7438063a8a42af2c3ac027c1346d7f4978679 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 6 Jan 2020 09:29:19 +0100 Subject: [PATCH] Open selected inbox from widget --- .../main/java/eu/faircode/email/Widget.java | 21 +++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/Widget.java b/app/src/main/java/eu/faircode/email/Widget.java index 0e1f63b6b4..d7172d25c0 100644 --- a/app/src/main/java/eu/faircode/email/Widget.java +++ b/app/src/main/java/eu/faircode/email/Widget.java @@ -49,16 +49,25 @@ public class Widget extends AppWidgetProvider { DB db = DB.getInstance(context); NumberFormat nf = NumberFormat.getIntegerInstance(); - Intent view = new Intent(context, ActivityView.class); - view.setAction("unified"); - view.putExtra("refresh", true); - view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - PendingIntent pi = PendingIntent.getActivity(context, ActivityView.REQUEST_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT); - for (int appWidgetId : appWidgetIds) { long account = prefs.getLong("widget." + appWidgetId + ".account", -1L); String name = prefs.getString("widget." + appWidgetId + ".name", null); + EntityFolder folder = db.folder().getFolderByType(account, EntityFolder.INBOX); + + Intent view = new Intent(context, ActivityView.class); + if (folder == null) { + view.setAction("unified"); + view.putExtra("refresh", true); + } else { + view.setAction("folder:" + folder.id); + view.putExtra("account", account); + view.putExtra("type", folder.type); + view.putExtra("refresh", true); + } + view.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + PendingIntent pi = PendingIntent.getActivity(context, ActivityView.REQUEST_UNIFIED, view, PendingIntent.FLAG_UPDATE_CURRENT); + TupleMessageStats stats = db.message().getUnseenWidget(account < 0 ? null : account); Integer unseen = (unseen_ignored ? stats.notifying : stats.unseen); if (unseen == null)