HomeHandle: Fix crash if blurCompat Class not found

Fixed Crash on Android U without HyperOS Signed-off-by: Art_Chen <[email protected]>
Art-Chen · Nov 5, 2023 · c847a3a · c847a3a
1 parent 1dab18e
commit c847a3a
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "moe.chenxy.miuiextra"
         minSdk 31
         targetSdk 34
-        versionCode 14
-        versionName "2.6.9-U-Pre_Hyper"
+        versionCode 16
+        versionName "2.6.9.2-U-Pre_Hyper"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/moe/chenxy/miuiextra/hooker/entity/systemui/MiBlurCompatUtils.kt b/app/src/main/java/moe/chenxy/miuiextra/hooker/entity/systemui/MiBlurCompatUtils.kt
@@ -1,23 +1,24 @@
 package moe.chenxy.miuiextra.hooker.entity.systemui
 
 import android.view.View
+import com.highcapable.yukihookapi.hook.factory.toClassOrNull
 import de.robv.android.xposed.XposedHelpers
+import moe.chenxy.miuiextra.hooker.entity.systemui.MiBlurCompatUtils.isSupportMiBlur
 import moe.chenxy.miuiextra.hooker.entity.systemui.StatusBarBlurUtilsHooker.toClass
 import moe.chenxy.miuiextra.utils.ChenUtils
 
 object MiBlurCompatUtils {
-    private const val blurCompatCls = "com.miui.systemui.util.MiBlurCompat"
+    private val blurCompatCls = "com.miui.systemui.util.MiBlurCompat".toClassOrNull()
 
     @JvmStatic
     fun View.setPassWindowBlurEnabledCompat(enable: Boolean) =
-        if (ChenUtils.isAboveAndroidVersion(ChenUtils.Companion.AndroidVersion.U)) {
+        blurCompatCls?.let {
             XposedHelpers.callStaticMethod(
-                blurCompatCls.toClass(), "setPassWindowBlurEnabledCompat", this, enable
+                it, "setPassWindowBlurEnabledCompat", this, enable
             )
-        } else {
-
         }
 
+
     @JvmStatic
     fun View.setMiBackgroundBlurModeCompat(mode: Int) = XposedHelpers.callMethod(
         this, "setMiBackgroundBlurMode", mode)
@@ -32,13 +33,11 @@ object MiBlurCompatUtils {
 
     @JvmStatic
     fun View.isSupportMiBlur() =
-        if (ChenUtils.isAboveAndroidVersion(ChenUtils.Companion.AndroidVersion.U)) {
+        blurCompatCls?.let {
             XposedHelpers.callStaticMethod(
-                blurCompatCls.toClass(),
+                it,
                 "getBackgroundBlurOpened",
                 this.context
             ) as Boolean
-        } else {
-            false
-        }
+        } ?: false
 }