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

Revert "Added option to skip printing quoted text" 

This reverts commit 5bca6849c5.
This commit is contained in:
M66B 2022-05-30 19:04:32 +02:00
parent 2deb39b19a
commit 61c50ddbf3
4 changed files with 1 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -8212,7 +8212,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_print, null);
CheckBox cbHeader = dview.findViewById(R.id.cbHeader);
CheckBox cbImages = dview.findViewById(R.id.cbImages);
CheckBox cbQuotes = dview.findViewById(R.id.cbQuotes);
CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
cbHeader.setChecked(prefs.getBoolean("print_html_header", true));
@ -8231,14 +8230,6 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
});
cbQuotes.setChecked(prefs.getBoolean("print_html_quotes", true));
cbQuotes.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
prefs.edit().putBoolean("print_html_quotes", isChecked).apply();
}
});
cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {

6
app/src/main/java/eu/faircode/email/FragmentMessages.java
View File

@ -9165,11 +9165,9 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext());
boolean print_html_header = prefs.getBoolean("print_html_header", true);
boolean print_html_images = prefs.getBoolean("print_html_images", true);
boolean print_html_quotes = prefs.getBoolean("print_html_quotes", true);
args.putBoolean("print_html_header", print_html_header);
args.putBoolean("print_html_images", print_html_images);
args.putBoolean("print_html_quotes", print_html_quotes);
new SimpleTask<String[]>() {
private final ExecutorService executor = Helper.getBackgroundExecutor(0, "print");
@ -9180,7 +9178,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
boolean headers = args.getBoolean("headers");
boolean print_html_header = args.getBoolean("print_html_header");
boolean print_html_images = args.getBoolean("print_html_images");
boolean print_html_quotes = args.getBoolean("print_html_quotes");
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
int timeout = prefs.getInt("timeout", ImageHelper.DOWNLOAD_TIMEOUT) * 1000;
@ -9269,9 +9266,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
element.removeClass(clazz);
}
if (!print_html_quotes)
document.body().select("blockquote").remove();
if (print_html_header) {
Element header = document.createElement("p");

24
app/src/main/res/layout/dialog_print.xml
View File

@ -64,28 +64,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbImages" />
<CheckBox
android:id="@+id/cbQuotes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:checked="true"
android:text="@string/title_print_quotes"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvImagesRemark" />
<eu.faircode.email.FixedTextView
android:id="@+id/tvQuotesRemark"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:text="@string/title_print_quotes_remark"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
android:textStyle="italic"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/cbQuotes" />
<CheckBox
android:id="@+id/cbNotAgain"
android:layout_width="wrap_content"
@ -94,6 +72,6 @@
android:text="@string/title_no_ask_again"
android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvQuotesRemark" />
app:layout_constraintTop_toBottomOf="@id/tvImagesRemark" />
</eu.faircode.email.ConstraintLayoutEx>
</eu.faircode.email.ScrollViewEx>

2
app/src/main/res/values/strings.xml
View File

@ -1176,9 +1176,7 @@
<string name="title_print">Print</string>
<string name="title_print_header">Print header</string>
<string name="title_print_images">Print images</string>
<string name="title_print_quotes">Print quoted text</string>
<string name="title_print_images_remark">Downloading images might take some time</string>
<string name="title_print_quotes_remark">Disabling this will remove quoted text (mostly answers)</string>
<string name="title_show_headers">Show headers</string>
<string name="title_share_as_html">Share as HTML</string>
<string name="title_raw_save">Save raw message</string>