Added support for test specified url

This commit is contained in:
PeratX 2017-04-07 00:46:30 +08:00
parent d36ab5d9a5
commit 132a90b181
3 changed files with 31 additions and 10 deletions

View File

@ -1,15 +1,15 @@
package org.itxtech.daedalus;
import android.content.Context;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.Button;
import android.widget.Spinner;
import android.widget.TextView;
import android.view.inputmethod.InputMethodManager;
import android.widget.*;
import de.measite.minidns.DNSClient;
import de.measite.minidns.DNSMessage;
import de.measite.minidns.Question;
@ -18,7 +18,8 @@ import de.measite.minidns.record.A;
import de.measite.minidns.util.InetAddressUtil;
import java.net.InetAddress;
import java.util.*;
import java.util.Random;
import java.util.Set;
public class ServerTestActivity extends AppCompatActivity {
private static final int MSG_DISPLAY_STATUS = 0;
@ -37,6 +38,10 @@ public class ServerTestActivity extends AppCompatActivity {
final Spinner spinnerServerChoice = (Spinner) findViewById(R.id.spinner_server_choice);
final AutoCompleteTextView textViewTestUrl = (AutoCompleteTextView) findViewById(R.id.autoCompleteTextView_test_url);
ArrayAdapter arrayAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.default_test_urls));
textViewTestUrl.setAdapter(arrayAdapter);
final Button startTestBut = (Button) findViewById(R.id.button_start_test);
startTestBut.setOnClickListener(new View.OnClickListener() {
@Override
@ -45,6 +50,9 @@ public class ServerTestActivity extends AppCompatActivity {
.setAction("Action", null).show();
startTestBut.setVisibility(View.INVISIBLE);
InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
imm.hideSoftInputFromWindow(v.getWindowToken(), 0);
textViewTestInfo.setText("");
if (mThread == null) {
@ -52,7 +60,7 @@ public class ServerTestActivity extends AppCompatActivity {
@Override
public void run() {
try {
String testUrl = "www.google.com";
String testUrl = textViewTestUrl.getText().toString();
String testText = "";
String[] dnsServers = {DnsServers.getDnsServerAddress(String.valueOf(spinnerServerChoice.getSelectedItemId())), "114.114.114.114", "8.8.8.8"};
DNSClient client = new DNSClient(null);

View File

@ -6,8 +6,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/activity_server_test"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@ -25,8 +23,8 @@
<Button
android:text="@string/action_start_test"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_below="@+id/spinner_server_choice"
android:layout_alignParentStart="true" android:layout_marginTop="20dp"
android:layout_height="wrap_content" android:layout_below="@+id/autoCompleteTextView_test_url"
android:layout_alignParentStart="true" android:layout_marginTop="10dp"
android:id="@+id/button_start_test"
android:layout_alignParentEnd="true"/>
<TextView
@ -35,5 +33,14 @@
android:layout_alignParentStart="true" android:layout_marginTop="10dp"
android:id="@+id/textView_test_info"
android:textSize="18sp"/>
<AutoCompleteTextView
android:text="www.google.com"
android:completionThreshold="3"
android:singleLine="true"
android:dropDownWidth="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/autoCompleteTextView_test_url" android:layout_below="@+id/spinner_server_choice"
android:layout_marginTop="10dp"/>
</RelativeLayout>
</ScrollView>

View File

@ -9,4 +9,10 @@
<item>1</item>
<item>2</item>
</string-array>
<string-array name="default_test_urls">
<item>www.google.com</item>
<item>twitter.com</item>
<item>youtube.com</item>
<item>facebook.com</item>
</string-array>
</resources>