From 48e92a7e9bf0db3f091c1517b8ffbe98a611a12c Mon Sep 17 00:00:00 2001 From: spaced4ndy <8711996+spaced4ndy@users.noreply.github.com> Date: Wed, 19 Apr 2023 18:16:26 +0400 Subject: [PATCH] android: don't show button to hide user if authentication is not configured (#2211) --- .../simplex/app/views/usersettings/UserProfilesView.kt | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt index c28515e3a0..d8f7f11c1a 100644 --- a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt +++ b/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt @@ -45,6 +45,7 @@ fun UserProfilesView(m: ChatModel, search: MutableState, profileHidden: searchTextOrPassword = searchTextOrPassword, showHiddenProfilesNotice = m.controller.appPrefs.showHiddenProfilesNotice, visibleUsersCount = visibleUsersCount(m), + prefPerformLA = m.controller.appPrefs.performLA.get(), addUser = { ModalManager.shared.showModalCloseable { close -> CreateProfile(m, close) @@ -142,6 +143,7 @@ private fun UserProfilesView( searchTextOrPassword: MutableState, profileHidden: MutableState, visibleUsersCount: Int, + prefPerformLA: Boolean, showHiddenProfilesNotice: SharedPreference, addUser: () -> Unit, activateUser: (User) -> Unit, @@ -170,7 +172,7 @@ private fun UserProfilesView( SectionView { for (user in filteredUsers) { - UserView(user, users, visibleUsersCount, activateUser, removeUser, unhideUser, muteUser, unmuteUser, showHiddenProfile) + UserView(user, users, visibleUsersCount, prefPerformLA, activateUser, removeUser, unhideUser, muteUser, unmuteUser, showHiddenProfile) SectionDivider() } if (searchTextOrPassword.value.trim().isEmpty()) { @@ -203,6 +205,7 @@ private fun UserView( user: User, users: List, visibleUsersCount: Int, + prefPerformLA: Boolean, activateUser: (User) -> Unit, removeUser: (User) -> Unit, unhideUser: (User) -> Unit, @@ -222,7 +225,7 @@ private fun UserView( unhideUser(user) }) } else { - if (visibleUsersCount > 1) { + if (visibleUsersCount > 1 && prefPerformLA) { ItemAction(stringResource(R.string.user_hide), Icons.Outlined.Lock, onClick = { showMenu.value = false showHiddenProfile(user)