Merge branch 'develop' into master2

18 files changed, 149 insertions, 100 deletions

diff --git a/OpenPGP-Keychain/build.gradle b/OpenPGP-Keychain/build.gradle
index 284f0430c..6338774eb 100644
--- a/OpenPGP-Keychain/build.gradle
+++ b/OpenPGP-Keychain/build.gradle
@@ -3,7 +3,8 @@ apply plugin: 'android'
 dependencies {
     compile 'com.android.support:support-v4:19.0.1'
     compile 'com.android.support:appcompat-v7:19.0.1'
-    compile project(':OpenPGP-Keychain-API:libraries:keychain-api-library')
+    compile project(':OpenPGP-Keychain-API:libraries:openpgp-api-library')
+    compile project(':OpenPGP-Keychain-API:libraries:openkeychain-api-library')
     compile project(':libraries:HtmlTextView')
     compile project(':libraries:StickyListHeaders:library')
     compile project(':libraries:AndroidBootstrap')
diff --git a/OpenPGP-Keychain/src/main/AndroidManifest.xml b/OpenPGP-Keychain/src/main/AndroidManifest.xml
index 8aa37393f..10f112f23 100644
--- a/OpenPGP-Keychain/src/main/AndroidManifest.xml
+++ b/OpenPGP-Keychain/src/main/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.sufficientlysecure.keychain"
     android:installLocation="auto"
-    android:versionCode="23103"
-    android:versionName="2.3.1 beta3">
+    android:versionCode="23104"
+    android:versionName="2.3.1 beta4">
 
     <!--
         General remarks
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index 9d9cd4d11..7c635a00b 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -228,7 +228,7 @@ public class PgpImportExport {
                 for (PGPSecretKey testSecretKey : new IterableIterator<PGPSecretKey>(
                         secretKeyRing.getSecretKeys())) {
                     if (!testSecretKey.isMasterKey()) {
-                        if (PgpKeyHelper.isSecretKeyPrivateEmpty(testSecretKey)) {
+                        if (testSecretKey.isPrivateKeyEmpty()) {
                             // this is bad, something is very wrong...
                             save = false;
                             status = Id.return_value.bad;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
index b3e21685e..71c921c33 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
@@ -32,6 +32,7 @@ import org.spongycastle.openpgp.PGPSecretKey;
 import org.spongycastle.openpgp.PGPSecretKeyRing;
 import org.spongycastle.openpgp.PGPSignature;
 import org.spongycastle.openpgp.PGPSignatureSubpacketVector;
+import org.spongycastle.util.encoders.Hex;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
 import org.sufficientlysecure.keychain.provider.ProviderHelper;
@@ -415,55 +416,30 @@ public class PgpKeyHelper {
         String algorithmStr = null;
 
         switch (algorithm) {
-        case PGPPublicKey.RSA_ENCRYPT:
-        case PGPPublicKey.RSA_GENERAL:
-        case PGPPublicKey.RSA_SIGN: {
-            algorithmStr = "RSA";
-            break;
-        }
-
-        case PGPPublicKey.DSA: {
-            algorithmStr = "DSA";
-            break;
-        }
-
-        case PGPPublicKey.ELGAMAL_ENCRYPT:
-        case PGPPublicKey.ELGAMAL_GENERAL: {
-            algorithmStr = "ElGamal";
-            break;
-        }
+            case PGPPublicKey.RSA_ENCRYPT:
+            case PGPPublicKey.RSA_GENERAL:
+            case PGPPublicKey.RSA_SIGN: {
+                algorithmStr = "RSA";
+                break;
+            }
 
-        default: {
-            algorithmStr = "Unknown";
-            break;
-        }
-        }
-        return algorithmStr + ", " + keySize + " bit";
-    }
+            case PGPPublicKey.DSA: {
+                algorithmStr = "DSA";
+                break;
+            }
 
-    /**
-     * Converts fingerprint to hex with whitespaces after 4 characters
-     * 
-     * @param fp
-     * @return
-     */
-    public static String convertFingerprintToHex(byte[] fp, boolean chunked) {
-        String fingerPrint = "";
-        for (int i = 0; i < fp.length; ++i) {
-            if (chunked && i != 0 && i % 10 == 0) {
-                fingerPrint += "  ";
-            } else if (chunked && i != 0 && i % 2 == 0) {
-                fingerPrint += " ";
+            case PGPPublicKey.ELGAMAL_ENCRYPT:
+            case PGPPublicKey.ELGAMAL_GENERAL: {
+                algorithmStr = "ElGamal";
+                break;
             }
-            String chunk = Integer.toHexString((fp[i] + 256) % 256).toUpperCase(Locale.US);
-            while (chunk.length() < 2) {
-                chunk = "0" + chunk;
+
+            default: {
+                algorithmStr = "Unknown";
+                break;
             }
-            fingerPrint += chunk;
         }
-
-        return fingerPrint;
-
+        return algorithmStr + ", " + keySize + " bit";
     }
 
     public static String getFingerPrint(Context context, long keyId) {
@@ -481,52 +457,68 @@ public class PgpKeyHelper {
         return convertFingerprintToHex(key.getFingerprint(), true);
     }
 
-    public static boolean isSecretKeyPrivateEmpty(PGPSecretKey secretKey) {
-        return secretKey.isPrivateKeyEmpty();
-    }
-
-//    public static boolean isSecretKeyPrivateEmpty(Context context, long keyId) {
-//        PGPSecretKey secretKey = ProviderHelper.getPGPSecretKeyByKeyId(context, keyId);
-//        if (secretKey == null) {
-//            Log.e(Constants.TAG, "Key could not be found!");
-//            return false; // could be a public key, assume it is not empty
-//        }
-//        return isSecretKeyPrivateEmpty(secretKey);
-//    }
-
-    public static String convertKeyIdToHex(long keyId) {
-        String fingerPrint = Long.toHexString(keyId & 0xffffffffL).toUpperCase(Locale.US);
-        while (fingerPrint.length() < 8) {
-            fingerPrint = "0" + fingerPrint;
+    /**
+     * Converts fingerprint to hex (optional: with whitespaces after 4 characters)
+     * <p/>
+     * Fingerprint is shown using lowercase characters. Studies have shown that humans can
+     * better differentiate between numbers and letters when letters are lowercase.
+     *
+     * @param fingerprint
+     * @param split       split into 4 character chunks
+     * @return
+     */
+    public static String convertFingerprintToHex(byte[] fingerprint, boolean split) {
+        String hexString = Hex.toHexString(fingerprint);
+        if (split) {
+            hexString = hexString.replaceAll("(.{4})(?!$)", "$1 ");
         }
-        return fingerPrint;
+
+        return hexString;
     }
 
     /**
-     * TODO: documentation
-     * 
+     * Convert key id from long to 64 bit hex string
+     * <p/>
+     * V4: "The Key ID is the low-order 64 bits of the fingerprint"
+     * <p/>
+     * see http://tools.ietf.org/html/rfc4880#section-12.2
+     *
      * @param keyId
      * @return
      */
-    public static String convertKeyToHex(long keyId) {
-        return convertKeyIdToHex(keyId >> 32) + convertKeyIdToHex(keyId);
+    public static String convertKeyIdToHex(long keyId) {
+        return "0x" + convertKeyIdToHex32bit(keyId >> 32) + convertKeyIdToHex32bit(keyId);
+    }
+
+    private static String convertKeyIdToHex32bit(long keyId) {
+        String hexString = Long.toHexString(keyId & 0xffffffffL).toLowerCase(Locale.US);
+        while (hexString.length() < 8) {
+            hexString = "0" + hexString;
+        }
+        return hexString;
     }
 
-    public static long convertHexToKeyId(String data) {
-        int len = data.length();
-        String s2 = data.substring(len - 8);
-        String s1 = data.substring(0, len - 8);
+    /**
+     * Used in HkpKeyServer to convert hex encoded key ids back to long.
+     *
+     * @param hexString
+     * @return
+     */
+    public static long convertHexToKeyId(String hexString) {
+        int len = hexString.length();
+        String s2 = hexString.substring(len - 8);
+        String s1 = hexString.substring(0, len - 8);
         return (Long.parseLong(s1, 16) << 32) | Long.parseLong(s2, 16);
     }
 
     /**
      * Splits userId string into naming part, email part, and comment part
-     * 
+     *
      * @param userId
      * @return array with naming (0), email (1), comment (2)
      */
     public static String[] splitUserId(String userId) {
-        String[] result = new String[] { null, null, null };
+        String[] result = new String[]{null, null, null};
 
         if (userId == null || userId.equals("")) {
             return result;
@@ -547,7 +539,6 @@ public class PgpKeyHelper {
             result[0] = matcher.group(1);
             result[1] = matcher.group(3);
             result[2] = matcher.group(2);
-            return result;
         }
 
         return result;
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
index 68d9f801b..1a16f6db3 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/provider/ProviderHelper.java
@@ -341,10 +341,10 @@ public class ProviderHelper {
                                                                      long keyRingRowId, PGPSecretKey key, int rank) throws IOException {
         ContentValues values = new ContentValues();
 
-        boolean has_private = true;
+        boolean hasPrivate = true;
         if (key.isMasterKey()) {
-            if (PgpKeyHelper.isSecretKeyPrivateEmpty(key)) {
-                has_private = false;
+            if (key.isPrivateKeyEmpty()) {
+                hasPrivate = false;
             }
         }
 
@@ -352,8 +352,8 @@ public class ProviderHelper {
         values.put(Keys.IS_MASTER_KEY, key.isMasterKey());
         values.put(Keys.ALGORITHM, key.getPublicKey().getAlgorithm());
         values.put(Keys.KEY_SIZE, key.getPublicKey().getBitStrength());
-        values.put(Keys.CAN_CERTIFY, (PgpKeyHelper.isCertificationKey(key) && has_private));
-        values.put(Keys.CAN_SIGN, (PgpKeyHelper.isSigningKey(key) && has_private));
+        values.put(Keys.CAN_CERTIFY, (PgpKeyHelper.isCertificationKey(key) && hasPrivate));
+        values.put(Keys.CAN_SIGN, (PgpKeyHelper.isSigningKey(key) && hasPrivate));
         values.put(Keys.CAN_ENCRYPT, PgpKeyHelper.isEncryptionKey(key));
         values.put(Keys.IS_REVOKED, key.getPublicKey().isRevoked());
         values.put(Keys.CREATION, PgpKeyHelper.getCreationDate(key).getTime() / 1000);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 5ac421a44..7e31d795e 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -161,7 +161,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
             } else if (extras.containsKey(EXTRA_KEY_ID)) {
                 long keyId = intent.getLongExtra(EXTRA_KEY_ID, 0);
                 if (keyId != 0) {
-                    query = "0x" + PgpKeyHelper.convertKeyToHex(keyId);
+                    query = PgpKeyHelper.convertKeyIdToHex(keyId);
                 }
             } else if (extras.containsKey(EXTRA_FINGERPRINT)) {
                 String fingerprint = intent.getStringExtra(EXTRA_FINGERPRINT);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
index 1118f0264..a6917d6f4 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java
@@ -219,27 +219,44 @@ public class ImportKeysListFragment extends ListFragment implements
         } else {
             setListShownNoAnimation(true);
         }
+
+        Exception error = data.getError();
+
         switch (loader.getId()) {
             case LOADER_ID_BYTES:
+
+                if(error == null){
+                    // No error
+                } else if(error instanceof ImportKeysListLoader.FileHasNoContent) {
+                    AppMsg.makeText(getActivity(), R.string.error_import_file_no_content,
+                            AppMsg.STYLE_ALERT).show();
+                } else if(error instanceof ImportKeysListLoader.NonPgpPart) {
+                    AppMsg.makeText(getActivity(),
+                            ((ImportKeysListLoader.NonPgpPart) error).getCount() + " " + getResources().
+                            getQuantityString(R.plurals.error_import_non_pgp_part,
+                                    ((ImportKeysListLoader.NonPgpPart) error).getCount()),
+                            new AppMsg.Style(AppMsg.LENGTH_LONG, R.color.confirm)).show();
+                } else {
+                    AppMsg.makeText(getActivity(), R.string.error_generic_report_bug,
+                            new AppMsg.Style(AppMsg.LENGTH_LONG, R.color.alert)).show();
+                }
                 break;
 
             case LOADER_ID_SERVER_QUERY:
 
-                Exception error = data.getError();
-
-                if(error == null){
+                if(error == null) {
                     AppMsg.makeText(
                             getActivity(), getResources().getQuantityString(R.plurals.keys_found,
                             mAdapter.getCount(), mAdapter.getCount()),
                             AppMsg.STYLE_INFO
                     ).show();
-                } else if(error instanceof KeyServer.InsufficientQuery){
+                } else if(error instanceof KeyServer.InsufficientQuery) {
                     AppMsg.makeText(getActivity(), R.string.error_keyserver_insufficient_query,
                             AppMsg.STYLE_ALERT).show();
-                }else if(error instanceof  KeyServer.QueryException){
+                } else if(error instanceof  KeyServer.QueryException) {
                     AppMsg.makeText(getActivity(), R.string.error_keyserver_query,
                             AppMsg.STYLE_ALERT).show();
-                }else if(error instanceof KeyServer.TooManyResponses){
+                } else if(error instanceof KeyServer.TooManyResponses) {
                     AppMsg.makeText(getActivity(), R.string.error_keyserver_too_many_responses,
                             AppMsg.STYLE_ALERT).show();
                 }
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
index f14fadd77..40a016f55 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/KeyListPublicFragment.java
@@ -375,6 +375,7 @@ public class KeyListPublicFragment extends Fragment implements SearchView.OnQuer
         // Execute this when searching
         mSearchView.setOnQueryTextListener(this);
 
+
         super.onCreateOptionsMenu(menu, inflater);
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
index 2db5fc27f..390de9ab9 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java
@@ -154,7 +154,7 @@ public class ViewKeyActivity extends ActionBarActivity {
     }
 
     private void updateFromKeyserver(Uri dataUri) {
-        long updateKeyId = ProviderHelper.getMasterKeyId(ViewKeyActivity.this, mDataUri);
+        long updateKeyId = ProviderHelper.getMasterKeyId(ViewKeyActivity.this, dataUri);
 
         if (updateKeyId == 0) {
             Log.e(Constants.TAG, "this shouldn't happen. KeyId == 0!");
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
index 495764eaf..7b83db87f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java
@@ -225,7 +225,7 @@ public class ViewKeyMainFragment extends Fragment  implements
                     // get key id from MASTER_KEY_ID
                     long keyId = data.getLong(KEYS_INDEX_KEY_ID);
 
-                    String keyIdStr = "0x" + PgpKeyHelper.convertKeyIdToHex(keyId);
+                    String keyIdStr = PgpKeyHelper.convertKeyIdToHex(keyId);
                     mKeyId.setText(keyIdStr);
 
                     // get creation date from CREATION
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
index 01b6deeaa..f764b879c 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java
@@ -165,7 +165,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
         this.revoked = pgpKeyRing.getPublicKey().isRevoked();
         this.fingerPrint = PgpKeyHelper.convertFingerprintToHex(pgpKeyRing.getPublicKey()
                 .getFingerprint(), true);
-        this.hexKeyId = "0x" + PgpKeyHelper.convertKeyIdToHex(keyId);
+        this.hexKeyId = PgpKeyHelper.convertKeyIdToHex(keyId);
         this.bitStrength = pgpKeyRing.getPublicKey().getBitStrength();
         int algorithm = pgpKeyRing.getPublicKey().getAlgorithm();
         if (algorithm == PGPPublicKey.RSA_ENCRYPT || algorithm == PGPPublicKey.RSA_GENERAL
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
index 357f5a3f1..3eca99f15 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListLoader.java
@@ -33,6 +33,21 @@ import android.content.Context;
 import android.support.v4.content.AsyncTaskLoader;
 
 public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>> {
+
+    public static class FileHasNoContent extends Exception {
+
+    }
+
+    public static class NonPgpPart extends Exception {
+        private int count;
+        public NonPgpPart(int count) {
+            this.count = count;
+        }
+        public int getCount() {
+            return count;
+        }
+    }
+
     Context mContext;
 
     InputData mInputData;
@@ -91,6 +106,10 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
      * @return
      */
     private void generateListOfKeyrings(InputData inputData) {
+
+        boolean isEmpty = true;
+        int nonPgpCounter = 0;
+
         PositionAwareInputStream progressIn = new PositionAwareInputStream(
                 inputData.getInputStream());
 
@@ -102,6 +121,7 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
 
             // read all available blocks... (asc files can contain many blocks with BEGIN END)
             while (bufferedInput.available() > 0) {
+                isEmpty = false;
                 InputStream in = PGPUtil.getDecoderStream(bufferedInput);
                 PGPObjectFactory objectFactory = new PGPObjectFactory(in);
 
@@ -115,11 +135,25 @@ public class ImportKeysListLoader extends AsyncTaskLoader<AsyncTaskResultWrapper
                         addToData(newKeyring);
                     } else {
                         Log.e(Constants.TAG, "Object not recognized as PGPKeyRing!");
+                        nonPgpCounter++;
                     }
                 }
             }
         } catch (Exception e) {
             Log.e(Constants.TAG, "Exception on parsing key file!", e);
+            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>(data, e);
+            nonPgpCounter = 0;
+        }
+
+        if(isEmpty) {
+            Log.e(Constants.TAG, "File has no content!", new FileHasNoContent());
+            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>
+                    (data, new FileHasNoContent());
+        }
+
+        if(nonPgpCounter > 0) {
+            entryListWrapper = new AsyncTaskResultWrapper<ArrayList<ImportKeysListEntry>>
+                    (data, new NonPgpPart(nonPgpCounter));
         }
     }
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
index 54c7eb60e..046a98883 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ViewKeyKeysAdapter.java
@@ -83,7 +83,7 @@ public class ViewKeyKeysAdapter extends CursorAdapter {
         ImageView encryptIcon = (ImageView) view.findViewById(R.id.ic_encryptKey);
         ImageView signIcon = (ImageView) view.findViewById(R.id.ic_signKey);
 
-        String keyIdStr = "0x" + PgpKeyHelper.convertKeyIdToHex(cursor.getLong(mIndexKeyId));
+        String keyIdStr = PgpKeyHelper.convertKeyIdToHex(cursor.getLong(mIndexKeyId));
         String algorithmStr = PgpKeyHelper.getAlgorithmInfo(cursor.getInt(mIndexAlgorithm),
                 cursor.getInt(mIndexKeySize));
 
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
index 75a885bdd..65461cb4f 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/widget/KeyEditor.java
@@ -174,9 +174,8 @@ public class KeyEditor extends LinearLayout implements Editor, OnClickListener {
         }
 
         mAlgorithm.setText(PgpKeyHelper.getAlgorithmInfo(key));
-        String keyId1Str = PgpKeyHelper.convertKeyIdToHex(key.getKeyID());
-        String keyId2Str = PgpKeyHelper.convertKeyIdToHex(key.getKeyID() >> 32);
-        mKeyId.setText(keyId1Str + " " + keyId2Str);
+        String keyIdStr = PgpKeyHelper.convertKeyIdToHex(key.getKeyID());
+        mKeyId.setText(keyIdStr);
 
         Vector<Choice> choices = new Vector<Choice>();
         boolean isElGamalKey = (key.getPublicKey().getAlgorithm() == PGPPublicKey.ELGAMAL_ENCRYPT);
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
index 921d22f21..0681847f4 100644
--- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
+++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java
@@ -226,7 +226,7 @@ public class HkpKeyServer extends KeyServer {
         HttpClient client = new DefaultHttpClient();
         try {
             HttpGet get = new HttpGet("http://" + mHost + ":" + mPort
-                    + "/pks/lookup?op=get&search=0x" + PgpKeyHelper.convertKeyToHex(keyId));
+                    + "/pks/lookup?op=get&search=0x" + PgpKeyHelper.convertKeyIdToHex(keyId));
 
             HttpResponse response = client.execute(get);
             if (response.getStatusLine().getStatusCode() != HttpStatus.SC_OK) {
diff --git a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
index 055687183..b44ca82ec 100644
--- a/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
+++ b/OpenPGP-Keychain/src/main/res/layout/view_key_main_fragment.xml
@@ -92,7 +92,7 @@
             android:layout_width="wrap_content"
             android:layout_height="0dp"
             android:layout_weight="1"
-            android:stretchColumns="1">
+            android:shrinkColumns="1">
 
             <TableRow>
 
diff --git a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
index 35a8f3926..35f4fca92 100644
--- a/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
+++ b/OpenPGP-Keychain/src/main/res/menu/key_list_public.xml
@@ -4,7 +4,7 @@
 
     <item
         android:id="@+id/menu_key_list_public_import"
-        app:showAsAction="always|withText"
+        app:showAsAction="ifRoom|withText"
         android:icon="@drawable/ic_action_add_person"
         android:title="@string/menu_import" />
     <item
@@ -16,5 +16,5 @@
         android:title="@string/menu_search"
         android:icon="@drawable/ic_action_search"
         app:actionViewClass="android.support.v7.widget.SearchView"
-        app:showAsAction="ifRoom" />
+        app:showAsAction="collapseActionView|ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml
index 99fc7c8a7..cd016c41e 100644
--- a/OpenPGP-Keychain/src/main/res/values/strings.xml
+++ b/OpenPGP-Keychain/src/main/res/values/strings.xml
@@ -296,10 +296,16 @@
     <string name="error_keyserver_insufficient_query">Insufficient server query</string>
     <string name="error_keyserver_query">Querying keyserver failed</string>
     <string name="error_keyserver_too_many_responses">Too many responses</string>
+    <string name="error_import_file_no_content">File has no content</string>
+    <string name="error_generic_report_bug">A generic error occurred, please create a new bug report for OpenKeychain.</string>
     <plurals name="error_can_not_delete_info">
         <item quantity="one">Please delete it from the \'My Keys\' screen!</item>
         <item quantity="other">Please delete them from the \'My Keys\' screen!</item>
     </plurals>
+    <plurals name="error_import_non_pgp_part">
+        <item quantity="one">part of the loaded file is a valid OpenPGP object but not a OpenPGP key</item>
+        <item quantity="other">parts of the loaded file are valid OpenPGP objects but not OpenPGP keys</item>
+    </plurals>
 
     <!-- progress dialogs, usually ending in '…' -->
     <string name="progress_done">done.</string>