ProfessionalUwU/tachiyomi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Massage user agent string from WebView a bit more

Browse Source
This commit is contained in:
arkon 2021-02-07 16:19:13 -05:00
parent 3aeac7e7b5
commit cf1609a429
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/eu/kanade/tachiyomi/util/system/WebViewUtil.kt
View File

@ -10,10 +10,6 @@ import eu.kanade.tachiyomi.util.lang.launchUI
import timber.log.Timber import timber.log.Timber
object WebViewUtil { object WebViewUtil {
val WEBVIEW_UA_VERSION_REGEX by lazy {
Regex(""".*Chrome/(\d+)\..*""")
}
var DEFAULT_USER_AGENT: String = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)" var DEFAULT_USER_AGENT: String = "Mozilla/5.0 (Windows NT 10.0; Win64; x64)"
private set private set
@ -31,6 +27,8 @@ object WebViewUtil {
DEFAULT_USER_AGENT = WebView(context) DEFAULT_USER_AGENT = WebView(context)
.getDefaultUserAgentString() .getDefaultUserAgentString()
.replace("; wv", "") .replace("; wv", "")
.replace(" Build\\/.+?\\)".toRegex(), ")")
.replace("Version/.*? ".toRegex(), "")
} }
} catch (e: Exception) { } catch (e: Exception) {
Timber.e(e) Timber.e(e)
@ -59,7 +57,7 @@ fun WebView.setDefaultSettings() {
} }
private fun WebView.getWebViewMajorVersion(): Int { private fun WebView.getWebViewMajorVersion(): Int {
val uaRegexMatch = WebViewUtil.WEBVIEW_UA_VERSION_REGEX.matchEntire(getDefaultUserAgentString()) val uaRegexMatch = """.*Chrome/(\d+)\..*""".toRegex().matchEntire(getDefaultUserAgentString())
return if (uaRegexMatch != null && uaRegexMatch.groupValues.size > 1) { return if (uaRegexMatch != null && uaRegexMatch.groupValues.size > 1) {
uaRegexMatch.groupValues[1].toInt() uaRegexMatch.groupValues[1].toInt()
} else { } else {