diff --git a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt index f072c549..80062a24 100644 --- a/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt +++ b/app/src/main/java/com/futo/platformplayer/activities/LoginActivity.kt @@ -79,20 +79,9 @@ class LoginActivity : AppCompatActivity() { val uiMods = authConfig.uiMods?.toMutableList() ?: mutableListOf(); var currentScale = 100; var currentDesktop = false; - _webView.setInitialScale(50); webViewClient.onPageLoaded.subscribe { view, url -> _textUrl.setText(url ?: ""); - if(!isFirstLoad) - return@subscribe; - isFirstLoad = false; - - if(!authConfig.loginButton.isNullOrEmpty() && authConfig.loginButton.matches(REGEX_LOGIN_BUTTON)) { - Logger.i(TAG, "Clicking login button [${authConfig.loginButton}]"); - //TODO: Find most reliable way to wait for page js to finish - view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {}); - } - if(loginWarnings.size > 0 && url != null) { synchronized(loginWarnings) { val warning = loginWarnings.find { url.matches(it.getRegex()) }; @@ -106,6 +95,16 @@ class LoginActivity : AppCompatActivity() { } } + if(!isFirstLoad) + return@subscribe; + isFirstLoad = false; + + if(!authConfig.loginButton.isNullOrEmpty() && authConfig.loginButton.matches(REGEX_LOGIN_BUTTON)) { + Logger.i(TAG, "Clicking login button [${authConfig.loginButton}]"); + //TODO: Find most reliable way to wait for page js to finish + view?.evaluateJavascript("setTimeout(()=> document.querySelector(\"${authConfig.loginButton}\")?.click(), 1000)", {}); + } + /* var specifiedScale = false; var specifiedDesktop = false;