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 29e720761..602283375 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java
@@ -94,11 +94,11 @@ public class Newsfeed {
public static boolean injectFilters(JSONObject jSONObject) {
String optString = jSONObject.optString(NavigatorKeys.j, "");
- if (!ads(optString) && !authors_rec(optString) && !recomm(optString) && !friendrecomm(optString)) {
+ if (!ads(optString) && !checkCopyright(optString) && !authors_rec(optString) && !recomm(optString) && !friendrecomm(optString)) {
String optString2 = jSONObject.optString("post_type", "");
if (!ads(optString2) && !authors_rec(optString2) && !recomm(optString2) && !friendrecomm(optString2)) {
String optString3 = jSONObject.optString("filters", "");
- if (ads(optString3) || authors_rec(optString3) || recomm(optString3) || friendrecomm(optString3) || isBlockedByFilter(jSONObject.optString(NavigatorKeys.x, "")) || checkCopyright(jSONObject) || captions(jSONObject)) {
+ if (ads(optString3) || authors_rec(optString3) || recomm(optString3) || friendrecomm(optString3) || isBlockedByFilter(jSONObject.optString(NavigatorKeys.x, "")) || captions(jSONObject)) {
return false;
}
return !AD(jSONObject);
@@ -142,8 +142,8 @@ public class Newsfeed {
return jSONObject.optInt("marked_as_ads", 0) == 1 && adsgroup();
}
- public static boolean checkCopyright(JSONObject jSONObject) {
- return jSONObject.optInt("copyright", 0) == 1 && copyright_post();
+ public static boolean checkCopyright(String str) {
+ return str.equals("copyright") && copyright_post();
}
public static String friendsads() {
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 a6ccc6037..6c68ae6d4 100644
--- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
+++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java
@@ -63,7 +63,7 @@ public class Preferences {
}
public static boolean captions() {
- return true; //BooleanTrue("captions");
+ return BooleanTrue("captions");
}
public static boolean copyright_post() {
@@ -237,6 +237,10 @@ public class Preferences {
return dnr() ? "messages.markAsRead" : "null";
}
+ public static String copyrightfix() {
+ return copyright_post() ? "copyright" : "ads_easy_promote";
+ }
+
public static boolean refsfilter() {
return BooleanFalse("refsfilter");
}
diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml
index 25a7b8ca3..e7680d9fd 100644
--- a/smali/res/xml/preferences_feed.xml
+++ b/smali/res/xml/preferences_feed.xml
@@ -21,6 +21,10 @@
android:key="adsstories"
android:summary="Реклама при переходе между историями"
android:title="@string/vtldas" />
+
diff --git a/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali b/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali
index ed7941079..58a3ddc0e 100644
--- a/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali
+++ b/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali
@@ -1067,7 +1067,7 @@
.method public a()Ljava/lang/String;
.locals 1
- const-string v0, "5.97"
+ const-string v0, "5.111"
return-object v0
.end method
diff --git a/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali b/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali
index 1cec88bd2..31a3c5467 100644
--- a/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali
+++ b/smali/smali_classes5/com/vk/dto/newsfeed/entries/Post$b.smali
@@ -1433,7 +1433,9 @@
:cond_26
:goto_15
- const-string v2, "ads_easy_promote"
+ invoke-static {}, Lru/vtosters/lite/utils/Preferences;->copyrightfix()Ljava/lang/String;
+
+ move-result-object v2
.line 373
invoke-virtual {v0, v2}, Lorg/json/JSONObject;->optJSONObject(Ljava/lang/String;)Lorg/json/JSONObject;
diff --git a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali
index b6b80f9a5..94bc44eed 100644
--- a/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali
+++ b/smali/smali_classes5/com/vk/im/engine/internal/api_commands/messages/MessagesMarkAsReadApiCmd.smali
@@ -128,7 +128,6 @@
invoke-virtual {p1, v0}, Lcom/vk/api/sdk/VKApiManager;->a(Lcom/vk/api/sdk/VKMethodCall;)V
:cond_beb
-
const/4 p1, 0x1
.line 24
diff --git a/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali b/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali
index 571fa25d8..887930bc4 100644
--- a/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali
+++ b/smali/smali_classes5/com/vtosters/lite/api/wall/WallGet.smali
@@ -712,7 +712,7 @@
.method public a()Ljava/lang/String;
.locals 1
- const-string v0, "5.97"
+ const-string v0, "5.111"
return-object v0
.end method