aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2015-04-25 14:15:38 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2015-04-25 14:15:38 +0200
commit28da73120145078eae9a62cb98fc9d704d5ef7a0 (patch)
tree28ede26b0d1518c84302e2941c4988a56ea791a7 /OpenKeychain/src/main
parentf8af6e3387b46bf0be3dbef799de483e090ad850 (diff)
downloadopen-keychain-28da73120145078eae9a62cb98fc9d704d5ef7a0.tar.gz
open-keychain-28da73120145078eae9a62cb98fc9d704d5ef7a0.tar.bz2
open-keychain-28da73120145078eae9a62cb98fc9d704d5ef7a0.zip
Fix empty screen when clicking on encrypt in details view
Diffstat (limited to 'OpenKeychain/src/main')
-rw-r--r--OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java7
1 files changed, 2 insertions, 5 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 03ab48e23..dd6dd6594 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
@@ -98,23 +98,20 @@ public class EncryptTextActivity extends BaseActivity implements
// handle like normal text encryption, override action and extras to later
// executeServiceMethod ACTION_ENCRYPT_TEXT in main actions
extras.putString(EXTRA_TEXT, sharedText);
- action = ACTION_ENCRYPT_TEXT;
}
}
}
String textData = extras.getString(EXTRA_TEXT);
- if (ACTION_ENCRYPT_TEXT.equals(action) && textData == null) {
- Log.e(Constants.TAG, "Include the extra 'text' in your Intent!");
- return;
+ if (textData == null) {
+ textData = "";
}
// preselect keys given by intent
long mSigningKeyId = extras.getLong(EXTRA_SIGNATURE_KEY_ID);
long[] mEncryptionKeyIds = extras.getLongArray(EXTRA_ENCRYPTION_KEY_IDS);
-
if (savedInstanceState == null) {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();