From c8766a788884d331c0b61eb74241abd65e9b90b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Thu, 29 Jan 2015 15:33:05 +0100 Subject: Blacklist APG, the current released version of APG includes a broken version of the API --- src/org/openintents/openpgp/util/OpenPgpListPreference.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/org/openintents/openpgp/util/OpenPgpListPreference.java b/src/org/openintents/openpgp/util/OpenPgpListPreference.java index 5058b9a..31ba97c 100644 --- a/src/org/openintents/openpgp/util/OpenPgpListPreference.java +++ b/src/org/openintents/openpgp/util/OpenPgpListPreference.java @@ -46,6 +46,13 @@ public class OpenPgpListPreference extends DialogPreference { private static final Intent MARKET_INTENT = new Intent(Intent.ACTION_VIEW, Uri.parse( String.format(MARKET_INTENT_URI_BASE, OPENKEYCHAIN_PACKAGE))); + private static final ArrayList PROVIDER_BLACKLIST = new ArrayList(); + + static { + // Unfortunately, the current released version of APG includes a broken version of the API + PROVIDER_BLACKLIST.add("org.thialfihar.android.apg"); + } + private ArrayList mLegacyList = new ArrayList(); private ArrayList mList = new ArrayList(); @@ -96,7 +103,9 @@ public class OpenPgpListPreference extends DialogPreference { .getPackageManager())); Drawable icon = resolveInfo.serviceInfo.loadIcon(getContext().getPackageManager()); - providerList.add(new OpenPgpProviderEntry(packageName, simpleName, icon)); + if (!PROVIDER_BLACKLIST.contains(packageName)) { + providerList.add(new OpenPgpProviderEntry(packageName, simpleName, icon)); + } } } -- cgit v1.2.3