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

fix NPE for data signed with an unknown key

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-07-15 12:08:12 +02:00
parent 891c0e10c4
commit fbbc77335b
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptFragment.java
View File

@@ -263,6 +263,9 @@ public abstract class DecryptFragment extends Fragment {
unifiedKeyInfoLiveData = new GenericLiveData<>(requireContext(), () -> { unifiedKeyInfoLiveData = new GenericLiveData<>(requireContext(), () -> {
KeyRepository keyRepository = KeyRepository.create(requireContext()); KeyRepository keyRepository = KeyRepository.create(requireContext());
Long masterKeyId = keyRepository.getMasterKeyIdBySubkeyId(mSignatureResult.getKeyId()); Long masterKeyId = keyRepository.getMasterKeyIdBySubkeyId(mSignatureResult.getKeyId());
if (masterKeyId == null) {
return null;
}
return keyRepository.getUnifiedKeyInfo(masterKeyId); return keyRepository.getUnifiedKeyInfo(masterKeyId);
}); });
unifiedKeyInfoLiveData.observe(this, this::onLoadSignerKeyData); unifiedKeyInfoLiveData.observe(this, this::onLoadSignerKeyData);