From e21a46fc07114612b0d2146366bccc9e94e75faf Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Thu, 19 Jul 2018 10:36:31 +0200
Subject: [PATCH] More consistent analytics consent dialog behavior

---
 .../keychain/analytics/AnalyticsConsentRequester.java        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java
index 4fc9af26b..0ff1778f8 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java
@@ -51,7 +51,7 @@ public class AnalyticsConsentRequester {
                     activity.getPackageManager().getPackageInfo(BuildConfig.APPLICATION_ID, 0).firstInstallTime;
             long threeDaysAgo = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(3);
             boolean installedLessThanThreeDaysAgo = firstInstallTime > threeDaysAgo;
-            if (!Constants.DEBUG && installedLessThanThreeDaysAgo) {
+            if (installedLessThanThreeDaysAgo) {
                 return;
             }
         } catch (NameNotFoundException e) {
@@ -60,7 +60,7 @@ public class AnalyticsConsentRequester {
 
         long twentyFourHoursAgo = System.currentTimeMillis() - TimeUnit.DAYS.toMillis(1);
         boolean askedLessThan24HoursAgo = preferences.getAnalyticsLastAsked() > twentyFourHoursAgo;
-        if (!Constants.DEBUG && askedLessThan24HoursAgo) {
+        if (askedLessThan24HoursAgo) {
             return;
         }
 
@@ -85,7 +85,6 @@ public class AnalyticsConsentRequester {
                 })
                 .show();
         alertDialog.<TextView>findViewById(android.R.id.message).setMovementMethod(LinkMovementMethod.getInstance());
-        alertDialog.setCanceledOnTouchOutside(false);
     }
 
     private void startExperimentalSettingsActivity() {