Skip to content
This repository was archived by the owner on Dec 6, 2025. It is now read-only.

Fix connection screen#304

Merged
johankool merged 9 commits intoeduvpn:masterfrom
roop:fix_connection_screen
Jun 3, 2020
Merged

Fix connection screen#304
johankool merged 9 commits intoeduvpn:masterfrom
roop:fix_connection_screen

Conversation

@roop
Copy link
Collaborator

@roop roop commented May 30, 2020

This is related to #90 - in case the certificate expires while the VPN is up, we should be able to stop the tunnel with the app. Currently, that’s not always possible because:

  1. While the tunnel is up, user can go back to the provider list
  2. On app startup, we show the provider list
  3. Clicking on a provider in the provider list can show the connection screen only when some network requests succeed (which can’t happen when we have a VPN up but not working because of an expired certificate)

This PR addresses the above concerns but also makes some additional fixes. (Hence a separate PR.)

  • Connect / Disconnect button text is based on on-demand (Thanks to @joosthoogendoorn for bringing this up)
  • Can’t click on Connect again when we’re doing a check_certificate
  • When we’re doing a check_certificate, or if on-demand is set, we can’t dismiss the connection screen
  • Show the spinner when doing a check_certificate, so the user knows something’s happening
  • On app launch, if on-demand is set, show the connection screen

roop added 7 commits May 30, 2020 07:36
 - Connect / Disconnnect button text is now based on on-demand-ness
 - When contacting the server for checking the certificate
    - Connect / Disconnnect button is disabled
    - Back button is disabled
    - Spinner spins
 - If on-demand is on
    - Back button is disabled
 - Connect / Disconnnect button text is now based on on-demand-ness
 - When contacting the server for checking the certificate
    - Connect / Disconnnect button is disabled
    - Close button is disabled, connection VC can't be swiped down
 - If on-demand is on
    - Close button is disabled, connection VC can't be swiped down
If startTunnel fails, the errors should get propagated through the
Promise-s, so that code can respond to the failure accordingly.
So that the user knows something's happening,
especially when we're doing a check_certificate.
Copy link
Contributor

@cyberjoost cyberjoost left a comment

Choose a reason for hiding this comment

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

Tested and added a little patch/commit.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants