mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-25 07:23:03 +00:00
Code Issues Releases Wiki Activity

Store original resend body

Browse source
This commit is contained in:
M66B 2021-12-11 22:46:37 +01:00
parent 28e6b6db0d
commit 186c79a846
3 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/eu/faircode/email/FragmentCompose.java
View file

@ -254,6 +254,7 @@ public class FragmentCompose extends FragmentBase {
private TextView tvReference;
private ImageButton ibCloseRefHint;
private ImageButton ibWriteAboveBelow;
private ImageView ivResend;
private ImageButton ibReferenceEdit;
private ImageButton ibReferenceImages;
private View vwAnchor;
@ -376,6 +377,7 @@ public class FragmentCompose extends FragmentBase {
tvReference = view.findViewById(R.id.tvReference);
ibCloseRefHint = view.findViewById(R.id.ibCloseRefHint);
ibWriteAboveBelow = view.findViewById(R.id.ibWriteAboveBelow);
ivResend = view.findViewById(R.id.ivResend);
ibReferenceEdit = view.findViewById(R.id.ibReferenceEdit);
ibReferenceImages = view.findViewById(R.id.ibReferenceImages);
vwAnchor = view.findViewById(R.id.vwAnchor);
@ -953,6 +955,7 @@ public class FragmentCompose extends FragmentBase {
grpSignature.setVisibility(View.GONE);
grpReferenceHint.setVisibility(View.GONE);
ibWriteAboveBelow.setVisibility(View.GONE);
ivResend.setVisibility(View.GONE);
ibReferenceEdit.setVisibility(View.GONE);
ibReferenceImages.setVisibility(View.GONE);
tvReference.setVisibility(View.GONE);
@ -4696,6 +4699,17 @@ public class FragmentCompose extends FragmentBase {
else
data.draft.signature = false;
if (ref.content && "resend".equals(action)) {
document = JsoupEx.parse(ref.getFile(context));
// Save original body
Element div = document.body()
.tagName("div")
.attr("fairemail", "reference");
Element body = document.createElement("body")
.appendChild(div);
document.body().replaceWith(body);
}
// Reply header
if (ref.content &&
!"resend".equals(action) &&
@ -6377,6 +6391,7 @@ public class FragmentCompose extends FragmentBase {
ibWriteAboveBelow.setVisibility(text[1] == null ||
draft.wasforwardedfrom != null || BuildConfig.PLAY_STORE_RELEASE
? View.GONE : View.VISIBLE);
ivResend.setVisibility(draft.headers == null ? View.GONE : View.VISIBLE);
ibReferenceEdit.setVisibility(text[1] == null ? View.GONE : View.VISIBLE);
ibReferenceImages.setVisibility(ref_has_images && !show_images ? View.VISIBLE : View.GONE);

9
app/src/main/java/eu/faircode/email/MessageHelper.java
View file

@ -808,6 +808,15 @@ public class MessageHelper {
// Build html body
Document document = JsoupEx.parse(message.getFile(context));
if (message.headers != null) {
Element body = document.body();
if (body.children().size() == 1) {
// Restore original body
Element ref = body.children().get(0);
body.replaceWith(ref.tagName("body").removeAttr("fairemail"));
}
}
// https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/lang
if (message.language != null)
document.body().attr("lang", message.language);

13
app/src/main/res/layout/fragment_compose.xml
View file

@ -424,6 +424,19 @@
app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
app:srcCompat="@drawable/abovebelow" />
<eu.faircode.email.FixedImageView
android:id="@+id/ivResend"
android:layout_width="36dp"
android:layout_height="wrap_content"
android:layout_marginTop="6dp"
android:layout_marginEnd="6dp"
android:contentDescription="@string/title_resend"
android:padding="3dp"
android:tooltipText="@string/title_resend"
app:layout_constraintStart_toEndOf="@id/ibWriteAboveBelow"
app:layout_constraintTop_toBottomOf="@id/tvReferenceHint"
app:srcCompat="@drawable/twotone_redo_24" />
<eu.faircode.email.FixedImageButton
android:id="@+id/ibReferenceEdit"
android:layout_width="36dp"