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

Fixed potential crashes 

Google: after all these years we are still missing a reliable AsynTask / Dialog

Fixes #291
This commit is contained in:
M66B 2016-02-07 09:28:02 +01:00
parent 6aa89b8038
commit a2c1f1c5eb
4 changed files with 68 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/faircode/netguard/ActivityLog.java
View File

@ -59,6 +59,7 @@ import java.util.Date;
public class ActivityLog extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Log";
private boolean running = false;
private ListView lvLog;
private LogAdapter adapter;
private MenuItem menuSearch = null;
@ -88,6 +89,7 @@ public class ActivityLog extends AppCompatActivity implements SharedPreferences.
Util.setTheme(this);
super.onCreate(savedInstanceState);
setContentView(R.layout.logview);
running = true;
// Action bar
View actionView = getLayoutInflater().inflate(R.layout.action, null);
@ -232,10 +234,9 @@ public class ActivityLog extends AppCompatActivity implements SharedPreferences.
@Override
protected void onDestroy() {
running = false;
dh.close();
PreferenceManager.getDefaultSharedPreferences(this).unregisterOnSharedPreferenceChangeListener(this);
super.onDestroy();
}
@ -409,7 +410,8 @@ public class ActivityLog extends AppCompatActivity implements SharedPreferences.
@Override
protected void onPostExecute(Object result) {
updateAdapter();
if (running)
updateAdapter();
}
}.execute();
return true;

3
app/src/main/java/eu/faircode/netguard/ActivityMain.java
View File

@ -237,7 +237,8 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences
.setNegativeButton(android.R.string.no, new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
finish();
if (running)
finish();
}
})
.setOnDismissListener(new DialogInterface.OnDismissListener() {

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

@ -21,7 +21,6 @@ package eu.faircode.netguard;
import android.Manifest;
import android.annotation.TargetApi;
import android.app.AlertDialog;
import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.DialogInterface;
@ -49,6 +48,7 @@ import android.preference.TwoStatePreference;
import android.support.annotation.NonNull;
import android.support.v4.app.NavUtils;
import android.support.v4.content.LocalBroadcastManager;
import android.support.v7.app.AlertDialog;
import android.support.v7.app.AppCompatActivity;
import android.telephony.PhoneStateListener;
import android.telephony.ServiceState;
@ -91,6 +91,7 @@ import javax.xml.parsers.SAXParserFactory;
public class ActivitySettings extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
private static final String TAG = "NetGuard.Settings";
private boolean running = false;
private boolean phone_state = false;
private static final int REQUEST_EXPORT = 1;
@ -102,6 +103,8 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
private static final int REQUEST_ROAMING_INTERNATIONAL = 7;
private static final int REQUEST_HOSTS = 8;
private AlertDialog dialogFilter = null;
private static final Intent INTENT_VPN_SETTINGS = new Intent("android.net.vpn.SETTINGS");
protected void onCreate(Bundle savedInstanceState) {
@ -109,6 +112,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
super.onCreate(savedInstanceState);
getFragmentManager().beginTransaction().replace(android.R.id.content, new FragmentSettings()).commit();
getSupportActionBar().setTitle(R.string.menu_settings);
running = true;
}
private PreferenceScreen getPreferenceScreen() {
@ -247,10 +251,15 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
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();
if (running) {
pref_hosts_download.setSummary(getString(R.string.msg_download_last, last));
Toast.makeText(ActivitySettings.this, R.string.msg_downloaded, Toast.LENGTH_LONG).show();
}
SinkholeService.reload(null, "hosts file download", ActivitySettings.this);
}
@ -264,7 +273,9 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
public void onException(Throwable ex) {
if (tmp.exists())
tmp.delete();
Toast.makeText(ActivitySettings.this, ex.getMessage(), Toast.LENGTH_LONG).show();
if (running)
Toast.makeText(ActivitySettings.this, ex.getMessage(), Toast.LENGTH_LONG).show();
}
}).execute();
} catch (MalformedURLException ex) {
@ -348,6 +359,16 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
}
}
@Override
protected void onDestroy() {
running = false;
if (dialogFilter != null) {
dialogFilter.dismiss();
dialogFilter = null;
}
super.onDestroy();
}
@Override
public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) {
@ -467,7 +488,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
if (prefs.getBoolean(name, false)) {
LayoutInflater inflater = LayoutInflater.from(ActivitySettings.this);
View view = inflater.inflate(R.layout.filter, null);
new AlertDialog.Builder(ActivitySettings.this)
dialogFilter = new AlertDialog.Builder(ActivitySettings.this)
.setView(view)
.setCancelable(false)
.setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {
@ -476,7 +497,14 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
// Do nothing
}
})
.create().show();
.setOnDismissListener(new DialogInterface.OnDismissListener() {
@Override
public void onDismiss(DialogInterface dialogInterface) {
dialogFilter = null;
}
})
.create();
dialogFilter.show();
}
} else if ("use_hosts".equals(name))
@ -752,10 +780,12 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
@Override
protected void onPostExecute(Throwable ex) {
if (ex == null)
Toast.makeText(ActivitySettings.this, R.string.msg_completed, Toast.LENGTH_LONG).show();
else
Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show();
if (running) {
if (ex == null)
Toast.makeText(ActivitySettings.this, R.string.msg_completed, Toast.LENGTH_LONG).show();
else
Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show();
}
}
}.execute();
}
@ -805,17 +835,19 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
@Override
protected void onPostExecute(Throwable ex) {
if (ex == null) {
Toast.makeText(ActivitySettings.this, R.string.msg_completed, Toast.LENGTH_LONG).show();
if (running) {
if (ex == null) {
Toast.makeText(ActivitySettings.this, R.string.msg_completed, Toast.LENGTH_LONG).show();
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivitySettings.this);
prefs.edit().remove("hosts_last").apply();
getPreferenceScreen().findPreference("hosts_download").setSummary(null);
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(ActivitySettings.this);
prefs.edit().remove("hosts_last").apply();
getPreferenceScreen().findPreference("hosts_download").setSummary(null);
SinkholeService.reload(null, "hosts", ActivitySettings.this);
getPreferenceScreen().findPreference("use_hosts").setEnabled(true);
} else
Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show();
SinkholeService.reload(null, "hosts", ActivitySettings.this);
getPreferenceScreen().findPreference("use_hosts").setEnabled(true);
} else
Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show();
}
}
}.execute();
}
@ -845,13 +877,15 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere
@Override
protected void onPostExecute(Throwable ex) {
if (ex == null) {
Toast.makeText(ActivitySettings.this, R.string.msg_completed, Toast.LENGTH_LONG).show();
SinkholeService.reloadStats("import", ActivitySettings.this);
// Update theme, request permissions
recreate();
} else
Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show();
if (running) {
if (ex == null) {
Toast.makeText(ActivitySettings.this, R.string.msg_completed, Toast.LENGTH_LONG).show();
SinkholeService.reloadStats("import", ActivitySettings.this);
// Update theme, request permissions
recreate();
} else
Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show();
}
}
}.execute();
}

2
app/src/main/java/eu/faircode/netguard/DownloadTask.java
View File

@ -22,7 +22,7 @@ public class DownloadTask extends AsyncTask<Object, Integer, Object> {
private URL url;
private File file;
private Listener listener;
ProgressDialog progressDialog;
private ProgressDialog progressDialog;
private PowerManager.WakeLock wakeLock;
public interface Listener {