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

Added open tracking link when showing images 

Always requires confirmation
This commit is contained in:
M66B 2024-05-23 12:37:42 +02:00
parent 50f16d93ac
commit 344669cc1c
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -647,6 +647,7 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
ImageSpan[] image = buffer.getSpans(off, off, ImageSpan.class);
if (image.length > 0 && image[0].getSource() != null) {
Uri uri = Uri.parse(image[0].getSource());
if (UriHelper.isHyperLink(uri)) {
ripple(event);
if (onOpenLink(uri, null,
@ -675,10 +676,13 @@ public class AdapterMessage extends RecyclerView.Adapter<AdapterMessage.ViewHold
}
ImageSpan[] image = buffer.getSpans(off, off, ImageSpan.class);
if (image.length > 0) {
if (image[0] instanceof ImageSpanEx &&
((ImageSpanEx) image[0]).getTracking())
if (image.length > 0 && image[0] instanceof ImageSpanEx) {
String tracking = ((ImageSpanEx) image[0]).getTracking();
if (!TextUtils.isEmpty(tracking)) {
onOpenLink(Uri.parse(tracking),
context.getString(R.string.title_legend_tracking_pixel), true);
return true;
}
ripple(event);
onOpenImage(message.id, image[0].getSource(),

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

@ -30,7 +30,7 @@ import org.jsoup.nodes.Element;
public class ImageSpanEx extends ImageSpan {
private final int width;
private final int height;
private final boolean tracking;
private final String tracking;
public ImageSpanEx(@NonNull Drawable drawable, @NonNull Element img) {
super(drawable, img.attr("src"));
@ -60,7 +60,7 @@ public class ImageSpanEx extends ImageSpan {
this.width = _width;
this.height = _height;
this.tracking = !TextUtils.isEmpty(img.attr("x-tracking"));
this.tracking = img.attr("x-tracking");
}
public int getWidth() {
@ -71,7 +71,7 @@ public class ImageSpanEx extends ImageSpan {
return this.height;
}
public boolean getTracking() {
public String getTracking() {
return this.tracking;
}
}