X-Git-Url: https://gitweb.stoutner.com/?p=PrivacyBrowserAndroid.git;a=blobdiff_plain;f=app%2Fsrc%2Fmain%2Fjava%2Fcom%2Fstoutner%2Fprivacybrowser%2Fviewmodels%2FWebViewSource.kt;h=d55540ecc5e7acfff45862b78ceed86d43cc5ac4;hp=1b9d9e1203dd15399c1efba4f05e5e6337115c13;hb=8142ac5fc2489de735de4b6fa21a1eae733ccfce;hpb=39fd3a6664fe15f9e050e6bb8c0ca0e125fd2f0f diff --git a/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt b/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt index 1b9d9e12..d55540ec 100644 --- a/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt +++ b/app/src/main/java/com/stoutner/privacybrowser/viewmodels/WebViewSource.kt @@ -1,20 +1,20 @@ /* - * Copyright © 2020-2021 Soren Stoutner . + * Copyright © 2020-2022 Soren Stoutner . * - * This file is part of Privacy Browser . + * This file is part of Privacy Browser Android . * - * Privacy Browser is free software: you can redistribute it and/or modify + * Privacy Browser Android is free software: you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * Privacy Browser is distributed in the hope that it will be useful, + * Privacy Browser Android is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with Privacy Browser. If not, see . + * along with Privacy Browser Android. If not, see . */ package com.stoutner.privacybrowser.viewmodels @@ -43,7 +43,8 @@ class WebViewSource(private val urlString: String, private val userAgent: String val getSourceBackgroundTask = GetSourceBackgroundTask() // Get the source. - executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, localeString, proxy, contentResolver, this)) } + executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, localeString, proxy, contentResolver, this, + false)) } } // The source observer. @@ -65,7 +66,7 @@ class WebViewSource(private val urlString: String, private val userAgent: String } // The workhorse that gets the source. - fun updateSource(urlString: String) { + fun updateSource(urlString: String, ignoreSslErrors: Boolean) { // Reset the mutable live data error string. This prevents the snackbar from displaying later if the activity restarts. mutableLiveDataErrorString.postValue("") @@ -73,6 +74,7 @@ class WebViewSource(private val urlString: String, private val userAgent: String val getSourceBackgroundTask = GetSourceBackgroundTask() // Get the source. - executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, localeString, proxy, contentResolver, this)) } + executorService.execute { mutableLiveDataSourceStringArray.postValue(getSourceBackgroundTask.acquire(urlString, userAgent, localeString, proxy, contentResolver, this, + ignoreSslErrors)) } } } \ No newline at end of file