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/remote/OpenPgpService.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/remote/OpenPgpService.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java index 20baf3a62..b2a9b50f0 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -53,6 +53,7 @@ import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpMetadata; import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.util.OpenPgpApi; +import org.openintents.openpgp.util.OpenPgpUtils.UserId; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.operations.BackupOperation; import org.sufficientlysecure.keychain.operations.results.DecryptVerifyResult; @@ -61,7 +62,6 @@ import org.sufficientlysecure.keychain.operations.results.OperationResult.LogEnt import org.sufficientlysecure.keychain.operations.results.PgpSignEncryptResult; import org.sufficientlysecure.keychain.pgp.CanonicalizedPublicKeyRing; import org.sufficientlysecure.keychain.pgp.KeyRing; -import org.sufficientlysecure.keychain.pgp.KeyRing.UserId; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyInputParcel; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerifyOperation; import org.sufficientlysecure.keychain.pgp.PgpSecurityConstants; |