From 7bc356ac1542ba2c9cb8c29794b455c4437d3fdd Mon Sep 17 00:00:00 2001 From: lilia Date: Tue, 27 Sep 2016 14:00:31 -0700 Subject: [PATCH] Rename variable --- dist/libsignal-protocol.js | 28 ++++++++++++++-------------- src/SessionRecord.js | 28 ++++++++++++++-------------- 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/dist/libsignal-protocol.js b/dist/libsignal-protocol.js index 01a4880..bf97ef8 100644 --- a/dist/libsignal-protocol.js +++ b/dist/libsignal-protocol.js @@ -35600,7 +35600,7 @@ Internal.SessionRecord = function() { } var SessionRecord = function() { - this._sessions = {}; + this.sessions = {}; this.version = SESSION_RECORD_VERSION; }; @@ -35609,8 +35609,8 @@ Internal.SessionRecord = function() { if (data.version !== SESSION_RECORD_VERSION) { migrate(data); } var record = new SessionRecord(); - record._sessions = data.sessions; - if (record._sessions === undefined || record._sessions === null || typeof record._sessions !== "object" || Array.isArray(record._sessions)) { + record.sessions = data.sessions; + if (record.sessions === undefined || record.sessions === null || typeof record.sessions !== "object" || Array.isArray(record.sessions)) { throw new Error("Error deserializing SessionRecord"); } return record; @@ -35619,7 +35619,7 @@ Internal.SessionRecord = function() { SessionRecord.prototype = { serialize: function() { return jsonThing({ - sessions : this._sessions, + sessions : this.sessions, version : this.version }); }, @@ -35629,7 +35629,7 @@ Internal.SessionRecord = function() { }, getSessionByBaseKey: function(baseKey) { - var session = this._sessions[util.toString(baseKey)]; + var session = this.sessions[util.toString(baseKey)]; if (session && session.indexInfo.baseKeyType === Internal.BaseKeyType.OURS) { console.log("Tried to lookup a session using our basekey"); return undefined; @@ -35638,7 +35638,7 @@ Internal.SessionRecord = function() { }, getSessionByRemoteEphemeralKey: function(remoteEphemeralKey) { this.detectDuplicateOpenSessions(); - var sessions = this._sessions; + var sessions = this.sessions; var searchKey = util.toString(remoteEphemeralKey); @@ -35658,7 +35658,7 @@ Internal.SessionRecord = function() { return undefined; }, getOpenSession: function() { - var sessions = this._sessions; + var sessions = this.sessions; if (sessions === undefined) { return undefined; } @@ -35674,7 +35674,7 @@ Internal.SessionRecord = function() { }, detectDuplicateOpenSessions: function() { var openSession; - var sessions = this._sessions; + var sessions = this.sessions; for (var key in sessions) { if (sessions[key].indexInfo.closed == -1) { if (openSession !== undefined) { @@ -35685,7 +35685,7 @@ Internal.SessionRecord = function() { } }, updateSessionState: function(session) { - var sessions = this._sessions; + var sessions = this.sessions; this.removeOldChains(session); @@ -35699,11 +35699,11 @@ Internal.SessionRecord = function() { // followed by the open session var list = []; var openSession; - for (var k in this._sessions) { - if (this._sessions[k].indexInfo.closed === -1) { - openSession = this._sessions[k]; + for (var k in this.sessions) { + if (this.sessions[k].indexInfo.closed === -1) { + openSession = this.sessions[k]; } else { - list.push(this._sessions[k]); + list.push(this.sessions[k]); } } list = list.sort(function(s1, s2) { @@ -35764,7 +35764,7 @@ Internal.SessionRecord = function() { }, removeOldSessions: function() { // Retain only the last 20 sessions - var sessions = this._sessions; + var sessions = this.sessions; var oldestBaseKey, oldestSession; while (Object.keys(sessions).length > ARCHIVED_STATES_MAX_LENGTH) { for (var key in sessions) { diff --git a/src/SessionRecord.js b/src/SessionRecord.js index 2792528..cb6d4dc 100644 --- a/src/SessionRecord.js +++ b/src/SessionRecord.js @@ -101,7 +101,7 @@ Internal.SessionRecord = function() { } var SessionRecord = function() { - this._sessions = {}; + this.sessions = {}; this.version = SESSION_RECORD_VERSION; }; @@ -110,8 +110,8 @@ Internal.SessionRecord = function() { if (data.version !== SESSION_RECORD_VERSION) { migrate(data); } var record = new SessionRecord(); - record._sessions = data.sessions; - if (record._sessions === undefined || record._sessions === null || typeof record._sessions !== "object" || Array.isArray(record._sessions)) { + record.sessions = data.sessions; + if (record.sessions === undefined || record.sessions === null || typeof record.sessions !== "object" || Array.isArray(record.sessions)) { throw new Error("Error deserializing SessionRecord"); } return record; @@ -120,7 +120,7 @@ Internal.SessionRecord = function() { SessionRecord.prototype = { serialize: function() { return jsonThing({ - sessions : this._sessions, + sessions : this.sessions, version : this.version }); }, @@ -130,7 +130,7 @@ Internal.SessionRecord = function() { }, getSessionByBaseKey: function(baseKey) { - var session = this._sessions[util.toString(baseKey)]; + var session = this.sessions[util.toString(baseKey)]; if (session && session.indexInfo.baseKeyType === Internal.BaseKeyType.OURS) { console.log("Tried to lookup a session using our basekey"); return undefined; @@ -139,7 +139,7 @@ Internal.SessionRecord = function() { }, getSessionByRemoteEphemeralKey: function(remoteEphemeralKey) { this.detectDuplicateOpenSessions(); - var sessions = this._sessions; + var sessions = this.sessions; var searchKey = util.toString(remoteEphemeralKey); @@ -159,7 +159,7 @@ Internal.SessionRecord = function() { return undefined; }, getOpenSession: function() { - var sessions = this._sessions; + var sessions = this.sessions; if (sessions === undefined) { return undefined; } @@ -175,7 +175,7 @@ Internal.SessionRecord = function() { }, detectDuplicateOpenSessions: function() { var openSession; - var sessions = this._sessions; + var sessions = this.sessions; for (var key in sessions) { if (sessions[key].indexInfo.closed == -1) { if (openSession !== undefined) { @@ -186,7 +186,7 @@ Internal.SessionRecord = function() { } }, updateSessionState: function(session) { - var sessions = this._sessions; + var sessions = this.sessions; this.removeOldChains(session); @@ -200,11 +200,11 @@ Internal.SessionRecord = function() { // followed by the open session var list = []; var openSession; - for (var k in this._sessions) { - if (this._sessions[k].indexInfo.closed === -1) { - openSession = this._sessions[k]; + for (var k in this.sessions) { + if (this.sessions[k].indexInfo.closed === -1) { + openSession = this.sessions[k]; } else { - list.push(this._sessions[k]); + list.push(this.sessions[k]); } } list = list.sort(function(s1, s2) { @@ -265,7 +265,7 @@ Internal.SessionRecord = function() { }, removeOldSessions: function() { // Retain only the last 20 sessions - var sessions = this._sessions; + var sessions = this.sessions; var oldestBaseKey, oldestSession; while (Object.keys(sessions).length > ARCHIVED_STATES_MAX_LENGTH) { for (var key in sessions) {