From 962491354e00fbd1dbd2a320905bdb4e67040a25 Mon Sep 17 00:00:00 2001 From: M66B Date: Sun, 6 Sep 2020 09:33:05 +0200 Subject: [PATCH] Added folder type to widget intent --- app/src/main/java/eu/faircode/email/ActivityView.java | 10 +++------- app/src/main/java/eu/faircode/email/WidgetUnified.java | 1 + 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index a3dc197c50..e61162a0ed 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -1039,19 +1039,15 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB } else if (action.equals("widget")) { long account = intent.getLongExtra("account", -1); long folder = intent.getLongExtra("folder", -1); - - intent.removeExtra("account"); - intent.removeExtra("folder"); - setIntent(intent); - - if (account > 0 && folder > 0) { + String type = intent.getStringExtra("type"); + if (account > 0 && folder > 0 && !TextUtils.isEmpty(type)) { if (getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.STARTED)) { getSupportFragmentManager().popBackStack("messages", FragmentManager.POP_BACK_STACK_INCLUSIVE); Bundle args = new Bundle(); - //args.putString("type", intent.getStringExtra("type")); args.putLong("account", account); args.putLong("folder", folder); + args.putString("type", type); FragmentMessages fragment = new FragmentMessages(); fragment.setArguments(args); diff --git a/app/src/main/java/eu/faircode/email/WidgetUnified.java b/app/src/main/java/eu/faircode/email/WidgetUnified.java index bed23ce26c..f307120ba3 100644 --- a/app/src/main/java/eu/faircode/email/WidgetUnified.java +++ b/app/src/main/java/eu/faircode/email/WidgetUnified.java @@ -91,6 +91,7 @@ public class WidgetUnified extends AppWidgetProvider { thread.setAction("widget"); thread.putExtra("account", account); thread.putExtra("folder", folder); + thread.putExtra("type", type); thread.putExtra("filter_archive", !EntityFolder.ARCHIVE.equals(type)); thread.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); PendingIntent piItem = PendingIntent.getActivity(