Skip to content

Commit a672d8c

Browse files
fix: Apps shown as disabled in group conversation details (WPB-25306) (#4804)
Signed-off-by: alexandreferris <ferris.alexandre@gmail.com>
1 parent 21aa628 commit a672d8c

2 files changed

Lines changed: 2 additions & 13 deletions

File tree

app/src/main/kotlin/com/wire/android/ui/home/conversations/details/GroupConversationDetailsViewModel.kt

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,6 @@ class GroupConversationDetailsViewModel @Inject constructor(
154154
}
155155

156156
val shouldUseNewAppsUi = computeShouldUseNewAppsUi(groupDetails, appsAllowedResult)
157-
val isAppsAllowedForConversation = computeAppsEnabledStatus(groupDetails, appsAllowedResult)
158157
val isUpdatingAppsAllowedForConversation =
159158
computeAppsAllowedStatus(canSelfPerformAdminTasks, isSelfInTeamThatOwnsConversation, groupDetails, appsAllowedResult)
160159

@@ -175,7 +174,7 @@ class GroupConversationDetailsViewModel @Inject constructor(
175174
isUpdatingNameAllowed = canSelfPerformAdminTasks && !isSelfExternalMember,
176175
isUpdatingGuestAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation,
177176
isUpdatingChannelAccessAllowed = canSelfPerformAdminTasks && isSelfInTeamThatOwnsConversation,
178-
isAppsAllowed = isAppsAllowedForConversation,
177+
isAppsAllowed = groupDetails.conversation.isServicesAllowed(),
179178
shouldUseNewAppsUi = shouldUseNewAppsUi,
180179
isUpdatingAppsAllowed = isUpdatingAppsAllowedForConversation,
181180
isUpdatingReadReceiptAllowed = canSelfPerformAdminTasks && groupDetails.conversation.isTeamGroup(),
@@ -215,16 +214,6 @@ class GroupConversationDetailsViewModel @Inject constructor(
215214
isSelfInTeamThatOwnsConversation &&
216215
isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult)
217216

218-
/**
219-
* Determine apps visibility based on feature flag and team settings
220-
* Or just should be protocol based in case of current logic
221-
*/
222-
private fun computeAppsEnabledStatus(
223-
groupDetails: ConversationDetails.Group,
224-
appsAllowedResult: AppsAllowedResult
225-
) = groupDetails.conversation.isServicesAllowed() &&
226-
isServicesSupportedForConversation(groupDetails.conversation.protocol, appsAllowedResult)
227-
228217
private fun isServicesSupportedForConversation(
229218
protocolInfo: Conversation.ProtocolInfo,
230219
appsAllowedResult: AppsAllowedResult

app/src/test/kotlin/com/wire/android/ui/home/conversations/details/GroupDetailsViewModelTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -256,7 +256,7 @@ class GroupDetailsViewModelTest {
256256
.withSelfTeamUseCaseReturns(selfTeam)
257257
.arrange()
258258

259-
assertEquals(false, viewModel.groupOptionsState.value.isAppsAllowed)
259+
assertEquals(true, viewModel.groupOptionsState.value.isAppsAllowed)
260260
assertEquals(false, viewModel.groupOptionsState.value.shouldUseNewAppsUi)
261261
assertEquals(false, viewModel.groupOptionsState.value.isUpdatingAppsAllowed)
262262
}

0 commit comments

Comments
 (0)