mirror/NetGuard
1
0
Fork 0
mirror of https://github.com/M66B/NetGuard.git synced 2025-02-25 07:32:46 +00:00
Code Issues Releases Wiki Activity

Remember last hosts file download, improvements

Browse source 
Fixes #273
This commit is contained in:
M66B 2016-02-03 13:23:54 +01:00
parent b4685b256d
commit a0dc8d46be
3 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
app/src/main/java/eu/faircode/netguard/ActivitySettings.java
View file

@ -117,7 +117,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
protected void onPostCreate(Bundle savedInstanceState) { protected void onPostCreate(Bundle savedInstanceState) {
super.onPostCreate(savedInstanceState); super.onPostCreate(savedInstanceState);
final PreferenceScreen screen = getPreferenceScreen(); final PreferenceScreen screen = getPreferenceScreen();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this); final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
// Handle auto enable // Handle auto enable
Preference pref_auto_enable = screen.findPreference("auto_enable"); Preference pref_auto_enable = screen.findPreference("auto_enable");
@ -203,7 +203,10 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
Preference pref_hosts = screen.findPreference("hosts"); Preference pref_hosts = screen.findPreference("hosts");
Preference pref_block_domains = screen.findPreference("use_hosts"); Preference pref_block_domains = screen.findPreference("use_hosts");
EditTextPreference pref_hosts_url = (EditTextPreference) screen.findPreference("hosts_url"); EditTextPreference pref_hosts_url = (EditTextPreference) screen.findPreference("hosts_url");
Preference pref_hosts_download = screen.findPreference("hosts_download"); final Preference pref_hosts_download = screen.findPreference("hosts_download");
String last = prefs.getString("hosts_last", null);
if (last != null)
pref_hosts_download.setSummary(getString(R.string.msg_download_last, last));
if (Util.isPlayStoreInstall(this)) { if (Util.isPlayStoreInstall(this)) {
PreferenceCategory pref_category = (PreferenceCategory) screen.findPreference("category_advanced_options"); PreferenceCategory pref_category = (PreferenceCategory) screen.findPreference("category_advanced_options");
@ -232,28 +235,33 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
pref_hosts_download.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { pref_hosts_download.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
@Override @Override
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
final File tmp = new File(getFilesDir(), "hosts.tmp");
final File hosts = new File(getFilesDir(), "hosts.txt"); final File hosts = new File(getFilesDir(), "hosts.txt");
EditTextPreference pref_hosts_url = (EditTextPreference) screen.findPreference("hosts_url"); EditTextPreference pref_hosts_url = (EditTextPreference) screen.findPreference("hosts_url");
try { try {
new DownloadTask(ActivitySettings.this, new URL(pref_hosts_url.getText()), hosts, new DownloadTask.Listener() { new DownloadTask(ActivitySettings.this, new URL(pref_hosts_url.getText()), tmp, new DownloadTask.Listener() {
@Override @Override
public void onCompleted() { public void onCompleted() {
if (hosts.exists())
hosts.delete();
tmp.renameTo(hosts);
String last = SimpleDateFormat.getDateTimeInstance().format(new Date().getTime());
prefs.edit().putString("hosts_last", last).apply();
pref_hosts_download.setSummary(getString(R.string.msg_download_last, last));
Toast.makeText(ActivitySettings.this, R.string.msg_downloaded, Toast.LENGTH_LONG).show(); Toast.makeText(ActivitySettings.this, R.string.msg_downloaded, Toast.LENGTH_LONG).show();
SinkholeService.reload(null, "hosts file download", ActivitySettings.this); SinkholeService.reload(null, "hosts file download", ActivitySettings.this);
} }
@Override @Override
public void onCancelled() { public void onCancelled() {
if (hosts.exists()) if (tmp.exists())
hosts.delete(); tmp.delete();
SinkholeService.reload(null, "hosts file download", ActivitySettings.this);
} }
@Override @Override
public void onException(Throwable ex) { public void onException(Throwable ex) {
if (hosts.exists()) if (tmp.exists())
hosts.delete(); tmp.delete();
SinkholeService.reload(null, "hosts file download", ActivitySettings.this);
Toast.makeText(ActivitySettings.this, ex.getMessage(), Toast.LENGTH_LONG).show(); Toast.makeText(ActivitySettings.this, ex.getMessage(), Toast.LENGTH_LONG).show();
} }
}).execute(); }).execute();

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

@ -128,6 +128,7 @@ Your internet traffic is not being sent to a remote VPN server.</string>
<string name="msg_reset_access">This will delete access attempt log lines without allow/block rules</string> <string name="msg_reset_access">This will delete access attempt log lines without allow/block rules</string>
<string name="msg_downloading">Downloading\n%1s</string> <string name="msg_downloading">Downloading\n%1s</string>
<string name="msg_downloaded">Hosts file downloaded</string> <string name="msg_downloaded">Hosts file downloaded</string>
<string name="msg_download_last">Last download: %s</string>
<string name="title_conditions">Conditions</string> <string name="title_conditions">Conditions</string>
<string name="title_screen_wifi">Allow Wi-Fi when screen is on</string> <string name="title_screen_wifi">Allow Wi-Fi when screen is on</string>

1
app/src/main/res/xml-v21/preferences.xml
View file

@ -178,6 +178,7 @@
android:title="@string/setting_hosts" /> android:title="@string/setting_hosts" />
<EditTextPreference <EditTextPreference
android:defaultValue="http://www.netguard.me/hosts" android:defaultValue="http://www.netguard.me/hosts"
android:hint="http://www.netguard.me/hosts"
android:key="hosts_url" android:key="hosts_url"
android:title="@string/setting_hosts_url" /> android:title="@string/setting_hosts_url" />
<Preference <Preference