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 7879b2c0a..b013390f5 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -98,10 +98,10 @@ public class Newsfeed{ return false; } - checkCopyright(obj); + if(checkCopyright(obj)) return false; + + if(isBadNew(obj.optString("text", ""))) return false; - optString = obj.optString("text", ""); - if(isBadNew(optString)) return false; if(checkCaption(obj)) return false; return !isGroupAds(obj); @@ -112,7 +112,7 @@ public class Newsfeed{ 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 + return copyrightlink.contains("vk.com") || copyright_post(); // fuck you, it doesn't work to detect link value // example of response //"copyright": { @@ -123,7 +123,7 @@ public class Newsfeed{ //} } - return true; + return false; } private static boolean isRecomsGroup(String src){ diff --git a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java index 00353460e..2e198fd38 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -289,10 +289,6 @@ public class Preferences{ return dnr() ? "messages.markAsRead" : "null"; } - public static String copyrightfix(){ - return copyright_post() ? "copyright" : "ads_easy_promote"; - } - public static boolean refsfilter(){ return getBoolValue("refsfilter", false); } diff --git a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali index 242ee7533..39d50f796 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali +++ b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a$a.smali @@ -122,6 +122,17 @@ move-result-object v10 + invoke-static {v10}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + + move-result v11 + + if-nez v11, :cond_229 + + add-int/lit8 v9, v9, 0x1 + + goto :goto_0 + + :cond_229 if-eqz v10, :cond_0 .line 7 @@ -257,7 +268,7 @@ goto :goto_2 :cond_6 - const-string v0, "ads" + const-string v0, "null" .line 14 :goto_2 @@ -528,6 +539,19 @@ move-object/from16 v21, v5 + invoke-static {v13}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + + move-result v16 + + if-nez v16, :cond_228 + + add-int/lit8 v12, v12, 0x1 + + move-object/from16 v5, v21 + + goto :goto_7 + + :cond_228 if-eqz v13, :cond_c .line 34 @@ -679,6 +703,8 @@ .line 42 :goto_c + const/4 v2, 0x0 + new-instance v32, Lcom/vk/dto/discover/DiscoverItem; move-object/from16 v4, v32 diff --git a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali index 92a705e82..a1b0d8913 100644 --- a/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali +++ b/smali/smali_classes2/com/vk/api/discover/DiscoverGet$a.smali @@ -34,7 +34,7 @@ .end method .method private final a(Landroid/util/SparseArray;Lorg/json/JSONArray;)Landroid/util/SparseArray; - .locals 4 + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -65,6 +65,17 @@ move-result-object v2 + invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + + move-result v10 + + if-nez v10, :cond_2 + + add-int/lit8 v0, v0, 0x1 + + goto :goto_0 + + :cond_2 if-eqz v2, :cond_0 .line 47 @@ -200,7 +211,7 @@ .end method .method private final b(Landroid/util/SparseArray;Lorg/json/JSONArray;)Landroid/util/SparseArray; - .locals 4 + .locals 11 .annotation system Ldalvik/annotation/Signature; value = { "(", @@ -231,6 +242,17 @@ move-result-object v2 + invoke-static {v2}, Lru/vtosters/lite/utils/Newsfeed;->injectFilters(Lorg/json/JSONObject;)Z + + move-result v10 + + if-nez v10, :cond_2 + + add-int/lit8 v0, v0, 0x1 + + goto :goto_0 + + :cond_2 if-eqz v2, :cond_0 .line 3