Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-01 02:21:37 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move default encrypt/receipt to send settings

Browse Source
This commit is contained in:
M66B
2019-10-02 09:26:32 +02:00
parent 8c2d9d281b
commit 13e09da162
7 changed files with 69 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
app/src/main/java/eu/faircode/email/FragmentCompose.java
View File

@@ -1988,6 +1988,8 @@ public class FragmentCompose extends FragmentBase {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean text_color = prefs.getBoolean("text_color", true);
boolean plain_only = prefs.getBoolean("plain_only", false);
boolean encrypt_default = prefs.getBoolean("encrypt_default", false);
boolean receipt_default = prefs.getBoolean("receipt_default", false);
Log.i("Load draft action=" + action + " id=" + id + " reference=" + reference);
@@ -2020,6 +2022,13 @@ public class FragmentCompose extends FragmentBase {
data.draft = new EntityMessage();
data.draft.msgid = EntityMessage.generateMessageId();
if (plain_only)
data.draft.plain_only = true;
if (encrypt_default)
data.draft.encrypt = true;
if (receipt_default)
data.draft.receipt_request = true;
if (ref == null) {
data.draft.thread = data.draft.msgid;
@@ -2090,8 +2099,10 @@ public class FragmentCompose extends FragmentBase {
if ("reply_all".equals(action))
data.draft.cc = ref.getAllRecipients(data.identities);
else if ("receipt".equals(action))
else if ("receipt".equals(action)) {
data.draft.receipt = true;
data.draft.receipt_request = false;
}
} else if ("forward".equals(action) || "editasnew".equals(action))
data.draft.thread = data.draft.msgid; // new thread
@@ -2130,7 +2141,8 @@ public class FragmentCompose extends FragmentBase {
} else if ("participation".equals(action))
data.draft.subject = status + ": " + ref.subject;
data.draft.plain_only = ref.plain_only;
if (ref.plain_only)
data.draft.plain_only = ref.plain_only;
if (answer > 0) {
EntityAnswer a = db.answer().getAnswer(answer);
@@ -2139,9 +2151,6 @@ public class FragmentCompose extends FragmentBase {
}
}
if (plain_only)
data.draft.plain_only = true;
// Select identity matching from address
Address from = null;
EntityIdentity selected = null;
@@ -2807,12 +2816,6 @@ public class FragmentCompose extends FragmentBase {
if (draft.to == null && draft.cc == null && draft.bcc == null)
throw new IllegalArgumentException(context.getString(R.string.title_to_missing));
db.message().setMessagePlainOnly(draft.id, identity.plain_only);
db.message().setMessageEncrypt(draft.id, identity.encrypt);
db.message().setMessageReceiptRequest(draft.id, identity.delivery_receipt || identity.read_receipt);
if (TextUtils.isEmpty(draft.subject))
args.putBoolean("remind_subject", true);
@@ -3620,6 +3623,10 @@ public class FragmentCompose extends FragmentBase {
cbEncrypt.setChecked(draft.encrypt != null && draft.encrypt);
cbReceipt.setChecked(draft.receipt_request != null && draft.receipt_request);
cbPlainOnly.setVisibility(draft.receipt != null && draft.receipt ? View.GONE : View.VISIBLE);
cbEncrypt.setVisibility(draft.receipt != null && draft.receipt ? View.GONE : View.VISIBLE);
cbReceipt.setVisibility(draft.receipt != null && draft.receipt ? View.GONE : View.VISIBLE);
int priority = (draft.priority == null ? 1 : draft.priority);
spPriority.setTag(priority);
spPriority.setSelection(priority);