Bug 1291524 - Load correct containers data in ensureDataReady method draft
authorJonathan Kingston <jkt@mozilla.com>
Fri, 05 Aug 2016 15:33:06 +0100
changeset 397221 b7a3676d75e5be08bc3128c5299f28e8de1f4a79
parent 395542 8c1c9706029249b5a94e64a39d0abe0b6fee0408
child 527405 348d454d2fd40bf70742bbf1ab2b24cc4c478ee1
push id25240
push userjkingston@mozilla.com
push dateFri, 05 Aug 2016 14:33:48 +0000
bugs1291524
milestone51.0a1
Bug 1291524 - Load correct containers data in ensureDataReady method MozReview-Commit-ID: EduImX01Nzd
toolkit/components/contextualidentity/ContextualIdentityService.jsm
--- a/toolkit/components/contextualidentity/ContextualIdentityService.jsm
+++ b/toolkit/components/contextualidentity/ContextualIdentityService.jsm
@@ -216,18 +216,21 @@ function _ContextualIdentityService(path
     try {
       // This reads the file and automatically detects the UTF-8 encoding.
       let inputStream = Cc["@mozilla.org/network/file-input-stream;1"]
                           .createInstance(Ci.nsIFileInputStream);
       inputStream.init(new FileUtils.File(this._path),
                        FileUtils.MODE_RDONLY, FileUtils.PERMS_FILE, 0);
       try {
         let json = Cc["@mozilla.org/dom/json;1"].createInstance(Ci.nsIJSON);
-        this._identities = json.decodeFromStream(inputStream,
-                                                 inputStream.available());
+        let data = json.decodeFromStream(inputStream,
+                                         inputStream.available());
+        this._identities = data.identities;
+        this._lastUserContextId = data.lastUserContextId;
+
         this._dataReady = true;
       } finally {
         inputStream.close();
       }
     } catch (error) {
       this.loadError(error);
       return;
     }