Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 21:59:54 +01:00
Code Issues Projects Releases Wiki Activity

Use XML to specify dependencies between settings.

Browse Source
This commit is contained in:
akwizgran
2020-01-20 16:41:39 +00:00
parent f5b4f6e071
commit 99686f5316
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -464,9 +464,9 @@ public class SettingsFragment extends PreferenceFragmentCompat
enableBluetooth.setEnabled(enabled); enableBluetooth.setEnabled(enabled);
enableWifi.setEnabled(enabled); enableWifi.setEnabled(enabled);
enableTor.setEnabled(enabled); enableTor.setEnabled(enabled);
torNetwork.setEnabled(enabled && enableTor.isChecked()); torNetwork.setEnabled(enabled);
torMobile.setEnabled(enabled && enableTor.isChecked()); torMobile.setEnabled(enabled);
torOnlyWhenCharging.setEnabled(enabled && enableTor.isChecked()); torOnlyWhenCharging.setEnabled(enabled);
if (!enabled) screenLock.setEnabled(false); if (!enabled) screenLock.setEnabled(false);
notifyPrivateMessages.setEnabled(enabled); notifyPrivateMessages.setEnabled(enabled);
notifyGroupMessages.setEnabled(enabled); notifyGroupMessages.setEnabled(enabled);
@@ -573,9 +573,6 @@ public class SettingsFragment extends PreferenceFragmentCompat
storeWifiSetting(wifiSetting); storeWifiSetting(wifiSetting);
} else if (preference == enableTor) { } else if (preference == enableTor) {
boolean torEnabledSetting = (Boolean) newValue; boolean torEnabledSetting = (Boolean) newValue;
torNetwork.setEnabled(torEnabledSetting);
torMobile.setEnabled(torEnabledSetting);
torOnlyWhenCharging.setEnabled(torEnabledSetting);
storeTorEnabledSetting(torEnabledSetting); storeTorEnabledSetting(torEnabledSetting);
} else if (preference == torNetwork) { } else if (preference == torNetwork) {
int torNetworkSetting = Integer.valueOf((String) newValue); int torNetworkSetting = Integer.valueOf((String) newValue);

3
briar-android/src/main/res/xml/settings.xml
View File

@@ -55,6 +55,7 @@
<ListPreference <ListPreference
android:defaultValue="0" android:defaultValue="0"
android:dependency="pref_key_tor_enable"
android:entries="@array/tor_network_setting_names" android:entries="@array/tor_network_setting_names"
android:entryValues="@array/tor_network_setting_values" android:entryValues="@array/tor_network_setting_values"
android:key="pref_key_tor_network" android:key="pref_key_tor_network"
@@ -65,6 +66,7 @@
<SwitchPreference <SwitchPreference
android:defaultValue="true" android:defaultValue="true"
android:dependency="pref_key_tor_enable"
android:key="pref_key_tor_mobile_data" android:key="pref_key_tor_mobile_data"
android:persistent="false" android:persistent="false"
android:title="@string/tor_mobile_data_title" android:title="@string/tor_mobile_data_title"
@@ -73,6 +75,7 @@
<SwitchPreference <SwitchPreference
android:defaultValue="false" android:defaultValue="false"
android:dependency="pref_key_tor_enable"
android:key="pref_key_tor_only_when_charging" android:key="pref_key_tor_only_when_charging"
android:persistent="false" android:persistent="false"
android:title="@string/tor_only_when_charging_title" android:title="@string/tor_only_when_charging_title"