diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-24 02:01:53 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-24 02:01:53 +0200 |
| commit | b373c866e74adb2ee5c27479b6fac75d9e6f76fc (patch) | |
| tree | fea6d6ce670a7c132310f72d354a3bbce7f2a129 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote | |
| parent | f7d49a48cb0a8f26261ebb67c053f2d7f6e8d55d (diff) | |
| download | open-keychain-b373c866e74adb2ee5c27479b6fac75d9e6f76fc.tar.gz open-keychain-b373c866e74adb2ee5c27479b6fac75d9e6f76fc.tar.bz2 open-keychain-b373c866e74adb2ee5c27479b6fac75d9e6f76fc.zip | |
Merge openpgp-card lib into OpenKeychain, it was already depending on OK, no need to separate
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | 3 |
1 files changed, 1 insertions, 2 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 1b4ad1fc1..8a115b245 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java @@ -31,10 +31,9 @@ import org.openintents.openpgp.OpenPgpError; import org.openintents.openpgp.OpenPgpSignatureResult; import org.openintents.openpgp.util.OpenPgpApi; import org.spongycastle.util.encoders.Hex; -import org.sufficientlysecure.keychain.nfc.NfcActivity; +import org.sufficientlysecure.keychain.ui.NfcActivity; import org.sufficientlysecure.keychain.Constants; import org.sufficientlysecure.keychain.pgp.PassphraseCacheInterface; -import org.sufficientlysecure.keychain.pgp.PassphraseCacheInterface.NoSecretKeyException; import org.sufficientlysecure.keychain.pgp.PgpDecryptVerify; import org.sufficientlysecure.keychain.provider.CachedPublicKeyRing; import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; |