From c4e5e6b1edae6f89279dfc0ac807bb481950bcef Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Tue, 2 Jun 2020 17:18:46 +0200
Subject: [PATCH] Rename PROVIDER_BLACKLIST to DISALLOWED_PROVIDERS

---
 .../k9/ui/settings/account/OpenPgpAppSelectDialog.java    | 8 ++++----
 .../org/openintents/openpgp/util/OpenPgpProviderUtil.java | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
index 3e8630d453..00a447c1e7 100644
--- a/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
+++ b/app/ui/legacy/src/main/java/com/fsck/k9/ui/settings/account/OpenPgpAppSelectDialog.java
@@ -141,7 +141,7 @@ public class OpenPgpAppSelectDialog extends FragmentActivity {
             // search for OpenPGP providers...
             Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT_2);
             List<ResolveInfo> resInfo = getActivity().getPackageManager().queryIntentServices(intent, 0);
-            boolean hasNonBlacklistedChoices = false;
+            boolean hasAllowedChoices = false;
             if (resInfo != null) {
                 for (ResolveInfo resolveInfo : resInfo) {
                     if (resolveInfo.serviceInfo == null) {
@@ -152,14 +152,14 @@ public class OpenPgpAppSelectDialog extends FragmentActivity {
                     String simpleName = String.valueOf(resolveInfo.serviceInfo.loadLabel(context.getPackageManager()));
                     Drawable icon = resolveInfo.serviceInfo.loadIcon(context.getPackageManager());
 
-                    if (!OpenPgpProviderUtil.isBlacklisted(packageName)) {
+                    if (OpenPgpProviderUtil.isProviderAllowed(packageName)) {
                         openPgpProviderList.add(new OpenPgpProviderEntry(packageName, simpleName, icon));
-                        hasNonBlacklistedChoices = true;
+                        hasAllowedChoices = true;
                     }
                 }
             }
 
-            if (!hasNonBlacklistedChoices) {
+            if (!hasAllowedChoices) {
                 // add install links if provider list is empty
                 resInfo = context.getPackageManager().queryIntentActivities(MARKET_INTENT, 0);
                 for (ResolveInfo resolveInfo : resInfo) {
diff --git a/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java b/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java
index d412fdfac3..b5e9b1e802 100644
--- a/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java
+++ b/plugins/openpgp-api-lib/openpgp-api/src/main/java/org/openintents/openpgp/util/OpenPgpProviderUtil.java
@@ -12,9 +12,9 @@ import android.content.pm.ResolveInfo;
 
 public class OpenPgpProviderUtil {
     private static final String PACKAGE_NAME_APG = "org.thialfihar.android.apg";
-    private static final ArrayList<String> PROVIDER_BLACKLIST = new ArrayList<>();
+    private static final ArrayList<String> DISALLOWED_PROVIDERS = new ArrayList<>();
     static {
-        PROVIDER_BLACKLIST.add(PACKAGE_NAME_APG);
+        DISALLOWED_PROVIDERS.add(PACKAGE_NAME_APG);
     }
 
     public static List<String> getOpenPgpProviderPackages(Context context) {
@@ -56,7 +56,7 @@ public class OpenPgpProviderUtil {
         return null;
     }
 
-    public static boolean isBlacklisted(String packageName) {
-        return PROVIDER_BLACKLIST.contains(packageName);
+    public static boolean isProviderAllowed(String packageName) {
+        return !DISALLOWED_PROVIDERS.contains(packageName);
     }
 }
-- 
GitLab