diff options
author | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
---|---|---|
committer | Fup Duck <fupduck@sacknagel.com> | 2018-02-16 10:38:41 +0100 |
commit | 9108878992e9825a00c44f0596818d0ab245b183 (patch) | |
tree | 088b116ca4b1236827337a3d5ae204abc0f907bb /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
parent | 6c1434addf1ee25a8c7ce30c240e2033d5075f35 (diff) | |
parent | 0365f243fc56112b2f43b35e1b4884d2d1ad2aa4 (diff) |
Merge branch 'leap_0.9.8' into #8797_certificate_expiration
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 6d9d32b5..2a2a68a7 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -35,6 +35,7 @@ import se.leap.bitmaskclient.drawer.NavigationDrawerFragment; import se.leap.bitmaskclient.eip.EipCommand; import se.leap.bitmaskclient.eip.EipStatus; import se.leap.bitmaskclient.eip.VoidVpnService; +import se.leap.bitmaskclient.fragments.LogFragment; import static android.content.Intent.CATEGORY_DEFAULT; import static se.leap.bitmaskclient.Constants.BROADCAST_EIP_EVENT; @@ -97,6 +98,7 @@ public class MainActivity extends AppCompatActivity implements Observer, MainAct }; 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. @@ -189,6 +191,9 @@ public class MainActivity extends AppCompatActivity implements Observer, MainAct bundle.putParcelable(PROVIDER_KEY, provider); fragment.setArguments(bundle); break; + case ACTION_SHOW_LOG_FRAGMENT: + fragment = new LogFragment(); + break; default: break; } |