diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 13:00:47 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-02-15 13:00:47 +0100 |
| commit | 52f1c930ebe98251fb9d3b34b2725087f2917f64 (patch) | |
| tree | ee5543854ced499c282892223674bd9b4c73266f /OpenPGP-Keychain/src | |
| parent | 3b0f76bf60028603140c3fd8a956241b315a6b18 (diff) | |
| download | open-keychain-52f1c930ebe98251fb9d3b34b2725087f2917f64.tar.gz open-keychain-52f1c930ebe98251fb9d3b34b2725087f2917f64.tar.bz2 open-keychain-52f1c930ebe98251fb9d3b34b2725087f2917f64.zip | |
parse string util method, better help text for access screen
Diffstat (limited to 'OpenPGP-Keychain/src')
| -rw-r--r-- | OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java | 3 | ||||
| -rw-r--r-- | OpenPGP-Keychain/src/main/res/values/strings.xml | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java index b1635ec10..5362aa603 100644 --- a/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java +++ b/OpenPGP-Keychain/src/main/java/org/sufficientlysecure/keychain/service/remote/OpenPgpService.java @@ -138,7 +138,8 @@ public class OpenPgpService extends RemoteService { // TODO: asciiArmor?! - private Bundle signImpl(Bundle params, ParcelFileDescriptor input, ParcelFileDescriptor output, AppSettings appSettings) { + private Bundle signImpl(Bundle params, ParcelFileDescriptor input, ParcelFileDescriptor output, + AppSettings appSettings) { try { // get passphrase from cache, if key has "no" passphrase, this returns an empty String String passphrase; diff --git a/OpenPGP-Keychain/src/main/res/values/strings.xml b/OpenPGP-Keychain/src/main/res/values/strings.xml index 2a0b4b6f9..0608b108f 100644 --- a/OpenPGP-Keychain/src/main/res/values/strings.xml +++ b/OpenPGP-Keychain/src/main/res/values/strings.xml @@ -383,7 +383,7 @@ <string name="api_settings_revoke">Revoke access</string> <string name="api_settings_package_name">Package Name</string> <string name="api_settings_package_signature">SHA-256 of Package Signature</string> - <string name="api_register_text">The following application requests access to OpenPGP Keychain.\n\nAllow access (you can revoke it later)?</string> + <string name="api_register_text">The displayed application requests access to OpenPGP Keychain.\nAllow access?\n\nWARNING: If you do not know why this screen appeared, disallow access! You can revoke access later using the \'Registered Applications\' screen.</string> <string name="api_register_allow">Allow access</string> <string name="api_register_disallow">Disallow access</string> <string name="api_register_error_select_key">Please select a key!</string> |