From 4288b6ab18ccdb8ba254b1ebcf1635345abb171c Mon Sep 17 00:00:00 2001
From: Floens <floens@gmail.com>
Date: Sun, 26 Jul 2015 01:08:36 +0200
Subject: [PATCH] Add filter option that removes the post completely

---
 .../main/java/org/floens/chan/core/manager/FilterEngine.java | 5 +++--
 .../app/src/main/java/org/floens/chan/core/model/Post.java   | 1 +
 .../java/org/floens/chan/core/net/ChanReaderRequest.java     | 3 +++
 .../main/java/org/floens/chan/ui/adapter/PostsFilter.java    | 4 ++--
 .../org/floens/chan/ui/controller/FiltersController.java     | 3 +++
 Clover/app/src/main/res/values/strings.xml                   | 3 ++-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java b/Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java
index 7b1a8835..c8189d20 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/manager/FilterEngine.java
@@ -73,7 +73,8 @@ public class FilterEngine {
 
     public enum FilterAction {
         HIDE(0),
-        COLOR(1);
+        COLOR(1),
+        REMOVE(2);
 
         public final int id;
 
@@ -85,7 +86,7 @@ public class FilterEngine {
             return enums[id];
         }
 
-        private static FilterAction[] enums = new FilterAction[2];
+        private static FilterAction[] enums = new FilterAction[3];
 
         static {
             for (FilterAction type : values()) {
diff --git a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
index 0e828fbe..4f9228b5 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/model/Post.java
@@ -68,6 +68,7 @@ public class Post {
     public boolean spoiler = false;
     public int filterHighlightedColor = 0;
     public boolean filterStub = false;
+    public boolean filterRemove = false;
     /**
      * This post replies to the these ids. Is an unmodifiable list after finish().
      */
diff --git a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
index 233d7b78..7ad356a8 100644
--- a/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
+++ b/Clover/app/src/main/java/org/floens/chan/core/net/ChanReaderRequest.java
@@ -343,6 +343,9 @@ public class ChanReaderRequest extends JsonReaderRequest<ChanReaderRequest.ChanR
                         case HIDE:
                             post.filterStub = true;
                             break;
+                        case REMOVE:
+                            post.filterRemove = true;
+                            break;
                     }
                 }
             }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostsFilter.java b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostsFilter.java
index 5cd37918..f78d3169 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostsFilter.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/adapter/PostsFilter.java
@@ -124,11 +124,11 @@ public class PostsFilter {
             }
         }
 
-        // Process hidden
+        // Process hidden either by a filter or by thread hiding
         Iterator<Post> i = posts.iterator();
         while (i.hasNext()) {
             Post post = i.next();
-            if (databaseManager.isThreadHidden(post)) {
+            if (post.filterRemove || databaseManager.isThreadHidden(post)) {
                 i.remove();
             }
         }
diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java
index c5ccec43..ffcba0d0 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/FiltersController.java
@@ -87,6 +87,8 @@ public class FiltersController extends Controller implements ToolbarMenuItem.Too
                 return getString(R.string.filter_hide);
             case COLOR:
                 return getString(R.string.filter_color);
+            case REMOVE:
+                return getString(R.string.filter_remove);
         }
         return null;
     }
@@ -161,6 +163,7 @@ public class FiltersController extends Controller implements ToolbarMenuItem.Too
 
     private void deleteFilter(Filter filter) {
         filterEngine.remove(filter);
+        EventBus.getDefault().post(new RefreshUIMessage("filters"));
         adapter.load();
         //TODO: undo
     }
diff --git a/Clover/app/src/main/res/values/strings.xml b/Clover/app/src/main/res/values/strings.xml
index 46f0515b..c5345012 100644
--- a/Clover/app/src/main/res/values/strings.xml
+++ b/Clover/app/src/main/res/values/strings.xml
@@ -133,7 +133,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
     <string name="filter_boards">Boards</string>
     <string name="filter_boards_all">all</string>
     <string name="filter_hide">Hide post</string>
-    <string name="filter_color">Highlight</string>
+    <string name="filter_color">Highlight post</string>
+    <string name="filter_remove">Remove post</string>
     <string name="filter_invalid_pattern">Invalid pattern</string>
     <string name="filter_preview">Test your filter</string>
     <string name="filter_no_matches">Does not match</string>