Merge branch 'main' of https://github.com/vtosters/lite

app/src/main/java/ru/vtosters/lite/hooks/NewsfeedHook.java

@@ -5,7 +5,6 @@ import static ru.vtosters.lite.utils.AndroidUtils.getDefaultPrefs;
 import static ru.vtosters.lite.utils.AndroidUtils.getGlobalContext;
 import static ru.vtosters.lite.utils.AndroidUtils.getPrefsValue;
 import static ru.vtosters.lite.utils.Preferences.ads;
-import static ru.vtosters.lite.utils.Preferences.adsslider;
 import static ru.vtosters.lite.utils.Preferences.authorsrecomm;
 import static ru.vtosters.lite.utils.Preferences.friendsrecomm;
 import static ru.vtosters.lite.utils.Preferences.getBoolValue;
@@ -115,14 +114,16 @@ public class NewsfeedHook {
     }
 
     public static void adsParams(HashSet<String> hashSet) {
-        if (ads())
+        if (ads()) {
             hashSet.add("ads_disabled");
+        } else {
+            hashSet.add("ads_app_slider");
+            hashSet.add("ads_site_slider");
+        }
+
         hashSet.add("ads_app");
         hashSet.add("ads_site");
         hashSet.add("ads_post");
-        if (!adsslider())
-            hashSet.add("ads_app_slider");
-        hashSet.add("ads_site_slider");
         hashSet.add("ads_app_video");
         hashSet.add("ads_post_pretty_cards");
         hashSet.add("ads_post_snippet_video");

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

@@ -41,7 +41,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         findPreference("vkme_notifs").setOnPreferenceClickListener(new MessagesFragment.restart());
         findPreference("systememoji").setOnPreferenceClickListener(new MessagesFragment.restart());
         findPreference("wallpapers").setOnPreferenceClickListener(new MessagesFragment.openwp());
-        findPreference("promotedstickers").setOnPreferenceChangeListener(new clearStickersCache());
 
         findPreference("autotranslate").setEnabled(!autoalltranslate());
 
@@ -79,7 +78,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
     public boolean onPreferenceTreeClick(Preference preference) {
         findPreference("autotranslate").setEnabled(!autoalltranslate());
         findPreference("vkme_notifs").setEnabled(vkme());
-        findPreference("promotedstickers").setOnPreferenceChangeListener(new clearStickersCache());
         return super.onPreferenceTreeClick(preference);
     }
 
@@ -107,16 +105,6 @@ public class MessagesFragment extends MaterialPreferenceToolbarFragment {
         }
     }
 
-    public class clearStickersCache implements Preference.OnPreferenceChangeListener {
-        @Override
-        public boolean onPreferenceChange(Preference preference, Object o) {
-            SharedPreferences prefs2 = getContext().getSharedPreferences("stickers_storage", Context.MODE_PRIVATE);
-            prefs2.edit().clear().commit();
-            Stickers.l.c();
-            return true;
-        }
-    }
-
     public class openwp implements Preference.OnPreferenceClickListener {
         @Override
         public boolean onPreferenceClick(Preference preference) {

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

@@ -42,7 +42,7 @@ public class DeletedMessagesHandler {
     }
 
     public static boolean hook() {
-        return getBoolValue("undeletemsg", true);
+        return getBoolValue("undeletemsg", false);
     }
 
     public static void setBodyDBParser(Msg msg) {

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

@@ -102,10 +102,6 @@ public class Preferences {
         return getBoolValue("vkme", false);
     }
 
-    public static boolean adsslider() {
-        return getBoolValue("__dbg_no_slider_ads", true);
-    }
-
     public static boolean autocache() {
         return getBoolValue("autocache", false);
     }
@@ -231,10 +227,6 @@ public class Preferences {
         return getBoolValue("offline", false);
     }
 
-    public static boolean oldabout() {
-        return getBoolValue("oldabout", false);
-    }
-
     public static boolean postsrecomm() {
         return getBoolValue("postsrecomm", false);
     }