mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed manual sync outbox

This commit is contained in:
M66B 2018-12-02 15:00:34 +01:00
parent 16296f3174
commit 95252daa29
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/src/main/java/eu/faircode/email/AdapterFolder.java
View File

@ -38,6 +38,8 @@ import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import com.google.android.material.snackbar.Snackbar;
import java.text.Collator; import java.text.Collator;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -233,7 +235,7 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
private void onActionSynchronizeNow() { private void onActionSynchronizeNow() {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("account", folder.account); args.putLong("account", folder.account == null ? -1 : folder.account);
args.putLong("folder", folder.id); args.putLong("folder", folder.id);
new SimpleTask<EntityAccount>() { new SimpleTask<EntityAccount>() {
@ -245,13 +247,13 @@ public class AdapterFolder extends RecyclerView.Adapter<AdapterFolder.ViewHolder
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
EntityOperation.sync(db, folder); EntityOperation.sync(db, folder);
return db.account().getAccount(account); return (account < 0 ? null : db.account().getAccount(account));
} }
@Override @Override
protected void onLoaded(Bundle args, EntityAccount account) { protected void onLoaded(Bundle args, EntityAccount account) {
if (!"connected".equals(account.state)) if (account != null && !"connected".equals(account.state))
Toast.makeText(context, R.string.title_sync_queued, Toast.LENGTH_LONG).show(); Snackbar.make(itemView, R.string.title_sync_queued, Snackbar.LENGTH_LONG).show();
} }
@Override @Override

9
app/src/main/java/eu/faircode/email/ServiceSynchronize.java
View File

@ -1087,7 +1087,7 @@ public class ServiceSynchronize extends LifecycleService {
boolean process = false; boolean process = false;
List<Long> current = new ArrayList<>(); List<Long> current = new ArrayList<>();
for (EntityOperation op : operations) { for (EntityOperation op : operations) {
if (!handling.contains(op.id) || op.error != null) if (!handling.contains(op.id))
process = true; process = true;
current.add(op.id); current.add(op.id);
} }
@ -1391,7 +1391,10 @@ public class ServiceSynchronize extends LifecycleService {
doAttachment(folder, op, ifolder, message, jargs, db); doAttachment(folder, op, ifolder, message, jargs, db);
else if (EntityOperation.SYNC.equals(op.name)) 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 else
throw new MessagingException("Unknown operation name=" + op.name); throw new MessagingException("Unknown operation name=" + op.name);
@ -2401,7 +2404,7 @@ public class ServiceSynchronize extends LifecycleService {
boolean process = false; boolean process = false;
List<Long> current = new ArrayList<>(); List<Long> current = new ArrayList<>();
for (EntityOperation op : operations) { for (EntityOperation op : operations) {
if (!handling.contains(op.id) || op.error != null) if (!handling.contains(op.id))
process = true; process = true;
current.add(op.id); current.add(op.id);
} }