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

Merge branch 'mime4j' of github.com:open-keychain/open-keychain into mime4j

Browse Source
This commit is contained in:
Vincent Breitmoser
2015-09-17 13:45:32 +02:00
parent 7da80c84b7 acbb857f24
commit 142a71480e
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java
View File

@@ -162,6 +162,10 @@ public class DecryptActivity extends BaseActivity {
Uri uri = intent.getData();
if (uri != null) {
if ("com.fsck.k9.attachmentprovider".equals(uri.getHost())) {
Toast.makeText(this, R.string.error_reading_k9, Toast.LENGTH_LONG).show();
}
if ("com.android.email.attachmentprovider".equals(uri.getHost())) {
Toast.makeText(this, R.string.error_reading_aosp, Toast.LENGTH_LONG).show();
finish();

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

@@ -1540,7 +1540,8 @@
<string name="error_loading_keys">"Error loading keys!"</string>
<string name="error_empty_log">"(error, empty log)"</string>
<string name="error_reading_text">"Could not read input to decrypt!"</string>
<string name="error_reading_aosp">"Failed reading data, this is a bug in the Android E-Mail client!"</string>
<string name="error_reading_aosp">"Failed reading data, this is a bug in the Android E-Mail client! (Issue #290)"</string>
<string name="error_reading_k9">"If decryption fails, press 'Download complete message' in K-9 Mail!"</string>
<string name="filename_unknown">Unknown filename (click to open)</string>
<string name="filename_unknown_text">Text (click to show)</string>
<string name="intent_show">Show Signed/Encrypted Content</string>