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

Select identity for external drafts

This commit is contained in:
M66B 2020-08-01 08:05:06 +02:00
parent aea8e76c92
commit d497aa4e02
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2920,6 +2920,9 @@ class Core {
private static EntityIdentity matchIdentity(Context context, EntityFolder folder, EntityMessage message) {
DB db = DB.getInstance(context);
if (EntityFolder.DRAFTS.equals(folder.type))
return null;
List<Address> addresses = new ArrayList<>();
if (folder.isOutgoing()) {
if (message.from != null)

3
app/src/main/java/eu/faircode/email/DaoMessage.java
View File

@ -664,6 +664,9 @@ public interface DaoMessage {
@Query("UPDATE message SET error = :error WHERE id = :id")
int setMessageError(long id, String error);
@Query("UPDATE message SET identity = :identity WHERE id = :id")
int setMessageIdentity(long id, Long identity);
@Query("UPDATE message SET revision = :revision WHERE id = :id")
int setMessageRevision(long id, Integer revision);

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

@ -3720,6 +3720,21 @@ public class FragmentCompose extends FragmentBase {
} else {
args.putBoolean("saved", true);
// External draft
if (data.draft.identity == null) {
for (EntityIdentity identity : data.identities)
if (identity.account.equals(data.draft.account))
if (identity.primary) {
data.draft.identity = identity.id;
break;
} else if (data.draft.identity == null)
data.draft.identity = identity.id;
if (data.draft.identity != null)
db.message().setMessageIdentity(data.draft.id, data.draft.identity);
Log.i("Selected external identity=" + data.draft.identity);
}
if (data.draft.revision == null) {
data.draft.revision = 1;
data.draft.revisions = 1;