mirror/mihon
1
0
Fork 0
mirror of https://github.com/mihonapp/mihon.git synced 2025-06-27 19:47:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Tsumino captcha display and merge branch 'master' of upstream

Browse Source 
# Conflicts:
#	.github/readme-images/app-icon.png
#	.github/readme-images/screens.png
#	.travis.yml
#	README.md
#	app/build.gradle
#	app/src/main/java/eu/kanade/tachiyomi/data/preference/PreferencesHelper.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/SourceManager.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSource.kt
#	app/src/main/java/eu/kanade/tachiyomi/source/online/YamlHttpSourceMappings.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/library/LibraryController.kt
#	app/src/main/java/eu/kanade/tachiyomi/ui/main/MainActivity.kt
#	app/src/main/java/eu/kanade/tachiyomi/util/DynamicConcurrentMergeOperator.java
This commit is contained in:
NerdNumber9
2018-02-25 15:34:19 -05:00
parent a71ae29c98
commit 07ce90ab8c
9 changed files with 241 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/exh/ui/login/LoginController.kt
View File

@ -14,6 +14,7 @@ import eu.kanade.tachiyomi.data.preference.PreferencesHelper
import eu.kanade.tachiyomi.source.SourceManager
import eu.kanade.tachiyomi.source.online.all.EHentai
import eu.kanade.tachiyomi.ui.base.controller.NucleusController
import eu.kanade.tachiyomi.util.launchUI
import exh.EXH_SOURCE_ID
import exh.uconfig.WarnConfigureDialogController
import kotlinx.android.synthetic.main.eh_activity_login.view.*
@ -49,9 +50,9 @@ class LoginController : NucleusController<LoginPresenter>() {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
CookieManager.getInstance().removeAllCookies {
Observable.fromCallable {
launchUI {
startWebview(view)
}.subscribeOn(AndroidSchedulers.mainThread()).subscribe()
}
}
} else {
CookieManager.getInstance().removeAllCookie()
@ -67,7 +68,7 @@ class LoginController : NucleusController<LoginPresenter>() {
webview.loadUrl("https://forums.e-hentai.org/index.php?act=Login")
webview.setWebViewClient(object : WebViewClient() {
webview.webViewClient = object : WebViewClient() {
override fun onPageFinished(view: WebView, url: String) {
super.onPageFinished(view, url)
Timber.d(url)
@ -88,7 +89,7 @@ class LoginController : NucleusController<LoginPresenter>() {
}
}
}
})
}
}
}