diff --git a/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java b/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java index 491c275e7..28e895457 100644 --- a/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java +++ b/app/src/main/java/ru/vtosters/hooks/NewsfeedHook.java @@ -1,7 +1,9 @@ package ru.vtosters.hooks; import android.content.Context; +import android.net.NetworkInfo; import android.os.PowerManager; +import android.telephony.TelephonyManager; import android.util.Log; import androidx.recyclerview.widget.RecyclerView; import com.vk.core.preference.Preference; @@ -132,4 +134,12 @@ public class NewsfeedHook { // return !getBoolValue("force_disable_psm", false) && pw.isPowerSaveMode(); return false; } + + public static boolean isRoaming(NetworkInfo networkInfo) { + return !Preferences.disableForceTrafficSaver() && networkInfo.isRoaming(); + } + + public static boolean isNetworkRoaming(TelephonyManager telephonyManager) { + return !Preferences.disableForceTrafficSaver() && telephonyManager.isNetworkRoaming(); + } } diff --git a/smali/smali_classes2/com/vk/core/util/DeviceState.smali b/smali/smali_classes2/com/vk/core/util/DeviceState.smali index 35f60eddc..0b2d10cc1 100644 --- a/smali/smali_classes2/com/vk/core/util/DeviceState.smali +++ b/smali/smali_classes2/com/vk/core/util/DeviceState.smali @@ -1101,7 +1101,7 @@ if-eqz v0, :cond_0 - invoke-virtual {v0}, Landroid/net/NetworkInfo;->isRoaming()Z + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->isRoaming(Landroid/net/NetworkInfo;)Z move-result v0 @@ -1125,7 +1125,7 @@ move-result-object v0 - invoke-virtual {v0}, Landroid/telephony/TelephonyManager;->isNetworkRoaming()Z + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->isNetworkRoaming(Landroid/telephony/TelephonyManager;)Z move-result v0 diff --git a/smali/smali_classes2/com/vk/httpexecutor/api/utils/RoamingDetector.smali b/smali/smali_classes2/com/vk/httpexecutor/api/utils/RoamingDetector.smali index a748c888f..f91c06a0f 100644 --- a/smali/smali_classes2/com/vk/httpexecutor/api/utils/RoamingDetector.smali +++ b/smali/smali_classes2/com/vk/httpexecutor/api/utils/RoamingDetector.smali @@ -163,7 +163,7 @@ if-eqz v0, :cond_0 - invoke-virtual {v0}, Landroid/net/NetworkInfo;->isRoaming()Z + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->isRoaming(Landroid/net/NetworkInfo;)Z move-result v0 @@ -187,7 +187,7 @@ move-result-object v0 - invoke-virtual {v0}, Landroid/telephony/TelephonyManager;->isNetworkRoaming()Z + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->isNetworkRoaming(Landroid/telephony/TelephonyManager;)Z move-result v0 diff --git a/smali/smali_classes4/com/vk/reef/trackers/ReefNetworkInfoTracker.smali b/smali/smali_classes4/com/vk/reef/trackers/ReefNetworkInfoTracker.smali index c43293986..cf78f1afe 100644 --- a/smali/smali_classes4/com/vk/reef/trackers/ReefNetworkInfoTracker.smali +++ b/smali/smali_classes4/com/vk/reef/trackers/ReefNetworkInfoTracker.smali @@ -400,7 +400,7 @@ if-eqz v1, :cond_8 - invoke-virtual {v1}, Landroid/telephony/TelephonyManager;->isNetworkRoaming()Z + invoke-static {v1}, Lru/vtosters/hooks/NewsfeedHook;->isNetworkRoaming(Landroid/telephony/TelephonyManager;)Z move-result v1 diff --git a/smali/smali_classes5/org/chromium/net/AndroidNetworkLibrary.smali b/smali/smali_classes5/org/chromium/net/AndroidNetworkLibrary.smali index 0385461b5..e5d924299 100644 --- a/smali/smali_classes5/org/chromium/net/AndroidNetworkLibrary.smali +++ b/smali/smali_classes5/org/chromium/net/AndroidNetworkLibrary.smali @@ -794,7 +794,7 @@ .line 3 :cond_0 - invoke-virtual {v0}, Landroid/net/NetworkInfo;->isRoaming()Z + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->isRoaming(Landroid/net/NetworkInfo;)Z move-result v0 diff --git a/smali/smali_classes5/ru/mail/libverify/accounts/f.smali b/smali/smali_classes5/ru/mail/libverify/accounts/f.smali index 20befc798..56a55be9f 100644 --- a/smali/smali_classes5/ru/mail/libverify/accounts/f.smali +++ b/smali/smali_classes5/ru/mail/libverify/accounts/f.smali @@ -277,7 +277,7 @@ iput-object v2, v1, Lru/mail/libverify/accounts/e;->m:Ljava/lang/String; - invoke-virtual {p0}, Landroid/telephony/TelephonyManager;->isNetworkRoaming()Z + invoke-static {p0}, Lru/vtosters/hooks/NewsfeedHook;->isNetworkRoaming(Landroid/telephony/TelephonyManager;)Z move-result v2 diff --git a/smali/smali_classes5/ru/mail/libverify/utils/n.smali b/smali/smali_classes5/ru/mail/libverify/utils/n.smali index 994aa4d57..e2de0b1b9 100644 --- a/smali/smali_classes5/ru/mail/libverify/utils/n.smali +++ b/smali/smali_classes5/ru/mail/libverify/utils/n.smali @@ -1419,7 +1419,7 @@ check-cast p0, Landroid/telephony/TelephonyManager; - invoke-virtual {p0}, Landroid/telephony/TelephonyManager;->isNetworkRoaming()Z + invoke-static {p0}, Lru/vtosters/hooks/NewsfeedHook;->isNetworkRoaming(Landroid/telephony/TelephonyManager;)Z move-result p0 diff --git a/smali/smali_classes5/ru/mail/libverify/utils/network/NetworkStateReceiver.smali b/smali/smali_classes5/ru/mail/libverify/utils/network/NetworkStateReceiver.smali index 416946800..4a62932ca 100644 --- a/smali/smali_classes5/ru/mail/libverify/utils/network/NetworkStateReceiver.smali +++ b/smali/smali_classes5/ru/mail/libverify/utils/network/NetworkStateReceiver.smali @@ -441,7 +441,7 @@ goto :goto_1 :cond_1 - invoke-virtual {v0}, Landroid/net/NetworkInfo;->isRoaming()Z + invoke-static {v0}, Lru/vtosters/hooks/NewsfeedHook;->isRoaming(Landroid/net/NetworkInfo;)Z move-result v0 diff --git a/smali/smali_classes5/vigo/sdk/Vigo.smali b/smali/smali_classes5/vigo/sdk/Vigo.smali index f0f811141..33c7577e4 100644 --- a/smali/smali_classes5/vigo/sdk/Vigo.smali +++ b/smali/smali_classes5/vigo/sdk/Vigo.smali @@ -4055,7 +4055,7 @@ iget-object v1, p0, Lvigo/sdk/Vigo;->tm:Landroid/telephony/TelephonyManager; .line 13 - invoke-virtual {v1}, Landroid/telephony/TelephonyManager;->isNetworkRoaming()Z + invoke-static {v1}, Lru/vtosters/hooks/NewsfeedHook;->isNetworkRoaming(Landroid/telephony/TelephonyManager;)Z move-result v1