summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2015-03-12 11:47:28 +0100
committerParménides GV <parmegv@sdf.org>2015-03-12 11:47:28 +0100
commit9732f263b3ea9af0c9610fa9b3f3010481a39e37 (patch)
tree65e9697c489b20abdef4ea75990d9ec1f761b86f /app/src/main/java/se/leap/bitmaskclient/Dashboard.java
parent8a53bf0c88498059751693695775788874714fc8 (diff)
Just show the log if an error occurred.
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/Dashboard.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/Dashboard.java19
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);