diff options
author | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-01 23:46:22 +0200 |
---|---|---|
committer | Vincent Breitmoser <valodim@mugenguild.com> | 2014-09-01 23:46:22 +0200 |
commit | a97ebc1ec9afa4951f676b4483c6db871c4704ab (patch) | |
tree | 349d29ae5827eb19f526fa8eade85c13dee121ba /OpenKeychain/src/main/java/org/sufficientlysecure | |
parent | f8625f531037205bff9f1f88a5c15a2685825cd8 (diff) | |
download | open-keychain-a97ebc1ec9afa4951f676b4483c6db871c4704ab.tar.gz open-keychain-a97ebc1ec9afa4951f676b4483c6db871c4704ab.tar.bz2 open-keychain-a97ebc1ec9afa4951f676b4483c6db871c4704ab.zip |
Lock drawer in EncryptFileActivity if called from intent
Closes #810
Diffstat (limited to 'OpenKeychain/src/main/java/org/sufficientlysecure')
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java | 3 | ||||
-rw-r--r-- | OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 3 |
2 files changed, 6 insertions, 0 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 3f58f14f3..0b37efd7a 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java @@ -26,6 +26,7 @@ import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.support.v4.app.Fragment; +import android.support.v4.widget.DrawerLayout; import android.view.Menu; import android.view.MenuItem; @@ -426,6 +427,8 @@ public class EncryptFileActivity extends DrawerActivity implements EncryptActivi // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_FILE.equals(getIntent().getAction())) { + // lock drawer + ((DrawerLayout) findViewById(R.id.drawer_layout)).setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); // TODO: back button to key? } else { setupDrawerNavigation(savedInstanceState); 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 17831b5df..fb79a1ee9 100644 --- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java +++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java @@ -26,6 +26,7 @@ import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.support.v4.app.Fragment; +import android.support.v4.widget.DrawerLayout; import android.view.Menu; import android.view.MenuItem; @@ -394,6 +395,8 @@ public class EncryptTextActivity extends DrawerActivity implements EncryptActivi // if called with an intent action, do not init drawer navigation if (ACTION_ENCRYPT_TEXT.equals(getIntent().getAction())) { + // lock drawer + ((DrawerLayout) findViewById(R.id.drawer_layout)).setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED); // TODO: back button to key? } else { setupDrawerNavigation(savedInstanceState); |