keyserver instead of key server

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java

@@ -60,7 +60,6 @@ import android.view.animation.AnimationUtils;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ImageView;
-import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 import android.widget.Toast;
@@ -247,7 +246,7 @@ public class DecryptActivity extends DrawerActivity {
                         DecryptActivity.this, mSignatureKeyId);
                 if (key != null) {
                     Intent intent = new Intent(DecryptActivity.this, ImportKeysActivity.class);
-                    intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEY_SERVER);
+                    intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER);
                     intent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, mSignatureKeyId);
                     startActivity(intent);
                 }
@@ -596,7 +595,7 @@ public class DecryptActivity extends DrawerActivity {
 
     private void lookupUnknownKey(long unknownKeyId) {
         Intent intent = new Intent(this, ImportKeysActivity.class);
-        intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEY_SERVER);
+        intent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER);
         intent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, unknownKeyId);
         startActivityForResult(intent, RESULT_CODE_LOOKUP_KEY);
     }

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java

@@ -55,9 +55,9 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
     public static final String ACTION_IMPORT_KEY = Constants.INTENT_PREFIX + "IMPORT_KEY";
     public static final String ACTION_IMPORT_KEY_FROM_QR_CODE = Constants.INTENT_PREFIX
             + "IMPORT_KEY_FROM_QR_CODE";
-    public static final String ACTION_IMPORT_KEY_FROM_KEY_SERVER = Constants.INTENT_PREFIX
+    public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER = Constants.INTENT_PREFIX
-            + "IMPORT_KEY_FROM_KEY_SERVER";
+            + "IMPORT_KEY_FROM_KEYSERVER";
-    public static final String ACTION_IMPORT_KEY_FROM_KEY_SERVER_AND_RETURN = Constants.INTENT_PREFIX
+    public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER_AND_RETURN = Constants.INTENT_PREFIX
             + "IMPORT_KEY_FROM_KEY_SERVER_AND_RETURN";
 
     // Actions for internal use only:
@@ -69,7 +69,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
     // only used by ACTION_IMPORT_KEY
     public static final String EXTRA_KEY_BYTES = "key_bytes";
 
-    // only used by ACTION_IMPORT_KEY_FROM_KEY_SERVER
+    // only used by ACTION_IMPORT_KEY_FROM_KEYSERVER
     public static final String EXTRA_QUERY = "query";
     public static final String EXTRA_KEY_ID = "key_id";
     public static final String EXTRA_FINGERPRINT = "fingerprint";
@@ -154,7 +154,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa
                 // action: directly load data
                 startListFragment(savedInstanceState, importData, null, null);
             }
-        } else if (ACTION_IMPORT_KEY_FROM_KEY_SERVER.equals(action)) {
+        } else if (ACTION_IMPORT_KEY_FROM_KEYSERVER.equals(action)) {
             String query = null;
             if (extras.containsKey(EXTRA_QUERY)) {
                 query = extras.getString(EXTRA_QUERY);

OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java

@@ -398,7 +398,7 @@ public class ViewKeyActivity extends ActionBarActivity implements
         }
 
         Intent queryIntent = new Intent(this, ImportKeysActivity.class);
-        queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEY_SERVER);
+        queryIntent.setAction(ImportKeysActivity.ACTION_IMPORT_KEY_FROM_KEYSERVER);
         queryIntent.putExtra(ImportKeysActivity.EXTRA_KEY_ID, updateKeyId);
 
         // TODO: lookup with onactivityresult!

OpenPGP-Keychain/src/main/res/values/strings.xml

@@ -13,7 +13,7 @@
     <string name="title_edit_key">Edit Key</string>
     <string name="title_preferences">Preferences</string>
     <string name="title_api_registered_apps">Registered Applications</string>
-    <string name="title_key_server_preference">Key Server Preference</string>
+    <string name="title_key_server_preference">Keyserver Preference</string>
     <string name="title_change_pass_phrase">Change Passphrase</string>
     <string name="title_set_passphrase">Set Passphrase</string>
     <string name="title_send_email">"Send Mail…"</string>
@@ -23,8 +23,8 @@
     <string name="title_export_key">Export Key</string>
     <string name="title_export_keys">Export Keys</string>
     <string name="title_key_not_found">Key Not Found</string>
-    <string name="title_key_server_query">Query Key Server</string>
+    <string name="title_key_server_query">Query Keyserver</string>
-    <string name="title_send_key">Upload to Key Server</string>
+    <string name="title_send_key">Upload to Keyserver</string>
     <string name="title_unknown_signature_key">Unknown Signature Key</string>
     <string name="title_certify_key">Certify Key</string>
     <string name="title_key_details">Key Details</string>
@@ -41,7 +41,7 @@
     <string name="section_actions">Actions</string>
     <string name="section_certification_key">Your Key used for certification</string>
     <string name="section_upload_key">Upload Key</string>
-    <string name="section_key_server">Key Server</string>
+    <string name="section_key_server">Keyserver</string>
     <string name="section_encrypt_and_or_sign">Encrypt and/or Sign</string>
     <string name="section_decrypt_verify">Decrypt and Verify</string>
 
@@ -60,7 +60,7 @@
     <string name="btn_change_passphrase">Change Passphrase</string>
     <string name="btn_set_passphrase">Set Passphrase</string>
     <string name="btn_search">Search</string>
-    <string name="btn_export_to_server">Upload To Key Server</string>
+    <string name="btn_export_to_server">Upload To Keyserver</string>
     <string name="btn_next">Next</string>
     <string name="btn_back">Back</string>
     <string name="btn_clipboard">Clipboard</string>
@@ -117,7 +117,7 @@
     <string name="label_message_compression">Message Compression</string>
     <string name="label_file_compression">File Compression</string>
     <string name="label_force_v3_signature">Force V3 Signatures</string>
-    <string name="label_key_servers">Key Servers</string>
+    <string name="label_key_servers">Keyservers</string>
     <string name="label_key_id">Key ID</string>
     <string name="label_creation">Creation</string>
     <string name="label_expiry">Expiry</string>

README.md

@@ -74,7 +74,7 @@ To do automatic encryption/decryption/sign/verify use the OpenPGP Remote API.
 * ``org.sufficientlysecure.keychain.action.IMPORT_KEY``
   * Extras: ``key_bytes`` (type: ``byte[]``)
   * or set data ``Uri`` (``intent.setData()``) pointing to a file
-* ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEY_SERVER``
+* ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_KEYSERVER``
   * Extras: ``query`` (type: ``String``)
   * or ``fingerprint`` (type: ``String``)
 * ``org.sufficientlysecure.keychain.action.IMPORT_KEY_FROM_QR_CODE``