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

Compare commits

base: narayana:master
Branches Tags
narayana:master
narayana:hrukudah
narayana:develop
narayana:gnomeshell1
narayana:fdroid/changelogs
narayana:c3
narayana:2.3.1
narayana:2.3.0
narayana:2.2.4
narayana:2.2.2
..
compare: narayana:2.3.1
Branches Tags
narayana:hrukudah
narayana:develop
narayana:gnomeshell1
narayana:fdroid/changelogs
narayana:master
narayana:c3
narayana:2.3.1
narayana:2.3.0
narayana:2.2.4
narayana:2.2.2

No commits in common. "master" and "2.3.1" have entirely different histories.
master ... 2.3.1

1 changed files with 0 additions and 12 deletions
Show stats Expand all files Collapse all files

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

@ -1150,12 +1150,6 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
if (self.match(this, needle)) {
this.contacts.add(self);
}
for (Bookmark bookmark : account.getBookmarks()) {
if (bookmark.match(this, needle)) {
tags.addAll(bookmark.getTags(this));
}
}
}
}
@ -1770,12 +1764,6 @@ public class StartConversationActivity extends XmppActivity implements XmppConne
ListItem item = getItem(i);
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 (!generalTagAdded) {
tagsAndAccounts.add(initialPosition, generalTag);