Added issue tracker button

This commit is contained in:
PeratX 2017-04-11 12:52:25 +08:00
parent 0b29f27be4
commit d163d1bb82
8 changed files with 30 additions and 15 deletions

View File

@ -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());
}
}
});

View File

@ -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();

View File

@ -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;
}

View File

@ -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");
}
}
}

View File

@ -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());
}
}
}

View File

@ -31,9 +31,10 @@
<string name="notice_join_group_failed">未安装手Q或当前版本不支持此操作。</string>
<string name="settings_notification">启用时显示通知</string>
<string name="settings_check_update">检查更新</string>
<string name="settings_update_summary">通过 GitHub 检查更新</string>
<string name="notice_checking_update">正在前往 GitHub Releases 页面……</string>
<string name="settings_update_summary">前往 GitHub 发布页面。</string>
<string name="settings_count_number_of_queries">统计 DNS 查询次数</string>
<string name="notification_queries">DNS 查询次数:</string>
<string name="notice_legacy_api">当前 Android API 无法支持所有功能。</string>
<string name="settings_issue_tracker">提交反馈</string>
<string name="settings_issue_summary">前往 GitHub 提交问题反馈。</string>
</resources>

View File

@ -21,7 +21,7 @@
<string name="test_time_used">Time used:</string>
<string name="test_dns_server">DNS server:</string>
<string name="test_result_resolved">Address:</string>
<string name="test_failed">Query failed. Timeout or unknown hostname.</string>
<string name="test_failed">DNS query failed. Timeout or unknown hostname.</string>
<string name="test_test_domain">google.com</string>
<string name="action_visit_itxtech">Visit iTXTech</string>
<string name="action_visit_cutedns">Visit CuteDNS!</string>
@ -31,9 +31,10 @@
</string>
<string name="settings_notification">Show notification when activated</string>
<string name="settings_check_update">Check update</string>
<string name="settings_update_summary">Check update via GitHub</string>
<string name="notice_checking_update">Going to the GitHub Releases page …</string>
<string name="settings_update_summary">Visit GitHub releases page.</string>
<string name="settings_count_number_of_queries">Count DNS query times</string>
<string name="notification_queries">DNS Query times:</string>
<string name="notification_queries">DNS query times:</string>
<string name="notice_legacy_api">The current Android API can not support all the features.</string>
<string name="settings_issue_tracker">Issue tracker</string>
<string name="settings_issue_summary">Submit an issue in GitHub Issues page.</string>
</resources>

View File

@ -37,5 +37,9 @@
android:key="settings_check_update"
android:title="@string/settings_check_update"
android:summary="@string/settings_update_summary"/>
<org.itxtech.daedalus.view.ClickPreference
android:key="settings_issue_tracker"
android:title="@string/settings_issue_tracker"
android:summary="@string/settings_issue_summary"/>
</PreferenceCategory>
</PreferenceScreen>