PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always confirm eSim removal.

Browse Source 
Test: atest DeleteSimProfilePreferenceControllerTest
Bug: 313604661

Change-Id: I0c43790bf43bedcc2e8075aa7be0b25876c731b4
This commit is contained in:
Jan Tomljanovic
2023-12-12 10:58:29 +00:00
parent 4345908c39
commit db1402a4df
8 changed files with 10 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/network/telephony/DeleteSimProfilePreferenceController.kt
View File

@@ -26,10 +26,8 @@ import androidx.preference.PreferenceScreen
import com.android.settings.R
import com.android.settings.core.BasePreferenceController
import com.android.settings.network.SubscriptionUtil
import com.android.settings.security.ConfirmSimDeletionPreferenceController.KEY_CONFIRM_SIM_DELETION
import com.android.settings.wifi.dpp.WifiDppUtils
import com.android.settingslib.spa.framework.util.collectLatestWithLifecycle
import com.android.settingslib.spaprivileged.settingsprovider.settingsGlobalBoolean
/** This controls a preference allowing the user to delete the profile for an eSIM. */
class DeleteSimProfilePreferenceController(context: Context, preferenceKey: String) :
@@ -63,16 +61,8 @@ class DeleteSimProfilePreferenceController(context: Context, preferenceKey: Stri
override fun handlePreferenceTreeClick(preference: Preference): Boolean {
if (preference.key != preferenceKey) return false
val confirmDeletion by mContext.settingsGlobalBoolean(
name = KEY_CONFIRM_SIM_DELETION,
defaultValue = mContext.resources
.getBoolean(R.bool.config_sim_deletion_confirmation_default_on),
)
if (confirmDeletion) {
WifiDppUtils.showLockScreen(mContext) { deleteSim() }
} else {
deleteSim()
}
WifiDppUtils.showLockScreen(mContext) { deleteSim() }
return true
}