code improvements

app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java

@@ -504,20 +504,10 @@ public class JsonInjectors {
             var list = items.optJSONObject(j);
             var type = list.optString("type");
 
-            if (isWhitelistedAd(list)) {
-                newItems.put(list);
-                continue;
-            }
-
             if (isAds(list, type)) {
                 continue;
             }
 
-            if (isWhitelistedFilters(list)) {
-                newItems.put(list);
-                continue;
-            }
-
             if (authorsrecomm() && (type.equals("authors_rec")
                     || type.startsWith("recommended_") && (type.endsWith("audios")
                     || type.endsWith("artists")
@@ -540,31 +530,31 @@ public class JsonInjectors {
                 continue;
             }
 
-            if (adsgroup() && list.optInt("marked_as_ads") == 1) {
+            if (adsgroup() && list.optInt("marked_as_ads") == 1 && !isWhitelistedAd(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: marked_as_ads is true");
                 continue;
             }
 
-            if (isBadNews(list.optString("text"))) {
+            if (isBadNews(list.optString("text")) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: text filters");
                 continue;
             }
 
-            if (checkCopyright(list)) {
+            if (checkCopyright(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: copyright filters");
                 continue;
             }
 
-            if (checkCaption(list)) {
+            if (checkCaption(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: caption filters");
                 continue;
             }
 
-            if (NewsFeedFiltersUtils.injectFiltersReposts(list)) {
+            if (NewsFeedFiltersUtils.injectFiltersReposts(list) && !isWhitelistedFilters(list)) {
                 if (dev())
                     Log.d("NewsfeedAdBlockV2", "Removed post " + list.optInt("post_id") + " from feed, Reason: repost ad");
                 continue;

app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java

@@ -84,10 +84,12 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment {
         builder.setTitle("Внимание!");
         builder.setMessage("Вы действительно хотите удалить все элементы из списка?");
         builder.setCancelable(false);
-        builder.setPositiveButton("Да", (dialogInterface, i) -> edit().remove(key).apply());
+        builder.setPositiveButton("Да", (dialogInterface, i) -> {
+            edit().remove(key).apply();
+            sendToast("Список элементов успешно очищен");
+        });
         builder.setNegativeButton("Отмена", (dialogInterface, i) -> dialogInterface.dismiss());
         builder.show();
-        sendToast("Все элементы списка удалены");
     }
 
     private String countSet(String key) {