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

Ad blocking is not allowed in the Play store

This commit is contained in:
M66B 2016-01-23 17:08:03 +01:00
parent 70cc2e9017
commit 97905df132
3 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -179,14 +179,19 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
// Handle hosts
Preference pref_hosts = screen.findPreference("hosts");
pref_hosts.setEnabled(getIntentOpenHosts().resolveActivity(getPackageManager()) != null);
pref_hosts.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
startActivityForResult(getIntentOpenHosts(), ActivitySettings.REQUEST_HOSTS);
return true;
}
});
if (Util.isPlayStoreInstall(this)) {
PreferenceCategory pref_backup = (PreferenceCategory) screen.findPreference("category_backup");
pref_backup.removePreference(pref_hosts);
} else {
pref_hosts.setEnabled(getIntentOpenHosts().resolveActivity(getPackageManager()) != null);
pref_hosts.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override
public boolean onPreferenceClick(Preference preference) {
startActivityForResult(getIntentOpenHosts(), ActivitySettings.REQUEST_HOSTS);
return true;
}
});
}
// Handle technical info
Preference.OnPreferenceClickListener listener = new Preference.OnPreferenceClickListener() {

1
app/src/main/res/values/strings.xml
View File

@ -64,6 +64,7 @@ These issues are caused by bugs in Android, or in the software provided by the m
<string name="setting_backup">Backup</string>
<string name="setting_export">Export settings</string>
<string name="setting_import">Import settings</string>
<string name="setting_hosts">Import hosts file</string>
<string name="setting_technical">Technical information</string>

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

@ -133,6 +133,9 @@
<Preference
android:key="import"
android:title="@string/setting_import" />
<Preference
android:key="hosts"
android:title="@string/setting_hosts" />
</PreferenceCategory>
<PreferenceCategory
android:key="category_development"
@ -143,9 +146,6 @@
android:entryValues="@array/logLevelValues"
android:key="loglevel"
android:title="Native log level" />
<Preference
android:key="hosts"
android:title="Import hosts file" />
</PreferenceCategory>
<PreferenceCategory
android:key="category_technical"