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

This commit is contained in:
Vincent Breitmoser
2015-09-17 13:45:32 +02:00
2 changed files with 6 additions and 1 deletions

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