ReVanced-Mirror/revanced-patches
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patches synced 2024-12-25 20:25:54 +01:00
Code Issues Projects Releases Wiki Activity

refactor(Spoof SIM country): Reduce code duplication

Browse Source
This commit is contained in:
oSumAtrIX 2023-12-22 02:17:40 +01:00
parent eada08272b
commit 1dfbda7be4
No known key found for this signature in database
GPG Key ID: A9B3094ACDB604B4
1 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/main/kotlin/app/revanced/patches/all/telephony/sim/spoof/SpoofSimCountryPatch.kt
View File

@ -4,7 +4,6 @@ import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
import app.revanced.patcher.patch.annotation.Patch import app.revanced.patcher.patch.annotation.Patch
import app.revanced.patcher.patch.options.PatchOption import app.revanced.patcher.patch.options.PatchOption
import app.revanced.patcher.patch.options.PatchOption.PatchExtensions.stringPatchOption
import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod import app.revanced.patcher.util.proxy.mutableTypes.MutableMethod
import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch import app.revanced.patches.all.misc.transformation.AbstractTransformInstructionsPatch
import com.android.tools.smali.dexlib2.iface.ClassDef import com.android.tools.smali.dexlib2.iface.ClassDef
@ -25,28 +24,32 @@ import java.util.*
) )
@Suppress("unused") @Suppress("unused")
object SpoofSimCountryPatch : AbstractTransformInstructionsPatch<Pair<Int, String>>() { object SpoofSimCountryPatch : AbstractTransformInstructionsPatch<Pair<Int, String>>() {
private val isoValidator: PatchOption<String>.(String?) -> Boolean = private val countries = Locale.getISOCountries().associateBy { Locale("", it).displayCountry }
{ it: String? -> it?.uppercase() in Locale.getISOCountries() || it == null }
private val networkCountryIso by stringPatchOption( private val networkCountryIso by isoCountryPatchOption(
"networkCountryIso", "networkCountryIso",
null,
null,
"Network ISO Country Code", "Network ISO Country Code",
"ISO-3166-1 alpha-2 country code equivalent of the MCC (Mobile Country Code) " +
"of the current registered operator or the cell nearby.",
validator = isoValidator
) )
private val simCountryIso by stringPatchOption( private val simCountryIso by isoCountryPatchOption(
"simCountryIso", "simCountryIso",
null,
null,
"Sim ISO Country Code", "Sim ISO Country Code",
"ISO-3166-1 alpha-2 country code equivalent for the SIM provider's country code.",
validator = isoValidator
) )
private fun isoCountryPatchOption(
key: String,
title: String,
) = PatchOption(
key,
null,
countries,
title,
"ISO-3166-1 alpha-2 country code equivalent for the SIM provider's country code.",
false,
valueType = "String",
validator = { it: String? -> it?.uppercase() in countries.keys || it == null }
).also(options::register)
override fun filterMap( override fun filterMap(
classDef: ClassDef, classDef: ClassDef,
method: Method, method: Method,