PeterCxy
/
open-keychain
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Fix returned autocrypt state in OpenPgpServiceKeyIdExtractor

This commit is contained in:
Vincent Breitmoser 2018-11-21 16:28:33 +01:00
parent 1f33102d7b
commit 29b014edad
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceKeyIdExtractor.java
View File

@ -108,7 +108,7 @@ class OpenPgpServiceKeyIdExtractor {
HashSet<Long> keyIds = new HashSet<>();
ArrayList<String> missingEmails = new ArrayList<>();
ArrayList<String> duplicateEmails = new ArrayList<>();
int combinedAutocryptState = AutocryptStatus.AUTOCRYPT_PEER_DISABLED;
Integer combinedAutocryptState = null;
if (hasAddresses) {
HashMap<String, AddressQueryResult> userIdEntries = getStatusMapForQueriedAddresses(
@ -128,8 +128,12 @@ class OpenPgpServiceKeyIdExtractor {
anyKeyNotVerified = true;
}
combinedAutocryptState = combineAutocryptState(
combinedAutocryptState, addressQueryResult.autocryptState);
if (combinedAutocryptState == null) {
combinedAutocryptState = addressQueryResult.autocryptState;
} else {
combinedAutocryptState = combineAutocryptState(
combinedAutocryptState, addressQueryResult.autocryptState);
}
continue;
}