From 441353306572340131030e1c4fee1ab6acb63cd9 Mon Sep 17 00:00:00 2001 From: oSumAtrIX Date: Thu, 19 Sep 2024 00:57:54 +0200 Subject: [PATCH] fix(YouTube - Check environment): Only use fields available since Android 8 (#3655) --- .../shared/misc/checks/BaseCheckEnvironmentPatch.kt | 10 ++++------ stub/src/main/java/android/os/Build.java | 4 ---- 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt b/src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt index 0411a0c51..a906b0f57 100644 --- a/src/main/kotlin/app/revanced/patches/shared/misc/checks/BaseCheckEnvironmentPatch.kt +++ b/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)), + ), ), ) diff --git a/stub/src/main/java/android/os/Build.java b/stub/src/main/java/android/os/Build.java index 45999597c..ddcac8126 100644 --- a/stub/src/main/java/android/os/Build.java +++ b/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;