chinwag/chinwag-android
chinwag/chinwag-android
2
0
Fork 0
Code Issues Pull requests Releases 1 Activity

filter polls (#1496)

Browse source
This commit is contained in:
Konrad Pozniak 2019-09-24 20:33:29 +02:00 • committed by GitHub
commit a9440ea2ab
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 256 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

19
app/src/main/java/com/keylesspalace/tusky/fragment/SFragment.java
View file

@ -33,6 +33,7 @@ import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.widget.PopupMenu;
import androidx.core.app.ActivityOptionsCompat;
@ -52,6 +53,7 @@ import com.keylesspalace.tusky.db.AccountManager;
import com.keylesspalace.tusky.di.Injectable;
import com.keylesspalace.tusky.entity.Attachment;
import com.keylesspalace.tusky.entity.Filter;
import com.keylesspalace.tusky.entity.PollOption;
import com.keylesspalace.tusky.entity.Status;
import com.keylesspalace.tusky.network.MastodonApi;
import com.keylesspalace.tusky.network.TimelineCases;
@ -445,7 +447,8 @@ public abstract class SFragment extends BaseFragment implements Injectable {
});
}
void reloadFilters(boolean forceRefresh) {
@VisibleForTesting
public void reloadFilters(boolean forceRefresh) {
if (filters != null && !forceRefresh) {
applyFilters(forceRefresh);
return;
@ -469,7 +472,7 @@ public abstract class SFragment extends BaseFragment implements Injectable {
});
}
protected boolean filterIsRelevant(Filter filter) {
protected boolean filterIsRelevant(@NonNull Filter filter) {
// Called when building local filter expression
// Override to select relevant filters for your fragment
return false;
@ -480,7 +483,17 @@ public abstract class SFragment extends BaseFragment implements Injectable {
// Override to refresh your fragment
}
boolean shouldFilterStatus(Status status) {
@VisibleForTesting
public boolean shouldFilterStatus(Status status) {
if(filterRemoveRegex && status.getPoll() != null) {
for(PollOption option: status.getPoll().getOptions()) {
if(filterRemoveRegexMatcher.reset(option.getTitle()).find()) {
return true;
}
}
}
return (filterRemoveRegex && (filterRemoveRegexMatcher.reset(status.getActionableStatus().getContent()).find()
|| (!status.getSpoilerText().isEmpty() && filterRemoveRegexMatcher.reset(status.getActionableStatus().getSpoilerText()).find())));
}

2
app/src/main/java/com/keylesspalace/tusky/fragment/TimelineFragment.java
View file

@ -376,7 +376,7 @@ public class TimelineFragment extends SFragment implements
}
@Override
protected boolean filterIsRelevant(Filter filter) {
protected boolean filterIsRelevant(@NonNull Filter filter) {
return filterContextMatchesKind(kind, filter.getContext());
}

2
app/src/main/java/com/keylesspalace/tusky/fragment/ViewThreadFragment.java
View file

@ -686,7 +686,7 @@ public final class ViewThreadFragment extends SFragment implements
}
@Override
protected boolean filterIsRelevant(Filter filter) {
protected boolean filterIsRelevant(@NonNull Filter filter) {
return filter.getContext().contains(Filter.THREAD);
}