diff --git a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt index 3bc62c6..245760a 100644 --- a/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt +++ b/app/src/main/java/com/displaynone/acss/ui/profile/ProfileFragment.kt @@ -31,7 +31,6 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) _binding = FragmentProfileBinding.bind(view) - checkForAdmin() binding.swipeRefresh.setOnRefreshListener { if (getIsMe()) refreshData() else showData(getUserDto()!!); @@ -52,12 +51,13 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { binding.recyclerViewLogs.adapter = adapter if (getIsMe()) { + checkForAdmin() refreshData() viewModel.visitListState.collectWithLifecycle(this) { data -> adapter.submitData(data) } waitForQRScanResult() } else { showData(getUserDto()!!) - + checkForAdmin() Log.d("ProfileFragment", "set login") viewModel.visitListStateFromLogin.collectWithLifecycle(this) { data -> adapter.submitData(data) @@ -75,7 +75,7 @@ class ProfileFragment : Fragment(R.layout.fragment_profile) { if (userDTO.roles.any { it.name == "ROLE_ADMIN" }) { binding.buttonSearch.visibility = View.VISIBLE } - binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск действителен" else "Пропуск действителен" + binding.rightsUsingSmartphone.text = if (userDTO.isACSBlocked) "Пропуск недействителен" else "Пропуск действителен" } private fun hideButtons() {