Prevent crash

5 years ago · c13aa5eefd
parent f80e546597
commit c13aa5eefd
2 changed files with 5 additions and 4 deletions
--- a/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
+++ b/app/src/main/java/eu/faircode/email/FragmentOptionsEncryption.java
@ -121,6 +121,7 @@ public class FragmentOptionsEncryption extends FragmentBase implements SharedPre

        Intent intent = new Intent(OpenPgpApi.SERVICE_INTENT_2);
        List<ResolveInfo> ris = pm.queryIntentServices(intent, 0); // package whitelisted
+        if (ris != null)
            for (ResolveInfo ri : ris)
                if (ri.serviceInfo != null)
                    openPgpProvider.add(ri.serviceInfo.packageName);
--- a/app/src/main/java/eu/faircode/email/Helper.java
+++ b/app/src/main/java/eu/faircode/email/Helper.java
@ -453,7 +453,7 @@ public class Helper {
        intent.setPackage(provider);
        List<ResolveInfo> ris = pm.queryIntentServices(intent, 0);

-        return (ris.size() > 0);
+        return (ris != null && ris.size() > 0);
    }

    // View