Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-03-31 14:17:03 +02:00
Code Issues Packages Projects Releases Wiki Activity

Check for any/all PGP or S/MIME keys

Browse Source
This commit is contained in:
M66B
2022-10-30 07:39:56 +01:00
parent 09cc268690
commit 388be88d0f
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/email/PgpHelper.java
View File

@@ -68,11 +68,11 @@ public class PgpHelper {
}
}
static boolean hasPgpKey(Context context, List<Address> recipients) {
return hasPgpKey(context, recipients, KEY_TIMEOUT); // milliseconds
static boolean hasPgpKey(Context context, List<Address> recipients, boolean all) {
return hasPgpKey(context, recipients, all, KEY_TIMEOUT); // milliseconds
}
private static boolean hasPgpKey(Context context, List<Address> recipients, long timeout) {
private static boolean hasPgpKey(Context context, List<Address> recipients, boolean all, long timeout) {
if (recipients == null || recipients.size() == 0)
return false;
@@ -90,7 +90,7 @@ public class PgpHelper {
int resultCode = result.getIntExtra(OpenPgpApi.RESULT_CODE, OpenPgpApi.RESULT_CODE_ERROR);
if (resultCode == OpenPgpApi.RESULT_CODE_SUCCESS) {
long[] keyIds = result.getLongArrayExtra(OpenPgpApi.EXTRA_KEY_IDS);
return (keyIds.length > 0);
return (all ? keyIds.length == recipients.size() : keyIds.length > 0);
}
} catch (OperationCanceledException ignored) {
// Do nothing