moparisthebest/open-keychain
1
0
Fork 0
mirror of https://github.com/moparisthebest/open-keychain synced 2024-11-27 19:22:14 -05:00
Code Issues Releases Wiki Activity

Lock drawer in EncryptFileActivity if called from intent

Browse Source 
Closes #810
This commit is contained in:
Vincent Breitmoser 2014-09-01 23:46:22 +02:00
parent f8625f5310
commit a97ebc1ec9
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptFileActivity.java
View File

@ -26,6 +26,7 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.widget.DrawerLayout;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; 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 called with an intent action, do not init drawer navigation
if (ACTION_ENCRYPT_FILE.equals(getIntent().getAction())) { 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? // TODO: back button to key?
} else { } else {
setupDrawerNavigation(savedInstanceState); setupDrawerNavigation(savedInstanceState);

3
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/EncryptTextActivity.java
View File

@ -26,6 +26,7 @@ import android.os.Handler;
import android.os.Message; import android.os.Message;
import android.os.Messenger; import android.os.Messenger;
import android.support.v4.app.Fragment; import android.support.v4.app.Fragment;
import android.support.v4.widget.DrawerLayout;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; 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 called with an intent action, do not init drawer navigation
if (ACTION_ENCRYPT_TEXT.equals(getIntent().getAction())) { 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? // TODO: back button to key?
} else { } else {
setupDrawerNavigation(savedInstanceState); setupDrawerNavigation(savedInstanceState);