From 1d687a01c111f967e6cedc772c2b93800ad51cbb Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Mon, 2 May 2022 10:44:57 +0300 Subject: [PATCH] Fixes + new update feed logic --- .../java/ru/vtosters/lite/utils/Newsfeed.java | 29 +++++++++++++++-- .../ru/vtosters/lite/utils/Preferences.java | 31 ++++++------------- .../java/ru/vtosters/lite/utils/Themes.java | 6 ++++ smali/res/values-ru/arrays.xml | 5 +++ smali/res/values/arrays.xml | 10 ++++++ smali/res/xml/preferences_feed.xml | 11 ++++--- .../api_parsers/AttachApiParser.smali | 2 +- .../lite/api/newsfeed/NewsfeedGet.smali | 9 ++---- .../com/vk/dto/stickers/StickerItem$b.smali | 2 +- 9 files changed, 68 insertions(+), 37 deletions(-) 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 51d6ff0a8..c6e8d9b70 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Newsfeed.java @@ -1,10 +1,19 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.ui.fragments.dockbar.DockBarManager.*; -import static ru.vtosters.lite.utils.Globals.*; -import static ru.vtosters.lite.utils.Preferences.*; +import static java.lang.Long.MAX_VALUE; +import static ru.vtosters.lite.ui.fragments.dockbar.DockBarManager.getInstance; +import static ru.vtosters.lite.utils.Globals.getContext; +import static ru.vtosters.lite.utils.Globals.getPreferences; +import static ru.vtosters.lite.utils.Preferences.BooleanTrue; +import static ru.vtosters.lite.utils.Preferences.adsgroup; +import static ru.vtosters.lite.utils.Preferences.adsstories; +import static ru.vtosters.lite.utils.Preferences.authorsrecomm; +import static ru.vtosters.lite.utils.Preferences.copyright_post; +import static ru.vtosters.lite.utils.Preferences.friendsrecomm; +import static ru.vtosters.lite.utils.Preferences.postsrecomm; import com.vk.apps.AppsFragment; +import com.vk.core.preference.Preference; import com.vk.fave.fragments.FaveTabFragment; import com.vk.menu.MenuFragment; import com.vk.music.fragment.MusicFragment; @@ -174,6 +183,20 @@ public class Newsfeed { return def; } + public static long getUpdateNewsfeed(boolean refresh_timeout) { + String string = getPreferences().getString("newsupdate", ""); + if (string.isEmpty()) { + return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L); + } + if (string.equals("no_update")) { + return MAX_VALUE; + } + if (string.equals("imd_update")) { + return 10000L; + } + return Preference.b().getLong(refresh_timeout ? "refresh_timeout_top" : "refresh_timeout_recent", 600000L); + } + public static Class getStartFragment() { String string = getPreferences().getString("start_values", ""); if (string.equals("default")) { 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 f0e49e8da..51f08817d 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Preferences.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Preferences.java @@ -1,6 +1,6 @@ package ru.vtosters.lite.utils; -import static ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager.*; +import static ru.vtosters.lite.ui.fragments.multiaccount.MultiAccountManager.migrate; import static ru.vtosters.lite.utils.Globals.*; import static ru.vtosters.lite.utils.Newsfeed.*; import static ru.vtosters.lite.utils.Proxy.*; @@ -17,7 +17,15 @@ import com.vtosters.lite.data.Users; import java.util.Locale; public class Preferences { - public static String VERSIONNAME = "2.0 Beta"; + public static String VERSIONNAME = "Beta"; + + public static void init(Application application) { + setupFilters(); + fixGapps(); + setProxy(); + migrate(); + registerActivities(application); + } public static boolean BooleanFalse(String key) { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getContext()); @@ -29,13 +37,6 @@ public class Preferences { return prefs.getBoolean(key, true); } - public static String getBackgroundStickers() { - if (isBGStickersEnabled()) { - return "images_with_background"; - } - return "images"; - } - public static boolean authorsrecomm() { return BooleanTrue("authorsrecomm"); } @@ -144,10 +145,6 @@ public class Preferences { return BooleanTrue("dockcounter"); } - public static boolean feedautoupdate() { - return BooleanTrue("feedautoupdate"); - } - public static boolean feedcache() { return BooleanTrue("feedcache"); } @@ -319,12 +316,4 @@ public class Preferences { } return string.isEmpty() ? Locale.getDefault().getLanguage() : string; } - - public static void init(Application application) { - setupFilters(); - fixGapps(); - setProxy(); - migrate(); - registerActivities(application); - } } diff --git a/app/src/main/java/ru/vtosters/lite/utils/Themes.java b/app/src/main/java/ru/vtosters/lite/utils/Themes.java index 0eb0495c8..fc940e2d6 100644 --- a/app/src/main/java/ru/vtosters/lite/utils/Themes.java +++ b/app/src/main/java/ru/vtosters/lite/utils/Themes.java @@ -194,4 +194,10 @@ public class Themes { return VKThemeHelper.a(R.attr.tabbar_background); } + public static String getBackgroundStickers() { + if (isBGStickersEnabled()) { + return "images_with_background"; + } + return "images"; + } } diff --git a/smali/res/values-ru/arrays.xml b/smali/res/values-ru/arrays.xml index 56aff6047..1d0411ab7 100644 --- a/smali/res/values-ru/arrays.xml +++ b/smali/res/values-ru/arrays.xml @@ -495,4 +495,9 @@ От Новых к Старым От Старых к Новым + + По умолчанию + Не обновлять + Обновлять мгновенно + diff --git a/smali/res/values/arrays.xml b/smali/res/values/arrays.xml index 9e6464eed..51c7f3bf3 100644 --- a/smali/res/values/arrays.xml +++ b/smali/res/values/arrays.xml @@ -686,4 +686,14 @@ new old + + Default + Do not update + Immediately update + + + default + no_update + imd_update + diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml index 8ce28cc9a..c468f83c1 100644 --- a/smali/res/xml/preferences_feed.xml +++ b/smali/res/xml/preferences_feed.xml @@ -79,10 +79,13 @@ android:entryValues="@array/commentssort" android:key="commentssort" android:title="Сортировка комментариев" /> - + a:Lcom/vk/im/engine/internal/api_parsers/ImageSizesParser; - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Themes;->getBackgroundStickers()Ljava/lang/String; move-result-object v4 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 c91872ce7..ed7941079 100644 --- a/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali +++ b/smali/smali_classes3/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali @@ -531,17 +531,12 @@ .method public static c(Z)J .locals 3 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->feedautoupdate()Z + invoke-static {p0}, Lru/vtosters/lite/utils/Newsfeed;->getUpdateNewsfeed(Z)J - move-result v0 - - if-nez v0, :cond_0 - - sget-wide v0, Ljava/lang/Long;->MAX_VALUE:J + move-result-wide v0 return-wide v0 - :cond_0 if-eqz p0, :cond_1 const-string p0, "refresh_timeout_top" diff --git a/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali b/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali index d793a9f82..9abeaa7d0 100644 --- a/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali +++ b/smali/smali_classes5/com/vk/dto/stickers/StickerItem$b.smali @@ -49,7 +49,7 @@ move-result v2 - invoke-static {}, Lru/vtosters/lite/utils/Preferences;->getBackgroundStickers()Ljava/lang/String; + invoke-static {}, Lru/vtosters/lite/utils/Themes;->getBackgroundStickers()Ljava/lang/String; move-result-object v0