diff options
author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-05 13:09:59 +0100 |
---|---|---|
committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-05 13:09:59 +0100 |
commit | 09ae50cc560646be5eb5aed46ef03e5d9b588613 (patch) | |
tree | af66b8618ddf26d44e22feaeee2191db5d65d996 /OpenPGP-Keychain/src | |
parent | 25080f45b1e094141c98ee04c6cb495dcdb0baaf (diff) | |
download | open-keychain-09ae50cc560646be5eb5aed46ef03e5d9b588613.tar.gz open-keychain-09ae50cc560646be5eb5aed46ef03e5d9b588613.tar.bz2 open-keychain-09ae50cc560646be5eb5aed46ef03e5d9b588613.zip |
keyserver instead of key server
Diffstat (limited to 'OpenPGP-Keychain/src')
11 files changed, 29 insertions, 30 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java index c60b1c2ed..ba6d7aa49 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/CertifyKeyActivity.java @@ -242,7 +242,7 @@ public class CertifyKeyActivity extends ActionBarActivity implements // check if we need to send the key to the server or not if (mUploadKeyCheckbox.isChecked()) { - // upload the newly signed key to the key server + // upload the newly signed key to the keyserver uploadKey(); } else { setResult(RESULT_OK); diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index 51c7c3257..3dd077d12 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/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); } diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java index 611883a86..e0f25b632 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysActivity.java +++ b/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 - + "IMPORT_KEY_FROM_KEY_SERVER"; - public static final String ACTION_IMPORT_KEY_FROM_KEY_SERVER_AND_RETURN = Constants.INTENT_PREFIX + public static final String ACTION_IMPORT_KEY_FROM_KEYSERVER = Constants.INTENT_PREFIX + + "IMPORT_KEY_FROM_KEYSERVER"; + 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); @@ -173,7 +173,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa return; } - // display key server fragment with query + // display keyserver fragment with query Bundle args = new Bundle(); args.putString(ImportKeysServerFragment.ARG_QUERY, query); loadNavFragment(0, args); @@ -288,7 +288,7 @@ public class ImportKeysActivity extends DrawerActivity implements ActionBar.OnNa String query = "0x" + fingerprint; - // display key server fragment with query + // display keyserver fragment with query Bundle args = new Bundle(); args.putString(ImportKeysServerFragment.ARG_QUERY, query); loadNavFragment(0, args); diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java index cfcb202b9..b52de5bc9 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ImportKeysListFragment.java @@ -122,7 +122,7 @@ public class ImportKeysListFragment extends ListFragment implements mKeyBytes = getArguments().getByteArray(ARG_BYTES); mServerQuery = getArguments().getString(ARG_SERVER_QUERY); - // TODO: this is used when scanning QR Code. Currently it simply uses key server nr 0 + // TODO: this is used when scanning QR Code. Currently it simply uses keyserver nr 0 mKeyServer = Preferences.getPreferences(getActivity()) .getKeyServers()[0]; diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java index e3881503b..550d3047d 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/UploadKeyActivity.java @@ -40,7 +40,7 @@ import android.widget.Toast; import com.beardedhen.androidbootstrap.BootstrapButton; /** - * Sends the selected public key to a key server + * Sends the selected public key to a keyserver */ public class UploadKeyActivity extends ActionBarActivity { private BootstrapButton mUploadButton; diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java index 1f4afcd8b..4d9d49c07 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/ViewKeyActivity.java +++ b/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! diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java index 753994450..b3bc39127 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/ui/adapter/ImportKeysListServerLoader.java @@ -79,7 +79,7 @@ public class ImportKeysListServerLoader extends AsyncTaskLoader<List<ImportKeysL } /** - * Query key server + * Query keyserver */ private void queryServer(String query, String keyServer) { HkpKeyServer server = new HkpKeyServer(keyServer); diff --git a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html index b11adda4d..0faf0eb5e 100644 --- a/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-de/help_changelog.html @@ -6,7 +6,7 @@ <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> <li>more internal fixes when editing keys (thanks to Ash Hughes)</li> -<li>querying key servers directly from the import screen</li> +<li>querying keyservers directly from the import screen</li> <li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> diff --git a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html index 583ee25f4..d42a1fbfd 100644 --- a/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw-es/help_changelog.html @@ -6,7 +6,7 @@ <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> <li>more internal fixes when editing keys (thanks to Ash Hughes)</li> -<li>querying key servers directly from the import screen</li> +<li>querying keyservers directly from the import screen</li> <li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> diff --git a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html index 7bb558a24..17ad853de 100644 --- a/OpenPGP-Keychain/src/main/res/raw/help_changelog.html +++ b/OpenPGP-Keychain/src/main/res/raw/help_changelog.html @@ -10,7 +10,7 @@ And don't add newlines before or after p tags because of transifex --> <li>remove unnecessary export of public keys when exporting secret key (thanks to Ash Hughes)</li> <li>fix setting expiry dates on keys (thanks to Ash Hughes)</li> <li>more internal fixes when editing keys (thanks to Ash Hughes)</li> -<li>querying key servers directly from the import screen</li> +<li>querying keyservers directly from the import screen</li> <li>fix layout and dialog style on Android 2.2-3.0</li> <li>fix crash on keys with empty user ids</li> <li>fix crash and empty lists when coming back from signing screen</li> @@ -55,7 +55,7 @@ And don't add newlines before or after p tags because of transifex --> <h2>1.0.8</h2> <ul> -<li>basic key server support</li> +<li>basic keyserver support</li> <li>app2sd</li> <li>more choices for pass phrase cache: 1, 2, 4, 8, hours</li> <li>translations: Norwegian (thanks, Sander Danielsen), Chinese (thanks, Zhang Fredrick)</li> diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 559b04469..ce919c8f0 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/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_send_key">Upload to Key Server</string> + <string name="title_key_server_query">Query Keyserver</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> @@ -80,8 +80,8 @@ <string name="menu_create_key">Create key</string> <string name="menu_create_key_expert">Create key (expert)</string> <string name="menu_search">Search</string> - <string name="menu_key_server">Import from key server</string> - <string name="menu_update_key">Update from key server</string> + <string name="menu_key_server">Import from keyserver</string> + <string name="menu_update_key">Update from keyserver</string> <string name="menu_export_key_to_server">Upload to key server</string> <string name="menu_share">Share</string> <string name="menu_share_title_fingerprint">Share fingerprint…</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> @@ -127,7 +127,7 @@ <string name="label_name">Name</string> <string name="label_comment">Comment</string> <string name="label_email">Email</string> - <string name="label_send_key">Upload key to selected key server after certification</string> + <string name="label_send_key">Upload key to selected keyserver after certification</string> <string name="label_fingerprint">Fingerprint</string> <string name="select_keys_button_default">Select</string> @@ -146,8 +146,8 @@ <string name="revoked">revoked</string> <plurals name="n_key_servers"> - <item quantity="one">%d key server</item> - <item quantity="other">%d key servers</item> + <item quantity="one">%d keyserver</item> + <item quantity="other">%d keyservers</item> </plurals> <string name="fingerprint">Fingerprint:</string> |