Merge branch 'hotfix/5.10.4'

Author: CDRussell

app/src/main/java/com/duckduckgo/app/browser/BrowserWebViewClient.kt

@@ -21,6 +21,8 @@ import android.graphics.Bitmap
 import android.net.Uri
 import android.net.http.SslError
 import android.os.Build
+import android.support.annotation.AnyThread
+import android.support.annotation.UiThread
 import android.support.annotation.WorkerThread
 import android.webkit.*
 import androidx.core.net.toUri
@@ -32,6 +34,7 @@ import com.duckduckgo.app.statistics.pixels.Pixel.PixelName.HTTPS_UPGRADE_SITE_E
 import com.duckduckgo.app.statistics.pixels.Pixel.PixelParameter
 import timber.log.Timber
 import javax.inject.Inject
+import kotlin.concurrent.thread
 
 
 class BrowserWebViewClient @Inject constructor(
@@ -117,40 +120,52 @@ class BrowserWebViewClient @Inject constructor(
         return webViewRequestInterceptor.shouldIntercept(request, webView, currentUrl, webViewClientListener)
     }
 
+    @UiThread
     @Suppress("OverridingDeprecatedMember")
     override fun onReceivedError(view: WebView, errorCode: Int, description: String, failingUrl: String) {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
             val url = failingUrl.toUri()
-            if (isHttpsUpgradeSite(url)) {
-                reportHttpsUpgradeSiteError(url, statusCode = null, error = "WEB_RESOURCE_ERROR_$errorCode")
-            }
+            reportHttpsErrorIfInUpgradeList(url, statusCode = null, error = "WEB_RESOURCE_ERROR_$errorCode")
         }
         super.onReceivedError(view, errorCode, description, failingUrl)
     }
 
+    @UiThread
     @TargetApi(Build.VERSION_CODES.M)
     override fun onReceivedError(view: WebView, request: WebResourceRequest, error: WebResourceError) {
-        if (request.isForMainFrame && isHttpsUpgradeSite(request.url)) {
-            reportHttpsUpgradeSiteError(request.url, statusCode = null, error = "WEB_RESOURCE_ERROR_${error.errorCode}")
+        if (request.isForMainFrame) {
+            reportHttpsErrorIfInUpgradeList(request.url, statusCode = null, error = "WEB_RESOURCE_ERROR_${error.errorCode}")
         }
         super.onReceivedError(view, request, error)
     }
 
+    @UiThread
     override fun onReceivedHttpError(view: WebView, request: WebResourceRequest, errorResponse: WebResourceResponse) {
-        if (request.isForMainFrame && isHttpsUpgradeSite(request.url)) {
-            reportHttpsUpgradeSiteError(request.url, errorResponse.statusCode, error = null)
+        if (request.isForMainFrame) {
+            reportHttpsErrorIfInUpgradeList(request.url, errorResponse.statusCode, error = null)
         }
         super.onReceivedHttpError(view, request, errorResponse)
     }
 
+    @UiThread
     override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) {
         val uri = error.url.toUri()
-        if (isHttpsUpgradeSite(uri)) {
-            reportHttpsUpgradeSiteError(uri, null, "SSL_ERROR_${error.primaryError}")
-        }
+        reportHttpsErrorIfInUpgradeList(uri, null, "SSL_ERROR_${error.primaryError}")
         super.onReceivedSslError(view, handler, error)
     }
 
+    @AnyThread
+    private fun reportHttpsErrorIfInUpgradeList(url: Uri, statusCode: Int?, error: String?) {
+
+        if (!url.isHttps) return
+
+        thread {
+            if (httpsUpgrader.isInUpgradeList(url)) {
+                reportHttpsUpgradeSiteError(url, statusCode, error)
+            }
+        }
+    }
+
     private fun reportHttpsUpgradeSiteError(url: Uri, statusCode: Int?, error: String?) {
         val params = mapOf(
             PixelParameter.URL to url.simpleUrl,
@@ -160,10 +175,6 @@ class BrowserWebViewClient @Inject constructor(
         pixel.fire(HTTPS_UPGRADE_SITE_ERROR, params)
     }
 
-    private fun isHttpsUpgradeSite(url: Uri): Boolean {
-        return url.isHttps && httpsUpgrader.shouldUpgrade(url)
-    }
-
     /**
      * Utility to function to execute a function, and then return true
      *

app/src/main/java/com/duckduckgo/app/httpsupgrade/HttpsUpgrader.kt

@@ -30,6 +30,9 @@ interface HttpsUpgrader {
     @WorkerThread
     fun shouldUpgrade(uri: Uri): Boolean
 
+    @WorkerThread
+    fun isInUpgradeList(uri: Uri): Boolean
+
     fun upgrade(uri: Uri): Uri {
         return uri.buildUpon().scheme(UrlScheme.https).build()
     }
@@ -53,6 +56,12 @@ class HttpsUpgraderImpl(
             return false
         }
 
+        return isInUpgradeList(uri)
+    }
+
+    @WorkerThread
+    override fun isInUpgradeList(uri: Uri): Boolean {
+
         val host = uri.host ?: return false
 
         waitForAnyReloadsToComplete()