Fix returned autocrypt state in OpenPgpServiceKeyIdExtractor
This commit is contained in:
parent
1f33102d7b
commit
29b014edad
|
@ -108,7 +108,7 @@ class OpenPgpServiceKeyIdExtractor {
|
||||||
HashSet<Long> keyIds = new HashSet<>();
|
HashSet<Long> keyIds = new HashSet<>();
|
||||||
ArrayList<String> missingEmails = new ArrayList<>();
|
ArrayList<String> missingEmails = new ArrayList<>();
|
||||||
ArrayList<String> duplicateEmails = new ArrayList<>();
|
ArrayList<String> duplicateEmails = new ArrayList<>();
|
||||||
int combinedAutocryptState = AutocryptStatus.AUTOCRYPT_PEER_DISABLED;
|
Integer combinedAutocryptState = null;
|
||||||
|
|
||||||
if (hasAddresses) {
|
if (hasAddresses) {
|
||||||
HashMap<String, AddressQueryResult> userIdEntries = getStatusMapForQueriedAddresses(
|
HashMap<String, AddressQueryResult> userIdEntries = getStatusMapForQueriedAddresses(
|
||||||
|
@ -128,8 +128,12 @@ class OpenPgpServiceKeyIdExtractor {
|
||||||
anyKeyNotVerified = true;
|
anyKeyNotVerified = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
combinedAutocryptState = combineAutocryptState(
|
if (combinedAutocryptState == null) {
|
||||||
combinedAutocryptState, addressQueryResult.autocryptState);
|
combinedAutocryptState = addressQueryResult.autocryptState;
|
||||||
|
} else {
|
||||||
|
combinedAutocryptState = combineAutocryptState(
|
||||||
|
combinedAutocryptState, addressQueryResult.autocryptState);
|
||||||
|
}
|
||||||
|
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue