owen/moshidon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(custom-local-timelines): revert 629262c266 and fix the crash for good

Browse Source 
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
This commit is contained in:
LucasGGamerM
2024-03-24 15:13:24 -03:00
parent d7a229afeb
commit 0931702802
2 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mastodon/src/main/java/org/joinmastodon/android/model/Mention.java
View File

@@ -34,10 +34,7 @@ public class Mention extends BaseModel{
@Override @Override
public int hashCode(){ public int hashCode(){
int result = 0; int result=id.hashCode();
if (id != null) {
result=id.hashCode();
}
result=31*result+url.hashCode(); result=31*result+url.hashCode();
return result; return result;
} }

2
mastodon/src/main/java/org/joinmastodon/android/ui/text/HtmlParser.java
View File

@@ -114,7 +114,7 @@ public class HtmlParser{
} }
} }
Map<String, String> idsByUrl=mentions.stream().distinct().collect(Collectors.toMap(m->m.url, m->m.id)); Map<String, String> 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. // Hashtags in remote posts have remote URLs, these have local URLs so they don't match.
// Map<String, String> tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name)); // Map<String, String> tagsByUrl=tags.stream().collect(Collectors.toMap(t->t.url, t->t.name));
Map<String, Hashtag> tagsByTag=tags.stream().distinct().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity())); Map<String, Hashtag> tagsByTag=tags.stream().distinct().collect(Collectors.toMap(t->t.name.toLowerCase(), Function.identity()));