aboutsummaryrefslogtreecommitdiffstats
path: root/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
diff options
context:
space:
mode:
authorDominik Schürmann <dominik@dominikschuermann.de>2014-09-06 16:36:58 +0200
committerDominik Schürmann <dominik@dominikschuermann.de>2014-09-06 16:36:58 +0200
commit59f32c4fca48b226fc13b649a7f6a635aeaa9041 (patch)
tree35b35e09a4c47c816a521fe2dafc6735dedd1840 /OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
parent30978384af7c6bf793d28c611b6f42eec6c157af (diff)
downloadopen-keychain-59f32c4fca48b226fc13b649a7f6a635aeaa9041.tar.gz
open-keychain-59f32c4fca48b226fc13b649a7f6a635aeaa9041.tar.bz2
open-keychain-59f32c4fca48b226fc13b649a7f6a635aeaa9041.zip
Drawer nav method cleanup
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.java5
1 files changed, 2 insertions, 3 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 0b37efd7a..8fc72ca89 100644
--- a/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
+++ b/OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
@@ -26,7 +26,6 @@ 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;
@@ -428,10 +427,10 @@ 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);
+ deactivateDrawerNavigation();
// TODO: back button to key?
} else {
- setupDrawerNavigation(savedInstanceState);
+ activateDrawerNavigation(savedInstanceState);
}
// Handle intent actions