Revert "Merge pull request #2395 from matrix-org/dbkr/merge_develop_experimental"

This reverts commit ad47144355.

src/components/structures/UserSettings.js

@@ -64,7 +64,6 @@ const SIMPLE_SETTINGS = [
     { id: "urlPreviewsEnabled" },
     { id: "autoplayGifsAndVideos" },
     { id: "alwaysShowEncryptionIcons" },
-    { id: "showRoomRecoveryReminder" },
     { id: "hideReadReceipts" },
     { id: "dontSendTypingNotifications" },
     { id: "alwaysShowTimestamps" },
@@ -189,11 +188,9 @@ module.exports = React.createClass({
             phase: "UserSettings.LOADING", // LOADING, DISPLAY
             email_add_pending: false,
             vectorVersion: undefined,
-            canSelfUpdate: null,
             rejectingInvites: false,
             mediaDevices: null,
             ignoredUsers: [],
-            autoLaunchEnabled: null,
         };
     },
 
@@ -212,13 +209,6 @@ module.exports = React.createClass({
             }, (e) => {
                 console.log("Failed to fetch app version", e);
             });
-
-            PlatformPeg.get().canSelfUpdate().then((canUpdate) => {
-                if (this._unmounted) return;
-                this.setState({
-                    canSelfUpdate: canUpdate,
-                });
-            });
         }
 
         this._refreshMediaDevices();
@@ -237,12 +227,11 @@ module.exports = React.createClass({
         });
         this._refreshFromServer();
 
-        if (PlatformPeg.get().supportsAutoLaunch()) {
-            PlatformPeg.get().getAutoLaunchEnabled().then(enabled => {
-                this.setState({
-                    autoLaunchEnabled: enabled,
-                });
-            });
+        if (PlatformPeg.get().isElectron()) {
+            const {ipcRenderer} = require('electron');
+
+            ipcRenderer.on('settings', this._electronSettings);
+            ipcRenderer.send('settings_get');
         }
 
         this.setState({
@@ -273,6 +262,11 @@ module.exports = React.createClass({
         if (cli) {
             cli.removeListener("RoomMember.membership", this._onInviteStateChange);
         }
+
+        if (PlatformPeg.get().isElectron()) {
+            const {ipcRenderer} = require('electron');
+            ipcRenderer.removeListener('settings', this._electronSettings);
+        }
     },
 
     // `UserSettings` assumes that the client peg will not be null, so give it some
@@ -291,6 +285,10 @@ module.exports = React.createClass({
         });
     },
 
+    _electronSettings: function(ev, settings) {
+        this.setState({ electron_settings: settings });
+    },
+
     _refreshMediaDevices: function(stream) {
         if (stream) {
             // kill stream so that we don't leave it lingering around with webcam enabled etc
@@ -945,7 +943,7 @@ module.exports = React.createClass({
 
     _renderCheckUpdate: function() {
         const platform = PlatformPeg.get();
-        if (this.state.canSelfUpdate) {
+        if ('canSelfUpdate' in platform && platform.canSelfUpdate() && 'startUpdateCheck' in platform) {
             return <div>
                 <h3>{ _t('Updates') }</h3>
                 <div className="mx_UserSettings_section">
@@ -990,7 +988,8 @@ module.exports = React.createClass({
     },
 
     _renderElectronSettings: function() {
-        if (!PlatformPeg.get().supportsAutoLaunch()) return;
+        const settings = this.state.electron_settings;
+        if (!settings) return;
 
         // TODO: This should probably be a granular setting, but it only applies to electron
         // and ends up being get/set outside of matrix anyways (local system setting).
@@ -1000,7 +999,7 @@ module.exports = React.createClass({
                 <div className="mx_UserSettings_toggle">
                     <input type="checkbox"
                            name="auto-launch"
-                           defaultChecked={this.state.autoLaunchEnabled}
+                           defaultChecked={settings['auto-launch']}
                            onChange={this._onAutoLaunchChanged}
                     />
                     <label htmlFor="auto-launch">{ _t('Start automatically after system login') }</label>
@@ -1010,11 +1009,8 @@ module.exports = React.createClass({
     },
 
     _onAutoLaunchChanged: function(e) {
-        PlatformPeg.get().setAutoLaunchEnabled(e.target.checked).then(() => {
-            this.setState({
-                autoLaunchEnabled: e.target.checked,
-            });
-        });
+        const {ipcRenderer} = require('electron');
+        ipcRenderer.send('settings_set', 'auto-launch', e.target.checked);
     },
 
     _mapWebRtcDevicesToSpans: function(devices) {
@@ -1373,7 +1369,7 @@ module.exports = React.createClass({
                 { this._renderBulkOptions() }
                 { this._renderBugReport() }
 
-                { this._renderElectronSettings() }
+                { PlatformPeg.get().isElectron() && this._renderElectronSettings() }
 
                 { this._renderAnalyticsControl() }