Commit 91c3f1d5 authored by Daniel Wolf's avatar Daniel Wolf
Browse files

Fix no rule being deleted when no source is selected

parent 7d52441c
......@@ -45,8 +45,11 @@ interface DnsRuleDao {
@Query("DELETE FROM DnsRule WHERE importedFrom IS NULL")
fun deleteAllUserRules()
@Query("UPDATE DnsRule SET stagingType=1 WHERE importedFrom IS NOT NULL AND stagingType=0 AND importedFrom IN(:sources)")
fun markNonUserRulesForDeletion(sources:List<Long>)
@Query("DELETE FROM DnsRule WHERE importedFrom IS NOT NULL")
fun deleteAllNonUserRules()
@Query("UPDATE DnsRule SET stagingType=1 WHERE importedFrom IS NOT NULL AND stagingType=0")
fun markNonUserRulesForDeletion()
@Query("UPDATE DnsRule SET stagingType=0 WHERE importedFrom=:hostSourceId AND stagingType=1")
fun unstageRulesOfSource(hostSourceId:Long)
......
......@@ -174,7 +174,7 @@ class RuleImportService : IntentService("RuleImportService") {
private fun startWork() {
val dnsRuleDao = getDatabase().dnsRuleDao()
dnsRuleDao.markNonUserRulesForDeletion(sourcesIds) // Stage all, ignoring if the source is actually processed in this run
dnsRuleDao.markNonUserRulesForDeletion() // Stage all, ignoring if the source is actually processed in this run
dnsRuleDao.deleteStagedRules()
var count = 0
val newChecksums = mutableMapOf<HostSource, String>()
......@@ -244,7 +244,7 @@ class RuleImportService : IntentService("RuleImportService") {
updateNotificationFinishing()
log("Delete rules staged for deletion")
dnsRuleDao.deleteMarkedRules()
log("Commiting staging")
log("Committing staging")
dnsRuleDao.commitStaging()
dnsRuleDao.deleteStagedRules()
log("Recreating database indices")
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment