mirror
/
NetGuard
mirror of https://github.com/M66B/NetGuard.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Prevent name clashes 

Refs #187
This commit is contained in:
M66B 2015-12-01 20:20:44 +01:00
parent 5f08cd557d
commit 5e08385a9e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View File

@ -174,12 +174,12 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
updateTechnicalInfo();
if (!Util.hasTelephony(this)) {
PreferenceCategory defaults = (PreferenceCategory)screen.findPreference("defaults");
PreferenceCategory defaults = (PreferenceCategory) screen.findPreference("category_defaults");
defaults.removePreference(screen.findPreference("whitelist_other"));
defaults.removePreference(screen.findPreference("screen_other"));
defaults.removePreference(screen.findPreference("whitelist_roaming"));
PreferenceCategory options = (PreferenceCategory)screen.findPreference("options");
PreferenceCategory options = (PreferenceCategory) screen.findPreference("category_options");
options.removePreference(screen.findPreference("use_metered"));
options.removePreference(screen.findPreference("national_roaming"));
}

8
app/src/main/res/xml/preferences.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<PreferenceCategory
android:key="defaults"
android:key="category_defaults"
android:title="@string/setting_defaults">
<SwitchPreference
android:defaultValue="true"
@ -25,7 +25,7 @@
android:title="@string/setting_whitelist_roaming" />
</PreferenceCategory>
<PreferenceCategory
android:key="options"
android:key="category_options"
android:title="@string/setting_options">
<SwitchPreference
android:defaultValue="false"
@ -48,7 +48,7 @@
android:title="@string/setting_national_roaming" />
</PreferenceCategory>
<PreferenceCategory
android:key="backup"
android:key="category_backup"
android:title="@string/setting_backup">
<Preference
android:key="export"
@ -58,7 +58,7 @@
android:title="@string/setting_import" />
</PreferenceCategory>
<PreferenceCategory
android:key="technical"
android:key="category_technical"
android:title="@string/setting_technical">
<Preference android:key="technical" />
</PreferenceCategory>