From 6bae8a24de46c63ea22896dc3d0a2a052e775481 Mon Sep 17 00:00:00 2001
From: Evan Hahn <69474926+EvanHahn-Signal@users.noreply.github.com>
Date: Fri, 3 Jun 2022 16:30:03 +0000
Subject: [PATCH] Convert `protocol_wrapper.js` to TypeScript

---
 background.html                   | 5 -----
 libtextsecure/protocol_wrapper.js | 9 ---------
 sticker-creator/index.html        | 5 -----
 test/index.html                   | 5 -----
 test/test.js                      | 2 ++
 ts/background.ts                  | 2 ++
 6 files changed, 4 insertions(+), 24 deletions(-)
 delete mode 100644 libtextsecure/protocol_wrapper.js

diff --git a/background.html b/background.html
index a708f869d8..93370a1a33 100644
--- a/background.html
+++ b/background.html
@@ -164,11 +164,6 @@
       src="ts/backbone/reliable_trigger.js"
     ></script>
 
-    <script
-      type="text/javascript"
-      src="libtextsecure/protocol_wrapper.js"
-    ></script>
-
     <script type="text/javascript" src="js/libphonenumber-util.js"></script>
     <script type="text/javascript" src="js/expiring_messages.js"></script>
     <script
diff --git a/libtextsecure/protocol_wrapper.js b/libtextsecure/protocol_wrapper.js
deleted file mode 100644
index 0f43e029e5..0000000000
--- a/libtextsecure/protocol_wrapper.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2016-2020 Signal Messenger, LLC
-// SPDX-License-Identifier: AGPL-3.0-only
-
-/* global window, SignalProtocolStore */
-
-// eslint-disable-next-line func-names
-(function () {
-  window.textsecure.storage.protocol = new SignalProtocolStore();
-})();
diff --git a/sticker-creator/index.html b/sticker-creator/index.html
index dffbe0f124..f62f6b9a96 100644
--- a/sticker-creator/index.html
+++ b/sticker-creator/index.html
@@ -13,10 +13,5 @@
       type="text/javascript"
       src="../../ts/backbone/backbonejQuery.js"
     ></script>
-
-    <script
-      type="text/javascript"
-      src="../../libtextsecure/protocol_wrapper.js"
-    ></script>
   </body>
 </html>
diff --git a/test/index.html b/test/index.html
index 49465fc173..fd56901c9a 100644
--- a/test/index.html
+++ b/test/index.html
@@ -85,11 +85,6 @@
 
     <script type="text/javascript" src="../js/database.js" data-cover></script>
 
-    <script
-      type="text/javascript"
-      src="../libtextsecure/protocol_wrapper.js"
-    ></script>
-
     <script type="text/javascript" src="../js/libphonenumber-util.js"></script>
     <script
       type="text/javascript"
diff --git a/test/test.js b/test/test.js
index 33f5fc5c87..e3dad4b954 100644
--- a/test/test.js
+++ b/test/test.js
@@ -38,3 +38,5 @@ before(async () => {
 
 window.Whisper = window.Whisper || {};
 window.Whisper.events = _.clone(Backbone.Events);
+
+window.textsecure.storage.protocol = new window.SignalProtocolStore();
diff --git a/ts/background.ts b/ts/background.ts
index 87892f2b60..45721af260 100644
--- a/ts/background.ts
+++ b/ts/background.ts
@@ -173,6 +173,8 @@ export async function cleanupSessionResets(): Promise<void> {
 }
 
 export async function startApp(): Promise<void> {
+  window.textsecure.storage.protocol = new window.SignalProtocolStore();
+
   if (window.initialTheme === ThemeType.light) {
     document.body.classList.add('light-theme');
   }