From d163d1bb822cb406401a2e619c1638a960809a65 Mon Sep 17 00:00:00 2001 From: PeratX <1215714524@qq.com> Date: Tue, 11 Apr 2017 12:52:25 +0800 Subject: [PATCH] Added issue tracker button --- .../org/itxtech/daedalus/activity/AboutActivity.java | 4 ++-- .../itxtech/daedalus/activity/ServerTestActivity.java | 8 +++++--- .../itxtech/daedalus/fragment/SettingsFragment.java | 11 +++++++++-- .../daedalus/receiver/BootBroadcastReceiver.java | 2 +- .../daedalus/receiver/StatusBarBroadcastReceiver.java | 2 +- app/src/main/res/values-zh/strings.xml | 5 +++-- app/src/main/res/values/strings.xml | 9 +++++---- app/src/main/res/xml/perf_settings.xml | 4 ++++ 8 files changed, 30 insertions(+), 15 deletions(-) diff --git a/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java b/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java index 42c5361..dd19206 100644 --- a/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/activity/AboutActivity.java @@ -29,7 +29,7 @@ import java.util.Locale; */ public class AboutActivity extends AppCompatActivity { - @SuppressLint({"JavascriptInterface", "SetJavaScriptEnabled"}) + @SuppressLint({"JavascriptInterface", "SetJavaScriptEnabled", "addJavascriptInterface"}) @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -61,7 +61,7 @@ public class AboutActivity extends AppCompatActivity { try { view.loadUrl("javascript:changeVersionInfo('" + getPackageManager().getPackageInfo(getPackageName(), 0).versionName + "', '" + BuildConfig.BUILD_TIME + "', '" + BuildConfig.GIT_COMMIT + "')"); } catch (Exception e) { - Log.e("Dvpn", e.toString()); + Log.e("DAboutActivity", e.toString()); } } }); 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 c7cfeaf..2e78c84 100644 --- a/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java +++ b/app/src/main/java/org/itxtech/daedalus/activity/ServerTestActivity.java @@ -38,6 +38,8 @@ public class ServerTestActivity extends AppCompatActivity { private static final int MSG_DISPLAY_STATUS = 0; private static final int MSG_TEST_DONE = 1; + private static final String TAG = "DServerTest"; + private static boolean testing = false; private static Thread mThread = null; private ServerTestHandler mHandler = null; @@ -89,12 +91,12 @@ public class ServerTestActivity extends AppCompatActivity { } mHandler.obtainMessage(MSG_TEST_DONE).sendToTarget(); } catch (Exception e) { - Log.e("DVpn", e.toString()); + Log.e(TAG, e.toString()); } } private StringBuilder testServer(DNSClient client, String dnsServer, String testUrl, StringBuilder testText) { - Log.d("Dvpn", "Testing DNS " + dnsServer); + 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); @@ -122,7 +124,7 @@ public class ServerTestActivity extends AppCompatActivity { } catch (Exception e) { testText.append("\n").append(getResources().getString(R.string.test_failed)).append("\n\n"); - Log.e("DVpn", e.toString()); + Log.e(TAG, e.toString()); } mHandler.obtainMessage(MSG_DISPLAY_STATUS, testText.toString()).sendToTarget(); diff --git a/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java b/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java index 8c3d700..8e8fe11 100644 --- a/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java +++ b/app/src/main/java/org/itxtech/daedalus/fragment/SettingsFragment.java @@ -56,13 +56,20 @@ public class SettingsFragment extends PreferenceFragment { checkUpdate.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { @Override public boolean onPreferenceClick(Preference preference) { - Snackbar.make(view, R.string.notice_checking_update, Snackbar.LENGTH_LONG) - .setAction("Action", null).show(); startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/iTXTech/Daedalus/releases"))); return false; } }); + ListPreference issueTracker = (ListPreference) findPreference("settings_issue_tracker"); + issueTracker.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/iTXTech/Daedalus/issues"))); + return false; + } + }); + return view; } diff --git a/app/src/main/java/org/itxtech/daedalus/receiver/BootBroadcastReceiver.java b/app/src/main/java/org/itxtech/daedalus/receiver/BootBroadcastReceiver.java index 1e768d6..7e46660 100644 --- a/app/src/main/java/org/itxtech/daedalus/receiver/BootBroadcastReceiver.java +++ b/app/src/main/java/org/itxtech/daedalus/receiver/BootBroadcastReceiver.java @@ -38,7 +38,7 @@ public class BootBroadcastReceiver extends BroadcastReceiver { context.startService((new Intent(context, DaedalusVpnService.class)).setAction(DaedalusVpnService.ACTION_ACTIVATE)); - Log.d("DVpn", "Boot service"); + Log.d("DBootRecv", "Triggered boot receiver"); } } } diff --git a/app/src/main/java/org/itxtech/daedalus/receiver/StatusBarBroadcastReceiver.java b/app/src/main/java/org/itxtech/daedalus/receiver/StatusBarBroadcastReceiver.java index 9eace5d..3fc5dd1 100644 --- a/app/src/main/java/org/itxtech/daedalus/receiver/StatusBarBroadcastReceiver.java +++ b/app/src/main/java/org/itxtech/daedalus/receiver/StatusBarBroadcastReceiver.java @@ -45,7 +45,7 @@ public class StatusBarBroadcastReceiver extends BroadcastReceiver { Method collapse = statusBarManager.getClass().getMethod("collapsePanels"); collapse.invoke(statusBarManager); } catch (Exception e) { - Log.d("DVpn", e.toString()); + Log.d("DStatusBarRecv", e.toString()); } } } diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml index fcdc8bf..84e21eb 100644 --- a/app/src/main/res/values-zh/strings.xml +++ b/app/src/main/res/values-zh/strings.xml @@ -31,9 +31,10 @@ 未安装手Q或当前版本不支持此操作。 启用时显示通知 检查更新 - 通过 GitHub 检查更新 - 正在前往 GitHub Releases 页面…… + 前往 GitHub 发布页面。 统计 DNS 查询次数 DNS 查询次数: 当前 Android API 无法支持所有功能。 + 提交反馈 + 前往 GitHub 提交问题反馈。 \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 78d8d6c..791dbc8 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -21,7 +21,7 @@ Time used: DNS server: Address: - Query failed. Timeout or unknown hostname. + DNS query failed. Timeout or unknown hostname. google.com Visit iTXTech Visit CuteDNS! @@ -31,9 +31,10 @@ Show notification when activated Check update - Check update via GitHub - Going to the GitHub Releases page … + Visit GitHub releases page. Count DNS query times - DNS Query times: + DNS query times: The current Android API can not support all the features. + Issue tracker + Submit an issue in GitHub Issues page. diff --git a/app/src/main/res/xml/perf_settings.xml b/app/src/main/res/xml/perf_settings.xml index 4982d36..0761d27 100644 --- a/app/src/main/res/xml/perf_settings.xml +++ b/app/src/main/res/xml/perf_settings.xml @@ -37,5 +37,9 @@ android:key="settings_check_update" android:title="@string/settings_check_update" android:summary="@string/settings_update_summary"/> + \ No newline at end of file