From f5d4892ba6143d8cc3ce79f135963c140c6a3942 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Fri, 24 Jun 2022 11:54:35 +0300 Subject: [PATCH] added filter for copyright links --- .../java/ru/vtosters/lite/utils/Newsfeed.java | 23 ++++++++++++------- smali/res/xml/preferences_feed.xml | 14 +++++++---- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java index b013390f5..7e85c00ea 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -48,9 +48,11 @@ import java.util.List; public class Newsfeed{ public static List mFilters; + public static List mFiltersLinks; public static void setupFilters(){ mFilters = new ArrayList(); + mFiltersLinks = new ArrayList(); getFilter("refsfilter", "Referals.txt"); getFilter("shortlinkfilter", "LinkShorter.txt"); @@ -63,6 +65,11 @@ public class Newsfeed{ mFilters.addAll(Arrays.asList(customfilters.split(", "))); } + String linkfilter = getPrefsValue("linkfilter"); + + if(!linkfilter.isEmpty()){ + mFiltersLinks.addAll(Arrays.asList(linkfilter.split(", "))); + } } public static void getFilter(String boolname, String filename){ @@ -108,19 +115,19 @@ public class Newsfeed{ } private static boolean checkCopyright(JSONObject json) throws JSONException{ + String linkfilter = getPrefsValue("linkfilter"); + if(json.opt("copyright") != null){ JSONObject copyright = json.getJSONObject("copyright"); String copyrightlink = copyright.getString("link"); - return copyrightlink.contains("vk.com") || copyright_post(); // fuck you, it doesn't work to detect link value + for(String linkfilters : mFiltersLinks) { + if(copyrightlink.toLowerCase().contains(linkfilters.toLowerCase())){ + return true; + } + } - // example of response - //"copyright": { - //"id": 251706814, - //"link": "https://vk.com/wall251706814_9016", - //"type": "owner", - //"name": "Маргарита Буруня" - //} + return copyright_post(); } return false; diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml index 1a25e8505..785ebddc9 100644 --- a/smali/res/xml/preferences_feed.xml +++ b/smali/res/xml/preferences_feed.xml @@ -21,11 +21,6 @@ android:key="adsstories" android:summary="@string/feed_ads_stories_summary" android:title="@string/vtldas" /> - + +