From 56e09b055013d18ff3a8b2131553d1668ee9c26b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Tue, 10 Sep 2013 00:39:41 +0200
Subject: [PATCH] rename extra of import

---
 .../sufficientlysecure/keychain/ui/ImportKeysActivity.java  | 6 +++---
 .../keychain/ui/KeyServerQueryActivity.java                 | 2 +-
 .../keychain/ui/ShareNfcBeamActivity.java                   | 2 +-
 README.md                                                   | 4 ++--
 4 files changed, 7 insertions(+), 7 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();
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
index 85f16600f..7c3112693 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/KeyServerQueryActivity.java
@@ -228,7 +228,7 @@ public class KeyServerQueryActivity extends SherlockFragmentActivity {
                                 Intent intent = new Intent(KeyServerQueryActivity.this,
                                         ImportKeysActivity.class);
                                 intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY);
-                                intent.putExtra(ImportKeysActivity.EXTRA_KEYRING_BYTES, mKeyData.getBytes());
+                                intent.putExtra(ImportKeysActivity.EXTRA_KEY_BYTES, mKeyData.getBytes());
                                 startActivity(intent);
                             }
                         }
diff --git a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareNfcBeamActivity.java b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareNfcBeamActivity.java
index 73cdce598..ded5455d4 100644
--- a/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareNfcBeamActivity.java
+++ b/OpenPGP-Keychain/src/org/sufficientlysecure/keychain/ui/ShareNfcBeamActivity.java
@@ -116,7 +116,7 @@ public class ShareNfcBeamActivity extends SherlockFragmentActivity implements
 
         Intent importIntent = new Intent(this, ImportKeysActivity.class);
         importIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY);
-        importIntent.putExtra(ImportKeysActivity.EXTRA_KEYRING_BYTES, receivedKeyringBytes);
+        importIntent.putExtra(ImportKeysActivity.EXTRA_KEY_BYTES, receivedKeyringBytes);
 
         finish();
 
diff --git a/README.md b/README.md
index 80b460cd1..c3b7c153d 100644
--- a/README.md
+++ b/README.md
@@ -67,12 +67,12 @@ OpenPGP Keychain specific Intent actions:
 * ``org.sufficientlysecure.keychain.action.DECRYPT_FILE``
   * Include data ``Uri`` (``intent.setData()``) pointing to a file or content provider
 * ``org.sufficientlysecure.keychain.action.IMPORT_KEY``
-  * Extras: ``keyring_bytes`` (type: ``byte[]``)
+  * Extras: ``key_bytes`` (type: ``byte[]``)
   * or Uri in data with file schema
 * ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE``
   * without extras starts Barcode Scanner to get QR Code
 
-## Remote Serive API
+## Remote Service API
 To do asyncronous fast encryption/decryption/sign/verify operations bind to the remote service.
 The API Demo contains all required AIDL files and a demo activity.