aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain
diff options
context:
space:
mode:
authorVincent Breitmoser <valodim@mugenguild.com>2015-10-29 15:08:57 +0100
committerVincent Breitmoser <valodim@mugenguild.com>2015-10-29 15:08:57 +0100
commit64a09a89451b09aaa54090c2e6373814edb5d0eb (patch)
treedd5e206e740bffbdc064722594747c81ac3444b3 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain
parenta1330f78e499840b386ea92e4280e9cdff9407f6 (diff)
downloadopen-keychain-64a09a89451b09aaa54090c2e6373814edb5d0eb.tar.gz
open-keychain-64a09a89451b09aaa54090c2e6373814edb5d0eb.tar.bz2
open-keychain-64a09a89451b09aaa54090c2e6373814edb5d0eb.zip
encrypttext: fix mimetype check logic (#1574)
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java3
1 files changed, 2 insertions, 1 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 201465b52..0afb942b5 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
@@ -28,6 +28,7 @@ import android.os.Bundle;
import android.support.v4.app.FragmentTransaction;
import android.widget.Toast;
+import org.apache.james.mime4j.util.MimeUtil;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.intents.OpenKeychainIntents;
@@ -64,7 +65,7 @@ public class EncryptTextActivity extends EncryptActivity {
Log.logDebugBundle(extras, "extras");
// When sending to OpenKeychain Encrypt via share menu
- if ("text/plain".equals(type)) {
+ if ( ! MimeUtil.isSameMimeType("text/plain", type)) {
Toast.makeText(this, R.string.toast_wrong_mimetype, Toast.LENGTH_LONG).show();
finish();
return;