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

Fix progress bar issues.

Browse Source
This commit is contained in:
akwizgran
2016-08-23 17:04:48 +01:00
parent 98337a16ec
commit 3aa3811d1b
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
briar-android/src/org/briarproject/android/blogs/BlogActivity.java
View File

@@ -79,13 +79,14 @@ public class BlogActivity extends BriarActivity implements BlogPostListener,
pager = (ViewPager) findViewById(R.id.pager); pager = (ViewPager) findViewById(R.id.pager);
progressBar = (ProgressBar) findViewById(R.id.progressBar); progressBar = (ProgressBar) findViewById(R.id.progressBar);
hideLoadingScreen();
blogPagerAdapter = new BlogPagerAdapter(getSupportFragmentManager()); blogPagerAdapter = new BlogPagerAdapter(getSupportFragmentManager());
postPagerAdapter = new BlogPostPagerAdapter( postPagerAdapter = new BlogPostPagerAdapter(
getSupportFragmentManager()); getSupportFragmentManager());
if (state == null || state.getByteArray(POST_ID) == null) { if (state == null || state.getByteArray(POST_ID) == null) {
// The blog fragment has its own progress bar
hideLoadingScreen();
pager.setAdapter(blogPagerAdapter); pager.setAdapter(blogPagerAdapter);
savedPostId = null; savedPostId = null;
} else { } else {
@@ -133,10 +134,6 @@ public class BlogActivity extends BriarActivity implements BlogPostListener,
progressBar.setVisibility(VISIBLE); progressBar.setVisibility(VISIBLE);
} }
private void showLoadingScreen() {
showLoadingScreen(false, 0);
}
@Override @Override
public void hideLoadingScreen() { public void hideLoadingScreen() {
progressBar.setVisibility(GONE); progressBar.setVisibility(GONE);
@@ -153,7 +150,6 @@ public class BlogActivity extends BriarActivity implements BlogPostListener,
} }
private void loadBlogPosts(final MessageId select) { private void loadBlogPosts(final MessageId select) {
showLoadingScreen();
blogController.loadBlogPosts( blogController.loadBlogPosts(
new UiResultExceptionHandler<Collection<BlogPostItem>, DbException>( new UiResultExceptionHandler<Collection<BlogPostItem>, DbException>(
this) { this) {

3
briar-android/src/org/briarproject/android/blogs/BlogFragment.java
View File

@@ -98,6 +98,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
list = (BriarRecyclerView) v.findViewById(R.id.postList); list = (BriarRecyclerView) v.findViewById(R.id.postList);
list.setLayoutManager(new LinearLayoutManager(getActivity())); list.setLayoutManager(new LinearLayoutManager(getActivity()));
list.setAdapter(adapter); list.setAdapter(adapter);
list.showProgressBar();
if (myBlog) { if (myBlog) {
list.setEmptyText( list.setEmptyText(
getString(R.string.blogs_my_blogs_blog_empty_state)); getString(R.string.blogs_my_blogs_blog_empty_state));
@@ -139,8 +140,6 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
adapter.clear();
list.showProgressBar();
list.stopPeriodicUpdate(); list.stopPeriodicUpdate();
} }