diff --git a/briar-android/src/org/briarproject/android/blogs/BlogActivity.java b/briar-android/src/org/briarproject/android/blogs/BlogActivity.java index 1bd9d938d4da7c907bce35375fafd95e388bd3d2..7c3309010e1c85ccfabdcedab718e80637d61816 100644 --- a/briar-android/src/org/briarproject/android/blogs/BlogActivity.java +++ b/briar-android/src/org/briarproject/android/blogs/BlogActivity.java @@ -79,13 +79,14 @@ public class BlogActivity extends BriarActivity implements BlogPostListener, pager = (ViewPager) findViewById(R.id.pager); progressBar = (ProgressBar) findViewById(R.id.progressBar); - hideLoadingScreen(); blogPagerAdapter = new BlogPagerAdapter(getSupportFragmentManager()); postPagerAdapter = new BlogPostPagerAdapter( getSupportFragmentManager()); if (state == null || state.getByteArray(POST_ID) == null) { + // The blog fragment has its own progress bar + hideLoadingScreen(); pager.setAdapter(blogPagerAdapter); savedPostId = null; } else { @@ -133,10 +134,6 @@ public class BlogActivity extends BriarActivity implements BlogPostListener, progressBar.setVisibility(VISIBLE); } - private void showLoadingScreen() { - showLoadingScreen(false, 0); - } - @Override public void hideLoadingScreen() { progressBar.setVisibility(GONE); @@ -153,7 +150,6 @@ public class BlogActivity extends BriarActivity implements BlogPostListener, } private void loadBlogPosts(final MessageId select) { - showLoadingScreen(); blogController.loadBlogPosts( new UiResultExceptionHandler<Collection<BlogPostItem>, DbException>( this) { diff --git a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java index 92236d4b4cfd72fbf33c6a910f1f9af406705513..143fc1b10d0a3dca946783c4a0ccb7c6ed204c79 100644 --- a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java +++ b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java @@ -98,6 +98,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener { list = (BriarRecyclerView) v.findViewById(R.id.postList); list.setLayoutManager(new LinearLayoutManager(getActivity())); list.setAdapter(adapter); + list.showProgressBar(); if (myBlog) { list.setEmptyText( getString(R.string.blogs_my_blogs_blog_empty_state)); @@ -139,8 +140,6 @@ public class BlogFragment extends BaseFragment implements BlogPostListener { @Override public void onPause() { super.onPause(); - adapter.clear(); - list.showProgressBar(); list.stopPeriodicUpdate(); }