diff options
author | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:16 -0800 |
---|---|---|
committer | fupduck <fupduck@riseup.net> | 2018-02-08 06:05:16 -0800 |
commit | c3d157c91ecc3a177efc4e089904684511e7710d (patch) | |
tree | d664bf391e0fe2abda37cd78947703b186515c14 /app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java | |
parent | e33292227eeac35194f9217edd5a243c688cb560 (diff) | |
parent | 6cd010c331cfd98078e657bb8d1107651daca49e (diff) |
Merge branch '#8829_notification_handling_new_layout' into '0.9.8'
#8829 notification handling new layout
See merge request leap/bitmask_android!37
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java index 0f1d0cdb..4b8ce55d 100644 --- a/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java +++ b/app/src/main/java/se/leap/bitmaskclient/userstatus/UserStatusFragment.java @@ -3,6 +3,7 @@ package se.leap.bitmaskclient.userstatus; import android.content.Context; import android.os.Bundle; import android.support.v4.app.Fragment; +import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -26,7 +27,7 @@ import se.leap.bitmaskclient.R; public class UserStatusFragment extends Fragment implements Observer, SessionDialog.SessionDialogInterface { - public static String TAG = UserStatusFragment.class.getSimpleName(); + public final static String TAG = UserStatusFragment.class.getSimpleName(); private ProviderAPIResultReceiver providerAPI_result_receiver; @InjectView(R.id.user_status_username) @@ -88,7 +89,8 @@ public class UserStatusFragment extends Fragment implements Observer, SessionDia if(status.isLoggedIn()) logOut(); else if(status.isLoggedOut()) - MainActivity.sessionDialog(Bundle.EMPTY); + Log.w(TAG, "implement login from here?"); + //MainActivity.sessionDialog(Bundle.EMPTY); else if(status.inProgress()) cancelLoginOrSignup(); } |