Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-04-07 09:33:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Sync instead of store sent

Browse Source
This commit is contained in:
M66B
2019-07-27 11:11:24 +02:00
parent d02e246189
commit 1d3cd1d44f
6 changed files with 19 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/eu/faircode/email/Core.java
View File

@@ -1265,6 +1265,7 @@ class Core {
for (EntityMessage orphan : orphans) {
Log.i(folder.name + " adding orphan id=" + orphan.id + " sent=" + new Date(orphan.sent));
orphan.folder = folder.id;
orphan.ui_hide = 0L;
db.message().updateMessage(orphan);
EntityOperation.queue(context, orphan, EntityOperation.ADD);
}

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

@@ -121,8 +121,6 @@ public class FragmentIdentity extends FragmentBase {
private CheckBox cbDeliveryReceipt;
private CheckBox cbReadReceipt;
private CheckBox cbStoreSent;
private Button btnSave;
private ContentLoadingProgressBar pbSave;
private TextView tvError;
@@ -199,8 +197,6 @@ public class FragmentIdentity extends FragmentBase {
cbDeliveryReceipt = view.findViewById(R.id.cbDeliveryReceipt);
cbReadReceipt = view.findViewById(R.id.cbReadReceipt);
cbStoreSent = view.findViewById(R.id.cbStoreSent);
btnSave = view.findViewById(R.id.btnSave);
pbSave = view.findViewById(R.id.pbSave);
tvError = view.findViewById(R.id.tvError);
@@ -505,7 +501,6 @@ public class FragmentIdentity extends FragmentBase {
args.putBoolean("encrypt", cbEncrypt.isChecked());
args.putBoolean("delivery_receipt", cbDeliveryReceipt.isChecked());
args.putBoolean("read_receipt", cbReadReceipt.isChecked());
args.putBoolean("store_sent", cbStoreSent.isChecked());
args.putLong("account", account == null ? -1 : account.id);
args.putString("host", etHost.getText().toString());
args.putBoolean("starttls", rgEncryption.getCheckedRadioButtonId() == R.id.radio_starttls);
@@ -570,7 +565,6 @@ public class FragmentIdentity extends FragmentBase {
boolean encrypt = args.getBoolean("encrypt");
boolean delivery_receipt = args.getBoolean("delivery_receipt");
boolean read_receipt = args.getBoolean("read_receipt");
boolean store_sent = args.getBoolean("store_sent");
boolean should = args.getBoolean("should");
@@ -662,8 +656,6 @@ public class FragmentIdentity extends FragmentBase {
return true;
if (!Objects.equals(identity.read_receipt, read_receipt))
return true;
if (!Objects.equals(identity.store_sent, store_sent))
return true;
if (identity.error != null)
return true;
@@ -746,7 +738,6 @@ public class FragmentIdentity extends FragmentBase {
identity.encrypt = encrypt;
identity.delivery_receipt = delivery_receipt;
identity.read_receipt = read_receipt;
identity.store_sent = store_sent;
identity.sent_folder = null;
identity.sign_key = null;
identity.error = null;
@@ -887,7 +878,6 @@ public class FragmentIdentity extends FragmentBase {
cbEncrypt.setChecked(identity == null ? false : identity.encrypt);
cbDeliveryReceipt.setChecked(identity == null ? false : identity.delivery_receipt);
cbReadReceipt.setChecked(identity == null ? false : identity.read_receipt);
cbStoreSent.setChecked(identity == null ? false : identity.store_sent);
color = (identity == null || identity.color == null ? Color.TRANSPARENT : identity.color);

12
app/src/main/java/eu/faircode/email/ServiceSend.java
View File

@@ -398,16 +398,12 @@ public class ServiceSend extends ServiceBase {
db.message().setMessageSeen(message.id, true);
db.message().setMessageUiSeen(message.id, true);
db.message().setMessageError(message.id, null);
if (!BuildConfig.DEBUG && !debug)
db.message().setMessageUiHide(message.id, new Date().getTime());
EntityFolder sent = db.folder().getFolderByType(message.account, EntityFolder.SENT);
if (ident.store_sent && sent != null) {
db.message().setMessageFolder(message.id, sent.id);
message.folder = sent.id;
EntityOperation.queue(this, message, EntityOperation.ADD);
} else {
if (!BuildConfig.DEBUG && !debug)
db.message().setMessageUiHide(message.id, new Date().getTime());
}
if (sent != null)
EntityOperation.sync(this, sent.id, false);
if (message.inreplyto != null) {
List<EntityMessage> replieds = db.message().getMessageByMsgId(message.account, message.inreplyto);