Fix getting hidden global settings

Mygod · Feb 29, 2024 · 81ecda8 · 81ecda8
1 parent cd8b302
commit 81ecda8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 0 deletions.
diff --git a/README.md b/README.md
@@ -185,6 +185,7 @@ Greylisted/blacklisted APIs or internal constants: (some constants are hardcoded
 * (since API 29) `Landroid/net/wifi/p2p/WifiP2pConfig$Builder;->mNetworkName:Ljava/lang/String;,blocked`
 * `Landroid/net/wifi/p2p/WifiP2pManager;->startWps(Landroid/net/wifi/p2p/WifiP2pManager$Channel;Landroid/net/wifi/WpsInfo;Landroid/net/wifi/p2p/WifiP2pManager$ActionListener;)V,unsupported`
 * (prior to API 30) `Landroid/provider/Settings$Global;->SOFT_AP_TIMEOUT_ENABLED:Ljava/lang/String;,lo-prio,max-target-o`
+* (since API 31) `Landroid/provider/Settings;->setInSystemServer()V,lo-prio,max-target-o`
 * (prior to API 30) `Lcom/android/internal/R$array;->config_tether_bluetooth_regexs:I,max-target-q`
 * (prior to API 30) `Lcom/android/internal/R$array;->config_tether_usb_regexs:I,max-target-q`
 * (prior to API 30) `Lcom/android/internal/R$array;->config_tether_wifi_regexs:I,max-target-q`

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/VpnFirewallManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/VpnFirewallManager.kt
@@ -10,6 +10,7 @@ import androidx.annotation.RequiresApi
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.R
 import be.mygod.vpnhotspot.util.RootSession
+import be.mygod.vpnhotspot.util.UnblockCentral
 import be.mygod.vpnhotspot.widget.SmartSnackbar
 import timber.log.Timber
 
@@ -74,6 +75,7 @@ object VpnFirewallManager {
  return
  }
  val uid = Process.myUid()
+ UnblockCentral.Settings_setInSystemServer
  val allowed = Settings.Global.getString(app.contentResolver, UIDS_ALLOWED_ON_RESTRICTED_NETWORKS)
  ?.splitToSequence(';')?.mapNotNull { it.toIntOrNull() }?.toMutableSet() ?: mutableSetOf()
  if (!allowed.contains(uid)) {

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/UnblockCentral.kt
@@ -4,6 +4,7 @@ import android.annotation.SuppressLint
 import android.net.MacAddress
 import android.net.wifi.SoftApConfiguration
 import android.net.wifi.p2p.WifiP2pConfig
+import android.provider.Settings
 import androidx.annotation.RequiresApi
 import org.lsposed.hiddenapibypass.HiddenApiBypass
 
@@ -40,4 +41,9 @@ object UnblockCentral {
  val WifiP2pConfig_Builder_mNetworkName get() = init.let {
  WifiP2pConfig.Builder::class.java.getDeclaredField("mNetworkName").apply { isAccessible = true }
  }
+
+ val Settings_setInSystemServer by lazy {
+ init
+ Settings::class.java.getDeclaredMethod("setInSystemServer")(null)
+ }
 }