Add a reload lock

Author: subsymbolic

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

@@ -23,6 +23,8 @@ import com.duckduckgo.app.global.isHttps
 import com.duckduckgo.app.httpsupgrade.api.HttpsBloomFilterFactory
 import com.duckduckgo.app.httpsupgrade.db.HttpsWhitelistDao
 import timber.log.Timber
+import java.util.concurrent.locks.ReentrantLock
+import kotlin.concurrent.thread
 
 interface HttpsUpgrader {
 
@@ -42,8 +44,13 @@ class HttpsUpgraderImpl(
 ) : HttpsUpgrader {
 
     private var httpsBloomFilter: BloomFilter? = null
-    private var dataLoaded = false
+    private val reloadLock = ReentrantLock()
 
+    init {
+        thread {
+            reloadData()
+        }
+    }
 
     @WorkerThread
     override fun shouldUpgrade(uri: Uri): Boolean {
@@ -52,9 +59,7 @@ class HttpsUpgraderImpl(
             return false
         }
 
-        if (!dataLoaded) {
-            reloadData()
-        }
+        waitForAnyReloadsToComplete()
 
         val host = uri.host
         if (whitelistedDao.contains(host)) {
@@ -75,9 +80,18 @@ class HttpsUpgraderImpl(
         return false
     }
 
+    private fun waitForAnyReloadsToComplete() {
+        // wait for lock (by locking and unlocking) before continuing
+        if (reloadLock.isLocked) {
+            reloadLock.lock()
+            reloadLock.unlock()
+        }
+    }
+
     override fun reloadData() {
-        dataLoaded = true
+        reloadLock.lock()
         httpsBloomFilter = bloomFactory.create()
+        reloadLock.unlock()
     }
 
     companion object {