From 81235592e34864f570b9c63920bd89027e7fbb8d Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Thu, 21 Feb 2019 10:18:20 +0000
Subject: [PATCH] Simplifications

---
 app/src/main/java/eu/faircode/email/AdapterFolder.java    | 6 ++----
 app/src/main/java/eu/faircode/email/FragmentMessages.java | 3 +--
 2 files changed, 3 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 7ecbf66e81..9fa704a678 100644
--- a/app/src/main/java/eu/faircode/email/AdapterFolder.java
+++ b/app/src/main/java/eu/faircode/email/AdapterFolder.java
@@ -301,9 +301,8 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                 db.beginTransaction();
 
                                 boolean now;
-                                if (aid < 0) {
-                                    // outbox
-                                    now = (internet && "connected".equals(folder.state));
+                                if (aid < 0) { // outbox
+                                    now = "connected".equals(folder.state);
                                     EntityOperation.sync(db, fid);
                                 } else {
                                     if (!internet || "connected".equals(db.account().getAccount(aid).state)) {
@@ -311,7 +310,6 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
                                         EntityOperation.sync(db, fid);
                                     } else {
                                         now = true;
-                                        db.folder().setFolderSyncState(folder.id, "requested");
                                         ServiceSynchronize.sync(context, fid);
                                     }
                                 }
diff --git a/app/src/main/java/eu/faircode/email/FragmentMessages.java b/app/src/main/java/eu/faircode/email/FragmentMessages.java
index 804e18782a..0e1aa71dc6 100644
--- a/app/src/main/java/eu/faircode/email/FragmentMessages.java
+++ b/app/src/main/java/eu/faircode/email/FragmentMessages.java
@@ -515,7 +515,7 @@ public class FragmentMessages extends FragmentBase {
                     boolean now = false;
                     for (EntityFolder folder : folders)
                         if (folder.account == null) { // outbox
-                            now = (internet && "connected".equals(folder.state));
+                            now = "connected".equals(folder.state);
                             EntityOperation.sync(db, folder.id);
                         } else {
                             EntityAccount account = db.account().getAccount(folder.account);
@@ -524,7 +524,6 @@ public class FragmentMessages extends FragmentBase {
                                 EntityOperation.sync(db, folder.id);
                             } else {
                                 now = true;
-                                db.folder().setFolderSyncState(folder.id, "requested");
                                 ServiceSynchronize.sync(context, folder.id);
                             }
                         }