diff options
author | Alex Fong <alexfongg@gmail.com> | 2016-05-15 23:22:08 +0800 |
---|---|---|
committer | Alex Fong <alexfongg@gmail.com> | 2016-05-15 23:26:09 +0800 |
commit | 614f46a630e5ce29926ad000edadf7e158c0d4b2 (patch) | |
tree | debcf009104ee1a8fc7dc0252f96f794e363003a /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java | |
parent | 664386afece0cfb4d6db214e786406b5ad632da7 (diff) | |
download | open-keychain-614f46a630e5ce29926ad000edadf7e158c0d4b2.tar.gz open-keychain-614f46a630e5ce29926ad000edadf7e158c0d4b2.tar.bz2 open-keychain-614f46a630e5ce29926ad000edadf7e158c0d4b2.zip |
Shifted duplicate method implementations from KeyRing to openpgp-api submodule
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java index 4dc0ebaa0..64a960d7b 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/util/KeyFormattingUtils.java @@ -37,6 +37,7 @@ import org.bouncycastle.asn1.nist.NISTNamedCurves; import org.bouncycastle.asn1.teletrust.TeleTrusTNamedCurves; import org.bouncycastle.bcpg.PublicKeyAlgorithmTags; import org.bouncycastle.util.encoders.Hex; +import org.openintents.openpgp.util.OpenPgpUtils; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.R; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; @@ -593,7 +594,7 @@ public class KeyFormattingUtils { holder.getSignatureAction().setDisplayedChild(sigActionDisplayedChild); String userId = result.getSignatureResult().getPrimaryUserId(); - KeyRing.UserId userIdSplit = KeyRing.splitUserId(userId); + OpenPgpUtils.UserId userIdSplit = KeyRing.splitUserId(userId); if (userIdSplit.name != null) { holder.getSignatureUserName().setText(userIdSplit.name); } else { |