Mastodon
/
SubwayTooter-Android-App
mirror of https://github.com/tateisu/SubwayTooter
1
0
Fork 0
Code Issues Releases Wiki Activity

CWのspoiler_textの絵文字表示に対応

This commit is contained in:
tateisu 2017-04-24 04:37:11 +09:00
parent aacba662b0
commit 746b6430c3
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/jp/juggler/subwaytooter/ColumnViewHolder.java
View File

@ -617,7 +617,7 @@ public class ColumnViewHolder implements View.OnClickListener, Column.VisualCall
llContents.setVisibility( View.VISIBLE );
}else{
llContentWarning.setVisibility( View.VISIBLE );
tvContentWarning.setText( status.spoiler_text );
tvContentWarning.setText( status.decoded_spoiler_text );
boolean cw_shown = ContentWarning.isShown( account.host, status.id, false );
showContent( cw_shown );
}

6
app/src/main/java/jp/juggler/subwaytooter/api/entity/TootStatus.java
View File

@ -98,6 +98,7 @@ public class TootStatus extends TootId {
public long time_created_at;
public Spannable decoded_content;
public Spannable decoded_spoiler_text;
public Spannable decoded_tags;
public Spannable decoded_mentions;
@ -138,7 +139,10 @@ public class TootStatus extends TootId {
status.decoded_content = HTMLDecoder.decodeHTML( account,status.content );
status.decoded_tags = HTMLDecoder.decodeTags( account,status.tags );
status.decoded_mentions = HTMLDecoder.decodeMentions(account, status.mentions );
if( !TextUtils.isEmpty( status.spoiler_text ) ){
status.decoded_spoiler_text = HTMLDecoder.decodeMentions(account, status.mentions );
}
return status;
}catch( Throwable ex ){
ex.printStackTrace();