cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

encrypttext: localization, and truncate overlong input

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-10-21 21:58:24 +02:00
parent a4b99ae350
commit 1b98c07237
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@@ -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);

4
OpenKeychain/src/main/res/values/strings.xml
View File

@@ -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>