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

fix NPE in ImportKeysAdapter

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-06-30 12:31:42 +02:00
parent 225b11c1db
commit fdefd30a46
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
View File

@@ -40,6 +40,7 @@ import org.sufficientlysecure.keychain.keyimport.ParcelableKeyRing;
import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysListener; import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysListener;
import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysOperationCallback; import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysOperationCallback;
import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysResultListener; import org.sufficientlysecure.keychain.keyimport.processing.ImportKeysResultListener;
import org.sufficientlysecure.keychain.model.SubKey.UnifiedKeyInfo;
import org.sufficientlysecure.keychain.operations.ImportOperation; import org.sufficientlysecure.keychain.operations.ImportOperation;
import org.sufficientlysecure.keychain.operations.results.ImportKeyResult; import org.sufficientlysecure.keychain.operations.results.ImportKeyResult;
import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing; import org.sufficientlysecure.keychain.pgp.CanonicalizedKeyRing;
@@ -90,7 +91,8 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
if (entry.isSecretKey()) { if (entry.isSecretKey()) {
verified = mKeyRepository.getCanonicalizedSecretKeyRing(keyId).getVerified(); verified = mKeyRepository.getCanonicalizedSecretKeyRing(keyId).getVerified();
} else { } else {
verified = mKeyRepository.getUnifiedKeyInfo(keyId).verified(); UnifiedKeyInfo unifiedKeyInfo = mKeyRepository.getUnifiedKeyInfo(keyId);
verified = unifiedKeyInfo != null ? unifiedKeyInfo.verified() : null;
} }
keyState.mAlreadyPresent = true; keyState.mAlreadyPresent = true;
keyState.mVerified = verified != null && verified != VerificationStatus.UNVERIFIED; keyState.mVerified = verified != null && verified != VerificationStatus.UNVERIFIED;