diff options
author | fupduck <fupduck@riseup.net> | 2018-02-16 00:43:45 -0800 |
---|---|---|
committer | fupduck <fupduck@riseup.net> | 2018-02-16 00:43:45 -0800 |
commit | 0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (patch) | |
tree | c2b8cb3b8f40d0a96a6167f13a0114aa8dbbdc0c /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
parent | f6b589d48d99b4458e8977e73433207848373924 (diff) | |
parent | 96e5db80d9a949435df32d2d0c46497b86d1fff4 (diff) |
Merge branch '#8846_remove_Dashboard' into '0.9.8'
#8846 remove legacy code and files: Dashboard, LogWindow, UserStatusFragment,…
See merge request leap/bitmask_android!44
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/MainActivity.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index 06a66e43..69002355 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -11,6 +11,7 @@ import android.support.v7.widget.Toolbar; import se.leap.bitmaskclient.drawer.NavigationDrawerFragment; import se.leap.bitmaskclient.eip.EipCommand; +import se.leap.bitmaskclient.fragments.LogFragment; import static se.leap.bitmaskclient.Constants.PROVIDER_KEY; import static se.leap.bitmaskclient.Constants.REQUEST_CODE_CONFIGURE_LEAP; @@ -29,6 +30,7 @@ public class MainActivity extends AppCompatActivity { private NavigationDrawerFragment navigationDrawerFragment; public final static String ACTION_SHOW_VPN_FRAGMENT = "action_show_vpn_fragment"; + public final static String ACTION_SHOW_LOG_FRAGMENT = "action_show_log_fragment"; /** * Fragment managing the behaviors, interactions and presentation of the navigation drawer. @@ -78,6 +80,9 @@ public class MainActivity extends AppCompatActivity { bundle.putParcelable(PROVIDER_KEY, provider); fragment.setArguments(bundle); break; + case ACTION_SHOW_LOG_FRAGMENT: + fragment = new LogFragment(); + break; default: break; } |