msb-public
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Code Issues Projects Releases Wiki Activity

Added saving of encrypted drafts

Browse Source
pull/178/head
M66B 6 years ago
parent d91d9e5eca
commit 62dfd12180
7 changed files with 166 additions and 164 deletions
Show Stats Download Patch File Download Diff File

4
app/src/main/java/eu/faircode/email/AdapterMessage.java
Unescape View File

@ -2670,7 +2670,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
card.setClickable(false); card.setClickable(false);
} }
if (EntityFolder.DRAFTS.equals(message.folderType) && message.visible == 1) if (EntityFolder.DRAFTS.equals(message.folderType) && message.visible == 1 &&
!EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) &&
!EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt))
context.startActivity( context.startActivity(
new Intent(context, ActivityCompose.class) new Intent(context, ActivityCompose.class)
.putExtra("action", "edit") .putExtra("action", "edit")

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

@ -716,7 +716,7 @@ class Core {
if (!message.content) if (!message.content)
throw new IllegalArgumentException("Message body missing"); throw new IllegalArgumentException("Message body missing");
imessage = MessageHelper.from(context, message, null, isession); imessage = MessageHelper.from(context, message, null, isession, false);
} else { } else {
// Cross account move // Cross account move
File file = message.getRawFile(context); File file = message.getRawFile(context);

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

@ -600,8 +600,8 @@ public interface DaoMessage {
@Query("UPDATE message SET encrypt = :encrypt WHERE id = :id") @Query("UPDATE message SET encrypt = :encrypt WHERE id = :id")
int setMessageEncrypt(long id, Integer encrypt); int setMessageEncrypt(long id, Integer encrypt);
@Query("UPDATE message SET encrypt = :encrypt, ui_encrypt = :encrypt WHERE id = :id") @Query("UPDATE message SET ui_encrypt = :ui_encrypt WHERE id = :id")
int setMessageUiEncrypt(long id, Integer encrypt); int setMessageUiEncrypt(long id, Integer ui_encrypt);
@Query("UPDATE message SET last_attempt = :last_attempt WHERE id = :id") @Query("UPDATE message SET last_attempt = :last_attempt WHERE id = :id")
int setMessageLastAttempt(long id, long last_attempt); int setMessageLastAttempt(long id, long last_attempt);

19
app/src/main/java/eu/faircode/email/EntityOperation.java
Unescape View File

@ -106,25 +106,6 @@ public class EntityOperation {
for (Object value : values) for (Object value : values)
jargs.put(value); jargs.put(value);
if (ADD.equals(name)) {
if (EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt)) {
EntityFolder folder = db.folder().getFolder(message.folder);
if (folder != null && EntityFolder.DRAFTS.equals(folder.type)) {
WorkerFts.init(context, false);
return;
}
}
}
if (MOVE.equals(name) &&
(EntityMessage.PGP_SIGNENCRYPT.equals(message.encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(message.encrypt))) {
EntityFolder folder = db.folder().getFolder(message.folder);
if (folder != null && EntityFolder.DRAFTS.equals(folder.type))
name = DELETE;
}
if (SEEN.equals(name)) { if (SEEN.equals(name)) {
boolean seen = jargs.getBoolean(0); boolean seen = jargs.getBoolean(0);
boolean ignore = jargs.optBoolean(1, true); boolean ignore = jargs.optBoolean(1, true);

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

@ -54,6 +54,7 @@ import android.os.OperationCanceledException;
import android.provider.ContactsContract; import android.provider.ContactsContract;
import android.provider.MediaStore; import android.provider.MediaStore;
import android.security.KeyChain; import android.security.KeyChain;
import android.security.KeyChainException;
import android.text.Editable; import android.text.Editable;
import android.text.Html; import android.text.Html;
import android.text.SpannableStringBuilder; import android.text.SpannableStringBuilder;
@ -278,7 +279,6 @@ public class FragmentCompose extends FragmentBase {
private static final int REQUEST_LINK = 13; private static final int REQUEST_LINK = 13;
private static final int REQUEST_DISCARD = 14; private static final int REQUEST_DISCARD = 14;
private static final int REQUEST_SEND = 15; private static final int REQUEST_SEND = 15;
private static final int REQUEST_CERTIFICATE = 16;
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
@ -1074,8 +1074,8 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public void onPause() { public void onPause() {
if (autosave && state == State.LOADED) //if (autosave && state == State.LOADED)
onAction(R.id.action_save); // onAction(R.id.action_save);
ConnectivityManager cm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE); ConnectivityManager cm = (ConnectivityManager) getContext().getSystemService(Context.CONNECTIVITY_SERVICE);
cm.unregisterNetworkCallback(networkCallback); cm.unregisterNetworkCallback(networkCallback);
@ -1529,16 +1529,16 @@ public class FragmentCompose extends FragmentBase {
onAction(R.id.action_check, extras); onAction(R.id.action_check, extras);
} }
private void onEncrypt(final EntityMessage draft) { private void onEncrypt(final EntityMessage draft, final int action, final boolean interactive) {
if (EntityMessage.SMIME_SIGNONLY.equals(draft.encrypt) || if (EntityMessage.SMIME_SIGNONLY.equals(draft.ui_encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(draft.encrypt)) { EntityMessage.SMIME_SIGNENCRYPT.equals(draft.ui_encrypt)) {
Bundle args = new Bundle(); Bundle args = new Bundle();
args.putLong("id", draft.id); args.putLong("id", draft.id);
args.putInt("type", draft.encrypt); args.putInt("type", draft.ui_encrypt);
new SimpleTask<EntityIdentity>() { new SimpleTask<EntityIdentity>() {
@Override @Override
protected EntityIdentity onExecute(Context context, Bundle args) { protected EntityIdentity onExecute(Context context, Bundle args) throws KeyChainException, InterruptedException {
long id = args.getLong("id"); long id = args.getLong("id");
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
@ -1546,16 +1546,32 @@ public class FragmentCompose extends FragmentBase {
if (draft == null || draft.identity == null) if (draft == null || draft.identity == null)
return null; return null;
return db.identity().getIdentity(draft.identity); EntityIdentity identity = db.identity().getIdentity(draft.identity);
if (identity != null && identity.sign_key_alias != null)
args.putBoolean("selected",
KeyChain.getPrivateKey(context, identity.sign_key_alias) != null);
return identity;
} }
@Override @Override
protected void onExecuted(final Bundle args, EntityIdentity identity) { protected void onExecuted(final Bundle args, EntityIdentity identity) {
if (identity == null)
return;
if (args.getBoolean("selected")) {
args.putString("alias", identity.sign_key_alias);
onSmime(args, action);
return;
}
if (interactive)
Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), identity.sign_key_alias, new Helper.IKeyAlias() { Helper.selectKeyAlias(getActivity(), getViewLifecycleOwner(), identity.sign_key_alias, new Helper.IKeyAlias() {
@Override @Override
public void onSelected(String alias) { public void onSelected(String alias) {
args.putString("alias", alias); args.putString("alias", alias);
onSmime(args); if (alias != null)
onSmime(args, action);
} }
@Override @Override
@ -1602,15 +1618,19 @@ public class FragmentCompose extends FragmentBase {
} }
Intent intent; Intent intent;
if (EntityMessage.PGP_SIGNONLY.equals(draft.encrypt)) if (EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt))
intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID); intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID);
else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.encrypt)) { else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt)) {
intent = new Intent(OpenPgpApi.ACTION_GET_KEY_IDS); intent = new Intent(OpenPgpApi.ACTION_GET_KEY_IDS);
intent.putExtra(OpenPgpApi.EXTRA_USER_IDS, pgpUserIds); intent.putExtra(OpenPgpApi.EXTRA_USER_IDS, pgpUserIds);
} else } else
throw new IllegalArgumentException("Invalid encrypt=" + draft.encrypt); throw new IllegalArgumentException("Invalid encrypt=" + draft.ui_encrypt);
intent.putExtra(BuildConfig.APPLICATION_ID, working); Bundle largs = new Bundle();
largs.putLong("id", working);
largs.putInt("action", action);
largs.putBoolean("interactive", interactive);
intent.putExtra(BuildConfig.APPLICATION_ID, largs);
onPgp(intent); onPgp(intent);
} catch (Throwable ex) { } catch (Throwable ex) {
@ -1692,13 +1712,12 @@ public class FragmentCompose extends FragmentBase {
break; break;
case REQUEST_SEND: case REQUEST_SEND:
if (resultCode == RESULT_OK) if (resultCode == RESULT_OK)
onActionSend(false); onAction(R.id.action_send);
else if (resultCode == RESULT_FIRST_USER) else if (resultCode == RESULT_FIRST_USER) {
onActionSend(true); Bundle extras = new Bundle();
break; extras.putBoolean("now", true);
case REQUEST_CERTIFICATE: onAction(R.id.action_send, extras);
if (resultCode == RESULT_OK && data != null) }
onSmime(data.getBundleExtra("args"));
break; break;
} }
} catch (Throwable ex) { } catch (Throwable ex) {
@ -1952,7 +1971,8 @@ public class FragmentCompose extends FragmentBase {
protected Object onExecute(Context context, Bundle args) throws Throwable { protected Object onExecute(Context context, Bundle args) throws Throwable {
// Get arguments // Get arguments
Intent data = args.getParcelable("data"); Intent data = args.getParcelable("data");
long id = data.getLongExtra(BuildConfig.APPLICATION_ID, -1); Bundle largs = data.getBundleExtra(BuildConfig.APPLICATION_ID);
long id = largs.getLong("id", -1);
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
@ -1971,9 +1991,9 @@ public class FragmentCompose extends FragmentBase {
File output = new File(context.getCacheDir(), "pgp_output." + draft.id); File output = new File(context.getCacheDir(), "pgp_output." + draft.id);
// Serializing messages is NOT reproducible // Serializing messages is NOT reproducible
if ((EntityMessage.PGP_SIGNONLY.equals(draft.encrypt) && if ((EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt) &&
OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) || OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) ||
(EntityMessage.PGP_SIGNENCRYPT.equals(draft.encrypt) && (EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt) &&
OpenPgpApi.ACTION_GET_KEY_IDS.equals(data.getAction()))) { OpenPgpApi.ACTION_GET_KEY_IDS.equals(data.getAction()))) {
// Get/clean attachments // Get/clean attachments
List<EntityAttachment> attachments = db.attachment().getAttachments(draft.id); List<EntityAttachment> attachments = db.attachment().getAttachments(draft.id);
@ -1987,7 +2007,7 @@ public class FragmentCompose extends FragmentBase {
Properties props = MessageHelper.getSessionProperties(); Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null); Session isession = Session.getInstance(props, null);
MimeMessage imessage = new MimeMessage(isession); MimeMessage imessage = new MimeMessage(isession);
MessageHelper.build(context, draft, attachments, identity, imessage); MessageHelper.build(context, draft, attachments, identity, false, imessage);
if (OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) { if (OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) {
// Serialize content // Serialize content
@ -2116,12 +2136,12 @@ public class FragmentCompose extends FragmentBase {
Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY); Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY);
intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId); intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, draft.id); intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent; return intent;
} else { } else {
// Get sign key // Get sign key
Intent intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID); Intent intent = new Intent(OpenPgpApi.ACTION_GET_SIGN_KEY_ID);
intent.putExtra(BuildConfig.APPLICATION_ID, draft.id); intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent; return intent;
} }
} else if (OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) { } else if (OpenPgpApi.ACTION_GET_SIGN_KEY_ID.equals(data.getAction())) {
@ -2134,26 +2154,26 @@ public class FragmentCompose extends FragmentBase {
Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY); Intent intent = new Intent(OpenPgpApi.ACTION_GET_KEY);
intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId); intent.putExtra(OpenPgpApi.EXTRA_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, draft.id); intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent; return intent;
} else if (OpenPgpApi.ACTION_GET_KEY.equals(data.getAction())) { } else if (OpenPgpApi.ACTION_GET_KEY.equals(data.getAction())) {
if (EntityMessage.PGP_SIGNONLY.equals(draft.encrypt)) { if (EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt)) {
// Get signature // Get signature
Intent intent = new Intent(OpenPgpApi.ACTION_DETACHED_SIGN); Intent intent = new Intent(OpenPgpApi.ACTION_DETACHED_SIGN);
intent.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, pgpSignKeyId); intent.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, draft.id); intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent; return intent;
} else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.encrypt)) { } else if (EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt)) {
// Encrypt message // Encrypt message
Intent intent = new Intent(OpenPgpApi.ACTION_SIGN_AND_ENCRYPT); Intent intent = new Intent(OpenPgpApi.ACTION_SIGN_AND_ENCRYPT);
intent.putExtra(OpenPgpApi.EXTRA_KEY_IDS, pgpKeyIds); intent.putExtra(OpenPgpApi.EXTRA_KEY_IDS, pgpKeyIds);
intent.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, pgpSignKeyId); intent.putExtra(OpenPgpApi.EXTRA_SIGN_KEY_ID, pgpSignKeyId);
intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true); intent.putExtra(OpenPgpApi.EXTRA_REQUEST_ASCII_ARMOR, true);
intent.putExtra(BuildConfig.APPLICATION_ID, draft.id); intent.putExtra(BuildConfig.APPLICATION_ID, largs);
return intent; return intent;
} else } else
throw new IllegalArgumentException("Invalid encrypt=" + draft.encrypt); throw new IllegalArgumentException("Invalid encrypt=" + draft.ui_encrypt);
} else if (OpenPgpApi.ACTION_DETACHED_SIGN.equals(data.getAction())) { } else if (OpenPgpApi.ACTION_DETACHED_SIGN.equals(data.getAction())) {
EntityAttachment attachment = new EntityAttachment(); EntityAttachment attachment = new EntityAttachment();
attachment.message = draft.id; attachment.message = draft.id;
@ -2170,16 +2190,19 @@ public class FragmentCompose extends FragmentBase {
db.attachment().setDownloaded(attachment.id, file.length()); db.attachment().setDownloaded(attachment.id, file.length());
// send message // send message
args.putInt("action", largs.getInt("action"));
return null; return null;
} else if (OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) { } else if (OpenPgpApi.ACTION_SIGN_AND_ENCRYPT.equals(data.getAction())) {
input.delete(); input.delete();
// send message // send message
args.putInt("action", largs.getInt("action"));
return null; return null;
} else } else
throw new IllegalStateException("Unknown action=" + data.getAction()); throw new IllegalStateException("Unknown action=" + data.getAction());
case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED: case OpenPgpApi.RESULT_CODE_USER_INTERACTION_REQUIRED:
args.putBoolean("interactive", largs.getBoolean("interactive"));
return result.getParcelableExtra(OpenPgpApi.RESULT_INTENT); return result.getParcelableExtra(OpenPgpApi.RESULT_INTENT);
case OpenPgpApi.RESULT_CODE_ERROR: case OpenPgpApi.RESULT_CODE_ERROR:
@ -2202,12 +2225,16 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
protected void onExecuted(Bundle args, Object result) { protected void onExecuted(Bundle args, Object result) {
Log.i("Result= " + result); Log.i("Result= " + result);
if (result == null) if (result == null) {
onAction(R.id.action_send); int action = args.getInt("action");
else if (result instanceof Intent) { Bundle extras = new Bundle();
extras.putBoolean("encrypted", true);
onAction(action, extras);
} else if (result instanceof Intent) {
Intent intent = (Intent) result; Intent intent = (Intent) result;
onPgp(intent); onPgp(intent);
} else if (result instanceof PendingIntent) } else if (result instanceof PendingIntent)
if (args.getBoolean("interactive"))
try { try {
ToastEx.makeText(getContext(), R.string.title_user_interaction, Toast.LENGTH_SHORT).show(); ToastEx.makeText(getContext(), R.string.title_user_interaction, Toast.LENGTH_SHORT).show();
PendingIntent pi = (PendingIntent) result; PendingIntent pi = (PendingIntent) result;
@ -2219,6 +2246,10 @@ public class FragmentCompose extends FragmentBase {
Log.e(ex); Log.e(ex);
Log.unexpectedError(getParentFragmentManager(), ex); Log.unexpectedError(getParentFragmentManager(), ex);
} }
else {
if (BuildConfig.DEBUG)
ToastEx.makeText(getContext(), "Non interactive", Toast.LENGTH_SHORT).show();
}
} }
@Override @Override
@ -2234,7 +2265,7 @@ public class FragmentCompose extends FragmentBase {
}.execute(this, args, "compose:pgp"); }.execute(this, args, "compose:pgp");
} }
private void onSmime(Bundle args) { private void onSmime(Bundle args, final int action) {
new SimpleTask<Void>() { new SimpleTask<Void>() {
@Override @Override
protected Void onExecute(Context context, Bundle args) throws Throwable { protected Void onExecute(Context context, Bundle args) throws Throwable {
@ -2264,7 +2295,7 @@ public class FragmentCompose extends FragmentBase {
Properties props = MessageHelper.getSessionProperties(); Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null); Session isession = Session.getInstance(props, null);
MimeMessage imessage = new MimeMessage(isession); MimeMessage imessage = new MimeMessage(isession);
MessageHelper.build(context, draft, attachments, identity, imessage); MessageHelper.build(context, draft, attachments, identity, false, imessage);
imessage.saveChanges(); imessage.saveChanges();
BodyPart bpContent = new MimeBodyPart() { BodyPart bpContent = new MimeBodyPart() {
@Override @Override
@ -2453,7 +2484,9 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
protected void onExecuted(Bundle args, Void result) { protected void onExecuted(Bundle args, Void result) {
onAction(R.id.action_send); Bundle extras = new Bundle();
extras.putBoolean("encrypted", true);
onAction(action, extras);
} }
@Override @Override
@ -2605,52 +2638,6 @@ public class FragmentCompose extends FragmentBase {
onAction(R.id.action_delete); onAction(R.id.action_delete);
} }
private void onActionSend(boolean now) {
Bundle args = new Bundle();
args.putLong("id", working);
args.putBoolean("now", now);
new SimpleTask<EntityMessage>() {
@Override
protected EntityMessage onExecute(Context context, Bundle args) {
long id = args.getLong("id");
boolean now = args.getBoolean("now");
DB db = DB.getInstance(context);
EntityMessage draft = db.message().getMessage(id);
if (draft != null && now)
db.message().setMessageSnoozed(draft.id, new Date().getTime());
return draft;
}
@Override
protected void onExecuted(Bundle args, EntityMessage draft) {
if (draft != null)
onActionSend(draft);
}
@Override
protected void onException(Bundle args, Throwable ex) {
Log.unexpectedError(getParentFragmentManager(), ex);
}
}.execute(this, args, "draft:get");
}
private void onActionSend(EntityMessage draft) {
if (EntityMessage.SMIME_SIGNONLY.equals(draft.encrypt) ||
EntityMessage.SMIME_SIGNENCRYPT.equals(draft.encrypt))
if (!ActivityBilling.isPro(getContext())) {
startActivity(new Intent(getContext(), ActivityBilling.class));
return;
}
if (draft.encrypt == null || EntityMessage.ENCRYPT_NONE.equals(draft.encrypt))
onAction(R.id.action_send);
else
onEncrypt(draft);
}
private void onExit() { private void onExit() {
if (state != State.LOADED) if (state != State.LOADED)
finish(); finish();
@ -2694,6 +2681,7 @@ public class FragmentCompose extends FragmentBase {
args.putString("body", HtmlHelper.toHtml(etBody.getText())); args.putString("body", HtmlHelper.toHtml(etBody.getText()));
args.putBoolean("signature", cbSignature.isChecked()); args.putBoolean("signature", cbSignature.isChecked());
args.putBoolean("empty", isEmpty()); args.putBoolean("empty", isEmpty());
args.putBoolean("interactive", getLifecycle().getCurrentState().isAtLeast(Lifecycle.State.RESUMED));
args.putBundle("extras", extras); args.putBundle("extras", extras);
Log.i("Run execute id=" + working); Log.i("Run execute id=" + working);
@ -2934,15 +2922,14 @@ public class FragmentCompose extends FragmentBase {
data.draft.plain_only = true; data.draft.plain_only = true;
if (encrypt_default) if (encrypt_default)
if ("s/mime".equals(encrypt_method)) if ("s/mime".equals(encrypt_method))
data.draft.encrypt = EntityMessage.SMIME_SIGNENCRYPT; data.draft.ui_encrypt = EntityMessage.SMIME_SIGNENCRYPT;
else else
data.draft.encrypt = EntityMessage.PGP_SIGNENCRYPT; data.draft.ui_encrypt = EntityMessage.PGP_SIGNENCRYPT;
else if (sign_default) else if (sign_default)
if ("s/mime".equals(encrypt_method)) if ("s/mime".equals(encrypt_method))
data.draft.encrypt = EntityMessage.SMIME_SIGNONLY; data.draft.ui_encrypt = EntityMessage.SMIME_SIGNONLY;
else else
data.draft.encrypt = EntityMessage.PGP_SIGNONLY; data.draft.ui_encrypt = EntityMessage.PGP_SIGNONLY;
data.draft.ui_encrypt = data.draft.encrypt;
if (receipt_default) if (receipt_default)
data.draft.receipt_request = true; data.draft.receipt_request = true;
@ -3217,11 +3204,9 @@ public class FragmentCompose extends FragmentBase {
if (ref.plain_only != null && ref.plain_only) if (ref.plain_only != null && ref.plain_only)
data.draft.plain_only = true; data.draft.plain_only = true;
if (ref.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(ref.ui_encrypt)) { if (ref.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(ref.ui_encrypt)) {
if (ActivityBilling.isPro(context)) { if (ActivityBilling.isPro(context))
data.draft.encrypt = ref.ui_encrypt;
data.draft.ui_encrypt = ref.ui_encrypt; data.draft.ui_encrypt = ref.ui_encrypt;
} }
}
if (answer > 0) { if (answer > 0) {
EntityAnswer a = db.answer().getAnswer(answer); EntityAnswer a = db.answer().getAnswer(answer);
@ -3471,8 +3456,6 @@ public class FragmentCompose extends FragmentBase {
args.putBoolean("incomplete", true); args.putBoolean("incomplete", true);
} }
} }
EntityOperation.queue(context, data.draft, EntityOperation.ADD);
} else { } else {
if (data.draft.revision == null) { if (data.draft.revision == null) {
data.draft.revision = 1; data.draft.revision = 1;
@ -3547,7 +3530,7 @@ public class FragmentCompose extends FragmentBase {
Log.i("Loaded draft id=" + data.draft.id + " action=" + action + " saved=" + saved); Log.i("Loaded draft id=" + data.draft.id + " action=" + action + " saved=" + saved);
working = data.draft.id; working = data.draft.id;
encrypt = data.draft.encrypt; encrypt = data.draft.ui_encrypt;
getActivity().invalidateOptionsMenu(); getActivity().invalidateOptionsMenu();
// Show identities // Show identities
@ -3603,6 +3586,8 @@ public class FragmentCompose extends FragmentBase {
boolean downloading = false; boolean downloading = false;
boolean inline_images = false; boolean inline_images = false;
for (EntityAttachment attachment : attachments) { for (EntityAttachment attachment : attachments) {
if (attachment.encryption != null)
continue;
if (attachment.available) if (attachment.available)
available++; available++;
if (attachment.progress != null) if (attachment.progress != null)
@ -3636,7 +3621,7 @@ public class FragmentCompose extends FragmentBase {
if (draft == null || draft.ui_hide) if (draft == null || draft.ui_hide)
finish(); finish();
else { else {
encrypt = draft.encrypt; encrypt = draft.ui_encrypt;
getActivity().invalidateOptionsMenu(); getActivity().invalidateOptionsMenu();
Log.i("Draft content=" + draft.content); Log.i("Draft content=" + draft.content);
@ -3751,6 +3736,8 @@ public class FragmentCompose extends FragmentBase {
} }
}); });
} else { } else {
boolean dirty = false;
// Move draft to new account // Move draft to new account
if (draft.account != aid && aid >= 0) { if (draft.account != aid && aid >= 0) {
Log.i("Account changed"); Log.i("Account changed");
@ -3785,7 +3772,7 @@ public class FragmentCompose extends FragmentBase {
db.message().updateMessage(draft); db.message().updateMessage(draft);
if (draft.content) if (draft.content)
EntityOperation.queue(context, draft, EntityOperation.ADD); dirty = true;
} }
Map<String, String> crumb = new HashMap<>(); Map<String, String> crumb = new HashMap<>();
@ -3857,7 +3844,7 @@ public class FragmentCompose extends FragmentBase {
available++; available++;
Long ident = (identity == null ? null : identity.id); Long ident = (identity == null ? null : identity.id);
boolean dirty = (!Objects.equals(draft.identity, ident) || if (!Objects.equals(draft.identity, ident) ||
!Objects.equals(draft.extra, extra) || !Objects.equals(draft.extra, extra) ||
!MessageHelper.equal(draft.from, afrom) || !MessageHelper.equal(draft.from, afrom) ||
!MessageHelper.equal(draft.to, ato) || !MessageHelper.equal(draft.to, ato) ||
@ -3865,7 +3852,8 @@ public class FragmentCompose extends FragmentBase {
!MessageHelper.equal(draft.bcc, abcc) || !MessageHelper.equal(draft.bcc, abcc) ||
!Objects.equals(draft.subject, subject) || !Objects.equals(draft.subject, subject) ||
!draft.signature.equals(signature) || !draft.signature.equals(signature) ||
last_available != available); last_available != available)
dirty = true;
last_available = available; last_available = available;
@ -3885,6 +3873,11 @@ public class FragmentCompose extends FragmentBase {
db.message().updateMessage(draft); db.message().updateMessage(draft);
} }
if (extras.getBoolean("now")) {
draft.ui_snoozed = new Date().getTime();
db.message().setMessageSnoozed(draft.id, draft.ui_snoozed);
}
Document doc = JsoupEx.parse(draft.getFile(context)); Document doc = JsoupEx.parse(draft.getFile(context));
doc.select("div[fairemail=signature]").remove(); doc.select("div[fairemail=signature]").remove();
Elements ref = doc.select("div[fairemail=reference]"); Elements ref = doc.select("div[fairemail=reference]");
@ -3968,12 +3961,20 @@ public class FragmentCompose extends FragmentBase {
} }
// Execute action // Execute action
boolean encrypted = extras.getBoolean("encrypted");
boolean shouldEncrypt =
(draft.ui_encrypt != null && !EntityMessage.ENCRYPT_NONE.equals(draft.ui_encrypt));
if (action == R.id.action_save || if (action == R.id.action_save ||
action == R.id.action_undo || action == R.id.action_undo ||
action == R.id.action_redo || action == R.id.action_redo ||
action == R.id.action_check) { action == R.id.action_check) {
if (dirty) if (dirty || encrypted)
if (encrypted || !shouldEncrypt)
EntityOperation.queue(context, draft, EntityOperation.ADD); EntityOperation.queue(context, draft, EntityOperation.ADD);
else {
args.putBoolean("needsEncryption", true);
return draft;
}
if (action == R.id.action_check) { if (action == R.id.action_check) {
// Check data // Check data
@ -4030,6 +4031,11 @@ public class FragmentCompose extends FragmentBase {
} }
} else if (action == R.id.action_send) { } else if (action == R.id.action_send) {
if (!encrypted && shouldEncrypt) {
args.putBoolean("needsEncryption", true);
return draft;
}
// Remove unused inline images // Remove unused inline images
List<String> cids = new ArrayList<>(); List<String> cids = new ArrayList<>();
if (draft.plain_only == null || !draft.plain_only) if (draft.plain_only == null || !draft.plain_only)
@ -4122,9 +4128,11 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
protected void onExecuted(Bundle args, EntityMessage draft) { protected void onExecuted(Bundle args, EntityMessage draft) {
boolean wasSaved = args.getBoolean("saved"); boolean wasSaved = args.getBoolean("saved");
boolean needsEncryption = args.getBoolean("needsEncryption");
int action = args.getInt("action"); int action = args.getInt("action");
Log.i("Loaded action id=" + (draft == null ? null : draft.id) + Log.i("Loaded action id=" + (draft == null ? null : draft.id) +
" action=" + getActionName(action) + " saved=" + wasSaved); " action=" + getActionName(action) +
" saved=" + wasSaved + " encryption=" + needsEncryption);
if (wasSaved) if (wasSaved)
saved = true; saved = true;
@ -4136,6 +4144,15 @@ public class FragmentCompose extends FragmentBase {
bottom_navigation.getMenu().findItem(R.id.action_undo).setVisible(draft.revision > 1); bottom_navigation.getMenu().findItem(R.id.action_undo).setVisible(draft.revision > 1);
bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(draft.revision < draft.revisions); bottom_navigation.getMenu().findItem(R.id.action_redo).setVisible(draft.revision < draft.revisions);
if (needsEncryption) {
if (ActivityBilling.isPro(getContext())) {
boolean interactive = args.getBoolean("interactive");
onEncrypt(draft, action, interactive);
} else
startActivity(new Intent(getContext(), ActivityBilling.class));
return;
}
if (action == R.id.action_delete) { if (action == R.id.action_delete) {
autosave = false; autosave = false;
finish(); finish();
@ -4173,7 +4190,7 @@ public class FragmentCompose extends FragmentBase {
fragment.setTargetFragment(FragmentCompose.this, REQUEST_SEND); fragment.setTargetFragment(FragmentCompose.this, REQUEST_SEND);
fragment.show(getParentFragmentManager(), "compose:send"); fragment.show(getParentFragmentManager(), "compose:send");
} else } else
onActionSend(draft); onAction(R.id.action_send);
} else if (action == R.id.action_send) { } else if (action == R.id.action_send) {
autosave = false; autosave = false;
@ -4459,7 +4476,7 @@ public class FragmentCompose extends FragmentBase {
@Override @Override
public boolean onKeyPressed(KeyEvent event) { public boolean onKeyPressed(KeyEvent event) {
if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER && event.isCtrlPressed()) { if (event.getKeyCode() == KeyEvent.KEYCODE_ENTER && event.isCtrlPressed()) {
onActionSend(false); onAction(R.id.action_send);
return true; return true;
} }
return false; return false;
@ -4939,7 +4956,7 @@ public class FragmentCompose extends FragmentBase {
cbPlainOnly.setVisibility(draft.receipt != null && draft.receipt ? View.GONE : View.VISIBLE); cbPlainOnly.setVisibility(draft.receipt != null && draft.receipt ? View.GONE : View.VISIBLE);
cbReceipt.setVisibility(draft.receipt != null && draft.receipt ? View.GONE : View.VISIBLE); cbReceipt.setVisibility(draft.receipt != null && draft.receipt ? View.GONE : View.VISIBLE);
int encrypt = (draft.encrypt == null ? EntityMessage.ENCRYPT_NONE : draft.encrypt); int encrypt = (draft.ui_encrypt == null ? EntityMessage.ENCRYPT_NONE : draft.ui_encrypt);
for (int i = 0; i < encryptValues.length; i++) for (int i = 0; i < encryptValues.length; i++)
if (encryptValues[i] == encrypt) { if (encryptValues[i] == encrypt) {
spEncrypt.setTag(i); spEncrypt.setTag(i);

8
app/src/main/java/eu/faircode/email/MessageHelper.java
Unescape View File

@ -137,7 +137,7 @@ public class MessageHelper {
return props; return props;
} }
static MimeMessageEx from(Context context, EntityMessage message, EntityIdentity identity, Session isession) static MimeMessageEx from(Context context, EntityMessage message, EntityIdentity identity, Session isession, boolean send)
throws MessagingException, IOException { throws MessagingException, IOException {
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
MimeMessageEx imessage = new MimeMessageEx(isession, message.msgid); MimeMessageEx imessage = new MimeMessageEx(isession, message.msgid);
@ -453,7 +453,7 @@ public class MessageHelper {
return imessage; return imessage;
} }
build(context, message, attachments, identity, imessage); build(context, message, attachments, identity, send, imessage);
return imessage; return imessage;
} }
@ -482,7 +482,7 @@ public class MessageHelper {
imessage.setRecipients(type, result.toArray(new Address[0])); imessage.setRecipients(type, result.toArray(new Address[0]));
} }
static void build(Context context, EntityMessage message, List<EntityAttachment> attachments, EntityIdentity identity, MimeMessage imessage) throws IOException, MessagingException { static void build(Context context, EntityMessage message, List<EntityAttachment> attachments, EntityIdentity identity, boolean send, MimeMessage imessage) throws IOException, MessagingException {
if (message.receipt != null && message.receipt) { if (message.receipt != null && message.receipt) {
// https://www.ietf.org/rfc/rfc3798.txt // https://www.ietf.org/rfc/rfc3798.txt
Multipart report = new MimeMultipart("report; report-type=disposition-notification"); Multipart report = new MimeMultipart("report; report-type=disposition-notification");
@ -525,8 +525,10 @@ public class MessageHelper {
if (identity != null) { if (identity != null) {
HtmlHelper.convertLists(document); HtmlHelper.convertLists(document);
if (send) {
document.select("div[fairemail=signature]").removeAttr("fairemail"); document.select("div[fairemail=signature]").removeAttr("fairemail");
document.select("div[fairemail=reference]").removeAttr("fairemail"); document.select("div[fairemail=reference]").removeAttr("fairemail");
}
DB db = DB.getInstance(context); DB db = DB.getInstance(context);
try { try {

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

@ -369,7 +369,7 @@ public class ServiceSend extends ServiceBase {
// Create message // Create message
Properties props = MessageHelper.getSessionProperties(); Properties props = MessageHelper.getSessionProperties();
Session isession = Session.getInstance(props, null); Session isession = Session.getInstance(props, null);
MimeMessage imessage = MessageHelper.from(this, message, ident, isession); MimeMessage imessage = MessageHelper.from(this, message, ident, isession, true);
// Prepare sent message // Prepare sent message
Long sid = null; Long sid = null;

Write Preview
Loading…
Cancel
Save