chore: Merge branch dev to main (#3656)

Author: oSumAtrIX

CHANGELOG.md

@@ -1,3 +1,10 @@
+## [4.14.1-dev.1](https://github.com/ReVanced/revanced-patches/compare/v4.14.0...v4.14.1-dev.1) (2024-09-18)
+
+
+### Bug Fixes
+
+* **YouTube - Check environment:** Only use fields available since Android 8 ([#3655](https://github.com/ReVanced/revanced-patches/issues/3655)) ([4413533](https://github.com/ReVanced/revanced-patches/commit/441353306572340131030e1c4fee1ab6acb63cd9))
+
 # [4.14.0](https://github.com/ReVanced/revanced-patches/compare/v4.13.3...v4.14.0) (2024-09-18)
 
 

gradle.properties

@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 4.14.0
+version = 4.14.1-dev.1

src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt

@@ -65,12 +65,8 @@ abstract class BaseCheckEnvironmentPatch(
                 "PATCH_ID" to ID.encodedAndHashed,
                 "PATCH_MANUFACTURER" to MANUFACTURER.encodedAndHashed,
                 "PATCH_MODEL" to MODEL.encodedAndHashed,
-                "PATCH_ODM_SKU" to ODM_SKU.encodedAndHashed,
                 "PATCH_PRODUCT" to PRODUCT.encodedAndHashed,
                 "PATCH_RADIO" to RADIO.encodedAndHashed,
-                "PATCH_SKU" to SKU.encodedAndHashed,
-                "PATCH_SOC_MANUFACTURER" to SOC_MANUFACTURER.encodedAndHashed,
-                "PATCH_SOC_MODEL" to SOC_MODEL.encodedAndHashed,
                 "PATCH_TAGS" to TAGS.encodedAndHashed,
                 "PATCH_TYPE" to TYPE.encodedAndHashed,
                 "PATCH_USER" to USER.encodedAndHashed,
@@ -98,8 +94,10 @@ abstract class BaseCheckEnvironmentPatch(
         private val String.encodedAndHashed
             get() = MutableStringEncodedValue(
                 ImmutableStringEncodedValue(
-                    Base64.encode(MessageDigest.getInstance("SHA-1")
-                        .digest(this.toByteArray(StandardCharsets.UTF_8))),
+                    Base64.encode(
+                        MessageDigest.getInstance("SHA-1")
+                            .digest(this.toByteArray(StandardCharsets.UTF_8)),
+                    ),
                 ),
             )
 

stub/src/main/java/android/os/Build.java

@@ -14,12 +14,8 @@ public class Build {
     public static final String ID = null;
     public static final String MANUFACTURER = null;
     public static final String MODEL = null;
-    public static final String ODM_SKU = null;
     public static final String PRODUCT = null;
     public static final String RADIO = null;
-    public static final String SKU = null;
-    public static final String SOC_MANUFACTURER = null;
-    public static final String SOC_MODEL = null;
     public static final String TAGS = null;
     public static final String TYPE = null;
     public static final String USER = null;