From a728c9efbfcfafa62960d64eb6e32b446fbc4e4a Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Wed, 7 Mar 2018 17:21:15 -0800
Subject: [PATCH] Remove all mention of obsolete safety-number-approval setting

---
 js/background.js                |  3 ---
 test/keychange_listener_test.js |  8 --------
 test/storage_test.js            | 16 ++--------------
 3 files changed, 2 insertions(+), 25 deletions(-)

diff --git a/js/background.js b/js/background.js
index 0aeaecae6..734bc9284 100644
--- a/js/background.js
+++ b/js/background.js
@@ -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');
diff --git a/test/keychange_listener_test.js b/test/keychange_listener_test.js
index 5db581a94..3e8182fd0 100644
--- a/test/keychange_listener_test.js
+++ b/test/keychange_listener_test.js
@@ -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);
diff --git a/test/storage_test.js b/test/storage_test.js
index abe5d61fe..2364eba42 100644
--- a/test/storage_test.js
+++ b/test/storage_test.js
@@ -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) {