From 8f070e24500616a78ed332fc7659e3d6b10860bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= <dominik@dominikschuermann.de>
Date: Mon, 2 Nov 2015 19:15:00 +0100
Subject: [PATCH] Support for Android 6 ACTION_PROCESS_TEXT

---
 .../drawables/ic_action_encrypt_paste.svg     |  59 ++++++++++++++++++
 Graphics/drawables/ic_action_encrypt_save.svg |  11 ++--
 .../drawables/originals/content-paste.svg     |   1 +
 Graphics/update-drawables.sh                  |   2 +-
 OpenKeychain/src/main/AndroidManifest.xml     |   6 ++
 .../keychain/ui/EncryptTextActivity.java      |  30 ++++++++-
 .../keychain/ui/EncryptTextFragment.java      |  22 ++++++-
 .../ic_action_encrypt_paste_24dp.png          | Bin 0 -> 590 bytes
 .../ic_action_encrypt_paste_24dp.png          | Bin 0 -> 433 bytes
 .../ic_action_encrypt_paste_24dp.png          | Bin 0 -> 684 bytes
 .../status_signature_expired_cutout_96dp.png  | Bin 0 -> 4973 bytes
 .../ic_action_encrypt_paste_24dp.png          | Bin 0 -> 986 bytes
 .../ic_action_encrypt_paste_24dp.png          | Bin 0 -> 1290 bytes
 .../main/res/menu/encrypt_text_fragment.xml   |   8 +++
 OpenKeychain/src/main/res/values/strings.xml  |   1 +
 15 files changed, 130 insertions(+), 10 deletions(-)
 create mode 100644 Graphics/drawables/ic_action_encrypt_paste.svg
 create mode 100644 Graphics/drawables/originals/content-paste.svg
 create mode 100644 OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_paste_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_paste_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_paste_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_paste_24dp.png
 create mode 100644 OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_paste_24dp.png

diff --git a/Graphics/drawables/ic_action_encrypt_paste.svg b/Graphics/drawables/ic_action_encrypt_paste.svg
new file mode 100644
index 000000000..588c1d2ca
--- /dev/null
+++ b/Graphics/drawables/ic_action_encrypt_paste.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   inkscape:version="0.48.5 r10040"
+   sodipodi:docname="ic_action_encrypt_paste.svg">
+  <metadata
+     id="metadata10">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs8" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="2558"
+     inkscape:window-height="1419"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="9.8333333"
+     inkscape:cx="0.10169504"
+     inkscape:cy="12"
+     inkscape:window-x="0"
+     inkscape:window-y="19"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <path
+     id="path3076"
+     d="m 17.363197,9.8980016 a 0.84079901,0.84079901 0 0 0 0.840798,-0.8408 c 0,-0.466643 -0.378359,-0.840799 -0.840798,-0.840799 a 0.84079901,0.84079901 0 0 0 -0.8408,0.840799 0.84079901,0.84079901 0 0 0 0.8408,0.8408 m 2.522396,-3.783596 a 0.84079901,0.84079901 0 0 1 0.8408,0.840799 V 11.159199 A 0.84079901,0.84079901 0 0 1 19.885593,12 H 14.840799 A 0.84079901,0.84079901 0 0 1 14,11.159199 V 6.9552046 c 0,-0.466644 0.37836,-0.840799 0.840799,-0.840799 h 0.4204 v -0.840799 a 2.1019975,2.1019975 0 0 1 2.101998,-2.101997 2.1019975,2.1019975 0 0 1 2.101997,2.101997 v 0.840799 h 0.420399 m -2.522396,-2.101998 a 1.2611986,1.2611986 0 0 0 -1.261198,1.261199 v 0.840799 h 2.522396 v -0.840799 a 1.2611986,1.2611986 0 0 0 -1.261198,-1.261199 z"
+     inkscape:connector-curvature="0"
+     style="fill:#000000" />
+  <path
+     id="path3053"
+     d="M 15.283513,19.502312 H 6.4607096 V 9.4191068 H 7.7211105 V 11.309707 H 14.023111 V 9.4191068 h 1.260402 M 10.87211,8.1587061 a 0.63020031,0.63020031 0 0 1 0.630201,0.6302004 0.63020031,0.63020031 0 0 1 -0.630201,0.6302003 0.63020031,0.63020031 0 0 1 -0.6302,-0.6302003 0.63020031,0.63020031 0 0 1 0.6302,-0.6302004 m 4.411405,0 h -2.63424 C 12.384592,7.427674 11.691372,6.8983055 10.87211,6.8983055 c -0.819259,0 -1.5124797,0.5293685 -1.7771628,1.2604006 H 6.4607096 A 1.2604005,1.2604005 0 0 0 5.200309,9.4191068 V 19.502312 a 1.2604005,1.2604005 0 0 0 1.2604006,1.260399 h 8.8228034 a 1.2604005,1.2604005 0 0 0 1.2604,-1.260399 V 9.4191068 a 1.2604005,1.2604005 0 0 0 -1.2604,-1.2604007 z"
+     inkscape:connector-curvature="0" />
+</svg>
diff --git a/Graphics/drawables/ic_action_encrypt_save.svg b/Graphics/drawables/ic_action_encrypt_save.svg
index 7bb435a5d..8502420f3 100644
--- a/Graphics/drawables/ic_action_encrypt_save.svg
+++ b/Graphics/drawables/ic_action_encrypt_save.svg
@@ -12,7 +12,7 @@
    height="24"
    viewBox="0 0 24 24"
    id="svg2"
-   inkscape:version="0.48.3.1 r9886"
+   inkscape:version="0.48.5 r10040"
    sodipodi:docname="ic_action_encrypt_save.svg">
   <metadata
      id="metadata10">
@@ -41,8 +41,8 @@
      id="namedview6"
      showgrid="false"
      inkscape:zoom="9.8333333"
-     inkscape:cx="12.20339"
-     inkscape:cy="12"
+     inkscape:cx="-4.7288134"
+     inkscape:cy="11.949153"
      inkscape:window-x="0"
      inkscape:window-y="19"
      inkscape:window-maximized="1"
@@ -50,10 +50,11 @@
   <path
      inkscape:connector-curvature="0"
      d="M 12.355932,11.847458 H 4.7288135 V 8.7966102 H 12.355932 M 10.067797,19.474576 a 2.2881356,2.2881356 0 0 1 -2.288136,-2.288135 2.2881356,2.2881356 0 0 1 2.288136,-2.288136 2.2881356,2.2881356 0 0 1 2.288135,2.288136 2.2881356,2.2881356 0 0 1 -2.288135,2.288135 M 13.881356,7.2711864 H 4.7288135 c -0.8466101,0 -1.5254237,0.6864407 -1.5254237,1.5254238 V 19.474576 A 1.5254237,1.5254237 0 0 0 4.7288135,21 H 15.40678 a 1.5254237,1.5254237 0 0 0 1.525424,-1.525424 V 10.322034 L 13.881356,7.2711864 z"
-     id="path4-7" />
+     id="path4-7"
+     style="fill:#000000;fill-opacity:1" />
   <path
      id="path3076-1"
      d="m 17.363197,9.8980016 a 0.84079901,0.84079901 0 0 0 0.840798,-0.8408 c 0,-0.466643 -0.378359,-0.840799 -0.840798,-0.840799 a 0.84079901,0.84079901 0 0 0 -0.8408,0.840799 0.84079901,0.84079901 0 0 0 0.8408,0.8408 m 2.522396,-3.783596 a 0.84079901,0.84079901 0 0 1 0.8408,0.840799 V 11.159199 A 0.84079901,0.84079901 0 0 1 19.885593,12 H 14.840799 A 0.84079901,0.84079901 0 0 1 14,11.159199 V 6.9552046 c 0,-0.466644 0.37836,-0.840799 0.840799,-0.840799 h 0.4204 v -0.840799 a 2.1019975,2.1019975 0 0 1 2.101998,-2.101997 2.1019975,2.1019975 0 0 1 2.101997,2.101997 v 0.840799 h 0.420399 m -2.522396,-2.101998 a 1.2611986,1.2611986 0 0 0 -1.261198,1.261199 v 0.840799 h 2.522396 v -0.840799 a 1.2611986,1.2611986 0 0 0 -1.261198,-1.261199 z"
      inkscape:connector-curvature="0"
-     style="fill:#000000" />
+     style="fill:#000000;fill-opacity:1" />
 </svg>
diff --git a/Graphics/drawables/originals/content-paste.svg b/Graphics/drawables/originals/content-paste.svg
new file mode 100644
index 000000000..11ea8f23d
--- /dev/null
+++ b/Graphics/drawables/originals/content-paste.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M19,20H5V4H7V7H17V4H19M12,2A1,1 0 0,1 13,3A1,1 0 0,1 12,4A1,1 0 0,1 11,3A1,1 0 0,1 12,2M19,2H14.82C14.4,0.84 13.3,0 12,0C10.7,0 9.6,0.84 9.18,2H5A2,2 0 0,0 3,4V20A2,2 0 0,0 5,22H19A2,2 0 0,0 21,20V4A2,2 0 0,0 19,2Z" /></svg>
\ No newline at end of file
diff --git a/Graphics/update-drawables.sh b/Graphics/update-drawables.sh
index 7dcf1d60f..18ed1b63a 100755
--- a/Graphics/update-drawables.sh
+++ b/Graphics/update-drawables.sh
@@ -22,7 +22,7 @@ SRC_DIR=./drawables/
 #inkscape -w 512 -h 512 -e "$PLAY_DIR/$NAME.png" $NAME.svg
 
 
-for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
+for NAME in "ic_cloud_search" "ic_action_encrypt_file" "ic_action_encrypt_text" "ic_action_verified_cutout" "ic_action_encrypt_copy" "ic_action_encrypt_paste" "ic_action_encrypt_save" "ic_action_encrypt_share" "status_lock_closed" "status_lock_error" "status_lock_open" "status_signature_expired_cutout" "status_signature_invalid_cutout" "status_signature_revoked_cutout" "status_signature_unknown_cutout" "status_signature_unverified_cutout" "status_signature_verified_cutout" "key_flag_authenticate" "key_flag_certify" "key_flag_encrypt" "key_flag_sign" "yubi_icon" "ic_stat_notify" "status_signature_verified_inner" "link" "octo_link"
 do
 echo $NAME
 inkscape -w 24 -h 24 -e "$MDPI_DIR/${NAME}_24dp.png" "$SRC_DIR/$NAME.svg"
diff --git a/OpenKeychain/src/main/AndroidManifest.xml b/OpenKeychain/src/main/AndroidManifest.xml
index 296685684..52d85bb90 100644
--- a/OpenKeychain/src/main/AndroidManifest.xml
+++ b/OpenKeychain/src/main/AndroidManifest.xml
@@ -210,6 +210,12 @@
                 <data android:mimeType="text/*" />
                 <data android:mimeType="message/*" />
             </intent-filter>
+            <!-- Android 6 Floating Action Mode -->
+            <intent-filter >
+                <action android:name="android.intent.action.PROCESS_TEXT"/>
+                <category android:name="android.intent.category.DEFAULT" />
+                <data android:mimeType="text/plain" />
+            </intent-filter>
         </activity>
         <activity
             android:name=".ui.DisplayTextActivity"
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 0afb942b5..50dbc9a8b 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
@@ -60,6 +60,9 @@ 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");
@@ -95,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 = "";
         }
@@ -108,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();
         }
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
index 4ce241c02..10d88253d 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextFragment.java
@@ -56,8 +56,10 @@ public class EncryptTextFragment
 
     public static final String ARG_TEXT = "text";
     public static final String ARG_USE_COMPRESSION = "use_compression";
+    public static final String ARG_RETURN_PROCESS_TEXT = "return_process_text";
 
     private boolean mShareAfterEncrypt;
+    private boolean mReturnProcessTextAfterEncrypt;
     private boolean mUseCompression;
     private boolean mHiddenRecipients = false;
 
@@ -66,11 +68,12 @@ public class EncryptTextFragment
     /**
      * Creates new instance of this fragment
      */
-    public static EncryptTextFragment newInstance(String text) {
+    public static EncryptTextFragment newInstance(String text, boolean returnProcessTextAfterEncrypt) {
         EncryptTextFragment frag = new EncryptTextFragment();
 
         Bundle args = new Bundle();
         args.putString(ARG_TEXT, text);
+        args.putBoolean(ARG_RETURN_PROCESS_TEXT, returnProcessTextAfterEncrypt);
         frag.setArguments(args);
 
         return frag;
@@ -128,6 +131,7 @@ public class EncryptTextFragment
         super.onCreate(savedInstanceState);
         if (savedInstanceState == null) {
             mMessage = getArguments().getString(ARG_TEXT);
+            mReturnProcessTextAfterEncrypt = getArguments().getBoolean(ARG_RETURN_PROCESS_TEXT, false);
         }
 
         Preferences prefs = Preferences.getPreferences(getActivity());
@@ -151,6 +155,12 @@ public class EncryptTextFragment
         inflater.inflate(R.menu.encrypt_text_fragment, menu);
 
         menu.findItem(R.id.check_enable_compression).setChecked(mUseCompression);
+
+        if (mReturnProcessTextAfterEncrypt) {
+            menu.findItem(R.id.encrypt_paste).setVisible(true);
+            menu.findItem(R.id.encrypt_copy).setVisible(false);
+            menu.findItem(R.id.encrypt_share).setVisible(false);
+        }
     }
 
     @Override
@@ -177,6 +187,11 @@ public class EncryptTextFragment
                 cryptoOperation(new CryptoInputParcel(new Date()));
                 break;
             }
+            case R.id.encrypt_paste: {
+                hideKeyboard();
+                cryptoOperation(new CryptoInputParcel(new Date()));
+                break;
+            }
             default: {
                 return super.onOptionsItemSelected(item);
             }
@@ -328,6 +343,11 @@ public class EncryptTextFragment
             // Share encrypted message/file
             startActivity(Intent.createChooser(createSendIntent(result.getResultBytes()),
                     getString(R.string.title_share_message)));
+        } else if (mReturnProcessTextAfterEncrypt) {
+            Intent resultIntent = new Intent();
+            resultIntent.putExtra(Intent.EXTRA_PROCESS_TEXT, new String(result.getResultBytes()));
+            getActivity().setResult(Activity.RESULT_OK, resultIntent);
+            getActivity().finish();
         } else {
             // Copy to clipboard
             copyToClipboard(result);
diff --git a/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_paste_24dp.png b/OpenKeychain/src/main/res/drawable-hdpi/ic_action_encrypt_paste_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..356cfbe434cd4d00dab3586075cf6e1d0612f094
GIT binary patch
literal 590
zcmV-U0<ryxP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ00004b3#c}2nYxW
zd<bNS00009a7bBm000!j000!j0TpmfLI3~&8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10n155K~z|U?bp9*6+sjR@ZZr0Dk4`B!D}V9BC!!H6bm1~MjM~N
zLJLdL#$GH0QAq0pSXhaLjVRa%X@a1rfncKu!GM3rSnNjD>)t!NSJnjF4~AXN%y;IS
zb9Uy;MoP(6!nVy8Fp6GK4*x_@L<}NguF2R=1(iZ>V;Rd4u@Di%O%sI6ID@n0^C+%Q
zWTccjX_&zZ&R1-wu!_CocwI(l4nr(fY>U`~!(&+;MduQhknpB_U&5=3?P?u2rah@6
zVjs@o2p*=C9#{IlV0XsFI%ZQ!pZ_{SitpoDx!R3(vC^L!wgasr6cNX91qUnU0p{@(
z3%G~C^RoZ+h?_h3q}X9mu@6&99~wspI}|%*+zM}Er{bI$H)gfs??o;`IYIL!@evN;
zTFr!O6U6*VCobSyPS8wUnkv``?^;UfZA5&m8M7<n1MW5$16e_%_<^qt{cdmQ?{{QU
zc1#i42Q7Eut#Yz)DO|_>T5cDDO75WKzHGz$Kkq|r&<o0;7nDOUD2HB94!PpGg6}vP
z5l^P{{jL?OK~1`$sPIj%rPcNxC)(7qMwk4En8p59D=h@QPAUC)#h5hLw0|94Vat8g
cy`UU^0)2{{6ivdiVgLXD07*qoM6N<$f={FTCjbBd

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_paste_24dp.png b/OpenKeychain/src/main/res/drawable-mdpi/ic_action_encrypt_paste_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..a546e152bdf7ed0a6b85a36f8cc3c5a64e86862a
GIT binary patch
literal 433
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjEX7WqAsj$Z!;#Vf<Z~8yL>2?p
zUk71ECym(^Ktah8*NBqf{Irtt#G+J&^73-M%)IR4<ivthz5Jr|+3#$m7#JA!JY5_^
zJUZWAHT1siC~^Gbd1bFq4H53SIvPKiWPUR(k@RMtuGi$T-AR$d$-3l&>ke_NbfKeX
z*NS-^?`tg4NYb#nsbr(~-{FUP{bdg(&L0Pu%lB8m`@Z*a-|iDWk9%fr+~sehpd{z&
zVyo1r{OIZl#v6x<_Z<D*5%G5Ai8Iyeej8%8ln1<DDS0S|@8Z?_$4#R$9x>%!X=6)}
z4*${m)#-GXjTFZL@0!EsmHt0sNdFO>A$!=&?$I*&gl&&L*om&reHgp&>Ia_gil9~b
zkL1NpxrJ`e5R5Opv2?9SmF2V#JLg+!m0#$5UlD7#t<zjp_v6$3j590y+>RC~E6sc4
zp7t)Z(&t<7M}`@E4p&Y09&vLy!#`tx+vVL{i|)^t5!C;{*w4-ob>r-r`_7DRl9%gG
ZY%jNZo4O)E9T;*944$rjF6*2UngI8Yu@V3P

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_paste_24dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/ic_action_encrypt_paste_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ed7fdb73207c6a001d39e27ec373ac1380439a67
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00004b3#c}2nYxW
zd<bNS00009a7bBm000}W000}W0bUxB8~^|S8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10x3yEK~!jg?buC-PGJ-W@ZTBZvlJVJC>u$lWK1awic%sAHBBkA
zw!zNYnrxJvd_*Z}7PGd+!ooC3S+F3D#UM5q$HG-_xAz_IedjgT<o@e)>wMkwKlh&d
z+~<kRw3snacLDQ7L!fRn1nS0M-33I%a*Sdx-e5d4C%aCNnY9VFU=rCPUva+c95oid
z1ds3ym#__|@EkvI=wBzWzv%eAl76_*Pjr)~&LQ4iT(7q(GxIT?wb<uGodi}E*O@l9
znHKw;h=u+aiijaxz#eSE6h4>Swqq3@<9=pd?wIf|z2BR$yo0U$)#*kKF31c-#7IOu
z#cNDQ#O;V!Q*ztUL+YI!Eq(0zuwUQsa`(ndepS1lINRyIl~&@2Scfy%)y6!GrTBo0
zIDn%#77-8eagNk8xQQX`t5Q>y4zIx{f9}@R!hd5IzQ5&o5fgaP#@?4Fa2l&Ii<gCN
z9oClojzz=-j#S9~9x^i{Vj5e!j;!zmuKCrCcP+XrdV8nKGKCRb?qKiF4E#lG$K756
z|NH&G6Wpj6a~SI@#=Pxlna>RLxL%AF1$8qUvv`1I3$hY-gUq~>nHzAfMZG>Vqm3-d
z%oCaUwNt)DKLZVcy3r7*8x4WF(GaK`4S~AR5U3lAo<NoV_%Z$2|CZ$?272CKR3NaT
zxLH4o|BkWwY>+A)?ncBQPHKO!RTW=wD>GlsC&_}JPWKy&eux_ab)z9rH+}*hV07%6
Sr&nG80000<MNUMnLSTYVMm7Hc

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png b/OpenKeychain/src/main/res/drawable-xhdpi/status_signature_expired_cutout_96dp.png
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..568b48c43ee53afaaa5b1f1642ba9304ceef29df 100644
GIT binary patch
literal 4973
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

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_paste_24dp.png b/OpenKeychain/src/main/res/drawable-xxhdpi/ic_action_encrypt_paste_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..50987bdd6dc0548d4bc0051b5be7b788508ca203
GIT binary patch
literal 986
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@ZgvM!EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zXtsecqtcuEJwQRp64!{5;QX|b^2DN4hVt@qz0ADq;^f4FRK5J7^x5xhq!<{O!#!Ob
zLn`LHoo$^V;waIu|9*!POT3^oYwyKJ4z2<<jT4+MI(@jv&82nA<A8gza)idVYfVlf
z8@Fr_JmM74v0#CVp#BdBof;Qc*5ohSZ}3K*-~HQscX8zP-}VxE)z-hyzuCUoc=Kf2
zz|c9zd^C44{kPIPae!5FhXS*B%7Z4Jm<f&CMl+&HSe+D=yc>BP)C<@vmaMWbW)Hg>
zq`rWOhaqZm9K+t7kHu@7ET6t%*>`oK@w7T7_gg^%8yF<|Tx;0<j;zfT+`wNU|6ZEa
zY|G*W+8Z0<4?MH_J)L3xBb)x)ffsiFc=CJp6U$jU?uw;pE}wFEPlpcku19BQ`)*SE
zzV>`jm?o>C9{U65$u%cyV|j~B7p`ei<L!KZHAq3}b%U(~{|3!}zsx@DI;d#eko)oe
z_XfuYS_QF}=T%&s`<BJ(sk6zv_dX_by`%FIbv;~IUZ`d9<~J-~WpzpAzrsZub(Z)}
zx2^qY=bEAp>pkGCkGs0v<#3UEbF$Occ^kKAg~oDExSSrcXaBq<+XPtFsLlErHP!yh
zdJe8lcNCT8x-35GHA{bC4x`FOTc0l{Hb_Ry`tff`ht8>hsn=bK=Zi}At@UpR3uK&U
z^ikV_tK_($RYO*r#K|k{KE01~S=@U5tlfXKA@jiD9(9ul;ny{Mmd;0tce(62t;q6p
zuIGBzY3VlGl$5L)U6!<Gq?|s*-@8_&Vyf~z3(M#WjQ{p%r8nGjsp_o#y4r<1y3+ct
z*P^(&J?q&;Z+Twdc0heqRd$ZE%f6)@8&%R}kL}P_67QJi$j4Od%<?y1>}})B0}n4a
z{>{7xjOH!B#D4p1(Ua+lWK6!vziLawgjMS}MZI0lF&$@W-Mw(t`O7If!RobE|L*Xg
zIVX|alEGA|^_Fqz%jS^Mh|vDkuVntkiSJsmYLb#~_|?6utfp+cbBRNX3z2dP9N93F
z6IQ_!zw_t6H@$7`l2UkXM&^w4E6Ng;tasPnyeGH(<g#sY2TzoCuYAS)AZo#`l%-x@
z(sH~xF0#L6(_`(J+{&1+dR1L!DC5C<Tf`^+ypg}N&8abcRa9=N<I-P--hw|2@?i-X
cVRQ5S$bVjb?Is*If%%ZZ)78&qol`;+09Xg6(f|Me

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_paste_24dp.png b/OpenKeychain/src/main/res/drawable-xxxhdpi/ic_action_encrypt_paste_24dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..11ad7e219c77353f69e1b6890e5323d236d16234
GIT binary patch
literal 1290
zcmeAS@N?(olHy`uVBq!ia0vp^2_VeD1|%QND7OGoEX7WqAsj$Z!;#Vf<Z~8yL>4nJ
zn8$)Jqhx~{kij5X;u=vBoS#-wo>-L1P+nfHmzkGcoSayYs+V7sKKq@G6wsh{PZ!6K
ziaBrR_;$#+O0>-nUwmlQj<%^f5+>`Kl(_#rS>Wd4Wb$N*TcC(wJ;yzkj}HtNsoQ!4
z2)e4aC_Gd8m*T1-@LzRakH)bIgEhyTH@PuyViPw1Y4hdHt-j5hZRf7~srK@HW7Erf
ztJbf2y>Rum>?*G`w+F{H@9}0>DIS<9@W6+oK#j#hm}w3t<GB`wbf*SmsBnh!rJs|+
zysXyCe{E%Oxa2x%o5wBgKTI_oKAyLfGZ!zpm{V$AYZ`K?`9Sf3o3Wc@8RX11Zx6nH
z|An=~rOgN2c9q*5;P^0Y$??hC7p^RCSTegIw;^hIAJci}_ssSTj}Js8#A=?uf50?t
zn{lM`nKgx+7VI~;BeZ=Pub-P-ZfX#F>bGuz+p29Qr5sV*I=Zs<DQWR#r!vxRH@JH*
zKh`*PrPQSm#_QAV>a)_`m!8f^TOY{dJ@=HnxUcAjMPDl2j~YF-PC2?~XVsFGOvk+D
zt7}iwd@em(KX|=KXoJ|fNn8KO_=*}B=zPj^u%BSUa)&X-tMKg8*ZX`gZQ@EiCH#KF
zlI4wu4}>3RnJK&a>bA*$9epkZJy3oyspo19;~KNg&U?jj4hei=s<f8x+WolGiq*fv
zdcjtc8p{I455^l#pQ&3L@lC;C&c@2kHR)-OZKr>V6N^YV`GD&|?7vtxjpgMHAGr*z
zrk<Vn?dmSK_kQm#6~5LGJFzSF3s1rQPMrjW=M0|w4C^<1kSW#L;CadRru5X##@Wm&
zx@>hzwio_pDA+jj??uJ9{dxuaXMX*2HuBr^hOqWH_K?4QrMz>k{~LU;EMP9Ex_#fR
zL0mO={q1vRb?jp5U03J!B>ynjAZc;zWB>ZwjjC&REIyFVnN;RAyWwJ(t#`xqY7J|P
z$p!{2HS;$l=jC+oS95-z|F%Gu$?k-v!gZBDJOz=5D(tt)`m6QWo^Jal92QYw>Kt3F
zBCg<hU~lJPyG;iQxxSq*{+H0U>)8oI&VI({+vd(*CUN{U52JZ_&(9f4o*tNeAXY@U
zFzX%LwQ`I2t-W7Q82pPr`TzLwyRx5jUr#u1?8|)m_N^UU7C{?p)><wQJbh8rQuv1A
zOWp+W0@DKZnc_Om2kI?(ckG`p%J(G5Wikgi!Ol{6kTL(&%$30>iiPgE9}54oYeVCs
z_{Vo@f|pO2&0zeS`-erj?WAkW(Z=D%%r>FRA9&ic%)H4`z`bGem%|qYyTZl7Z`$a8
z*K<*x#~dZ3me#N8%Ot)nb@!<=``)GRUcgv>U;&oQfg{flDSUGK>dahyv#BN-^%91g
z@BfO;{A7KgYww+JOZsNdyel`C|7Y6*b>pLFUDw8MU!u^>V0@cr&m844wm75Bx_Mil
z-_T#N<@%ww2h<NJ{`uadvD{wMtaz{K^RMBawKt9ZE-5`&^F}l@{nnYRziUiPnYU-g
jU+#F0oU^gGvYz400jrb-7QtL#xy9h=>gTe~DWM4f4iq);

literal 0
HcmV?d00001

diff --git a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
index 80b78457d..4d3d53870 100644
--- a/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
+++ b/OpenKeychain/src/main/res/menu/encrypt_text_fragment.xml
@@ -2,6 +2,14 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
+    <item
+        android:id="@+id/encrypt_paste"
+        android:title="@string/btn_paste_encrypted_signed"
+        android:icon="@drawable/ic_action_encrypt_paste_24dp"
+        android:orderInCategory="1"
+        android:visible="false"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/encrypt_copy"
         android:title="@string/btn_copy_encrypted_signed"
diff --git a/OpenKeychain/src/main/res/values/strings.xml b/OpenKeychain/src/main/res/values/strings.xml
index 123647bca..2e2e7a19e 100644
--- a/OpenKeychain/src/main/res/values/strings.xml
+++ b/OpenKeychain/src/main/res/values/strings.xml
@@ -88,6 +88,7 @@
     <string name="btn_match_phrases">"Phrases match"</string>
     <string name="btn_share_encrypted_signed">"Encrypt/sign and share text"</string>
     <string name="btn_copy_encrypted_signed">"Encrypt/sign and copy text"</string>
+    <string name="btn_paste_encrypted_signed">"Encrypt/sign and paste text"</string>
     <string name="btn_view_cert_key">"View certification key"</string>
     <string name="btn_create_key">"Create key"</string>
     <string name="btn_add_files">"Add file(s)"</string>