Dynamically load user session fragment.

Tests click new button, instead of action bar's.

Fixing more bugs...

2 files changed, 4 insertions, 2 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
index f541283a..a854ffd4 100644
--- a/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
+++ b/app/src/main/java/se/leap/bitmaskclient/Dashboard.java
@@ -200,6 +200,7 @@ public class Dashboard extends Activity implements ProviderAPIResultReceiver.Rec
 
         provider_name.setText(provider.getDomain());
         user_session_fragment = new UserSessionFragment();
+        fragment_manager.replace(R.id.user_session_fragment, user_session_fragment, UserSessionFragment.TAG);
 
         if (provider.hasEIP()) {
             fragment_manager.removePreviousFragment(EipFragment.TAG);
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
index f51a6779..18f16301 100644
--- a/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
+++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/SessionDialog.java
@@ -81,7 +81,7 @@ public class SessionDialog extends DialogFragment {
         ButterKnife.inject(this, view);
 
         Bundle arguments = getArguments();
-        if (arguments != Bundle.EMPTY) {
+        if (arguments != Bundle.EMPTY && arguments != null) {
             setUp(arguments);
         }
 
@@ -165,8 +165,9 @@ public class SessionDialog extends DialogFragment {
     @Override
     public void onAttach(Activity activity) {
         super.onAttach(activity);
+
         try {
-            interface_with_Dashboard = (SessionDialogInterface) activity;
+            interface_with_Dashboard = (SessionDialogInterface) activity.getFragmentManager().findFragmentById(R.id.user_session_fragment);;
         } catch (ClassCastException e) {
             throw new ClassCastException(activity.toString()
                     + " must implement LogInDialogListener");