Skip to content

Commit 1fbaeef

Browse files
anddeaanddea
committed
feat(YT Music): Bump new versions
1 parent cc87b2d commit 1fbaeef

File tree

6 files changed

+23
-21
lines changed

6 files changed

+23
-21
lines changed

‎api/revanced-patches.api

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -642,8 +642,8 @@ public final class app/revanced/patches/music/utils/intenthook/IntentHookPatch :
642642
public synthetic fun execute (Lapp/revanced/patcher/data/Context;)V
643643
}
644644

645-
public final class app/revanced/patches/music/utils/intenthook/fingerprints/FullStackTraceActivityFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
646-
public static final field INSTANCE Lapp/revanced/patches/music/utils/intenthook/fingerprints/FullStackTraceActivityFingerprint;
645+
public final class app/revanced/patches/music/utils/intenthook/fingerprints/GoogleApiActivityFingerprint : app/revanced/patcher/fingerprint/MethodFingerprint {
646+
public static final field INSTANCE Lapp/revanced/patches/music/utils/intenthook/fingerprints/GoogleApiActivityFingerprint;
647647
}
648648

649649
public final class app/revanced/patches/music/utils/litho/LithoFilterPatch : app/revanced/patcher/patch/BytecodePatch, java/io/Closeable {

‎src/main/kotlin/app/revanced/patches/music/player/oldstyleminiplayer/OldStyleMiniPlayerPatch.kt

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import app.revanced.patcher.data.BytecodeContext
44
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
55
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
66
import app.revanced.patcher.patch.BytecodePatch
7+
import app.revanced.patcher.patch.PatchException
78
import app.revanced.patcher.patch.annotation.CompatiblePackage
89
import app.revanced.patcher.patch.annotation.Patch
910
import app.revanced.patches.music.player.oldstyleminiplayer.fingerprints.MiniPlayerParentFingerprint
@@ -23,7 +24,8 @@ import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
2324
SettingsPatch::class,
2425
SharedResourceIdPatch::class
2526
],
26-
compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")]
27+
compatiblePackages = [CompatiblePackage("com.google.android.apps.youtube.music")],
28+
use = false
2729
)
2830
@Suppress("unused")
2931
object OldStyleMiniPlayerPatch : BytecodePatch(
@@ -53,7 +55,7 @@ object OldStyleMiniPlayerPatch : BytecodePatch(
5355
"""
5456
)
5557
}
56-
} ?: throw NextButtonVisibilityFingerprint.exception
58+
} ?: throw PatchException("This version is not supported. Please use YT Music 6.42 or earlier.")
5759
} ?: throw MiniPlayerParentFingerprint.exception
5860

5961
SwipeToCloseFingerprint.result?.let {

‎src/main/kotlin/app/revanced/patches/music/utils/intenthook/IntentHookPatch.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,17 @@ import app.revanced.patcher.patch.BytecodePatch
77
import app.revanced.patcher.patch.annotation.Patch
88
import app.revanced.patcher.util.smali.ExternalLabel
99
import app.revanced.patches.music.utils.integrations.Constants.INTEGRATIONS_PATH
10-
import app.revanced.patches.music.utils.intenthook.fingerprints.FullStackTraceActivityFingerprint
10+
import app.revanced.patches.music.utils.intenthook.fingerprints.GoogleApiActivityFingerprint
1111
import app.revanced.patches.music.utils.settings.SettingsPatch
1212
import app.revanced.util.exception
1313

1414
@Patch(dependencies = [SettingsPatch::class])
1515
object IntentHookPatch : BytecodePatch(
16-
setOf(FullStackTraceActivityFingerprint)
16+
setOf(GoogleApiActivityFingerprint)
1717
) {
1818
override fun execute(context: BytecodeContext) {
1919

20-
FullStackTraceActivityFingerprint.result?.let {
20+
GoogleApiActivityFingerprint.result?.let {
2121
it.mutableMethod.apply {
2222
addInstructionsWithLabels(
2323
1, """
@@ -28,7 +28,7 @@ object IntentHookPatch : BytecodePatch(
2828
""", ExternalLabel("show", getInstruction(1))
2929
)
3030
}
31-
} ?: throw FullStackTraceActivityFingerprint.exception
31+
} ?: throw GoogleApiActivityFingerprint.exception
3232

3333
}
34-
}
34+
}

‎src/main/kotlin/app/revanced/patches/music/utils/intenthook/fingerprints/FullStackTraceActivityFingerprint.kt renamed to ‎src/main/kotlin/app/revanced/patches/music/utils/intenthook/fingerprints/GoogleApiActivityFingerprint.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@ package app.revanced.patches.music.utils.intenthook.fingerprints
22

33
import app.revanced.patcher.fingerprint.MethodFingerprint
44

5-
object FullStackTraceActivityFingerprint : MethodFingerprint(
5+
object GoogleApiActivityFingerprint : MethodFingerprint(
66
returnType = "V",
77
parameters = listOf("Landroid/os/Bundle;"),
88
customFingerprint = { methodDef, _ ->
9-
methodDef.definingClass.endsWith("/FullStackTraceActivity;") && methodDef.name == "onCreate"
9+
methodDef.definingClass.endsWith("/GoogleApiActivity;") && methodDef.name == "onCreate"
1010
}
1111
)

‎src/main/kotlin/app/revanced/patches/music/utils/settings/ResourceUtils.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ object ResourceUtils {
2323
"com.google.android.apps.youtube.music.ui.preference.SwitchCompatPreference"
2424

2525
const val YOUTUBE_MUSIC_PREFERENCE_TARGET_CLASS =
26-
"com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity"
26+
"com.google.android.gms.common.api.GoogleApiActivity"
2727

2828
var targetPackage = "com.google.android.apps.youtube.music"
2929

‎src/main/resources/music/sponsorblock/xml/sponsorblock_prefs.xml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,32 +5,32 @@
55
<com.google.android.apps.youtube.music.ui.preference.SwitchCompatPreference android:title="@string/sb_toast_on_skip" android:key="sb_toast_on_skip" android:summary="@string/sb_toast_on_skip_sum" android:dependency="sb_enabled" android:defaultValue="true" />
66
<com.google.android.apps.youtube.music.ui.preference.SwitchCompatPreference android:title="@string/sb_toast_on_connection_error" android:key="sb_toast_on_connection_error" android:summary="@string/sb_toast_on_connection_error_sum" android:dependency="sb_enabled" android:defaultValue="false" />
77
<Preference android:title="@string/sb_api_url" android:key="sb_api_url" android:summary="@string/sb_api_url_sum" android:dependency="sb_enabled">
8-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_api_url" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
8+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_api_url" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
99
</Preference>
1010
<com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat android:title="@string/sb_diff_segments" android:key="segments">
1111
<Preference android:title="@string/sb_segments_sponsor" android:key="sb_segments_sponsor" android:summary="@string/sb_segments_sponsor_sum">
12-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_sponsor" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
12+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_sponsor" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
1313
</Preference>
1414
<Preference android:title="@string/sb_segments_selfpromo" android:key="sb_segments_selfpromo" android:summary="@string/sb_segments_selfpromo_sum">
15-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_selfpromo" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
15+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_selfpromo" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
1616
</Preference>
1717
<Preference android:title="@string/sb_segments_interaction" android:key="sb_segments_interaction" android:summary="@string/sb_segments_interaction_sum">
18-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_interaction" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
18+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_interaction" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
1919
</Preference>
2020
<Preference android:title="@string/sb_segments_intro" android:key="sb_segments_intro" android:summary="@string/sb_segments_intro_sum">
21-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_intro" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
21+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_intro" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
2222
</Preference>
2323
<Preference android:title="@string/sb_segments_outro" android:key="sb_segments_outro" android:summary="@string/sb_segments_outro_sum">
24-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_outro" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
24+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_outro" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
2525
</Preference>
2626
<Preference android:title="@string/sb_segments_preview" android:key="sb_segments_preview" android:summary="@string/sb_segments_preview_sum">
27-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_preview" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
27+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_preview" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
2828
</Preference>
2929
<Preference android:title="@string/sb_segments_filler" android:key="sb_segments_filler" android:summary="@string/sb_segments_filler_sum">
30-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_filler" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
30+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_filler" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
3131
</Preference>
3232
<Preference android:title="@string/sb_segments_nomusic" android:key="sb_segments_music_offtopic" android:summary="@string/sb_segments_nomusic_sum">
33-
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_music_offtopic" android:targetClass="com.google.android.libraries.strictmode.penalties.notification.FullStackTraceActivity" />
33+
<intent android:targetPackage="com.google.android.apps.youtube.music" android:data="sb_segments_music_offtopic" android:targetClass="com.google.android.gms.common.api.GoogleApiActivity" />
3434
</Preference>
3535
</com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat>
3636
<com.google.android.apps.youtube.music.ui.preference.PreferenceCategoryCompat android:title="@string/sb_about" android:key="about">

0 commit comments

Comments
 (0)