diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8ab3e2f..e4450fe 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -41,8 +41,7 @@ + android:launchMode="singleTask"> diff --git a/app/src/main/java/org/itxtech/daedalus/Daedalus.java b/app/src/main/java/org/itxtech/daedalus/Daedalus.java index 86e6c16..530d1df 100644 --- a/app/src/main/java/org/itxtech/daedalus/Daedalus.java +++ b/app/src/main/java/org/itxtech/daedalus/Daedalus.java @@ -23,6 +23,14 @@ public class Daedalus extends Application { add(new DnsServer("2", "123.206.61.167", R.string.server_south_china)); }}; + public static final String[] DEFAULT_TEST_DOMAINS = new String[]{ + "google.com", + "twitter.com", + "youtube.com", + "facebook.com", + "wikipedia.org" + }; + private static Daedalus instance = null; @Override 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 88e3b7c..77506e6 100644 --- a/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/activity/MainActivity.java @@ -10,7 +10,6 @@ import android.os.Bundle; import android.preference.PreferenceManager; import android.support.design.widget.FloatingActionButton; import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.View; @@ -46,8 +45,8 @@ public class MainActivity extends AppCompatActivity { initConfig(); setContentView(R.layout.activity_main); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); - setSupportActionBar(toolbar); + /*Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + setSupportActionBar(toolbar);*/ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab); fab.setOnClickListener(new View.OnClickListener() { 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 c77e0f6..ec22bc2 100644 --- a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java @@ -16,6 +16,7 @@ import de.measite.minidns.Question; import de.measite.minidns.Record; import de.measite.minidns.record.A; import de.measite.minidns.util.InetAddressUtil; +import org.itxtech.daedalus.Daedalus; import org.itxtech.daedalus.R; import org.itxtech.daedalus.util.DnsServer; @@ -53,7 +54,7 @@ public class ServerTestActivity extends AppCompatActivity { spinnerServerChoice.setAdapter(spinnerArrayAdapter); final AutoCompleteTextView textViewTestUrl = (AutoCompleteTextView) findViewById(R.id.autoCompleteTextView_test_url); - ArrayAdapter autoCompleteArrayAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, getResources().getStringArray(R.array.default_test_urls)); + ArrayAdapter autoCompleteArrayAdapter = new ArrayAdapter<>(this, android.R.layout.simple_list_item_1, Daedalus.DEFAULT_TEST_DOMAINS); textViewTestUrl.setAdapter(autoCompleteArrayAdapter); final Context context = this; @@ -78,7 +79,7 @@ public class ServerTestActivity extends AppCompatActivity { try { String testUrl = textViewTestUrl.getText().toString(); if (testUrl.equals("")) { - testUrl = getResources().getStringArray(R.array.default_test_urls)[0]; + testUrl = Daedalus.DEFAULT_TEST_DOMAINS[0]; } String testText = ""; String[] dnsServers = {DnsServer.getDnsServerAddressByStringDesription(context, spinnerServerChoice.getSelectedItem().toString()), "114.114.114.114", "8.8.8.8"}; diff --git a/app/src/main/java/org/itxtech/daedalus/view/ClickPreference.java b/app/src/main/java/org/itxtech/daedalus/view/ClickPreference.java index 4d4c307..e8c7b67 100644 --- a/app/src/main/java/org/itxtech/daedalus/view/ClickPreference.java +++ b/app/src/main/java/org/itxtech/daedalus/view/ClickPreference.java @@ -5,7 +5,14 @@ import android.preference.ListPreference; import android.util.AttributeSet; /** - * @author PeratX + * Daedalus Project + * + * @author iTXTech + * @link https://itxtech.org + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, version 3. */ public class ClickPreference extends ListPreference { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 4321e69..c40a19c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -8,20 +8,6 @@ android:fitsSystemWindows="true" tools:context="org.itxtech.daedalus.activity.MainActivity"> - - - - - - - - google.com - twitter.com - youtube.com - facebook.com - wikipedia.org - - \ No newline at end of file