From fcf6abfec3de198f7c0bb929d95a76489c4cc6df Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Mon, 16 Jul 2018 14:15:23 +0200
Subject: [PATCH] link to privacy policy in consent dialog

---
 .../keychain/analytics/AnalyticsConsentRequester.java    | 9 ++++++---
 OpenKeychain/src/main/res/values/strings.xml             | 6 +++---
 2 files changed, 9 insertions(+), 6 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 1a6173555..acf643ba6 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java
@@ -9,6 +9,8 @@ import android.app.AlertDialog.Builder;
 import android.content.Intent;
 import android.content.pm.PackageManager.NameNotFoundException;
 import android.preference.PreferenceActivity;
+import android.text.method.LinkMovementMethod;
+import android.widget.TextView;
 
 import org.sufficientlysecure.keychain.BuildConfig;
 import org.sufficientlysecure.keychain.Constants;
@@ -65,8 +67,8 @@ public class AnalyticsConsentRequester {
         preferences.setAnalyticsLastAskedNow();
 
         AnalyticsManager analyticsManager = ((KeychainApplication) activity.getApplication()).getAnalyticsManager();
-        AlertDialog show = new Builder(activity)
-                .setMessage(R.string.dialog_analytics_text)
+        AlertDialog alertDialog = new Builder(activity)
+                .setMessage(R.string.dialog_analytics_consent)
                 .setPositiveButton(R.string.button_analytics_yes, (dialog, which) -> {
                     preferences.setAnalyticsAskedPolitely();
                     preferences.setAnalyticsGotUserConsent(true);
@@ -82,7 +84,8 @@ public class AnalyticsConsentRequester {
                             this::startExperimentalSettingsActivity, R.string.snackbutton_analytics_settings).show();
                 })
                 .show();
-        show.setCanceledOnTouchOutside(false);
+        alertDialog.<TextView>findViewById(android.R.id.message).setMovementMethod(LinkMovementMethod.getInstance());
+        alertDialog.setCanceledOnTouchOutside(false);
     }
 
     private void startExperimentalSettingsActivity() {
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 274059e46..5e457eded 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -2048,9 +2048,9 @@
     <string name="keylist_header_anonymous">Anonymous</string>
     <string name="keylist_header_special">#</string>
 
-    <string name="dialog_analytics_text">Allow OpenKeychain to collect anonymous usage statistics to help improve the app?</string>
-    <string name="button_analytics_yes">Yes, I want to help!</string>
-    <string name="button_analytics_no">No, thanks</string>
+    <string name="dialog_analytics_consent">"To improve the experience for all users, may OpenKeychain collect anonymous usage statistics?\n\nTo find out more, see our <a href="https://openkeychain.org/help/privacy-policy">Privacy Policy</a>."</string>
+    <string name="button_analytics_yes">"Yes, I want to help!"</string>
+    <string name="button_analytics_no">"No, thanks"</string>
 
     <string name="snack_analytics_accept">"Thanks for helping out! You can change this preference in the settings."</string>
     <string name="snack_analytics_reject">"That's alright, we won't ask again. You can change your mind in the settings."</string>