Skip to content

fix: Apps shown as disabled in group conversation details (WPB-25306) #4804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexandreferris wants to merge 1 commit into
base: develop
Choose a base branch
from
+2 −13
Open

fix: Apps shown as disabled in group conversation details (WPB-25306) #4804

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 1 addition & 12 deletions ...otlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModel.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,6 @@ class GroupConversationDetailsViewModel @Inject constructor(
}

val shouldUseNewAppsUi = computeShouldUseNewAppsUi(groupDetails, appsAllowedResult)
val isAppsAllowedForConversation = computeAppsEnabledStatus(groupDetails, appsAllowedResult)
val isUpdatingAppsAllowedForConversation =
computeAppsAllowedStatus(canSelfPerformAdminTasks, isSelfInTeamThatOwnsConversation, groupDetails, appsAllowedResult)

Expand All @@ -175,7 +174,7 @@ class GroupConversationDetailsViewModel @Inject constructor(
isUpdatingNameAllowed = canSelfPerformAdminTasks && !isSelfExternalMember,
isUpdatingGuestAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation,
isUpdatingChannelAccessAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation,
isAppsAllowed = isAppsAllowedForConversation,
isAppsAllowed = groupDetails.conversation.isServicesAllowed(),
shouldUseNewAppsUi = shouldUseNewAppsUi,
isUpdatingAppsAllowed = isUpdatingAppsAllowedForConversation,
isUpdatingReadReceiptAllowed = canSelfPerformAdminTasks && groupDetails.conversation.isTeamGroup(),
Expand Down Expand Up @@ -215,16 +214,6 @@ class GroupConversationDetailsViewModel @Inject constructor(
isSelfInTeamThatOwnsConversation &&
isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult)

/**
* Determine apps visibility based on feature flag and team settings
* Or just should be protocol based in case of current logic
*/
private fun computeAppsEnabledStatus(
groupDetails: ConversationDetails.Group,
appsAllowedResult: AppsAllowedResult
) = groupDetails.conversation.isServicesAllowed() &&
isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult)

private fun isServicesSupportedForConversation(
protocolInfo: Conversation.ProtocolInfo,
appsAllowedResult: AppsAllowedResult
Expand Down
2 changes: 1 addition & 1 deletion ...c/test/kotlin/com/wire/android/ui/home/conversations/details/GroupDetailsViewModelTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ class GroupDetailsViewModelTest {
.withSelfTeamUseCaseReturns(selfTeam)
.arrange()

assertEquals(false, viewModel.groupOptionsState.value.isAppsAllowed)
assertEquals(true, viewModel.groupOptionsState.value.isAppsAllowed)
assertEquals(false, viewModel.groupOptionsState.value.shouldUseNewAppsUi)
assertEquals(false, viewModel.groupOptionsState.value.isUpdatingAppsAllowed)
}
Expand Down
Loading