Fix fingerprint handling

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java

@@ -452,7 +452,7 @@ public class PgpKeyHelper {
             key = secretKey.getPublicKey();
         }
 
-        return convertFingerprintToHex(key.getFingerprint(), true);
+        return convertFingerprintToHex(key.getFingerprint());
     }
 
     /**
@@ -465,19 +465,12 @@ public class PgpKeyHelper {
      * @param split       split into 4 character chunks
      * @return
      */
-    public static String convertFingerprintToHex(byte[] fingerprint, boolean split) {
+    public static String convertFingerprintToHex(byte[] fingerprint) {
         String hexString = Hex.toHexString(fingerprint);
-        if (split) {
-            hexString = splitFingerprintHex(hexString);
-        }
 
         return hexString;
     }
 
-    public static String splitFingerprintHex(String hexString) {
-        return hexString.replaceAll("(.{4})(?!$)", "$1 ");
-    }
-
     /**
      * Convert key id from long to 64 bit hex string
      * <p/>
@@ -511,6 +504,9 @@ public class PgpKeyHelper {
 
 
     public static SpannableStringBuilder colorizeFingerprint(String fingerprint) {
+        // split by 4 characters
+        fingerprint = fingerprint.replaceAll("(.{4})(?!$)", "$1 ");
+
         // add line breaks to have a consistent "image" that can be recognized
         char[] chars = fingerprint.toCharArray();
         chars[24] = '\n';

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/KeychainIntentService.java

@@ -756,7 +756,7 @@ public class KeychainIntentService extends IntentService
                     // if available use complete fingerprint for get request
                     byte[] downloadedKeyBytes;
                     if (entry.getFingerPrintHex() != null) {
-                        downloadedKeyBytes = server.get(entry.getFingerPrintHex()).getBytes();
+                        downloadedKeyBytes = server.get("0x" + entry.getFingerPrintHex()).getBytes();
                     } else {
                         downloadedKeyBytes = server.get(entry.getKeyIdHex()).getBytes();
                     }
@@ -784,7 +784,7 @@ public class KeychainIntentService extends IntentService
 
                     // verify downloaded key by comparing fingerprints
                     if (entry.getFingerPrintHex() != null) {
-                        String downloadedKeyFp = PgpKeyHelper.convertFingerprintToHex(downloadedKey.getPublicKey().getFingerprint(), false);
+                        String downloadedKeyFp = PgpKeyHelper.convertFingerprintToHex(downloadedKey.getPublicKey().getFingerprint());
                         if (downloadedKeyFp.equals(entry.getFingerPrintHex())) {
                             Log.d(Constants.TAG, "fingerprint of downloaded key is the same as the requested fingerprint!");
                         } else {

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java

@@ -198,6 +198,8 @@ public class CertifyKeyActivity extends ActionBarActivity implements
             case LOADER_ID_KEYRING:
                 // the first key here is our master key
                 if (data.moveToFirst()) {
+                    // TODO: put findViewById in onCreate!
+
                     long keyId = data.getLong(INDEX_MASTER_KEY_ID);
                     String keyIdStr = PgpKeyHelper.convertKeyIdToHexShort(keyId);
                     ((TextView) findViewById(R.id.key_id)).setText(keyIdStr);
@@ -210,7 +212,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements
                         // FALLBACK for old database entries
                         fingerprintBlob = ProviderHelper.getFingerprint(this, mDataUri);
                     }
-                    String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob, true);
+                    String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob);
                     ((TextView) findViewById(R.id.fingerprint)).setText(PgpKeyHelper.colorizeFingerprint(fingerprint));
                 }
                 break;

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

@@ -182,7 +182,7 @@ public class ViewKeyActivity extends ActionBarActivity {
         String content;
         if (fingerprintOnly) {
             byte[] fingerprintBlob = ProviderHelper.getFingerprint(this, dataUri);
-            String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob, false);
+            String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob);
 
             content = Constants.FINGERPRINT_SCHEME + ":" + fingerprint;
         } else {

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyMainFragment.java

@@ -320,7 +320,7 @@ public class ViewKeyMainFragment extends Fragment implements
                         // FALLBACK for old database entries
                         fingerprintBlob = ProviderHelper.getFingerprint(getActivity(), mDataUri);
                     }
-                    String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob, true);
+                    String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob);
 
                     mFingerprint.setText(PgpKeyHelper.colorizeFingerprint(fingerprint));
                 }

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListEntry.java

@@ -240,7 +240,7 @@ public class ImportKeysListEntry implements Serializable, Parcelable {
 
         this.revoked = pgpKeyRing.getPublicKey().isRevoked();
         this.fingerPrintHex = PgpKeyHelper.convertFingerprintToHex(pgpKeyRing.getPublicKey()
-                .getFingerprint(), true);
+                .getFingerprint());
         this.bitStrength = pgpKeyRing.getPublicKey().getBitStrength();
         final int algorithm = pgpKeyRing.getPublicKey().getAlgorithm();
         this.algorithm = getAlgorithmFromId(algorithm);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/dialog/ShareQrCodeDialogFragment.java

@@ -90,7 +90,7 @@ public class ShareQrCodeDialogFragment extends DialogFragment {
             alert.setPositiveButton(R.string.btn_okay, null);
 
             byte[] fingerprintBlob = ProviderHelper.getFingerprint(getActivity(), dataUri);
-            String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob, false);
+            String fingerprint = PgpKeyHelper.convertFingerprintToHex(fingerprintBlob);
 
             mText.setText(getString(R.string.share_qr_code_dialog_fingerprint_text) + " " + fingerprint);
 

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/util/HkpKeyServer.java

@@ -251,8 +251,7 @@ public class HkpKeyServer extends KeyServer {
             // and https://github.com/openpgp-keychain/openpgp-keychain/issues/259#issuecomment-38168176
             String fingerprintOrKeyId = matcher.group(1);
             if (fingerprintOrKeyId.length() > 16) {
-                entry.setFingerPrintHex(PgpKeyHelper.splitFingerprintHex(
+                entry.setFingerPrintHex(fingerprintOrKeyId.toLowerCase(Locale.US));
-                        fingerprintOrKeyId.toLowerCase(Locale.US)));
                 entry.setKeyIdHex("0x" + fingerprintOrKeyId.substring(fingerprintOrKeyId.length()
                         - 16, fingerprintOrKeyId.length()));
             } else {

OpenPGP-Keychain/src/main/res/layout/import_keys_list_entry.xml

@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:paddingLeft="3dip"
@@ -23,7 +23,7 @@
     android:singleLine="true" >
 
     <LinearLayout
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal" >
 
@@ -87,6 +87,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="fingerprint"
+                android:typeface="monospace"
                 android:textAppearance="?android:attr/textAppearanceSmall" />
 
             <TextView
@@ -100,7 +101,7 @@
 
     <LinearLayout
         android:id="@+id/list"
-        android:layout_width="fill_parent"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="36dip"
         android:orientation="vertical" >