More code cleanup

8 files changed, 36 insertions, 50 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 c571831cd..f4fa7f3bf 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
@@ -17,7 +17,7 @@
 
 package org.sufficientlysecure.keychain.ui.adapter;
 
-import android.annotation.SuppressLint;
+import android.annotation.TargetApi;
 import android.app.Activity;
 import android.content.Context;
 import android.graphics.Color;
@@ -61,14 +61,14 @@ public class ImportKeysAdapter extends ArrayAdapter<ImportKeysListEntry> {
         mInflater = (LayoutInflater) activity.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
     }
 
-    @SuppressLint("NewApi")
+    @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     public void setData(List<ImportKeysListEntry> data) {
         clear();
         if (data != null) {
             this.mData = data;
 
             // add data to extended ArrayAdapter
-            if (Build.VERSION.SDK_INT >= 11) {
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
                 addAll(data);
             } else {
                 for (ImportKeysListEntry entry : data) {
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);
     }
 }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index e7a045294..3fd5d5daf 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
@@ -165,7 +165,7 @@ public class ImportKeysListLoader
     }
 
     private void addToData(PGPKeyRing keyring) {
-        ImportKeysListEntry item = new ImportKeysListEntry(keyring);
+        ImportKeysListEntry item = new ImportKeysListEntry(getContext(), keyring);
         mData.add(item);
     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
index 259e14319..838aeefee 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java
@@ -101,7 +101,7 @@ public class ImportKeysListServerLoader
                 String fingerprint = query.substring(2);
                 Log.d(Constants.TAG, "fingerprint: " + fingerprint);
                 // query must return only one result!
-                if (searchResult.size() > 0) {
+                if (searchResult.size() == 1) {
                     ImportKeysListEntry uniqueEntry = searchResult.get(0);
                     /*
                      * set fingerprint explicitly after query
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
index c3d6024c7..80d605fb9 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/KeyValueSpinnerAdapter.java
@@ -39,7 +39,8 @@ public class KeyValueSpinnerAdapter extends ArrayAdapter<String> {
                     public int compare(Map.Entry<K, V> e1, Map.Entry<K, V> e2) {
                         return e1.getValue().compareTo(e2.getValue());
                     }
-                });
+                }
+        );
         sortedEntries.addAll(map.entrySet());
         return sortedEntries;
     }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
index 2210975fe..cde008175 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/SelectKeyCursorAdapter.java
@@ -65,8 +65,8 @@ abstract public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter
         if (cursor != null) {
             mIndexUserId = cursor.getColumnIndexOrThrow(KeyRings.USER_ID);
             mIndexMasterKeyId = cursor.getColumnIndexOrThrow(KeyRings.MASTER_KEY_ID);
-            mIndexExpiry= cursor.getColumnIndexOrThrow(KeyRings.EXPIRY);
-            mIndexRevoked= cursor.getColumnIndexOrThrow(KeyRings.IS_REVOKED);
+            mIndexExpiry = cursor.getColumnIndexOrThrow(KeyRings.EXPIRY);
+            mIndexRevoked = cursor.getColumnIndexOrThrow(KeyRings.IS_REVOKED);
         }
     }
 
@@ -122,7 +122,7 @@ abstract public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter
         h.keyId.setText(PgpKeyHelper.convertKeyIdToHex(masterKeyId));
 
         boolean enabled = true;
-        if(cursor.getInt(mIndexRevoked) != 0) {
+        if (cursor.getInt(mIndexRevoked) != 0) {
             h.status.setText(R.string.revoked);
             enabled = false;
         } else if (!cursor.isNull(mIndexExpiry)
@@ -134,7 +134,6 @@ abstract public class SelectKeyCursorAdapter extends HighlightQueryCursorAdapter
         }
 
         h.status.setTag(enabled);
-
     }
 
     @Override
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
index 27ba19233..9e26e559f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
@@ -73,7 +73,7 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
                     hasAnySecret = true;
                     break;
                 }
-            } while(newCursor.moveToNext());
+            } while (newCursor.moveToNext());
         }
 
         return super.swapCursor(newCursor);
@@ -112,8 +112,11 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
         ImageView revokedKeyIcon = (ImageView) view.findViewById(R.id.ic_revokedKey);
 
         String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(mIndexKeyId));
-        String algorithmStr = PgpKeyHelper.getAlgorithmInfo(cursor.getInt(mIndexAlgorithm),
-                cursor.getInt(mIndexKeySize));
+        String algorithmStr = PgpKeyHelper.getAlgorithmInfo(
+                context,
+                cursor.getInt(mIndexAlgorithm),
+                cursor.getInt(mIndexKeySize)
+        );
 
         keyId.setText(keyIdStr);
         // may be set with additional "stripped" later on
@@ -173,6 +176,7 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
         } else {
             keyExpiry.setVisibility(View.GONE);
         }
+
         // if key is expired or revoked, strike through text
         if (!valid) {
             keyId.setText(OtherHelper.strikeOutText(keyId.getText()));
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
index 29883d750..52e6dec92 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyUserIdsAdapter.java
@@ -46,8 +46,12 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
     private final ArrayList<Boolean> mCheckStates;
 
     public static final String[] USER_IDS_PROJECTION = new String[]{
-            UserIds._ID, UserIds.USER_ID, UserIds.RANK,
-            UserIds.VERIFIED, UserIds.IS_PRIMARY, UserIds.IS_REVOKED
+            UserIds._ID,
+            UserIds.USER_ID,
+            UserIds.RANK,
+            UserIds.VERIFIED,
+            UserIds.IS_PRIMARY,
+            UserIds.IS_REVOKED
     };
 
     public ViewKeyUserIdsAdapter(Context context, Cursor c, int flags, boolean showCheckBoxes) {
@@ -102,7 +106,6 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
 
     @Override
     public void bindView(View view, Context context, Cursor cursor) {
-
         TextView vRank = (TextView) view.findViewById(R.id.rank);
         TextView vUserId = (TextView) view.findViewById(R.id.userId);
         TextView vAddress = (TextView) view.findViewById(R.id.address);
@@ -137,12 +140,16 @@ public class ViewKeyUserIdsAdapter extends CursorAdapter implements AdapterView.
 
             int verified = cursor.getInt(mVerifiedId);
             // TODO introduce own resources for this :)
-            if (verified == Certs.VERIFIED_SECRET) {
-                vVerified.setImageResource(R.drawable.key_certify_ok_depth0);
-            } else if (verified == Certs.VERIFIED_SELF) {
-                vVerified.setImageResource(R.drawable.key_certify_ok_self);
-            } else {
-                vVerified.setImageResource(R.drawable.key_certify_error);
+            switch (verified) {
+                case Certs.VERIFIED_SECRET:
+                    vVerified.setImageResource(R.drawable.key_certify_ok_depth0);
+                    break;
+                case Certs.VERIFIED_SELF:
+                    vVerified.setImageResource(R.drawable.key_certify_ok_self);
+                    break;
+                default:
+                    vVerified.setImageResource(R.drawable.key_certify_error);
+                    break;
             }
         }