Fix filters
This commit is contained in:
parent
eae0df43c0
commit
5e4dac1456
|
@ -137,8 +137,6 @@ public class TimelineHelper {
|
||||||
if (m.find()) {
|
if (m.find()) {
|
||||||
status.filteredByApp = filter;
|
status.filteredByApp = filter;
|
||||||
continue;
|
continue;
|
||||||
} else {
|
|
||||||
status.filteredByApp = null;
|
|
||||||
}
|
}
|
||||||
if (status.spoiler_text != null) {
|
if (status.spoiler_text != null) {
|
||||||
String spoilerText;
|
String spoilerText;
|
||||||
|
@ -149,8 +147,6 @@ public class TimelineHelper {
|
||||||
Matcher ms = p.matcher(spoilerText);
|
Matcher ms = p.matcher(spoilerText);
|
||||||
if (ms.find()) {
|
if (ms.find()) {
|
||||||
status.filteredByApp = filter;
|
status.filteredByApp = filter;
|
||||||
} else {
|
|
||||||
status.filteredByApp = null;
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -160,9 +156,6 @@ public class TimelineHelper {
|
||||||
if (filterTimeLineType == Timeline.TimeLineEnum.HOME) {
|
if (filterTimeLineType == Timeline.TimeLineEnum.HOME) {
|
||||||
if (filteredAccounts != null && filteredAccounts.size() > 0) {
|
if (filteredAccounts != null && filteredAccounts.size() > 0) {
|
||||||
for (Status status : statuses) {
|
for (Status status : statuses) {
|
||||||
if (status.filteredByApp != null) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
for (Account account : filteredAccounts) {
|
for (Account account : filteredAccounts) {
|
||||||
if (account.acct.equals(status.account.acct) || (status.reblog != null && account.acct.equals(status.reblog.account.acct))) {
|
if (account.acct.equals(status.account.acct) || (status.reblog != null && account.acct.equals(status.reblog.account.acct))) {
|
||||||
Filter filterCustom = new Filter();
|
Filter filterCustom = new Filter();
|
||||||
|
|
Loading…
Reference in New Issue