Merge pull request #1020 from lxgr/fix-screensec

Use the "screen security" preference for the conversation list
This commit is contained in:
Moxie Marlinspike 2014-03-05 09:12:33 -08:00
commit 003095b08c

View File

@ -280,7 +280,7 @@ public class ConversationListActivity extends PassphraseRequiredSherlockFragment
}
private void initializeResources() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB && TextSecurePreferences.isScreenSecurityEnabled(this)) {
getWindow().setFlags(WindowManager.LayoutParams.FLAG_SECURE,
WindowManager.LayoutParams.FLAG_SECURE);
}