CuteDNS!'s nodes is not available, now changed it to Pure DNS as default.

This commit is contained in:
PeratX 2017-04-22 10:37:35 +08:00
parent aceb5dbdda
commit beb141de4c
8 changed files with 14 additions and 13 deletions

View File

@ -48,7 +48,7 @@ DNS server providers
Requirements
-------------
* Minimum Android version: 4.0.3 (API 15)
* Minimum Android version: 4.0.4 (API 15)
* Recommended Android version: >= 5.0 (API 21)
* Best Android version: >= 7.1 (API 25)

View File

@ -57,7 +57,7 @@
<div style="font-size: 25px;"><a href="https://aixyz.com">AIXYZ DNS</a></div>
<br>
<br>
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS 仅限用于学术用途</div>
<div style="font-size: 12px; color: #FF4081">AIXYZ DNS 仅限用于学术目的</div>
<div style="font-size: 12px; color: gray;">
使用者必须遵守当地法律法规。<br>
欢迎加入 CuteDNS! QQ群336152805 。<br>

View File

@ -118,9 +118,9 @@ public class AboutActivity extends AppCompatActivity {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/iTXTech/Daedalus")));
}
if (id == R.id.action_visit_cutedns) {
/*if (id == R.id.action_visit_cutedns) {
startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://www.cutedns.cn")));
}
}*/
/*if (id == R.id.action_join_qqgroup) {
joinQQGroup("q6Lfo_EhAEO1fP6Xg3fmKsP4pd6U5-RE");

View File

@ -63,7 +63,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
startActivity(new Intent(v.getContext(), ServerTestActivity.class));
startActivity(new Intent(Daedalus.getInstance(), ServerTestActivity.class));
}
});
@ -192,7 +192,7 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On
}
private Intent getServiceIntent() {
return new Intent(this, DaedalusVpnService.class);
return new Intent(getApplicationContext(), DaedalusVpnService.class);
}
protected void onActivityResult(int request, int result, Intent data) {

View File

@ -157,6 +157,7 @@ public class ServerTestActivity extends AppCompatActivity {
super.onDestroy();
stopThread();
mHandler.removeCallbacks(mRunnable);
mRunnable = null;
mHandler = null;
}

View File

@ -169,9 +169,9 @@ public class DaedalusVpnService extends VpnService implements Runnable {
stopSelf();
if (shouldRefresh && MainActivity.getInstance() != null && MainActivity.getInstance().isAppOnForeground()) {
MainActivity.getInstance().startActivity(new Intent(this, MainActivity.class).putExtra(MainActivity.LAUNCH_ACTION, MainActivity.LAUNCH_ACTION_NONE));
MainActivity.getInstance().startActivity(new Intent(getApplicationContext(), MainActivity.class).putExtra(MainActivity.LAUNCH_ACTION, MainActivity.LAUNCH_ACTION_NONE));
} else if (shouldRefresh) {
Daedalus.updateShortcut(this.getApplicationContext());
Daedalus.updateShortcut(getApplicationContext());
}
}

View File

@ -10,12 +10,12 @@
android:title="@string/action_visit_github"
android:orderInCategory="100"
app:showAsAction="never"/>
<item android:id="@+id/action_visit_cutedns"
<!--item android:id="@+id/action_visit_cutedns"
android:title="@string/action_visit_cutedns"
android:orderInCategory="100"
app:showAsAction="never"/>
app:showAsAction="never"/-->
<!--item android:id="@+id/action_join_qqgroup"
android:title="@string/action_join_qqgroup"
android:orderInCategory="100"
app:showAsAction="never"!/-->
app:showAsAction="never"/-->
</menu>

View File

@ -8,13 +8,13 @@
<ListPreference
android:key="primary_server"
android:title="@string/primary_server"
android:defaultValue="0">
android:defaultValue="3">
</ListPreference>
<ListPreference
android:key="secondary_server"
android:title="@string/secondary_server"
android:defaultValue="1">
android:defaultValue="4">
</ListPreference>
<EditTextPreference
android:key="dns_test_servers"