Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'filter_toots' into develop

This commit is contained in:
tom79 2017-10-11 17:41:20 +02:00
parent 6ba2d68b7d 59874c498c
commit f191369889
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
View File

@ -166,9 +166,9 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
if (status.getReblog() != null && !sharedpreferences.getBoolean(Helper.SET_SHOW_BOOSTS, true))
return HIDDEN_STATUS;
else if ((status.getIn_reply_to_account_id() != null && !status.getIn_reply_to_account_id().equals("null")) || (status.getIn_reply_to_id() != null && !status.getIn_reply_to_id().equals("null")) && !sharedpreferences.getBoolean(Helper.SET_SHOW_REPLIES, true))
else if (status.getIn_reply_to_id() != null && !status.getIn_reply_to_id().equals("null") && !sharedpreferences.getBoolean(Helper.SET_SHOW_REPLIES, true)) {
return HIDDEN_STATUS;
else
}else
return DISPLAYED_STATUS;
}else {
return DISPLAYED_STATUS;