Skip to content

Commit 54d682c

Browse files
committed
Remove possibility of not checking for https because data not yet loaded
1 parent 7c1d458 commit 54d682c

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import com.duckduckgo.app.global.UrlScheme
2222
import com.duckduckgo.app.global.isHttps
2323
import com.duckduckgo.app.httpsupgrade.api.HttpsBloomFilterFactory
2424
import com.duckduckgo.app.httpsupgrade.db.HttpsWhitelistDao
25-
import io.reactivex.schedulers.Schedulers
2625
import timber.log.Timber
2726

2827
interface HttpsUpgrader {
@@ -43,10 +42,8 @@ class HttpsUpgraderImpl(
4342
) : HttpsUpgrader {
4443

4544
private var httpsBloomFilter: BloomFilter? = null
45+
private var dataLoaded = false
4646

47-
init {
48-
reloadData()
49-
}
5047

5148
@WorkerThread
5249
override fun shouldUpgrade(uri: Uri): Boolean {
@@ -55,6 +52,10 @@ class HttpsUpgraderImpl(
5552
return false
5653
}
5754

55+
if (!dataLoaded) {
56+
reloadData()
57+
}
58+
5859
val host = uri.host
5960
if (whitelistedDao.contains(host)) {
6061
Timber.d("${host} is in whitelist and so not upgradable")
@@ -75,9 +76,8 @@ class HttpsUpgraderImpl(
7576
}
7677

7778
override fun reloadData() {
78-
Schedulers.io().scheduleDirect {
79-
httpsBloomFilter = bloomFactory.create()
80-
}
79+
dataLoaded = true
80+
httpsBloomFilter = bloomFactory.create()
8181
}
8282

8383
companion object {

0 commit comments

Comments
 (0)