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/drawer | |
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/drawer')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java index dbe99dce..4f2d0744 100644 --- a/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/drawer/NavigationDrawerFragment.java @@ -28,8 +28,8 @@ import android.widget.Toast; import se.leap.bitmaskclient.ConfigHelper; import se.leap.bitmaskclient.ConfigurationWizard; +import se.leap.bitmaskclient.EipFragment; import se.leap.bitmaskclient.R; -import se.leap.bitmaskclient.VpnFragment; import se.leap.bitmaskclient.fragments.AboutFragment; import se.leap.bitmaskclient.fragments.LogFragment; @@ -296,7 +296,7 @@ public class NavigationDrawerFragment extends Fragment { if (parent == mDrawerAccountsListView) { mTitle = getString(R.string.vpn_fragment_title); - fragment = new VpnFragment(); + fragment = new EipFragment(); } else { Log.d("Drawer", String.format("Selected position %d", position)); switch (position) { |