Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-19 14:19:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1210-fix-list-duplicates' into 'master'

Browse Source 
[android] Fix duplicate items in lists

Closes #1210

See merge request briar/briar!1174
This commit is contained in:
akwizgran
2019-10-16 14:32:49 +00:00
parent f45d00e23c 0d4cb05ac0
commit 7a644f7d8b
4 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/contact/ContactListFragment.java
View File

@@ -267,7 +267,7 @@ public class ContactListFragment extends BaseFragment implements EventListener,
if (revision == adapter.getRevision()) { if (revision == adapter.getRevision()) {
adapter.incrementRevision(); adapter.incrementRevision();
if (contacts.isEmpty()) list.showData(); if (contacts.isEmpty()) list.showData();
else adapter.addAll(contacts); else adapter.replaceAll(contacts);
} else { } else {
LOG.info("Concurrent update, reloading"); LOG.info("Concurrent update, reloading");
loadContacts(); loadContacts();

2
briar-android/src/main/java/org/briarproject/briar/android/forum/ForumListFragment.java
View File

@@ -182,7 +182,7 @@ public class ForumListFragment extends BaseEventFragment implements
if (revision == adapter.getRevision()) { if (revision == adapter.getRevision()) {
adapter.incrementRevision(); adapter.incrementRevision();
if (forums.isEmpty()) list.showData(); if (forums.isEmpty()) list.showData();
else adapter.addAll(forums); else adapter.replaceAll(forums);
} else { } else {
LOG.info("Concurrent update, reloading"); LOG.info("Concurrent update, reloading");
loadForums(); loadForums();

2
briar-android/src/main/java/org/briarproject/briar/android/privategroup/list/GroupListFragment.java
View File

@@ -194,7 +194,7 @@ public class GroupListFragment extends BaseFragment implements
if (revision == adapter.getRevision()) { if (revision == adapter.getRevision()) {
adapter.incrementRevision(); adapter.incrementRevision();
if (groups.isEmpty()) list.showData(); if (groups.isEmpty()) list.showData();
else adapter.addAll(groups); else adapter.replaceAll(groups);
} else { } else {
LOG.info("Concurrent update, reloading"); LOG.info("Concurrent update, reloading");
loadGroups(); loadGroups();

4
briar-android/src/main/java/org/briarproject/briar/android/util/BriarAdapter.java
View File

@@ -79,6 +79,10 @@ public abstract class BriarAdapter<T, V extends ViewHolder>
this.items.addAll(items); this.items.addAll(items);
} }
public void replaceAll(Collection<T> items) {
this.items.replaceAll(items);
}
public void setItems(Collection<T> items) { public void setItems(Collection<T> items) {
this.items.beginBatchedUpdates(); this.items.beginBatchedUpdates();
this.items.clear(); this.items.clear();