Merge branch 'hotfix/5.9.1'

Author: subsymbolic

app/build.gradle

@@ -6,7 +6,7 @@ apply plugin: 'kotlin-kapt'
 apply from: '../versioning.gradle'
 
 ext {
-    VERSION_NAME = "5.9.0"
+    VERSION_NAME = "5.9.1"
     USE_ORCHESTRATOR = project.hasProperty('orchestrator') ? project.property('orchestrator') : false
 }
 

app/src/androidTest/java/com/duckduckgo/app/httpsupgrade/HttpsUpgraderTest.kt

@@ -16,29 +16,18 @@
 
 package com.duckduckgo.app.httpsupgrade
 
-import android.arch.core.executor.testing.InstantTaskExecutorRule
 import android.net.Uri
-import com.duckduckgo.app.InstantSchedulersRule
 import com.duckduckgo.app.httpsupgrade.api.HttpsBloomFilterFactory
 import com.duckduckgo.app.httpsupgrade.db.HttpsWhitelistDao
 import com.nhaarman.mockito_kotlin.mock
 import com.nhaarman.mockito_kotlin.whenever
 import org.junit.Assert.assertFalse
 import org.junit.Assert.assertTrue
 import org.junit.Before
-import org.junit.Rule
 import org.junit.Test
 
 class HttpsUpgraderTest {
 
-    @get:Rule
-    @Suppress("unused")
-    var instantTaskExecutorRule = InstantTaskExecutorRule()
-
-    @get:Rule
-    @Suppress("unused")
-    val schedulers = InstantSchedulersRule()
-
     lateinit var testee: HttpsUpgrader
 
     private var mockHttpsBloomFilterFactory: HttpsBloomFilterFactory = mock()
@@ -49,6 +38,7 @@ class HttpsUpgraderTest {
     fun before() {
         whenever(mockHttpsBloomFilterFactory.create()).thenReturn(bloomFilter)
         testee = HttpsUpgraderImpl(mockWhitelistDao, mockHttpsBloomFilterFactory)
+        testee.reloadData()
     }
 
     @Test

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

@@ -22,8 +22,9 @@ import com.duckduckgo.app.global.UrlScheme
 import com.duckduckgo.app.global.isHttps
 import com.duckduckgo.app.httpsupgrade.api.HttpsBloomFilterFactory
 import com.duckduckgo.app.httpsupgrade.db.HttpsWhitelistDao
-import io.reactivex.schedulers.Schedulers
 import timber.log.Timber
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.thread
 
 interface HttpsUpgrader {
 
@@ -43,9 +44,12 @@ class HttpsUpgraderImpl(
 ) : HttpsUpgrader {
 
     private var httpsBloomFilter: BloomFilter? = null
+    private val dataReloadLock = ReentrantLock()
 
     init {
-        reloadData()
+        thread {
+            reloadData()
+        }
     }
 
     @WorkerThread
@@ -55,6 +59,8 @@ class HttpsUpgraderImpl(
             return false
         }
 
+        waitForAnyReloadsToComplete()
+
         val host = uri.host
         if (whitelistedDao.contains(host)) {
             Timber.d("${host} is in whitelist and so not upgradable")
@@ -74,12 +80,21 @@ class HttpsUpgraderImpl(
         return false
     }
 
-    override fun reloadData() {
-        Schedulers.io().scheduleDirect {
-            httpsBloomFilter = bloomFactory.create()
+    private fun waitForAnyReloadsToComplete() {
+        // wait for lock (by locking and unlocking) before continuing
+        if (dataReloadLock.isLocked) {
+            dataReloadLock.lock()
+            dataReloadLock.unlock()
         }
     }
 
+    @WorkerThread
+    override fun reloadData() {
+        dataReloadLock.lock()
+        httpsBloomFilter = bloomFactory.create()
+        dataReloadLock.unlock()
+    }
+
     companion object {
         const val NANO_TO_MILLIS_DIVISOR = 1_000_000.0
     }