Merge remote-tracking branch 'origin/main'

ReChronoRain · Mar 1, 2024 · 412daf1 · 412daf1
2 parents 908a463 + 329b9d9
commit 412daf1
Show file tree

Hide file tree

Showing 7 changed files with 173 additions and 138 deletions.
diff --git a/...src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/UnlockCustomPhotoFrames.kt b/...src/main/java/com/sevtinge/hyperceiler/module/hook/mediaeditor/UnlockCustomPhotoFrames.kt
@@ -137,7 +137,7 @@ object UnlockCustomPhotoFrames : BaseHook() {
             other(method)
         }
 
-        if (isOpenSpring) {
+        if (isOpenSpring && orderedPublicC.isNotEmpty()) {
             orderedPublicC.forEach { method ->
                 logI(TAG, "Public Spring name is $method") // debug 用
                 other(method)  // 1.6.0.5.2 新增限时新春定制画框

diff --git a/...ava/com/sevtinge/hyperceiler/module/hook/securitycenter/RemoveOpenAppConfirmationPopup.kt b/...ava/com/sevtinge/hyperceiler/module/hook/securitycenter/RemoveOpenAppConfirmationPopup.kt
@@ -32,7 +32,7 @@ class RemoveOpenAppConfirmationPopup : BaseHook() {
             .filterByName("setText")
             .filterByParamTypes {
                 it[0] == CharSequence::class.java
-            }.single().createHook {
+            }.first().createHook {
                 after {
                     val textView = it.thisObject as TextView
                     if (it.args.isNotEmpty() && it.args[0]?.toString().equals(

diff --git a/...src/main/java/com/sevtinge/hyperceiler/module/hook/securitycenter/beauty/BeautyPrivacy.kt b/...src/main/java/com/sevtinge/hyperceiler/module/hook/securitycenter/beauty/BeautyPrivacy.kt
@@ -28,7 +28,7 @@ object BeautyPrivacy : BaseHook() {
     private val R0 by lazy {
         dexKitBridge.findMethod {
             matcher {
-                addUsingString("persist.sys.privacy_camera")
+                addUsingStringsEquals("persist.sys.privacy_camera")
             }
         }.single().getMethodInstance(EzXHelper.safeClassLoader)
     }

diff --git a/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/lockscreen/ChargingCVP.kt b/app/src/main/java/com/sevtinge/hyperceiler/module/hook/systemui/lockscreen/ChargingCVP.kt
diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml
@@ -559,7 +559,7 @@
     <string name="system_ui_status_bar_icon_big_hd">Ikon HD besar</string>
     <string name="system_ui_status_bar_icon_mobile_network_signal_no_card">Tidak ada ikon kartu SIM</string>
     <string name="system_ui_status_bar_icon_mobile_network_hide_card_1">Sembunyikan ikon sinyal kartu SIM 1</string>
-    <string name="system_ui_status_bar_icon_mobile_network_hide_card_2">Sembunyikan ikon sinyal kartu SIM 1</string>
+    <string name="system_ui_status_bar_icon_mobile_network_hide_card_2">Sembunyikan ikon sinyal kartu SIM 2</string>
     <string name="system_ui_status_bar_icon_mobile_network_type">Logika tampilan</string>
     <string name="system_ui_status_bar_big_mobile_network_type">Ikon Tipe Jaringan Besar</string>
     <string name="system_ui_status_bar_icon_location">Lokasi</string>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -601,7 +601,7 @@
     <string name="system_ui_status_bar_icon_big_hd">Big HD icon</string>
     <string name="system_ui_status_bar_icon_mobile_network_signal_no_card">No SIM card icon</string>
     <string name="system_ui_status_bar_icon_mobile_network_hide_card_1">Hide SIM card 1 signal icon</string>
-    <string name="system_ui_status_bar_icon_mobile_network_hide_card_2">Hide SIM card 1 signal icon</string>
+    <string name="system_ui_status_bar_icon_mobile_network_hide_card_2">Hide SIM card 2 signal icon</string>
     <string name="system_ui_status_bar_icon_mobile_network_type">Display logic</string>
     <string name="system_ui_status_bar_big_mobile_network_type">Big Network Type Icon</string>
     <string name="system_ui_status_bar_icon_location">Location</string>

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-agp = "8.2.2"
+agp = "8.3.0"
 kotlinAndroid = "1.9.22"
 
 core = "1.12.0"