Merge remote-tracking branch 'origin/master'

This commit is contained in:
Docile-Alligator 2022-11-13 16:50:54 +11:00
commit 2d62332e8d

View File

@ -357,12 +357,12 @@ public class PostFilter implements Parcelable {
postFilter.containDomains = stringBuilder.toString(); postFilter.containDomains = stringBuilder.toString();
} }
postFilter.containTextType = p.containTextType || postFilter.containTextType; postFilter.containTextType = p.containTextType && postFilter.containTextType;
postFilter.containLinkType = p.containLinkType || postFilter.containLinkType; postFilter.containLinkType = p.containLinkType && postFilter.containLinkType;
postFilter.containImageType = p.containImageType || postFilter.containImageType; postFilter.containImageType = p.containImageType && postFilter.containImageType;
postFilter.containGifType = p.containGifType || postFilter.containGifType; postFilter.containGifType = p.containGifType && postFilter.containGifType;
postFilter.containVideoType = p.containVideoType || postFilter.containVideoType; postFilter.containVideoType = p.containVideoType && postFilter.containVideoType;
postFilter.containGalleryType = p.containGalleryType || postFilter.containGalleryType; postFilter.containGalleryType = p.containGalleryType && postFilter.containGalleryType;
} }
return postFilter; return postFilter;