Skip to content

RedirectFixActivity: only follow redirects with URL cleaning enabled #102

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Atemu wants to merge 1 commit into
base: master
Choose a base branch
from
Open

RedirectFixActivity: only follow redirects with URL cleaning enabled #102

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions redirect/src/main/kotlin/com/tasomaniac/openwith/redirect/RedirectFixActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ class RedirectFixActivity : DaggerAppCompatActivity() {
@Inject lateinit var redirectFixer: RedirectFixer
@Inject lateinit var urlFix: UrlFix
@Inject lateinit var schedulingStrategy: SchedulingStrategy
@Inject lateinit var cleanUrlsPreferences: CleanUrlsPreferences

private var disposable: Disposable? = null

Expand Down Expand Up @@ -57,10 +58,15 @@ class RedirectFixActivity : DaggerAppCompatActivity() {
}

private val redirectTransformer = MaybeTransformer<HttpUrl, HttpUrl> { source ->
source.flatMap { httpUrl ->
redirectFixer
.followRedirects(httpUrl)
.toMaybe()
if (cleanUrlsPreferences.isEnabled) {
source.flatMap { httpUrl ->
redirectFixer
.followRedirects(httpUrl)
.toMaybe()
}
} else {
// Identity; do nothing
source
}
}

Expand Down