diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:52:11 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-25 15:52:11 +0100 |
commit | a643da6ff368c56186a92b135988d52d5f0bff63 (patch) | |
tree | 87ba3d12270cb08137f169ad84a50ee7745832eb /app/src/main/java/se/leap/bitmaskclient/StartActivity.java | |
parent | 03c1d39eccca1368fb160d6495f385846def5818 (diff) | |
parent | 6a683c605aa5bb5ce72f8ea46a4b6bcae0f9e98a (diff) |
Merge branch '8868_ui_lollipop' into 0xacab_0.9.8
* redo merge https://0xacab.org/leap/bitmask_android/merge_requests/53
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/StartActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/StartActivity.java | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java index b7180f5f..6bbdeb4f 100644 --- a/app/src/main/java/se/leap/bitmaskclient/StartActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/StartActivity.java @@ -13,12 +13,10 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import de.blinkt.openvpn.core.VpnStatus; -import se.leap.bitmaskclient.eip.EIP; import se.leap.bitmaskclient.eip.EipCommand; import se.leap.bitmaskclient.userstatus.User; import static se.leap.bitmaskclient.Constants.APP_ACTION_CONFIGURE_ALWAYS_ON_PROFILE; -import static se.leap.bitmaskclient.Constants.EIP_ACTION_START; import static se.leap.bitmaskclient.Constants.EIP_RESTART_ON_BOOT; import static se.leap.bitmaskclient.Constants.PREFERENCES_APP_VERSION; import static se.leap.bitmaskclient.Constants.PROVIDER_EIP_DEFINITION; @@ -32,7 +30,7 @@ import static se.leap.bitmaskclient.MainActivity.ACTION_SHOW_VPN_FRAGMENT; * and acts and calls another activity accordingly. * */ -public class StartActivity extends Activity { +public class StartActivity extends Activity{ public static final String TAG = StartActivity.class.getSimpleName(); @Retention(RetentionPolicy.SOURCE) |