From 4cc6bfabd07f62c738dbd69564b8388253c82c40 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sun, 24 Jul 2022 00:02:46 +0300 Subject: [PATCH] fixes foaf time is now with local timezone fixed music starting --- app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java | 11 +++++------ .../java/ru/vtosters/lite/hooks/JsonInjectors.java | 3 ++- .../main/java/ru/vtosters/lite/hooks/TogglesHook.java | 1 - smali/res/xml/preferences_debug.xml | 1 - 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java index d690cd700..ac8425b9f 100644 --- a/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java +++ b/app/src/main/java/ru/vtosters/lite/foaf/FoafBase.java @@ -55,12 +55,11 @@ public class FoafBase{ return origtime; } - var tz = TimeZone.getDefault(); - var smf = new SimpleDateFormat("yyyy-MM-dd'T'kk:mm:ss", Locale.getDefault()); - - smf.setTimeZone(tz); - - return smf.parse(matcher.group(1)).getTime() / 1000; + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss", Locale.US); + sdf.setTimeZone(TimeZone.getTimeZone("Europe/Moscow")); + Date date = sdf.parse(matcher.group(1)); + sdf.setTimeZone(TimeZone.getDefault()); + return sdf.parse(sdf.format(date)).getTime() / 1000; } private static String getLink(int i){ 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 4b278e713..f9c3eed18 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/JsonInjectors.java @@ -8,6 +8,7 @@ import static ru.vtosters.lite.hooks.DateHook.getLocale; import static ru.vtosters.lite.utils.Base64Utils.decode; import static ru.vtosters.lite.utils.Globals.getContext; import static ru.vtosters.lite.utils.Globals.getPrefsValue; +import static ru.vtosters.lite.utils.Globals.getUserId; import static ru.vtosters.lite.utils.Globals.getUserToken; import static ru.vtosters.lite.utils.Newsfeed.checkCaption; import static ru.vtosters.lite.utils.Newsfeed.checkCopyright; @@ -166,7 +167,7 @@ public class JsonInjectors{ var onlineinfo = json.optJSONObject("online_info"); var time = getLastSeen(0L, id); - if (time != 0L && onlineinfo != null && !onlineinfo.optBoolean("is_online")) { + if (time != 0L && onlineinfo != null && !onlineinfo.optBoolean("is_online") && id != getUserId()) { json.remove("online_info"); var online_info = new JSONObject() diff --git a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java index 799d8f079..ccedd4cb2 100644 --- a/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java +++ b/app/src/main/java/ru/vtosters/lite/hooks/TogglesHook.java @@ -23,7 +23,6 @@ public class TogglesHook{ case AB_GIFTS_FROM_KEYBOARD: case FEATURE_FEED_DEFAULT_LIST_ALWAYS: case EXPERIMENT_NEWS_VIDEO_LAYOUT_TEXT: - case FEATURE_MUSIC_AUDIO_SERVICE: case FEATURE_MILKSHAKE_DISCOVER_IN_MENU: case FEATURE_DISCOVER_CATEGORIES: case FEATURE_FAVE_PERF_IMPROVE: diff --git a/smali/res/xml/preferences_debug.xml b/smali/res/xml/preferences_debug.xml index ac6e847a7..1b1c6befa 100644 --- a/smali/res/xml/preferences_debug.xml +++ b/smali/res/xml/preferences_debug.xml @@ -90,7 +90,6 @@ android:defaultValue="https://vtsf.vknext.net" android:key="ssfscustom" android:title="@string/debug_developer_ssfs_custom" /> -