n/nextdns-mgmt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Improved runnable

Browse Source
This commit is contained in:
PeratX 2017-04-21 23:05:16 +08:00
parent 34ae1e2990
commit eee6d3923f
1 changed files with 81 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

161
app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java
View File

@ -41,8 +41,8 @@ public class ServerTestActivity extends AppCompatActivity {
private static final String TAG = "DServerTest"; private static final String TAG = "DServerTest";
private static boolean testing = false;
private static Thread mThread = null; private static Thread mThread = null;
private static Runnable mRunnable = null;
private ServerTestHandler mHandler = null; private ServerTestHandler mHandler = null;
@Override @Override
@ -63,6 +63,70 @@ public class ServerTestActivity extends AppCompatActivity {
final Context context = this; final Context context = this;
mRunnable = new Runnable() {
@Override
public void run() {
try {
String testDomain = textViewTestUrl.getText().toString();
if (testDomain.equals("")) {
testDomain = Daedalus.DEFAULT_TEST_DOMAINS[0];
}
StringBuilder testText = new StringBuilder();
ArrayList<String> dnsServers = new ArrayList<String>() {{
add(DnsServer.getDnsServerAddressByStringDescription(context, spinnerServerChoice.getSelectedItem().toString()));
String servers = Daedalus.getPrefs().getString("dns_test_servers", "");
if (!servers.equals("")) {
for (String server : servers.split(",")) {
add(server);
}
}
}};
DNSClient client = new DNSClient(null);
for (String dnsServer : dnsServers) {
testText = testServer(client, dnsServer, testDomain, testText);
}
mHandler.obtainMessage(MSG_TEST_DONE).sendToTarget();
} catch (Exception e) {
Log.e(TAG, e.toString());
}
}
private StringBuilder testServer(DNSClient client, String dnsServer, String testUrl, StringBuilder testText) {
Log.d(TAG, "Testing DNS " + dnsServer);
testText.append(getResources().getString(R.string.test_domain)).append(" ").append(testUrl).append("\n").append(getResources().getString(R.string.test_dns_server)).append(" ").append(dnsServer);
mHandler.obtainMessage(MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
Question question = new Question(testUrl, Record.TYPE.getType(A.class));
DNSMessage.Builder message = DNSMessage.builder();
message.setQuestion(question);
message.setId((new Random()).nextInt());
message.setRecursionDesired(true);
message.getEdnsBuilder().setUdpPayloadSize(1024).setDnssecOk(false);
try {
long startTime = System.currentTimeMillis();
DNSMessage responseMessage = client.query(message.build(), InetAddressUtil.ipv4From(dnsServer));
long endTime = System.currentTimeMillis();
Set<A> answers = responseMessage.getAnswersFor(question);
for (A a : answers) {
InetAddress inetAddress = a.getInetAddress();
testText.append("\n").append(getResources().getString(R.string.test_result_resolved)).append(" ").append(inetAddress.getHostAddress());
}
testText.append("\n").append(getResources().getString(R.string.test_time_used)).append(" ").append(String.valueOf(endTime - startTime)).append(" ms\n\n");
} catch (Exception e) {
testText.append("\n").append(getResources().getString(R.string.test_failed)).append("\n\n");
Log.e(TAG, e.toString());
}
mHandler.obtainMessage(MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
return testText;
}
};
final Button startTestBut = (Button) findViewById(R.id.button_start_test); final Button startTestBut = (Button) findViewById(R.id.button_start_test);
startTestBut.setOnClickListener(new View.OnClickListener() { startTestBut.setOnClickListener(new View.OnClickListener() {
@Override @Override
@ -77,70 +141,7 @@ public class ServerTestActivity extends AppCompatActivity {
textViewTestInfo.setText(""); textViewTestInfo.setText("");
if (mThread == null) { if (mThread == null) {
Runnable runnable = new Runnable() { mThread = new Thread(mRunnable);
@Override
public void run() {
try {
String testDomain = textViewTestUrl.getText().toString();
if (testDomain.equals("")) {
testDomain = Daedalus.DEFAULT_TEST_DOMAINS[0];
}
StringBuilder testText = new StringBuilder();
ArrayList<String> dnsServers = new ArrayList<String>() {{
add(DnsServer.getDnsServerAddressByStringDescription(context, spinnerServerChoice.getSelectedItem().toString()));
String servers = Daedalus.getPrefs().getString("dns_test_servers", "");
if (!servers.equals("")) {
for (String server : servers.split(",")) {
add(server);
}
}
}};
DNSClient client = new DNSClient(null);
for (String dnsServer : dnsServers) {
testText = testServer(client, dnsServer, testDomain, testText);
}
mHandler.obtainMessage(MSG_TEST_DONE).sendToTarget();
} catch (Exception e) {
Log.e(TAG, e.toString());
}
}
private StringBuilder testServer(DNSClient client, String dnsServer, String testUrl, StringBuilder testText) {
Log.d(TAG, "Testing DNS " + dnsServer);
testText.append(getResources().getString(R.string.test_domain)).append(" ").append(testUrl).append("\n").append(getResources().getString(R.string.test_dns_server)).append(" ").append(dnsServer);
mHandler.obtainMessage(MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
Question question = new Question(testUrl, Record.TYPE.getType(A.class));
DNSMessage.Builder message = DNSMessage.builder();
message.setQuestion(question);
message.setId((new Random()).nextInt());
message.setRecursionDesired(true);
message.getEdnsBuilder().setUdpPayloadSize(1024).setDnssecOk(false);
try {
long startTime = System.currentTimeMillis();
DNSMessage responseMessage = client.query(message.build(), InetAddressUtil.ipv4From(dnsServer));
long endTime = System.currentTimeMillis();
Set<A> answers = responseMessage.getAnswersFor(question);
for (A a : answers) {
InetAddress inetAddress = a.getInetAddress();
testText.append("\n").append(getResources().getString(R.string.test_result_resolved)).append(" ").append(inetAddress.getHostAddress());
}
testText.append("\n").append(getResources().getString(R.string.test_time_used)).append(" ").append(String.valueOf(endTime - startTime)).append(" ms\n\n");
} catch (Exception e) {
testText.append("\n").append(getResources().getString(R.string.test_failed)).append("\n\n");
Log.e(TAG, e.toString());
}
mHandler.obtainMessage(MSG_DISPLAY_STATUS, testText.toString()).sendToTarget();
return testText;
}
};
mThread = new Thread(runnable);
mThread.start(); mThread.start();
} }
} }
@ -155,13 +156,22 @@ public class ServerTestActivity extends AppCompatActivity {
protected void onDestroy() { protected void onDestroy() {
super.onDestroy(); super.onDestroy();
if (mThread != null) { stopThread();
mThread.interrupt(); mRunnable = null;
mThread = null;
}
mHandler = null; mHandler = null;
} }
private static void stopThread() {
try {
if (mThread != null) {
mThread.join(1);
mThread = null;
}
} catch (Exception e) {
Log.e(TAG, e.toString());
}
}
public static class ServerTestHandler extends Handler { public static class ServerTestHandler extends Handler {
private Button startTestBtn = null; private Button startTestBtn = null;
private TextView textViewTestInfo = null; private TextView textViewTestInfo = null;
@ -179,20 +189,11 @@ public class ServerTestActivity extends AppCompatActivity {
textViewTestInfo.setText((String) msg.obj); textViewTestInfo.setText((String) msg.obj);
break; break;
case MSG_TEST_DONE: case MSG_TEST_DONE:
testing = false;
startTestBtn.setVisibility(View.VISIBLE); startTestBtn.setVisibility(View.VISIBLE);
mThread = null;
stopThread();
break; break;
} }
} }
} }
@Override
protected void onRestart() {
super.onRestart();
if (testing) {
final Button startTestBut = (Button) findViewById(R.id.button_start_test);
startTestBut.setVisibility(View.INVISIBLE);
}
}
} }