From c40beae0fa301149c873ab55ed957d47b60842aa Mon Sep 17 00:00:00 2001 From: M66B Date: Wed, 24 Jul 2019 19:07:07 +0200 Subject: [PATCH] Fixed simple task count --- .../java/eu/faircode/email/FragmentMessages.java | 12 +++++++----- app/src/main/java/eu/faircode/email/SimpleTask.java | 4 ++++ 2 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 2973a9adbb..66b0d6e2ea 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -216,7 +216,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. private boolean manual = false; private Integer lastUnseen = null; private boolean swiping = false; - private int busy = 0; private AdapterMessage adapter; @@ -942,8 +941,11 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. private BroadcastReceiver creceiver = new BroadcastReceiver() { @Override public void onReceive(Context context, Intent intent) { - busy = intent.getIntExtra("count", 0); - if (busy == 0) { + Log.i("Received " + intent); + Log.logExtras(intent); + + int count = intent.getIntExtra("count", 0); + if (count == 0) { if (initialized && !loading) pbWait.setVisibility(View.GONE); } else @@ -2752,7 +2754,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. public void onLoaded(int fetched) { loading = false; - if (initialized && busy == 0) + if (initialized && SimpleTask.getCount() == 0) pbWait.setVisibility(View.GONE); tvNoEmail.setVisibility(fetched == 0 ? View.VISIBLE : View.GONE); @@ -2807,7 +2809,7 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences. }); initialized = true; - if (!loading && busy == 0) + if (!loading && SimpleTask.getCount() == 0) pbWait.setVisibility(View.GONE); if (viewType != AdapterMessage.ViewType.SEARCH) diff --git a/app/src/main/java/eu/faircode/email/SimpleTask.java b/app/src/main/java/eu/faircode/email/SimpleTask.java index 2c525f5d36..4379870fd6 100644 --- a/app/src/main/java/eu/faircode/email/SimpleTask.java +++ b/app/src/main/java/eu/faircode/email/SimpleTask.java @@ -195,4 +195,8 @@ public abstract class SimpleTask implements LifecycleObserver { protected void onPostExecute(Bundle args) { } + + static int getCount() { + return tasks.size(); + } }