Skip to content

feat: hide incoming connection request picture - WPB-25863 #4861

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
marcoconti83 wants to merge 1 commit into
base: develop
Choose a base branch
from
+19 −2
Open

feat: hide incoming connection request picture - WPB-25863 #4861

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: 12 additions & 1 deletion app/src/main/kotlin/com/wire/android/mapper/ConversationMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@
is Connection -> {
ConversationItem.ConnectionConversation(
userAvatarData = UserAvatarData(
asset = conversationDetails.otherUser?.previewPicture?.let { UserAvatarAsset(it) },
asset = previewPictureAsset(conversationDetails),
availabilityStatus = conversationDetails.otherUser?.availabilityStatus ?: UserAvailabilityStatus.NONE,
nameBasedAvatar = NameBasedAvatar(conversationDetails.otherUser?.name, conversationDetails.otherUser?.accentId ?: -1)
),
Expand Down Expand Up @@ -243,3 +243,14 @@
}
}
}

private const val WIRE_DOMAIN = "wire.com"

private fun previewPictureAsset(connection: Connection): UserAvatarAsset? {
val otherUser = connection.otherUser ?: return null
val hidePicture = connection.connection.status == ConnectionState.PENDING &&
otherUser.id.domain == WIRE_DOMAIN

Check warning on line 252 in app/src/main/kotlin/com/wire/android/mapper/ConversationMapper.kt

View check run for this annotation

Codecov / codecov/patch

app/src/main/kotlin/com/wire/android/mapper/ConversationMapper.kt#L252 

Added line #L252 was not covered by tests
return otherUser.previewPicture
?.takeUnless { hidePicture }
?.let { UserAvatarAsset(it) }
}
8 changes: 7 additions & 1 deletion app/src/main/kotlin/com/wire/android/ui/userprofile/other/OtherUserProfileScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,11 @@ private fun TopBarCollapsing(
UserProfileInfo(
userId = targetState.userId,
isLoading = targetState.isAvatarLoading,
avatarAsset = targetState.userAvatarAsset,
avatarAsset = targetState.userAvatarAsset
.takeUnless {
targetState.connectionState == ConnectionState.PENDING &&
targetState.userId.domain == WIRE_DOMAIN
},
fullName = targetState.fullName,
userName = targetState.userName,
teamName = targetState.teamName,
Expand Down Expand Up @@ -547,6 +551,8 @@ fun ContentFooter(
}
}

private const val WIRE_DOMAIN = "wire.com"

enum class OtherUserProfileTabItem(@StringRes val titleResId: Int) : TabItem {
GROUP(R.string.user_profile_conversation_tab),
DETAILS(R.string.user_profile_details_tab),
Expand Down
Loading