bug 1454941 - revert CP wait fix from
bug 1451150 r?valentin
... but keep the logic that avoids re-initialization.
MozReview-Commit-ID: 2XQCRaM6U4B
--- a/netwerk/dns/TRRService.cpp
+++ b/netwerk/dns/TRRService.cpp
@@ -281,41 +281,41 @@ TRRService::Observe(nsISupports *aSubjec
} else if (!strcmp(aTopic, kOpenCaptivePortalLoginEvent)) {
// We are in a captive portal
LOG(("TRRservice in captive portal\n"));
mCaptiveIsPassed = false;
} else if (!strcmp(aTopic, NS_CAPTIVE_PORTAL_CONNECTIVITY)) {
nsAutoCString data = NS_ConvertUTF16toUTF8(aData);
LOG(("TRRservice captive portal was %s\n", data.get()));
- if (data.Equals("clear")) {
- if (!mTRRBLStorage) {
- mTRRBLStorage = DataStorage::Get(DataStorageClass::TRRBlacklist);
- if (mTRRBLStorage) {
- bool storageWillPersist = true;
- if (NS_FAILED(mTRRBLStorage->Init(storageWillPersist))) {
- mTRRBLStorage = nullptr;
+ if (!mTRRBLStorage) {
+ mTRRBLStorage = DataStorage::Get(DataStorageClass::TRRBlacklist);
+ if (mTRRBLStorage) {
+ bool storageWillPersist = true;
+ if (NS_FAILED(mTRRBLStorage->Init(storageWillPersist))) {
+ mTRRBLStorage = nullptr;
+ }
+ if (mClearTRRBLStorage) {
+ if (mTRRBLStorage) {
+ mTRRBLStorage->Clear();
}
- if (mClearTRRBLStorage) {
- if (mTRRBLStorage) {
- mTRRBLStorage->Clear();
- }
- mClearTRRBLStorage = false;
- }
+ mClearTRRBLStorage = false;
}
}
- if (mConfirmationState != CONFIRM_OK) {
- mConfirmationState = CONFIRM_TRYING;
- MaybeConfirm();
- } else {
- LOG(("TRRservice CP clear when already up!\n"));
- }
- mCaptiveIsPassed = true;
}
+ if (mConfirmationState != CONFIRM_OK) {
+ mConfirmationState = CONFIRM_TRYING;
+ MaybeConfirm();
+ } else {
+ LOG(("TRRservice CP clear when already up!\n"));
+ }
+
+ mCaptiveIsPassed = true;
+
} else if (!strcmp(aTopic, kClearPrivateData) ||
!strcmp(aTopic, kPurge)) {
// flush the TRR blacklist, both in-memory and on-disk
if (mTRRBLStorage) {
mTRRBLStorage->Clear();
}
}
return NS_OK;