narayana/conversations-classic
3
2
Fork 0
Code Issues 3 Pull requests 2 Actions Packages Projects Releases 4 Wiki Activity

fix disappearing bookmarks (issue #12)

Browse source
This commit is contained in:
kosyak 2024-08-18 14:03:49 +02:00
parent ce40742ddf
commit e9659f0fa3
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/main/java/eu/siacs/conversations/ui/StartConversationActivity.java
View file

@ -1150,6 +1150,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
if (self.match(this, needle)) { if (self.match(this, needle)) {
this.contacts.add(self); this.contacts.add(self);
} }
for (Bookmark bookmark : account.getBookmarks()) {
if (bookmark.match(this, needle)) {
tags.addAll(bookmark.getTags(this));
}
}
} }
} }
@ -1764,6 +1770,12 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
ListItem item = getItem(i); ListItem item = getItem(i);
List<ListItem.Tag> itemTags = item.getTags(activity); List<ListItem.Tag> itemTags = item.getTags(activity);
if (item instanceof Contact && !((Contact) item).getAccount().getJid().equals(account.getJid())) {
continue;
} else if (item instanceof Bookmark && !((Bookmark) item).getAccount().getJid().equals(account.getJid())) {
continue;
}
if (itemTags.size() == 0 || (itemTags.size() == 1 && UIHelper.isStatusTag(activity, itemTags.get(0)))) { if (itemTags.size() == 0 || (itemTags.size() == 1 && UIHelper.isStatusTag(activity, itemTags.get(0)))) {
if (!generalTagAdded) { if (!generalTagAdded) {
tagsAndAccounts.add(initialPosition, generalTag); tagsAndAccounts.add(initialPosition, generalTag);