BlogFragment doesn't need to use adapter revisions.

All changes to the adapter are cumulative.
This commit is contained in:
akwizgran
2016-10-20 14:21:10 +01:00
parent 9bb16b424f
commit c4716ca457

View File

@@ -32,7 +32,6 @@ import org.briarproject.api.identity.Author;
import org.briarproject.api.sync.GroupId; import org.briarproject.api.sync.GroupId;
import java.util.Collection; import java.util.Collection;
import java.util.logging.Logger;
import javax.inject.Inject; import javax.inject.Inject;
@@ -52,7 +51,6 @@ public class BlogFragment extends BaseFragment implements
OnBlogPostAddedListener { OnBlogPostAddedListener {
public final static String TAG = BlogFragment.class.getName(); public final static String TAG = BlogFragment.class.getName();
private static final Logger LOG = Logger.getLogger(TAG);
@Inject @Inject
BlogController blogController; BlogController blogController;
@@ -209,7 +207,6 @@ public class BlogFragment extends BaseFragment implements
listener) { listener) {
@Override @Override
public void onResultUi(BlogPostItem post) { public void onResultUi(BlogPostItem post) {
adapter.incrementRevision();
adapter.add(post); adapter.add(post);
if (local) { if (local) {
list.scrollToPosition(0); list.scrollToPosition(0);
@@ -231,23 +228,16 @@ public class BlogFragment extends BaseFragment implements
} }
void loadBlogPosts(final boolean reload) { void loadBlogPosts(final boolean reload) {
final int revision = adapter.getRevision();
blogController.loadBlogPosts( blogController.loadBlogPosts(
new UiResultExceptionHandler<Collection<BlogPostItem>, DbException>( new UiResultExceptionHandler<Collection<BlogPostItem>, DbException>(
listener) { listener) {
@Override @Override
public void onResultUi(Collection<BlogPostItem> posts) { public void onResultUi(Collection<BlogPostItem> posts) {
if (revision == adapter.getRevision()) { if (posts.isEmpty()) {
adapter.incrementRevision(); list.showData();
if (posts.isEmpty()) {
list.showData();
} else {
adapter.addAll(posts);
if (reload) list.scrollToPosition(0);
}
} else { } else {
LOG.info("Concurrent update, reloading"); adapter.addAll(posts);
loadBlogPosts(reload); if (reload) list.scrollToPosition(0);
} }
} }