From 3bfd4898fdf2e7a49f15eee2121a7d3690504ffc Mon Sep 17 00:00:00 2001 From: M66B Date: Tue, 29 Jun 2021 17:49:04 +0200 Subject: [PATCH] Google dicates a link --- app/build.gradle | 1 - app/src/main/assets/PRIVACY.md | 39 ------------------- .../java/eu/faircode/email/ActivitySetup.java | 8 +--- .../java/eu/faircode/email/ActivityView.java | 8 +--- .../main/java/eu/faircode/email/Helper.java | 1 + 5 files changed, 5 insertions(+), 52 deletions(-) delete mode 100644 app/src/main/assets/PRIVACY.md diff --git a/app/build.gradle b/app/build.gradle index eba65c2965..1cd9a9bbe4 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -224,7 +224,6 @@ task copyMarkdown(type: Copy) { from "${rootDir}" into "src/main/assets" include "SETUP.md" - include "PRIVACY.md" include "ATTRIBUTION.md" } preBuild.dependsOn copyMarkdown diff --git a/app/src/main/assets/PRIVACY.md b/app/src/main/assets/PRIVACY.md deleted file mode 100644 index efeb796d07..0000000000 --- a/app/src/main/assets/PRIVACY.md +++ /dev/null @@ -1,39 +0,0 @@ -## Privacy policy - -FairEmail **does not** collect any information. - -FairEmail **does not** store data on third party servers. - -FairEmail **does not** require unnecessary permissions. -For more information on permissions, see [this FAQ](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq1). - -FairEmail **does not** allow other apps access to messages and attachments without your approval. - -FairEmail **does** follow the recommendations of [this EFF article](https://www.eff.org/deeplinks/2019/01/stop-tracking-my-emails). - -FairEmail is 100 % **open source**, see [the license](https://github.com/M66B/FairEmail/blob/master/LICENSE). - -Error reporting is **opt-in**, see [here](https://github.com/M66B/FairEmail/blob/master/FAQ.md#user-content-faq104) for more information. - -FairEmail **will not** transfer information to other apps and services -and therefore adheres to the [Google API Services User Data Policy](https://developers.google.com/terms/api-services-user-data-policy#additional_requirements_for_specific_api_scopes), -including the Limited Use requirements. -Google API Services are used only to authenticate Gmail accounts though OAuth. - -FairEmail **can use** these services if they are explicitly enabled (off by default) or are explicitly used by you: - -* [ipinfo.io](https://ipinfo.io/) – [Privacy policy](https://ipinfo.io/privacy-policy) -* [Gravatar](https://gravatar.com/) – [Privacy policy](https://automattic.com/privacy/) -* [Spamhaus](https://www.spamhaus.org/) – [Privacy policy](https://www.spamhaus.org/organization/privacy/) -* [Spamcop](https://www.spamcop.net/) – [Privacy policy](https://www.spamcop.net/fom-serve/cache/168.html) -* [Barracuda](https://www.barracudacentral.org/rbl/how-to-use) – [Privacy policy](https://www.barracuda.com/company/legal/trust-center/data-privacy/privacy-policy) -* [Thunderbird autoconfiguration](https://developer.mozilla.org/docs/Mozilla/Thunderbird/Autoconfiguration) – [Privacy policy](https://www.mozilla.org/privacy/) - -FairEmail **can access** the websites at the domain names of email addresses -if [favicons](https://en.wikipedia.org/wiki/Favicon) are explicitly enabled (off by default). - -FairEmail **will** obvously access the configured email servers. - -
- -Copyright © 2018-2021 Marcel Bokhorst. diff --git a/app/src/main/java/eu/faircode/email/ActivitySetup.java b/app/src/main/java/eu/faircode/email/ActivitySetup.java index 4fd842f47a..49088d9179 100644 --- a/app/src/main/java/eu/faircode/email/ActivitySetup.java +++ b/app/src/main/java/eu/faircode/email/ActivitySetup.java @@ -271,7 +271,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac drawerLayout.closeDrawer(drawerContainer); onMenuPrivacy(); } - })); + }).setExternal(true)); menus.add(new NavMenuItem(R.drawable.twotone_info_24, R.string.menu_about, new Runnable() { @Override @@ -520,11 +520,7 @@ public class ActivitySetup extends ActivityBase implements FragmentManager.OnBac } private void onMenuPrivacy() { - Bundle args = new Bundle(); - args.putString("name", "PRIVACY.md"); - FragmentDialogMarkdown fragment = new FragmentDialogMarkdown(); - fragment.setArguments(args); - fragment.show(getSupportFragmentManager(), "privacy"); + Helper.view(this, Uri.parse(Helper.PRIVACY_URI), false); } private void onMenuAbout() { diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java index f33ed5665b..688cd9ec4e 100644 --- a/app/src/main/java/eu/faircode/email/ActivityView.java +++ b/app/src/main/java/eu/faircode/email/ActivityView.java @@ -587,7 +587,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB drawerLayout.closeDrawer(drawerContainer); onMenuPrivacy(); } - })); + }).setExternal(true)); extra.add(new NavMenuItem(R.drawable.twotone_info_24, R.string.menu_about, new Runnable() { @Override @@ -1326,11 +1326,7 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB } private void onMenuPrivacy() { - Bundle args = new Bundle(); - args.putString("name", "PRIVACY.md"); - FragmentDialogMarkdown fragment = new FragmentDialogMarkdown(); - fragment.setArguments(args); - fragment.show(getSupportFragmentManager(), "privacy"); + Helper.view(this, Uri.parse(Helper.PRIVACY_URI), false); } private void onMenuAbout() { diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index 4e1a78d038..d7dea8eecd 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -159,6 +159,7 @@ public class Helper { static final String PGP_BEGIN_MESSAGE = "-----BEGIN PGP MESSAGE-----"; static final String PGP_END_MESSAGE = "-----END PGP MESSAGE-----"; + static final String PRIVACY_URI = "https://email.faircode.eu/privacy/"; static final String XDA_URI = "https://forum.xda-developers.com/showthread.php?t=3824168"; static final String SUPPORT_URI = "https://contact.faircode.eu/?product=fairemailsupport&version=" + BuildConfig.VERSION_NAME; static final String TEST_URI = "https://play.google.com/apps/testing/" + BuildConfig.APPLICATION_ID;