Merge branch 'master' of github.com:M66B/open-source-email

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);
                                     }
                                 }

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);
                             }
                         }