Merge branch 'bug/Give-more-feedback-if-something-fails-#6782' into develop

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);