Skip to content

Commit 49c5e16

Browse files
oSumAtrIXoSumAtrIX
authored
chore: Merge branch dev to main (#3407)
2 parents 9c843cb + a46f9dd commit 49c5e16

File tree

10 files changed

+32
-52
lines changed

10 files changed

+32
-52
lines changed

‎CHANGELOG.md‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
# [3.1.0-dev.1](https://github.com/ReVanced/revanced-patches/compare/v3.0.1...v3.1.0-dev.1) (2023-12-12)
2+
3+
4+
### Bug Fixes
5+
6+
* **Boost for Reddit - Spoof client:** Fix account login by removing user agent patch ([42a5de9](https://github.com/ReVanced/revanced-patches/commit/42a5de98becee7fc027c3e7143e071a3447f7077))
7+
* Solve build errors by using correct syntax ([3f5a5bf](https://github.com/ReVanced/revanced-patches/commit/3f5a5bf2ab061e7be2f430dc3f5fd64d5c842677))
8+
* **Sync for Reddit - Spoof client:** Fix account login by removing user agent patch ([d90786e](https://github.com/ReVanced/revanced-patches/commit/d90786e26d9c0e581284aab0d9d6d5097da2bfda))
9+
10+
11+
### Features
12+
13+
* **IconPackStudio - Unlock pro:** Constrain to last working version ([#3410](https://github.com/ReVanced/revanced-patches/issues/3410)) ([fb6ee8a](https://github.com/ReVanced/revanced-patches/commit/fb6ee8a8976b64477171f70229e161188c39efcd))
14+
115
## [3.0.1](https://github.com/ReVanced/revanced-patches/compare/v3.0.0...v3.0.1) (2023-12-12)
216

317

‎api/revanced-patches.api‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -418,7 +418,6 @@ public final class app/revanced/patches/reddit/customclients/baconreader/api/Spo
418418
public final class app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch {
419419
public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch;
420420
public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
421-
public fun patchUserAgent (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
422421
}
423422

424423
public final class app/revanced/patches/reddit/customclients/infinityforreddit/api/SpoofClientPatch : app/revanced/patches/reddit/customclients/AbstractSpoofClientPatch {
@@ -482,7 +481,6 @@ public final class app/revanced/patches/reddit/customclients/syncforreddit/api/S
482481
public static final field INSTANCE Lapp/revanced/patches/reddit/customclients/syncforreddit/api/SpoofClientPatch;
483482
public fun patchClientId (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
484483
public fun patchMiscellaneous (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
485-
public fun patchUserAgent (Ljava/util/Set;Lapp/revanced/patcher/data/BytecodeContext;)V
486484
}
487485

488486
public final class app/revanced/patches/reddit/customclients/syncforreddit/detection/piracy/DisablePiracyDetectionPatch : app/revanced/patcher/patch/BytecodePatch {

‎gradle.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
org.gradle.parallel = true
22
org.gradle.caching = true
33
kotlin.code.style = official
4-
version = 3.0.1
4+
version = 3.1.0-dev.1

‎patches.json‎

Lines changed: 1 addition & 1 deletion
Large diffs are not rendered by default.

‎src/main/kotlin/app/revanced/patches/iconpackstudio/misc/pro/UnlockProPatch.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import app.revanced.patches.iconpackstudio.misc.pro.fingerprints.CheckProFingerp
99

1010
@Patch(
1111
name = "Unlock pro",
12-
compatiblePackages = [CompatiblePackage("ginlemon.iconpackstudio")]
12+
compatiblePackages = [CompatiblePackage("ginlemon.iconpackstudio", ["2.2 build 016"])]
1313
)
1414
@Suppress("unused")
1515
object UnlockProPatch : BytecodePatch(

‎src/main/kotlin/app/revanced/patches/reddit/customclients/boostforreddit/api/SpoofClientPatch.kt‎

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import app.revanced.patcher.data.BytecodeContext
44
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
55
import app.revanced.patcher.fingerprint.MethodFingerprintResult
66
import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
7-
import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
87
import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.GetClientIdFingerprint
98
import app.revanced.patches.reddit.customclients.boostforreddit.api.fingerprints.LoginActivityOnCreateFingerprint
109

@@ -25,20 +24,4 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
2524
"""
2625
)
2726
}
28-
29-
override fun Set<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
30-
first().let { result ->
31-
result.mutableMethod.apply {
32-
val insertIndex = result.scanResult.patternScanResult!!.endIndex
33-
34-
addInstructions(
35-
insertIndex,
36-
"""
37-
const-string v7, "$OAUTH_USER_AGENT"
38-
invoke-virtual {v4, v7}, Landroid/webkit/WebSettings;->setUserAgentString(Ljava/lang/String;)V
39-
"""
40-
)
41-
}
42-
}
43-
}
4427
}

‎src/main/kotlin/app/revanced/patches/reddit/customclients/syncforreddit/api/SpoofClientPatch.kt‎

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,17 @@
11
package app.revanced.patches.reddit.customclients.syncforreddit.api
22

3-
import app.revanced.util.exception
43
import app.revanced.patcher.data.BytecodeContext
54
import app.revanced.patcher.extensions.InstructionExtensions.addInstructions
65
import app.revanced.patcher.extensions.InstructionExtensions.getInstruction
76
import app.revanced.patcher.extensions.InstructionExtensions.replaceInstruction
87
import app.revanced.patcher.fingerprint.MethodFingerprintResult
98
import app.revanced.patches.reddit.customclients.AbstractSpoofClientPatch
10-
import app.revanced.patches.reddit.customclients.Constants.OAUTH_USER_AGENT
119
import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetAuthorizationStringFingerprint
1210
import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.GetBearerTokenFingerprint
1311
import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.ImgurImageAPIFingerprint
1412
import app.revanced.patches.reddit.customclients.syncforreddit.api.fingerprints.LoadBrowserURLFingerprint
1513
import app.revanced.patches.reddit.customclients.syncforreddit.detection.piracy.DisablePiracyDetectionPatch
14+
import app.revanced.util.exception
1615
import com.android.tools.smali.dexlib2.iface.instruction.OneRegisterInstruction
1716
import com.android.tools.smali.dexlib2.iface.instruction.ReferenceInstruction
1817
import com.android.tools.smali.dexlib2.iface.reference.StringReference
@@ -76,18 +75,4 @@ object SpoofClientPatch : AbstractSpoofClientPatch(
7675
"const-string v1, \"https://api.imgur.com/3/image\""
7776
)
7877
}
79-
80-
override fun Set<MethodFingerprintResult>.patchUserAgent(context: BytecodeContext) {
81-
first().let { result ->
82-
val insertIndex = result.scanResult.patternScanResult!!.startIndex
83-
84-
result.mutableMethod.addInstructions(
85-
insertIndex,
86-
"""
87-
const-string v0, "$OAUTH_USER_AGENT"
88-
invoke-virtual {p1, v0}, Landroid/webkit/WebSettings;->setUserAgentString(Ljava/lang/String;)V
89-
"""
90-
)
91-
}
92-
}
9378
}

‎src/main/kotlin/app/revanced/patches/youtube/layout/thumbnails/AlternativeThumbnailsPatch.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -125,9 +125,9 @@ object AlternativeThumbnailsPatch : BytecodePatch(
125125
),
126126
SwitchPreference(
127127
"revanced_alt_thumbnail_dearrow_connection_toast",
128-
StringResource("revanced_alt_thumbnail_dearrow_connection_toast_title", "Show toast if API is not available"),
129-
StringResource("revanced_alt_thumbnail_dearrow_connection_toast_summary_on", "Toast shown if DeArrow is not available"),
130-
StringResource("revanced_alt_thumbnail_dearrow_connection_toast_summary_off", "Toast not shown if DeArrow is not available")
128+
StringResource("revanced_alt_thumbnail_dearrow_connection_toast_title", "Show a toast if API is not available"),
129+
StringResource("revanced_alt_thumbnail_dearrow_connection_toast_summary_on", "Toast is shown if DeArrow is not available"),
130+
StringResource("revanced_alt_thumbnail_dearrow_connection_toast_summary_off", "Toast is not shown if DeArrow is not available")
131131
),
132132
TextPreference(
133133
"revanced_alt_thumbnail_dearrow_api_url",
@@ -148,7 +148,7 @@ object AlternativeThumbnailsPatch : BytecodePatch(
148148
),
149149
StringResource(
150150
"revanced_alt_thumbnail_dearrow_about_summary",
151-
"DeArrow provides crowd sourced thumbnails for YouTube videos. " +
151+
"DeArrow provides crowd-sourced thumbnails for YouTube videos. " +
152152
"These thumbnails are often more relevant than those provided by YouTube. " +
153153
"If enabled, video URLs will be sent to the API server and no other data is sent."
154154
+ "\\n\\nTap here to learn more about DeArrow"
@@ -160,8 +160,8 @@ object AlternativeThumbnailsPatch : BytecodePatch(
160160
SwitchPreference(
161161
"revanced_alt_thumbnail_stills",
162162
StringResource("revanced_alt_thumbnail_stills_title", "Enable still video captures"),
163-
StringResource("revanced_alt_thumbnail_stills_summary_on", "Using YouTube video still captures"),
164-
StringResource("revanced_alt_thumbnail_stills_summary_off", "Not using YouTube video still captures")
163+
StringResource("revanced_alt_thumbnail_stills_summary_on", "Using YouTube still video captures"),
164+
StringResource("revanced_alt_thumbnail_stills_summary_off", "Not using YouTube still video captures")
165165
),
166166
ListPreference(
167167
"revanced_alt_thumbnail_stills_time",

‎src/main/resources/returnyoutubedislike/host/values/strings.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
<string name="revanced_ryd_compact_layout_summary_on">Like button styled for minimum width</string>
2727
<string name="revanced_ryd_compact_layout_summary_off">Like button styled for best appearance</string>
2828

29-
<string name="ryd_toast_on_connection_error_title">Show toast if API is not available</string>
30-
<string name="ryd_toast_on_connection_error_summary_on">Toast shown if ReturnYouTubeDislike API is not available</string>
31-
<string name="ryd_toast_on_connection_error_summary_off">Toast not shown if ReturnYouTubeDislike API is not available</string>
29+
<string name="ryd_toast_on_connection_error_title">Show a toast if API is not available</string>
30+
<string name="ryd_toast_on_connection_error_summary_on">Toast is shown if Return YouTube Dislike is not available</string>
31+
<string name="ryd_toast_on_connection_error_summary_off">Toast is not shown if Return YouTube Dislike is not available</string>
3232

3333
<string name="revanced_ryd_about">About</string>
3434
<string name="revanced_ryd_attribution_title">ReturnYouTubeDislike.com</string>

‎src/main/resources/sponsorblock/host/values/strings.xml‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
<string name="sb_enable_auto_hide_skip_segment_button_sum_on">Skip button hides after a few seconds</string>
1515
<string name="sb_enable_auto_hide_skip_segment_button_sum_off">Skip button displayed for entire segment</string>
1616
<string name="sb_general_skiptoast">Show a toast when skipping automatically</string>
17-
<string name="sb_general_skiptoast_sum_on">Toast shown when a segment is automatically skipped. Tap here to see an example</string>
18-
<string name="sb_general_skiptoast_sum_off">Toast not shown. Tap here to see an example</string>
17+
<string name="sb_general_skiptoast_sum_on">Toast is shown when a segment is automatically skipped. Tap here to see an example</string>
18+
<string name="sb_general_skiptoast_sum_off">Toast is not shown. Tap here to see an example</string>
1919
<string name="sb_general_time_without">Show video length without segments</string>
2020
<string name="sb_general_time_without_sum_on">Video length minus all segments, shown in parentheses next to the full video length</string>
2121
<string name="sb_general_time_without_sum_off">Full video length shown</string>
@@ -35,9 +35,9 @@
3535
<string name="sb_guidelines_popup_open">Show me</string>
3636

3737
<string name="sb_general">General</string>
38-
<string name="sb_toast_on_connection_error_title">Show toast if API is not available</string>
39-
<string name="sb_toast_on_connection_error_summary_on">Toast shown if SponsorBlock API is not available</string>
40-
<string name="sb_toast_on_connection_error_summary_off">Toast not shown if SponsorBlock API is not available</string>
38+
<string name="sb_toast_on_connection_error_title">Show a toast if API is not available</string>
39+
<string name="sb_toast_on_connection_error_summary_on">Toast is shown if SponsorBlock is not available</string>
40+
<string name="sb_toast_on_connection_error_summary_off">Toast is not shown if SponsorBlock is not available</string>
4141
<string name="sb_general_skipcount">Enable skip count tracking</string>
4242
<string name="sb_general_skipcount_sum_on">Lets the SponsorBlock leaderboard know how much time is saved. A message is sent to the leaderboard each time a segment is skipped</string>
4343
<string name="sb_general_skipcount_sum_off">Skip count tracking is not enabled</string>

0 commit comments

Comments
 (0)