From 328d57f06320d839992a6f4eff0fae0eac4c5dfe Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Mon, 29 Oct 2018 22:57:33 +0000
Subject: [PATCH] Remove temporary account_deactivation_preferences

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
---
 .../views/dialogs/DeactivateAccountDialog.js  | 41 +------------------
 1 file changed, 1 insertion(+), 40 deletions(-)

diff --git a/src/components/views/dialogs/DeactivateAccountDialog.js b/src/components/views/dialogs/DeactivateAccountDialog.js
index 761a1e4209..6e87a816bb 100644
--- a/src/components/views/dialogs/DeactivateAccountDialog.js
+++ b/src/components/views/dialogs/DeactivateAccountDialog.js
@@ -35,19 +35,10 @@ export default class DeactivateAccountDialog extends React.Component {
         this._onPasswordFieldChange = this._onPasswordFieldChange.bind(this);
         this._onEraseFieldChange = this._onEraseFieldChange.bind(this);
 
-        const deactivationPreferences =
-            MatrixClientPeg.get().getAccountData('im.riot.account_deactivation_preferences');
-
-        const shouldErase = (
-            deactivationPreferences &&
-            deactivationPreferences.getContent() &&
-            deactivationPreferences.getContent().shouldErase
-        ) || false;
-
         this.state = {
             confirmButtonEnabled: false,
             busy: false,
-            shouldErase,
+            shouldErase: false,
             errStr: null,
         };
     }
@@ -67,36 +58,6 @@ export default class DeactivateAccountDialog extends React.Component {
     async _onOk() {
         this.setState({busy: true});
 
-        // Before we deactivate the account insert an event into
-        // the user's account data indicating that they wish to be
-        // erased from the homeserver.
-        //
-        // We do this because the API for erasing after deactivation
-        // might not be supported by the connected homeserver. Leaving
-        // an indication in account data is only best-effort, and
-        // in the worse case, the HS maintainer would have to run a
-        // script to erase deactivated accounts that have shouldErase
-        // set to true in im.riot.account_deactivation_preferences.
-        //
-        // Note: The preferences are scoped to Riot, hence the
-        // "im.riot..." event type.
-        //
-        // Note: This may have already been set on previous attempts
-        // where, for example, the user entered the wrong password.
-        // This is fine because the UI always indicates the preference
-        // prior to us calling `deactivateAccount`.
-        try {
-            await MatrixClientPeg.get().setAccountData('im.riot.account_deactivation_preferences', {
-                shouldErase: this.state.shouldErase,
-            });
-        } catch (err) {
-            this.setState({
-                busy: false,
-                errStr: _t('Failed to indicate account erasure'),
-            });
-            return;
-        }
-
         try {
             // This assumes that the HS requires password UI auth
             // for this endpoint. In reality it could be any UI auth.