diff --git a/app/src/main/java/eu/faircode/netguard/ActivityDns.java b/app/src/main/java/eu/faircode/netguard/ActivityDns.java index eaa2a275..290eb81d 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityDns.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityDns.java @@ -95,7 +95,7 @@ public class ActivityDns extends AppCompatActivity { ServiceSinkhole.reload("DNS cleanup", ActivityDns.this); updateAdapter(); } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } private void clear() { @@ -112,7 +112,7 @@ public class ActivityDns extends AppCompatActivity { ServiceSinkhole.reload("DNS clear", ActivityDns.this); updateAdapter(); } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } private void updateAdapter() { diff --git a/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java b/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java index 27e7b09e..6f88268a 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityForwarding.java @@ -179,7 +179,7 @@ public class ActivityForwarding extends AppCompatActivity { spRuid.setVisibility(View.VISIBLE); } }; - task.execute(); + task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); dialog = new AlertDialog.Builder(this) .setView(view) @@ -223,7 +223,7 @@ public class ActivityForwarding extends AppCompatActivity { } else Toast.makeText(ActivityForwarding.this, ex.toString(), Toast.LENGTH_LONG).show(); } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } catch (Throwable ex) { Toast.makeText(ActivityForwarding.this, ex.toString(), Toast.LENGTH_LONG).show(); } diff --git a/app/src/main/java/eu/faircode/netguard/ActivityLog.java b/app/src/main/java/eu/faircode/netguard/ActivityLog.java index 770d2d6b..d6b76c7d 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityLog.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityLog.java @@ -497,7 +497,7 @@ public class ActivityLog extends AppCompatActivity implements SharedPreferences. if (running) updateAdapter(); } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); return true; case R.id.menu_log_support: @@ -620,6 +620,6 @@ public class ActivityLog extends AppCompatActivity implements SharedPreferences. else Toast.makeText(ActivityLog.this, ex.toString(), Toast.LENGTH_LONG).show(); } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } } diff --git a/app/src/main/java/eu/faircode/netguard/ActivityMain.java b/app/src/main/java/eu/faircode/netguard/ActivityMain.java index cae134af..909eda22 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivityMain.java +++ b/app/src/main/java/eu/faircode/netguard/ActivityMain.java @@ -118,18 +118,6 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences public static final String EXTRA_METERED = "Metered"; public static final String EXTRA_SIZE = "Size"; - private static ExecutorService mExecutor = Executors.newFixedThreadPool(Runtime.getRuntime().availableProcessors(), - new PriorityThreadFactory()); - - private static class PriorityThreadFactory implements ThreadFactory { - @Override - public Thread newThread(Runnable r) { - Thread t = new Thread(r); - t.setPriority(Thread.MAX_PRIORITY); - return t; - } - } - @Override protected void onCreate(Bundle savedInstanceState) { Log.i(TAG, "Create version=" + Util.getSelfVersionName(this) + "/" + Util.getSelfVersionCode(this)); @@ -1063,7 +1051,7 @@ public class ActivityMain extends AppCompatActivity implements SharedPreferences } } } - }.execute(mExecutor); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } private void updateSearch(String search) { diff --git a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java index ecb56d0e..9942eb21 100644 --- a/app/src/main/java/eu/faircode/netguard/ActivitySettings.java +++ b/app/src/main/java/eu/faircode/netguard/ActivitySettings.java @@ -201,7 +201,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere else Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show(); } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } }); return false; @@ -376,7 +376,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere if (running) Toast.makeText(ActivitySettings.this, ex.getMessage(), Toast.LENGTH_LONG).show(); } - }).execute(); + }).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } catch (MalformedURLException ex) { Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show(); } @@ -1015,7 +1015,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show(); } } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } private void handleHosts(final Intent data) { @@ -1082,7 +1082,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show(); } } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } private void handleImport(final Intent data) { @@ -1124,7 +1124,7 @@ public class ActivitySettings extends AppCompatActivity implements SharedPrefere Toast.makeText(ActivitySettings.this, ex.toString(), Toast.LENGTH_LONG).show(); } } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } private void xmlExport(OutputStream out) throws IOException { diff --git a/app/src/main/java/eu/faircode/netguard/AdapterAccess.java b/app/src/main/java/eu/faircode/netguard/AdapterAccess.java index b3c93a5c..095cb450 100644 --- a/app/src/main/java/eu/faircode/netguard/AdapterAccess.java +++ b/app/src/main/java/eu/faircode/netguard/AdapterAccess.java @@ -161,7 +161,7 @@ public class AdapterAccess extends CursorAdapter { " >" + addr + (dport > 0 ? "/" + dport : "")); ViewCompat.setHasTransientState(tvDest, false); } - }.execute(daddr); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, daddr); if (allowed < 0) tvDest.setTextColor(colorText); diff --git a/app/src/main/java/eu/faircode/netguard/AdapterLog.java b/app/src/main/java/eu/faircode/netguard/AdapterLog.java index a2726561..c4af2f25 100644 --- a/app/src/main/java/eu/faircode/netguard/AdapterLog.java +++ b/app/src/main/java/eu/faircode/netguard/AdapterLog.java @@ -265,7 +265,7 @@ public class AdapterLog extends CursorAdapter { tvDaddr.setText(">" + name); ViewCompat.setHasTransientState(tvDaddr, false); } - }.execute(daddr); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, daddr); } else tvDaddr.setText(dname); else @@ -299,7 +299,7 @@ public class AdapterLog extends CursorAdapter { } ViewCompat.setHasTransientState(tvOrganization, false); } - }.execute(daddr); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, daddr); } // Show extra data diff --git a/app/src/main/java/eu/faircode/netguard/AdapterRule.java b/app/src/main/java/eu/faircode/netguard/AdapterRule.java index bea7bc66..ec7e3ba2 100644 --- a/app/src/main/java/eu/faircode/netguard/AdapterRule.java +++ b/app/src/main/java/eu/faircode/netguard/AdapterRule.java @@ -749,7 +749,7 @@ public class AdapterRule extends RecyclerView.Adapter im rule.hosts = hosts; notifyDataSetChanged(); } - }.execute(); + }.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); return result; } diff --git a/app/src/main/java/eu/faircode/netguard/Util.java b/app/src/main/java/eu/faircode/netguard/Util.java index ed553eac..dfe7f958 100644 --- a/app/src/main/java/eu/faircode/netguard/Util.java +++ b/app/src/main/java/eu/faircode/netguard/Util.java @@ -972,7 +972,7 @@ public class Util { } } }; - task.execute(); + task.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); } private static StringBuilder getTrafficLog(Context context) {