1 files changed, 29 insertions, 4 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..50dbc9a8b 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;
@@ -59,12 +60,15 @@ public class EncryptTextActivity extends EncryptActivity {
             extras = new Bundle();
         }
 
+        String textData = extras.getString(EXTRA_TEXT);
+        boolean returnProcessText = false;
+
         // When sending to OpenKeychain Encrypt via share menu
         if (Intent.ACTION_SEND.equals(action) && type != null) {
             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;
@@ -94,12 +98,33 @@ public class EncryptTextActivity extends EncryptActivity {
                 }
                 // handle like normal text encryption, override action and extras to later
                 // executeServiceMethod ACTION_ENCRYPT_TEXT in main actions
-                extras.putString(EXTRA_TEXT, sharedText);
+                textData = sharedText;
             }
 
         }
 
-        String textData = extras.getString(EXTRA_TEXT);
+        // Android 6, PROCESS_TEXT Intent
+        if (Intent.ACTION_PROCESS_TEXT.equals(action) && type != null) {
+
+            String sharedText = null;
+            if (extras.containsKey(Intent.EXTRA_PROCESS_TEXT)) {
+                sharedText = extras.getString(Intent.EXTRA_PROCESS_TEXT);
+                returnProcessText = true;
+            } else  if (extras.containsKey(Intent.EXTRA_PROCESS_TEXT_READONLY)) {
+                sharedText = extras.getString(Intent.EXTRA_PROCESS_TEXT_READONLY);
+            }
+
+            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
+                textData = sharedText;
+            }
+        }
+
         if (textData == null) {
             textData = "";
         }
@@ -107,7 +132,7 @@ public class EncryptTextActivity extends EncryptActivity {
         if (savedInstanceState == null) {
             FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
 
-            EncryptTextFragment encryptFragment = EncryptTextFragment.newInstance(textData);
+            EncryptTextFragment encryptFragment = EncryptTextFragment.newInstance(textData, returnProcessText);
             transaction.replace(R.id.encrypt_text_container, encryptFragment);
             transaction.commit();
         }