fixes merge conflicts

This commit is contained in:
Vavassor 2017-05-11 18:58:38 -04:00
commit 66bac21236
5 changed files with 65 additions and 1 deletions

View file

@ -145,6 +145,11 @@ public class TimelineAdapter extends RecyclerView.Adapter implements AdapterItem
notifyItemRemoved(position);
}
public void clear() {
statuses.clear();
notifyDataSetChanged();
}
public void removeAllByAccountId(String accountId) {
for (int i = 0; i < statuses.size();) {
Status status = statuses.get(i);