From 256b87aa7a6372dc88c93f73356b01d1d57763be Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@nonnenberg.com>
Date: Thu, 8 Mar 2018 10:00:20 -0800
Subject: [PATCH] Refactor newly-added ClearDataView in settings_view.js

---
 .eslintignore             |   1 +
 js/views/settings_view.js | 130 +++++++++++++++++++++-----------------
 2 files changed, 72 insertions(+), 59 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 25e1e431f..ab00fab0f 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -23,6 +23,7 @@ test/views/*.js
 !js/views/debug_log_view.js
 !js/views/file_input_view.js
 !js/views/inbox_view.js
+!js/views/settings_view.js
 !js/database.js
 !main.js
 !prepare_build.js
diff --git a/js/views/settings_view.js b/js/views/settings_view.js
index 723a437a1..b29bcb457 100644
--- a/js/views/settings_view.js
+++ b/js/views/settings_view.js
@@ -1,10 +1,15 @@
-/*
- * vim: ts=4:sw=4:expandtab
- */
+/* global storage: false */
+/* global textsecure: false */
+/* global i18n: false */
+/* global Whisper: false */
+
+/* eslint-disable */
+
 (function () {
     'use strict';
     window.Whisper = window.Whisper || {};
-    const { OS } = window.Signal;
+    const { Database } = window.Whisper;
+    const { OS, Logs } = window.Signal;
     const { Settings } = window.Signal.Types;
 
     var CheckboxView = Whisper.View.extend({
@@ -119,63 +124,70 @@
         },
     });
 
-    var CLEAR_DATA_STEPS = {
-        CHOICE: 1,
-        DELETING: 2,
-    };
-    var ClearDataView = Whisper.View.extend({
-        templateName: 'clear-data',
-        className: 'full-screen-flow overlay',
-        events: {
-            'click .cancel': 'onCancel',
-            'click .delete-all-data': 'onDeleteAllData',
-        },
-        initialize: function() {
-            this.step = CLEAR_DATA_STEPS.CHOICE;
-        },
-        onCancel: function() {
-            this.remove();
-        },
-        onDeleteAllData: function() {
-            console.log('Deleting everything!');
-            this.step = CLEAR_DATA_STEPS.DELETING;
-            this.render();
+    /* jshint ignore:start */
+    /* eslint-enable */
 
-            Whisper.Database.close().then(function() {
-                console.log('All database connections closed. Starting delete.');
-                this.clearAllData();
-            }.bind(this), function(error) {
-                console.log('Something went wrong closing all database connections.');
-                this.clearAllData();
-            }.bind(this));
-        },
-        clearAllData: function() {
-            Promise.all([
-                Signal.Logs.deleteAll(),
-                Whisper.Database.drop(),
-            ]).then(function() {
-                window.restart();
-            }, function(error) {
-                console.log(
-                    'Something went wrong deleting all data:',
-                    error && error.stack ? error.stack : error
-                );
-                window.restart();
-            });
-        },
-        render_attributes: function() {
-            return {
-                isStep1: this.step === CLEAR_DATA_STEPS.CHOICE,
-                header: i18n('deleteAllDataHeader'),
-                body: i18n('deleteAllDataBody'),
-                cancelButton: i18n('cancel'),
-                deleteButton: i18n('deleteAllDataButton'),
+  const CLEAR_DATA_STEPS = {
+    CHOICE: 1,
+    DELETING: 2,
+  };
+  const ClearDataView = Whisper.View.extend({
+    templateName: 'clear-data',
+    className: 'full-screen-flow overlay',
+    events: {
+      'click .cancel': 'onCancel',
+      'click .delete-all-data': 'onDeleteAllData',
+    },
+    initialize() {
+      this.step = CLEAR_DATA_STEPS.CHOICE;
+    },
+    onCancel() {
+      this.remove();
+    },
+    async onDeleteAllData() {
+      console.log('Deleting everything!');
+      this.step = CLEAR_DATA_STEPS.DELETING;
+      this.render();
 
-                isStep2: this.step === CLEAR_DATA_STEPS.DELETING,
-                deleting: i18n('deleteAllDataProgress'),
-            };
-        }
-    });
+      try {
+        await Database.close();
+        console.log('All database connections closed. Starting delete.');
+      } catch (error) {
+        console.log('Something went wrong closing all database connections.');
+      }
+
+      this.clearAllData();
+    },
+    async clearAllData() {
+      try {
+        await Promise.all([
+          Logs.deleteAll(),
+          Database.drop(),
+        ]);
+      } catch (error) {
+        console.log(
+          'Something went wrong deleting all data:',
+          error && error.stack ? error.stack : error
+        );
+      }
+      window.restart();
+    },
+    render_attributes() {
+      return {
+        isStep1: this.step === CLEAR_DATA_STEPS.CHOICE,
+        header: i18n('deleteAllDataHeader'),
+        body: i18n('deleteAllDataBody'),
+        cancelButton: i18n('cancel'),
+        deleteButton: i18n('deleteAllDataButton'),
+
+        isStep2: this.step === CLEAR_DATA_STEPS.DELETING,
+        deleting: i18n('deleteAllDataProgress'),
+      };
+    },
+  });
+
+    /* eslint-disable */
+    /* jshint ignore:end */
 
     var SyncView = Whisper.View.extend({
         templateName: 'syncSettings',