refactor

src/main/kotlin/app/revanced/patches/openinghours/misc/fix/crash/FixCrashPatch.kt

@@ -0,0 +1,105 @@
+package app.revanced.patches.openinghours.misc.fix.crash
+
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.InstructionExtensions.getInstructions
+import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
+import app.revanced.patcher.extensions.newLabel
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.annotation.CompatiblePackage
+import app.revanced.patcher.patch.annotation.Patch
+import app.revanced.patches.openinghours.misc.fix.crash.fingerprints.SetPlaceFingerprint
+import app.revanced.util.exception
+import app.revanced.util.getReference
+import com.android.tools.smali.dexlib2.Opcode
+import com.android.tools.smali.dexlib2.builder.instruction.BuilderInstruction21t
+import com.android.tools.smali.dexlib2.iface.instruction.Instruction
+import com.android.tools.smali.dexlib2.iface.reference.MethodReference
+
+@Patch(
+    name = "Fix crash",
+    compatiblePackages = [CompatiblePackage("de.simon.openinghours", ["1.0"])],
+)
+@Suppress("unused")
+object FixCrashPatch : BytecodePatch(
+    setOf(SetPlaceFingerprint),
+) {
+
+    override fun execute(context: BytecodeContext) {
+        SetPlaceFingerprint.result?.let {
+            val indexedInstructions = it.mutableMethod.getInstructions().withIndex().toList()
+
+            fun avoidNullPointerException(openingHoursIndex: Int, jumpOverIndex: Int, targetRegister: Int) {
+                val continueLabel = it.mutableMethod.newLabel(jumpOverIndex + 1)
+
+                for (index in openingHoursIndex..jumpOverIndex) {
+                    val instruction = indexedInstructions[index].value
+
+                    if (!instruction.isCheckNotNullInstruction) {
+                        continue
+                    }
+
+                    it.mutableMethod.replaceInstruction(
+                        index,
+                        BuilderInstruction21t(
+                            Opcode.IF_EQZ,
+                            targetRegister,
+                            continueLabel,
+                        ),
+                    )
+                }
+            }
+
+            val getOpeningHoursIndex = getIndicesOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/models/Place;",
+                "getOpeningHours",
+            )
+
+            val setWeekDayTextIndex = getIndexOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/views/custom/PlaceCard;",
+                "setWeekDayText",
+            )
+
+            val startCalculateStatusIndex = getIndexOfInvoke(
+                indexedInstructions,
+                "Lde/simon/openinghours/views/custom/PlaceCard;",
+                "startCalculateStatus",
+            )
+
+            // Replace the Intrinsics;->checkNotNull instructions with a null check
+            // and jump to our newly created label if it returns true.
+            // This avoids throwing a NullPointerExceptions.
+            avoidNullPointerException(getOpeningHoursIndex[0], startCalculateStatusIndex, 4)
+            avoidNullPointerException(getOpeningHoursIndex[1], setWeekDayTextIndex, 0)
+        } ?: throw SetPlaceFingerprint.exception
+    }
+
+    private fun isInvokeInstruction(instruction: Instruction, className: String, methodName: String): Boolean {
+        val methodRef = instruction.getReference<MethodReference>() ?: return false
+        return methodRef.definingClass == className && methodRef.name == methodName
+    }
+
+    private fun getIndicesOfInvoke(
+        instructions: List<IndexedValue<Instruction>>,
+        className: String,
+        methodName: String,
+    ): List<Int> = instructions.mapNotNull { (index, instruction) ->
+        if (isInvokeInstruction(instruction, className, methodName)) {
+            index
+        } else {
+            null
+        }
+    }
+
+    private fun getIndexOfInvoke(
+        instructions: List<IndexedValue<Instruction>>,
+        className: String,
+        methodName: String,
+    ): Int = instructions.indexOfFirst { (_, instruction) ->
+        isInvokeInstruction(instruction, className, methodName)
+    }
+
+    private val Instruction.isCheckNotNullInstruction
+        get() = isInvokeInstruction(this, "Lkotlin/jvm/internal/Intrinsics;", "checkNotNull")
+}

src/main/kotlin/app/revanced/patches/openinghours/crash/fingerprints/SetPlaceFingerprint.kt → src/main/kotlin/app/revanced/patches/openinghours/misc/fix/crash/fingerprints/SetPlaceFingerprint.kt

@@ -1,12 +1,12 @@
-package app.revanced.patches.openinghours.crash.fingerprints
+package app.revanced.patches.openinghours.misc.fix.crash.fingerprints
 
 import app.revanced.patcher.fingerprint.MethodFingerprint
 
 internal object SetPlaceFingerprint : MethodFingerprint(
     "V",
     parameters = listOf("Lde/simon/openinghours/models/Place;"),
     customFingerprint = { methodDef, _ ->
-        methodDef.definingClass == "Lde/simon/openinghours/views/custom/PlaceCard;"
-                && methodDef.name == "setPlace"
-    }
+        methodDef.definingClass == "Lde/simon/openinghours/views/custom/PlaceCard;" &&
+            methodDef.name == "setPlace"
+    },
 )