Commit b75379ba authored by Varun Patil's avatar Varun Patil

Show and init logout button and user in settings only if logged in

parent 12485107
...@@ -90,10 +90,10 @@ public class SettingsFragment extends Fragment { ...@@ -90,10 +90,10 @@ public class SettingsFragment extends Fragment {
// Check if we exist // Check if we exist
if (getActivity() == null || getView() == null) return; if (getActivity() == null || getView() == null) return;
Button updateProfileButton = getActivity().findViewById(R.id.settings_update_profile); Button updateProfileButton = getView().findViewById(R.id.settings_update_profile);
Button feedbackButton = getActivity().findViewById(R.id.settings_feedback); Button feedbackButton = getView().findViewById(R.id.settings_feedback);
Button aboutButton = getActivity().findViewById(R.id.settings_about); Button aboutButton = getView().findViewById(R.id.settings_about);
Button logoutButton = getActivity().findViewById(R.id.settings_logout); Button logoutButton = getView().findViewById(R.id.settings_logout);
updateProfileButton.setOnClickListener(new View.OnClickListener() { updateProfileButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
...@@ -121,6 +121,9 @@ public class SettingsFragment extends Fragment { ...@@ -121,6 +121,9 @@ public class SettingsFragment extends Fragment {
} }
}); });
// Logged in user vs Guest
final SessionManager sessionManager = new SessionManager(getContext());
if (sessionManager.isLoggedIn()) {
logoutButton.setOnClickListener(new View.OnClickListener() { logoutButton.setOnClickListener(new View.OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
...@@ -129,7 +132,6 @@ public class SettingsFragment extends Fragment { ...@@ -129,7 +132,6 @@ public class SettingsFragment extends Fragment {
@Override @Override
public void onResponse(Call<Void> call, Response<Void> response) { public void onResponse(Call<Void> call, Response<Void> response) {
if (response.isSuccessful()) { if (response.isSuccessful()) {
SessionManager sessionManager = new SessionManager(getContext());
sessionManager.logout(); sessionManager.logout();
Intent intent = new Intent(getContext(), LoginActivity.class); Intent intent = new Intent(getContext(), LoginActivity.class);
startActivity(intent); startActivity(intent);
...@@ -145,6 +147,10 @@ public class SettingsFragment extends Fragment { ...@@ -145,6 +147,10 @@ public class SettingsFragment extends Fragment {
}); });
} }
}); });
} else {
logoutButton.setVisibility(View.GONE);
getView().findViewById(R.id.role_card_layout).setVisibility(View.GONE);
}
} }
private void openWebURL(String URL) { private void openWebURL(String URL) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment