From 46d15e9f790a3e0b3cc9f64edde2404f5a226a35 Mon Sep 17 00:00:00 2001 From: M66B Date: Mon, 7 Sep 2020 09:53:12 +0200 Subject: [PATCH] Small fix --- app/src/main/java/eu/faircode/email/FragmentCompose.java | 6 +++++- app/src/main/java/eu/faircode/email/FragmentMessages.java | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index 7c62c90efb..9f56c1d4e0 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1600,12 +1600,16 @@ public class FragmentCompose extends FragmentBase { popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem target) { + Intent intent = target.getIntent(); + if (intent == null) + return false; + if (!ActivityBilling.isPro(getContext())) { startActivity(new Intent(getContext(), ActivityBilling.class)); return true; } - long id = target.getIntent().getLongExtra("id", -1); + long id = intent.getLongExtra("id", -1); for (EntityAnswer answer : answers) if (answer.id.equals(id)) { if (etSubject.getText().length() == 0) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 342ce8016f..f9a56aaace 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -2450,6 +2450,10 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. popupMenu.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() { @Override public boolean onMenuItemClick(MenuItem target) { + Intent intent = target.getIntent(); + if (intent == null) + return false; + if (!ActivityBilling.isPro(getContext())) { startActivity(new Intent(getContext(), ActivityBilling.class)); return true; @@ -2458,7 +2462,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. startActivity(new Intent(getContext(), ActivityCompose.class) .putExtra("action", "reply") .putExtra("reference", message.id) - .putExtra("answer", target.getIntent().getLongExtra("id", -1))); + .putExtra("answer", intent.getLongExtra("id", -1))); return true; } });