Fixed simple task count

pull/159/head
M66B 5 years ago
parent a0c2e41adb
commit c40beae0fa

@ -216,7 +216,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private boolean manual = false; private boolean manual = false;
private Integer lastUnseen = null; private Integer lastUnseen = null;
private boolean swiping = false; private boolean swiping = false;
private int busy = 0;
private AdapterMessage adapter; private AdapterMessage adapter;
@ -942,8 +941,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
private BroadcastReceiver creceiver = new BroadcastReceiver() { private BroadcastReceiver creceiver = new BroadcastReceiver() {
@Override @Override
public void onReceive(Context context, Intent intent) { public void onReceive(Context context, Intent intent) {
busy = intent.getIntExtra("count", 0); Log.i("Received " + intent);
if (busy == 0) { Log.logExtras(intent);
int count = intent.getIntExtra("count", 0);
if (count == 0) {
if (initialized && !loading) if (initialized && !loading)
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
} else } else
@ -2752,7 +2754,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
public void onLoaded(int fetched) { public void onLoaded(int fetched) {
loading = false; loading = false;
if (initialized && busy == 0) if (initialized && SimpleTask.getCount() == 0)
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
tvNoEmail.setVisibility(fetched == 0 ? View.VISIBLE : View.GONE); tvNoEmail.setVisibility(fetched == 0 ? View.VISIBLE : View.GONE);
@ -2807,7 +2809,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
}); });
initialized = true; initialized = true;
if (!loading && busy == 0) if (!loading && SimpleTask.getCount() == 0)
pbWait.setVisibility(View.GONE); pbWait.setVisibility(View.GONE);
if (viewType != AdapterMessage.ViewType.SEARCH) if (viewType != AdapterMessage.ViewType.SEARCH)

@ -195,4 +195,8 @@ public abstract class SimpleTask<T> implements LifecycleObserver {
protected void onPostExecute(Bundle args) { protected void onPostExecute(Bundle args) {
} }
static int getCount() {
return tasks.size();
}
} }

Loading…
Cancel
Save