Revert "Replace all trivial Promise.defer usages with regular Promises"

This reverts commit 44401d73

src/ContentMessages.js

@@ -59,7 +59,8 @@ export class UploadCanceledError extends Error {}
  *  and a thumbnail key.
  */
 function createThumbnail(element, inputWidth, inputHeight, mimeType) {
-    return new Promise((resolve) => {
+    const deferred = Promise.defer();
+
     let targetWidth = inputWidth;
     let targetHeight = inputHeight;
     if (targetHeight > MAX_HEIGHT) {
@@ -76,7 +77,7 @@ function createThumbnail(element, inputWidth, inputHeight, mimeType) {
     canvas.height = targetHeight;
     canvas.getContext("2d").drawImage(element, 0, 0, targetWidth, targetHeight);
     canvas.toBlob(function(thumbnail) {
-            resolve({
+        deferred.resolve({
             info: {
                 thumbnail_info: {
                     w: targetWidth,
@@ -90,7 +91,8 @@ function createThumbnail(element, inputWidth, inputHeight, mimeType) {
             thumbnail: thumbnail,
         });
     }, mimeType);
-    });
+
+    return deferred.promise;
 }
 
 /**
@@ -177,29 +179,30 @@ function infoForImageFile(matrixClient, roomId, imageFile) {
  * @return {Promise} A promise that resolves with the video image element.
  */
 function loadVideoElement(videoFile) {
-    return new Promise((resolve, reject) => {
+    const deferred = Promise.defer();
+
     // Load the file into an html element
     const video = document.createElement("video");
 
     const reader = new FileReader();
-
     reader.onload = function(e) {
         video.src = e.target.result;
 
         // Once ready, returns its size
         // Wait until we have enough data to thumbnail the first frame.
         video.onloadeddata = function() {
-                resolve(video);
+            deferred.resolve(video);
         };
         video.onerror = function(e) {
-                reject(e);
+            deferred.reject(e);
         };
     };
     reader.onerror = function(e) {
-            reject(e);
+        deferred.reject(e);
     };
     reader.readAsDataURL(videoFile);
-    });
+
+    return deferred.promise;
 }
 
 /**
@@ -233,16 +236,16 @@ function infoForVideoFile(matrixClient, roomId, videoFile) {
  *   is read.
  */
 function readFileAsArrayBuffer(file) {
-    return new Promise((resolve, reject) => {
+    const deferred = Promise.defer();
     const reader = new FileReader();
     reader.onload = function(e) {
-            resolve(e.target.result);
+        deferred.resolve(e.target.result);
     };
     reader.onerror = function(e) {
-            reject(e);
+        deferred.reject(e);
     };
     reader.readAsArrayBuffer(file);
-    });
+    return deferred.promise;
 }
 
 /**
@@ -458,34 +461,33 @@ export default class ContentMessages {
             content.info.mimetype = file.type;
         }
 
-        const prom = new Promise((resolve) => {
+        const def = Promise.defer();
         if (file.type.indexOf('image/') == 0) {
             content.msgtype = 'm.image';
             infoForImageFile(matrixClient, roomId, file).then((imageInfo)=>{
                 extend(content.info, imageInfo);
-                    resolve();
+                def.resolve();
             }, (error)=>{
                 console.error(error);
                 content.msgtype = 'm.file';
-                    resolve();
+                def.resolve();
             });
         } else if (file.type.indexOf('audio/') == 0) {
             content.msgtype = 'm.audio';
-                resolve();
+            def.resolve();
         } else if (file.type.indexOf('video/') == 0) {
             content.msgtype = 'm.video';
             infoForVideoFile(matrixClient, roomId, file).then((videoInfo)=>{
                 extend(content.info, videoInfo);
-                    resolve();
+                def.resolve();
             }, (error)=>{
                 content.msgtype = 'm.file';
-                    resolve();
+                def.resolve();
             });
         } else {
             content.msgtype = 'm.file';
-                resolve();
+            def.resolve();
         }
-        });
 
         const upload = {
             fileName: file.name || 'Attachment',
@@ -507,7 +509,7 @@ export default class ContentMessages {
             dis.dispatch({action: 'upload_progress', upload: upload});
         }
 
-        return prom.then(function() {
+        return def.promise.then(function() {
             // XXX: upload.promise must be the promise that
             // is returned by uploadFile as it has an abort()
             // method hacked onto it.

src/Lifecycle.js

@@ -312,14 +312,18 @@ async function _restoreFromLocalStorage(opts) {
 function _handleLoadSessionFailure(e) {
     console.error("Unable to load session", e);
 
+    const def = Promise.defer();
     const SessionRestoreErrorDialog =
           sdk.getComponent('views.dialogs.SessionRestoreErrorDialog');
 
-    const modal = Modal.createTrackedDialog('Session Restore Error', '', SessionRestoreErrorDialog, {
+    Modal.createTrackedDialog('Session Restore Error', '', SessionRestoreErrorDialog, {
         error: e.message,
+        onFinished: (success) => {
+            def.resolve(success);
+        },
     });
 
-    return modal.finished.then(([success]) => {
+    return def.promise.then((success) => {
         if (success) {
             // user clicked continue.
             _clearStorage();

src/components/views/rooms/Autocomplete.js

@@ -26,7 +26,6 @@ import { Room } from 'matrix-js-sdk';
 
 import SettingsStore from "../../../settings/SettingsStore";
 import Autocompleter from '../../../autocomplete/Autocompleter';
-import {sleep} from "../../../utils/promise";
 
 const COMPOSER_SELECTED = 0;
 
@@ -106,11 +105,13 @@ export default class Autocomplete extends React.Component {
             autocompleteDelay = 0;
         }
 
-        return new Promise((resolve) => {
+        const deferred = Promise.defer();
         this.debounceCompletionsRequest = setTimeout(() => {
-                resolve(this.processQuery(query, selection));
+            this.processQuery(query, selection).then(() => {
-            }, autocompleteDelay);
+                deferred.resolve();
             });
+        }, autocompleteDelay);
+        return deferred.promise;
     }
 
     processQuery(query, selection) {
@@ -196,16 +197,16 @@ export default class Autocomplete extends React.Component {
     }
 
     forceComplete() {
-        return new Promise((resolve) => {
+        const done = Promise.defer();
         this.setState({
             forceComplete: true,
             hide: false,
         }, () => {
             this.complete(this.props.query, this.props.selection).then(() => {
-                    resolve(this.countCompletions());
+                done.resolve(this.countCompletions());
-                });
             });
         });
+        return done.promise;
     }
 
     onCompletionClicked(selectionOffset: number): boolean {

src/components/views/settings/ChangePassword.js

@@ -178,12 +178,17 @@ module.exports = createReactClass({
     },
 
     _optionallySetEmail: function() {
+        const deferred = Promise.defer();
         // Ask for an email otherwise the user has no way to reset their password
         const SetEmailDialog = sdk.getComponent("dialogs.SetEmailDialog");
-        const modal = Modal.createTrackedDialog('Do you want to set an email address?', '', SetEmailDialog, {
+        Modal.createTrackedDialog('Do you want to set an email address?', '', SetEmailDialog, {
             title: _t('Do you want to set an email address?'),
+            onFinished: (confirmed) => {
+                // ignore confirmed, setting an email is optional
+                deferred.resolve(confirmed);
+            },
         });
-        return modal.finished.then(([confirmed]) => confirmed);
+        return deferred.promise;
     },
 
     _onExportE2eKeysClicked: function() {

src/rageshake/submit-rageshake.js

@@ -105,7 +105,8 @@ export default async function sendBugReport(bugReportEndpoint, opts) {
 }
 
 function _submitReport(endpoint, body, progressCallback) {
-    return new Promise((resolve, reject) => {
+    const deferred = Promise.defer();
+
     const req = new XMLHttpRequest();
     req.open("POST", endpoint);
     req.timeout = 5 * 60 * 1000;
@@ -113,14 +114,17 @@ function _submitReport(endpoint, body, progressCallback) {
         if (req.readyState === XMLHttpRequest.LOADING) {
             progressCallback(_t("Waiting for response from server"));
         } else if (req.readyState === XMLHttpRequest.DONE) {
-                // on done
+            on_done();
-                if (req.status < 200 || req.status >= 400) {
-                    reject(new Error(`HTTP ${req.status}`));
-                    return;
-                }
-                resolve();
         }
     };
     req.send(body);
-    });
+    return deferred.promise;
+
+    function on_done() {
+        if (req.status < 200 || req.status >= 400) {
+            deferred.reject(new Error(`HTTP ${req.status}`));
+            return;
+        }
+        deferred.resolve();
+    }
 }