From 1e8f71f0352fb0f96f8772add93bbd7fa0fe0e45 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Thu, 2 Aug 2018 17:18:45 -0700
Subject: [PATCH] Make settings and debug log available during initial
 migrations

---
 js/background.js | 108 +++++++++++++++++++++++------------------------
 1 file changed, 54 insertions(+), 54 deletions(-)

diff --git a/js/background.js b/js/background.js
index 9766e7e38..723210bfa 100644
--- a/js/background.js
+++ b/js/background.js
@@ -191,6 +191,60 @@
     }
     first = false;
 
+    // These make key operations available to IPC handlers created in preload.js
+    window.Events = {
+      getDeviceName: () => textsecure.storage.user.getDeviceName(),
+
+      getThemeSetting: () => storage.get('theme-setting', 'light'),
+      setThemeSetting: value => {
+        storage.put('theme-setting', value);
+        onChangeTheme();
+      },
+      getHideMenuBar: () => storage.get('hide-menu-bar'),
+      setHideMenuBar: value => {
+        storage.put('hide-menu-bar', value);
+        window.setAutoHideMenuBar(value);
+        window.setMenuBarVisibility(!value);
+      },
+
+      getNotificationSetting: () =>
+        storage.get('notification-setting', 'message'),
+      setNotificationSetting: value =>
+        storage.put('notification-setting', value),
+      getAudioNotification: () => storage.get('audio-notification'),
+      setAudioNotification: value => storage.put('audio-notification', value),
+
+      getSpellCheck: () => storage.get('spell-check', true),
+      setSpellCheck: value => {
+        storage.put('spell-check', value);
+        startSpellCheck();
+      },
+
+      // eslint-disable-next-line eqeqeq
+      isPrimary: () => textsecure.storage.user.getDeviceId() == '1',
+      getSyncRequest: () =>
+        new Promise((resolve, reject) => {
+          const syncRequest = window.getSyncRequest();
+          syncRequest.addEventListener('success', resolve);
+          syncRequest.addEventListener('timeout', reject);
+        }),
+      getLastSyncTime: () => storage.get('synced_at'),
+      setLastSyncTime: value => storage.put('synced_at', value),
+
+      addDarkOverlay: () => {
+        if ($('.dark-overlay').length) {
+          return;
+        }
+        $(document.body).prepend('<div class="dark-overlay"></div>');
+        $('.dark-overlay').on('click', () => $('.dark-overlay').remove());
+      },
+      removeDarkOverlay: () => $('.dark-overlay').remove(),
+      deleteAllData: () => {
+        const clearDataView = new window.Whisper.ClearDataView().render();
+        $('body').append(clearDataView.el);
+      },
+    };
+
     const currentVersion = window.getVersion();
     const lastVersion = storage.get('version');
     newVersion = !lastVersion || currentVersion !== lastVersion;
@@ -306,60 +360,6 @@
       }
     });
 
-    // These make key operations available to IPC handlers created in preload.js
-    window.Events = {
-      getDeviceName: () => textsecure.storage.user.getDeviceName(),
-
-      getThemeSetting: () => storage.get('theme-setting', 'light'),
-      setThemeSetting: value => {
-        storage.put('theme-setting', value);
-        onChangeTheme();
-      },
-      getHideMenuBar: () => storage.get('hide-menu-bar'),
-      setHideMenuBar: value => {
-        storage.put('hide-menu-bar', value);
-        window.setAutoHideMenuBar(value);
-        window.setMenuBarVisibility(!value);
-      },
-
-      getNotificationSetting: () =>
-        storage.get('notification-setting', 'message'),
-      setNotificationSetting: value =>
-        storage.put('notification-setting', value),
-      getAudioNotification: () => storage.get('audio-notification'),
-      setAudioNotification: value => storage.put('audio-notification', value),
-
-      getSpellCheck: () => storage.get('spell-check', true),
-      setSpellCheck: value => {
-        storage.put('spell-check', value);
-        startSpellCheck();
-      },
-
-      // eslint-disable-next-line eqeqeq
-      isPrimary: () => textsecure.storage.user.getDeviceId() == '1',
-      getSyncRequest: () =>
-        new Promise((resolve, reject) => {
-          const syncRequest = window.getSyncRequest();
-          syncRequest.addEventListener('success', resolve);
-          syncRequest.addEventListener('timeout', reject);
-        }),
-      getLastSyncTime: () => storage.get('synced_at'),
-      setLastSyncTime: value => storage.put('synced_at', value),
-
-      addDarkOverlay: () => {
-        if ($('.dark-overlay').length) {
-          return;
-        }
-        $(document.body).prepend('<div class="dark-overlay"></div>');
-        $('.dark-overlay').on('click', () => $('.dark-overlay').remove());
-      },
-      removeDarkOverlay: () => $('.dark-overlay').remove(),
-      deleteAllData: () => {
-        const clearDataView = new window.Whisper.ClearDataView().render();
-        $('body').append(clearDataView.el);
-      },
-    };
-
     const startSpellCheck = () => {
       if (!window.enableSpellCheck || !window.disableSpellCheck) {
         return;