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

Merge branch '576-empty-state-messages-are-briefly-shown-when-they-shouldn-t' into 'master'

Browse Source 
Prevent empty state messages from showing briefly

When we clear a list in `onPause()`, the proper behavior is that the empty state
message is shown, because the list is indeed empty.

However, we will reload the list content again in `onResume()`,
so the fix chosen in this MR is to force showing the progress bar
right after clearing the list.

Closes #576

See merge request !267
This commit is contained in:
akwizgran
2016-08-05 15:02:52 +00:00
parent adc85dab7e dd0d23359b
commit 054a0d467c
5 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/org/briarproject/android/blogs/MyBlogsFragment.java
View File

@@ -82,6 +82,7 @@ public class MyBlogsFragment extends BaseFragment {
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
adapter.clear(); adapter.clear();
list.showProgressBar();
loadBlogs(); loadBlogs();
} }

3
briar-android/src/org/briarproject/android/contact/ContactListFragment.java
View File

@@ -192,8 +192,9 @@ public class ContactListFragment extends BaseFragment implements EventListener {
@Override @Override
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
adapter.clear();
eventBus.removeListener(this); eventBus.removeListener(this);
adapter.clear();
list.showProgressBar();
list.stopPeriodicUpdate(); list.stopPeriodicUpdate();
} }

1
briar-android/src/org/briarproject/android/forum/ForumListFragment.java
View File

@@ -119,6 +119,7 @@ public class ForumListFragment extends BaseEventFragment implements
super.onPause(); super.onPause();
adapter.clear(); adapter.clear();
list.showProgressBar();
list.stopPeriodicUpdate(); list.stopPeriodicUpdate();
} }

1
briar-android/src/org/briarproject/android/introduction/ContactChooserFragment.java
View File

@@ -140,6 +140,7 @@ public class ContactChooserFragment extends BaseFragment {
public void onPause() { public void onPause() {
super.onPause(); super.onPause();
adapter.clear(); adapter.clear();
list.showProgressBar();
} }
@Override @Override

6
briar-android/src/org/briarproject/android/sharing/InvitationsActivity.java
View File

@@ -28,6 +28,7 @@ abstract class InvitationsActivity extends BriarActivity
Logger.getLogger(InvitationsActivity.class.getName()); Logger.getLogger(InvitationsActivity.class.getName());
private InvitationAdapter adapter; private InvitationAdapter adapter;
private BriarRecyclerView list;
@Inject @Inject
protected EventBus eventBus; protected EventBus eventBus;
@@ -40,8 +41,8 @@ abstract class InvitationsActivity extends BriarActivity
adapter = getAdapter(this, this); adapter = getAdapter(this, this);
BriarRecyclerView list =
(BriarRecyclerView) findViewById(R.id.invitationsView); list = (BriarRecyclerView) findViewById(R.id.invitationsView);
if (list != null) { if (list != null) {
list.setLayoutManager(new LinearLayoutManager(this)); list.setLayoutManager(new LinearLayoutManager(this));
list.setAdapter(adapter); list.setAdapter(adapter);
@@ -60,6 +61,7 @@ abstract class InvitationsActivity extends BriarActivity
super.onPause(); super.onPause();
eventBus.removeListener(this); eventBus.removeListener(this);
adapter.clear(); adapter.clear();
list.showProgressBar();
} }
@Override @Override