From 0cc0299215915a2291686418f23306dc18e043ce Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Sat, 30 Jul 2022 17:37:28 +0300 Subject: [PATCH] deviceinfo and geodata hide feature --- .../vtosters/lite/hooks/DeviceInfoHook.java | 12 +++++++++++ .../lite/ui/fragments/FeedFragment.java | 9 +++++++++ smali/res/xml/preferences_activity.xml | 5 +++++ smali/res/xml/preferences_feed.xml | 10 +++++----- .../com/facebook/login/DeviceAuthDialog.smali | 4 ++++ .../internal/DeviceShareDialogFragment.smali | 4 ++++ smali/smali_classes2/b/h/c/b/AdsParams.smali | 12 +++++++++++ .../com/vk/core/util/DeviceIdProvider.smali | 20 +++++++++++++++++++ .../lite/api/newsfeed/NewsfeedGet.smali | 4 ++++ .../com/vtosters/lite/data/Analytics.smali | 4 ++++ .../com/vtosters/lite/utils/Utils.smali | 4 ++++ 11 files changed, 83 insertions(+), 5 deletions(-) create mode 100644 app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java diff --git a/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java b/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java new file mode 100644 index 000000000..81bf9df19 --- /dev/null +++ b/app/src/main/java/ru/vtosters/lite/hooks/DeviceInfoHook.java @@ -0,0 +1,12 @@ +package ru.vtosters.lite.hooks; +import static ru.vtosters.lite.utils.Preferences.getBoolValue; + +import android.util.Log; + +public class DeviceInfoHook{ + public static String getDeviceInfo(String input) { + Log.d("DeviceInfoHook", "getDeviceInfo: " + input); + if (getBoolValue("hideDeviceInfo", true)) return ""; + return input; + } +} diff --git a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java index eb746ac60..1e9de8fa8 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java +++ b/app/src/main/java/ru/vtosters/lite/ui/fragments/FeedFragment.java @@ -1,6 +1,8 @@ package ru.vtosters.lite.ui.fragments; import static ru.vtosters.lite.utils.AndroidUtils.getIdentifier; +import static ru.vtosters.lite.utils.Preferences.copyright_post; +import static ru.vtosters.lite.utils.Preferences.offline; import android.content.Context; import android.content.Intent; @@ -22,6 +24,13 @@ public class FeedFragment extends MaterialPreferenceToolbarFragment { private void prefs() { findPreference("officialnewssett").setOnPreferenceClickListener(new openofficialsett()); + findPreference("cringecopyright").setEnabled(!copyright_post()); + } + + @Override + public boolean onPreferenceTreeClick(Preference preference) { + findPreference("cringecopyright").setEnabled(!copyright_post()); + return super.onPreferenceTreeClick(preference); } public class openofficialsett implements Preference.OnPreferenceClickListener { diff --git a/smali/res/xml/preferences_activity.xml b/smali/res/xml/preferences_activity.xml index 2a3174d83..f7de4916f 100644 --- a/smali/res/xml/preferences_activity.xml +++ b/smali/res/xml/preferences_activity.xml @@ -115,5 +115,10 @@ android:key="awayphp" android:summary="@string/vtlawayphpsummary" android:title="@string/vtlawayphp" /> + \ No newline at end of file diff --git a/smali/res/xml/preferences_feed.xml b/smali/res/xml/preferences_feed.xml index 33a508e5f..24a0c994c 100644 --- a/smali/res/xml/preferences_feed.xml +++ b/smali/res/xml/preferences_feed.xml @@ -51,11 +51,6 @@ android:key="shitposting" android:summary="@string/shitpostingsummary" android:title="@string/shitposting" /> - + getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object p1 + const-string v0, "device_info" .line 17 diff --git a/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali b/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali index 708eaf306..4cd336091 100644 --- a/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali +++ b/smali/smali/com/facebook/share/internal/DeviceShareDialogFragment.smali @@ -221,6 +221,10 @@ move-result-object v0 + invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + const-string v1, "device_info" .line 7 diff --git a/smali/smali_classes2/b/h/c/b/AdsParams.smali b/smali/smali_classes2/b/h/c/b/AdsParams.smali index 5593d7bb8..190539df9 100644 --- a/smali/smali_classes2/b/h/c/b/AdsParams.smali +++ b/smali/smali_classes2/b/h/c/b/AdsParams.smali @@ -48,6 +48,10 @@ if-eqz v0, :cond_0 + invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + const-string v1, "connection_type" invoke-virtual {p1, v1, v0}, Lcom/vk/api/base/ApiRequest;->c(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; @@ -58,6 +62,10 @@ if-eqz v0, :cond_1 + invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + const-string v1, "connection_subtype" invoke-virtual {p1, v1, v0}, Lcom/vk/api/base/ApiRequest;->c(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; @@ -68,6 +76,10 @@ if-eqz v0, :cond_2 + invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + const-string v1, "user_options" invoke-virtual {p1, v1, v0}, Lcom/vk/api/base/ApiRequest;->c(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; diff --git a/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali b/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali index b63f9fbdd..db7e0a89f 100644 --- a/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali +++ b/smali/smali_classes2/com/vk/core/util/DeviceIdProvider.smali @@ -43,6 +43,10 @@ move-result-object p0 + invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object p0 + return-object p0 .end method @@ -189,6 +193,10 @@ move-result-object v0 :cond_1 + invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method @@ -214,6 +222,10 @@ monitor-exit v0 + invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object p0 + return-object p0 .line 3 @@ -259,6 +271,10 @@ monitor-exit v0 + invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object p0 + return-object p0 :catchall_0 @@ -425,6 +441,10 @@ monitor-exit v0 + invoke-static {p0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object p0 + return-object p0 :catchall_0 diff --git a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali index 5d510d0c6..9db3fd928 100644 --- a/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali +++ b/smali/smali_classes4/com/vtosters/lite/api/newsfeed/NewsfeedGet.smali @@ -563,6 +563,10 @@ move-result-object v1 + invoke-static {v1}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v1 + const-string v2, "geo_data" invoke-virtual {p0, v2, v1}, Lcom/vk/api/base/ApiRequest;->c(Ljava/lang/String;Ljava/lang/String;)Lcom/vk/api/base/ApiRequest; diff --git a/smali/smali_classes4/com/vtosters/lite/data/Analytics.smali b/smali/smali_classes4/com/vtosters/lite/data/Analytics.smali index 82bf2dcd2..27294cf0e 100644 --- a/smali/smali_classes4/com/vtosters/lite/data/Analytics.smali +++ b/smali/smali_classes4/com/vtosters/lite/data/Analytics.smali @@ -2342,6 +2342,10 @@ iget-object v0, v0, Lcom/vtosters/lite/data/Analytics;->o:Ljava/lang/String; + invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method diff --git a/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali b/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali index a341401bb..5e713a8aa 100644 --- a/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali +++ b/smali/smali_classes5/com/vtosters/lite/utils/Utils.smali @@ -228,6 +228,10 @@ move-result-object v0 + invoke-static {v0}, Lru/vtosters/lite/hooks/DeviceInfoHook;->getDeviceInfo(Ljava/lang/String;)Ljava/lang/String; + + move-result-object v0 + return-object v0 .end method