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

1 files changed, 4 insertions, 3 deletions

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));
                     }
                 }
             }