diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-15 14:10:40 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2016-02-22 15:06:45 +0100 |
commit | eef27a544f5101d4fa46e9246d74b2b7db65ce73 (patch) | |
tree | 7f44a261c6e2490788aee7c03fd2aac2ced2bea0 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/remote/OpenPgpService.java | |
parent | c9018e1844293eb2c47f642c5940531a3496dce5 (diff) | |
download | open-keychain-eef27a544f5101d4fa46e9246d74b2b7db65ce73.tar.gz open-keychain-eef27a544f5101d4fa46e9246d74b2b7db65ce73.tar.bz2 open-keychain-eef27a544f5101d4fa46e9246d74b2b7db65ce73.zip |
Extract service parts from SecurityTokenOperationActivity
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 | 9 |
1 files changed, 5 insertions, 4 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 e1d0728d1..263668be5 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.sufficientlysecure.keychain.provider.KeychainContract.ApiAccounts; import org.sufficientlysecure.keychain.provider.KeychainContract.KeyRings; import org.sufficientlysecure.keychain.provider.KeychainDatabase.Tables; import org.sufficientlysecure.keychain.provider.ProviderHelper; +import org.sufficientlysecure.keychain.remote.ui.RemoteSecurityTokenOperationActivity; import org.sufficientlysecure.keychain.remote.ui.RemoteSelectPubKeyActivity; import org.sufficientlysecure.keychain.remote.ui.SelectAllowedKeysActivity; import org.sufficientlysecure.keychain.remote.ui.SelectSignKeyIdActivity; @@ -191,11 +192,11 @@ public class OpenPgpService extends Service { case NFC_DECRYPT: case NFC_SIGN: { // build PendingIntent for Security Token NFC operations - Intent intent = new Intent(context, SecurityTokenOperationActivity.class); + Intent intent = new Intent(context, RemoteSecurityTokenOperationActivity.class); // pass params through to activity that it can be returned again later to repeat pgp operation - intent.putExtra(SecurityTokenOperationActivity.EXTRA_SERVICE_INTENT, data); - intent.putExtra(SecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput); - intent.putExtra(SecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput); + intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_SERVICE_INTENT, data); + intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_REQUIRED_INPUT, requiredInput); + intent.putExtra(RemoteSecurityTokenOperationActivity.EXTRA_CRYPTO_INPUT, cryptoInput); return PendingIntent.getActivity(context, 0, intent, PendingIntent.FLAG_CANCEL_CURRENT); } |