diff options
| author | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 13:04:21 +0100 |
|---|---|---|
| committer | Dominik Schürmann <dominik@dominikschuermann.de> | 2015-01-27 13:04:21 +0100 |
| commit | 3b23a71209b3c5acdc9d34351d1731184eea8aca (patch) | |
| tree | 848eb0cc4484dd8e5f70f96ec4ef70221ee8883e /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | |
| parent | 9c6f195eb7c4df33dceafcfdd9f6c17246e8b9c5 (diff) | |
| parent | ae7ba2639f1ade3953c8b96fb32a17df0d3aaf8a (diff) | |
| download | open-keychain-3b23a71209b3c5acdc9d34351d1731184eea8aca.tar.gz open-keychain-3b23a71209b3c5acdc9d34351d1731184eea8aca.tar.bz2 open-keychain-3b23a71209b3c5acdc9d34351d1731184eea8aca.zip | |
Merge branch 'detached-sigs-api' into development
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java')
| -rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java index a84461a92..21377bcd2 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/DecryptActivity.java @@ -34,13 +34,13 @@ import org.sufficientlysecure.keychain.ui.util.SubtleAttentionSeeker; import java.util.regex.Matcher; -public class DecryptActivity extends DrawerActivity { +public class DecryptActivity extends BaseActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - activateDrawerNavigation(savedInstanceState); +// activateDrawerNavigation(savedInstanceState); View actionFile = findViewById(R.id.decrypt_files); View actionFromClipboard = findViewById(R.id.decrypt_from_clipboard); |