Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-05 04:19:21 +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

14
app/src/main/java/eu/faircode/email/EntityIdentity.java
View File

@@ -91,11 +91,11 @@ public class EntityIdentity {
@NonNull
public Boolean plain_only = false; // obsolete
@NonNull
public Boolean encrypt = false;
public Boolean encrypt = false; // obsolete
@NonNull
public Boolean delivery_receipt = false;
public Boolean delivery_receipt = false; // obsolete
@NonNull
public Boolean read_receipt = false;
public Boolean read_receipt = false; // obsolete
@NonNull
public Boolean store_sent = false; // obsolete
public Long sent_folder = null; // obsolete
@@ -179,8 +179,6 @@ public class EntityIdentity {
// not plain_only
json.put("encrypt", encrypt);
json.put("delivery_receipt", delivery_receipt);
json.put("read_receipt", read_receipt);
// not store_sent
// not sent_folder
// not sign_key
@@ -229,10 +227,6 @@ public class EntityIdentity {
if (json.has("encrypt"))
identity.encrypt = json.getBoolean("encrypt");
if (json.has("delivery_receipt"))
identity.delivery_receipt = json.getBoolean("delivery_receipt");
if (json.has("read_receipt"))
identity.read_receipt = json.getBoolean("read_receipt");
return identity;
}
@@ -263,8 +257,6 @@ public class EntityIdentity {
Objects.equals(this.replyto, other.replyto) &&
Objects.equals(this.bcc, other.bcc) &&
this.encrypt.equals(other.encrypt) &&
this.delivery_receipt.equals(other.delivery_receipt) &&
this.read_receipt.equals(other.read_receipt) &&
Objects.equals(this.tbd, other.tbd) &&
Objects.equals(this.state, other.state) &&
Objects.equals(this.error, other.error) &&