refactor

Author: LisoUseInAIKyrios

api/revanced-patcher.api

@@ -111,7 +111,6 @@ public final class app/revanced/patcher/Match {
 }
 
 public final class app/revanced/patcher/Match$FilterMatch {
-	public fun <init> (Lapp/revanced/patcher/InstructionFilter;ILcom/android/tools/smali/dexlib2/iface/instruction/Instruction;)V
 	public final fun getFilter ()Lapp/revanced/patcher/InstructionFilter;
 	public final fun getIndex ()I
 	public final fun getInstruction ()Lcom/android/tools/smali/dexlib2/iface/instruction/Instruction;

src/main/kotlin/app/revanced/patcher/Fingerprint.kt

@@ -361,10 +361,11 @@ class Fingerprint internal constructor(
     context(BytecodePatchContext)
     val patternMatchOrNull : PatternMatch?
         get() {
-            if (matchOrNull == null || matchOrNull!!.filterMatches == null) {
+            val match = this.matchOrNull
+            if (match == null || match.filterMatches == null) {
                 return null
             }
-            return matchOrNull!!.patternMatch
+            return match.patternMatch
         }
 
     /**
@@ -483,7 +484,7 @@ class Match internal constructor(
      */
     val method by lazy { classDef.methods.first { MethodUtil.methodSignaturesMatch(it, originalMethod) } }
 
-    @Deprecated("Instead use filterMatch")
+    @Deprecated("Instead use filterMatches", ReplaceWith("filterMatches"))
     val patternMatch by lazy {
         if (filterMatches == null) throw PatchException("Did not match $this")
         PatternMatch(filterMatches!!.first().index, filterMatches.last().index)
@@ -506,7 +507,7 @@ class Match internal constructor(
      * @param index The instruction index it matched with.
      * @param instruction The instruction that matched.
      */
-    class FilterMatch(
+    class FilterMatch internal constructor(
         val filter : InstructionFilter,
         val index: Int,
         val instruction: Instruction