Skip to content

[stable-4.6] Fix avatar loading #3041

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

Merged
AndyScherzinger merged 1 commit into from
Feb 6, 2026
Merged

[stable-4.6] Fix avatar loading #3041

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
20 changes: 14 additions & 6 deletions app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@
import android.view.View;
import android.widget.ImageView;

import androidx.annotation.ColorInt;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.recyclerview.widget.RecyclerView;

import com.owncloud.android.lib.resources.shares.OCShare;

Expand All @@ -31,6 +31,8 @@ public class ShareViewHolder extends BrandedViewHolder {
private ItemShareShareBinding binding;
private Account account;
private Context context;
@ColorInt
private int color;

public ShareViewHolder(@NonNull View itemView) {
super(itemView);
Expand Down Expand Up @@ -62,28 +64,34 @@ public void bind(OCShare share, ShareeListAdapterListener listener) {
case GROUP:
name = context.getString(R.string.share_group_clarification, name);
viewThemeUtils.createAvatar(share.getShareType(), binding.icon, context);
BrandingUtil.of(color, context).platform.colorImageViewBackgroundAndIcon(binding.icon);
break;
case ROOM:
name = context.getString(R.string.share_room_clarification, name);
viewThemeUtils.createAvatar(share.getShareType(), binding.icon, context);
BrandingUtil.of(color, context).platform.colorImageViewBackgroundAndIcon(binding.icon);
break;
case CIRCLE:
viewThemeUtils.createAvatar(share.getShareType(), binding.icon, context);
BrandingUtil.of(color, context).platform.colorImageViewBackgroundAndIcon(binding.icon);
break;
case FEDERATED:
name = context.getString(R.string.share_remote_clarification, name);
setImage(binding.icon, share.getSharedWithDisplayName(), R.drawable.ic_account_circle_grey_24dp);
setImage(binding.icon, share.getShareWith(), R.drawable.ic_account_circle_grey_24dp);
BrandingUtil.of(color, context).platform.colorImageViewBackgroundAndIcon(binding.icon);
break;
case USER:
binding.icon.setTag(share.getShareWith());

if (share.getSharedWithDisplayName() != null) {
AvatarLoader.INSTANCE.load(context, binding.icon, account, share.getSharedWithDisplayName());
if (share.getShareWith() != null) {
AvatarLoader.INSTANCE.load(context, binding.icon, account, share.getShareWith());
}

// binding.icon.setOnClickListener(v -> listener.showProfileBottomSheet(user, share.getShareWith()));
break;
default:
setImage(binding.icon, name, R.drawable.ic_account_circle_grey_24dp);
BrandingUtil.of(color, context).platform.colorImageViewBackgroundAndIcon(binding.icon);
break;
}

Expand Down Expand Up @@ -123,10 +131,10 @@ private void setImage(ImageView avatar, String name, @DrawableRes int fallback)

@Override
public void applyBrand(int color) {
final var util = BrandingUtil.of(color, context);
this.color = color;
final var util = BrandingUtil.of(this.color, context);
if (binding != null) {
util.androidx.colorPrimaryTextViewElement(binding.permissionName);
util.platform.colorImageViewBackgroundAndIcon(binding.icon);
}
}
}
Loading