From 519ded1f753611993888b458e7304c0300e6c1ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B9=8C=E5=A0=86=E5=B0=8F=E9=80=8F=E6=98=8E?= Date: Sun, 5 Mar 2023 21:06:59 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"=E5=90=88=E5=B9=B6=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E8=AF=B7=E6=B1=82=20#233"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 317340bf6fb95c138a053802d58b3be8fdeb4691. --- .../hooks/rules/t/systemui/HideSimIconForT.kt | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt index 1b4f4ea6..69cc370e 100644 --- a/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt +++ b/app/src/main/java/com/lt2333/simplicitytools/hooks/rules/t/systemui/HideSimIconForT.kt @@ -2,24 +2,22 @@ package com.lt2333.simplicitytools.hooks.rules.t.systemui import com.github.kyuubiran.ezxhelper.utils.findMethod import com.github.kyuubiran.ezxhelper.utils.hookBefore -import com.github.kyuubiran.ezxhelper.utils.putObject -import com.lt2333.simplicitytools.utils.getObjectField import com.lt2333.simplicitytools.utils.hasEnable import com.lt2333.simplicitytools.utils.xposed.base.HookRegister object HideSimIconForT : HookRegister() { override fun init() { - findMethod("com.android.systemui.statusbar.StatusBarMobileView") { - name == "applyMobileState" + findMethod("com.android.systemui.statusbar.phone.StatusBarSignalPolicy") { + name == "hasCorrectSubs" && parameterTypes[0] == MutableList::class.java }.hookBefore { - val mobileIconState = it.args[0] - val subId = mobileIconState.getObjectField("subId") as Int - hasEnable("hide_sim_one_icon", extraCondition = { subId == 1 }) { - mobileIconState.putObject("visible", false) + val list = it.args[0] as MutableList<*> + val size = list.size + hasEnable("hide_sim_two_icon", extraCondition = { size == 2 }) { + list.removeAt(1) } - hasEnable("hide_sim_two_icon", extraCondition = { subId == 2 }) { - mobileIconState.putObject("visible", false) + hasEnable("hide_sim_one_icon", extraCondition = { size >= 1 }) { + list.removeAt(0) } } }