From 97a86269e6cf11e73590d4bd2fe27ff3f27c0fb5 Mon Sep 17 00:00:00 2001
From: Rani Sargees <cheeze.sprinkels+official_git@gmail.com>
Date: Wed, 11 Mar 2020 00:15:33 -0400
Subject: [PATCH] change a dependency to try to fix merged sources

---
 .../tachiyomi/source/online/english/EightMuses.kt    | 12 ++++++------
 .../tachiyomi/source/online/english/HBrowse.kt       |  6 +++---
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt
index 08fe628a0..b174e5ffa 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/EightMuses.kt
@@ -2,7 +2,7 @@ package eu.kanade.tachiyomi.source.online.english
 
 import android.net.Uri
 import com.kizitonwose.time.hours
-import com.lvla.rxjava.interopkt.toV1Single
+import hu.akarnokd.rxjava.interop.RxJavaInterop
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.asObservableSuccess
 import eu.kanade.tachiyomi.source.model.*
@@ -177,9 +177,9 @@ class EightMuses: HttpSource(),
         return client.newCall(request)
                 .asObservableSuccess()
                 .flatMapSingle { response ->
-                    GlobalScope.async(Dispatchers.IO) {
+                    RxJavaInterop.toV1Single(GlobalScope.async(Dispatchers.IO) {
                         parseResultsPage(response, dig)
-                    }.asSingle(GlobalScope.coroutineContext).toV1Single()
+                    }.asSingle(GlobalScope.coroutineContext))
                 }
     }
 
@@ -252,9 +252,9 @@ class EightMuses: HttpSource(),
     }
 
     override fun fetchChapterList(manga: SManga): Observable<List<SChapter>> {
-        return GlobalScope.async(Dispatchers.IO) {
+        return RxJavaInterop.toV1Single(GlobalScope.async(Dispatchers.IO) {
             fetchAndParseChapterList("", manga.url)
-        }.asSingle(GlobalScope.coroutineContext).toV1Single().toObservable()
+        }.asSingle(GlobalScope.coroutineContext)).toObservable()
     }
 
     private suspend fun fetchAndParseChapterList(prefix: String, url: String): List<SChapter> {
@@ -382,4 +382,4 @@ class EightMuses: HttpSource(),
         }
         return "/comics/album/${path.joinToString("/")}"
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
index 02fdafdb5..498232ecb 100644
--- a/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
+++ b/app/src/main/java/eu/kanade/tachiyomi/source/online/english/HBrowse.kt
@@ -4,7 +4,7 @@ import android.net.Uri
 import com.github.salomonbrys.kotson.array
 import com.github.salomonbrys.kotson.string
 import com.google.gson.JsonParser
-import com.lvla.rxjava.interopkt.toV1Single
+import hu.akarnokd.rxjava.interop.RxJavaInterop
 import eu.kanade.tachiyomi.network.GET
 import eu.kanade.tachiyomi.network.POST
 import eu.kanade.tachiyomi.network.asObservable
@@ -129,7 +129,7 @@ class HBrowse : HttpSource(), LewdSource<HBrowseSearchMetadata, Document>, UrlIm
             = throw UnsupportedOperationException("Should not be called!")
 
     private fun fetchSearchMangaInternal(page: Int, query: String, filters: FilterList): Observable<MangasPage> {
-        return GlobalScope.async(Dispatchers.IO) {
+        return RxJavaInterop.toV1Single(GlobalScope.async(Dispatchers.IO) {
             val modeFilter = filters.filterIsInstance<ModeFilter>().firstOrNull()
             val sortFilter = filters.filterIsInstance<SortFilter>().firstOrNull()
 
@@ -252,7 +252,7 @@ class HBrowse : HttpSource(), LewdSource<HBrowseSearchMetadata, Document>, UrlIm
                         hasNextPage
                 )
             }
-        }.asSingle(GlobalScope.coroutineContext).toV1Single().toObservable()
+        }.asSingle(GlobalScope.coroutineContext)).toObservable()
     }
 
     // Collection must be sorted and cannot be sorted