From 0731872dcfe887ede4bd7e19f5f8f66766aa378b Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 21 Feb 2019 08:13:44 +0000
Subject: [PATCH] Added message about delay sync

---
 .../java/eu/faircode/email/AdapterFolder.java | 20 ++++++++++++++-----
 .../eu/faircode/email/FragmentMessages.java   |  4 +++-
 app/src/main/res/values/strings.xml           |  1 +
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 64c70f04a4..fdd9c70542 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -284,9 +284,9 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                     args.putLong("account", folder.account == null ? -1 : folder.account);
                     args.putLong("folder", folder.id);
 
-                    new SimpleTask<Void>() {
+                    new SimpleTask<Boolean>() {
                         @Override
-                        protected Void onExecute(Context context, Bundle args) {
+                        protected Boolean onExecute(Context context, Bundle args) {
                             long aid = args.getLong("account");
                             long fid = args.getLong("folder");
 
@@ -298,9 +298,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             try {
                                 db.beginTransaction();
 
-                                if (aid < 0) // outbox
+                                boolean now;
+                                if (aid < 0) {
+                                    // outbox
+                                    now = ("connected".equals(folder.state));
                                     EntityOperation.sync(db, fid);
-                                else {
+                                } else {
+                                    now = true;
                                     if ("connected".equals(db.account().getAccount(aid).state))
                                         EntityOperation.sync(db, fid);
                                     else {
@@ -310,11 +314,17 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                 }
 
                                 db.setTransactionSuccessful();
+
+                                return now;
                             } finally {
                                 db.endTransaction();
                             }
+                        }
 
-                            return null;
+                        @Override
+                        protected void onExecuted(Bundle args, Boolean now) {
+                            if (!now)
+                                Snackbar.make(itemView, R.string.title_sync_delayed, Snackbar.LENGTH_LONG).show();
                         }
 
                         @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 6afdfda464..7c7091aa8a 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -536,8 +536,10 @@ 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
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5f4c9674e4..d7317759fd 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -256,6 +256,7 @@
     <string name="title_no_utf8">This provider does not support UTF-8</string>
     <string name="title_no_sync">Synchronization errors since %1$s</string>
     <string name="title_sync_disabled">Synchronization is disabled</string>
+    <string name="title_sync_delayed">Synchronization will be performed on the next account connection</string>
     <string name="title_drafts_required">A drafts folder is required to send messages</string>
     <string name="title_account_delete">Delete this account permanently?</string>
     <string name="title_identity_delete">Delete this identity permanently?</string>