Remove all mention of obsolete safety-number-approval setting

This commit is contained in:
Scott Nonnenberg 2018-03-07 17:21:15 -08:00 committed by Scott Nonnenberg
parent 26c273618a
commit a728c9efbf
No known key found for this signature in database
GPG Key ID: 5F82280C35134661
3 changed files with 2 additions and 25 deletions

View File

@ -64,9 +64,6 @@
SERVER_URL, USERNAME, PASSWORD
);
accountManager.addEventListener('registration', function() {
if (!Whisper.Registration.everDone()) {
storage.put('safety-numbers-approval', false);
}
Whisper.Registration.markDone();
console.log('dispatching registration event');
Whisper.events.trigger('registration_done');

View File

@ -5,14 +5,6 @@ describe('KeyChangeListener', function() {
var newKey = libsignal.crypto.getRandomBytes(33);
var store;
before(function() {
storage.put('safety-numbers-approval', false);
});
after(function() {
storage.remove('safety-numbers-approval');
});
beforeEach(function() {
store = new SignalProtocolStore();
Whisper.KeyChangeListener.init(store);

View File

@ -792,8 +792,7 @@ describe("SignalProtocolStore", function() {
done();
});
});
it('returns false if blocking approval is required', function(done) {
storage.put('safety-numbers-approval', true);
it('returns false if keys match but we just received this new identiy', function(done) {
store.isTrustedIdentity(identifier, newIdentity, store.Direction.SENDING).then(function(trusted) {
if (trusted) {
done(new Error('isTrusted returned true on untrusted key'));
@ -802,18 +801,7 @@ describe("SignalProtocolStore", function() {
}
}).catch(done);
});
it('returns false if keys match but nonblocking approval is required', function(done) {
storage.put('safety-numbers-approval', false);
store.isTrustedIdentity(identifier, newIdentity, store.Direction.SENDING).then(function(trusted) {
if (trusted) {
done(new Error('isTrusted returned true on untrusted key'));
} else {
done();
}
}).catch(done);
});
it('returns true if neither blocking nor nonblocking approval is required', function(done) {
storage.put('safety-numbers-approval', false);
it('returns true if we have already approved identity', function(done) {
store.saveIdentity(address.toString(), newIdentity, true).then(function() {
store.isTrustedIdentity(identifier, newIdentity, store.Direction.SENDING).then(function(trusted) {
if (trusted) {