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 additional advanced options to login screen

Browse Source 
Add "more" button into global search results
Retry-all button is now more explicit on what was retried
Minor performance fix in hitomi search
This commit is contained in:
NerdNumber9
2018-07-08 17:53:03 -04:00
parent 30c12fc9de
commit 28d05b629f
11 changed files with 197 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,12 +9,16 @@ import android.webkit.CookieManager
import android.webkit.WebView
import android.webkit.WebViewClient
import com.afollestad.materialdialogs.MaterialDialog
import com.jakewharton.rxbinding.view.clicks
import eu.kanade.tachiyomi.R
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.gone
import eu.kanade.tachiyomi.util.invisible
import eu.kanade.tachiyomi.util.launchUI
import eu.kanade.tachiyomi.util.visible
import exh.EXH_SOURCE_ID
import exh.uconfig.WarnConfigureDialogController
import kotlinx.android.synthetic.main.eh_activity_login.view.*
@ -46,7 +50,33 @@ class LoginController : NucleusController<LoginPresenter>() {
with(view) {
btn_cancel.setOnClickListener { router.popCurrentController() }
btn_recheck.setOnClickListener { webview.loadUrl("https://exhentai.org/") }
btn_advanced.setOnClickListener {
advanced_options.visible()
adv_shim.visible()
webview.gone()
btn_advanced.isEnabled = false
btn_cancel.isEnabled = false
}
btn_close.setOnClickListener {
hideAdvancedOptions(this)
}
btn_recheck.setOnClickListener {
hideAdvancedOptions(this)
webview.loadUrl("https://exhentai.org/")
}
btn_alt_login.setOnClickListener {
hideAdvancedOptions(this)
webview.loadUrl("https://e-hentai.org/bounce_login.php")
}
btn_skip_restyle.setOnClickListener {
hideAdvancedOptions(this)
webview.loadUrl("https://forums.e-hentai.org/index.php?act=Login&$PARAM_SKIP_INJECT=true")
}
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
CookieManager.getInstance().removeAllCookies {
@ -61,6 +91,16 @@ class LoginController : NucleusController<LoginPresenter>() {
}
}
private fun hideAdvancedOptions(view: View) {
with(view) {
advanced_options.gone()
adv_shim.gone()
webview.visible()
btn_advanced.isEnabled = true
btn_cancel.isEnabled = true
}
}
fun startWebview(view: View) {
with(view) {
webview.settings.javaScriptEnabled = true
@ -75,7 +115,8 @@ class LoginController : NucleusController<LoginPresenter>() {
val parsedUrl = Uri.parse(url)
if (parsedUrl.host.equals("forums.e-hentai.org", ignoreCase = true)) {
//Hide distracting content
view.loadUrl(HIDE_JS)
if(!parsedUrl.queryParameterNames.contains(PARAM_SKIP_INJECT))
view.loadUrl(HIDE_JS)
//Check login result
if (parsedUrl.getQueryParameter("code")?.toInt() != 0) {
@ -177,6 +218,8 @@ class LoginController : NucleusController<LoginPresenter>() {
}
companion object {
const val PARAM_SKIP_INJECT = "TEH_SKIP_INJECT"
const val MEMBER_ID_COOKIE = "ipb_member_id"
const val PASS_HASH_COOKIE = "ipb_pass_hash"
const val IGNEOUS_COOKIE = "igneous"