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

Fixed dns test snackbar time

Browse Source
This commit is contained in:
PeratX 2017-05-26 15:04:06 +08:00
parent 07ae91b2ac
commit 0d88d6f75e
5 changed files with 15 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/itxtech/daedalus/fragment/DnsServerConfigFragment.java
View File

@ -28,16 +28,8 @@ import org.itxtech.daedalus.util.DnsServer;
* (at your option) any later version. * (at your option) any later version.
*/ */
public class DnsServerConfigFragment extends ConfigFragment { public class DnsServerConfigFragment extends ConfigFragment {
private View view;
private int index; private int index;
@Override
public void onDestroy() {
super.onDestroy();
view = null;
}
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -46,7 +38,7 @@ public class DnsServerConfigFragment extends ConfigFragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = super.onCreateView(inflater, container, savedInstanceState); View view = super.onCreateView(inflater, container, savedInstanceState);
EditTextPreference serverName = (EditTextPreference) findPreference("serverName"); EditTextPreference serverName = (EditTextPreference) findPreference("serverName");
serverName.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { serverName.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
@ -106,7 +98,7 @@ public class DnsServerConfigFragment extends ConfigFragment {
String serverPort = ((EditTextPreference) findPreference("serverPort")).getText(); String serverPort = ((EditTextPreference) findPreference("serverPort")).getText();
if (serverName.equals("") | serverAddress.equals("") | serverPort.equals("")) { if (serverName.equals("") | serverAddress.equals("") | serverPort.equals("")) {
Snackbar.make(view, R.string.notice_fill_in_all, Snackbar.LENGTH_LONG) Snackbar.make(getView(), R.string.notice_fill_in_all, Snackbar.LENGTH_LONG)
.setAction("Action", null).show(); .setAction("Action", null).show();
break; break;
} }

2
app/src/main/java/org/itxtech/daedalus/fragment/DnsTestFragment.java
View File

@ -132,7 +132,7 @@ public class DnsTestFragment extends ToolbarFragment {
startTestBut.setOnClickListener(new View.OnClickListener() { startTestBut.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
Snackbar.make(v, R.string.notice_start_test, Snackbar.LENGTH_LONG) Snackbar.make(v, R.string.notice_start_test, Snackbar.LENGTH_SHORT)
.setAction("Action", null).show(); .setAction("Action", null).show();
startTestBut.setVisibility(View.INVISIBLE); startTestBut.setVisibility(View.INVISIBLE);

29
app/src/main/java/org/itxtech/daedalus/fragment/GlobalConfigFragment.java
View File

@ -6,9 +6,7 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.preference.*; import android.preference.*;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import org.itxtech.daedalus.Daedalus; import org.itxtech.daedalus.Daedalus;
import org.itxtech.daedalus.R; import org.itxtech.daedalus.R;
import org.itxtech.daedalus.util.DnsServerHelper; import org.itxtech.daedalus.util.DnsServerHelper;
@ -25,7 +23,6 @@ import org.itxtech.daedalus.util.DnsServerHelper;
* (at your option) any later version. * (at your option) any later version.
*/ */
public class GlobalConfigFragment extends PreferenceFragment { public class GlobalConfigFragment extends PreferenceFragment {
private View view = null;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -46,7 +43,7 @@ public class GlobalConfigFragment extends PreferenceFragment {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
preference.setSummary(DnsServerHelper.getDescription((String) newValue, Daedalus.getInstance())); preference.setSummary(DnsServerHelper.getDescription((String) newValue, Daedalus.getInstance()));
Snackbar.make(view, R.string.notice_need_restart, Snackbar.LENGTH_LONG) Snackbar.make(getView(), R.string.notice_need_restart, Snackbar.LENGTH_LONG)
.setAction("Action", null).show(); .setAction("Action", null).show();
return true; return true;
} }
@ -60,7 +57,7 @@ public class GlobalConfigFragment extends PreferenceFragment {
@Override @Override
public boolean onPreferenceChange(Preference preference, Object newValue) { public boolean onPreferenceChange(Preference preference, Object newValue) {
preference.setSummary(DnsServerHelper.getDescription((String) newValue, Daedalus.getInstance())); preference.setSummary(DnsServerHelper.getDescription((String) newValue, Daedalus.getInstance()));
Snackbar.make(view, R.string.notice_need_restart, Snackbar.LENGTH_LONG) Snackbar.make(getView(), R.string.notice_need_restart, Snackbar.LENGTH_LONG)
.setAction("Action", null).show(); .setAction("Action", null).show();
return true; return true;
} }
@ -121,12 +118,6 @@ public class GlobalConfigFragment extends PreferenceFragment {
updateAdvancedOptions(advanced.isChecked()); updateAdvancedOptions(advanced.isChecked());
} }
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = super.onCreateView(inflater, container, savedInstanceState);
return view;
}
private void updateAdvancedOptions(boolean checked) { private void updateAdvancedOptions(boolean checked) {
PreferenceCategory category = (PreferenceCategory) findPreference("settings_advanced"); PreferenceCategory category = (PreferenceCategory) findPreference("settings_advanced");
for (int i = 1; i < category.getPreferenceCount(); i++) { for (int i = 1; i < category.getPreferenceCount(); i++) {
@ -143,18 +134,10 @@ public class GlobalConfigFragment extends PreferenceFragment {
} }
@Override @Override
public void onStart() { public void onViewCreated(View view, Bundle savedInstanceState) {
super.onStart(); super.onViewCreated(view, savedInstanceState);
if (view != null && Build.VERSION.SDK_INT < Build.VERSION_CODES.LOLLIPOP) {
Snackbar.make(view, R.string.notice_legacy_api, Snackbar.LENGTH_LONG)
.setAction("Action", null).show();
}
}
@Override Snackbar.make(view, R.string.notice_legacy_api, Snackbar.LENGTH_LONG)
public void onDestroyView() { .setAction("Action", null).show();
super.onDestroyView();
view = null;
} }
} }

13
app/src/main/java/org/itxtech/daedalus/fragment/MainFragment.java
View File

@ -23,11 +23,9 @@ import org.itxtech.daedalus.activity.MainActivity;
*/ */
public class MainFragment extends ToolbarFragment { public class MainFragment extends ToolbarFragment {
private View view = null;
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = inflater.inflate(R.layout.fragment_main, container, false); View view = inflater.inflate(R.layout.fragment_main, container, false);
Button but = (Button) view.findViewById(R.id.button_activate); Button but = (Button) view.findViewById(R.id.button_activate);
but.setOnClickListener(new View.OnClickListener() { but.setOnClickListener(new View.OnClickListener() {
@ -50,13 +48,6 @@ public class MainFragment extends ToolbarFragment {
toolbar.setTitle(R.string.action_home); toolbar.setTitle(R.string.action_home);
} }
@Override
public void onDestroy() {
super.onDestroy();
view = null;
}
@Override @Override
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
@ -65,7 +56,7 @@ public class MainFragment extends ToolbarFragment {
private void updateUserInterface() { private void updateUserInterface() {
Log.d("DMainFragment", "updateInterface"); Log.d("DMainFragment", "updateInterface");
Button but = (Button) view.findViewById(R.id.button_activate); Button but = (Button) getView().findViewById(R.id.button_activate);
if (Daedalus.getInstance().isServiceActivated()) { if (Daedalus.getInstance().isServiceActivated()) {
but.setText(R.string.button_text_deactivate); but.setText(R.string.button_text_deactivate);
} else { } else {

10
app/src/main/java/org/itxtech/daedalus/fragment/RuleConfigFragment.java
View File

@ -40,7 +40,6 @@ public class RuleConfigFragment extends ConfigFragment {
private Intent intent = null; private Intent intent = null;
private Thread mThread = null; private Thread mThread = null;
private RuleConfigHandler mHandler = null; private RuleConfigHandler mHandler = null;
private View view;
private int id; private int id;
public void setIntent(Intent intent) { public void setIntent(Intent intent) {
@ -55,7 +54,6 @@ public class RuleConfigFragment extends ConfigFragment {
intent = null; intent = null;
mHandler.shutdown(); mHandler.shutdown();
mHandler = null; mHandler = null;
view = null;
} }
private void stopThread() { private void stopThread() {
@ -74,7 +72,7 @@ public class RuleConfigFragment extends ConfigFragment {
@Override @Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = super.onCreateView(inflater, container, savedInstanceState); View view = super.onCreateView(inflater, container, savedInstanceState);
mHandler = new RuleConfigHandler().setView(view); mHandler = new RuleConfigHandler().setView(view);
@ -124,7 +122,7 @@ public class RuleConfigFragment extends ConfigFragment {
public boolean onPreferenceClick(Preference preference) { public boolean onPreferenceClick(Preference preference) {
save(); save();
if (mThread == null) { if (mThread == null) {
Snackbar.make(view, R.string.notice_start_download, Snackbar.LENGTH_LONG) Snackbar.make(getView(), R.string.notice_start_download, Snackbar.LENGTH_LONG)
.setAction("Action", null).show(); .setAction("Action", null).show();
mThread = new Thread(new Runnable() { mThread = new Thread(new Runnable() {
@Override @Override
@ -152,7 +150,7 @@ public class RuleConfigFragment extends ConfigFragment {
}); });
mThread.start(); mThread.start();
} else { } else {
Snackbar.make(view, R.string.notice_now_downloading, Snackbar.LENGTH_LONG) Snackbar.make(getView(), R.string.notice_now_downloading, Snackbar.LENGTH_LONG)
.setAction("Action", null).show(); .setAction("Action", null).show();
} }
return false; return false;
@ -214,7 +212,7 @@ public class RuleConfigFragment extends ConfigFragment {
String ruleDownloadUrl = ((EditTextPreference) findPreference("ruleDownloadUrl")).getText(); String ruleDownloadUrl = ((EditTextPreference) findPreference("ruleDownloadUrl")).getText();
if (ruleName.equals("") | ruleType.equals("") | ruleFilename.equals("") | ruleDownloadUrl.equals("")) { if (ruleName.equals("") | ruleType.equals("") | ruleFilename.equals("") | ruleDownloadUrl.equals("")) {
Snackbar.make(view, R.string.notice_fill_in_all, Snackbar.LENGTH_SHORT) Snackbar.make(getView(), R.string.notice_fill_in_all, Snackbar.LENGTH_SHORT)
.setAction("Action", null).show(); .setAction("Action", null).show();
return false; return false;
} }