Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 20:29:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1454-theme-system-crash' into 'master'

Browse Source 
Prevent crash when user has set theme to system default on unsupported API level

Closes #1454

See merge request briar/briar!1191
This commit is contained in:
akwizgran
2019-11-06 09:46:48 +00:00
parent 4e7f33edfd 21eaab3259
commit aeefa35f38
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/main/java/org/briarproject/briar/android/settings/SettingsFragment.java
View File

@@ -218,11 +218,17 @@ public class SettingsFragment extends PreferenceFragmentCompat
}); });
if (SDK_INT < 27) { if (SDK_INT < 27) {
// remove System Default Theme option // remove System Default Theme option from preference entries
// as it is not functional on this API anyway
List<CharSequence> entries = List<CharSequence> entries =
new ArrayList<>(Arrays.asList(theme.getEntries())); new ArrayList<>(Arrays.asList(theme.getEntries()));
entries.remove(getString(R.string.pref_theme_system)); entries.remove(getString(R.string.pref_theme_system));
theme.setEntries(entries.toArray(new CharSequence[0])); theme.setEntries(entries.toArray(new CharSequence[0]));
// also remove corresponding value
List<CharSequence> values =
new ArrayList<>(Arrays.asList(theme.getEntryValues()));
values.remove(getString(R.string.pref_theme_system_value));
theme.setEntryValues(values.toArray(new CharSequence[0]));
} }
if (IS_DEBUG_BUILD) { if (IS_DEBUG_BUILD) {
findPreference("pref_key_explode").setOnPreferenceClickListener( findPreference("pref_key_explode").setOnPreferenceClickListener(