feat(Boost For Reddit): Add `Fix /s/ links` patch #631

OctoNezd · 2024-05-11T18:10:41Z

Multi-part PR:

Part 1: feat(Boost For Reddit): Add Fix /s/ links patch revanced-patches#3154

This PR fixes ReVanced/revanced-patches#478

Code is essentially copy-paste from patch for Sync, but with more exception handling and adding the Authorization header to prevent reddit from giving the client page "log in or provide token or else" without proper Location: header.

OctoNezd · 2024-05-11T18:20:12Z

I really hate the database query part of this - however I couldn't find anything inside context that includes access token or any sort of HTTP client - so its the best solution I managed to come up with :(

My network is censored weirdly - I cant open reddit without VPN, and reddit blocks VPNs

app/src/main/java/app/revanced/integrations/boostforreddit/FixSLinksPatch.java

oSumAtrIX · 2024-05-11T18:32:21Z

app/src/main/java/app/revanced/integrations/boostforreddit/FixSLinksPatch.java

+import java.net.URL;
+
+public final class FixSLinksPatch {
+    public static String getUserAccessToken(Context context) {


Should be private

Should it still be private? Interfaces don't allow private+default

app/src/main/java/app/revanced/integrations/boostforreddit/FixSLinksPatch.java

OctoNezd · 2024-05-11T18:37:53Z

This is related to s-links - to get slink reliably (incl. banned networks) Authorization header with user token must be supplied, else reddit gives 403 without proper Location.

OctoNezd · 2024-05-12T12:21:43Z

Do I add Sync for reddit switch to interface in this PR or should I make a separate one after that one gets merged?

OctoNezd · 2024-05-12T13:08:35Z

On note of implementing support for Sync for reddit:

Sync doesn't store access tokens in its DB (unlike boost) - only refresh tokens. The access token in sync seem to be kept inside com.laurencedawson.reddit_sync.singleton.AccountSingleton - but I have no idea how one can even access it from integration. Unless the patch would also patch the AccountSingleton method that sets the Authorization header and somehow transfer between these two.

… into boost-slink

OctoNezd · 2024-05-16T15:39:37Z

Tested on Boost 1.12.12 and Sync v23.06.30-13:39.

Resolution no longer halts the UI.

Everything hopefully should be good, gonna run around with boost for a few days and check if everything gonna be okay.

oSumAtrIX

The abstraction can be improved. Theres still some duplicate implementations such as openInAppBrowser or resolveSLink. Instead of copying the implementation, try to reduce duplicates. In the example of openInAppBrowser you could for example add a field of type Activity and then set the field in the constructor of the instance with either activity for Sync and Boost, then the base class implementation could reference it. You would then not need to duplicate the implementation like you do now in the implementing classes.

OctoNezd · 2024-05-18T22:35:03Z

In the example of openInAppBrowser you could for example add a field of type Activity and then set the field in the constructor of the instance with either activity for Sync and Boost, then the base class implementation could reference it

Are you suggesting that both Boost & Sync use the same class, and inside constructor there is some sort of switch-case that determines webview activity based on package name?

app/src/main/java/app/revanced/integrations/boostforreddit/FixSLinksPatch.java

… into boost-slink

…tegrations into boost-slink

oSumAtrIX

Left some refactoring changes and TODOs in the code. Please check on them and test the refactoring changes (same for the patches part). Apart from that lgtm.

app/src/main/java/app/revanced/integrations/shared/fixes/slink/BaseFixSLinksPatch.java

OctoNezd · 2024-06-02T13:37:29Z

I am not sure on todo you added:

                    // TODO: Check if this ends in java.lang.ExceptionInInitializerError.
                    Objects.requireNonNull(location, "Location is null");

Wouldnt that be caught by catch (Exception e)?

oSumAtrIX · 2024-06-07T20:01:27Z

Wouldnt that be caught by catch (Exception e)?

You originally left a comment claiming that Objects.requireNonNull was causing a RuntimeException, but given that you were not able to reproduce again the question is redundant.

welcome · 2024-06-08T16:31:15Z

Thank you for contributing to ReVanced. Join us on Discord to receive a role for your contribution.

# [1.11.0-dev.3](v1.11.0-dev.2...v1.11.0-dev.3) (2024-06-08) ### Features * **Boost For Reddit:** Add `Fix /s/ links` patch ([#631](#631)) ([0c9ad35](0c9ad35))

# [1.11.0](v1.10.0...v1.11.0) (2024-06-23) ### Bug Fixes * **YouTube - Client spoof:** Correctly play more livestreams using Android VR ([#652](#652)) ([58f8172](58f8172)) * **YouTube - Hide description components:** Replace `Hide game section` and `Hide music section` with `Hide attributes section` ([#654](#654)) ([f82dfce](f82dfce)) * **YouTube - Return YouTube Dislike:** Do not replace view count with dislikes ([5f79196](5f79196)) * **YouTube - Spoof client:** Correctly play as background audio only with Android VR ([9adbc66](9adbc66)) * **YouTube - Spoof client:** Correctly play some live streams when using Android VR ([f74fb17](f74fb17)) * **YouTube:** Rename `Minimized playback` to `Remove background playback restrictions` ([#651](#651)) ([84c50c0](84c50c0)) ### Features * **Boost For Reddit:** Add `Fix /s/ links` patch ([#631](#631)) ([0c9ad35](0c9ad35)) * **YouTube - Comments:** Add `Hide 'Create a Short' button` option ([#656](#656)) ([064d8e9](064d8e9)) * **YouTube - Comments:** Add `Hide Thanks button` and `Hide 'Comments by members' header` options ([#653](#653)) ([240e805](240e805)) * **YouTube - Miniplayer:** Rename `Tablet mini player` and allow selecting the style of the in-app miniplayer ([#649](#649)) ([f483af6](f483af6))

# [1.11.0](v1.10.0...v1.11.0) (2024-06-23) ### Bug Fixes * **YouTube - Client spoof:** Correctly play more livestreams using Android VR ([ReVanced#652](https://github.com/E85Addict/revanced-integrations/issues/652)) ([58f8172](58f8172)) * **YouTube - Hide description components:** Replace `Hide game section` and `Hide music section` with `Hide attributes section` ([ReVanced#654](https://github.com/E85Addict/revanced-integrations/issues/654)) ([f82dfce](f82dfce)) * **YouTube - Return YouTube Dislike:** Do not replace view count with dislikes ([5f79196](5f79196)) * **YouTube - Spoof client:** Correctly play as background audio only with Android VR ([9adbc66](9adbc66)) * **YouTube - Spoof client:** Correctly play some live streams when using Android VR ([f74fb17](f74fb17)) * **YouTube:** Rename `Minimized playback` to `Remove background playback restrictions` ([ReVanced#651](https://github.com/E85Addict/revanced-integrations/issues/651)) ([84c50c0](84c50c0)) ### Features * **Boost For Reddit:** Add `Fix /s/ links` patch ([ReVanced#631](https://github.com/E85Addict/revanced-integrations/issues/631)) ([0c9ad35](0c9ad35)) * **YouTube - Comments:** Add `Hide 'Create a Short' button` option ([ReVanced#656](https://github.com/E85Addict/revanced-integrations/issues/656)) ([064d8e9](064d8e9)) * **YouTube - Comments:** Add `Hide Thanks button` and `Hide 'Comments by members' header` options ([ReVanced#653](https://github.com/E85Addict/revanced-integrations/issues/653)) ([240e805](240e805)) * **YouTube - Miniplayer:** Rename `Tablet mini player` and allow selecting the style of the in-app miniplayer ([ReVanced#649](https://github.com/E85Addict/revanced-integrations/issues/649)) ([f483af6](f483af6)) ### Performance Improvements * Add upstream sync ([cdb049d](cdb049d))

# [1.11.0](v1.10.0...v1.11.0) (2024-07-07) ### Bug Fixes * **YouTube - Client spoof:** Correctly play more livestreams using Android VR ([ReVanced#652](https://github.com/E85Addict/revanced-integrations/issues/652)) ([58f8172](58f8172)) * **YouTube - Hide description components:** Replace `Hide game section` and `Hide music section` with `Hide attributes section` ([ReVanced#654](https://github.com/E85Addict/revanced-integrations/issues/654)) ([f82dfce](f82dfce)) * **YouTube - Return YouTube Dislike:** Do not replace view count with dislikes ([5f79196](5f79196)) * **YouTube - Spoof client:** Correctly play as background audio only with Android VR ([9adbc66](9adbc66)) * **YouTube - Spoof client:** Correctly play some live streams when using Android VR ([f74fb17](f74fb17)) * **YouTube:** Rename `Minimized playback` to `Remove background playback restrictions` ([ReVanced#651](https://github.com/E85Addict/revanced-integrations/issues/651)) ([84c50c0](84c50c0)) ### Features * **Boost For Reddit:** Add `Fix /s/ links` patch ([ReVanced#631](https://github.com/E85Addict/revanced-integrations/issues/631)) ([0c9ad35](0c9ad35)) * **YouTube - Comments:** Add `Hide 'Create a Short' button` option ([ReVanced#656](https://github.com/E85Addict/revanced-integrations/issues/656)) ([064d8e9](064d8e9)) * **YouTube - Comments:** Add `Hide Thanks button` and `Hide 'Comments by members' header` options ([ReVanced#653](https://github.com/E85Addict/revanced-integrations/issues/653)) ([240e805](240e805)) * **YouTube - Miniplayer:** Rename `Tablet mini player` and allow selecting the style of the in-app miniplayer ([ReVanced#649](https://github.com/E85Addict/revanced-integrations/issues/649)) ([f483af6](f483af6)) ### Performance Improvements * Add upstream sync ([4e3b281](4e3b281))

# [1.11.0](v1.10.0...v1.11.0) (2024-07-11) ### Bug Fixes * **YouTube - Client spoof:** Correctly play more livestreams using Android VR ([ReVanced#652](https://github.com/E85Addict/revanced-integrations/issues/652)) ([58f8172](58f8172)) * **YouTube - Hide description components:** Replace `Hide game section` and `Hide music section` with `Hide attributes section` ([ReVanced#654](https://github.com/E85Addict/revanced-integrations/issues/654)) ([f82dfce](f82dfce)) * **YouTube - Return YouTube Dislike:** Do not replace view count with dislikes ([5f79196](5f79196)) * **YouTube - Spoof client:** Correctly play as background audio only with Android VR ([9adbc66](9adbc66)) * **YouTube - Spoof client:** Correctly play some live streams when using Android VR ([f74fb17](f74fb17)) * **YouTube:** Rename `Minimized playback` to `Remove background playback restrictions` ([ReVanced#651](https://github.com/E85Addict/revanced-integrations/issues/651)) ([84c50c0](84c50c0)) ### Features * **Boost For Reddit:** Add `Fix /s/ links` patch ([ReVanced#631](https://github.com/E85Addict/revanced-integrations/issues/631)) ([0c9ad35](0c9ad35)) * **YouTube - Comments:** Add `Hide 'Create a Short' button` option ([ReVanced#656](https://github.com/E85Addict/revanced-integrations/issues/656)) ([064d8e9](064d8e9)) * **YouTube - Comments:** Add `Hide Thanks button` and `Hide 'Comments by members' header` options ([ReVanced#653](https://github.com/E85Addict/revanced-integrations/issues/653)) ([240e805](240e805)) * **YouTube - Miniplayer:** Rename `Tablet mini player` and allow selecting the style of the in-app miniplayer ([ReVanced#649](https://github.com/E85Addict/revanced-integrations/issues/649)) ([f483af6](f483af6)) ### Performance Improvements * Add upstream sync ([e9c74d4](e9c74d4))

Initial support for FixSLinks on Boost for Reddit

45c23de

OctoNezd changed the title ~~[2/2] Add support for /s/ links on boost for reddit.~~ feat(Boost For Reddit - FixSLinks): [2/2] Add support for /s/ links on boost for reddit. May 11, 2024

OctoNezd mentioned this pull request May 11, 2024

feat(Boost For Reddit): Add Fix /s/ links patch ReVanced/revanced-patches#3154

Merged

oSumAtrIX reviewed May 11, 2024

View reviewed changes

app/src/main/java/app/revanced/integrations/boostforreddit/FixSLinksPatch.java Outdated Show resolved Hide resolved

This comment was marked as resolved.

Sign in to view

oSumAtrIX requested changes May 11, 2024

View reviewed changes

OctoNezd added 4 commits May 12, 2024 15:04

Create IFixSLinksPatch interface

59cb577

Implement IFixSLinksPatch interface for Boost /s/ link adapter

43c284e

Add error toasts

d9fec48

Clean-up imports in Boost patch

daa3a10

OctoNezd requested a review from oSumAtrIX May 12, 2024 12:22

Boost: Grab access_token from JRAW

f981ed0

OctoNezd marked this pull request as draft May 16, 2024 14:54

Re-add sync patch

ea4a049

OctoNezd marked this pull request as ready for review May 16, 2024 15:37

OctoNezd and others added 2 commits May 16, 2024 18:37

Merge branch 'dev' into boost-slink

6804b7c

Merge branch 'dev' of https://github.com/revanced/revanced-integrations…

550ef32

… into boost-slink

oSumAtrIX changed the title ~~feat(Boost For Reddit - FixSLinks): [2/2] Add support for /s/ links on boost for reddit.~~ feat(Boost For Reddit): Add Fix /s/ links patch May 18, 2024

refactor

af39ab3

oSumAtrIX requested changes May 18, 2024

View reviewed changes

OctoNezd commented May 18, 2024

View reviewed changes

app/src/main/java/app/revanced/integrations/boostforreddit/FixSLinksPatch.java Outdated Show resolved Hide resolved

OctoNezd added 3 commits May 19, 2024 10:57

Merge branch 'dev' of https://github.com/revanced/revanced-integrations…

d6ca560

… into boost-slink

Merge branch 'boost-slink' of https://github.com/OctoNezd/revanced-in…

b9f7bfa

…tegrations into boost-slink

Simplify FixSLinksPatch(es)

11518fb

OctoNezd added 2 commits May 19, 2024 12:22

Remove old unrelated comment

f15b8fe

Add documentation on basic implementation inside abstract class

deeb73f

OctoNezd force-pushed the boost-slink branch from 72dc54d to deeb73f Compare May 25, 2024 15:41

OctoNezd requested a review from oSumAtrIX May 25, 2024 17:42

oSumAtrIX added 2 commits June 1, 2024 20:03

refactor

c5acfc1

refactor

34f01c5

oSumAtrIX reviewed Jun 1, 2024

View reviewed changes

app/src/main/java/app/revanced/integrations/shared/fixes/slink/BaseFixSLinksPatch.java Outdated Show resolved Hide resolved

Remove Context argument and use getContext instead

a30c5f1

oSumAtrIX and others added 3 commits June 7, 2024 22:40

refactor

cbedeb8

Fix singleton

85c2ebe

refactor singleton

a709169

oSumAtrIX approved these changes Jun 8, 2024

View reviewed changes

oSumAtrIX merged commit 0c9ad35 into ReVanced:dev Jun 8, 2024
2 checks passed

revanced-bot pushed a commit that referenced this pull request Jun 8, 2024

chore(release): 1.11.0-dev.3 [skip ci]

758dfad

# [1.11.0-dev.3](v1.11.0-dev.2...v1.11.0-dev.3) (2024-06-08) ### Features * **Boost For Reddit:** Add `Fix /s/ links` patch ([#631](#631)) ([0c9ad35](0c9ad35))

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(Boost For Reddit): Add `Fix /s/ links` patch #631

feat(Boost For Reddit): Add `Fix /s/ links` patch #631

OctoNezd commented May 11, 2024

OctoNezd commented May 11, 2024

This comment was marked as resolved.

oSumAtrIX May 11, 2024

OctoNezd May 12, 2024

OctoNezd commented May 11, 2024

OctoNezd commented May 12, 2024

OctoNezd commented May 12, 2024

OctoNezd commented May 16, 2024

oSumAtrIX left a comment

OctoNezd commented May 18, 2024

oSumAtrIX left a comment •

edited

Loading

OctoNezd commented Jun 2, 2024

oSumAtrIX commented Jun 7, 2024

welcome bot commented Jun 8, 2024

feat(Boost For Reddit): Add Fix /s/ links patch #631

feat(Boost For Reddit): Add Fix /s/ links patch #631

Conversation

OctoNezd commented May 11, 2024

OctoNezd commented May 11, 2024

This comment was marked as resolved.

oSumAtrIX May 11, 2024

Choose a reason for hiding this comment

OctoNezd May 12, 2024

Choose a reason for hiding this comment

OctoNezd commented May 11, 2024

OctoNezd commented May 12, 2024

OctoNezd commented May 12, 2024

OctoNezd commented May 16, 2024

oSumAtrIX left a comment

Choose a reason for hiding this comment

OctoNezd commented May 18, 2024

oSumAtrIX left a comment • edited Loading

Choose a reason for hiding this comment

OctoNezd commented Jun 2, 2024

oSumAtrIX commented Jun 7, 2024

welcome bot commented Jun 8, 2024

feat(Boost For Reddit): Add `Fix /s/ links` patch #631

feat(Boost For Reddit): Add `Fix /s/ links` patch #631

oSumAtrIX left a comment •

edited

Loading