fix #1376

Co-authored-by: abslike <abslike@vk.com>

.github/workflows/build.yml

@@ -21,10 +21,10 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - name: Set up JDK 14
+      - name: Set up JDK
         uses: actions/setup-java@v3
         with:
-          java-version: '14'
+          java-version: '17'
           distribution: 'adopt'
           
       - uses: actions/checkout@v3

app/build.gradle

@@ -72,6 +72,9 @@ android {
     }
     namespace 'ru.vtosters.lite'
     ndkVersion '25.2.9519653'
+    buildFeatures {
+        aidl true
+    }
 }
 
 dependencies {

app/src/main/java/com/vtosters/lite/R.java

@@ -19658,6 +19658,9 @@ public final class R {
         public static final int vkx_integration_enabled_info = 0x7f12188a; // 2131892362
         public static final int whitelisted_ad_groups_stories_title = 0x7f12188b; // 2131892363
         public static final int writebar_ios_title = 0x7f12188c; // 2131892364
+        public static final int cache_size = 0x7f12188d; // 2131892365
+        public static final int cache_size_summ = 0x7f12188e; // 2131892366
+        public static final int clear_all_cache = 0x7f12188f; // 2131892367
     }
 
     public static final class style {

app/src/main/java/ru/vtosters/hooks/GcmHook.java

@@ -19,13 +19,10 @@ import static ru.vtosters.hooks.other.Preferences.isValidSignature;
 
 
 public class GcmHook {
-
     private static final String agent = String.format("Android-GCM/1.5 (%s %s)", Build.MODEL, Build.MODEL);
-
     private static KeyPair pair;
-
     private static int rid = 0;
-
+    
     static {
         genNewKey();
     }
@@ -35,15 +32,15 @@ public class GcmHook {
     }
 
     public static String requestToken(String orig) {
-        return "yssp9o9p9pamz5t-nvmq8spgwtin3e0==";
+        return isValidSignature() ? "yssp9o9p9pamz5t-nvmq8spgwtin3e0==" : requestToken();
     }
 
     public static String requestToken() {
-        String xappide;
         try {
             String aid = getRandomAid();
             String pub2 = genNewKey();
             String sig = getSig(pub2);
+            String xappide;
             try {
                 byte[] bytes = MessageDigest.getInstance("SHA1").digest(pair.getPublic().getEncoded());
                 bytes[0] = (byte) (((bytes[0] & 15) + 112) & 255);
@@ -200,7 +197,6 @@ public class GcmHook {
             }).getBytes(StandardCharsets.UTF_8));
             return Base64.encodeToString(sign.sign(), 0);
         } catch (Exception e) {
-            e.printStackTrace();
             return null;
         }
     }

app/src/main/java/ru/vtosters/hooks/PhotoViewer.java

@@ -130,6 +130,8 @@ public class PhotoViewer {
                     .setItems(items, (di, i) -> openUrl(SearchEngine.values()[i].buildSearchUrl(url)))
                     .show();
         } else {
+            // index correction for old versions with numeration "1-x"
+            if (selectedEngine >= SearchEngine.values().length) SearchEngine.setDefaultSearchEngine(--selectedEngine);
             openUrl(SearchEngine.values()[selectedEngine].buildSearchUrl(url));
         }
     }

app/src/main/java/ru/vtosters/hooks/VKUIHook.java

@@ -23,7 +23,7 @@ public class VKUIHook {
     }
 
     private static void applyVKUIStyles(WebView webView) {
-        if (getBoolValue("VKUI_INJ", true)) {
+        if (getBoolValue("VKUI_INJ", true) && !webView.getUrl().contains("static.vk.com/memories")) {
             if (!WebViewColoringUtils.isLoaded) {
                 WebViewColoringUtils.load();
             }

app/src/main/java/ru/vtosters/hooks/other/Preferences.java

@@ -330,7 +330,7 @@ public class Preferences {
     }
 
     public static long getSizeForDelete() {
-        return switch (Preferences.getPreferences().getString("clearcache", "")) {
+        return switch (Preferences.getPreferences().getString("autoclearcache", "")) {
             case "100mb" -> 104857600L;
             case "500mb" -> 524288000L;
             case "1gb" -> 1073741824L;

app/src/main/java/ru/vtosters/hooks/other/ThemesUtils.java

@@ -28,6 +28,7 @@ import com.vk.core.ui.themes.VKThemeHelper;
 import com.vtosters.lite.R;
 import com.vtosters.lite.data.ThemeTracker;
 import ru.vtosters.lite.deviceinfo.OEMDetector;
+import ru.vtosters.lite.themes.ThemesCore;
 import ru.vtosters.lite.themes.ThemesHacks;
 import ru.vtosters.lite.ui.wallpapers.WallpapersHooks;
 import ru.vtosters.lite.utils.LifecycleUtils;
@@ -55,14 +56,6 @@ public class ThemesUtils {
         return ColorStateList.valueOf(getAccentColor());
     }
 
-    public static int getSystemModeTheme() {
-        return AppCompatDelegate.getDefaultNightMode();
-    }
-
-    public static void setSystemModeTheme(int theme) {
-        AppCompatDelegate.setDefaultNightMode(theme);
-    }
-
     public static void setTheme(VKTheme theme, Activity activity, Boolean restartActivity) {
         setThemeFL(theme, activity, getCenterScreenCoords(), restartActivity);
     } // apply changed theme
@@ -72,6 +65,7 @@ public class ThemesUtils {
             activity = LifecycleUtils.getCurrentActivity();
         }
         VKThemeHelper.theme(theme, activity, fl);
+        if (isMonetTheme()) ThemesCore.clear();
         if (restartActivity) activity.recreate();
         ThemeTracker.a();
         WebViewColoringUtils.isLoaded = false;
@@ -261,14 +255,6 @@ public class ThemesUtils {
         return Build.VERSION.SDK_INT >= Build.VERSION_CODES.O ? isDarkTheme() ? View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR : 0 : 0;
     }
 
-    public static int getStockAccent() {
-        if (isMilkshake()) {
-            return isDarkTheme() ? Color.parseColor("#71aaeb") : Color.parseColor("#3f8ae0");
-        } else {
-            return isDarkTheme() ? Color.parseColor("#71aaeb") : Color.parseColor("#528bcc");
-        }
-    }
-
     public static int getDarkThemeRes() {
         if (isMonetTheme()) {
             if (isAmoledTheme()) {
@@ -408,15 +394,11 @@ public class ThemesUtils {
     }
 
     public static int getNavigationHeight(int Default) {
-        int VKME = R.dimen.design_bottom_sheet_peek_height_min;
-
-        return vkme() ? VKME : Default;
+        return vkme() ? R.dimen.design_bottom_sheet_peek_height_min : Default;
     }
 
     public static int getNavigationWidth(int Default) {
-        int VKME = R.dimen.app_minimumsize_h;
-
-        return vkme() ? VKME : Default;
+        return vkme() ? R.dimen.app_minimumsize_h : Default;
     }
 
     public static ColorStateList getCSTDock() {
@@ -427,12 +409,8 @@ public class ThemesUtils {
                 },
                 new int[]{
                         dockbar_accent() ? getAccentColor() : (isDarkTheme() ? getResources().getColor(R.color.white) : getResources().getColor(R.color.gray_700)),
-                        isDarkTheme() ? getResources().getColor(R.color.gray_500) : getResources().getColor(R.color.vk_steel_gray_300)
+                        getColorFromAttr(R.attr.tabbar_inactive_icon)
                 }
         );
     }
-
-    private void getCurrentThemeID(VKTheme paramVKTheme) {
-        Preference.b("vk_theme_helper", "current_theme", paramVKTheme.getId());
-    }
 }

app/src/main/java/ru/vtosters/lite/music/catalog/inject/CatalogJsonInjector.java

@@ -30,79 +30,22 @@ public class CatalogJsonInjector {
 
     public static JSONObject music(JSONObject json) throws JSONException {
         var catalog = json.optJSONObject("catalog");
-
-        JSONArray oldItems = null;
-
-        if (catalog != null) {
-            oldItems = catalog.optJSONArray("sections");
-        }
-
+        var oldItems = catalog != null ? catalog.optJSONArray("sections") : null;
         var useOldAppVer = getBoolValue("useOldAppVer", false);
         var isUsersCatalog = oldItems.optJSONObject(0).optString("url").equals("https://vk.com/audios" + getUserId() + "?section=" + (useOldAppVer ? "all" : "general"));
+        var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
 
-        if (isUsersCatalog) {
-            var blocks = oldItems.optJSONObject(0).optJSONArray("blocks");
-
+        if (isUsersCatalog && blocks != null) {
             if (!useOldAppVer) {
                 fixDailyMix(blocks);
-                if (blocks != null) {
-                    for (int i = 0; i < blocks.length(); i++) {
-                        var block = blocks.optJSONObject(i);
-                        var layout = block.optJSONObject("layout");
-                        if (layout != null) {
-                            var name = layout.optString("name");
-                            if (name.equals("header_extended")) {
-                                if (layout.has("top_title")) blocks.remove(i);
-                                try {
-                                    layout.put("name", "header");
-                                } catch (JSONException e) {
-                                    e.printStackTrace();
-                                }
-                            }
-                        }
-                    }
-                }
 
-                var playlists = fetchCatalogId("https://vk.com/audio?section=my_playlists");
-                if (playlists != null) {
-                    var catalogarr = playlists.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+                removeUnsupportedLayouts(blocks);
 
-                    var title = catalogarr.optString("title");
-                    var id = catalogarr.optString("id");
-                    var url = catalogarr.optString("url");
+                fetchCatalogId("https://vk.com/audio?section=my_playlists", oldItems);
 
-                    Log.d("VKMusic", "Added " + title + " in music sections");
+                fetchCatalogId("https://vk.com/audio?section=albums", oldItems);
 
-                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-                }
-
-                var albums = fetchCatalogId("https://vk.com/audio?section=albums");
-                if (albums != null) {
-                    var catalogarr = albums.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
-
-                    var title = catalogarr.optString("title");
-                    var id = catalogarr.optString("id");
-                    var url = catalogarr.optString("url");
-
-                    Log.d("VKMusic", "Added " + title + " in music sections");
-
-                    oldItems.put(new JSONObject().put("id", id).put("title", title).put("url", url));
-                }
-
-                for (int i = 0; i < oldItems.length(); i++) {
-                    var item = oldItems.optJSONObject(i);
-                    var title = item.optString("title");
-                    var id = item.optString("id");
-                    var url = item.optString("url");
-                    var value = Preferences.getString("musicdefcatalog");
-
-                    Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
-
-                    if (url.contains(value) && !value.isEmpty()) {
-                        catalog.put("default_section", id);
-                        Log.d("VKMusic", "Added " + title + " as default music section");
-                    }
-                }
+                setDefaultAudioPage(oldItems, catalog);
             }
 
             if (CacheDatabaseDelegate.hasTracks() && !LibVKXClient.isIntegrationEnabled()) { // inj in playlist list
@@ -112,15 +55,11 @@ public class CatalogJsonInjector {
                     json.put("playlists", new JSONArray().put(getPlaylist()));
                     Log.d("catalogInjector", "added new pl");
                 } else {
-                    try {
-                        json.optJSONArray("playlists").put(getPlaylist());
-                        Log.d("catalogInjector", "added to exist pl");
-                    } catch (Exception e) {
-                        Log.d("catalogInjector", e.toString());
-                    }
+                    json.optJSONArray("playlists").put(getPlaylist());
+                    Log.d("catalogInjector", "added to exist pl");
                 }
 
-                if (blocks != null && (!useOldAppVer || noPlaylists)) {
+                if (!useOldAppVer || noPlaylists) {
                     var newBlocks = new JSONArray();
 
                     newBlocks
@@ -155,6 +94,7 @@ public class CatalogJsonInjector {
             if (!isUsersCatalog || !CacheDatabaseDelegate.hasTracks() || LibVKXClient.isIntegrationEnabled()) {
                 return; // early return if not users catalog or no tracks or integration enabled
             }
+
             var noPlaylists = !json.has("playlists");
 
             if (noPlaylists) {
@@ -169,7 +109,7 @@ public class CatalogJsonInjector {
                 }
             }
 
-            if (!useOldAppVer || noPlaylists) {
+            if (!useOldAppVer && !noPlaylists) {
                 var newBlocks = new JSONArray();
 
                 newBlocks
@@ -278,9 +218,38 @@ public class CatalogJsonInjector {
         }
     }
 
-    private static JSONObject fetchCatalogId(String section) {
-        if (section.isEmpty()) return null;
+    private static void removeUnsupportedLayouts(JSONArray blocks) throws JSONException {
+        for (int i = 0; i < blocks.length(); i++) {
+            var block = blocks.optJSONObject(i);
+            var layout = block.optJSONObject("layout");
+            if (layout != null) {
+                var name = layout.optString("name");
+                if (name.equals("header_extended")) {
+                    if (layout.has("top_title")) blocks.remove(i);
+                    layout.put("name", "header");
+                }
+            }
+        }
+    }
 
+    private static void setDefaultAudioPage(JSONArray jsonArray, JSONObject catalog) throws JSONException {
+        for (int i = 0; i < jsonArray.length(); i++) {
+            var item = jsonArray.optJSONObject(i);
+            var title = item.optString("title");
+            var id = item.optString("id");
+            var url = item.optString("url");
+            var value = Preferences.getString("musicdefcatalog");
+
+            Log.d("VKMusic", "title: " + title + " id: " + id + " url: " + url + " value: " + value);
+
+            if (url.contains(value) && !value.isEmpty()) {
+                catalog.put("default_section", id);
+                Log.d("VKMusic", "Added " + title + " as default music section");
+            }
+        }
+    }
+
+    private static void fetchCatalogId(String sectionUrl, JSONArray jsonArray) {
         var request = new Request.a()
                 .b("https://" + getApi() + "/method/" + "catalog.getAudio"
                         + "?v=5.119"
@@ -291,16 +260,23 @@ public class CatalogJsonInjector {
                         + "&device_id="
                         + DeviceIdProvider.d(AndroidUtils.getGlobalContext())
                         + "&url="
-                        + section
+                        + sectionUrl
                         + "&access_token="
                         + AccountManagerUtils.getUserToken())
                 .a(Headers.a("User-Agent", Network.l.c().a(), "Content-Type", "application/x-www-form-urlencoded; charset=utf-8")).a();
         try {
-            return new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
+            var json = new JSONObject(mClient.a(request).execute().a().g()).getJSONObject("response");
+            var catalogarr = json.optJSONObject("catalog").optJSONArray("sections").optJSONObject(0);
+
+            var title = catalogarr.optString("title");
+            var id = catalogarr.optString("id");
+            var url = catalogarr.optString("url");
+
+            Log.d("VKMusic", "Added " + title + " in music sections");
+
+            jsonArray.put(new JSONObject().put("id", id).put("title", title).put("url", url));
         } catch (JSONException | IOException e) {
             Log.d("VTLMusic", "Error: " + e.getMessage());
         }
-
-        return null;
     }
 }

app/src/main/java/ru/vtosters/lite/themes/ThemesCore.java

@@ -143,8 +143,11 @@ public class ThemesCore {
         themedColors.put(R.attr.im_reply_separator, accentColor);
         themedColors.put(R.attr.im_text_name, accentColor);
 
-        outgoinging_msg = ThemesUtils.lighten(accentColor, 0.76f);
-        outgoinging_msg_highlight = ThemesUtils.lighten(accentColor, 0.5f);
+        float out = ThemesUtils.isMonetTheme() ? 0.85f : 0.76f;
+        float outhighlight = ThemesUtils.isMonetTheme() ? 0.75f : 0.5f;
+
+        outgoinging_msg = ThemesUtils.lighten(accentColor, out);
+        outgoinging_msg_highlight = ThemesUtils.lighten(accentColor, outhighlight);
 
         themedColors.put(R.attr.im_ic_send_msg, accentColor);
         themedColors.put(R.attr.im_bubble_wallpaper_outgoing, accentColor);

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

@@ -1,21 +1,37 @@
 package ru.vtosters.lite.ui.fragments;
 
+import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
+import android.content.SharedPreferences;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.TypedValue;
 import android.view.View;
 import android.view.WindowInsetsController;
+import android.webkit.WebView;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
 import android.widget.Toast;
+import androidx.appcompat.view.ContextThemeWrapper;
+import b.h.g.m.FileUtils;
 import com.vk.core.dialogs.alert.VkAlertDialog;
+import com.vk.im.engine.ImEngine1;
+import com.vk.im.engine.ImEngineExt;
+import com.vk.im.ui.providers.audiomsg.ImAudioMsgPlayerProvider;
+import com.vk.im.ui.providers.audiomsg.PlayerActionSources;
+import com.vk.imageloader.VKImageLoader;
+import com.vk.media.player.cache.AutoPlayCacheHolder;
+import com.vk.mediastore.MediaStorage;
+import com.vk.stickers.Stickers;
+import com.vtosters.lite.im.ImEngineProvider;
+import ru.vtosters.hooks.SwitchHook;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.hooks.other.ThemesUtils;
 import ru.vtosters.lite.ui.PreferenceFragmentUtils;
 import ru.vtosters.lite.ui.components.BackupManager;
-import ru.vtosters.lite.utils.AccountManagerUtils;
-import ru.vtosters.lite.utils.AndroidUtils;
-import ru.vtosters.lite.utils.LifecycleUtils;
-import ru.vtosters.lite.utils.VKAccountDB;
+import ru.vtosters.lite.utils.*;
 
 import java.io.IOException;
 
@@ -58,6 +74,108 @@ public class DataSettingsFragment extends TrackedMaterialPreferenceToolbarFragme
             }
         }
 
+        PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), AndroidUtils.getString("data"));
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "currcache",
+                getString(com.vtosters.lite.R.string.cache_size),
+                getString(com.vtosters.lite.R.string.cache_size_summ) + ": " + CacheUtils.humanReadableByteCountBin(IOUtils.getDirSize(AndroidUtils.getGlobalContext().getCacheDir())),
+                null,
+                preference -> {
+                    new VkAlertDialog.Builder(requireContext())
+                            .setTitle(getString(com.vtosters.lite.R.string.clear_all_cache))
+                            .setPositiveButton(requireContext().getString(com.vtosters.lite.R.string.yes), (dialogInterface, i) -> {
+                                new WebView(requireContext()).clearCache(true);
+                                VKImageLoader.e();
+                                ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
+                                ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
+                                FileUtils.l();
+                                AutoPlayCacheHolder.d.a();
+                                MediaStorage.a();
+                                updateCacheSize();
+                            })
+                            .setNegativeButton(requireContext().getString(com.vtosters.lite.R.string.cancel), (dialogInterface, i) -> dialogInterface.dismiss())
+                            .show();
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "",
+                AndroidUtils.getString("clearcache_other_title"),
+                "",
+                null,
+                preference -> {
+                    new VkAlertDialog.Builder(getContext())
+                            .setTitle(requireContext().getString(com.vtosters.lite.R.string.select_which_clean))
+                            .setItems(AndroidUtils.getArray(com.vtosters.lite.R.array.cache_cleaner), (dialog, which) -> {
+                                switch (which) {
+                                    case 0 -> {
+                                        SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
+                                        prefs2.edit().clear().commit();
+                                        new WebView(requireContext()).clearCache(true);
+                                        VKImageLoader.e();
+                                        ImEngineProvider.b().a();
+                                        ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
+                                        ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
+                                        FileUtils.l();
+                                        Stickers.l.c();
+                                        ImEngineExt.a(ImEngine1.a());
+                                        AutoPlayCacheHolder.d.a();
+                                        MediaStorage.a();
+                                    }
+                                    case 1 -> {
+                                        SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
+                                        prefs2.edit().clear().commit();
+                                        Stickers.l.c();
+                                    }
+                                    case 2 -> {
+                                        VKImageLoader.e();
+                                        ImEngineExt.a(ImEngine1.a());
+                                    }
+                                    case 3 -> {
+                                        AutoPlayCacheHolder.d.a();
+                                        MediaStorage.a();
+                                    }
+                                    case 4 -> {
+                                        ImEngineProvider.b().a();
+                                        ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
+                                        ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
+                                    }
+                                    case 5 -> new WebView(requireContext()).clearCache(true);
+                                }
+                                Toast.makeText(getContext(), requireContext().getString(com.vtosters.lite.R.string.cache_cleaned), Toast.LENGTH_SHORT).show();
+                                updateCacheSize();
+                            })
+                            .show();
+                    return false;
+                }
+        );
+
+        PreferenceFragmentUtils.addPreference(
+                getPreferenceScreen(),
+                "autoclearcache_btn",
+                AndroidUtils.getString("autoclearcache"),
+                "",
+                null,
+                preference -> {
+                    cacheAutoCleanDialog();
+                    return false;
+                }
+        );
+
+        var pref = Preferences.getPreferences().getString("autoclearcache", "Default");
+        switch (pref) {
+            case "Default" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_disabled));
+            case "100mb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_100mb));
+            case "500mb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_500mb));
+            case "1gb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_1gb));
+            case "2gb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_2gb));
+            case "5gb" -> findPreference("autoclearcache_btn").setSummary(requireContext().getString(com.vtosters.lite.R.string.cache_5gb));
+        }
+
         PreferenceFragmentUtils.addPreferenceCategory(getPreferenceScreen(), AndroidUtils.getString("accounts"));
 
         PreferenceFragmentUtils.addPreference(
@@ -177,4 +295,59 @@ public class DataSettingsFragment extends TrackedMaterialPreferenceToolbarFragme
 
         findPreference("analyticsDisabled").setVisible(Preferences.isValidSignature());
     }
+
+    private void updateCacheSize() {
+        findPreference("currcache").setSummary(getString(com.vtosters.lite.R.string.cache_size_summ) + ": " + CacheUtils.humanReadableByteCountBin(IOUtils.getDirSize(AndroidUtils.getGlobalContext().getCacheDir())));
+    }
+
+    @SuppressLint({"CommitPrefEdits", "SetTextI18n"})
+    private void cacheAutoCleanDialog() {
+        String[] cacheText = {null, "100 MB", "500 MB", "1 GB", "2 GB", "5 GB"};
+
+        var val = Preferences.getPreferences().getInt("autoclearcache_size", 0);
+        RadioGroup rg = new RadioGroup(getContext());
+
+        rg.setPadding(AndroidUtils.dp2px(18f), AndroidUtils.dp2px(12f), AndroidUtils.dp2px(18f), 0);
+
+        for (int item = 0; item <= 5; item++) {
+            RadioButton rb = new RadioButton(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
+            SwitchHook.setCompoundButton(rb);
+            rg.addView(rb);
+            rb.setId(item);
+            rb.setTextSize(TypedValue.COMPLEX_UNIT_PX, AndroidUtils.dp2px(14f));
+
+            var text = cacheText[item];
+            rb.setText(text != null ? text : AndroidUtils.getString("autoclearcachedisabled"));
+
+            rb.setTextColor(ThemesUtils.getTextAttr());
+            rb.setChecked(val == item);
+        }
+
+        new VkAlertDialog.Builder(getContext())
+                .setTitle(requireContext().getString(com.vtosters.lite.R.string.cache_clean_title))
+                .setMessage(requireContext().getString(com.vtosters.lite.R.string.cache_select_size))
+                .setCancelable(true)
+                .setNegativeButton(requireContext().getString(com.vtosters.lite.R.string.cancel), null)
+                .setView(rg)
+                .setPositiveButton(requireContext().getString(com.vtosters.lite.R.string.save), (dialog, which) -> {
+                    var sizes = new String[]{"Default", "100mb", "500mb", "1gb", "2gb", "5gb"};
+                    var id = rg.getCheckedRadioButtonId();
+                    Preferences.getPreferences().edit()
+                            .putInt("autoclearcache_size", id)
+                            .putString("autoclearcache", sizes[id])
+                            .apply();
+                })
+                .show();
+    }
+
+    @Override
+    public int T4() {
+        return com.vtosters.lite.R.string.data;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        updateCacheSize();
+    }
 }

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

@@ -17,7 +17,6 @@ import com.vtosters.lite.R;
 import okhttp3.Headers;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
-import org.json.JSONException;
 import org.json.JSONObject;
 import ru.vtosters.hooks.other.Preferences;
 import ru.vtosters.hooks.other.ThemesUtils;
@@ -33,7 +32,6 @@ import ru.vtosters.lite.utils.AndroidUtils;
 import ru.vtosters.lite.utils.LifecycleUtils;
 import ru.vtosters.lite.utils.SearchEngine;
 
-import java.io.IOException;
 import java.util.Arrays;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
@@ -261,7 +259,7 @@ public class MediaFragment extends TrackedMaterialPreferenceToolbarFragment {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-        });;
+        });
     }
 
     private void deleteVideoHistoryDialog(Context context) {

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

@@ -111,11 +111,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("clearcache").setOnPreferenceClickListener(preference -> {
-            cacheCleanDialog();
-            return true;
-        });
-
         findPreference("copyownlink").setOnPreferenceClickListener(preference -> {
             copyText("https://vk.com/id" + AccountManagerUtils.getUserId());
             ToastUtils.a(requireContext().getString(R.string.link_copied));
@@ -127,11 +122,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        findPreference("autoclearcache").setOnPreferenceClickListener(preference -> {
-            cacheAutoCleanDialog();
-            return true;
-        });
-
         findPreference("datasettings").setOnPreferenceClickListener(preference -> {
             NavigatorUtils.switchFragment(requireContext(), DataSettingsFragment.class);
             return true;
@@ -146,19 +136,6 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
             return true;
         });
 
-        var pref = Preferences.getPreferences().getString("autoclearcache", "Default");
-        switch (pref) {
-            case "Default" ->
-                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_disabled));
-            case "100mb" ->
-                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_100mb));
-            case "500mb" ->
-                    findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_500mb));
-            case "1gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_1gb));
-            case "2gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_2gb));
-            case "5gb" -> findPreference("autoclearcache").setSummary(requireContext().getString(R.string.cache_5gb));
-        }
-
         var vkAdminTokenPref = findPreference("vk_admin_token");
         vkAdminTokenPref.setVisible(Preferences.getPreferences().getBoolean("new_music_downloading_way", false));
         if (vkAdminTokenPref.isVisible()) {
@@ -170,93 +147,7 @@ public class OtherFragment extends TrackedMaterialPreferenceToolbarFragment {
         }
     }
 
-    @SuppressLint({"CommitPrefEdits", "SetTextI18n"})
-    private void cacheAutoCleanDialog() {
-        String[] cacheText = {null, "100 MB", "500 MB", "1 GB", "2 GB", "5 GB"};
 
-        var val = Preferences.getPreferences().getInt("autoclearcache_size", 0);
-        RadioGroup rg = new RadioGroup(getContext());
-
-        rg.setPadding(AndroidUtils.dp2px(18f), AndroidUtils.dp2px(12f), AndroidUtils.dp2px(18f), 0);
-
-        for (int item = 0; item <= 5; item++) {
-            RadioButton rb = new RadioButton(new ContextThemeWrapper(getContext(), com.vtosters.lite.R.style.Widget_AppCompat_CompoundButton_RadioButton));
-            SwitchHook.setCompoundButton(rb);
-            rg.addView(rb);
-            rb.setId(item);
-            rb.setTextSize(TypedValue.COMPLEX_UNIT_PX, AndroidUtils.dp2px(14f));
-
-            var text = cacheText[item];
-            rb.setText(text != null ? text : AndroidUtils.getString("autoclearcachedisabled"));
-
-            rb.setTextColor(ThemesUtils.getTextAttr());
-            rb.setChecked(val == item);
-        }
-
-        new VkAlertDialog.Builder(getContext())
-                .setTitle(requireContext().getString(R.string.cache_clean_title))
-                .setMessage(requireContext().getString(R.string.cache_select_size))
-                .setCancelable(true)
-                .setNegativeButton(requireContext().getString(R.string.cancel), null)
-                .setView(rg)
-                .setPositiveButton(requireContext().getString(R.string.save), (dialog, which) -> {
-                    var sizes = new String[]{"Default", "100mb", "500mb", "1gb", "2gb", "5gb"};
-                    var id = rg.getCheckedRadioButtonId();
-                    Preferences.getPreferences().edit()
-                            .putInt("autoclearcache_size", id)
-                            .putString("autoclearcache", sizes[id])
-                            .apply();
-                })
-                .show();
-    }
-
-    private void cacheCleanDialog() {
-        new VkAlertDialog.Builder(getContext())
-                .setTitle(requireContext().getString(R.string.select_which_clean))
-                .setItems(AndroidUtils.getArray(R.array.cache_cleaner), (dialog, which) -> {
-                    switch (which) {
-                        case 0 -> {
-                            SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
-                            prefs2.edit().clear().commit();
-                            clearWebViewCache();
-                            VKImageLoader.e();
-                            ImEngineProvider.b().a();
-                            ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
-                            ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
-                            FileUtils.l();
-                            Stickers.l.c();
-                            ImEngineExt.a(ImEngine1.a());
-                            AutoPlayCacheHolder.d.a();
-                            MediaStorage.a();
-                        }
-                        case 1 -> {
-                            SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
-                            prefs2.edit().clear().commit();
-                            Stickers.l.c();
-                        }
-                        case 2 -> {
-                            VKImageLoader.e();
-                            ImEngineExt.a(ImEngine1.a());
-                        }
-                        case 3 -> {
-                            AutoPlayCacheHolder.d.a();
-                            MediaStorage.a();
-                        }
-                        case 4 -> {
-                            ImEngineProvider.b().a();
-                            ImAudioMsgPlayerProvider.b().e(PlayerActionSources.a);
-                            ImAudioMsgPlayerProvider.b().d(PlayerActionSources.a);
-                        }
-                        case 5 -> clearWebViewCache();
-                    }
-                    Toast.makeText(getContext(), requireContext().getString(R.string.cache_cleaned), Toast.LENGTH_SHORT).show();
-                })
-                .show();
-    }
-
-    private void clearWebViewCache() {
-        new WebView(requireContext()).clearCache(true);
-    }
 
     private void copyText(String src) {
         var manager = (ClipboardManager) requireContext().getSystemService(Context.CLIPBOARD_SERVICE);

app/src/main/java/ru/vtosters/lite/ui/vkui/MenuBuilder.java

@@ -46,15 +46,17 @@ public class MenuBuilder {
             cfambObject = CommunityFragmentActionsMenuBuilder.class.getDeclaredField("b");
             cfambObject.setAccessible(true);
         } catch (NoSuchFieldException | NoSuchMethodException e) {
-            Log.e("VTLite", "Reflection failed");
+            Log.e("MenuBuilder", "Reflection failed");
             e.printStackTrace();
         }
     }
 
     public static void injectAP(final ProfileFragmentActionsMenuBuilder mb, final ActionsPopup.b builder) {
         try {
-            final ExtendedUserProfile eup = (ExtendedUserProfile) pfambObject.get(mb);
-            final Context ctx = ((View) Objects.requireNonNull(apView.get(builder))).getContext();
+            ExtendedUserProfile eup = (ExtendedUserProfile) pfambObject.get(mb);
+            Context ctx = ((View) Objects.requireNonNull(apView.get(builder))).getContext();
+            boolean isPageWhitelistedFilter = isWhitelistedFilter(eup);
+            boolean isPageWhitelistedAdsStories = isWhitelistedAdStories(eup);
             addItem(builder, AndroidUtils.getString(R.string.menu_copy_id), () -> {
                 copy(ctx, String.valueOf(AccountManagerUtils.getUserID(eup)));
                 return Unit.a;
@@ -70,6 +72,17 @@ public class MenuBuilder {
 //                return Unit.a;
 //            });
 
+            addItem(builder, AndroidUtils.getString(isPageWhitelistedFilter ? R.string.remove_from_filter_whitelist : R.string.add_to_filter_whitelist), () -> {
+                setWhitelistedFilter(eup, !isPageWhitelistedFilter);
+                AndroidUtils.sendToast(AndroidUtils.getString(isPageWhitelistedFilter ? R.string.removed_from_whitelist_success : R.string.added_to_whitelist_success));
+                return Unit.a;
+            });
+
+            addItem(builder, AndroidUtils.getString(isPageWhitelistedAdsStories ? R.string.remove_from_ads_stories_whitelist : R.string.add_to_ads_stories_whitelist), () -> {
+                setWhitelistedAdStories(eup, !isPageWhitelistedAdsStories);
+                AndroidUtils.sendToast(AndroidUtils.getString(isPageWhitelistedAdsStories ? R.string.removed_from_whitelist_success : R.string.added_to_whitelist_success));
+                return Unit.a;
+            });
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
@@ -77,11 +90,11 @@ public class MenuBuilder {
 
     public static void injectAP(final CommunityFragmentActionsMenuBuilder mb, final ActionsPopup.b builder) {
         try {
-            final ExtendedCommunityProfile ecp = (ExtendedCommunityProfile) cfambObject.get(mb);
-            final Context ctx = ((View) apView.get(builder)).getContext();
-            final boolean isPageWhitelistedFilter = isWhitelistedFilter(ecp);
-            final boolean isPageWhitelistedAds = isWhitelistedAd(ecp);
-            final boolean isPageWhitelistedAdsStories = isWhitelistedAdStories(ecp);
+            ExtendedCommunityProfile ecp = (ExtendedCommunityProfile) cfambObject.get(mb);
+            Context ctx = ((View) apView.get(builder)).getContext();
+            boolean isPageWhitelistedFilter = isWhitelistedFilter(ecp);
+            boolean isPageWhitelistedAds = isWhitelistedAd(ecp);
+            boolean isPageWhitelistedAdsStories = isWhitelistedAdStories(ecp);
 
             addItem(builder, AndroidUtils.getString(R.string.menu_copy_id), () -> {
                 copy(ctx, String.valueOf(AccountManagerUtils.getUserID(ecp)));
@@ -110,7 +123,6 @@ public class MenuBuilder {
                 AndroidUtils.sendToast(AndroidUtils.getString(isPageWhitelistedAdsStories ? R.string.removed_from_whitelist_success : R.string.added_to_whitelist_success));
                 return Unit.a;
             });
-
         } catch (IllegalAccessException | InvocationTargetException e) {
             e.printStackTrace();
         }
@@ -148,6 +160,19 @@ public class MenuBuilder {
         ).contains(String.valueOf(AccountManagerUtils.getUserID(eup)));
     }
 
+    public static boolean isWhitelistedFilter(ExtendedUserProfile eup) {
+        return Preferences.getPreferences().getStringSet(
+                "whitelisted_filters_groups", Collections.emptySet()
+        ).contains(String.valueOf(AccountManagerUtils.getUserID(eup)));
+    }
+
+    public static boolean isWhitelistedAdStories(ExtendedUserProfile eup) {
+        return Preferences.getPreferences().getStringSet(
+                "whitelisted_stories_ad",
+                Collections.emptySet()
+        ).contains(String.valueOf(AccountManagerUtils.getUserID(eup)));
+    }
+
     public static void setWhitelistedFilter(ExtendedCommunityProfile eup, boolean needWhitelist) {
         var id = String.valueOf(AccountManagerUtils.getUserID(eup));
 
@@ -195,4 +220,36 @@ public class MenuBuilder {
 
         Preferences.getPreferences().edit().putStringSet("whitelisted_stories_ad", mutableAdsSet).apply();
     }
+
+    public static void setWhitelistedFilter(ExtendedUserProfile eup, boolean needWhitelist) {
+        var id = String.valueOf(AccountManagerUtils.getUserID(eup));
+
+        var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet(
+                "whitelisted_filters_groups",
+                Collections.emptySet())
+        );
+        if (needWhitelist) {
+            mutableAdsSet.add(id);
+        } else {
+            mutableAdsSet.remove(id);
+        }
+
+        Preferences.getPreferences().edit().putStringSet("whitelisted_filters_groups", mutableAdsSet).apply();
+    }
+
+    public static void setWhitelistedAdStories(ExtendedUserProfile eup, boolean needWhitelist) {
+        var id = String.valueOf(AccountManagerUtils.getUserID(eup));
+
+        var mutableAdsSet = new LinkedHashSet<>(Preferences.getPreferences().getStringSet(
+                "whitelisted_stories_ad",
+                Collections.emptySet()));
+
+        if (needWhitelist) {
+            mutableAdsSet.add(id);
+        } else {
+            mutableAdsSet.remove(id);
+        }
+
+        Preferences.getPreferences().edit().putStringSet("whitelisted_stories_ad", mutableAdsSet).apply();
+    }
 }

app/src/main/java/ru/vtosters/lite/utils/NewsFeedFiltersUtils.java

@@ -14,57 +14,46 @@ import static ru.vtosters.hooks.other.Preferences.*;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 
 public class NewsFeedFiltersUtils {
-    public static List<String> mFilters;
-    public static List<String> mFiltersNames;
-    public static List<String> mFiltersLinks;
+    public static List<String> mFilters = new ArrayList<>();
+    public static List<String> mFiltersNames = new ArrayList<>();
+    public static List<String> mFiltersLinks = new ArrayList<>();
 
     public static void setupFilters() {
-        mFilters = new ArrayList<>();
-        mFiltersNames = new ArrayList<>();
-        mFiltersLinks = new ArrayList<>();
-
         getFilter("refsfilter", "Referals.txt", mFilters);
         getFilter("shortlinkfilter", "LinkShorter.txt", mFilters);
         getFilter("default_ad_list", "StandartFilter.txt", mFilters);
         getFilter("shitposting", "IDontWantToReadIt.txt", mFilters);
         getFilter("cringecopyright", "CopyrightAds.txt", mFiltersLinks);
 
-        var customFilters = getString("spamfilters");
-        if (!customFilters.isEmpty()) {
-            mFilters.addAll(Arrays.asList(customFilters.toLowerCase().split(", ")));
-        }
-
-        var sourceNameFilter = getString("sourcenamefilter");
-        if (!sourceNameFilter.isEmpty()) {
-            mFiltersNames.addAll(Arrays.asList(sourceNameFilter.toLowerCase().split(", ")));
-        }
-
-        var linkFilter = getString("linkfilter");
-        if (!linkFilter.isEmpty()) {
-            mFiltersLinks.addAll(Arrays.asList(linkFilter.toLowerCase().split(", ")));
-        }
+        setCustomFilters(mFilters, getString("spamfilters"));
+        setCustomFilters(mFiltersNames, getString("sourcenamefilter"));
+        setCustomFilters(mFiltersLinks, getString("linkfilter"));
     }
 
+    // Get needed filter list from assets
     public static void getFilter(String boolname, String filename, List<String> list) {
-        var ctx = getGlobalContext();
-
         if (getBoolValue(boolname, false)) {
-            try {
-                Scanner scanner;
-                scanner = new Scanner(ctx.getAssets().open(filename));
-
+            try (Scanner scanner = new Scanner(getGlobalContext().getAssets().open(filename))) {
                 while (scanner.hasNextLine()) {
-                    var line = scanner.nextLine();
-                    if (!line.isEmpty())
-                        list.add(line.toLowerCase());
+                    addNonEmptyLineToList(scanner.nextLine(), list);
                 }
             } catch (IOException e) {
                 Log.d("NewsFeedFiltersUtils", e.getMessage());
             }
         }
-    } // Get needed filter list from assets
+    }
 
-    public static boolean injectFiltersReposts(JSONObject obj) throws JSONException {
+    private static void addNonEmptyLineToList(String line, List<String> list) {
+        if (!line.isEmpty()) {
+            list.add(line.toLowerCase());
+        }
+    }
+
+    public static void setCustomFilters(List<String> list, String filters) {
+        if (!filters.isEmpty()) list.addAll(Arrays.asList(filters.toLowerCase().split(", ")));
+    }
+
+    public static boolean injectFiltersReposts(JSONObject obj) {
         if (obj.has("copy_history")) {
             var copyHistoryNode = obj.optJSONArray("copy_history");
             if (copyHistoryNode != null && copyHistoryNode.length() != 0) {
@@ -94,6 +83,7 @@ public class NewsFeedFiltersUtils {
                 }
             }
         }
+
         return false;
     }
 
@@ -101,17 +91,12 @@ public class NewsFeedFiltersUtils {
         if (json.has("copyright")) {
             if (copyright_post()) return true;
 
-            var copyright = json.optJSONObject("copyright");
-
+            JSONObject copyright = json.optJSONObject("copyright");
             String copyrightName = null;
-
-            if (copyright != null) {
-                copyrightName = copyright.getString("name").toLowerCase();
-            }
-
             String copyrightLink = null;
 
             if (copyright != null) {
+                copyrightName = copyright.getString("name").toLowerCase();
                 copyrightLink = copyright.getString("link").toLowerCase();
             }
 
@@ -126,8 +111,8 @@ public class NewsFeedFiltersUtils {
                     if (copyrightLink != null && copyrightLink.contains(filter)) return true;
                 }
             }
-
         }
+
         return false;
     }
 
@@ -144,7 +129,6 @@ public class NewsFeedFiltersUtils {
             }
         }
 
-
         return false;
     }
 
@@ -154,9 +138,8 @@ public class NewsFeedFiltersUtils {
             var caption = postJson.optJSONObject("caption");
             if (postsrecomm()) {
                 try {
-                    String type;
                     if (caption != null) {
-                        type = caption.getString("type");
+                        String type = caption.getString("type");
                         return type.equals("explorebait") || // Может быть интересно
                                 type.equals("shared") || // Поделился записью
                                 type.equals("digest") || // Рекомедации
@@ -187,7 +170,7 @@ public class NewsFeedFiltersUtils {
             var title = item.optString("title");
 
             if (TextUtils.isEmpty(id) || TextUtils.isEmpty(title)
-                    // this items not working
+                    // these items not working
                     || id.equals("kpop") || id.equals("foryou")
                     || id.equals("qazaqstan") || id.equals("podcasts"))
                 continue;
@@ -201,8 +184,8 @@ public class NewsFeedFiltersUtils {
                     .put("is_unavailable", hide);
             Log.d("NewsfeedListInj", "Unlocked " + id + " in newsfeed list");
         }
-        Preferences.getPreferences().edit().putStringSet("news_feed_items_set", mutableFiltersSet)
-                .apply();
+
+        Preferences.getPreferences().edit().putStringSet("news_feed_items_set", mutableFiltersSet).apply();
 
         return items;
     }
@@ -284,45 +267,6 @@ public class NewsFeedFiltersUtils {
         return true;
     }
 
-    public static JSONObject discoverObj() throws JSONException {
-        var mainjson = new JSONObject();
-
-        var info = new JSONObject();
-        info.put("title", "Test Injection");
-        info.put("text_color", "#ffffff");
-        info.put("description", "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat");
-
-        var image = new JSONArray();
-        var imageQuality1 = new JSONObject();
-        imageQuality1.put("url", "https://w7.pngwing.com/pngs/505/1021/png-transparent-konata-izumi-lucky-star-desktop-anime-anime-blue-mammal-face.png");
-        imageQuality1.put("width", 72); // 72, 108, 144, 216, 288
-        imageQuality1.put("height", 72); // 72, 108, 144, 216, 288
-        image.put(imageQuality1);
-
-        var background = new JSONArray();
-        var backgroundQuality1 = new JSONObject();
-        backgroundQuality1.put("url", "https://2ch.life/vg/arch/2022-08-22/src/38524739/16440606579870.jpg");
-        backgroundQuality1.put("width", 344); // 344, 516, 680, 1032, 1376
-        backgroundQuality1.put("height", 215); // 215, 323, 426, 645, 860
-        background.put(backgroundQuality1);
-
-        info.put("image", image);
-        info.put("background", background);
-
-        mainjson.put("info", info);
-        mainjson.put("track_code", "info_banner_donut_catalog");
-        mainjson.put("template", "info");
-
-        var action = new JSONObject();
-        action.put("type", "open_url");
-        action.put("url", "vk.com/vtosters_official");
-        action.put("target", "internal");
-
-        mainjson.put("action", action);
-
-        return mainjson;
-    }
-
     public static void parseStoriesItem(JSONObject item) throws JSONException {
         var stories = item.optJSONArray("stories");
         var newStories = new JSONArray();
@@ -382,7 +326,7 @@ public class NewsFeedFiltersUtils {
             id = String.valueOf(list.optInt("source_id"));
         }
 
-        if (id.equals("-189659924")) {
+        if (id.equals("-189659924") || id.equals(String.valueOf(AccountManagerUtils.getUserId()))) {
             return true;
         }
 
@@ -391,7 +335,7 @@ public class NewsFeedFiltersUtils {
                 Collections.emptySet()
         );
 
-        return whitelist.contains(id);
+        return Preferences.getBoolValue("invertFilters", false) != whitelist.contains(id);
     }
 
     public static Boolean isWhitelistedAd(JSONObject list) {
@@ -425,7 +369,7 @@ public class NewsFeedFiltersUtils {
 
         if (attachments != null && getBoolValue("blockminiapps", false)) {
             for (int j = 0; j < attachments.length(); j++) {
-                var type = attachments.optJSONObject(j).optString("type");
+                String type = attachments.optJSONObject(j).optString("type");
                 if (type.contains("mini_app")) return true;
             }
         }
@@ -439,7 +383,7 @@ public class NewsFeedFiltersUtils {
 
         for (int i = 0; i < (items != null ? items.length() : 0); i++) {
             try {
-                var curr = items.getJSONObject(i);
+                JSONObject curr = items.getJSONObject(i);
                 if (!curr.optString("template").contains("info") && discoverAdBlock(curr)) {
                     newObj.put(items.optJSONObject(i));
                 }
@@ -460,11 +404,11 @@ public class NewsFeedFiltersUtils {
             var newItems = new JSONArray();
 
             for (int j = 0; j < items.length(); j++) {
-                var list = items.optJSONObject(j);
+                JSONObject list = items.optJSONObject(j);
 
                 if (list == null) continue;
 
-                var type = list.optString("type");
+                String type = list.optString("type");
 
                 if (isAds(list, type)) {
                     continue;
@@ -549,7 +493,7 @@ public class NewsFeedFiltersUtils {
         }
 
         if (json.has("ads")) {
-            var ad = json.optJSONObject("ads");
+            JSONObject ad = json.optJSONObject("ads");
             if (isDeleteFix) {
                 if (ad != null) {
                     ad.optJSONObject("settings")
@@ -567,10 +511,10 @@ public class NewsFeedFiltersUtils {
             }
         }
 
-        var items = json.optJSONArray("items");
+        JSONArray items = json.optJSONArray("items");
         if (items != null) {
             for (int i = 0; i < items.length(); i++) {
-                var item = items.optJSONObject(i);
+                JSONObject item = items.optJSONObject(i);
                 if (item != null) {
                     parseStoriesItem(item);
                 }

build.gradle

@@ -8,7 +8,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.2'
         classpath 'org.mozilla.rust-android-gradle:plugin:0.9.3'
 
         // NOTE: Do not place your application dependencies here; they belong

gradle.properties

@@ -14,3 +14,6 @@
 android.useAndroidX=true
 android.enableJetifier=true
 android.jetifier.ignorelist=classes-dex2jar.jar, classes2-dex2jar.jar, classes3-dex2jar.jar, classes4-dex2jar.jar, classes5-dex2jar.jar, classes6-dex2jar.jar, classes7-dex2jar.jar
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Tue Aug 16 21:49:57 MSK 2022
 distributionBase=GRADLE_USER_HOME
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
 distributionPath=wrapper/dists
 zipStorePath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME

smali/res/values-be/strings.xml

@@ -6823,8 +6823,8 @@
     <string name="remove_from_ads_whitelist">Выдаліць з вайтліста рэкламы</string>
     <string name="add_to_ads_stories_whitelist">Дадаць у вайтліст гісторый</string>
     <string name="remove_from_ads_stories_whitelist">Выдаліць з вайтліста гісторый</string>
-    <string name="removed_from_whitelist_success">Група выдалена з вайтліста</string>
-    <string name="added_to_whitelist_success">Група дададзена ў вайтліст</string>
+    <string name="removed_from_whitelist_success">Выдаленая з вайтлиста</string>
+    <string name="added_to_whitelist_success">Дададзена ў вайтліст</string>
     <string name="whitelisted_ad_groups_title">Вайтліст рэкламы</string>
 
     <string name="whitelisted_ad_groups_stories_title">Вайтліст рэкламы гісторый</string>
@@ -6942,6 +6942,8 @@
     <string name="promotedstickers_title">Не атрымліваць промостикеры</string>
     <string name="useOldAppVer_title">Выкарыстоўваць стары дызайн</string>
     <string name="useOldAppVer_summ">Працуе \"як ёсць\". Могуць быць памылкі</string>
+    <string name="invertFilters">Інвертаваць выключэння</string>
+    <string name="invertFilters_summ">Дададзеныя ў выключэння групы будуць фільтраваць</string>
     <string name="downloading_update">Спампоўка абнаўлення</string>
     <string name="sources">Крыніцы</string>
     <string name="businessDisabler_title">Адключыць бізнес-паведамлення</string>
@@ -7025,4 +7027,8 @@
 
     <string name="compression_types">Спосаб кампрэсіі фота</string>
     <string name="compression_types_selection">Выберыце спосаб кампрэсіі</string>
+
+    <string name="clear_all_cache">Ачысціць ўвесь кэш?</string>
+    <string name="cache_size">Памер прыкладання</string>
+    <string name="cache_size_summ">Вага кэша прыкладання</string>
 </resources>

smali/res/values-ru/strings.xml

@@ -6191,8 +6191,8 @@
     <string name="remove_from_ads_whitelist">Удалить из вайтлиста рекламы</string>
     <string name="add_to_ads_stories_whitelist">Добавить в вайтлист историй</string>
     <string name="remove_from_ads_stories_whitelist">Удалить из вайтлиста историй</string>
-    <string name="removed_from_whitelist_success">Группа удалена из вайтлиста</string>
-    <string name="added_to_whitelist_success">Группа добавлена в вайтлист</string>
+    <string name="removed_from_whitelist_success">Удалено из вайтлиста</string>
+    <string name="added_to_whitelist_success">Добавлено в вайтлист</string>
 
     <string name="whitelisted_ad_groups_title">Вайтлист рекламы</string>
     <string name="whitelisted_filters_groups_title">Вайтлист фильтров и источников</string>
@@ -6330,6 +6330,8 @@
     <string name="promotedstickers_title">Не получать промостикеры</string>
     <string name="useOldAppVer_title">Использовать старый дизайн</string>
     <string name="useOldAppVer_summ">Работает \"как есть\". Могут быть ошибки</string>
+    <string name="invertFilters">Инвертировать исключения</string>
+    <string name="invertFilters_summ">Добавленные в исключения группы будут фильтроваться</string>
 
     <string name="downloading_update">Скачивание обновления</string>
     <string name="sources">Источники</string>
@@ -6407,4 +6409,8 @@
 
     <string name="compression_types">Способ компрессии фото</string>
     <string name="compression_types_selection">Выберите способ компрессии</string>
+
+    <string name="clear_all_cache">Очистить весь кеш?</string>
+    <string name="cache_size">Размер приложения</string>
+    <string name="cache_size_summ">Вес кеша приложения</string>
 </resources>

smali/res/values-uk/strings.xml

@@ -6116,8 +6116,8 @@
     <string name="remove_from_ads_whitelist">Видалити з вайтліста реклами</string>
     <string name="add_to_ads_stories_whitelist">Додати до вайтліста історій</string>
     <string name="remove_from_ads_stories_whitelist">Видалити з вайтліста історій</string>
-    <string name="removed_from_whitelist_success">Група видалена з вайтліста</string>
-    <string name="added_to_whitelist_success">Група додана до вайтліста</string>
+    <string name="removed_from_whitelist_success">Видалена з вайтліста</string>
+    <string name="added_to_whitelist_success">Додана до вайтліста</string>
 
     <string name="whitelisted_ad_groups_title">Вайтліст реклами</string>
     <string name="whitelisted_filters_groups_title">Вайтліст фільтрів та джерел</string>
@@ -6255,6 +6255,8 @@
     <string name="promotedstickers_title">Не отримувати промостикери</string>
     <string name="useOldAppVer_title">Використовувати старий дизайн</string>
     <string name="useOldAppVer_summ">Працює \"як є\". Можливі помилки</string>
+    <string name="invertFilters">Інвертувати винятки</string>
+    <string name="invertFilters_summ">Додані в виключення групи будуть фільтруватися</string>
 
     <string name="downloading_update">Завантаження оновлення</string>
     <string name="sources">Джерела</string>
@@ -6332,4 +6334,8 @@
 
     <string name="compression_types">Спосіб компресії фото</string>
     <string name="compression_types_selection">Виберіть спосіб компресії</string>
+
+    <string name="clear_all_cache">Очистити весь кеш?</string>
+    <string name="cache_size">Розмір програми</string>
+    <string name="cache_size_summ">Вага кеша додатки</string>
 </resources>

smali/res/values/strings.xml

@@ -6329,8 +6329,8 @@ May look like a fake leaving the online"</string>
     <string name="remove_from_ads_stories_whitelist">Remove from stories whitelist</string>
     <string name="add_to_ads_whitelist">Add to ads stories whitelist</string>
     <string name="remove_from_ads_whitelist">Remove from ads stories whitelist</string>
-    <string name="removed_from_whitelist_success">Group removed from whitelist</string>
-    <string name="added_to_whitelist_success">Group added to whitelist</string>
+    <string name="removed_from_whitelist_success">Removed from whitelist</string>
+    <string name="added_to_whitelist_success">Added to whitelist</string>
 
     <string name="whitelisted_ad_groups_title">Ads whitelist</string>
     <string name="whitelisted_filters_groups_title">Filters whitelist and copyrights</string>
@@ -6468,6 +6468,8 @@ May look like a fake leaving the online"</string>
     <string name="promotedstickers_title">Don\'t receive promoted stickers</string>
     <string name="useOldAppVer_title">Use old music catalog</string>
     <string name="useOldAppVer_summ">Works \"as is\". There may be errors</string>
+    <string name="invertFilters">Invert exceptions</string>
+    <string name="invertFilters_summ">Groups added to exceptions will be filtered</string>
 
     <string name="downloading_update">Downloading update</string>
     <string name="sources">Sources</string>
@@ -6545,4 +6547,8 @@ May look like a fake leaving the online"</string>
 
     <string name="compression_types">Photo compression method</string>
     <string name="compression_types_selection">Choose the compression method</string>
+
+    <string name="clear_all_cache">Clear all cache?</string>
+    <string name="cache_size">App size</string>
+    <string name="cache_size_summ">Cache size</string>
 </resources>

smali/res/xml/preferences_feed.xml

@@ -89,6 +89,11 @@
         <Preference
                 android:key="whitelisted_filters_groups"
                 android:title="@string/whitelisted_filters_groups_title"/>
+        <com.vtosters.lite.ui.MaterialSwitchPreference
+                android:defaultValue="false"
+                android:key="invertFilters"
+                android:summary="@string/invertFilters_summ"
+                android:title="@string/invertFilters"/>
         <com.vtosters.lite.ui.MaterialSwitchPreference
                 android:defaultValue="false"
                 android:key="blockminiapps"

smali/res/xml/preferences_other.xml

@@ -4,12 +4,6 @@
         <Preference
                 android:key="datasettings"
                 android:title="@string/datasettings_title"/>
-        <Preference
-                android:key="clearcache"
-                android:title="@string/clearcache_other_title"/>
-        <Preference
-                android:key="autoclearcache"
-                android:title="@string/autoclearcache"/>
     </PreferenceCategory>
     <PreferenceCategory android:title="@string/other_fix_app">
         <Preference