From f5bf3515c5181fa6be9fe490aae85cc6c49b096f Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Wed, 11 Sep 2019 14:43:32 +0200
Subject: [PATCH] Simplification

---
 .../java/eu/faircode/email/FragmentCompose.java    |  5 -----
 .../eu/faircode/email/FragmentDialogDuration.java  | 14 ++++++++++++++
 .../java/eu/faircode/email/FragmentMessages.java   |  5 -----
 3 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java
index 8376092ca0..b5ae846f38 100644
--- a/app/src/main/java/eu/faircode/email/FragmentCompose.java
+++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java
@@ -3689,11 +3689,6 @@ public class FragmentCompose extends FragmentBase {
             if (context == null)
                 return;
 
-            if (!ActivityBilling.isPro(context)) {
-                context.startActivity(new Intent(context, ActivityBilling.class));
-                return;
-            }
-
             Bundle data = intent.getBundleExtra("args");
             long id = data.getLong("id");
             long duration = data.getLong("duration");
diff --git a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
index db6b5594e5..d6b66ae377 100644
--- a/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
+++ b/app/src/main/java/eu/faircode/email/FragmentDialogDuration.java
@@ -21,6 +21,7 @@ package eu.faircode.email;
 
 import android.app.Dialog;
 import android.content.DialogInterface;
+import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -39,6 +40,7 @@ import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.Date;
 
+import static android.app.Activity.RESULT_CANCELED;
 import static android.app.Activity.RESULT_OK;
 
 public class FragmentDialogDuration extends FragmentDialogEx {
@@ -163,4 +165,16 @@ public class FragmentDialogDuration extends FragmentDialogEx {
 
         return dialog;
     }
+
+    @Override
+    protected void sendResult(int result) {
+        if (result == RESULT_OK) {
+            if (!ActivityBilling.isPro(getContext())) {
+                getActivity().startActivity(new Intent(getContext(), ActivityBilling.class));
+                result = RESULT_CANCELED;
+            }
+        }
+
+        super.sendResult(result);
+    }
 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 50ea8a03fd..22bff716a3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -4247,11 +4247,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
     }
 
     private void onSnooze(Bundle args) {
-        if (!ActivityBilling.isPro(getContext())) {
-            getContext().startActivity(new Intent(getContext(), ActivityBilling.class));
-            return;
-        }
-
         long duration = args.getLong("duration");
         long time = args.getLong("time");
         args.putLong("wakeup", duration == 0 ? -1 : time);