Mirrors/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2026-01-04 03:43:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

Undo typing

Browse Source
This commit is contained in:
M66B
2020-07-02 22:42:28 +02:00
parent 2732c5f5e2
commit 8bf6ac26a3
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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