From 5af63e0adf475120f02c90fecba8d0bc3f9f34c8 Mon Sep 17 00:00:00 2001
From: gdlbo <41114720+gdlbo@users.noreply.github.com>
Date: Thu, 21 Jul 2022 16:34:55 +0300
Subject: [PATCH] some ad fixes

---
 .../ru/vtosters/lite/hooks/JsonInjectors.java | 29 +++++++------------
 1 file changed, 11 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
index 2976126af..755f8f68e 100644
--- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
+++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java
@@ -164,13 +164,13 @@ public class JsonInjectors{
 
         if (json.has("ads")) {
             if (isDeleteFix) {
-                var adsettings = json.optJSONObject("ads").optJSONObject("settings");
-                adsettings.put("stories_interval", 0);
-                adsettings.put("authors_interval", 0);
-                adsettings.put("time_interval", 0);
-                adsettings.put("stories_init", 0);
-                adsettings.put("authors_init", 0);
-                adsettings.put("time_init", 0);
+                json.optJSONObject("ads").optJSONObject("settings")
+                        .put("stories_interval", 0)
+                        .put("authors_interval", 0)
+                        .put("time_interval", 0)
+                        .put("stories_init", 0)
+                        .put("authors_init", 0)
+                        .put("time_init", 0);
                 Log.d("StoriesAds", "Set ads at zero val");
             } else {
                 json.remove("ads");
@@ -184,21 +184,14 @@ public class JsonInjectors{
                 if (item != null) {
                     for (int j = 0; j < item.length(); j++) {
                         var item2 = item.optJSONObject(j);
-                        var type = item2.optBoolean("is_ads");
+                        var ads = item2.optBoolean("is_ads");
                         var promo = item2.optBoolean("is_promo");
 
-                        if (!type && !promo) {
-                            newItems2.put(item.optJSONObject(j));
-                        } else {
-                            Log.d("StoriesAds", "Fetched ad " + item2.optString("id"));
+                        if (ads || promo) {
+                            item.remove(j);
+                            Log.d("StoriesAds", "Fetched ad " + item2.optString("id") + " isads: " + ads + " ispromo: " + promo);
                         }
                     }
-
-                    try {
-                        oldItems.optJSONObject(i).put("stories", newItems2);
-                    } catch (JSONException e) {
-                        Log.e("StoriesAds", e.getMessage());
-                    }
                 }
             }
         }