diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-10 00:39:41 +0200 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2013-09-10 00:39:41 +0200 |
commit | 56e09b055013d18ff3a8b2131553d1668ee9c26b (patch) | |
tree | 18d8d9d678f38ba1145ae4886465a0bd04d20de6 /OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | |
parent | e7a42976516336c3c5ebd4fa9989398d65a81208 (diff) | |
download | open-keychain-56e09b055013d18ff3a8b2131553d1668ee9c26b.tar.gz open-keychain-56e09b055013d18ff3a8b2131553d1668ee9c26b.tar.bz2 open-keychain-56e09b055013d18ff3a8b2131553d1668ee9c26b.zip |
rename extra of import
Diffstat (limited to 'OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java')
-rw-r--r-- | OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java | 6 |
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(); |