colin/Signal-Desktop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change key conflict error message

Browse Source 
Include the contact's number in the message for more helpful debug log
output.

// FREEBIE
This commit is contained in:
lilia
2015-10-28 13:46:02 -07:00
parent c9e01390a7
commit 1065502770
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
js/libtextsecure.js
View File

@@ -38,10 +38,10 @@
args : [number, message] args : [number, message]
}); });
this.name = 'IncomingIdentityKeyError';
this.message = "The identity of the sender has changed. This may be malicious, or the sender may have simply reinstalled.";
this.identityKey = key;
this.number = number.split('.')[0]; this.number = number.split('.')[0];
this.name = 'IncomingIdentityKeyError';
this.message = "The identity of " + this.number + " has changed.";
this.identityKey = key;
} }
IncomingIdentityKeyError.prototype = new ReplayableError(); IncomingIdentityKeyError.prototype = new ReplayableError();
IncomingIdentityKeyError.prototype.constructor = IncomingIdentityKeyError; IncomingIdentityKeyError.prototype.constructor = IncomingIdentityKeyError;
@@ -51,9 +51,9 @@
functionCode : Type.ENCRYPT_MESSAGE, functionCode : Type.ENCRYPT_MESSAGE,
args : [number, message, timestamp] args : [number, message, timestamp]
}); });
this.name = 'OutgoingIdentityKeyError';
this.message = "The identity of the destination has changed. This may be malicious, or the destination may have simply reinstalled.";
this.number = number.split('.')[0]; this.number = number.split('.')[0];
this.name = 'OutgoingIdentityKeyError';
this.message = "The identity of " + this.number + " has changed.";
this.identityKey = identityKey; this.identityKey = identityKey;
} }
OutgoingIdentityKeyError.prototype = new ReplayableError(); OutgoingIdentityKeyError.prototype = new ReplayableError();

10
libtextsecure/errors.js
View File

@@ -37,10 +37,10 @@
args : [number, message] args : [number, message]
}); });
this.name = 'IncomingIdentityKeyError';
this.message = "The identity of the sender has changed. This may be malicious, or the sender may have simply reinstalled.";
this.identityKey = key;
this.number = number.split('.')[0]; this.number = number.split('.')[0];
this.name = 'IncomingIdentityKeyError';
this.message = "The identity of " + this.number + " has changed.";
this.identityKey = key;
} }
IncomingIdentityKeyError.prototype = new ReplayableError(); IncomingIdentityKeyError.prototype = new ReplayableError();
IncomingIdentityKeyError.prototype.constructor = IncomingIdentityKeyError; IncomingIdentityKeyError.prototype.constructor = IncomingIdentityKeyError;
@@ -50,9 +50,9 @@
functionCode : Type.ENCRYPT_MESSAGE, functionCode : Type.ENCRYPT_MESSAGE,
args : [number, message, timestamp] args : [number, message, timestamp]
}); });
this.name = 'OutgoingIdentityKeyError';
this.message = "The identity of the destination has changed. This may be malicious, or the destination may have simply reinstalled.";
this.number = number.split('.')[0]; this.number = number.split('.')[0];
this.name = 'OutgoingIdentityKeyError';
this.message = "The identity of " + this.number + " has changed.";
this.identityKey = identityKey; this.identityKey = identityKey;
} }
OutgoingIdentityKeyError.prototype = new ReplayableError(); OutgoingIdentityKeyError.prototype = new ReplayableError();