From 88b5550df7080d365bc3213a19f0585fa98ca304 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Sun, 22 Dec 2024 18:21:57 +0900 Subject: [PATCH 1/4] fix(Reddit - Hide ads): Patch failing during building with certain patch selection --- .../src/main/kotlin/app/revanced/patches/reddit/ad/AdsPatch.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/patches/src/main/kotlin/app/revanced/patches/reddit/ad/AdsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/reddit/ad/AdsPatch.kt index d01e0bc6e..df6539d9a 100644 --- a/patches/src/main/kotlin/app/revanced/patches/reddit/ad/AdsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/reddit/ad/AdsPatch.kt @@ -87,9 +87,9 @@ val adsPatch = bytecodePatch( compatibleWith(COMPATIBLE_PACKAGE) dependsOn( + settingsPatch, bannerAdsPatch, commentAdsPatch, - settingsPatch ) execute { From 3e7b690d76ae9bba2e823b543c726d68035fb794 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Sun, 22 Dec 2024 18:23:45 +0900 Subject: [PATCH 2/4] fix(YouTube): Some strings are missing https://github.com/inotia00/ReVanced_Extended/issues/2597 --- .../patches/youtube/utils/settings/SettingsPatch.kt | 13 +++++++++++++ .../youtube/settings/values-v21/strings.xml | 7 +++++++ 2 files changed, 20 insertions(+) create mode 100644 patches/src/main/resources/youtube/settings/values-v21/strings.xml diff --git a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt index e1bcc7c8c..13e59bb69 100644 --- a/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt +++ b/patches/src/main/kotlin/app/revanced/patches/youtube/utils/settings/SettingsPatch.kt @@ -29,6 +29,7 @@ import app.revanced.util.removeStringsElements import app.revanced.util.valueOrThrow import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction import org.w3c.dom.Element +import java.nio.file.Files import java.util.jar.Manifest private const val EXTENSION_INITIALIZATION_CLASS_DESCRIPTOR = @@ -182,6 +183,18 @@ val settingsPatch = resourcePatch( copyXmlNode("youtube/settings/host", "values/$xmlFile", "resources") } + val valuesV21Directory = get("res").resolve("values-v21") + if (!valuesV21Directory.isDirectory) + Files.createDirectories(valuesV21Directory.toPath()) + + copyResources( + "youtube/settings", + ResourceGroup( + "values-v21", + "strings.xml" + ) + ) + arrayOf( ResourceGroup( "drawable", diff --git a/patches/src/main/resources/youtube/settings/values-v21/strings.xml b/patches/src/main/resources/youtube/settings/values-v21/strings.xml new file mode 100644 index 000000000..6fe87a4c3 --- /dev/null +++ b/patches/src/main/resources/youtube/settings/values-v21/strings.xml @@ -0,0 +1,7 @@ + + + + @string/revanced_spoof_streaming_data_side_effects_android + @string/revanced_spoof_streaming_data_side_effects_android + @string/revanced_spoof_streaming_data_side_effects_android + From 863c03943852187408f4f3927fa898a2510d6f76 Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Sun, 22 Dec 2024 18:23:53 +0900 Subject: [PATCH 3/4] feat(Translations): Update translation --- .../src/main/resources/youtube/translations/it-rIT/strings.xml | 1 + .../src/main/resources/youtube/translations/ja-rJP/strings.xml | 2 ++ 2 files changed, 3 insertions(+) diff --git a/patches/src/main/resources/youtube/translations/it-rIT/strings.xml b/patches/src/main/resources/youtube/translations/it-rIT/strings.xml index 8c8c72705..a1e78d884 100644 --- a/patches/src/main/resources/youtube/translations/it-rIT/strings.xml +++ b/patches/src/main/resources/youtube/translations/it-rIT/strings.xml @@ -1788,6 +1788,7 @@ Tocca il pulsante Continua e consenti le modifiche di ottimizzazione." Usa solo il client Android Il client Android è usato per recuperare i dati in streaming. I client Android e iOS sono usati per recuperare i dati in streaming. + La disattivazione di questa impostazione potrebbe causare problemi di riproduzione. Mostra nelle statistiche per nerd Il client usato per recuperare i dati in streaming è visibile nelle statistiche per nerd. Il client usato per recuperare i dati in streaming è nascosto nelle statistiche per nerd. diff --git a/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml b/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml index 0413fa87d..0eab6fd63 100644 --- a/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml +++ b/patches/src/main/resources/youtube/translations/ja-rJP/strings.xml @@ -1778,12 +1778,14 @@ GmsCore の電池の最適化を無効にしても、バッテリーの使用に iOS iOS Music iOS TV + Android Creator Android TV Android VR ストリーミングデータを偽装することによる副作用 ・まだ見つかっていません。 ・子供向け動画は再生できない可能性があります。 ・映画や有料動画は再生できない可能性があります。 + Android クライアントのみを使用 統計情報に偽装したクライアントを表示 統計情報に偽装したストリーミングデータを表示します。 統計情報に偽装したストリーミングデータを表示します。 From bdae48b981fc2303c853547b2e69e87f7aaaae9a Mon Sep 17 00:00:00 2001 From: inotia00 <108592928+inotia00@users.noreply.github.com> Date: Sun, 22 Dec 2024 18:24:53 +0900 Subject: [PATCH 4/4] bump 5.1.3 --- gradle.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle.properties b/gradle.properties index 52e659b34..9013491db 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,5 +4,5 @@ org.gradle.parallel = true android.useAndroidX = true kotlin.code.style = official kotlin.jvm.target.validation.mode = IGNORE -version = 5.1.2 +version = 5.1.3