diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-21 21:58:24 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-10-21 21:58:24 +0200 |
| commit | 1b98c07237660af0184879425e741b2b06f18132 (patch) | |
| tree | 1bdf1cc8efcc574e6e8bfe601ebf75e922d2e6fe /OpenKeychain | |
| parent | a4b99ae3506545a675918bb3f182b9b142e6654b (diff) | |
| download | open-keychain-1b98c07237660af0184879425e741b2b06f18132.tar.gz open-keychain-1b98c07237660af0184879425e741b2b06f18132.tar.bz2 open-keychain-1b98c07237660af0184879425e741b2b06f18132.zip | |
encrypttext: localization, and truncate overlong input
Diffstat (limited to 'OpenKeychain')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 8 | ||||
| -rw-r--r-- | OpenKeychain/src/main/res/values/strings.xml | 4 |
2 files changed, 9 insertions, 3 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java index 6a7955fc5..201465b52 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -65,7 +65,7 @@ public class EncryptTextActivity extends EncryptActivity { // When sending to OpenKeychain Encrypt via share menu if ("text/plain".equals(type)) { - Toast.makeText(this, "Wrong data type, expected text!", Toast.LENGTH_LONG).show(); + Toast.makeText(this, R.string.toast_wrong_mimetype, Toast.LENGTH_LONG).show(); finish(); return; } @@ -82,12 +82,16 @@ public class EncryptTextActivity extends EncryptActivity { return; } } else { - Toast.makeText(this, "No text in shared data!", Toast.LENGTH_LONG).show(); + Toast.makeText(this, R.string.toast_no_text, Toast.LENGTH_LONG).show(); finish(); return; } if (sharedText != null) { + if (sharedText.length() > Constants.TEXT_LENGTH_LIMIT) { + sharedText = sharedText.substring(0, Constants.TEXT_LENGTH_LIMIT); + Notify.create(this, R.string.snack_shared_text_too_long, Style.WARN).show(); + } // handle like normal text encryption, override action and extras to later // executeServiceMethod ACTION_ENCRYPT_TEXT in main actions extras.putString(EXTRA_TEXT, sharedText); diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml index 4df144531..ea34a77a5 100644 --- a/OpenKeychain/src/main/res/values/strings.xml +++ b/OpenKeychain/src/main/res/values/strings.xml @@ -1664,11 +1664,13 @@ <string name="snack_backup_saved_dir">"Saved to OpenKeychain directory"</string> <string name="btn_backup_back">Go back to check</string> <string name="snack_text_too_long">"Text is too long to show in full!"</string> + <string name="snack_shared_text_too_long">"Shared text was cut because it was too long!"</string> <string name="share_log_dialog_title">"Share log?"</string> <string name="share_log_dialog_message">"While logs can be super helpful for developers to find bugs in OpenKeychain, they can contain potential sensitive information such as data about the updated keys. Please make sure you are okay with sharing this information."</string> <string name="share_log_dialog_share_button">"Share"</string> <string name="share_log_dialog_cancel_button">"Cancel"</string> - + <string name="toast_wrong_mimetype">"Wrong data type, expected text!"</string> + <string name="toast_no_text">"No text in shared data!"</string> </resources> |