TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-26 04:36:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1272 from mcginty/flag-secure

Browse Source 
hide screen security when unsupported
This commit is contained in:
Moxie Marlinspike
2014-04-02 22:14:08 -07:00
parent 54d2184c72 06659fd98f
commit 73e2f6ce59
3 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/org/thoughtcrime/securesms/ApplicationPreferencesActivity.java
View File

@@ -193,10 +193,12 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
}
private void initializePlatformSpecificOptions() {
PreferenceGroup pushSmsCategory = (PreferenceGroup) findPreference("push_sms_category");
Preference defaultPreference = findPreference(KITKAT_DEFAULT_PREF);
Preference allSmsPreference = findPreference(TextSecurePreferences.ALL_SMS_PREF);
Preference allMmsPreference = findPreference(TextSecurePreferences.ALL_MMS_PREF);
PreferenceGroup pushSmsCategory = (PreferenceGroup) findPreference("push_sms_category");
PreferenceGroup advancedCategory = (PreferenceGroup) findPreference("advanced_category");
Preference defaultPreference = findPreference(KITKAT_DEFAULT_PREF);
Preference allSmsPreference = findPreference(TextSecurePreferences.ALL_SMS_PREF);
Preference allMmsPreference = findPreference(TextSecurePreferences.ALL_MMS_PREF);
Preference screenSecurityPreference = findPreference(TextSecurePreferences.SCREEN_SECURITY_PREF);
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT && pushSmsCategory != null) {
if (allSmsPreference != null) pushSmsCategory.removePreference(allSmsPreference);
@@ -216,6 +218,13 @@ public class ApplicationPreferencesActivity extends PassphraseRequiredSherlockPr
} else if (pushSmsCategory != null && defaultPreference != null) {
pushSmsCategory.removePreference(defaultPreference);
}
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN_MR1 &&
advancedCategory != null &&
screenSecurityPreference != null)
{
advancedCategory.removePreference(screenSecurityPreference);
}
}
private void initializeEditTextSummary(final EditTextPreference preference) {