From 1324a364e8206dfeb2a033a8a8bbb520910e0b19 Mon Sep 17 00:00:00 2001 From: M66B Date: Thu, 28 Feb 2019 11:28:25 +0000 Subject: [PATCH] Small state fix --- .../main/java/eu/faircode/email/FragmentFolders.java | 10 ++++------ .../main/java/eu/faircode/email/FragmentMessages.java | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/app/src/main/java/eu/faircode/email/FragmentFolders.java b/app/src/main/java/eu/faircode/email/FragmentFolders.java index 06c6ec364e..59383bd17e 100644 --- a/app/src/main/java/eu/faircode/email/FragmentFolders.java +++ b/app/src/main/java/eu/faircode/email/FragmentFolders.java @@ -228,11 +228,6 @@ public class FragmentFolders extends FragmentBase { args.putLong("account", account); new SimpleTask() { - @Override - protected void onPostExecute(Bundle args) { - swipeRefresh.setRefreshing(false); - } - @Override protected Boolean onExecute(Context context, Bundle args) { long aid = args.getLong("account"); @@ -296,12 +291,15 @@ public class FragmentFolders extends FragmentBase { @Override protected void onExecuted(Bundle args, Boolean now) { - if (!now) + if (!now) { + swipeRefresh.setRefreshing(false); Snackbar.make(view, R.string.title_sync_delayed, Snackbar.LENGTH_LONG).show(); + } } @Override protected void onException(Bundle args, Throwable ex) { + swipeRefresh.setRefreshing(false); if (ex instanceof IllegalArgumentException) Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); else diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java index 13ddf60ff0..a37855f979 100644 --- a/app/src/main/java/eu/faircode/email/FragmentMessages.java +++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java @@ -488,11 +488,6 @@ public class FragmentMessages extends FragmentBase { args.putLong("folder", folder); new SimpleTask() { - @Override - protected void onPostExecute(Bundle args) { - swipeRefresh.setRefreshing(false); - } - @Override protected Boolean onExecute(Context context, Bundle args) { long fid = args.getLong("folder"); @@ -553,12 +548,15 @@ public class FragmentMessages extends FragmentBase { @Override protected void onExecuted(Bundle args, Boolean now) { - if (!now) + if (!now) { + swipeRefresh.setRefreshing(false); Snackbar.make(view, R.string.title_sync_delayed, Snackbar.LENGTH_LONG).show(); + } } @Override protected void onException(Bundle args, Throwable ex) { + swipeRefresh.setRefreshing(false); if (ex instanceof IllegalArgumentException) Snackbar.make(view, ex.getMessage(), Snackbar.LENGTH_LONG).show(); else