diff options
| author | cyBerta <cyberta@riseup.net> | 2021-02-26 13:13:29 +0100 |
|---|---|---|
| committer | cyBerta <cyberta@riseup.net> | 2021-02-26 13:13:29 +0100 |
| commit | 704bdf92e6265ee4bdb7e177c7d09284ebc29868 (patch) | |
| tree | c2adecb59abc4fd344272d55e1829ad03d5e07fd /app/src/main/java/se/leap/bitmaskclient/base | |
| parent | e1b6c1a9c4e9cf9849ceb37bf775ba28cc539bff (diff) | |
Bigger refactoring:
* always use a bound service connection to start a vpn service as foreground service to fix remote excptions. These appeared if the system wasn't able to set the service as forground shortly after it was started
* move vpn start logic from LaunchVPN activity to EIP service. LaunchVPN/VoidVPNLauncher is only used in case we need to ask the user for a permission. It reduces visual glitches when the transparent LaunchVPN activity appears and disappears
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java index a7a14ed0..126c4a98 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/MainActivity.java @@ -258,7 +258,8 @@ public class MainActivity extends AppCompatActivity implements EipSetupListener, break; case EIP_ACTION_PREPARE_VPN: if (resultCode == RESULT_CANCELED) { - showMainActivityErrorDialog(getString(R.string.vpn_error_establish), ERROR_VPN_PREPARE); + String error = resultData.getString(ERRORS); + showMainActivityErrorDialog(error, ERROR_VPN_PREPARE); } break; case EIP_ACTION_LAUNCH_VPN: |