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

Auto save after paragraphs

This commit is contained in:
M66B 2022-04-25 11:54:07 +02:00
parent 2efe85919b
commit c16d9c0c89
1 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -740,6 +740,12 @@ public class FragmentCompose extends FragmentBase {
if (renum)
StyleHelper.renumber(text, false, etBody.getContext());
etBody.setTag(null);
Bundle extras = new Bundle();
extras.putBoolean("silent", true);
onAction(R.id.action_save, extras, "paragraph");
} catch (Throwable ex) {
Log.e(ex);
} finally {
@ -4113,7 +4119,6 @@ public class FragmentCompose extends FragmentBase {
args.putBoolean("ime", ime);
args.putBundle("extras", extras);
Log.i("Run execute id=" + working + " reason=" + reason);
actionLoader.execute(this, args, "compose:action:" + getActionName(action));
}
@ -5597,11 +5602,17 @@ public class FragmentCompose extends FragmentBase {
private SimpleTask<EntityMessage> actionLoader = new SimpleTask<EntityMessage>() {
@Override
protected void onPreExecute(Bundle args) {
if (args.getBundle("extras").getBoolean("silent"))
return;
setBusy(true);
}
@Override
protected void onPostExecute(Bundle args) {
if (args.getBundle("extras").getBoolean("silent"))
return;
int action = args.getInt("action");
boolean needsEncryption = args.getBoolean("needsEncryption");
if (action != R.id.action_check || needsEncryption)
@ -5627,6 +5638,8 @@ public class FragmentCompose extends FragmentBase {
boolean notext = args.getBoolean("notext");
Bundle extras = args.getBundle("extras");
boolean silent = extras.getBoolean("silent");
boolean dirty = false;
String body = HtmlHelper.toHtml(spanned, context);
EntityMessage draft;
@ -5800,7 +5813,7 @@ public class FragmentCompose extends FragmentBase {
Elements ref = doc.select("div[fairemail=reference]");
ref.remove();
if (extras != null && extras.containsKey("html"))
if (extras.containsKey("html"))
dirty = true;
if (below != write_below &&
@ -5832,7 +5845,7 @@ public class FragmentCompose extends FragmentBase {
// Get saved body
Document d;
if (extras != null && extras.containsKey("html")) {
if (extras.containsKey("html")) {
// Save current revision
Document c = JsoupEx.parse(body);
@ -5947,6 +5960,12 @@ public class FragmentCompose extends FragmentBase {
db.message().setMessageSent(draft.id, draft.sent);
}
if (silent) {
// Skip storing on the server, etc
db.setTransactionSuccessful();
return draft;
}
// Execute action
boolean encrypted = extras.getBoolean("encrypted");
boolean shouldEncrypt = EntityMessage.PGP_SIGNENCRYPT.equals(draft.ui_encrypt) ||
@ -6268,6 +6287,12 @@ public class FragmentCompose extends FragmentBase {
if (draft == null)
return;
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);
if (args.getBundle("extras").getBoolean("silent"))
return;
boolean needsEncryption = args.getBoolean("needsEncryption");
int action = args.getInt("action");
Log.i("Loaded action id=" + draft.id +
@ -6298,9 +6323,6 @@ public class FragmentCompose extends FragmentBase {
if (show)
showDraft(draft, refedit, null, -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);
if (needsEncryption) {
if (ActivityBilling.isPro(getContext()) ||
EntityMessage.PGP_SIGNONLY.equals(draft.ui_encrypt) ||