diff options
author | Parménides GV <parmegv@sdf.org> | 2015-03-12 12:02:08 +0100 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-03-12 12:02:08 +0100 |
commit | c5124635b8272d08538889c1a9edfafe4acaf759 (patch) | |
tree | 1c0de82cc3bb4186cb4eb6dc0cb974d0d3de0580 /app/src/main/java/se/leap/bitmaskclient/Dashboard.java | |
parent | 777cdf0e0844f8450fac6bc9146c013f30e820d2 (diff) | |
parent | f62c2c0ef907744814b48a56d08a83a6fbe1bed4 (diff) |
Merge branch 'bug/Give-more-feedback-if-something-fails-#6782' into develop
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Dashboard.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/Dashboard.java | 19 |
1 files changed, 13 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java index 4fe51939..04385ddd 100644 --- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java +++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java @@ -249,16 +249,12 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn @Override public boolean onOptionsItemSelected(MenuItem item){ - Intent intent; switch (item.getItemId()){ case R.id.about_leap: - intent = new Intent(this, AboutActivity.class); - startActivity(intent); + showAbout(); return true; case R.id.log_window: - Intent startLW = new Intent(getAppContext(), LogWindow.class); - startLW.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); - startActivity(startLW); + showLog(); return true; case R.id.switch_provider: switching_provider = true; @@ -279,6 +275,17 @@ public class Dashboard extends Activity implements SessionDialog.SessionDialogIn } } + public void showAbout() { + Intent intent = new Intent(this, AboutActivity.class); + startActivity(intent); + } + + public void showLog() { + Intent startLW = new Intent(getAppContext(), LogWindow.class); + //startLW.addFlags(Intent.FLAG_ACTIVITY_REORDER_TO_FRONT); + startActivity(startLW); + } + @Override public void signUp(String username, String password) { Bundle parameters = bundleParameters(username, password); |