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

don't save bidi-safe string in account

Browse Source 
also support custom emoji in account switcher
closes sk22#859
This commit is contained in:
sk
2023-10-19 01:01:53 +02:00
parent 95858e3280
commit 5db44cbf9d
16 changed files with 35 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -178,7 +178,6 @@ public class Account extends BaseModel implements Searchable{
if(url==null) url="";
if(note==null) note="";
if(avatar==null) avatar="";
if(displayName!=null) displayName='\u2068'+displayName+'\u2069';
}
public boolean isLocal(){
@@ -208,6 +207,10 @@ public class Account extends BaseModel implements Searchable{
return fqn != null ? fqn : acct.split("@")[0] + "@" + getDomainFromURL();
}
public String getDisplayName(){
return '\u2068'+displayName+'\u2069';
}
@Override
public String toString(){
return "Account{"+

4
mastodon/src/main/java/org/joinmastodon/android/model/viewmodel/AccountViewModel.java
View File

@@ -33,9 +33,9 @@ public class AccountViewModel{
V.dp(50), V.dp(50));
emojiHelper=new CustomEmojiHelper();
if(session.getLocalPreferences().customEmojiInNames)
parsedName=HtmlParser.parseCustomEmoji(account.displayName, account.emojis);
parsedName=HtmlParser.parseCustomEmoji(account.getDisplayName(), account.emojis);
else
parsedName=account.displayName;
parsedName=account.getDisplayName();
parsedBio=HtmlParser.parse(account.note, account.emojis, Collections.emptyList(), Collections.emptyList(), accountID);
SpannableStringBuilder ssb=new SpannableStringBuilder(parsedName);
ssb.append(parsedBio);