From abc50f7e401122525242a448533896d31855f8c3 Mon Sep 17 00:00:00 2001
From: Vincent Breitmoser <look@my.amazin.horse>
Date: Tue, 12 Jun 2018 11:06:14 +0200
Subject: [PATCH] fix crash in ImportKeysAdapter

Fixes #2343
---
 .../keychain/ui/adapter/ImportKeysAdapter.java       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
index 3c110e571..633300e70 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysAdapter.java
@@ -291,13 +291,13 @@ public class ImportKeysAdapter extends RecyclerView.Adapter<ImportKeysAdapter.Vi
         entry.setExpired(keyRing.isExpired());
         entry.setSecure(keyRing.isSecure());
 
-        int algorithmId = keyRing.getPublicKey().getAlgorithm();
-        int bitSize = keyRing.getPublicKey().getBitStrength();
-        String algoInfo = KeyFormattingUtils.getAlgorithmInfo(algorithmId, bitSize, null);
-        if(entry.getAlgorithm() == null){
+        if (entry.getAlgorithm() == null) {
+            int algorithmId = keyRing.getPublicKey().getAlgorithm();
+            Integer bitSize = keyRing.getPublicKey().getBitStrength();
+            String oid = keyRing.getPublicKey().getCurveOid();
+            String algoInfo = KeyFormattingUtils.getAlgorithmInfo(algorithmId, bitSize, oid);
+
             entry.setAlgorithm(algoInfo);
-        } else if ( !entry.getAlgorithm().equalsIgnoreCase(algoInfo)){
-            // TODO: handle(?)
         }
 
         Date expectedDate = entry.getDate();