Skip to content

Fix network name detection for multi-SIM devices #74

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
CodeName-Anti wants to merge 1 commit into
base: main
Choose a base branch
from
+13 −1
Open

Fix network name detection for multi-SIM devices #74

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion base/src/main/java/com/windscribe/vpn/state/DeviceStateManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import android.net.Network
import android.net.NetworkCapabilities
import android.net.wifi.WifiManager
import android.os.Build
import android.telephony.SubscriptionManager
import android.telephony.TelephonyManager
import androidx.core.content.ContextCompat
import com.windscribe.vpn.wsnet.WSNetWrapper
Expand Down Expand Up @@ -362,7 +363,18 @@ class DeviceStateManager
try {
val telephonyManager =
context.getSystemService(Context.TELEPHONY_SERVICE) as? TelephonyManager
val operatorName = telephonyManager?.networkOperatorName

val dataSubId =
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
SubscriptionManager.getActiveDataSubscriptionId()
} else {
@Suppress("DEPRECATION")
SubscriptionManager.getDefaultDataSubscriptionId()
}

val dataSimTelephonyManager =
telephonyManager?.createForSubscriptionId(dataSubId)
val operatorName = dataSimTelephonyManager?.networkOperatorName
Comment on lines +367 to +377

when {
operatorName.isNullOrBlank() || operatorName == "Unknown" -> {
Expand Down