diff options
| author | Dominik <dominik@dominikschuermann.de> | 2012-04-13 03:33:00 +0200 |
|---|---|---|
| committer | Dominik <dominik@dominikschuermann.de> | 2012-06-13 19:28:22 +0300 |
| commit | 4793cd1c253a1e901a176aa7e2f19809b8a6d883 (patch) | |
| tree | 0e33e72064ad5bbaa27a709704da79065f363390 /org_apg/src/org/apg | |
| parent | 01230cd0a9dc90032a4a36e22ab10dcb77fad208 (diff) | |
| download | open-keychain-4793cd1c253a1e901a176aa7e2f19809b8a6d883.tar.gz open-keychain-4793cd1c253a1e901a176aa7e2f19809b8a6d883.tar.bz2 open-keychain-4793cd1c253a1e901a176aa7e2f19809b8a6d883.zip | |
designing encrypt and decrypt
Diffstat (limited to 'org_apg/src/org/apg')
| -rw-r--r-- | org_apg/src/org/apg/ui/DecryptActivity.java | 12 | ||||
| -rw-r--r-- | org_apg/src/org/apg/ui/EncryptActivity.java | 10 |
2 files changed, 12 insertions, 10 deletions
diff --git a/org_apg/src/org/apg/ui/DecryptActivity.java b/org_apg/src/org/apg/ui/DecryptActivity.java index b1726194b..a1a533763 100644 --- a/org_apg/src/org/apg/ui/DecryptActivity.java +++ b/org_apg/src/org/apg/ui/DecryptActivity.java @@ -250,12 +250,6 @@ public class DecryptActivity extends BaseActivity { Log.d(Constants.TAG, "got extras"); } - // disable home button on actionbar because this activity is run from another app - final ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayShowTitleEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(false); - actionBar.setHomeButtonEnabled(false); - mData = extras.getByteArray(Apg.EXTRA_DATA); String textData = null; if (mData == null) { @@ -312,6 +306,12 @@ public class DecryptActivity extends BaseActivity { extras = new Bundle(); } + // disable home button on actionbar because this activity is run from another app + final ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setDisplayHomeAsUpEnabled(false); + actionBar.setHomeButtonEnabled(false); + mReturnBinary = extras.getBoolean(Apg.EXTRA_BINARY, false); if (mContentUri == null) { diff --git a/org_apg/src/org/apg/ui/EncryptActivity.java b/org_apg/src/org/apg/ui/EncryptActivity.java index c437ebe27..68b2c893b 100644 --- a/org_apg/src/org/apg/ui/EncryptActivity.java +++ b/org_apg/src/org/apg/ui/EncryptActivity.java @@ -314,10 +314,12 @@ public class EncryptActivity extends BaseActivity { } // disable home button on actionbar because this activity is run from another app - final ActionBar actionBar = getSupportActionBar(); - actionBar.setDisplayShowTitleEnabled(true); - actionBar.setDisplayHomeAsUpEnabled(false); - actionBar.setHomeButtonEnabled(false); + if (Apg.Intent.ENCRYPT_AND_RETURN.equals(mIntent.getAction())) { + final ActionBar actionBar = getSupportActionBar(); + actionBar.setDisplayShowTitleEnabled(true); + actionBar.setDisplayHomeAsUpEnabled(false); + actionBar.setHomeButtonEnabled(false); + } if (Apg.Intent.ENCRYPT_AND_RETURN.equals(mIntent.getAction()) || Apg.Intent.GENERATE_SIGNATURE.equals(mIntent.getAction())) { |