From 3aa3811d1bbf319bcf7e0164253933d35d3b04c1 Mon Sep 17 00:00:00 2001
From: akwizgran <akwizgran@users.sourceforge.net>
Date: Tue, 23 Aug 2016 17:04:48 +0100
Subject: [PATCH] Fix progress bar issues.
---
.../src/org/briarproject/android/blogs/BlogActivity.java | 8 ++------
.../src/org/briarproject/android/blogs/BlogFragment.java | 3 +--
2 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/briar-android/src/org/briarproject/android/blogs/BlogActivity.java b/briar-android/src/org/briarproject/android/blogs/BlogActivity.java
index 1bd9d938d4..7c3309010e 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 92236d4b4c..143fc1b10d 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();
}
--
GitLab