Skip to content
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

Jump to bottom

feat: Add toggle for adding cross-sim to network name #264

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

feat: Add toggle for adding cross-sim to network name #264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8093180
Update Moder.kt
fillwithjoy1 Feb 18, 2024
a3b1601
Update Config.kt
fillwithjoy1 Feb 18, 2024
a7a03e2
Update strings.xml
fillwithjoy1 Feb 18, 2024
f6bfe9a
Update Config.kt
fillwithjoy1 Feb 18, 2024
eb878b0
Merge branch 'main' into cross-sim-name
kyujin-cho May 16, 2024
0cd8867
Merge branch 'main' into cross-sim-name
kyujin-cho May 16, 2024
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
3 changes: 3 additions & 0 deletions app/src/main/java/dev/bluehouse/enablevolte/Moder.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -287,6 +287,9 @@ class SubscriptionModer(val subscriptionId: Int) : Moder() {
}
}

val isCrossSIMInNetwork: Int
get() = this.getIntValue(CarrierConfigManager.KEY_CROSS_SIM_SPN_FORMAT_INT)

val isVoWifiConfigEnabled: Boolean
get() = this.getBooleanValue(CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL)

Expand Down
14 changes: 14 additions & 0 deletions app/src/main/java/dev/bluehouse/enablevolte/pages/Config.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,7 @@ fun Config(navController: NavController, subId: Int) {
var voLTEEnabled by rememberSaveable { mutableStateOf(false) }
var voNREnabled by rememberSaveable { mutableStateOf(false) }
var crossSIMEnabled by rememberSaveable { mutableStateOf(false) }
var crossSIMInNetworkName by rememberSaveable { mutableStateOf(false) }
var voWiFiEnabled by rememberSaveable { mutableStateOf(false) }
var voWiFiEnabledWhileRoaming by rememberSaveable { mutableStateOf(false) }
var showIMSinSIMInfo by rememberSaveable { mutableStateOf(false) }
Expand Down Expand Up @@ -89,6 +90,7 @@ fun Config(navController: NavController, subId: Int) {
voLTEEnabled = moder.isVoLteConfigEnabled
voNREnabled = VERSION.SDK_INT >= VERSION_CODES.UPSIDE_DOWN_CAKE && moder.isVoNrConfigEnabled
crossSIMEnabled = moder.isCrossSIMConfigEnabled
crossSIMInNetworkName = (moder.showCrossSIMInNetworkName == 2)
voWiFiEnabled = moder.isVoWifiConfigEnabled
voWiFiEnabledWhileRoaming = moder.isVoWifiWhileRoamingEnabled
showIMSinSIMInfo = VERSION.SDK_INT >= VERSION_CODES.R && moder.showIMSinSIMInfo
Expand Down Expand Up @@ -180,6 +182,18 @@ fun Config(navController: NavController, subId: Int) {
}
}
}
BooleanPropertyView(label = stringResource(R.string.add_crosssim_to_network_name), toggled = crossSIMInNetworkName, minSdk = VERSION_CODES.TIRAMISU) {
if (VERSION.SDK_INT >= VERSION_CODES.TIRAMISU) {
crossSIMInNetworkName = if (crossSIMInNetworkName) {
moder.updateCarrierConfig(CarrierConfigManager.KEY_CROSS_SIM_SPN_FORMAT_INT, 1)
false
} else {
moder.updateCarrierConfig(CarrierConfigManager.KEY_CROSS_SIM_SPN_FORMAT_INT, 2)
moder.restartIMSRegistration()
true
}
}
}
BooleanPropertyView(label = stringResource(R.string.enable_vowifi), toggled = voWiFiEnabled) {
voWiFiEnabled = if (voWiFiEnabled) {
moder.updateCarrierConfig(CarrierConfigManager.KEY_CARRIER_WFC_IMS_AVAILABLE_BOOL, false)
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<string name="enable_volte">Enable VoLTE</string>
<string name="enable_vonr">Enable VoNR</string>
<string name="enable_crosssim">Enable Backup Calling</string>
<string name="add_crosssim_to_network_name">Add \"Backup Calling"\ to Network Name</string>
<string name="enable_vowifi">Enable VoWiFi</string>
<string name="enable_vowifi_while_roamed">Enable VoWiFi while roaming</string>
<string name="show_vowifi_preference_in_settings">Show VoWiFi preference in Settings</string>
Expand Down
Loading