Skip to content

fix(avatar): flicker #17687

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

Closed
alperozturk96 wants to merge 1 commit into from
+19 −9
Closed

fix(avatar): flicker #17687

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
5 changes: 3 additions & 2 deletions app/src/main/java/com/nextcloud/utils/extensions/ServerCredentialsExtensions.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,11 @@ import com.owncloud.android.lib.common.utils.Log_OC

private const val TAG = "ServerCredentialsExtensions"

suspend fun ServerCredentials.supportsUnifiedShare(): Boolean {
suspend fun ServerCredentials.supportsUnifiedShare(): Boolean? {
val capabilities = ShareRemoteRepository(NextcloudHttpClient.create(this))
.fetchSharingCapabilities()
.dataOrElse { Log_OC.e(TAG, "Failed to fetch sharing capabilities") }
?: return null

return capabilities?.isUnifiedShareEnabled == true
return capabilities.isUnifiedShareEnabled
}
21 changes: 15 additions & 6 deletions app/src/main/java/com/nextcloud/utils/share/UnifiedShareSharees.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ package com.nextcloud.utils.share

import com.nextcloud.android.common.ui.network.auth.ServerCredentials
import com.nextcloud.android.common.ui.share.avatar.ShareAvatarRepository
import com.nextcloud.android.common.ui.share.model.api.recipients.Recipient
import com.nextcloud.android.common.ui.share.model.api.share.Share
import com.nextcloud.client.account.User
import com.nextcloud.utils.extensions.supportsUnifiedShare
Expand Down Expand Up @@ -75,19 +76,27 @@ object UnifiedShareSharees {
unifiedShareSupport[accountName]?.let { return it }

// a failed capability request stays uncached so that the next listing can resolve it again
val supported = runCatching { credentials.supportsUnifiedShare() }.getOrNull() ?: return false
unifiedShareSupport[accountName] = supported
val supported = runCatching { credentials.supportsUnifiedShare() }.getOrNull()
supported?.let { unifiedShareSupport[accountName] = it }

return supported
return supported == true
}

private suspend fun ShareAvatarRepository.fetchSharees(file: OCFile) {
file.sharees = fetchShareAvatars(file.localId.toString())?.toAvatarSharees().orEmpty()
val sharees = fetchShareAvatars(file.localId.toString())?.toAvatarSharees() ?: return
file.sharees = sharees
}

private fun List<Share>.toAvatarSharees(): List<ShareeUser> = asSequence()
.flatMap { share -> share.invitedRecipients }
.distinctBy { recipient -> recipient.value }
.map { recipient -> ShareeUser(recipient.value, recipient.displayName, ShareType.USER) }
.distinctBy { recipient -> recipient.clazz to recipient.value }
.map { recipient -> ShareeUser(recipient.value, recipient.displayName, recipient.toShareType()) }
.toList()

private fun Recipient.toShareType(): ShareType = when (clazz) {
Recipient.GROUP_RECIPIENT_CLASS -> ShareType.GROUP
Recipient.TEAM_RECIPIENT_CLASS -> ShareType.CIRCLE
Recipient.EMAIL_RECIPIENT_CLASS -> ShareType.EMAIL
else -> ShareType.USER
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ class FileDetailSharingFragment :
private fun initializeSharingMode() {
viewLifecycleOwner.lifecycleScope.launch {
withContext(Dispatchers.IO) {
user?.toServerCredentials()?.takeIf { it.supportsUnifiedShare() }
user?.toServerCredentials()?.takeIf { it.supportsUnifiedShare() == true }
}?.let(::showUnifiedShare) ?: showLegacyShare()
}
}
Expand Down
Loading