Draff/TachiyomiSY-Plus
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix captcha solve activity sometimes never appearing

Browse Source
This commit is contained in:
NerdNumber9 2019-04-20 14:07:52 -04:00
parent 895191814e
commit b785f68154
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/exh/ui/captcha/BrowserActionActivity.kt
View File

@ -615,13 +615,18 @@ class BrowserActionActivity : AppCompatActivity() {
val TRANSCRIPT_CLEANER_REGEX = Regex("[^0-9a-zA-Z_ -]") val TRANSCRIPT_CLEANER_REGEX = Regex("[^0-9a-zA-Z_ -]")
val SPACE_DEDUPE_REGEX = Regex(" +") val SPACE_DEDUPE_REGEX = Regex(" +")
private fun baseIntent(context: Context) =
Intent(context, BrowserActionActivity::class.java).apply {
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK and Intent.FLAG_ACTIVITY_NO_HISTORY)
}
fun launchCaptcha(context: Context, fun launchCaptcha(context: Context,
source: ActionCompletionVerifier, source: ActionCompletionVerifier,
cookies: Map<String, String>, cookies: Map<String, String>,
script: String?, script: String?,
url: String, url: String,
autoSolveSubmitBtnSelector: String? = null) { autoSolveSubmitBtnSelector: String? = null) {
val intent = Intent(context, BrowserActionActivity::class.java).apply { val intent = baseIntent(context).apply {
putExtra(SOURCE_ID_EXTRA, source.id) putExtra(SOURCE_ID_EXTRA, source.id)
putExtra(COOKIES_EXTRA, HashMap(cookies)) putExtra(COOKIES_EXTRA, HashMap(cookies))
putExtra(SCRIPT_EXTRA, script) putExtra(SCRIPT_EXTRA, script)
@ -635,7 +640,7 @@ class BrowserActionActivity : AppCompatActivity() {
fun launchUniversal(context: Context, fun launchUniversal(context: Context,
source: HttpSource, source: HttpSource,
url: String) { url: String) {
val intent = Intent(context, BrowserActionActivity::class.java).apply { val intent = baseIntent(context).apply {
putExtra(SOURCE_ID_EXTRA, source.id) putExtra(SOURCE_ID_EXTRA, source.id)
putExtra(URL_EXTRA, url) putExtra(URL_EXTRA, url)
} }
@ -648,7 +653,7 @@ class BrowserActionActivity : AppCompatActivity() {
script: String?, script: String?,
url: String, url: String,
actionName: String) { actionName: String) {
val intent = Intent(context, BrowserActionActivity::class.java).apply { val intent = baseIntent(context).apply {
putExtra(SOURCE_ID_EXTRA, completionVerifier.id) putExtra(SOURCE_ID_EXTRA, completionVerifier.id)
putExtra(SCRIPT_EXTRA, script) putExtra(SCRIPT_EXTRA, script)
putExtra(URL_EXTRA, url) putExtra(URL_EXTRA, url)
@ -664,7 +669,7 @@ class BrowserActionActivity : AppCompatActivity() {
url: String, url: String,
actionName: String, actionName: String,
headers: Map<String, String>? = emptyMap()) { headers: Map<String, String>? = emptyMap()) {
val intent = Intent(context, BrowserActionActivity::class.java).apply { val intent = baseIntent(context).apply {
putExtra(HEADERS_EXTRA, HashMap(headers)) putExtra(HEADERS_EXTRA, HashMap(headers))
putExtra(VERIFY_LAMBDA_EXTRA, completionVerifier as Serializable) putExtra(VERIFY_LAMBDA_EXTRA, completionVerifier as Serializable)
putExtra(SCRIPT_EXTRA, script) putExtra(SCRIPT_EXTRA, script)