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

Added option to disable saving draft revisions

Browse Source
pull/214/head
M66B 1 year ago
parent e8a089966e
commit b854f606dc
7 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File

3
CHANGELOG.md
Unescape View File

@ -8,7 +8,8 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=
### Next version
* Basic support for [Linked Data](https://json-ld.org/)
* Basic support for [Linked Data](https://json-ld.org/) (GitHub version only)
* Added option to disable saving revisions for undo/redo
* Small improvements and minor bug fixes
* Updated [translations](https://crowdin.com/project/open-source-email)

3
app/src/main/assets/CHANGELOG.md
Unescape View File

@ -8,7 +8,8 @@ For support you can use [the contact form](https://contact.faircode.eu/?product=
### Next version
* Basic support for [Linked Data](https://json-ld.org/)
* Basic support for [Linked Data](https://json-ld.org/) (GitHub version only)
* Added option to disable saving revisions for undo/redo
* Small improvements and minor bug fixes
* Updated [translations](https://crowdin.com/project/open-source-email)

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

@ -6655,6 +6655,7 @@ public class FragmentCompose extends FragmentBase {
boolean discard_delete = prefs.getBoolean("discard_delete", true);
boolean write_below = prefs.getBoolean("write_below", false);
boolean save_drafts = prefs.getBoolean("save_drafts", true);
boolean save_revisions = prefs.getBoolean("save_revisions", true);
int send_delayed = prefs.getInt("send_delayed", 0);
DB db = DB.getInstance(context);
@ -6886,8 +6887,10 @@ public class FragmentCompose extends FragmentBase {
body = d.html();
// Create new revision
draft.revisions++;
draft.revision = draft.revisions;
if (save_revisions) {
draft.revisions++;
draft.revision = draft.revisions;
}
Helper.writeText(draft.getFile(context, draft.revision), body);
} else

12
app/src/main/java/eu/faircode/email/FragmentOptionsSend.java
Unescape View File

@ -76,6 +76,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
private SwitchCompat swNavColor;
private SwitchCompat swSendReminders;
private SwitchCompat swSendPending;
private SwitchCompat swSaveRevisions;
private SwitchCompat swAutoSaveParagraph;
private SwitchCompat swAutoSaveDot;
private SwitchCompat swDiscardDelete;
@ -124,7 +125,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
"keyboard", "keyboard_no_fullscreen",
"suggest_names", "suggest_sent", "suggested_received", "suggest_frequently", "suggest_account", "auto_identity",
"send_reminders", "send_chips", "send_nav_color", "send_pending",
"auto_save_paragraph", "auto_save_dot", "discard_delete",
"save_revisions", "auto_save_paragraph", "auto_save_dot", "discard_delete",
"send_delayed",
"answer_single", "answer_action",
"sound_sent",
@ -164,6 +165,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
swNavColor = view.findViewById(R.id.swNavColor);
swSendReminders = view.findViewById(R.id.swSendReminders);
swSendPending = view.findViewById(R.id.swSendPending);
swSaveRevisions = view.findViewById(R.id.swSaveRevisions);
swAutoSaveParagraph = view.findViewById(R.id.swAutoSaveParagraph);
swAutoSaveDot = view.findViewById(R.id.swAutoSaveDot);
swDiscardDelete = view.findViewById(R.id.swDiscardDelete);
@ -336,6 +338,13 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
}
});
swSaveRevisions.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
prefs.edit().putBoolean("save_revisions", checked).apply();
}
});
swAutoSaveParagraph.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton compoundButton, boolean checked) {
@ -781,6 +790,7 @@ public class FragmentOptionsSend extends FragmentBase implements SharedPreferenc
swNavColor.setChecked(prefs.getBoolean("send_nav_color", false));
swSendReminders.setChecked(prefs.getBoolean("send_reminders", true));
swSendPending.setChecked(prefs.getBoolean("send_pending", true));
swSaveRevisions.setChecked(prefs.getBoolean("save_revisions", true));
swAutoSaveParagraph.setChecked(prefs.getBoolean("auto_save_paragraph", true));
swAutoSaveDot.setChecked(prefs.getBoolean("auto_save_dot", false));
swDiscardDelete.setChecked(prefs.getBoolean("discard_delete", true));

14
app/src/main/res/layout/fragment_options_send.xml
Unescape View File

@ -304,6 +304,18 @@
app:layout_constraintTop_toBottomOf="@id/tvSendReminders"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swSaveRevisions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_advanced_save_revisions"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swSendPending"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat
android:id="@+id/swAutoSaveParagraph"
android:layout_width="0dp"
@ -313,7 +325,7 @@
android:text="@string/title_advanced_auto_save_paragraph"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/swSendPending"
app:layout_constraintTop_toBottomOf="@id/swSaveRevisions"
app:switchPadding="12dp" />
<androidx.appcompat.widget.SwitchCompat

3
app/src/main/res/values/strings.xml
Unescape View File

@ -463,9 +463,10 @@
<string name="title_advanced_answer_hint">The answer button actions can also be configured in the send settings tab page</string>
<string name="title_advanced_answer_warning">Not all actions are possible without a selection menu!</string>
<string name="title_advanced_send_pending">Show non-obtrusive send delayed icon</string>
<string name="title_advanced_save_revisions">Save draft revisions for undo and redo</string>
<string name="title_advanced_auto_save_paragraph">Automatically save a draft after every paragraph</string>
<string name="title_advanced_auto_save_dot">Automatically save a draft after every sentence</string>
<string name="title_advanced_compose_color">Default text color</string>
<string name="title_advanced_compose_font">Default font</string>
<string name="title_advanced_compose_monospaced">Use monospaced font for plain text messages</string>

1
metadata/en-US/changelogs/2131.txt
Unescape View File

@ -9,6 +9,7 @@ Vallibonavenatrix
Next version
* Basic support for Linked Data
* Added option to disable saving revisions for undo/redo
* Small improvements and minor bug fixes
* Updated translations

Write Preview
Loading…
Cancel
Save