From c21729b83e4bba1cb9ac423f7537cb0a188ab639 Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 24 Jun 2020 12:47:00 +0200 Subject: [PATCH] Remove OpenKeychain app reference --- app/build.gradle | 3 --- .../java/eu/faircode/email/FragmentCompose.java | 14 ++++++-------- .../java/eu/faircode/email/FragmentMessages.java | 14 ++++++-------- app/src/main/java/eu/faircode/email/Helper.java | 6 ------ 4 files changed, 12 insertions(+), 25 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 9f4c96ab85..78e15ecc90 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -133,7 +133,6 @@ android { buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/donate/\"" buildConfigField "String", "CHANGELOG", "\"https://github.com/M66B/FairEmail/releases/\"" buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\"" - buildConfigField "String", "OPENKEYCHAIN_URI", "\"https://f-droid.org/en/packages/org.sufficientlysecure.keychain/\"" buildConfigField "String", "CAMERA_URI", "\"https://f-droid.org/en/packages/net.sourceforge.opencamera/\"" buildConfigField "String", "RECORDER_URI", "\"https://f-droid.org/packages/com.github.axet.audiorecorder/\"" buildConfigField "String", "APPS_URI", "\"https://github.com/M66B?tab=repositories/\"" @@ -146,7 +145,6 @@ android { buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/donate/\"" buildConfigField "String", "CHANGELOG", "\"https://github.com/M66B/FairEmail/releases/\"" buildConfigField "String", "GITHUB_LATEST_API", "\"https://api.github.com/repos/M66B/open-source-email/releases/latest\"" - buildConfigField "String", "OPENKEYCHAIN_URI", "\"https://f-droid.org/en/packages/org.sufficientlysecure.keychain/\"" buildConfigField "String", "CAMERA_URI", "\"https://f-droid.org/en/packages/net.sourceforge.opencamera/\"" buildConfigField "String", "RECORDER_URI", "\"https://f-droid.org/packages/com.github.axet.audiorecorder/\"" buildConfigField "String", "APPS_URI", "\"https://github.com/M66B?tab=repositories/\"" @@ -160,7 +158,6 @@ android { buildConfigField "String", "PRO_FEATURES_URI", "\"https://email.faircode.eu/#pro\"" buildConfigField "String", "CHANGELOG", "\"\"" buildConfigField "String", "GITHUB_LATEST_API", "\"\"" - buildConfigField "String", "OPENKEYCHAIN_URI", "\"https://play.google.com/store/apps/details?id=org.sufficientlysecure.keychain\"" buildConfigField "String", "CAMERA_URI", "\"https://play.google.com/store/apps/details?id=net.sourceforge.opencamera\"" buildConfigField "String", "RECORDER_URI", "\"https://play.google.com/store/apps/details?id=com.github.axet.audiorecorder\"" buildConfigField "String", "APPS_URI", "\"https://play.google.com/store/apps/dev?id=8420080860664580239\"" diff --git a/app/src/main/java/eu/faircode/email/FragmentCompose.java b/app/src/main/java/eu/faircode/email/FragmentCompose.java index fcf596df6a..32d8005ac3 100644 --- a/app/src/main/java/eu/faircode/email/FragmentCompose.java +++ b/app/src/main/java/eu/faircode/email/FragmentCompose.java @@ -1698,14 +1698,12 @@ public class FragmentCompose extends FragmentBase { } else { Snackbar snackbar = Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_LONG); - PackageManager pm = getContext().getPackageManager(); - if (Helper.getIntentOpenKeychain().resolveActivity(pm) != null) // package whitelisted - snackbar.setAction(R.string.title_fix, new View.OnClickListener() { - @Override - public void onClick(View v) { - startActivity(Helper.getIntentOpenKeychain()); - } - }); + snackbar.setAction(R.string.title_fix, new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.viewFAQ(getContext(), 12); + } + }); snackbar.show(); } } diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index db035578ad..fc2b22f9a8 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -5116,14 +5116,12 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. onPgp(data, auto); } else { Snackbar snackbar = Snackbar.make(view, R.string.title_no_openpgp, Snackbar.LENGTH_LONG); - PackageManager pm = getContext().getPackageManager(); - if (Helper.getIntentOpenKeychain().resolveActivity(pm) != null) // package whitelisted - snackbar.setAction(R.string.title_fix, new View.OnClickListener() { - @Override - public void onClick(View v) { - startActivity(Helper.getIntentOpenKeychain()); - } - }); + snackbar.setAction(R.string.title_fix, new View.OnClickListener() { + @Override + public void onClick(View v) { + Helper.viewFAQ(getContext(), 12); + } + }); snackbar.show(); } } diff --git a/app/src/main/java/eu/faircode/email/Helper.java b/app/src/main/java/eu/faircode/email/Helper.java index b0d0167e62..8de9cdd8e7 100644 --- a/app/src/main/java/eu/faircode/email/Helper.java +++ b/app/src/main/java/eu/faircode/email/Helper.java @@ -566,12 +566,6 @@ public class Helper { view(context, Uri.parse(FAQ_URI + "#user-content-faq" + question), false); } - static Intent getIntentOpenKeychain() { - Intent intent = new Intent(Intent.ACTION_VIEW); - intent.setData(Uri.parse(BuildConfig.OPENKEYCHAIN_URI)); - return intent; - } - static String getOpenKeychainPackage(Context context) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); return prefs.getString("openpgp_provider", "org.sufficientlysecure.keychain");