aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-10-21 21:58:24 +0200
committerVincent Breitmoser <valodim@mugenguild.com>2015-10-21 21:58:24 +0200
commit1b98c07237660af0184879425e741b2b06f18132 (patch)
tree1bdf1cc8efcc574e6e8bfe601ebf75e922d2e6fe /OpenKeychain/src/main/java/org/sufficientlysecure
parenta4b99ae3506545a675918bb3f182b9b142e6654b (diff)
downloadopen-keychain-1b98c07237660af0184879425e741b2b06f18132.tar.gz
open-keychain-1b98c07237660af0184879425e741b2b06f18132.tar.bz2
open-keychain-1b98c07237660af0184879425e741b2b06f18132.zip
encrypttext: localization, and truncate overlong input
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java8
1 files changed, 6 insertions, 2 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);