Merge branch 'filter_toots' into develop
This commit is contained in:
commit
f191369889
|
@ -166,9 +166,9 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
|
||||||
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
|
||||||
if (status.getReblog() != null && !sharedpreferences.getBoolean(Helper.SET_SHOW_BOOSTS, true))
|
if (status.getReblog() != null && !sharedpreferences.getBoolean(Helper.SET_SHOW_BOOSTS, true))
|
||||||
return HIDDEN_STATUS;
|
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;
|
return HIDDEN_STATUS;
|
||||||
else
|
}else
|
||||||
return DISPLAYED_STATUS;
|
return DISPLAYED_STATUS;
|
||||||
}else {
|
}else {
|
||||||
return DISPLAYED_STATUS;
|
return DISPLAYED_STATUS;
|
||||||
|
|
Loading…
Reference in New Issue