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

fix crash in ImportKeysAdapter

Browse Source 
Fixes #2343
This commit is contained in:
Vincent Breitmoser
2018-06-12 11:06:14 +02:00
parent a0f48b8353
commit abc50f7e40
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -291,13 +291,13 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
entry.setExpired(keyRing.isExpired()); entry.setExpired(keyRing.isExpired());
entry.setSecure(keyRing.isSecure()); entry.setSecure(keyRing.isSecure());
int algorithmId = keyRing.getPublicKey().getAlgorithm(); if (entry.getAlgorithm() == null) {
int bitSize = keyRing.getPublicKey().getBitStrength(); int algorithmId = keyRing.getPublicKey().getAlgorithm();
String algoInfo = KeyFormattingUtils.getAlgorithmInfo(algorithmId, bitSize, null); Integer bitSize = keyRing.getPublicKey().getBitStrength();
if(entry.getAlgorithm() == null){ String oid = keyRing.getPublicKey().getCurveOid();
String algoInfo = KeyFormattingUtils.getAlgorithmInfo(algorithmId, bitSize, oid);
entry.setAlgorithm(algoInfo); entry.setAlgorithm(algoInfo);
} else if ( !entry.getAlgorithm().equalsIgnoreCase(algoInfo)){
// TODO: handle(?)
} }
Date expectedDate = entry.getDate(); Date expectedDate = entry.getDate();