chore: merge branch dev to main (#1496)

2024-07-06 13:51:34 +02:00 · 2023-01-18 00:38:58 +01:00 · 2023-01-18 00:38:58 +01:00 · d0ab4da50f
commit d0ab4da50f
parent 1e6ef87f17 96f17cea41
15 changed files with 230 additions and 9 deletions
--- a/.github/ISSUE_TEMPLATE/bug-issue.yml
+++ b/.github/ISSUE_TEMPLATE/bug-issue.yml
@ -36,7 +36,7 @@ body:
  - type: textarea
    attributes:
      label: Relevant log output
-      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
+      description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks. Capture crash logs by running `logcat | grep AndroidRuntime`.
      render: shell
    validations:
      required: true
@ -70,4 +70,4 @@ body:
        - label: I have written a short but informative title.
          required: true
        - label: I filled out all of the requested information in this issue properly.
-          required: true
+          required: true
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,3 +1,20 @@
+# [2.156.0-dev.1](https://github.com/revanced/revanced-patches/compare/v2.155.1-dev.1...v2.156.0-dev.1) (2023-01-17)
+
+
+### Features
+
+* explain how to capture crash logs [skip ci] ([f938ba8](https://github.com/revanced/revanced-patches/commit/f938ba81ec98f06f508dbdceeabd29a0ea7bf1af))
+* **id-austria:** `remove-root-detection` patch ([3cf77cd](https://github.com/revanced/revanced-patches/commit/3cf77cdb4ebbd128d29eedefa1ee35289e3c8058))
+* **id-austria:** `spoof-signature` patch ([355a847](https://github.com/revanced/revanced-patches/commit/355a847b1ccd69c4ab2c356395c97b4871e53f1f))
+* **nova-launcher:** `unlock-prime` patch ([#1463](https://github.com/revanced/revanced-patches/issues/1463)) ([cf710b2](https://github.com/revanced/revanced-patches/commit/cf710b27740cce4b9a0fbdf03a494eb8c65246da))
+
+## [2.155.1-dev.1](https://github.com/revanced/revanced-patches/compare/v2.155.0...v2.155.1-dev.1) (2023-01-15)
+
+
+### Bug Fixes
+
+* **reddit/general-reddit-ads:** specify last version that works correctly ([#1495](https://github.com/revanced/revanced-patches/issues/1495)) ([2a3bedd](https://github.com/revanced/revanced-patches/commit/2a3bedd5608d2f23b174c4227ac167e44e54215e))
+
 # [2.155.0](https://github.com/revanced/revanced-patches/compare/v2.154.0...v2.155.0) (2023-01-15)


--- a/README.md
+++ b/README.md
@ -150,10 +150,19 @@ The official Patch bundle provided by ReVanced and the community.

 | 💊 Patch | 📜 Description | 🏹 Target Version |
 |:--------:|:--------------:|:-----------------:|
-| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | all |
+| `general-reddit-ads` | Removes general ads from the Reddit frontpage and subreddits. | 2022.43.0 |
 | `premium-icon-reddit` | Unlocks premium Reddit app icons. | all |
 </details>

+### [📦 `at.gv.oe.app`](https://play.google.com/store/apps/details?id=at.gv.oe.app)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `remove-root-detection` | Removes the check for root permissions and unlocked bootloader. | 2.5.2 |
+| `spoof-signature` | Spoofs the signature of the app. | 2.5.2 |
+</details>
+
 ### [📦 `com.vanced.android.youtube`](https://play.google.com/store/apps/details?id=com.vanced.android.youtube)
 <details>

@ -202,6 +211,14 @@ The official Patch bundle provided by ReVanced and the community.
 | `promo-code-unlock` | Disables the validation of promo code. Any code will work to unlock all features. | all |
 </details>

+### [📦 `com.teslacoilsw.launcher`](https://play.google.com/store/apps/details?id=com.teslacoilsw.launcher)
+<details>
+
+| 💊 Patch | 📜 Description | 🏹 Target Version |
+|:--------:|:--------------:|:-----------------:|
+| `unlock-prime` | Unlocks Nova Prime and all functions of the app. | all |
+</details>
+
 ### [📦 `com.awedea.nyx`](https://play.google.com/store/apps/details?id=com.awedea.nyx)
 <details>

--- a/build.gradle.kts
+++ b/build.gradle.kts
@ -20,10 +20,10 @@ repositories {
 }

 dependencies {
-    implementation("app.revanced:revanced-patcher:6.4.1")
-    implementation("app.revanced:multidexlib2:2.5.2.r2")
+    implementation("app.revanced:revanced-patcher:6.4.2")
+    implementation("app.revanced:multidexlib2:2.5.3-a3836654")
    // Required for meta
-    implementation("com.google.code.gson:gson:2.10")
+    implementation("com.google.code.gson:gson:2.10.1")
 }

 tasks {
--- a/gradle.properties
+++ b/gradle.properties
@ -1,2 +1,2 @@
 kotlin.code.style = official
-version = 2.155.0
+version = 2.156.0-dev.1
--- a/patches.json
+++ b/patches.json
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/fingerprints/RootDetectionFingerprint.kt
@ -0,0 +1,12 @@
+package app.revanced.patches.idaustria.detection.root.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object RootDetectionFingerprint : MethodFingerprint(
+    "V",
+    access = AccessFlags.PUBLIC.value,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/DeviceIntegrityCheck;")
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/root/patch/RootDetectionPatch.kt
@ -0,0 +1,25 @@
+package app.revanced.patches.idaustria.detection.root.patch
+
+import app.revanced.patcher.annotation.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.idaustria.detection.root.fingerprints.RootDetectionFingerprint
+import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
+
+@Patch
+@Name("remove-root-detection")
+@Description("Removes the check for root permissions and unlocked bootloader.")
+@DetectionCompatibility
+@Version("0.0.1")
+class RootDetectionPatch : BytecodePatch(
+    listOf(RootDetectionFingerprint)
+) {
+    override fun execute(context: BytecodeContext): PatchResult {
+        RootDetectionFingerprint.result!!.mutableMethod.addInstructions(0, "return-void")
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/shared/annotations/DetectionCompatibility.kt
@ -0,0 +1,9 @@
+package app.revanced.patches.idaustria.detection.shared.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility([Package("at.gv.oe.app", arrayOf("2.5.2"))])
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class DetectionCompatibility
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/fingerprints/SpoofSignatureFingerprint.kt
@ -0,0 +1,13 @@
+package app.revanced.patches.idaustria.detection.signature.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.AccessFlags
+
+object SpoofSignatureFingerprint : MethodFingerprint(
+    "L",
+    parameters = listOf("L"),
+    access = AccessFlags.PRIVATE.value,
+    customFingerprint = { methodDef ->
+        methodDef.definingClass.endsWith("/SL2Step1Task;") && methodDef.name == "getPubKey"
+    }
+)
--- a/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/idaustria/detection/signature/patch/SpoofSignaturePatch.kt
@ -0,0 +1,45 @@
+package app.revanced.patches.idaustria.detection.signature.patch
+
+import app.revanced.patcher.annotation.*
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstructions
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.idaustria.detection.shared.annotations.DetectionCompatibility
+import app.revanced.patches.idaustria.detection.signature.fingerprints.SpoofSignatureFingerprint
+
+@Patch
+@Name("spoof-signature")
+@Description("Spoofs the signature of the app.")
+@DetectionCompatibility
+@Version("0.0.1")
+class SpoofSignaturePatch : BytecodePatch(
+    listOf(SpoofSignatureFingerprint)
+) {
+    companion object {
+        const val EXPECTED_SIGNATURE = "OpenSSLRSAPublicKey{modulus=ac3e6fd6050aa7e0d6010ae58190404cd89a56935b44f6fee" +
+                "067c149768320026e10b24799a1339e414605e448e3f264444a327b9ae292be2b62ad567dd1800dbed4a88f718a33dc6db6b" +
+                "f5178aa41aa0efff8a3409f5ca95dbfccd92c7b4298966df806ea7a0204a00f0e745f6d9f13bdf24f3df715d7b62c1600906" +
+                "15de1c8a956b9286764985a3b3c060963c435fb9481a5543aaf0671fc2dba6c5c2b17d1ef1d85137f14dc9bbdf3490288087" +
+                "324cd48341cce64fabf6a9b55d1a7bf23b2fcdff451fd85bf0c7feb0a5e884d7c5c078e413149566a12a686e6efa70ae5161" +
+                "a0201307692834cda336c55157fef125e67c01c1359886f94742105596b42a790404bbcda5dad6a65f115aaff5e45ef3c28b" +
+                "2316ff6cef07aa49a45aa58c07bf258051b13ef449ccb37a3679afd5cfb9132f70bb9d931a937897544f90c3bcc80ed012e9" +
+                "f6ba020b8cdc23f8c29ac092b88f0e370ff9434e4f0f359e614ae0868dc526fa41e4b7596533e8d10279b66e923ecd9f0b20" +
+                "0def55be2c1f6f9c72c92fb45d7e0a9ac571cb38f0a9a37bb33ea06f223fde8c7a92e8c47769e386f9799776e8f110c21df2" +
+                "77ef1be61b2c01ebdabddcbf53cc4b6fd9a3c445606ee77b3758162c80ad8f8137b3c6864e92db904807dcb2be9d7717dd21" +
+                "bf42c121d620ddfb7914f7a95c713d9e1c1b7bdb4a03d618e40cf7e9e235c0b5687e03b7ab3,publicExponent=10001}"
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        SpoofSignatureFingerprint.result!!.mutableMethod.addInstructions(
+            0,
+            """
+                const-string v0, "$EXPECTED_SIGNATURE"
+                return-object v0 
+            """
+        )
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/nova/prime/annotations/UnlockPrimeCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/nova/prime/annotations/UnlockPrimeCompatibility.kt
@ -0,0 +1,13 @@
+package app.revanced.patches.nova.prime.annotations
+
+import app.revanced.patcher.annotation.Compatibility
+import app.revanced.patcher.annotation.Package
+
+@Compatibility(
+    [
+        Package("com.teslacoilsw.launcher")
+    ]
+)
+@Target(AnnotationTarget.CLASS)
+@Retention(AnnotationRetention.RUNTIME)
+internal annotation class UnlockPrimeCompatibility
--- a/src/main/kotlin/app/revanced/patches/nova/prime/fingerprints/UnlockPrimeFingerprint.kt
+++ b/src/main/kotlin/app/revanced/patches/nova/prime/fingerprints/UnlockPrimeFingerprint.kt
@ -0,0 +1,16 @@
+package app.revanced.patches.nova.prime.fingerprints
+
+import app.revanced.patcher.fingerprint.method.impl.MethodFingerprint
+import org.jf.dexlib2.Opcode
+
+object UnlockPrimeFingerprint : MethodFingerprint(
+    "V",
+    opcodes = listOf(
+        Opcode.IPUT_OBJECT,
+        Opcode.CONST_STRING,
+        Opcode.CONST_4,
+        Opcode.INVOKE_INTERFACE,
+        Opcode.MOVE_RESULT
+    ),
+    strings = listOf("1")
+)
--- a/src/main/kotlin/app/revanced/patches/nova/prime/patch/UnlockPrimePatch.kt
+++ b/src/main/kotlin/app/revanced/patches/nova/prime/patch/UnlockPrimePatch.kt
@ -0,0 +1,50 @@
+package app.revanced.patches.nova.prime.patch
+
+import app.revanced.extensions.toErrorResult
+import app.revanced.patcher.annotation.Description
+import app.revanced.patcher.annotation.Name
+import app.revanced.patcher.annotation.Version
+import app.revanced.patcher.data.BytecodeContext
+import app.revanced.patcher.extensions.addInstruction
+import app.revanced.patcher.patch.BytecodePatch
+import app.revanced.patcher.patch.PatchResult
+import app.revanced.patcher.patch.PatchResultSuccess
+import app.revanced.patcher.patch.annotations.Patch
+import app.revanced.patches.nova.prime.annotations.UnlockPrimeCompatibility
+import app.revanced.patches.nova.prime.fingerprints.UnlockPrimeFingerprint
+import org.jf.dexlib2.builder.instruction.BuilderInstruction11x
+
+@Patch
+@Name("unlock-prime")
+@Description("Unlocks Nova Prime and all functions of the app.")
+@UnlockPrimeCompatibility
+@Version("0.0.1")
+class UnlockPrimePatch : BytecodePatch(
+    listOf(
+        UnlockPrimeFingerprint
+    )
+) {
+    private companion object {
+        // Any value except 0 unlocks prime, but 512 is needed for a protection mechanism
+        // which would reset the preferences if the value on disk had changed after a restart.
+        const val PRIME_STATUS: Int = 512
+    }
+
+    override fun execute(context: BytecodeContext): PatchResult {
+        UnlockPrimeFingerprint.result?.apply {
+            val insertIndex = scanResult.patternScanResult!!.endIndex + 1
+
+            val primeStatusRegister =
+                (mutableMethod.implementation!!.instructions[insertIndex - 1] as BuilderInstruction11x).registerA
+
+            mutableMethod.addInstruction(
+                insertIndex,
+                """
+                    const/16 v$primeStatusRegister, $PRIME_STATUS
+                """
+            )
+        } ?: UnlockPrimeFingerprint.toErrorResult()
+
+        return PatchResultSuccess()
+    }
+}
--- a/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt
+++ b/src/main/kotlin/app/revanced/patches/reddit/ad/general/annotations/GeneralAdsCompatibility.kt
@ -3,7 +3,11 @@ package app.revanced.patches.reddit.ad.general.annotations
 import app.revanced.patcher.annotation.Compatibility
 import app.revanced.patcher.annotation.Package

-@Compatibility([Package("com.reddit.frontpage")])
+@Compatibility(
+    [Package(
+        "com.reddit.frontpage", arrayOf("2022.43.0")
+    )]
+)
@Target(AnnotationTarget.CLASS)
@Retention(AnnotationRetention.RUNTIME)
 internal annotation class GeneralAdsCompatibility