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

Undo typing

Browse Source
pull/183/head
M66B 5 years ago
parent 2732c5f5e2
commit 8bf6ac26a3
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File

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

@ -4093,6 +4093,7 @@ public class FragmentCompose extends FragmentBase {
else else
b = HtmlHelper.sanitizeCompose(context, body, true); b = HtmlHelper.sanitizeCompose(context, body, true);
int revision = draft.revision; // Save for undo/redo
if (dirty || if (dirty ||
TextUtils.isEmpty(body) || TextUtils.isEmpty(body) ||
!b.body().html().equals(doc.body().html()) || !b.body().html().equals(doc.body().html()) ||
@ -4125,10 +4126,8 @@ public class FragmentCompose extends FragmentBase {
body = d.html(); body = d.html();
// Create new revision // Create new revision
if (action != R.id.action_undo && action != R.id.action_redo) { draft.revisions++;
draft.revisions++; draft.revision = draft.revisions;
draft.revision = draft.revisions;
}
Helper.writeText(draft.getFile(context, draft.revision), body); Helper.writeText(draft.getFile(context, draft.revision), body);
} else } else
@ -4136,11 +4135,15 @@ public class FragmentCompose extends FragmentBase {
if (action == R.id.action_undo || action == R.id.action_redo) { if (action == R.id.action_undo || action == R.id.action_redo) {
if (action == R.id.action_undo) { if (action == R.id.action_undo) {
if (draft.revision > 1) if (!dirty && revision > 1)
draft.revision--; draft.revision = revision - 1;
else
draft.revision = revision;
} else { } else {
if (draft.revision < draft.revisions) if (revision < draft.revisions)
draft.revision++; draft.revision = revision + 1;
else
draft.revision = revision;
} }
// Restore revision // Restore revision

Write Preview
Loading…
Cancel
Save