From 29b014edade7798a41cfb5475ada88b1891950bd Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Wed, 21 Nov 2018 16:28:33 +0100
Subject: [PATCH] Fix returned autocrypt state in OpenPgpServiceKeyIdExtractor

---
 .../keychain/remote/OpenPgpServiceKeyIdExtractor.java  | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceKeyIdExtractor.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceKeyIdExtractor.java
index 71aadde74..106073ce9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceKeyIdExtractor.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpServiceKeyIdExtractor.java
@@ -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;
                 }