diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-07 17:00:58 +0200 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2014-09-07 17:00:58 +0200 |
| commit | d1e08f9305a451feab0bc7ac93e165952435a599 (patch) | |
| tree | 0d612f36ee0df776377003441fe7650a8ff9a523 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java | |
| parent | 02663de191e58d3349628fe4e944147ffdc72bc0 (diff) | |
| download | open-keychain-d1e08f9305a451feab0bc7ac93e165952435a599.tar.gz open-keychain-d1e08f9305a451feab0bc7ac93e165952435a599.tar.bz2 open-keychain-d1e08f9305a451feab0bc7ac93e165952435a599.zip | |
Two buttons to encrypt files and text, some fixes
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java index 68a8fce93..49842c361 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java @@ -50,7 +50,7 @@ import java.util.Set; public class EncryptFileActivity extends DrawerActivity implements EncryptActivityInterface { /* Intents */ - public static final String ACTION_ENCRYPT_FILE = Constants.INTENT_PREFIX + "ENCRYPT_FILE"; + public static final String ACTION_ENCRYPT = Constants.INTENT_PREFIX + "ENCRYPT"; // enables ASCII Armor for file encryption when uri is given public static final String EXTRA_ASCII_ARMOR = "ascii_armor"; @@ -370,7 +370,7 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi setContentView(R.layout.encrypt_file_activity); // if called with an intent action, do not init drawer navigation - if (ACTION_ENCRYPT_FILE.equals(getIntent().getAction())) { + if (ACTION_ENCRYPT.equals(getIntent().getAction())) { // lock drawer deactivateDrawerNavigation(); // TODO: back button to key? @@ -460,10 +460,10 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi String sharedText = intent.getStringExtra(Intent.EXTRA_TEXT); if (sharedText != null) { // handle like normal text encryption, override action and extras to later - // executeServiceMethod ACTION_ENCRYPT_FILE in main actions + // executeServiceMethod ACTION_ENCRYPT in main actions extras.putString(EXTRA_TEXT, sharedText); extras.putBoolean(EXTRA_ASCII_ARMOR, true); - action = ACTION_ENCRYPT_FILE; + action = ACTION_ENCRYPT; } } else */ |