1 files changed, 3 insertions, 28 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
index 201cda2e8..b06852af4 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
@@ -17,6 +17,7 @@
 
 package org.sufficientlysecure.keychain.ui.adapter;
 
+import android.content.Context;
 import android.os.Parcel;
 import android.os.Parcelable;
 import android.util.SparseArray;
@@ -213,7 +214,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
      * Constructor based on key object, used for import from NFC, QR Codes, files
      */
     @SuppressWarnings("unchecked")
-    public ImportKeysListEntry(PGPKeyRing pgpKeyRing) {
+    public ImportKeysListEntry(Context context, PGPKeyRing pgpKeyRing) {
         // save actual key object into entry, used to import it later
         try {
             this.mBytes = pgpKeyRing.getEncoded();
@@ -263,32 +264,6 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         this.fingerPrintHex = PgpKeyHelper.convertFingerprintToHex(key.getFingerprint());
         this.bitStrength = key.getBitStrength();
         final int algorithm = key.getAlgorithm();
-        this.algorithm = getAlgorithmFromId(algorithm);
-    }
-
-    /**
-     * Based on <a href="http://tools.ietf.org/html/rfc2440#section-9.1">OpenPGP Message Format</a>
-     */
-    private static final SparseArray<String> ALGORITHM_IDS = new SparseArray<String>() {{
-        put(-1, "unknown"); // TODO: with resources
-        put(0, "unencrypted");
-        put(PGPPublicKey.RSA_GENERAL, "RSA");
-        put(PGPPublicKey.RSA_ENCRYPT, "RSA");
-        put(PGPPublicKey.RSA_SIGN, "RSA");
-        put(PGPPublicKey.ELGAMAL_ENCRYPT, "ElGamal");
-        put(PGPPublicKey.ELGAMAL_GENERAL, "ElGamal");
-        put(PGPPublicKey.DSA, "DSA");
-        put(PGPPublicKey.EC, "ECC");
-        put(PGPPublicKey.ECDSA, "ECC");
-        put(PGPPublicKey.ECDH, "ECC");
-    }};
-
-    /**
-     * Based on <a href="http://tools.ietf.org/html/rfc2440#section-9.1">OpenPGP Message Format</a>
-     */
-    public static String getAlgorithmFromId(int algorithmId) {
-        return (ALGORITHM_IDS.get(algorithmId) != null ?
-                ALGORITHM_IDS.get(algorithmId) :
-                ALGORITHM_IDS.get(-1));
+        this.algorithm = PgpKeyHelper.getAlgorithmInfo(context, algorithm);
     }
 }