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

Added hiding/showing blockquotes

Browse Source
pull/147/head
M66B 6 years ago
parent a60b1b642d
commit a74c1e835b
6 changed files with 89 additions and 33 deletions
Show Stats Download Patch File Download Diff File

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

@ -61,6 +61,7 @@ import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ProgressBar;
import android.widget.TextView;
@ -177,7 +178,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private BottomNavigationView bnvActions;
private Button btnHtml;
private Button btnImages;
private ImageButton ibQuotes;
private ImageButton ibImages;
private TextView tvBody;
private ProgressBar pbBody;
@ -238,7 +240,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
bnvActions = itemView.findViewById(R.id.bnvActions);
btnHtml = itemView.findViewById(R.id.btnHtml);
btnImages = itemView.findViewById(R.id.btnImages);
ibQuotes = itemView.findViewById(R.id.ibQuotes);
ibImages = itemView.findViewById(R.id.ibImages);
tvBody = itemView.findViewById(R.id.tvBody);
pbBody = itemView.findViewById(R.id.pbBody);
@ -256,7 +259,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ivExpanderAddress.setOnClickListener(this);
ivAddContact.setOnClickListener(this);
btnHtml.setOnClickListener(this);
btnImages.setOnClickListener(this);
ibQuotes.setOnClickListener(this);
ibImages.setOnClickListener(this);
bnvActions.setOnNavigationItemSelectedListener(this);
}
@ -267,7 +271,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ivExpanderAddress.setOnClickListener(null);
ivAddContact.setOnClickListener(null);
btnHtml.setOnClickListener(null);
btnImages.setOnClickListener(null);
ibQuotes.setOnClickListener(null);
ibImages.setOnClickListener(null);
bnvActions.setOnNavigationItemSelectedListener(null);
}
@ -295,7 +300,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
pbHeaders.setVisibility(View.GONE);
bnvActions.setVisibility(View.GONE);
btnHtml.setVisibility(View.GONE);
btnImages.setVisibility(View.GONE);
ibQuotes.setVisibility(View.GONE);
ibImages.setVisibility(View.GONE);
pbBody.setVisibility(View.GONE);
grpAddress.setVisibility(View.GONE);
@ -440,7 +446,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
grpAttachments.setVisibility(message.attachments > 0 && show_expanded ? View.VISIBLE : View.GONE);
bnvActions.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
btnHtml.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
btnImages.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
ibQuotes.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
ibImages.setVisibility(viewType == ViewType.THREAD && show_expanded ? View.INVISIBLE : View.GONE);
pbBody.setVisibility(View.GONE);
bnvActions.setTag(null);
@ -605,7 +612,9 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
onToggleAddresses(pos, message);
else if (view.getId() == R.id.btnHtml)
onShowHtml(message);
else if (view.getId() == R.id.btnImages)
else if (view.getId() == R.id.ibQuotes)
onShowQuotes(message);
else if (view.getId() == R.id.ibImages)
onShowImages(message);
else
onToggleMessage(pos, message);
@ -682,6 +691,10 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
else {
boolean expanded = !properties.getValue("expanded", message.id);
properties.setValue("expanded", message.id, expanded);
if (!expanded) {
properties.setValue("quotes", message.id, false);
properties.setValue("images", message.id, false);
}
notifyItemChanged(pos);
}
}
@ -716,6 +729,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
.putExtra("from", MessageHelper.getFormattedAddresses(message.from, true)));
}
private void onShowQuotes(final TupleMessageEx message) {
properties.setValue("quotes", message.id, true);
ibQuotes.setEnabled(false);
Bundle args = new Bundle();
args.putSerializable("message", message);
bodyTask.load(context, owner, args);
}
private void onShowImages(final TupleMessageEx message) {
if (confirm)
new DialogBuilderLifecycle(context, owner)
@ -734,7 +756,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
private void onShowImagesConfirmed(final TupleMessageEx message) {
properties.setValue("images", message.id, true);
btnImages.setEnabled(false);
ibImages.setEnabled(false);
Bundle args = new Bundle();
args.putSerializable("message", message);
@ -747,7 +769,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected void onInit(Bundle args) {
btnHtml.setHasTransientState(true);
btnImages.setHasTransientState(true);
ibQuotes.setHasTransientState(true);
ibImages.setHasTransientState(true);
tvBody.setHasTransientState(true);
pbBody.setHasTransientState(true);
}
@ -755,7 +778,8 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
@Override
protected void onCleanup(Bundle args) {
btnHtml.setHasTransientState(false);
btnImages.setHasTransientState(false);
ibQuotes.setHasTransientState(false);
ibImages.setHasTransientState(false);
tvBody.setHasTransientState(false);
pbBody.setHasTransientState(false);
}
@ -788,7 +812,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
class StyledQuoteSpan extends QuoteSpan {
StyledQuoteSpan() {
super();
super(Helper.resolveColor(context, R.attr.colorPrimary));
}
@Override
@ -802,7 +826,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
int color = p.getColor();
p.setStyle(Paint.Style.FILL);
p.setColor(Helper.resolveColor(context, R.attr.colorPrimary));
p.setColor(getColor());
c.drawRect(x, top, x + dir * 6 /* stripeWidth */, bottom, p);
@ -816,12 +840,15 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
TupleMessageEx message = (TupleMessageEx) args.getSerializable("message");
SpannedString ss = new SpannedString(body);
boolean has_quotes = (ss.getSpans(0, ss.length(), StyledQuoteSpan.class).length > 0);
boolean has_images = (ss.getSpans(0, ss.length(), ImageSpan.class).length > 0);
boolean show_expanded = properties.getValue("expanded", message.id);
boolean show_quotes = properties.getValue("quotes", message.id);
boolean show_images = properties.getValue("images", message.id);
btnHtml.setVisibility(hasWebView && show_expanded ? View.VISIBLE : View.GONE);
btnImages.setVisibility(has_images && show_expanded && !show_images ? View.VISIBLE : View.GONE);
ibQuotes.setVisibility(has_quotes && show_expanded && !show_quotes ? View.VISIBLE : View.GONE);
ibImages.setVisibility(has_images && show_expanded && !show_images ? View.VISIBLE : View.GONE);
tvBody.setText(body);
pbBody.setVisibility(View.GONE);
}
@ -833,11 +860,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
};
private Spanned decodeHtml(final EntityMessage message, String body) {
return Html.fromHtml(HtmlHelper.sanitize(body), new Html.ImageGetter() {
final boolean show_quotes = properties.getValue("quotes", message.id);
final boolean show_images = properties.getValue("images", message.id);
return Html.fromHtml(HtmlHelper.sanitize(body, show_quotes), new Html.ImageGetter() {
@Override
public Drawable getDrawable(String source) {
boolean show = properties.getValue("images", message.id);
return HtmlHelper.decodeImage(source, context, message.id, show);
return HtmlHelper.decodeImage(source, context, message.id, show_images);
}
}, new Html.TagHandler() {
@Override

8
app/src/main/java/eu/faircode/email/HtmlHelper.java
Unescape View File

@ -55,7 +55,7 @@ public class HtmlHelper {
return Jsoup.parse(html).body().html();
}
static String sanitize(String html) {
static String sanitize(String html, boolean quotes) {
Document document = Jsoup.parse(Jsoup.clean(html, Whitelist
.relaxed()
.addProtocols("img", "src", "cid")
@ -82,6 +82,10 @@ public class HtmlHelper {
}
}
if (!quotes)
for (Element quote : document.select("blockquote"))
quote.text("&#8230;");
NodeTraversor.traverse(new NodeVisitor() {
@Override
public void head(Node node, int depth) {
@ -242,6 +246,6 @@ public class HtmlHelper {
return String.format("<p>%s %s:</p>\n<blockquote>%s</blockquote>",
Html.escapeHtml(new Date(message.received).toString()),
Html.escapeHtml(MessageHelper.getFormattedAddresses(message.from, true)),
sanitize ? sanitize(html) : getBody(html));
sanitize ? sanitize(html, true) : getBody(html));
}
}

10
app/src/main/res/drawable/baseline_format_quote_24.xml
Unescape View File

@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,17h3l2,-4L11,7L5,7v6h3zM14,17h3l2,-4L19,7h-6v6h3z"/>
</vector>

21
app/src/main/res/layout/item_message_compact.xml
Unescape View File

@ -572,16 +572,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
<Button
android:id="@+id/btnImages"
style="?android:attr/buttonStyleSmall"
<ImageButton
android:id="@+id/ibQuotes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_show_images"
android:src="@drawable/baseline_format_quote_24"
app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
<ImageButton
android:id="@+id/ibImages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:src="@drawable/baseline_image_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
@ -590,7 +597,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="btnHtml,btnImages" />
app:constraint_referenced_ids="btnHtml,ibQuotes,ibImages" />
<TextView
android:id="@+id/tvBody"

21
app/src/main/res/layout/item_message_normal.xml
Unescape View File

@ -576,16 +576,23 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
<Button
android:id="@+id/btnImages"
style="?android:attr/buttonStyleSmall"
<ImageButton
android:id="@+id/ibQuotes"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:minWidth="0dp"
android:minHeight="0dp"
android:text="@string/title_show_images"
android:src="@drawable/baseline_format_quote_24"
app:layout_constraintEnd_toStartOf="@+id/ibImages"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
<ImageButton
android:id="@+id/ibImages"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:layout_marginEnd="6dp"
android:src="@drawable/baseline_image_24"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/bnvActions" />
@ -594,7 +601,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:barrierDirection="bottom"
app:constraint_referenced_ids="btnHtml,btnImages" />
app:constraint_referenced_ids="btnHtml,ibQuotes,ibImages" />
<TextView
android:id="@+id/tvBody"

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

@ -233,7 +233,6 @@
<string name="title_folders_unified">Unified inbox folders</string>
<string name="title_no_messages">No messages</string>
<string name="title_show_images">Show images</string>
<string name="title_subject_reply">Re: %1$s</string>
<string name="title_subject_forward">Fwd: %1$s</string>

Write Preview
Loading…
Cancel
Save