From 0cbf5db76d8bfd2e2a53765ad594a71a0f0ead42 Mon Sep 17 00:00:00 2001
From: PeratX <1215714524@qq.com>
Date: Sat, 22 Apr 2017 11:17:03 +0800
Subject: [PATCH] Updated README.md
---
README.md | 20 +------------------
.../java/org/itxtech/daedalus/Daedalus.java | 13 ++++++------
.../daedalus/activity/MainActivity.java | 2 ++
.../daedalus/activity/ServerTestActivity.java | 5 +++++
.../daedalus/service/DaedalusVpnService.java | 2 ++
app/src/main/res/xml/perf_settings.xml | 4 ++--
6 files changed, 19 insertions(+), 27 deletions(-)
diff --git a/README.md b/README.md
index 015f914..251f290 100644
--- a/README.md
+++ b/README.md
@@ -22,27 +22,9 @@ This application can create a VPN tunnel to modify the DNS server on Android.
Through the DNS server which are provided by third parties, users can visit Google, Twitter and so on via https directly without a VPN.
------------------
-
-__CuteDNS! 近期惨遭举报，建议某些人好自为之。__
-
-__AIXYZ DNS 节点仅供学术用途使用！__
-
-__BEYOND THE MATRIX, FREE.__
-
-~~本萌新第一个 Android 应用。~~
-不需要翻墙就能在 Android 上通过 https 协议直连 Google, Twitter, Facebook 等网站。
-通过由第三方 DNS 服务器提供者提供的 DNS 服务器，减少 DNS 劫持。
-~~（当然万能的 *** 想封了你也不是不行）~~ 。
-基于 Android API 提供的 VpnService 实现，不需要 root，数据连接也可用。
-支持开机启动。 ~~BAT流氓软件~~
-~~好吧故事编不下去了。~~
-
-__各位 dalao 见笑了！__
-
DNS server providers
-------------
-* __CuteDNS!__
+* __CuteDNS!__ - *Stopped service because of the police.*
* __[Pure DNS](http://puredns.cn/)__
* __[AIXYZ DNS](https://aixyz.com/)__ - *For academic purposes only.*
diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
index a395e49..30cd760 100644
--- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java
+++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java
@@ -33,13 +33,13 @@ public class Daedalus extends Application {
private static final String SHORTCUT_ID_ACTIVATE = "shortcut_activate";
public static final List DNS_SERVERS = new ArrayList() {{
- add(new DnsServer("0", "113.107.249.56", R.string.server_cutedns_north_china));
+ /*add(new DnsServer("0", "113.107.249.56", R.string.server_cutedns_north_china));
add(new DnsServer("1", "120.27.103.230", R.string.server_cutedns_east_china));
- add(new DnsServer("2", "123.206.61.167", R.string.server_cutedns_south_china));
- add(new DnsServer("3", "115.159.220.214", R.string.server_puredns_east_china));
- add(new DnsServer("4", "123.207.137.88", R.string.server_puredns_north_china));
- add(new DnsServer("5", "115.159.146.99", R.string.server_aixyz_east_china));
- add(new DnsServer("6", "123.206.21.48", R.string.server_aixyz_south_china));
+ add(new DnsServer("2", "123.206.61.167", R.string.server_cutedns_south_china));*/
+ add(new DnsServer("0", "115.159.220.214", R.string.server_puredns_east_china));
+ add(new DnsServer("1", "123.207.137.88", R.string.server_puredns_north_china));
+ add(new DnsServer("2", "115.159.146.99", R.string.server_aixyz_east_china));
+ add(new DnsServer("3", "123.206.21.48", R.string.server_aixyz_south_china));
}};
public static final String[] DEFAULT_TEST_DOMAINS = new String[]{
@@ -76,6 +76,7 @@ public class Daedalus extends Application {
super.onTerminate();
instance = null;
+ prefs = null;
}
public static void updateShortcut(Context context) {
diff --git a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
index a070a7c..cb7a9a8 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java
@@ -103,7 +103,9 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
protected void onDestroy() {
super.onDestroy();
+ Log.d("DMainActivity", "onDestroy");
instance = null;
+ System.gc();
}
@Override
diff --git a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
index 756d846..bcf26e9 100644
--- a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
+++ b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
@@ -159,7 +159,10 @@ public class ServerTestActivity extends AppCompatActivity {
stopThread();
mHandler.removeCallbacks(mRunnable);
mRunnable = null;
+ mHandler.obtainMessage(MSG_TEST_DONE).sendToTarget();
mHandler = null;
+
+ System.gc();
}
private static void stopThread() {
@@ -193,6 +196,8 @@ public class ServerTestActivity extends AppCompatActivity {
startTestBtn.setVisibility(View.VISIBLE);
stopThread();
+ startTestBtn = null;
+ textViewTestInfo = null;
break;
}
}
diff --git a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
index 8fc5a66..f920d2a 100644
--- a/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
+++ b/app/src/main/java/org/itxtech/daedalus/service/DaedalusVpnService.java
@@ -173,6 +173,8 @@ public class DaedalusVpnService extends VpnService implements Runnable {
} else if (shouldRefresh) {
Daedalus.updateShortcut(getApplicationContext());
}
+
+ System.gc();
}
diff --git a/app/src/main/res/xml/perf_settings.xml b/app/src/main/res/xml/perf_settings.xml
index 8284867..9f6eca7 100644
--- a/app/src/main/res/xml/perf_settings.xml
+++ b/app/src/main/res/xml/perf_settings.xml
@@ -8,13 +8,13 @@
+ android:defaultValue="0">
+ android:defaultValue="1">