From 377b6d0cc263d5c30ccc0ba2ca1c26d8d495fcee Mon Sep 17 00:00:00 2001
From: LoveSy <shana@zju.edu.cn>
Date: Tue, 5 Nov 2024 18:24:43 +0800
Subject: [PATCH] avoid desugar the Desugar class

---
 buildSrc/src/main/java/DesugarClassVisitorFactory.kt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/buildSrc/src/main/java/DesugarClassVisitorFactory.kt b/buildSrc/src/main/java/DesugarClassVisitorFactory.kt
index d3fec6473..c99c6c79a 100644
--- a/buildSrc/src/main/java/DesugarClassVisitorFactory.kt
+++ b/buildSrc/src/main/java/DesugarClassVisitorFactory.kt
@@ -7,7 +7,7 @@ import org.objectweb.asm.MethodVisitor
 import org.objectweb.asm.Opcodes
 import org.objectweb.asm.Opcodes.ASM9
 
-private const val DESUGAR_CLASS_NAME = "com/topjohnwu/magisk/core/utils/Desugar"
+private const val DESUGAR_CLASS_NAME = "com.topjohnwu.magisk.core.utils.Desugar"
 private const val ZIP_ENTRY_GET_TIME_DESC = "()Ljava/nio/file/attribute/FileTime;"
 private const val DESUGAR_GET_TIME_DESC = "(Ljava/util/zip/ZipEntry;)Ljava/nio/file/attribute/FileTime;"
 
@@ -19,7 +19,7 @@ abstract class DesugarClassVisitorFactory : AsmClassVisitorFactory<Instrumentati
         return DesugarClassVisitor(nextClassVisitor)
     }
 
-    override fun isInstrumentable(classData: ClassData) = true
+    override fun isInstrumentable(classData: ClassData) = classData.className != DESUGAR_CLASS_NAME
 
     class DesugarClassVisitor(cv: ClassVisitor) : ClassVisitor(ASM9, cv) {
         override fun visitMethod(
@@ -53,7 +53,7 @@ abstract class DesugarClassVisitorFactory : AsmClassVisitorFactory<Instrumentati
                 "getLastModifiedTime", "getLastAccessTime", "getCreationTime" -> {
                     mv.visitMethodInsn(
                         Opcodes.INVOKESTATIC,
-                        DESUGAR_CLASS_NAME,
+                        DESUGAR_CLASS_NAME.replace('.', '/'),
                         name,
                         DESUGAR_GET_TIME_DESC,
                         false