package reordering: merge util and helper, there were no real difference; created ui.util for everything related to formatting

7 files changed, 31 insertions, 361 deletions

diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
index e0e199684..e8f139b22 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpDecryptVerify.java
@@ -51,6 +51,7 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.results.DecryptVerifyResult;
 import org.sufficientlysecure.keychain.service.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ProgressScaler;
@@ -260,7 +261,7 @@ public class PgpDecryptVerify {
                 long subKeyId = encData.getKeyID();
 
                 log.add(LogType.MSG_DC_ASYM, indent,
-                        PgpKeyHelper.convertKeyIdToHex(subKeyId));
+                        KeyFormattingUtils.convertKeyIdToHex(subKeyId));
 
                 CanonicalizedSecretKeyRing secretKeyRing;
                 try {
@@ -367,7 +368,7 @@ public class PgpDecryptVerify {
                 PGPPublicKeyEncryptedData encData = (PGPPublicKeyEncryptedData) obj;
                 long subKeyId = encData.getKeyID();
                 log.add(LogType.MSG_DC_TRAIL_ASYM, indent,
-                        PgpKeyHelper.convertKeyIdToHex(subKeyId));
+                        KeyFormattingUtils.convertKeyIdToHex(subKeyId));
             } else if (obj instanceof PGPPBEEncryptedData) {
                 log.add(LogType.MSG_DC_TRAIL_SYM, indent);
             } else {
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
index db360f810..0a15fd98f 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpHelper.java
@@ -24,7 +24,7 @@ import android.content.pm.PackageManager.NameNotFoundException;
 
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.helper.Preferences;
+import org.sufficientlysecure.keychain.util.Preferences;
 import org.sufficientlysecure.keychain.util.Log;
 
 import java.io.File;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
index 1c2c1e78a..26c705347 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpImportExport.java
@@ -37,6 +37,7 @@ import org.sufficientlysecure.keychain.service.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog;
 import org.sufficientlysecure.keychain.service.results.ImportKeyResult;
 import org.sufficientlysecure.keychain.service.results.SaveKeyringResult;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ProgressScaler;
@@ -144,8 +145,8 @@ public class PgpImportExport {
 
                 String expectedFp = entry.getExpectedFingerprint();
                 if(expectedFp != null) {
-                    if(!PgpKeyHelper.convertFingerprintToHex(key.getFingerprint()).equals(expectedFp)) {
-                        Log.d(Constants.TAG, "fingerprint: " + PgpKeyHelper.convertFingerprintToHex(key.getFingerprint()));
+                    if(!KeyFormattingUtils.convertFingerprintToHex(key.getFingerprint()).equals(expectedFp)) {
+                        Log.d(Constants.TAG, "fingerprint: " + KeyFormattingUtils.convertFingerprintToHex(key.getFingerprint()));
                         Log.d(Constants.TAG, "expected fingerprint: " + expectedFp);
                         Log.e(Constants.TAG, "Actual key fingerprint is not the same as expected!");
                         badKeys += 1;
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
deleted file mode 100644
index 78d1a857f..000000000
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyHelper.java
+++ /dev/null
@@ -1,334 +0,0 @@
-/*
- * Copyright (C) 2012-2014 Dominik Schürmann <dominik@dominikschuermann.de>
- * Copyright (C) 2010-2014 Thialfihar <thi@thialfihar.org>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-package org.sufficientlysecure.keychain.pgp;
-
-import android.content.Context;
-import android.graphics.Color;
-import android.text.Spannable;
-import android.text.SpannableStringBuilder;
-import android.text.style.ForegroundColorSpan;
-
-import org.spongycastle.asn1.ASN1ObjectIdentifier;
-import org.spongycastle.asn1.nist.NISTNamedCurves;
-import org.spongycastle.asn1.teletrust.TeleTrusTNamedCurves;
-import org.spongycastle.bcpg.PublicKeyAlgorithmTags;
-import org.spongycastle.util.encoders.Hex;
-import org.sufficientlysecure.keychain.Constants;
-import org.sufficientlysecure.keychain.R;
-import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm;
-import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Curve;
-import org.sufficientlysecure.keychain.util.Log;
-
-import java.security.DigestException;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.Locale;
-
-public class PgpKeyHelper {
-
-    public static String getAlgorithmInfo(int algorithm, Integer keySize, String oid) {
-        return getAlgorithmInfo(null, algorithm, keySize, oid);
-    }
-
-    /**
-     * Based on <a href="http://tools.ietf.org/html/rfc2440#section-9.1">OpenPGP Message Format</a>
-     */
-    public static String getAlgorithmInfo(Context context, int algorithm, Integer keySize, String oid) {
-        String algorithmStr;
-
-        switch (algorithm) {
-            case PublicKeyAlgorithmTags.RSA_ENCRYPT:
-            case PublicKeyAlgorithmTags.RSA_GENERAL:
-            case PublicKeyAlgorithmTags.RSA_SIGN: {
-                algorithmStr = "RSA";
-                break;
-            }
-            case PublicKeyAlgorithmTags.DSA: {
-                algorithmStr = "DSA";
-                break;
-            }
-
-            case PublicKeyAlgorithmTags.ELGAMAL_ENCRYPT:
-            case PublicKeyAlgorithmTags.ELGAMAL_GENERAL: {
-                algorithmStr = "ElGamal";
-                break;
-            }
-
-            case PublicKeyAlgorithmTags.ECDSA: {
-                if (oid == null) {
-                    return "ECDSA";
-                }
-                String oidName = PgpKeyHelper.getCurveInfo(context, oid);
-                return "ECDSA (" + oidName + ")";
-            }
-            case PublicKeyAlgorithmTags.ECDH: {
-                if (oid == null) {
-                    return "ECDH";
-                }
-                String oidName = PgpKeyHelper.getCurveInfo(context, oid);
-                return "ECDH (" + oidName + ")";
-            }
-
-            default: {
-                if (context != null) {
-                    algorithmStr = context.getResources().getString(R.string.unknown_algorithm);
-                } else {
-                    algorithmStr = "unknown";
-                }
-                break;
-            }
-        }
-        if (keySize != null && keySize > 0)
-            return algorithmStr + ", " + keySize + " bit";
-        else
-            return algorithmStr;
-    }
-
-    public static String getAlgorithmInfo(Algorithm algorithm, Integer keySize, Curve curve) {
-        return getAlgorithmInfo(null, algorithm, keySize, curve);
-    }
-
-    /**
-     * Based on <a href="http://tools.ietf.org/html/rfc2440#section-9.1">OpenPGP Message Format</a>
-     */
-    public static String getAlgorithmInfo(Context context, Algorithm algorithm, Integer keySize, Curve curve) {
-        String algorithmStr;
-
-        switch (algorithm) {
-            case RSA: {
-                algorithmStr = "RSA";
-                break;
-            }
-            case DSA: {
-                algorithmStr = "DSA";
-                break;
-            }
-
-            case ELGAMAL: {
-                algorithmStr = "ElGamal";
-                break;
-            }
-
-            case ECDSA: {
-                algorithmStr = "ECDSA";
-                if (curve != null) {
-                    algorithmStr += " (" + getCurveInfo(context, curve) + ")";
-                }
-                return algorithmStr;
-            }
-            case ECDH: {
-                algorithmStr = "ECDH";
-                if (curve != null) {
-                    algorithmStr += " (" + getCurveInfo(context, curve) + ")";
-                }
-                return algorithmStr;
-            }
-
-            default: {
-                if (context != null) {
-                    algorithmStr = context.getResources().getString(R.string.unknown_algorithm);
-                } else {
-                    algorithmStr = "unknown";
-                }
-                break;
-            }
-        }
-        if (keySize != null && keySize > 0)
-            return algorithmStr + ", " + keySize + " bit";
-        else
-            return algorithmStr;
-    }
-
-    /**
-     * Return name of a curve. These are names, no need for translation
-     */
-    public static String getCurveInfo(Context context, Curve curve) {
-        switch (curve) {
-            case NIST_P256:
-                return "NIST P-256";
-            case NIST_P384:
-                return "NIST P-384";
-            case NIST_P521:
-                return "NIST P-521";
-
-            /* see SaveKeyringParcel
-            case BRAINPOOL_P256:
-                return "Brainpool P-256";
-            case BRAINPOOL_P384:
-                return "Brainpool P-384";
-            case BRAINPOOL_P512:
-                return "Brainpool P-512";
-            */
-        }
-        if (context != null) {
-            return context.getResources().getString(R.string.unknown_algorithm);
-        } else {
-            return "unknown";
-        }
-    }
-
-    public static String getCurveInfo(Context context, String oidStr) {
-        ASN1ObjectIdentifier oid = new ASN1ObjectIdentifier(oidStr);
-
-        String name;
-        name = NISTNamedCurves.getName(oid);
-        if (name != null) {
-            return name;
-        }
-        name = TeleTrusTNamedCurves.getName(oid);
-        if (name != null) {
-            return name;
-        }
-        if (context != null) {
-            return context.getResources().getString(R.string.unknown_algorithm);
-        } else {
-            return "unknown";
-        }
-    }
-
-    /**
-     * Converts fingerprint to hex
-     * <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
-     * @return
-     */
-    public static String convertFingerprintToHex(byte[] fingerprint) {
-        return Hex.toHexString(fingerprint).toLowerCase(Locale.ENGLISH);
-    }
-
-    /**
-     * 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 convertKeyIdToHex(long keyId) {
-        long upper = keyId >> 32;
-        if (upper == 0) {
-            // this is a short key id
-            return convertKeyIdToHexShort(keyId);
-        }
-        return "0x" + convertKeyIdToHex32bit(keyId >> 32) + convertKeyIdToHex32bit(keyId);
-    }
-
-    public static String convertKeyIdToHexShort(long keyId) {
-        return "0x" + convertKeyIdToHex32bit(keyId);
-    }
-
-    private static String convertKeyIdToHex32bit(long keyId) {
-        String hexString = Long.toHexString(keyId & 0xffffffffL).toLowerCase(Locale.ENGLISH);
-        while (hexString.length() < 8) {
-            hexString = "0" + hexString;
-        }
-        return hexString;
-    }
-
-
-    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';
-        fingerprint = String.valueOf(chars);
-
-        SpannableStringBuilder sb = new SpannableStringBuilder(fingerprint);
-        try {
-            // for each 4 characters of the fingerprint + 1 space
-            for (int i = 0; i < fingerprint.length(); i += 5) {
-                int spanEnd = Math.min(i + 4, fingerprint.length());
-                String fourChars = fingerprint.substring(i, spanEnd);
-
-                int raw = Integer.parseInt(fourChars, 16);
-                byte[] bytes = {(byte) ((raw >> 8) & 0xff - 128), (byte) (raw & 0xff - 128)};
-                int[] color = getRgbForData(bytes);
-                int r = color[0];
-                int g = color[1];
-                int b = color[2];
-
-                // we cannot change black by multiplication, so adjust it to an almost-black grey,
-                // which will then be brightened to the minimal brightness level
-                if (r == 0 && g == 0 && b == 0) {
-                    r = 1;
-                    g = 1;
-                    b = 1;
-                }
-
-                // Convert rgb to brightness
-                double brightness = 0.2126 * r + 0.7152 * g + 0.0722 * b;
-
-                // If a color is too dark to be seen on black,
-                // then brighten it up to a minimal brightness.
-                if (brightness < 80) {
-                    double factor = 80.0 / brightness;
-                    r = Math.min(255, (int) (r * factor));
-                    g = Math.min(255, (int) (g * factor));
-                    b = Math.min(255, (int) (b * factor));
-
-                    // If it is too light, then darken it to a respective maximal brightness.
-                } else if (brightness > 180) {
-                    double factor = 180.0 / brightness;
-                    r = (int) (r * factor);
-                    g = (int) (g * factor);
-                    b = (int) (b * factor);
-                }
-
-                // Create a foreground color with the 3 digest integers as RGB
-                // and then converting that int to hex to use as a color
-                sb.setSpan(new ForegroundColorSpan(Color.rgb(r, g, b)),
-                        i, spanEnd, Spannable.SPAN_INCLUSIVE_INCLUSIVE);
-            }
-        } catch (Exception e) {
-            Log.e(Constants.TAG, "Colorization failed", e);
-            // if anything goes wrong, then just display the fingerprint without colour,
-            // instead of partially correct colour or wrong colours
-            return new SpannableStringBuilder(fingerprint);
-        }
-
-        return sb;
-    }
-
-    /**
-     * Converts the given bytes to a unique RGB color using SHA1 algorithm
-     *
-     * @param bytes
-     * @return an integer array containing 3 numeric color representations (Red, Green, Black)
-     * @throws java.security.NoSuchAlgorithmException
-     * @throws java.security.DigestException
-     */
-    private static int[] getRgbForData(byte[] bytes) throws NoSuchAlgorithmException, DigestException {
-        MessageDigest md = MessageDigest.getInstance("SHA1");
-
-        md.update(bytes);
-        byte[] digest = md.digest();
-
-        return new int[]{((int) digest[0] + 256) % 256,
-                ((int) digest[1] + 256) % 256,
-                ((int) digest[2] + 256) % 256};
-    }
-
-}
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
index 63a86e107..0a8774029 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpKeyOperation.java
@@ -54,6 +54,7 @@ import org.sufficientlysecure.keychain.service.SaveKeyringParcel;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Algorithm;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.Curve;
 import org.sufficientlysecure.keychain.service.SaveKeyringParcel.SubkeyAdd;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Primes;
@@ -405,7 +406,7 @@ public class PgpKeyOperation {
          */
 
         log.add(LogType.MSG_MF, indent,
-                PgpKeyHelper.convertKeyIdToHex(wsKR.getMasterKeyId()));
+                KeyFormattingUtils.convertKeyIdToHex(wsKR.getMasterKeyId()));
         indent += 1;
         progress(R.string.progress_building_key, 0);
 
@@ -674,12 +675,12 @@ public class PgpKeyOperation {
                 progress(R.string.progress_modify_subkeychange, (i-1) * (100 / saveParcel.mChangeSubKeys.size()));
                 SaveKeyringParcel.SubkeyChange change = saveParcel.mChangeSubKeys.get(i);
                 log.add(LogType.MSG_MF_SUBKEY_CHANGE,
-                        indent, PgpKeyHelper.convertKeyIdToHex(change.mKeyId));
+                        indent, KeyFormattingUtils.convertKeyIdToHex(change.mKeyId));
 
                 PGPSecretKey sKey = sKR.getSecretKey(change.mKeyId);
                 if (sKey == null) {
                     log.add(LogType.MSG_MF_ERROR_SUBKEY_MISSING,
-                            indent + 1, PgpKeyHelper.convertKeyIdToHex(change.mKeyId));
+                            indent + 1, KeyFormattingUtils.convertKeyIdToHex(change.mKeyId));
                     return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null);
                 }
 
@@ -687,7 +688,7 @@ public class PgpKeyOperation {
                 if (change.mExpiry != null && change.mExpiry != 0 &&
                         new Date(change.mExpiry*1000).before(new Date())) {
                     log.add(LogType.MSG_MF_ERROR_PAST_EXPIRY,
-                            indent + 1, PgpKeyHelper.convertKeyIdToHex(change.mKeyId));
+                            indent + 1, KeyFormattingUtils.convertKeyIdToHex(change.mKeyId));
                     return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null);
                 }
 
@@ -755,12 +756,12 @@ public class PgpKeyOperation {
                 progress(R.string.progress_modify_subkeyrevoke, (i-1) * (100 / saveParcel.mRevokeSubKeys.size()));
                 long revocation = saveParcel.mRevokeSubKeys.get(i);
                 log.add(LogType.MSG_MF_SUBKEY_REVOKE,
-                        indent, PgpKeyHelper.convertKeyIdToHex(revocation));
+                        indent, KeyFormattingUtils.convertKeyIdToHex(revocation));
 
                 PGPSecretKey sKey = sKR.getSecretKey(revocation);
                 if (sKey == null) {
                     log.add(LogType.MSG_MF_ERROR_SUBKEY_MISSING,
-                            indent+1, PgpKeyHelper.convertKeyIdToHex(revocation));
+                            indent+1, KeyFormattingUtils.convertKeyIdToHex(revocation));
                     return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null);
                 }
                 PGPPublicKey pKey = sKey.getPublicKey();
@@ -780,12 +781,12 @@ public class PgpKeyOperation {
                 progress(R.string.progress_modify_subkeystrip, (i-1) * (100 / saveParcel.mStripSubKeys.size()));
                 long strip = saveParcel.mStripSubKeys.get(i);
                 log.add(LogType.MSG_MF_SUBKEY_STRIP,
-                        indent, PgpKeyHelper.convertKeyIdToHex(strip));
+                        indent, KeyFormattingUtils.convertKeyIdToHex(strip));
 
                 PGPSecretKey sKey = sKR.getSecretKey(strip);
                 if (sKey == null) {
                     log.add(LogType.MSG_MF_ERROR_SUBKEY_MISSING,
-                            indent+1, PgpKeyHelper.convertKeyIdToHex(strip));
+                            indent+1, KeyFormattingUtils.convertKeyIdToHex(strip));
                     return new EditKeyResult(EditKeyResult.RESULT_ERROR, log, null);
                 }
 
@@ -810,7 +811,7 @@ public class PgpKeyOperation {
                 progress(R.string.progress_modify_subkeyadd, (i-1) * (100 / saveParcel.mAddSubKeys.size()));
                 SaveKeyringParcel.SubkeyAdd add = saveParcel.mAddSubKeys.get(i);
                 log.add(LogType.MSG_MF_SUBKEY_NEW, indent,
-                        PgpKeyHelper.getAlgorithmInfo(add.mAlgorithm, add.mKeySize, add.mCurve) );
+                        KeyFormattingUtils.getAlgorithmInfo(add.mAlgorithm, add.mKeySize, add.mCurve) );
 
                 if (add.mExpiry == null) {
                     log.add(LogType.MSG_MF_ERROR_NULL_EXPIRY, indent +1);
@@ -856,7 +857,7 @@ public class PgpKeyOperation {
                 }
 
                 log.add(LogType.MSG_MF_SUBKEY_NEW_ID,
-                        indent+1, PgpKeyHelper.convertKeyIdToHex(sKey.getKeyID()));
+                        indent+1, KeyFormattingUtils.convertKeyIdToHex(sKey.getKeyID()));
 
                 sKR = PGPSecretKeyRing.insertSecretKey(sKR, sKey);
 
@@ -888,7 +889,7 @@ public class PgpKeyOperation {
                 // noinspection unchecked
                 for (PGPSecretKey sKey : new IterableIterator<PGPSecretKey>(sKR.getSecretKeys())) {
                     log.add(LogType.MSG_MF_PASSPHRASE_KEY, indent,
-                            PgpKeyHelper.convertKeyIdToHex(sKey.getKeyID()));
+                            KeyFormattingUtils.convertKeyIdToHex(sKey.getKeyID()));
 
                     boolean ok = false;
 
@@ -921,7 +922,7 @@ public class PgpKeyOperation {
                     if (!ok) {
                         // for a subkey, it's merely a warning
                         log.add(LogType.MSG_MF_PASSPHRASE_FAIL, indent+1,
-                                PgpKeyHelper.convertKeyIdToHex(sKey.getKeyID()));
+                                KeyFormattingUtils.convertKeyIdToHex(sKey.getKeyID()));
                         continue;
                     }
 
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
index 25840495e..e4df1c447 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/PgpSignEncrypt.java
@@ -39,6 +39,7 @@ import org.sufficientlysecure.keychain.provider.ProviderHelper;
 import org.sufficientlysecure.keychain.service.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog;
 import org.sufficientlysecure.keychain.service.results.SignEncryptResult;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.InputData;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.ProgressScaler;
@@ -389,13 +390,13 @@ public class PgpSignEncrypt {
                         CanonicalizedPublicKey key = keyRing.getEncryptionSubKey();
                         cPk.addMethod(key.getPubKeyEncryptionGenerator());
                         log.add(LogType.MSG_SE_KEY_OK, indent + 1,
-                                PgpKeyHelper.convertKeyIdToHex(id));
+                                KeyFormattingUtils.convertKeyIdToHex(id));
                     } catch (PgpGeneralException e) {
                         log.add(LogType.MSG_SE_KEY_WARN, indent + 1,
-                                PgpKeyHelper.convertKeyIdToHex(id));
+                                KeyFormattingUtils.convertKeyIdToHex(id));
                     } catch (ProviderHelper.NotFoundException e) {
                         log.add(LogType.MSG_SE_KEY_UNKNOWN, indent + 1,
-                                PgpKeyHelper.convertKeyIdToHex(id));
+                                KeyFormattingUtils.convertKeyIdToHex(id));
                     }
                 }
             }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
index 612077e34..cde25c19d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/pgp/UncachedKeyRing.java
@@ -33,11 +33,11 @@ import org.spongycastle.openpgp.PGPSignature;
 import org.spongycastle.openpgp.PGPSignatureList;
 import org.spongycastle.openpgp.PGPUtil;
 import org.spongycastle.openpgp.operator.jcajce.JcaKeyFingerprintCalculator;
-import org.spongycastle.util.Strings;
 import org.sufficientlysecure.keychain.Constants;
 import org.sufficientlysecure.keychain.pgp.exception.PgpGeneralException;
 import org.sufficientlysecure.keychain.service.results.OperationResult.LogType;
 import org.sufficientlysecure.keychain.service.results.OperationResult.OperationLog;
+import org.sufficientlysecure.keychain.ui.util.KeyFormattingUtils;
 import org.sufficientlysecure.keychain.util.IterableIterator;
 import org.sufficientlysecure.keychain.util.Log;
 import org.sufficientlysecure.keychain.util.Utf8Util;
@@ -261,7 +261,7 @@ public class UncachedKeyRing {
     public CanonicalizedKeyRing canonicalize(OperationLog log, int indent) {
 
         log.add(isSecret() ? LogType.MSG_KC_SECRET : LogType.MSG_KC_PUBLIC,
-                indent, PgpKeyHelper.convertKeyIdToHex(getMasterKeyId()));
+                indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId()));
         indent += 1;
 
         // do not accept v3 keys
@@ -286,7 +286,7 @@ public class UncachedKeyRing {
 
         {
             log.add(LogType.MSG_KC_MASTER,
-                    indent, PgpKeyHelper.convertKeyIdToHex(masterKey.getKeyID()));
+                    indent, KeyFormattingUtils.convertKeyIdToHex(masterKey.getKeyID()));
             indent += 1;
 
             PGPPublicKey modified = masterKey;
@@ -420,7 +420,7 @@ public class UncachedKeyRing {
                             // never mind any further for public keys, but remove them from secret ones
                             if (isSecret()) {
                                 log.add(LogType.MSG_KC_UID_FOREIGN,
-                                        indent, PgpKeyHelper.convertKeyIdToHex(certId));
+                                        indent, KeyFormattingUtils.convertKeyIdToHex(certId));
                                 modified = PGPPublicKey.removeCertification(modified, rawUserId, zert);
                                 badCerts += 1;
                             }
@@ -536,7 +536,7 @@ public class UncachedKeyRing {
                 continue;
             }
             log.add(LogType.MSG_KC_SUB,
-                    indent, PgpKeyHelper.convertKeyIdToHex(key.getKeyID()));
+                    indent, KeyFormattingUtils.convertKeyIdToHex(key.getKeyID()));
             indent += 1;
 
             if (Arrays.binarySearch(KNOWN_ALGORITHMS, key.getAlgorithm()) < 0) {
@@ -689,7 +689,7 @@ public class UncachedKeyRing {
                 ring = removeSubKey(ring, key);
 
                 log.add(LogType.MSG_KC_SUB_NO_CERT,
-                        indent, PgpKeyHelper.convertKeyIdToHex(key.getKeyID()));
+                        indent, KeyFormattingUtils.convertKeyIdToHex(key.getKeyID()));
                 indent -= 1;
                 continue;
             }
@@ -737,7 +737,7 @@ public class UncachedKeyRing {
     public UncachedKeyRing merge(UncachedKeyRing other, OperationLog log, int indent) {
 
         log.add(isSecret() ? LogType.MSG_MG_SECRET : LogType.MSG_MG_PUBLIC,
-                indent, PgpKeyHelper.convertKeyIdToHex(getMasterKeyId()));
+                indent, KeyFormattingUtils.convertKeyIdToHex(getMasterKeyId()));
         indent += 1;
 
         long masterKeyId = other.getMasterKeyId();