diff options
| author | lalottacontinua <loddatio@posteo.de> | 2018-06-27 22:44:33 +0200 |
|---|---|---|
| committer | lalottacontinua <loddatio@posteo.de> | 2018-06-27 22:44:33 +0200 |
| commit | d63dd4b36701f2f993e671f8cc3c5424b787e43a (patch) | |
| tree | 486a8c3a1a688e76c7da7f5d9f8dfddbcc0b58aa /app/src/main/java/se/leap/bitmaskclient/eip/EIP.java | |
| parent | 277f0f12ca505797daec42a5211885ac07b909f9 (diff) | |
| parent | 8c9879145e588e985e5305ee2f88dfc1b6bf1d10 (diff) | |
Merge branch 'master' into add_provider
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/eip/EIP.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/eip/EIP.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java index 159bc9a7..971d973f 100644 --- a/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java +++ b/app/src/main/java/se/leap/bitmaskclient/eip/EIP.java @@ -53,7 +53,6 @@ import se.leap.bitmaskclient.OnBootReceiver; import static android.app.Activity.RESULT_CANCELED; import static android.app.Activity.RESULT_OK; import static android.content.Intent.CATEGORY_DEFAULT; -import static se.leap.bitmaskclient.ConfigHelper.ensureNotOnMainThread; import static se.leap.bitmaskclient.Constants.BROADCAST_EIP_EVENT; import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_CODE; import static se.leap.bitmaskclient.Constants.BROADCAST_RESULT_KEY; @@ -71,6 +70,7 @@ import static se.leap.bitmaskclient.Constants.PROVIDER_VPN_CERTIFICATE; import static se.leap.bitmaskclient.Constants.SHARED_PREFERENCES; import static se.leap.bitmaskclient.MainActivityErrorDialog.DOWNLOAD_ERRORS.ERROR_INVALID_VPN_CERTIFICATE; import static se.leap.bitmaskclient.R.string.vpn_certificate_is_invalid; +import static se.leap.bitmaskclient.utils.ConfigHelper.ensureNotOnMainThread; /** * EIP is the abstract base class for interacting with and managing the Encrypted |