Commit b584a372 authored by Thomas's avatar Thomas
Browse files

Comment #467 #464 - hide or remove message in timelines

parent 58c3a5fc

app/src/main/java/app/fedilab/android/activities/FilterActivity.java

+3 −0
Original line number Diff line number Diff line
@@ -156,6 +156,9 @@ public class FilterActivity extends BaseActivity implements FilterAdapter.Delete 
                popupAddFilterBinding.actionRemove.setChecked(true);

            }

        }

        if (filterParams.keywords == null) {

            filterParams.keywords = new ArrayList<>();

        }



        KeywordAdapter keywordAdapter = new KeywordAdapter(filterParams.keywords);

        popupAddFilterBinding.lvKeywords.setAdapter(keywordAdapter);

app/src/main/java/app/fedilab/android/client/endpoints/MastodonFiltersService.java

+2 −15
Original line number Diff line number Diff line
@@ -46,15 +46,11 @@ public interface MastodonFiltersService { 
            @Path("id") String id);



    //Add a filter

    @FormUrlEncoded

    @Headers({"Accept: application/json"})

    @POST("filters")

    Call<Filter> addFilter(

            @Header("Authorization") String token,

            @Field("title") String title,

            @Field("expires_in") Long expires_in,

            @Field("filter_action") String filter_action,

            @Field("context[]") List<String> context,

            @Field("keywords_attributes[]") List<Filter.KeywordsParams> keywordsAttributes

            @Body Filter.FilterParams filter

    );



    //Edit a filter
@@ -64,15 +60,6 @@ public interface MastodonFiltersService { 
            @Header("Authorization") String token,

            @Path("id") String id,

            @Body Filter.FilterParams filter

            /*@Path("id") String id,

            @Field("title") String title,

            @Field("expires_in") Date expires_in,

            @Field("filter_action") String filter_action,

            @Field("context[]") List<String> context,

            @Field("keywords_attributes[]") List<Filter.KeywordsAttributes> keywords

            @Field("keywords_attributes[][id]") List<String> keywordId,

            @Field("keywords_attributes[][keyword]") List<String> keywords,

            @Field("keywords_attributes[][whole_word]") List<Boolean> wholeWords*/

    );



    //Remove a filter

app/src/main/java/app/fedilab/android/client/entities/api/Filter.java

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ public class Filter implements Serializable { 
        public List<String> context;

        @SerializedName("whole_word")

        public boolean whole_word;

        @SerializedName("expires_in")

        @SerializedName("expires_at")

        public Date expires_at;

        @SerializedName("filter_action")

        public String filter_action;

app/src/main/java/app/fedilab/android/client/entities/api/Notification.java

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ public class Notification { 
    public Status status;

    @SerializedName("cached")

    public boolean cached;



    public Filter filteredByApp;

    public PositionFetchMore positionFetchMore = PositionFetchMore.BOTTOM;

    public transient List<Notification> relatedNotifications;

    public boolean isFetchMore;

app/src/main/java/app/fedilab/android/client/entities/api/Status.java

+3 −3
Original line number Diff line number Diff line
@@ -92,8 +92,8 @@ public class Status implements Serializable, Cloneable { 
    public Card card;

    @SerializedName("poll")

    public Poll poll;

    /*  @SerializedName("filtered")

      public Filter.FilterResult filtered;*/

    @SerializedName("filtered")

    public List<Filter.FilterResult> filtered;

    @SerializedName("pleroma")

    public Pleroma pleroma;

    @SerializedName("cached")
@@ -114,7 +114,7 @@ public class Status implements Serializable, Cloneable { 
    public transient int cursorPosition = 0;

    public transient boolean submitted = false;

    public transient boolean spoilerChecked = false;



    public Filter filteredByApp;

    @Override

    public boolean equals(@Nullable Object obj) {

        boolean same = false;