rename legacy filter

mastodon/src/androidTest/java/org/joinmastodon/android/utils/StatusFilterPredicateTest.java

@@ -1,10 +1,10 @@
 package org.joinmastodon.android.utils;
 
-import static org.joinmastodon.android.model.Filter.FilterAction.*;
+import static org.joinmastodon.android.model.LegacyFilter.FilterAction.*;
 import static org.joinmastodon.android.model.FilterContext.*;
 import static org.junit.Assert.*;
 
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Status;
 import org.junit.Test;
 
@@ -14,8 +14,8 @@
 
 public class StatusFilterPredicateTest {
 
-    private static final Filter hideMeFilter = new Filter(), warnMeFilter = new Filter();
-    private static final List<Filter> allFilters = List.of(hideMeFilter, warnMeFilter);
+    private static final LegacyFilter hideMeFilter = new LegacyFilter(), warnMeFilter = new LegacyFilter();
+    private static final List<LegacyFilter> allFilters = List.of(hideMeFilter, warnMeFilter);
 
     private static final Status
             hideInHomePublic = Status.ofFake(null, "hide me, please", Instant.now()),

mastodon/src/main/java/org/joinmastodon/android/api/CacheController.java

@@ -16,7 +16,7 @@
 import org.joinmastodon.android.api.session.AccountSession;
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Notification;
@@ -59,7 +59,7 @@ public void getHomeTimeline(String maxID, int count, boolean forceReload, Callba
 		cancelDelayedClose();
 		databaseThread.postRunnable(()->{
 			try{
-				List<Filter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(FilterContext.HOME)).collect(Collectors.toList());
+				List<LegacyFilter> filters=AccountSessionManager.getInstance().getAccount(accountID).wordFilters.stream().filter(f->f.context.contains(FilterContext.HOME)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
 					try(Cursor cursor=db.query("home_timeline", new String[]{"json", "flags"}, maxID==null ? null : "`id`<?", maxID==null ? null : new String[]{maxID}, null, null, "`time` DESC", count+"")){
@@ -132,7 +132,7 @@ public void getNotifications(String maxID, int count, boolean onlyMentions, bool
 		databaseThread.postRunnable(()->{
 			try{
 				AccountSession accountSession=AccountSessionManager.getInstance().getAccount(accountID);
-				List<Filter> filters=accountSession.wordFilters.stream().filter(f->f.context.contains(FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
+				List<LegacyFilter> filters=accountSession.wordFilters.stream().filter(f->f.context.contains(FilterContext.NOTIFICATIONS)).collect(Collectors.toList());
 				if(!forceReload){
 					SQLiteDatabase db=getOrOpenDatabase();
 					String table=onlyPosts ? "notifications_posts" : onlyMentions ? "notifications_mentions" : "notifications_all";

mastodon/src/main/java/org/joinmastodon/android/api/requests/accounts/GetWordFilters.java

@@ -3,11 +3,11 @@
 import com.google.gson.reflect.TypeToken;
 
 import org.joinmastodon.android.api.MastodonAPIRequest;
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 
 import java.util.List;
 
-public class GetWordFilters extends MastodonAPIRequest<List<Filter>>{
+public class GetWordFilters extends MastodonAPIRequest<List<LegacyFilter>>{
 	public GetWordFilters(){
 		super(HttpMethod.GET, "/filters", new TypeToken<>(){});
 	}

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSession.java

@@ -8,7 +8,7 @@
 import org.joinmastodon.android.api.StatusInteractionController;
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Application;
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Markers;
 import org.joinmastodon.android.model.Preferences;
@@ -32,7 +32,7 @@ public class AccountSession{
 	public PushSubscription pushSubscription;
 	public boolean needUpdatePushSettings;
 	public long filtersLastUpdated;
-	public List<Filter> wordFilters=new ArrayList<>();
+	public List<LegacyFilter> wordFilters=new ArrayList<>();
 	public String pushAccountID;
 	public Preferences preferences;
 	public AccountActivationInfo activationInfo;

mastodon/src/main/java/org/joinmastodon/android/api/session/AccountSessionManager.java

@@ -33,7 +33,7 @@
 import org.joinmastodon.android.model.Application;
 import org.joinmastodon.android.model.Emoji;
 import org.joinmastodon.android.model.EmojiCategory;
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Instance;
 import org.joinmastodon.android.model.Marker;
 import org.joinmastodon.android.model.Markers;
@@ -345,7 +345,7 @@ private void updateSessionWordFilters(AccountSession session){
 		new GetWordFilters()
 				.setCallback(new Callback<>(){
 					@Override
-					public void onSuccess(List<Filter> result){
+					public void onSuccess(List<LegacyFilter> result){
 						session.wordFilters=result;
 						session.filtersLastUpdated=System.currentTimeMillis();
 						writeAccountsFile();

mastodon/src/main/java/org/joinmastodon/android/fragments/AccountTimelineFragment.java

@@ -12,7 +12,6 @@
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusUnpinnedEvent;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.HeaderStatusDisplayItem;

mastodon/src/main/java/org/joinmastodon/android/fragments/BookmarkedStatusListFragment.java

@@ -5,7 +5,6 @@
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetBookmarkedStatuses;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;

mastodon/src/main/java/org/joinmastodon/android/fragments/FavoritedStatusListFragment.java

@@ -5,7 +5,6 @@
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetFavoritedStatuses;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.HeaderPaginationList;
 import org.joinmastodon.android.model.Status;

mastodon/src/main/java/org/joinmastodon/android/fragments/HashtagTimelineFragment.java

@@ -17,7 +17,6 @@
 import org.joinmastodon.android.api.requests.tags.SetHashtagFollowed;
 import org.joinmastodon.android.api.requests.timelines.GetHashtagTimeline;
 import org.joinmastodon.android.events.HashtagUpdatedEvent;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.Status;

mastodon/src/main/java/org/joinmastodon/android/fragments/HomeTimelineFragment.java

@@ -14,7 +14,6 @@
 import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.model.CacheablePaginatedResponse;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.GapStatusDisplayItem;

mastodon/src/main/java/org/joinmastodon/android/fragments/ListTimelineFragment.java

@@ -18,7 +18,6 @@
 import org.joinmastodon.android.api.requests.timelines.GetListTimeline;
 import org.joinmastodon.android.events.ListDeletedEvent;
 import org.joinmastodon.android.events.ListUpdatedCreatedEvent;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.ListTimeline;
 import org.joinmastodon.android.model.Status;

mastodon/src/main/java/org/joinmastodon/android/fragments/PinnedPostsListFragment.java

@@ -6,7 +6,6 @@
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.accounts.GetAccountStatuses;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.parceler.Parcels;

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusEditHistoryFragment.java

@@ -7,7 +7,6 @@
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.statuses.GetStatusEditHistory;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ReblogOrReplyLineStatusDisplayItem;

mastodon/src/main/java/org/joinmastodon/android/fragments/StatusListFragment.java

@@ -1,6 +1,5 @@
 package org.joinmastodon.android.fragments;
 
-import android.app.assist.AssistContent;
 import android.content.res.Configuration;
 import android.os.Bundle;
 
@@ -14,7 +13,6 @@
 import org.joinmastodon.android.events.StatusCreatedEvent;
 import org.joinmastodon.android.events.StatusDeletedEvent;
 import org.joinmastodon.android.events.StatusUpdatedEvent;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.ExtendedFooterStatusDisplayItem;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/BubbleTimelineFragment.java

@@ -5,9 +5,7 @@
 import android.view.View;
 
 import org.joinmastodon.android.api.requests.timelines.GetBubbleTimeline;
-import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
 import org.joinmastodon.android.fragments.StatusListFragment;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/DiscoverPostsFragment.java

@@ -6,7 +6,6 @@
 
 import org.joinmastodon.android.api.requests.trends.GetTrendingStatuses;
 import org.joinmastodon.android.fragments.StatusListFragment;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/FederatedTimelineFragment.java

@@ -4,10 +4,8 @@
 import android.os.Bundle;
 import android.view.View;
 
-import org.joinmastodon.android.R;
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
 import org.joinmastodon.android.fragments.StatusListFragment;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/LocalTimelineFragment.java

@@ -5,9 +5,7 @@
 import android.view.View;
 
 import org.joinmastodon.android.api.requests.timelines.GetPublicTimeline;
-import org.joinmastodon.android.api.session.AccountSessionManager;
 import org.joinmastodon.android.fragments.StatusListFragment;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.utils.DiscoverInfoBannerHelper;

mastodon/src/main/java/org/joinmastodon/android/fragments/discover/SearchFragment.java

@@ -15,7 +15,6 @@
 import org.joinmastodon.android.fragments.ProfileFragment;
 import org.joinmastodon.android.fragments.ThreadFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Hashtag;
 import org.joinmastodon.android.model.SearchResult;

mastodon/src/main/java/org/joinmastodon/android/fragments/report/ReportAddPostsChoiceFragment.java

@@ -22,7 +22,6 @@
 import org.joinmastodon.android.events.FinishReportFragmentsEvent;
 import org.joinmastodon.android.fragments.StatusListFragment;
 import org.joinmastodon.android.model.Account;
-import org.joinmastodon.android.model.Filter;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.Status;
 import org.joinmastodon.android.ui.displayitems.AudioStatusDisplayItem;

mastodon/src/main/java/org/joinmastodon/android/model/FilterResult.java

@@ -7,7 +7,7 @@
 
 @Parcel
 public class FilterResult extends BaseModel {
-    public Filter filter;
+    public LegacyFilter filter;
 
     public List<String> keywordMatches;
 

mastodon/src/main/java/org/joinmastodon/android/model/Filter.java → mastodon/src/main/java/org/joinmastodon/android/model/LegacyFilter.java

@@ -2,6 +2,8 @@
 
 import android.text.TextUtils;
 
+import com.google.gson.annotations.SerializedName;
+
 import org.joinmastodon.android.api.ObjectValidationException;
 import org.joinmastodon.android.api.RequiredField;
 import org.parceler.Parcel;
@@ -13,17 +15,18 @@
 import java.util.regex.Pattern;
 
 @Parcel
-public class Filter extends BaseModel{
+public class LegacyFilter extends BaseModel{
 	public String id;
 	public String phrase;
 	public String title;
-
-	@RequiredField
-	public EnumSet<FilterContext> context;
-
+	public transient EnumSet<FilterContext> context=EnumSet.noneOf(FilterContext.class);
 	public Instant expiresAt;
 	public boolean irreversible;
 	public boolean wholeWord;
+
+	@SerializedName("context")
+	private List<FilterContext> _context;
+
 	public FilterAction filterAction;
 
 	public List<FilterKeyword> keywords=new ArrayList<>();
@@ -35,16 +38,18 @@ public class Filter extends BaseModel{
 	@Override
 	public void postprocess() throws ObjectValidationException{
 		super.postprocess();
+		if(_context==null)
+			throw new ObjectValidationException();
+		for(FilterContext c:_context){
+			if(c!=null)
+				context.add(c);
+		}
 		for(FilterKeyword keyword:keywords)
 			keyword.postprocess();
 		for(FilterStatus status:statuses)
 			status.postprocess();
 	}
 
-	public boolean isActive(){
-		return expiresAt==null || expiresAt.isAfter(Instant.now());
-	}
-
 	public boolean matches(CharSequence text){
 		if(TextUtils.isEmpty(text))
 			return false;
@@ -62,6 +67,10 @@ public boolean matches(Status status){
 		return matches(status.getContentStatus().getStrippedText());
 	}
 
+	public boolean isActive(){
+		return expiresAt==null || expiresAt.isAfter(Instant.now());
+	}
+
 	@Override
 	public String toString(){
 		return "Filter{"+

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/StatusDisplayItem.java

@@ -20,7 +20,7 @@
 import org.joinmastodon.android.model.Account;
 import org.joinmastodon.android.model.Attachment;
 import org.joinmastodon.android.model.DisplayItemsParent;
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.FilterAction;
 import org.joinmastodon.android.model.FilterContext;
 import org.joinmastodon.android.model.FilterResult;
@@ -298,7 +298,7 @@ else if(statusForContent.sensitive && GlobalUserPreferences.alwaysExpandContentW
 			}
 		}
 
-		Filter applyingFilter = null;
+		LegacyFilter applyingFilter = null;
 		if (!statusForContent.filterRevealed) {
 			StatusFilterPredicate predicate = new StatusFilterPredicate(accountID, filterContext, FilterAction.WARN);
 			statusForContent.filterRevealed = predicate.test(status);

mastodon/src/main/java/org/joinmastodon/android/ui/displayitems/WarningFilteredStatusDisplayItem.java

@@ -7,7 +7,7 @@
 
 import org.joinmastodon.android.R;
 import org.joinmastodon.android.fragments.BaseStatusListFragment;
-import org.joinmastodon.android.model.Filter;
+import org.joinmastodon.android.model.LegacyFilter;
 import org.joinmastodon.android.model.Status;
 
 import java.util.List;
@@ -16,9 +16,9 @@ public class WarningFilteredStatusDisplayItem extends StatusDisplayItem{
 	public boolean loading;
 	public final Status status;
 	public List<StatusDisplayItem> filteredItems;
-	public Filter applyingFilter;
+	public LegacyFilter applyingFilter;
 
-	public WarningFilteredStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, List<StatusDisplayItem> filteredItems, Filter applyingFilter){
+	public WarningFilteredStatusDisplayItem(String parentID, BaseStatusListFragment<?> parentFragment, Status status, List<StatusDisplayItem> filteredItems, LegacyFilter applyingFilter){
 		super(parentID, parentFragment);
 		this.status=status;
 		this.filteredItems = filteredItems;