mirror/FairEmail
1
0
Fork 0
mirror of https://github.com/M66B/FairEmail.git synced 2025-02-22 14:11:00 +00:00
Code Issues Releases Wiki Activity

Favicon order

Browse source
This commit is contained in:
M66B 2021-07-13 20:31:31 +02:00
parent 73ea92e4a5
commit 0b29f65e26
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -670,8 +670,8 @@ public class ContactInfo {
if (i != 0) if (i != 0)
return -i; return -i;
int t1 = (img1.attr("href").toLowerCase(Locale.ROOT).endsWith("ico") ? 1 : -1); int t1 = getOrder(img1.attr("href"), img1.attr("type"));
int t2 = (img2.attr("href").toLowerCase(Locale.ROOT).endsWith("ico") ? 1 : -1); int t2 = getOrder(img2.attr("href"), img2.attr("type"));
int t = Integer.compare(t1, t2); int t = Integer.compare(t1, t2);
if (t != 0) if (t != 0)
return t; return t;
@ -722,6 +722,17 @@ public class ContactInfo {
return null; return null;
} }
private static int getOrder(String href, String type) {
int order = -1;
String h = (href == null ? "" : href.toLowerCase(Locale.ROOT));
if (h.endsWith(".ico"))
order = 2;
else if (h.endsWith(".svg") || "image/svg+xml".equals(type))
order = 1;
return order;
}
private static int getSize(String sizes) { private static int getSize(String sizes) {
int max = 0; int max = 0;
for (String size : sizes.split(" ")) { for (String size : sizes.split(" ")) {