RedirectFixActivity: only follow redirects with URL cleaning enabled

Fixes tasomaniac#86
Atemu · May 13, 2023 · 3e1b411 · 3e1b411
1 parent 2c6f019
commit 3e1b411
Showing 1 changed file with 10 additions and 4 deletions.
diff --git a/redirect/src/main/kotlin/com/tasomaniac/openwith/redirect/RedirectFixActivity.kt b/redirect/src/main/kotlin/com/tasomaniac/openwith/redirect/RedirectFixActivity.kt
@@ -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
 
@@ -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
         }
     }