cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

link to privacy policy in consent dialog

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-16 14:15:23 +02:00
parent 15229854a6
commit fcf6abfec3
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/analytics/AnalyticsConsentRequester.java
View File

@@ -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() {

6
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>