From 95252daa29c8f2378d122bcf5c5c9d413529c1b9 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Sun, 2 Dec 2018 15:00:34 +0100
Subject: [PATCH] Fixed manual sync outbox

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java | 10 ++++++----
 .../java/eu/faircode/email/ServiceSynchronize.java     |  9 ++++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/AdapterFolder.java b/app/src/main/java/eu/faircode/email/AdapterFolder.java
index 0cbb9db622..96de8035c0 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -38,6 +38,8 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.widget.Toast;
 
+import com.google.android.material.snackbar.Snackbar;
+
 import java.text.Collator;
 import java.util.ArrayList;
 import java.util.Collections;
@@ -233,7 +235,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
 
                 private void onActionSynchronizeNow() {
                     Bundle args = new Bundle();
-                    args.putLong("account", folder.account);
+                    args.putLong("account", folder.account == null ? -1 : folder.account);
                     args.putLong("folder", folder.id);
 
                     new SimpleTask<EntityAccount>() {
@@ -245,13 +247,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                             DB db = DB.getInstance(context);
                             EntityOperation.sync(db, folder);
 
-                            return db.account().getAccount(account);
+                            return (account < 0 ? null : db.account().getAccount(account));
                         }
 
                         @Override
                         protected void onLoaded(Bundle args, EntityAccount account) {
-                            if (!"connected".equals(account.state))
-                                Toast.makeText(context, R.string.title_sync_queued, Toast.LENGTH_LONG).show();
+                            if (account != null && !"connected".equals(account.state))
+                                Snackbar.make(itemView, R.string.title_sync_queued, Snackbar.LENGTH_LONG).show();
                         }
 
                         @Override
diff --git a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
index 2eda51aa5e..1082e78dde 100644
--- a/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
+++ b/app/src/main/java/eu/faircode/email/ServiceSynchronize.java
@@ -1087,7 +1087,7 @@ public class ServiceSynchronize extends LifecycleService {
                                             boolean process = false;
                                             List<Long> current = new ArrayList<>();
                                             for (EntityOperation op : operations) {
-                                                if (!handling.contains(op.id) || op.error != null)
+                                                if (!handling.contains(op.id))
                                                     process = true;
                                                 current.add(op.id);
                                             }
@@ -1391,7 +1391,10 @@ public class ServiceSynchronize extends LifecycleService {
                                 doAttachment(folder, op, ifolder, message, jargs, db);
 
                             else if (EntityOperation.SYNC.equals(op.name))
-                                synchronizeMessages(account, folder, ifolder, state);
+                                if (!EntityFolder.OUTBOX.equals(folder.type))
+                                    synchronizeMessages(account, folder, ifolder, state);
+                                else
+                                    db.folder().setFolderError(folder.id, null);
 
                             else
                                 throw new MessagingException("Unknown operation name=" + op.name);
@@ -2401,7 +2404,7 @@ public class ServiceSynchronize extends LifecycleService {
                                                 boolean process = false;
                                                 List<Long> current = new ArrayList<>();
                                                 for (EntityOperation op : operations) {
-                                                    if (!handling.contains(op.id) || op.error != null)
+                                                    if (!handling.contains(op.id))
                                                         process = true;
                                                     current.add(op.id);
                                                 }