From a97ebc1ec9afa4951f676b4483c6db871c4704ab Mon Sep 17 00:00:00 2001 From: Vincent Breitmoser Date: Mon, 1 Sep 2014 23:46:22 +0200 Subject: Lock drawer in EncryptFileActivity if called from intent Closes #810 --- .../java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java | 3 +++ .../java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java | 3 +++ 2 files changed, 6 insertions(+) (limited to 'OpenKeychain/src') 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); -- cgit v1.2.3