diff options
| author | cyberta <cyberta@riseup.net> | 2018-01-27 16:35:36 -0800 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2018-01-27 16:35:36 -0800 |
| commit | 3bb2c2c219359a6016366c4d3533a5e2ef812ea9 (patch) | |
| tree | c743e74b951d3104e32f7e8351f83f68207430b4 /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
| parent | df8b1fcf1ecc55f15229935294a337c897960ff4 (diff) | |
| parent | 0ad1b398e19a02dd725b253e15f6ded4d0cd641b (diff) | |
Merge branch '8800_vpn_fragment' into '0.9.8'
new UI for EipFragment
See merge request leap/bitmask_android!29
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java')
| -rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/MainActivity.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index 40a9052c..4fd16a8b 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -68,7 +68,7 @@ public class MainActivity extends AppCompatActivity { switch (intent.getAction()) { case ACTION_SHOW_VPN_FRAGMENT: - fragment = new VpnFragment(); + fragment = new EipFragment(); break; default: break; |