aboutsummaryrefslogtreecommitdiffstats
path: root/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r--OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
index 40ab80856..a52d2b435 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java
@@ -59,7 +59,7 @@ public class ImportKeysActivity extends SherlockFragmentActivity {
+ "IMPORT_KEY_FROM_NFC";
// only used by IMPORT
- public static final String EXTRA_KEYRING_BYTES = "keyring_bytes";
+ public static final String EXTRA_KEY_BYTES = "key_bytes";
// TODO: import keys from server
// public static final String EXTRA_KEY_ID = "keyId";
@@ -162,8 +162,8 @@ public class ImportKeysActivity extends SherlockFragmentActivity {
if ("file".equals(intent.getScheme()) && intent.getDataString() != null) {
mImportFilename = intent.getData().getPath();
mImportData = null;
- } else if (extras.containsKey(EXTRA_KEYRING_BYTES)) {
- mImportData = intent.getByteArrayExtra(EXTRA_KEYRING_BYTES);
+ } else if (extras.containsKey(EXTRA_KEY_BYTES)) {
+ mImportData = intent.getByteArrayExtra(EXTRA_KEY_BYTES);
mImportFilename = null;
}
loadKeyListFragment();