Skip to content

Fix for corrupted DB crashes #338

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 10, 2018
Merged

Fix for corrupted DB crashes #338

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e809435
Possibly fix for corrupted DB crashes
CDRussell Aug 27, 2018
d37b504
Merge branch 'develop' into feature/possible_fix_for_corrupted_db_cra…
CDRussell Sep 4, 2018
1234b38
Move https upgrader initialization to its own method
CDRussell Sep 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions app/src/main/java/com/duckduckgo/app/global/DuckDuckGoApplication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import com.duckduckgo.app.fire.FireActivity
import com.duckduckgo.app.global.install.AppInstallStore
import com.duckduckgo.app.global.notification.NotificationRegistrar
import com.duckduckgo.app.global.shortcut.AppShortcutCreator
import com.duckduckgo.app.httpsupgrade.HttpsUpgrader
import com.duckduckgo.app.job.AppConfigurationSyncer
import com.duckduckgo.app.migration.LegacyMigration
import com.duckduckgo.app.statistics.api.StatisticsUpdater
Expand All @@ -48,6 +49,7 @@ import io.reactivex.schedulers.Schedulers
import org.jetbrains.anko.doAsync
import timber.log.Timber
import javax.inject.Inject
import kotlin.concurrent.thread

open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasSupportFragmentInjector, Application(), LifecycleObserver {

Expand Down Expand Up @@ -87,6 +89,9 @@ open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasS
@Inject
lateinit var appShortcutCreator: AppShortcutCreator

@Inject
lateinit var httpsUpgrader: HttpsUpgrader

override fun onCreate() {
super.onCreate()

Expand All @@ -110,6 +115,9 @@ open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasS

migrateLegacyDb()
notificationRegistrar.registerApp()

initializeHttpsUpgrader()

}

private fun recordInstallationTimestamp() {
Expand Down Expand Up @@ -164,6 +172,10 @@ open class DuckDuckGoApplication : HasActivityInjector, HasServiceInjector, HasS
statisticsUpdater.initializeAtb()
}

private fun initializeHttpsUpgrader() {
thread { httpsUpgrader.reloadData() }
}

/**
* Immediately syncs data. Upon completion (successful or error),
* it will schedule a recurring job to keep the data in sync.
Expand Down
8 changes: 1 addition & 7 deletions app/src/main/java/com/duckduckgo/app/httpsupgrade/HttpsUpgrader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ 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 {

Expand All @@ -35,6 +34,7 @@ interface HttpsUpgrader {
return uri.buildUpon().scheme(UrlScheme.https).build()
}

@WorkerThread
fun reloadData()
}

Expand All @@ -46,12 +46,6 @@ class HttpsUpgraderImpl(
private var httpsBloomFilter: BloomFilter? = null
private val dataReloadLock = ReentrantLock()

init {
thread {
reloadData()
}
}

@WorkerThread
override fun shouldUpgrade(uri: Uri): Boolean {

Expand Down