From a86ed92214a0b25a99dd634999d593aee08dd738 Mon Sep 17 00:00:00 2001
From: arkon <arkon@users.noreply.github.com>
Date: Sat, 26 Aug 2023 10:22:01 -0400
Subject: [PATCH] Remove usages of rxandroid (#17688)

---
 gradle/libs.versions.toml                                  | 2 --
 src/all/komga/build.gradle                                 | 6 +-----
 src/all/lanraragi/build.gradle                             | 6 +-----
 src/all/tachidesk/build.gradle                             | 7 +------
 .../kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt  | 3 +--
 5 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index bb8087899..d69e7350f 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -19,7 +19,6 @@ coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", ve
 coroutines-android = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-android", version.ref = "coroutines_version" }
 
 injekt-core = { module = "com.github.inorichi.injekt:injekt-core", version = "65b0440" }
-rxandroid = { module = "io.reactivex:rxandroid", version = "1.2.1" }
 rxjava = { module = "io.reactivex:rxjava", version = "1.3.8" }
 jsoup = { module = "org.jsoup:jsoup", version = "1.15.1" }
 okhttp = { module = "com.squareup.okhttp3:okhttp", version = "5.0.0-alpha.11" }
@@ -27,4 +26,3 @@ quickjs = { module = "app.cash.quickjs:quickjs-android", version = "0.9.2" }
 
 [bundles]
 common = ["kotlin-stdlib", "coroutines-core", "coroutines-android", "injekt-core", "rxjava", "kotlin-protobuf", "kotlin-json", "jsoup", "okhttp", "tachiyomi-lib", "quickjs"]
-reactivex = ["rxandroid"]
diff --git a/src/all/komga/build.gradle b/src/all/komga/build.gradle
index f04faa5c7..f866a844f 100644
--- a/src/all/komga/build.gradle
+++ b/src/all/komga/build.gradle
@@ -6,11 +6,7 @@ ext {
     extName = 'Komga'
     pkgNameSuffix = 'all.komga'
     extClass = '.KomgaFactory'
-    extVersionCode = 47
-}
-
-dependencies {
-    compileOnly libs.bundles.reactivex
+    extVersionCode = 48
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/lanraragi/build.gradle b/src/all/lanraragi/build.gradle
index 6cf8118a9..0bd070762 100644
--- a/src/all/lanraragi/build.gradle
+++ b/src/all/lanraragi/build.gradle
@@ -6,11 +6,7 @@ ext {
     extName = 'LANraragi'
     pkgNameSuffix = 'all.lanraragi'
     extClass = '.LANraragiFactory'
-    extVersionCode = 13
-}
-
-dependencies {
-    compileOnly libs.bundles.reactivex
+    extVersionCode = 14
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/tachidesk/build.gradle b/src/all/tachidesk/build.gradle
index 19b917ad1..0b756ba38 100644
--- a/src/all/tachidesk/build.gradle
+++ b/src/all/tachidesk/build.gradle
@@ -6,12 +6,7 @@ ext {
     extName = 'Suwayomi'
     pkgNameSuffix = 'all.tachidesk'
     extClass = '.Tachidesk'
-    extVersionCode = 10
-}
-
-dependencies {
-    implementation 'io.reactivex:rxandroid:1.2.1'
-    implementation 'io.reactivex:rxjava:1.3.8'
+    extVersionCode = 11
 }
 
 apply from: "$rootDir/common.gradle"
diff --git a/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt b/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt
index cdcfd5cce..69beabb0d 100644
--- a/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt
+++ b/src/all/tachidesk/src/eu/kanade/tachiyomi/extension/all/tachidesk/Tachidesk.kt
@@ -30,7 +30,6 @@ import okhttp3.Response
 import okhttp3.internal.toImmutableList
 import rx.Observable
 import rx.Single
-import rx.android.schedulers.AndroidSchedulers
 import rx.schedulers.Schedulers
 import uy.kohesive.injekt.Injekt
 import uy.kohesive.injekt.api.get
@@ -206,7 +205,7 @@ class Tachidesk : ConfigurableSource, UnmeteredSource, HttpSource() {
             client.newCall(GET("$baseUrl/api/v1/category", headers)).execute()
         }
             .subscribeOn(Schedulers.io())
-            .observeOn(AndroidSchedulers.mainThread())
+            .observeOn(Schedulers.io())
             .subscribe(
                 { response ->
                     categoryList = try {