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

Added option to skip printing header

Browse Source
pull/189/head
M66B 5 years ago
parent 13c2ee5b30
commit 6f9d962c2b
4 changed files with 96 additions and 75 deletions
Show Stats Download Patch File Download Diff File

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

@ -6601,17 +6601,24 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@NonNull @NonNull
@Override @Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
Bundle args = getArguments();
final Context context = getContext(); final Context context = getContext();
final SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
View dview = LayoutInflater.from(context).inflate(R.layout.dialog_print, null); View dview = LayoutInflater.from(context).inflate(R.layout.dialog_print, null);
CheckBox cbHeader = dview.findViewById(R.id.cbHeader);
CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain); CheckBox cbNotAgain = dview.findViewById(R.id.cbNotAgain);
cbHeader.setChecked(prefs.getBoolean("print_html_header", true));
cbHeader.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
prefs.edit().putBoolean("print_html_header", isChecked).apply();
}
});
cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { cbNotAgain.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override @Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
prefs.edit().putBoolean("print_html_confirmed", isChecked).apply(); prefs.edit().putBoolean("print_html_confirmed", isChecked).apply();
} }
}); });

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

@ -7133,7 +7133,6 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
return null; return null;
Document document = JsoupEx.parse(file); Document document = JsoupEx.parse(file);
HtmlHelper.truncate(document, false);
HtmlHelper.embedInlineImages(context, id, document, true); HtmlHelper.embedInlineImages(context, id, document, true);
// Prevent multiple pages for Microsoft Office // Prevent multiple pages for Microsoft Office
@ -7141,88 +7140,92 @@ public class FragmentMessages extends FragmentBase implements SharedPreferences.
if (section == null) if (section == null)
section = document.body(); section = document.body();
Element header = document.createElement("p"); SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context);
boolean print_html_header = prefs.getBoolean("print_html_header", true);
if (print_html_header) {
Element header = document.createElement("p");
if (message.from != null && message.from.length > 0) { if (message.from != null && message.from.length > 0) {
Element span = document.createElement("span"); Element span = document.createElement("span");
Element strong = document.createElement("strong"); Element strong = document.createElement("strong");
strong.text(context.getString(R.string.title_from)); strong.text(context.getString(R.string.title_from));
span.appendChild(strong); span.appendChild(strong);
span.appendText(" " + MessageHelper.formatAddresses(message.from)); span.appendText(" " + MessageHelper.formatAddresses(message.from));
span.appendElement("br"); span.appendElement("br");
header.appendChild(span); header.appendChild(span);
} }
if (message.to != null && message.to.length > 0) { if (message.to != null && message.to.length > 0) {
Element span = document.createElement("span"); Element span = document.createElement("span");
Element strong = document.createElement("strong"); Element strong = document.createElement("strong");
strong.text(context.getString(R.string.title_to)); strong.text(context.getString(R.string.title_to));
span.appendChild(strong); span.appendChild(strong);
span.appendText(" " + MessageHelper.formatAddresses(message.to)); span.appendText(" " + MessageHelper.formatAddresses(message.to));
span.appendElement("br"); span.appendElement("br");
header.appendChild(span); header.appendChild(span);
} }
if (message.cc != null && message.cc.length > 0) { if (message.cc != null && message.cc.length > 0) {
Element span = document.createElement("span"); Element span = document.createElement("span");
Element strong = document.createElement("strong"); Element strong = document.createElement("strong");
strong.text(context.getString(R.string.title_cc)); strong.text(context.getString(R.string.title_cc));
span.appendChild(strong); span.appendChild(strong);
span.appendText(" " + MessageHelper.formatAddresses(message.cc)); span.appendText(" " + MessageHelper.formatAddresses(message.cc));
span.appendElement("br"); span.appendElement("br");
header.appendChild(span); header.appendChild(span);
} }
if (message.received != null) { if (message.received != null) {
DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.LONG, SimpleDateFormat.LONG); DateFormat DTF = Helper.getDateTimeInstance(context, SimpleDateFormat.LONG, SimpleDateFormat.LONG);
Element span = document.createElement("span"); Element span = document.createElement("span");
Element strong = document.createElement("strong"); Element strong = document.createElement("strong");
strong.text(context.getString(R.string.title_received)); strong.text(context.getString(R.string.title_received));
span.appendChild(strong); span.appendChild(strong);
span.appendText(" " + DTF.format(message.received)); span.appendText(" " + DTF.format(message.received));
span.appendElement("br"); span.appendElement("br");
header.appendChild(span); header.appendChild(span);
} }
if (!TextUtils.isEmpty(message.subject)) { if (!TextUtils.isEmpty(message.subject)) {
Element span = document.createElement("span"); Element span = document.createElement("span");
span.appendText(message.subject); span.appendText(message.subject);
span.appendElement("br"); span.appendElement("br");
header.appendChild(span); header.appendChild(span);
} }
if (headers && message.headers != null) { if (headers && message.headers != null) {
header.appendElement("hr"); header.appendElement("hr");
Element pre = document.createElement("pre"); Element pre = document.createElement("pre");
pre.text(message.headers); pre.text(message.headers);
header.appendChild(pre); header.appendChild(pre);
} }
header.appendElement("hr").appendElement("br"); header.appendElement("hr").appendElement("br");
section.prependChild(header); section.prependChild(header);
boolean hasAttachments = false; boolean hasAttachments = false;
Element footer = document.createElement("p"); Element footer = document.createElement("p");
footer.appendElement("br").appendElement("hr"); footer.appendElement("br").appendElement("hr");
for (EntityAttachment attachment : attachments) for (EntityAttachment attachment : attachments)
if (attachment.isAttachment()) { if (attachment.isAttachment()) {
hasAttachments = true; hasAttachments = true;
Element strong = document.createElement("strong"); Element strong = document.createElement("strong");
strong.text(context.getString(R.string.title_attachment)); strong.text(context.getString(R.string.title_attachment));
footer.appendChild(strong); footer.appendChild(strong);
if (!TextUtils.isEmpty(attachment.name)) if (!TextUtils.isEmpty(attachment.name))
footer.appendText(" " + attachment.name); footer.appendText(" " + attachment.name);
if (attachment.size != null) if (attachment.size != null)
footer.appendText(" " + Helper.humanReadableByteCount(attachment.size)); footer.appendText(" " + Helper.humanReadableByteCount(attachment.size));
footer.appendElement("br"); footer.appendElement("br");
} }
if (hasAttachments) if (hasAttachments)
section.appendChild(footer); section.appendChild(footer);
}
return new String[]{message.subject, document.html()}; return new String[]{message.subject, section.html()};
} }
@Override @Override

12
app/src/main/res/layout/dialog_print.xml
Unescape View File

@ -31,6 +31,16 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvMessage" /> app:layout_constraintTop_toBottomOf="@id/tvMessage" />
<CheckBox
android:id="@+id/cbHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:text="@string/title_print_header"
android:textAppearance="@style/TextAppearance.AppCompat.Medium"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvRemark" />
<CheckBox <CheckBox
android:id="@+id/cbNotAgain" android:id="@+id/cbNotAgain"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -39,6 +49,6 @@
android:text="@string/title_no_ask_again" android:text="@string/title_no_ask_again"
android:textAppearance="@style/TextAppearance.AppCompat.Small" android:textAppearance="@style/TextAppearance.AppCompat.Small"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tvRemark" /> app:layout_constraintTop_toBottomOf="@id/cbHeader" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
</eu.faircode.email.ScrollViewEx> </eu.faircode.email.ScrollViewEx>

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

@ -836,6 +836,7 @@
<string name="title_event">Add to calendar</string> <string name="title_event">Add to calendar</string>
<string name="title_pin">Add shortcut</string> <string name="title_pin">Add shortcut</string>
<string name="title_print">Print</string> <string name="title_print">Print</string>
<string name="title_print_header">Print header</string>
<string name="title_show_headers">Show headers</string> <string name="title_show_headers">Show headers</string>
<string name="title_raw_save">Save raw message</string> <string name="title_raw_save">Save raw message</string>
<string name="title_raw_send">Send as attachment</string> <string name="title_raw_send">Send as attachment</string>

Write Preview
Loading…
Cancel
Save