Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add a "Test Connection" button to the main activity #56

Merged
merged 6 commits into from
Jan 27, 2020
Merged

Add a "Test Connection" button to the main activity #56

merged 6 commits into from
Jan 27, 2020

Conversation

PegasisForever
Copy link
Contributor

This button will test connection to https://www.google.com and show the result in a toast.
When succeed: show the time been used
When failed: show error message

@claassistantio
Copy link

claassistantio commented Jan 19, 2020

CLA assistant check
All committers have signed the CLA.

private class TestConnection extends AsyncTask<String, Void, TestConnectionResult> {
protected void onPreExecute() {
super.onPreExecute();
testConnectionButton.setText(R.string.testing);
Copy link
Member

@oasiscifr oasiscifr Jan 27, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Disable the button when the test is in progress

@PegasisForever
Copy link
Contributor Author

Fixed

@oasiscifr
Copy link
Member

To pull upstream commits to your developing branch, pull --rebase is more recommended rather than merge. merge will create unnecessary commits and mess up the commit timeline.

@oasiscifr
Copy link
Member

LGTM 🍻

@PegasisForever
Copy link
Contributor Author

Nice, thanks for telling me this, I'll use rebase next time.

@oasiscifr oasiscifr merged commit 525f06b into trojan-gfw:master Jan 27, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

3 participants