Skip to content

Commit ff1527a

Browse files
committed
fix duplication and avatar
Signed-off-by: alperozturk <alper_ozturk@proton.me>
1 parent 6557a20 commit ff1527a

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

app/src/main/java/it/niedermann/owncloud/notes/share/adapter/ShareeListAdapter.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212
import com.owncloud.android.lib.resources.shares.ShareType;
1313

1414
import java.util.ArrayList;
15+
import java.util.LinkedHashSet;
1516
import java.util.List;
17+
import java.util.Set;
1618

1719
import it.niedermann.owncloud.notes.databinding.ItemAddPublicShareBinding;
1820
import it.niedermann.owncloud.notes.databinding.ItemInternalShareLinkBinding;
@@ -136,7 +138,14 @@ public int getItemCount() {
136138

137139
@SuppressLint("NotifyDataSetChanged")
138140
public void addShares(List<OCShare> sharesToAdd) {
139-
shares.addAll(sharesToAdd);
141+
Set<OCShare> uniqueShares = new LinkedHashSet<>(shares);
142+
143+
// Automatically removes duplicates
144+
uniqueShares.addAll(sharesToAdd);
145+
146+
shares.clear();
147+
shares.addAll(uniqueShares);
148+
140149
sortShares();
141150
notifyDataSetChanged();
142151
}

app/src/main/java/it/niedermann/owncloud/notes/share/adapter/holder/ShareViewHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ private void setPermissionName(String permissionName) {
110110

111111
private void setImage(ImageView avatar, String name, @DrawableRes int fallback) {
112112
try {
113-
AvatarLoader.INSTANCE.load(context, avatar, account);
113+
AvatarLoader.INSTANCE.load(context, avatar, account, name);
114114
} catch (StringIndexOutOfBoundsException e) {
115115
avatar.setImageResource(fallback);
116116
}

0 commit comments

Comments
 (0)