From 0931702802355eacaa442e585b16c5297a94b36f Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Sun, 24 Mar 2024 15:13:24 -0300 Subject: [PATCH] fix(custom-local-timelines): revert 629262c266f32809d8fcde6306013d34eb49211a and fix the crash for good AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --- .../main/java/org/joinmastodon/android/model/Mention.java | 5 +---- .../java/org/joinmastodon/android/ui/text/HtmlParser.java | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/model/Mention.java b/mastodon/src/main/java/org/joinmastodon/android/model/Mention.java index bb153e460..80188c771 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/model/Mention.java +++ b/mastodon/src/main/java/org/joinmastodon/android/model/Mention.java @@ -34,10 +34,7 @@ public class Mention extends BaseModel{ @Override public int hashCode(){ - int result = 0; - if (id != null) { - result=id.hashCode(); - } + int result=id.hashCode(); result=31*result+url.hashCode(); return result; } diff --git a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java index 918f6e027..0e468d653 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java +++ b/mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java @@ -114,7 +114,7 @@ public class HtmlParser{ } } - Map idsByUrl=mentions.stream().distinct().collect(Collectors.toMap(m->m.url, m->m.id)); + Map idsByUrl=mentions.stream().filter(mention -> mention.id != null).collect(Collectors.toMap(m->m.url, m->m.id)); // Hashtags in remote posts have remote URLs, these have local URLs so they don't match. // Map tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name)); Map tagsByTag=tags.stream().distinct().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));