Skip to content

Clear out old disconnect data when new data available #125

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 1 commit into from
Jan 19, 2018
Merged

Clear out old disconnect data when new data available #125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 11 additions & 3 deletions app/src/main/java/com/duckduckgo/app/trackerdetection/api/TrackerDataDownloader.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
package com.duckduckgo.app.trackerdetection.api

import com.duckduckgo.app.global.api.isCached
import com.duckduckgo.app.global.db.AppDatabase
import com.duckduckgo.app.trackerdetection.AdBlockClient
import com.duckduckgo.app.trackerdetection.Client
import com.duckduckgo.app.trackerdetection.Client.ClientName.*
Expand All @@ -35,7 +36,8 @@ class TrackerDataDownloader @Inject constructor(
private val trackerListService: TrackerListService,
private val trackerDataStore: TrackerDataStore,
private val trackerDataLoader: TrackerDataLoader,
private val trackerDataDao: TrackerDataDao) {
private val trackerDataDao: TrackerDataDao,
private val appDatabase: AppDatabase) {

fun downloadList(clientName: Client.ClientName): Completable {

Expand Down Expand Up @@ -63,8 +65,14 @@ class TrackerDataDownloader @Inject constructor(
if (response.isSuccessful) {
Timber.d("Updating disconnect data from server")
val body = response.body()!!
trackerDataDao.insertAll(body.trackers)
trackerDataLoader.loadDisconnectData()

appDatabase.runInTransaction {
trackerDataDao.deleteAll()
trackerDataDao.insertAll(body.trackers)
trackerDataLoader.loadDisconnectData()
}


} else {
throw IOException("Status: ${response.code()} - ${response.errorBody()?.string()}")
}
Expand Down
3 changes: 3 additions & 0 deletions app/src/main/java/com/duckduckgo/app/trackerdetection/db/TrackerDataDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,4 +34,7 @@ interface TrackerDataDao {

@Query("Select count(*) from disconnect_tracker")
fun count(): Int

@Query("DELETE FROM disconnect_tracker")
fun deleteAll()
}