From bf87b4b385c34bd4f429e173aee4904774d804aa Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 26 Dec 2019 19:40:42 +0100
Subject: [PATCH] Review later

---
 .../eu/faircode/email/FragmentMessages.java     | 17 ++++++++++++++++-
 .../eu/faircode/email/FragmentOptionsMisc.java  |  2 +-
 app/src/main/res/values/strings.xml             |  5 +++--
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 7e1a0e77b4..4d1978ecea 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -2727,6 +2727,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         if (viewType != AdapterMessage.ViewType.UNIFIED)
             return false;
 
+        if (!Helper.isPlayStoreInstall() && !BuildConfig.DEBUG)
+            return false;
+
         SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
         if (prefs.getBoolean("review_asked", false))
             return false;
@@ -2745,7 +2748,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
         } catch (Throwable ex) {
             Log.e(ex);
         }
-        Log.i("Installed=" + new Date(installed));
+
+        long later = prefs.getLong("review_later", 0);
+
+        Log.i("Installed=" + new Date(installed) + " later=" + new Date(later));
+        if (later > installed)
+            installed = later;
 
         long now = new Date().getTime();
         if (installed + REVIEW_ASK_DELAY > now)
@@ -5489,6 +5497,13 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
                         }
                     })
                     .setNegativeButton(android.R.string.no, null)
+                    .setNeutralButton(R.string.title_later, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialog, int which) {
+                            SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
+                            prefs.edit().putLong("review_later", new Date().getTime()).apply();
+                        }
+                    })
                     .create();
         }
     }
diff --git a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
index d72624fa92..9a293c32f3 100644
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsMisc.java
@@ -68,7 +68,7 @@ public class FragmentOptionsMisc extends FragmentBase implements SharedPreferenc
     };
 
     private final static String[] RESET_QUESTIONS = new String[]{
-            "welcome", "crash_reports_asked", "review_asked",
+            "welcome", "crash_reports_asked", "review_asked", "review_later",
             "html_always_images", "print_html_confirmed",
             "identities_asked", "cc_bcc", "inline_image_hint", "compose_reference", "send_dialog"
     };
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index d08d4ddc53..14221c9b49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -658,8 +658,8 @@
     <string name="title_ask_reporting">Send error reports?</string>
     <string name="title_reporting_why">Error reporting will help improve FairEmail</string>
 
-    <string name="title_ask_review" translatable="false">Please review FairEmail</string>
-    <string name="title_ask_review_rationale" translatable="false">
+    <string name="title_ask_review">Please review FairEmail</string>
+    <string name="title_ask_review_rationale">
         You have been using FairEmail for a while.
         It would be appreciated if you could rate FairEmail in the Play Store.
         This will help to maintain a balance between unfavorable and favorable reviews.
@@ -958,6 +958,7 @@
     <string name="title_issue">Do you have a question or problem?</string>
     <string name="title_yes">Yes</string>
     <string name="title_no">No</string>
+    <string name="title_later">Later</string>
     <string name="title_undo">Undo</string>
     <string name="title_redo">Redo</string>
     <string name="title_add">Add</string>