diff --git a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt index 43a3a1beb..1abda77d3 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/EhEngine.kt @@ -41,6 +41,7 @@ import com.hippo.ehviewer.client.parser.GalleryNotAvailableParser import com.hippo.ehviewer.client.parser.GalleryPageApiParser import com.hippo.ehviewer.client.parser.GalleryPageParser import com.hippo.ehviewer.client.parser.GalleryTokenApiParser +import com.hippo.ehviewer.client.parser.HomeParser import com.hippo.ehviewer.client.parser.ProfileParser import com.hippo.ehviewer.client.parser.RateGalleryParser import com.hippo.ehviewer.client.parser.SignInParser @@ -760,7 +761,7 @@ object EhEngine { } @Throws(Throwable::class) - suspend fun getFunds(): ArchiveParser.Funds? { + suspend fun getFunds(): HomeParser.Funds { val url = EhUrl.URL_FUNDS Log.d(TAG, url) val request = EhRequestBuilder(url, null).build() @@ -773,7 +774,7 @@ object EhEngine { code = response.code headers = response.headers body = response.body.string() - return ArchiveParser.parseFunds(body!!) + return HomeParser.parseFunds(body!!) } } catch (e: Throwable) { ExceptionUtils.throwIfFatal(e) diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/ArchiveParser.kt b/app/src/main/java/com/hippo/ehviewer/client/parser/ArchiveParser.kt index ce37500da..1696717b4 100644 --- a/app/src/main/java/com/hippo/ehviewer/client/parser/ArchiveParser.kt +++ b/app/src/main/java/com/hippo/ehviewer/client/parser/ArchiveParser.kt @@ -23,8 +23,6 @@ object ArchiveParser { Regex("(.*).*Click Here To Start Downloading") private val PATTERN_CURRENT_FUNDS = Regex("
([\\d,]+) GP \\[[^]]*] ([\\d,]+) Credits \\[[^]]*]
") - private val PATTERN_FUNDS = - Regex("Available: ([\\d,]+) Credits.*Available: ([\\d,]+) kGP", RegexOption.DOT_MATCHES_ALL) private val PATTERN_HATH_FORM = Regex("