From 43140c10b114c30e57531cf52fa1b3a47cc9a43a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dominik=20Sch=C3=BCrmann?= Date: Mon, 29 Sep 2014 22:52:03 +0200 Subject: Fixes for share to decrypt --- .../java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java | 4 ++-- .../java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java index 582c988df..9271f146c 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptTextActivity.java @@ -112,11 +112,11 @@ public class DecryptTextActivity extends ActionBarActivity { } if (Intent.ACTION_SEND.equals(action) && type != null) { - // Android action + Log.logDebugBundle(extras, "extras"); // When sending to Keychain Decrypt via share menu if ("text/plain".equals(type)) { - String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); + String sharedText = extras.getString(Intent.EXTRA_TEXT); sharedText = getPgpContent(sharedText); if (sharedText != null) { 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 f4d2040ed..d05989bb2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -302,7 +302,6 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv // Handle intent actions handleActions(getIntent()); updateModeFragment(); - } @Override @@ -359,9 +358,11 @@ public class EncryptTextActivity extends EncryptActivity implements EncryptActiv // 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)) { - String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); + String sharedText = extras.getString(Intent.EXTRA_TEXT); if (sharedText != null) { // handle like normal text encryption, override action and extras to later // executeServiceMethod ACTION_ENCRYPT_TEXT in main actions -- cgit v1.2.3