v1.7.17

[Release] package: Bump our seshat version

.eslintrc.js

@@ -1,5 +1,3 @@
-const jsSdkEslintCfg = require('matrix-js-sdk/.eslintrc');
-
 module.exports = {
     parserOptions: {
         ecmaVersion: 8,
@@ -10,17 +8,15 @@ module.exports = {
         // we also have some browser code (ie. the preload script)
         browser: true,
     },
-    extends: ["eslint:recommended", "google"],
-    rules: jsSdkEslintCfg.rules,
+    extends: ["matrix-org"],
+    rules: {
+        // js-sdk uses a babel rule which we can't use because we
+        // don't use babel, so remove it & put the original back
+        "babel/no-invalid-this": "off",
+        "no-invalid-this": "error",
+        "quotes": "off",
+        "indent": "off",
+        "prefer-promise-reject-errors": "off",
+        "no-async-promise-executor": "off",
+    }
 }
-
-// js-sdk uses a babel rule which we can't use because we
-// don't use babel, so remove it & put the original back
-delete module.exports.rules["babel/no-invalid-this"];
-module.exports.rules["no-invalid-this"] = "error";
-
-// also override the line length to be consistent with
-// vector-web / react-sdk rather than js-sdk
-module.exports.rules["max-len"] = ["warn", {
-    code: 120,
-}];

CHANGELOG.md

@@ -1,3 +1,239 @@
+Changes in [1.7.17](https://github.com/vector-im/element-desktop/releases/tag/v1.7.17) (2021-01-18)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.17-rc.1...v1.7.17)
+
+ * [Release] package: Bump our seshat version
+   [\#165](https://github.com/vector-im/element-desktop/pull/165)
+
+Changes in [1.7.17-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.17-rc.1) (2021-01-13)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.16...v1.7.17-rc.1)
+
+ * package: Bump our Seshat version
+   [\#162](https://github.com/vector-im/element-desktop/pull/162)
+ * Upgrade to Electron 10.2.0
+   [\#159](https://github.com/vector-im/element-desktop/pull/159)
+
+Changes in [1.7.16](https://github.com/vector-im/element-desktop/releases/tag/v1.7.16) (2020-12-21)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.16-rc.1...v1.7.16)
+
+ * No changes since rc.1
+
+Changes in [1.7.16-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.16-rc.1) (2020-12-16)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.15...v1.7.16-rc.1)
+
+ * Bump ini from 1.3.5 to 1.3.8
+   [\#158](https://github.com/vector-im/element-desktop/pull/158)
+ * Add gitter.im to room directory
+   [\#157](https://github.com/vector-im/element-desktop/pull/157)
+
+Changes in [1.7.15](https://github.com/vector-im/element-desktop/releases/tag/v1.7.15) (2020-12-07)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.15-rc.1...v1.7.15)
+
+ * No changes since rc.1
+
+Changes in [1.7.15-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.15-rc.1) (2020-12-02)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.14...v1.7.15-rc.1)
+
+ * No changes since 1.7.14
+
+Changes in [1.7.14](https://github.com/vector-im/element-desktop/releases/tag/v1.7.14) (2020-11-23)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.14-rc.1...v1.7.14)
+
+ * No changes since rc.1
+
+Changes in [1.7.14-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.14-rc.1) (2020-11-18)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.13...v1.7.14-rc.1)
+
+ * Correct spelling mistakes
+   [\#151](https://github.com/vector-im/element-desktop/pull/151)
+
+Changes in [1.7.13](https://github.com/vector-im/element-desktop/releases/tag/v1.7.13) (2020-11-09)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.13-rc.1...v1.7.13)
+
+ * No changes since rc.1
+
+Changes in [1.7.13-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.13-rc.1) (2020-11-04)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.12...v1.7.13-rc.1)
+
+ * Add countly experiment to develop/nightly configs
+   [\#150](https://github.com/vector-im/element-desktop/pull/150)
+
+Changes in [1.7.12](https://github.com/vector-im/element-desktop/releases/tag/v1.7.12) (2020-10-28)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.11...v1.7.12)
+
+ * No changes since 1.7.11
+
+Changes in [1.7.11](https://github.com/vector-im/element-desktop/releases/tag/v1.7.11) (2020-10-26)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.11-rc.1...v1.7.11)
+
+ * No changes since rc.1
+
+Changes in [1.7.11-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.11-rc.1) (2020-10-21)
+=============================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.10...v1.7.11-rc.1)
+
+ * Bump npm-user-validate from 1.0.0 to 1.0.1
+   [\#148](https://github.com/vector-im/element-desktop/pull/148)
+ * Use keytar for the seshat passphrase.
+   [\#147](https://github.com/vector-im/element-desktop/pull/147)
+ * Upgrade to Electron 10.1.3
+   [\#146](https://github.com/vector-im/element-desktop/pull/146)
+
+Changes in [1.7.10](https://github.com/vector-im/element-desktop/releases/tag/v1.7.10) (2020-10-20)
+===================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.9...v1.7.10)
+
+ * No changes since 1.7.9
+
+Changes in [1.7.9](https://github.com/vector-im/element-desktop/releases/tag/v1.7.9) (2020-10-12)
+=================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.9-rc.1...v1.7.9)
+
+ * No changes since rc.1
+
+Changes in [1.7.9-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.9-rc.1) (2020-10-07)
+===========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.8...v1.7.9-rc.1)
+
+ * package.json: Bump the seshat version.
+   [\#145](https://github.com/vector-im/element-desktop/pull/145)
+ * Explicitly depend on `request` as webcontents-handler requires it
+   [\#144](https://github.com/vector-im/element-desktop/pull/144)
+ * Upgrade png-to-ico
+   [\#143](https://github.com/vector-im/element-desktop/pull/143)
+ * Point 'new issue' link at issue-type choice page
+   [\#142](https://github.com/vector-im/element-desktop/pull/142)
+
+Changes in [1.7.8](https://github.com/vector-im/element-desktop/releases/tag/v1.7.8) (2020-09-28)
+=================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.8-rc.1...v1.7.8)
+
+ * No changes since rc.1
+
+Changes in [1.7.8-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.8-rc.1) (2020-09-23)
+===========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.7...v1.7.8-rc.1)
+
+ * Fix neon error by upgrading Seshat
+   [\#141](https://github.com/vector-im/element-desktop/pull/141)
+ * Upgrade to Electron 10.1.1
+   [\#140](https://github.com/vector-im/element-desktop/pull/140)
+
+Changes in [1.7.7](https://github.com/vector-im/element-desktop/releases/tag/v1.7.7) (2020-09-14)
+=================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.6...v1.7.7)
+
+ * No changes since 1.7.6
+
+Changes in [1.7.6](https://github.com/vector-im/element-desktop/releases/tag/v1.7.6) (2020-09-14)
+=================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.6-rc.1...v1.7.6)
+
+ * No changes since rc.1
+
+Changes in [1.7.6-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.6-rc.1) (2020-09-09)
+===========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.5...v1.7.6-rc.1)
+
+ * Update to Element pipeline name
+   [\#139](https://github.com/vector-im/element-desktop/pull/139)
+ * Bump bl from 4.0.2 to 4.0.3
+   [\#137](https://github.com/vector-im/element-desktop/pull/137)
+
+Changes in [1.7.5](https://github.com/vector-im/element-desktop/releases/tag/v1.7.5) (2020-09-01)
+=================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.5-rc.1...v1.7.5)
+
+ * No changes since 1.7.5-rc.1
+
+Changes in [1.7.5-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.5-rc.1) (2020-08-26)
+===========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.4...v1.7.5-rc.1)
+
+ * Settings v3: Update configs for new feature flag behaviour
+   [\#135](https://github.com/vector-im/element-desktop/pull/135)
+ * Add reaction preview labs flags to nightly
+   [\#134](https://github.com/vector-im/element-desktop/pull/134)
+
+Changes in [1.7.4](https://github.com/vector-im/element-desktop/releases/tag/v1.7.4) (2020-08-17)
+=================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.4-rc.1...v1.7.4)
+
+ * No changes since 1.7.4-rc.1
+
+Changes in [1.7.4-rc.1](https://github.com/vector-im/element-desktop/releases/tag/v1.7.4-rc.1) (2020-08-13)
+===========================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.3...v1.7.4-rc.1)
+
+ * Update policy links to element.io
+   [\#132](https://github.com/vector-im/element-desktop/pull/132)
+ * Update bug report submission URL
+   [\#131](https://github.com/vector-im/element-desktop/pull/131)
+ * Update code signing cert for Windows
+   [\#130](https://github.com/vector-im/element-desktop/pull/130)
+ * Replace Riot with Element in docs and comments
+   [\#129](https://github.com/vector-im/element-desktop/pull/129)
+ * Fix order of README steps
+   [\#128](https://github.com/vector-im/element-desktop/pull/128)
+ * Upgrade to Electron 9.1.2
+   [\#127](https://github.com/vector-im/element-desktop/pull/127)
+
+Changes in [1.7.3](https://github.com/vector-im/element-desktop/releases/tag/v1.7.3) (2020-08-05)
+=================================================================================================
+[Full Changelog](https://github.com/vector-im/element-desktop/compare/v1.7.3-rc.1...v1.7.3)
+
+ * No changes since 1.7.3-rc.1
+
+Changes in [1.7.3-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.7.3-rc.1) (2020-07-31)
+========================================================================================================
+[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.7.2...v1.7.3-rc.1)
+
+ * Clean up linting
+   [\#126](https://github.com/vector-im/riot-desktop/pull/126)
+ * Update renaming workaround for 'Element' name
+   [\#125](https://github.com/vector-im/riot-desktop/pull/125)
+
+Changes in [1.7.2](https://github.com/vector-im/riot-desktop/releases/tag/v1.7.2) (2020-07-27)
+==============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.7.1...v1.7.2)
+
+ * Catch exceptions from main method in fetch script
+   [\#124](https://github.com/vector-im/riot-desktop/pull/124)
+ * Use new eslint package
+   [\#122](https://github.com/vector-im/riot-desktop/pull/122)
+ * Remove ' (Riot)' from app name
+   [\#123](https://github.com/vector-im/riot-desktop/pull/123)
+
+Changes in [1.7.1](https://github.com/vector-im/riot-desktop/releases/tag/v1.7.1) (2020-07-16)
+==============================================================================================
+[Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.7.0...v1.7.1)
+
+ * Bump lodash from 4.17.15 to 4.17.19
+   [\#121](https://github.com/vector-im/riot-desktop/pull/121)
+ * Don't forget nightly when computing userData path
+   [\#120](https://github.com/vector-im/riot-desktop/pull/120)
+ * Fix hosting link
+   [\#119](https://github.com/vector-im/riot-desktop/pull/119)
+ * New macOS icon
+   [\#117](https://github.com/vector-im/riot-desktop/pull/117)
+ * Update README.md
+   [\#118](https://github.com/vector-im/riot-desktop/pull/118)
+ * More icon updates
+   [\#115](https://github.com/vector-im/riot-desktop/pull/115)
+ * Don't forget to yarn install
+   [\#114](https://github.com/vector-im/riot-desktop/pull/114)
+
 Changes in [1.7.0](https://github.com/vector-im/riot-desktop/releases/tag/v1.7.0) (2020-07-15)
 ==============================================================================================
 [Full Changelog](https://github.com/vector-im/riot-desktop/compare/v1.6.8...v1.7.0)
@@ -216,7 +452,7 @@ Changes in [1.6.0-rc.1](https://github.com/vector-im/riot-desktop/releases/tag/v
    [\#57](https://github.com/vector-im/riot-desktop/pull/57)
  * Remove welcome user from config
    [\#56](https://github.com/vector-im/riot-desktop/pull/56)
- * electron-main: Immediatelly set the eventIndex variable to null when
+ * electron-main: Immediately set the eventIndex variable to null when
    closing.
    [\#55](https://github.com/vector-im/riot-desktop/pull/55)
  * Enable Seshat on Nightly

README.md

@@ -3,13 +3,21 @@ Element Desktop
 
 Element Desktop is a Matrix client for desktop platforms with Element Web at its core.
 
+First Steps
+===========
+Before you do anything else, fetch the dependencies:
+
+```
+yarn install
+```
+
 Fetching Element
 ================
 Since this package is just the Electron wrapper for Element Web, it doesn't contain any of the Element Web code,
 so the first step is to get a working copy of Element Web. There are a few ways of doing this:
 
 ```
-# Fetch the prebuilt release Element package from the riot.im GitHub releases page. The version
+# Fetch the prebuilt release Element package from the element-web GitHub releases page. The version
 # fetched will be the same as the local element-desktop package.
 # We're explicitly asking for no config, so the packaged Element will have no config.json.
 yarn run fetch --noverify --cfgdir ''
@@ -27,7 +35,7 @@ yarn run fetch --cfgdir ''
 
 ...or either of the above, but fetching a specific version of Element:
 ```
-# Fetch the prebuilt release Element package from the riot.im GitHub releases page. The version
+# Fetch the prebuilt release Element package from the element-web GitHub releases page. The version
 # fetched will be the same as the local element-desktop package.
 yarn run fetch --noverify --cfgdir '' v1.5.6
 ```
@@ -35,8 +43,8 @@ yarn run fetch --noverify --cfgdir '' v1.5.6
 If you only want to run the app locally and don't need to build packages, you can
 provide the `webapp` directory directly:
 ```
-# Assuming you've checked out and built a copy of riot-web in ../riot-web
-ln -s ../riot-web/webapp ./
+# Assuming you've checked out and built a copy of element-web in ../element-web
+ln -s ../element-web/webapp ./
 ```
 
 [TODO: add support for fetching develop builds, arbitrary URLs and arbitrary paths]
@@ -47,6 +55,20 @@ Building
 Now you have a copy of Element, you're ready to build packages. If you'd just like to
 run Element locally, skip to the next section.
 
+If you'd like to build the native modules (for searching in encrypted rooms and
+secure storage), do this first. This will take 10 minutes or so, and will
+require a number of native tools to be installed, depending on your OS (eg.
+rust, tcl, make/nmake). If you don't need these features, you can skip this
+step.
+```
+yarn run build:native
+```
+
+On Windows, this will automatically determine the architecture to build for based
+on the environment (ie. set up by vcvarsall.bat).
+
+Now you can build the package:
+
 ```
 yarn run build
 ```
@@ -67,16 +89,6 @@ yarn run build64
 
 This build step will not build any native modules.
 
-If you'd like to build the native modules (for searching in encrypted rooms):
-This will take 10 minutes or so, and will require a number of native tools
-to be installed, depending on your OS (eg. rust, tcl, make/nmake).
-```
-yarn run build:native
-```
-
-On Windows, this will automatically determine the architecture to build for based
-on the environment (ie. set up by vcvarsall.bat).
-
 You can also build using docker, which will always produce the linux package:
 ```
 # Run this once to make the docker image
@@ -110,7 +122,7 @@ mkdir myconfig
 cp /path/to/my/config.json myconfig/
 yarn run fetch --cfgdir myconfig
 ```
-The config dir for the official Element.im app is in `riot.im`. If you use this,
+The config dir for the official Element app is in `element.io`. If you use this,
 your app will auto-update itself using builds from element.io.
 
 Profiles
@@ -135,3 +147,10 @@ In the paths above, `$NAME` is typically `Element`, unless you use `--profile
 $PROFILE` in which case it becomes `Element-$PROFILE`, or it is using one of
 the above created by a pre-1.7 install, in which case it will be `Riot` or
 `Riot-$PROFILE`.
+
+Report bugs & give feedback
+==========================
+
+If you run into any bugs or have feedback you'd like to share, please let us know on GitHub.
+
+To help avoid duplicate issues, please [view existing issues](https://github.com/vector-im/element-web/issues?q=is%3Aopen+is%3Aissue+sort%3Areactions-%2B1-desc) first (and add a +1) or [create a new issue](https://github.com/vector-im/element-web/issues/new/choose) if you can't find it.  Please note that this issue tracker is associated with the [element-web](https://github.com/vector-im/element-web) repo, but is also applied to the code in this repo as well.

build/rebrand_stub/rebrand_stub.c

@@ -4,7 +4,7 @@
 #include <tchar.h>
 
 /*
- * This just runs 'Element (Riot).exe' with the same args as
+ * This just runs 'Element.exe' with the same args as
  * this process was invoked with. This gets around the fact that
  * squirrel always tries to run an executable with the same name,
  * so fails to restart if the app's name has changed.
@@ -15,7 +15,7 @@ void _tmain( int argc, TCHAR *argv[] )
     char cmdLine[32767];
 
     LPSTR cmdLinePos = cmdLine;
-    LPSTR toRun = "\"Element (Riot).exe\" ";
+    LPSTR toRun = "\"Element.exe\" ";
     strncpy(cmdLinePos, toRun, strlen(toRun));
     cmdLinePos += strlen(toRun);
 

element.io/New_Vector_Ltd.pem

@@ -1,34 +1,34 @@
 -----BEGIN CERTIFICATE-----
-MIIF0jCCBLqgAwIBAgIRAISYBqZi3VvCUeSfHXF+cbwwDQYJKoZIhvcNAQELBQAw
+MIIF8DCCBNigAwIBAgIRAIZSd8hNVs3w8AhJIsQSoYYwDQYJKoZIhvcNAQELBQAw
 gZExCzAJBgNVBAYTAkdCMRswGQYDVQQIExJHcmVhdGVyIE1hbmNoZXN0ZXIxEDAO
 BgNVBAcTB1NhbGZvcmQxGjAYBgNVBAoTEUNPTU9ETyBDQSBMaW1pdGVkMTcwNQYD
 VQQDEy5DT01PRE8gUlNBIEV4dGVuZGVkIFZhbGlkYXRpb24gQ29kZSBTaWduaW5n
-IENBMB4XDTE3MDgyMzAwMDAwMFoXDTIwMDgyMjIzNTk1OVowgdgxETAPBgNVBAUT
+IENBMB4XDTIwMDczMDAwMDAwMFoXDTIzMDczMDIzNTk1OVowgfMxETAPBgNVBAUT
 CDEwODczNjYxMRMwEQYLKwYBBAGCNzwCAQMTAkdCMR0wGwYDVQQPExRQcml2YXRl
-IE9yZ2FuaXphdGlvbjELMAkGA1UEBhMCR0IxETAPBgNVBBEMCFdDMVIgNEFHMQ8w
-DQYDVQQIDAZMb25kb24xDzANBgNVBAcMBkxvbmRvbjEbMBkGA1UECQwSMjYgUmVk
-IExpb24gU3F1YXJlMRcwFQYDVQQKDA5OZXcgVmVjdG9yIEx0ZDEXMBUGA1UEAwwO
-TmV3IFZlY3RvciBMdGQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC7
-X0HP3oM/SVr6PboD03ndtYTONZDcJ/GJ3EyYi6UNrcbKjuDHwPktx9hjAhNjcVkG
-lmuTEPluPj9DbvjaTrers0cQsAS1vJ0RHjLfA93Flg1ys9Q6OThUMw77FtFPtiJU
-z5cSYzfFAhn/4dv7BcgGptn+Mv/8CaTu+RUZJUgoSlRWcT1TREmxkzWotbblqsHO
-zjDmUg20tL5/qpt6BSWsNespf5udKQFXMtqkczBcLvBLmql0vurVcQy8BibB+Q89
-QKwRzwLgaIa7O8WEssFcW8uJe9s0SNtUy8ehbuoSxpA/DbHFwsiDbNA78vp7HrqM
-qY6t6OIgLtDYBFCfe/btAgMBAAGjggHaMIIB1jAfBgNVHSMEGDAWgBTfj/MgDOnK
-pgTYW1g3Kj2rRtyDSTAdBgNVHQ4EFgQUH+mDOdRkF3bYDxCWEaGB4lxiCxcwDgYD
-VR0PAQH/BAQDAgeAMAwGA1UdEwEB/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwMw
-EQYJYIZIAYb4QgEBBAQDAgQQMEYGA1UdIAQ/MD0wOwYMKwYBBAGyMQECAQYBMCsw
-KQYIKwYBBQUHAgEWHWh0dHBzOi8vc2VjdXJlLmNvbW9kby5jb20vQ1BTMFUGA1Ud
-HwROMEwwSqBIoEaGRGh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4
-dGVuZGVkVmFsaWRhdGlvbkNvZGVTaWduaW5nQ0EuY3JsMIGGBggrBgEFBQcBAQR6
-MHgwUAYIKwYBBQUHMAKGRGh0dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JT
-QUV4dGVuZGVkVmFsaWRhdGlvbkNvZGVTaWduaW5nQ0EuY3J0MCQGCCsGAQUFBzAB
-hhhodHRwOi8vb2NzcC5jb21vZG9jYS5jb20wJgYDVR0RBB8wHaAbBggrBgEFBQcI
-A6APMA0MC0dCLTEwODczNjYxMA0GCSqGSIb3DQEBCwUAA4IBAQBJ2aH4aixh0aiz
-4WKlK+LMVLHpQ2POE3FZYNpAW7o1q2YDGEADXdGrygPE9NCGNBXKo0CAemCYNWfX
-Ov/jdoiMfeqW3vrZ66oEy8OqbvJSwK1xmomWuYw3wYPWcPVG+YbWYD2CGdQu8jTz
-fzAJCpvAuY3Wji3fQjiecAC7JCSB4fBHa0ALJOmiSqKQUUpkXs5kW7O0lPBnHzNF
-2tQGltXMSIrq1QfFtcreMyKlwDOxPIh360dv5aHhaeSRDRKxq7uq5ikQF2gjKx4k
-ieg2HRbAW6fVPpFr4zRS5umpeZV3i06i11VQQPS/mA/OBEXyaqzx4mr6B7U6ptrp
-jMqiUv2w
+IE9yZ2FuaXphdGlvbjELMAkGA1UEBhMCR0IxDzANBgNVBBEMBlc0IDFRVTEYMBYG
+A1UECAwPTG9uZG9uLCBDaXR5IG9mMQ8wDQYDVQQHDAZMb25kb24xJzAlBgNVBAkM
+HjE0IFR1cm5oYW0gR3JlZW4sIFRlcnJhY2UgTWV3czEbMBkGA1UECgwSTmV3IFZl
+Y3RvciBMaW1pdGVkMRswGQYDVQQDDBJOZXcgVmVjdG9yIExpbWl0ZWQwggEiMA0G
+CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDKDnGul2M7oCCN+3veGf7yfakSfMjK
+Kqeylyo0Nj8dUleNQvsRo0OHxIWJlbHDYglxebT109MqgyASr0SoeiqvXOSSFACD
+MYFoyerRGMnXEuomTU0y7+FE3p/hcim8+C5gS+rHr3YaJJuzzXRztjjCBGoY4was
+h9V8kYiyMMK0xi2WftOCBa1yYS32CInHIZVmdhzoK4k4YzSYIp57BWvnIUlDyCYk
+slNfp0SFbDrOGa7kbmy8HRfWPLjNmW5PPIrsf8LlnVRBfmTeUIJtV31w/FuMjeir
+pzYjzooXmpIrj96ecxdc9thP6etCUazvpowjfewu7UNWRUhGPtYn8v8rAgMBAAGj
+ggHdMIIB2TAfBgNVHSMEGDAWgBTfj/MgDOnKpgTYW1g3Kj2rRtyDSTAdBgNVHQ4E
+FgQUB9su4pCQXE5ZWFhB1eo48992LEcwDgYDVR0PAQH/BAQDAgeAMAwGA1UdEwEB
+/wQCMAAwEwYDVR0lBAwwCgYIKwYBBQUHAwMwEQYJYIZIAYb4QgEBBAQDAgQQMEkG
+A1UdIARCMEAwNQYMKwYBBAGyMQECAQYBMCUwIwYIKwYBBQUHAgEWF2h0dHBzOi8v
+c2VjdGlnby5jb20vQ1BTMAcGBWeBDAEDMFUGA1UdHwROMEwwSqBIoEaGRGh0dHA6
+Ly9jcmwuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlvbkNv
+ZGVTaWduaW5nQ0EuY3JsMIGGBggrBgEFBQcBAQR6MHgwUAYIKwYBBQUHMAKGRGh0
+dHA6Ly9jcnQuY29tb2RvY2EuY29tL0NPTU9ET1JTQUV4dGVuZGVkVmFsaWRhdGlv
+bkNvZGVTaWduaW5nQ0EuY3J0MCQGCCsGAQUFBzABhhhodHRwOi8vb2NzcC5jb21v
+ZG9jYS5jb20wJgYDVR0RBB8wHaAbBggrBgEFBQcIA6APMA0MC0dCLTEwODczNjYx
+MA0GCSqGSIb3DQEBCwUAA4IBAQBZ8/YtqW/+VUoV8knKpdhMR2uTn8AEyVmfmoZA
+Ly5kdCRoKvFm/z4VK4cqF7gsUDxRIgDuMKKbWTtr1FEXuaZkUkOjicNcdYxc0pDn
+nFKBWAv5pN5OmnC9cVqIG7PtvD+8bKVzDdQRjpGMy6PY4rN2PYGfQ7KGgddEDD6m
+oM51jI/OTvCeU0Tyl0bixKEmpUJvbeQM9Ul2Y1o5Enx1Q9uda8xATb0HCMKgJ+GC
+iFHL2DNC3j1xK4QoZEIYgbTscj9rK4OMEov3PT/e1FwQyB5V9xdJ5i1MDBDD9fAf
+OiVgf90SffT7TgWUbA4Z+PtQHq/qNma0+dZWyeq7zYn2IIX3
 -----END CERTIFICATE-----

element.io/nightly/config.json

@@ -11,29 +11,22 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
-    "features": {
-        "feature_new_spinner": "labs",
-        "feature_pinning": "labs",
-        "feature_custom_status": "labs",
-        "feature_custom_tags": "labs",
-        "feature_state_counters": "labs",
-        "feature_many_integration_managers": "labs",
-        "feature_mjolnir": "labs",
-        "feature_dm_verification": "labs",
-        "feature_bridge_state": "labs",
-        "feature_presence_in_room_list": "labs",
-        "feature_custom_themes": "labs"
-    },
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
+    "showLabsSettings": true,
     "piwik": {
         "url": "https://piwik.riot.im/",
         "siteId": 1,
-        "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
+        "policyUrl": "https://element.io/cookie-policy"
+    },
+    "countly": {
+        "url": "https://try.count.ly",
+        "appKey": "8abf1ee15646bc884556b82e5053857904264b66"
     },
     "roomDirectory": {
         "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im"
         ]
     },
     "enable_presence_by_hs_url": {
@@ -42,11 +35,11 @@
     },
     "terms_and_conditions_links": [
         {
-            "url": "https://riot.im/privacy",
+            "url": "https://element.io/privacy",
             "text": "Privacy Policy"
         },
         {
-            "url": "https://matrix.org/legal/riot-im-cookie-policy",
+            "url": "https://element.io/cookie-policy",
             "text": "Cookie Policy"
         }
     ]

element.io/release/config.json

@@ -11,17 +11,19 @@
         "https://scalar-staging.vector.im/api",
         "https://scalar-staging.riot.im/scalar/api"
     ],
-    "hosting_signup_link": "https://modular.im/services/matrix-hosting-riot?utm_source=riot-web&utm_medium=web",
-    "bug_report_endpoint_url": "https://riot.im/bugreports/submit",
+    "hosting_signup_link": "https://element.io/matrix-services?utm_source=element-web&utm_medium=web",
+    "bug_report_endpoint_url": "https://element.io/bugreports/submit",
     "roomDirectory": {
         "servers": [
-            "matrix.org"
+            "matrix.org",
+            "gitter.im"
         ]
     },
+    "showLabsSettings": false,
     "piwik": {
         "url": "https://piwik.riot.im/",
         "siteId": 1,
-        "policyUrl": "https://matrix.org/legal/riot-im-cookie-policy"
+        "policyUrl": "https://element.io/cookie-policy"
     },
     "enable_presence_by_hs_url": {
         "https://matrix.org": false,
@@ -29,11 +31,11 @@
     },
     "terms_and_conditions_links": [
         {
-            "url": "https://riot.im/privacy",
+            "url": "https://element.io/privacy",
             "text": "Privacy Policy"
         },
         {
-            "url": "https://matrix.org/legal/riot-im-cookie-policy",
+            "url": "https://element.io/cookie-policy",
             "text": "Cookie Policy"
         }
     ]

package.json

@@ -1,13 +1,13 @@
 {
   "name": "element-desktop",
-  "productName": "Element (Riot)",
+  "productName": "Element",
   "main": "src/electron-main.js",
-  "version": "1.7.0",
+  "version": "1.7.17",
   "description": "A feature-rich client for Matrix.org",
   "author": "Element",
   "repository": {
     "type": "git",
-    "url": "https://github.com/vector-im/riot-desktop"
+    "url": "https://github.com/vector-im/element-desktop"
   },
   "license": "Apache-2.0",
   "files": [],
@@ -21,7 +21,7 @@
     "build32": "electron-builder --ia32",
     "build64": "electron-builder --x64",
     "build": "electron-builder",
-    "docker:setup": "docker build -t riot-desktop-dockerbuild dockerbuild",
+    "docker:setup": "docker build -t element-desktop-dockerbuild dockerbuild",
     "docker:build:native": "scripts/in-docker.sh yarn run hak",
     "docker:build": "scripts/in-docker.sh yarn run build",
     "docker:install": "scripts/in-docker.sh yarn install",
@@ -34,7 +34,8 @@
     "electron-store": "^2.0.0",
     "electron-window-state": "^4.1.0",
     "minimist": "^1.2.3",
-    "png-to-ico": "^1.0.2"
+    "png-to-ico": "^2.1.0",
+    "request": "^2.88.2"
   },
   "devDependencies": {
     "asar": "^2.0.1",
@@ -42,13 +43,11 @@
     "electron-builder-squirrel-windows": "^22.7.0",
     "electron-devtools-installer": "^2.2.4",
     "electron-notarize": "^0.2.0",
-    "eslint": "^5.8.0",
-    "eslint-config-google": "^0.7.1",
-    "eslint-plugin-babel": "^4.1.2",
+    "eslint": "7.3.1",
+    "eslint-config-matrix-org": "^0.1.2",
     "find-npm-prefix": "^1.0.2",
     "fs-extra": "^8.1.0",
     "glob": "^7.1.6",
-    "matrix-js-sdk": "7.1.0",
     "mkdirp": "^1.0.3",
     "needle": "^2.5.0",
     "node-pre-gyp": "^0.15.0",
@@ -58,12 +57,12 @@
     "tar": "^6.0.1"
   },
   "hakDependencies": {
-    "matrix-seshat": "^2.1.0",
+    "matrix-seshat": "^2.2.3",
     "keytar": "^5.6.0"
   },
   "build": {
     "appId": "im.riot.app",
-    "electronVersion": "9.0.5",
+    "electronVersion": "10.2.0",
     "files": [
       "package.json",
       {

release.sh

@@ -9,52 +9,4 @@ set -e
 
 cd `dirname $0`
 
-for i in matrix-js-sdk
-do
-    echo "Checking version of $i..."
-    depver=`cat package.json | jq -r .devDependencies[\"$i\"]`
-    latestver=`yarn info -s $i dist-tags.next`
-    if [ "$depver" != "$latestver" ]
-    then
-        echo "The latest version of $i is $latestver but package.json depends on $depver."
-        echo -n "Type 'u' to auto-upgrade, 'c' to continue anyway, or 'a' to abort:"
-        read resp
-        if [ "$resp" != "u" ] && [ "$resp" != "c" ]
-        then
-            echo "Aborting."
-            exit 1
-        fi
-        if [ "$resp" == "u" ]
-        then
-            echo "Upgrading $i to $latestver..."
-            yarn add -ED $i@$latestver
-            git add -u
-            # The `-e` flag opens the editor and gives you a chance to check
-            # the upgrade for correctness.
-            git commit -m "Upgrade $i to $latestver" -e
-        fi
-    fi
-done
-
 ./node_modules/matrix-js-sdk/release.sh -n -z "$@"
-
-release="${1#v}"
-prerelease=0
-# We check if this build is a prerelease by looking to
-# see if the version has a hyphen in it. Crude,
-# but semver doesn't support postreleases so anything
-# with a hyphen is a prerelease.
-echo $release | grep -q '-' && prerelease=1
-
-if [ $prerelease -eq 0 ]
-then
-    # For a release, reset SDK deps back to the `develop` branch.
-    for i in matrix-js-sdk
-    do
-        echo "Resetting $i to develop branch..."
-        yarn add -D github:matrix-org/$i#develop
-        git add -u
-        git commit -m "Reset $i back to develop branch"
-    done
-    git push origin develop
-fi

scripts/ci/install-deps.sh

@@ -2,12 +2,4 @@
 
 set -ex
 
-scripts/fetchdep.sh matrix-org matrix-js-sdk
-
-pushd matrix-js-sdk
-yarn link
-yarn install $@
-popd
-
-yarn link matrix-js-sdk
 yarn install $@

scripts/fetch-package.js

@@ -11,15 +11,15 @@ const needle = require('needle');
 
 const riotDesktopPackageJson = require('../package.json');
 
-const PUB_KEY_URL = "https://packages.riot.im/riot-release-key.asc";
-const PACKAGE_URL_PREFIX = "https://github.com/vector-im/riot-web/releases/download/";
+const PUB_KEY_URL = "https://packages.riot.im/element-release-key.asc";
+const PACKAGE_URL_PREFIX = "https://github.com/vector-im/element-web/releases/download/";
 const ASAR_PATH = 'webapp.asar';
 
 const {setPackageVersion, setDebVersion} = require('./set-version.js');
 
 async function getLatestDevelopUrl(bkToken) {
     const buildsResult = await needle('get',
-        "https://api.buildkite.com/v2/organizations/matrix-dot-org/pipelines/riot-web/builds",
+        "https://api.buildkite.com/v2/organizations/matrix-dot-org/pipelines/element-web/builds",
         {
             branch: 'develop',
             state: 'passed',
@@ -55,7 +55,7 @@ async function getLatestDevelopUrl(bkToken) {
     let dlUrl;
     let dlFilename;
     for (const artifact of artifactsResult.body) {
-        if (artifact.filename && /^riot-.*\.tar.gz$/.test(artifact.filename)) {
+        if (artifact.filename && /^element-.*\.tar.gz$/.test(artifact.filename)) {
             dlUrl = artifact.download_url;
             dlFilename = artifact.filename;
             break;
@@ -149,7 +149,7 @@ async function main() {
 
     if (targetVersion === undefined) {
         targetVersion = 'v' + riotDesktopPackageJson.version;
-        filename = 'riot-' + targetVersion + '.tar.gz';
+        filename = 'element-' + targetVersion + '.tar.gz';
         url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
     } else if (targetVersion === 'develop') {
         const buildKiteApiKey = process.env.BUILDKITE_API_KEY;
@@ -164,7 +164,7 @@ async function main() {
         [filename, url] = await getLatestDevelopUrl(buildKiteApiKey);
         verify = false; // develop builds aren't signed
     } else {
-        filename = 'riot-' + targetVersion + '.tar.gz';
+        filename = 'element-' + targetVersion + '.tar.gz';
         url = PACKAGE_URL_PREFIX + targetVersion + '/' + filename;
         setVersion = true;
     }
@@ -289,4 +289,4 @@ async function main() {
     console.log("Done!");
 }
 
-main().then((ret) => process.exit(ret));
+main().then((ret) => process.exit(ret)).catch(e => process.exit(1));

scripts/in-docker.sh

@@ -1,8 +1,8 @@
 #!/bin/bash
 
-docker inspect riot-desktop-dockerbuild 2> /dev/null > /dev/null
+docker inspect element-desktop-dockerbuild 2> /dev/null > /dev/null
 if [ $? != 0 ]; then
-    echo "Docker image riot-desktop-dockerbuild not found. Have you run yarn run docker:setup?"
+    echo "Docker image element-desktop-dockerbuild not found. Have you run yarn run docker:setup?"
     exit 1
 fi
 
@@ -17,4 +17,4 @@ docker run --rm -ti \
  -v ${PWD}/docker/.gnupg:/root/.gnupg \
  -v ~/.cache/electron:/root/.cache/electron \
  -v ~/.cache/electron-builder:/root/.cache/electron-builder \
- riot-desktop-dockerbuild "$@"
+ element-desktop-dockerbuild "$@"

scripts/mkrepo.sh

@@ -22,10 +22,10 @@ cp $confdir/conf_distributions $repodir/conf/distributions
 pushd $repodir
 for i in `cat conf/distributions | grep Codename | cut -d ' ' -f 2`
 do
-    reprepro includedeb $i $distdir/riot-desktop_${ver}_amd64.deb
+    reprepro includedeb $i $distdir/element-desktop_${ver}_amd64.deb
 done
 
-tar cvzf $distdir/riot-desktop_repo_$ver.tar.gz .
+tar cvzf $distdir/element-desktop_repo_$ver.tar.gz .
 
 popd
 

src/electron-main.js

@@ -61,7 +61,7 @@ let Seshat;
 let SeshatRecovery;
 let ReindexError;
 
-const seshatPassphrase = "DEFAULT_PASSPHRASE";
+const seshatDefaultPassphrase = "DEFAULT_PASSPHRASE";
 
 try {
     const seshatModule = require('matrix-seshat');
@@ -115,14 +115,16 @@ if (userDataPathInProtocol) {
 } else if (argv['profile-dir']) {
     userDataPath = argv['profile-dir'];
 } else {
-    // always override the user data path because electron uses the ${appData}/productName
-    // but we want our productName to be "Element (Riot)" for a transition period after the rename.
-    let newUserDataPath = path.join(app.getPath('appData'), 'Element');
+    let newUserDataPath = app.getPath('userData');
     if (argv['profile']) {
         newUserDataPath += '-' + argv['profile'];
     }
     const newUserDataPathExists = isRealUserDataDir(newUserDataPath);
-    const oldUserDataPath = path.join(app.getPath('appData'), 'Riot');
+    let oldUserDataPath = path.join(app.getPath('appData'), app.getName().replace('Element', 'Riot'));
+    if (argv['profile']) {
+        oldUserDataPath += '-' + argv['profile'];
+    }
+
     const oldUserDataPathExists = isRealUserDataDir(oldUserDataPath);
     console.log(newUserDataPath + " exists: " + (newUserDataPathExists ? 'yes' : 'no'));
     console.log(oldUserDataPath + " exists: " + (oldUserDataPathExists ? 'yes' : 'no'));
@@ -180,7 +182,7 @@ async function setupGlobals() {
         vectorConfig = require(asarPath + 'config.json');
     } catch (e) {
         // it would be nice to check the error code here and bail if the config
-        // is unparseable, but we get MODULE_NOT_FOUND in the case of a missing
+        // is unparsable, but we get MODULE_NOT_FOUND in the case of a missing
         // file or invalid json, so node is just very unhelpful.
         // Continue with the defaults (ie. an empty config)
         vectorConfig = {};
@@ -208,7 +210,7 @@ async function setupGlobals() {
 
     // The tray icon
     // It's important to call `path.join` so we don't end up with the packaged asar in the final path.
-    const iconFile = `riot.${process.platform === 'win32' ? 'ico' : 'png'}`;
+    const iconFile = `element.${process.platform === 'win32' ? 'ico' : 'png'}`;
     iconPath = path.join(resPath, "img", iconFile);
     trayConfig = {
         icon_path: iconPath,
@@ -260,6 +262,18 @@ const deleteContents = async (p) => {
     }
 };
 
+async function randomArray(size) {
+    return new Promise((resolve, reject) => {
+        crypto.randomBytes(size, (err, buf) => {
+            if (err) {
+                reject(err);
+            } else {
+                resolve(buf.toString("base64").replace(/=+$/g, ''));
+            }
+        });
+    });
+}
+
 // handle uncaught errors otherwise it displays
 // stack traces in popup dialogs, which is terrible (which
 // it will do any time the auto update poke fails, and there's
@@ -437,16 +451,7 @@ ipcMain.on('ipcCall', async function(ev, payload) {
 
         case 'createPickleKey':
             try {
-                const randomArray = await new Promise((resolve, reject) => {
-                    crypto.randomBytes(32, (err, buf) => {
-                        if (err) {
-                            reject(err);
-                        } else {
-                            resolve(buf);
-                        }
-                    });
-                });
-                const pickleKey = randomArray.toString("base64").replace(/=+$/g, '');
+                const pickleKey = await randomArray(32);
                 await keytar.setPassword("element.io", `${args[0]}|${args[1]}`, pickleKey);
                 ret = pickleKey;
             } catch (e) {
@@ -501,18 +506,42 @@ ipcMain.on('seshat', async function(ev, payload) {
 
         case 'initEventIndex':
             if (eventIndex === null) {
-                try {
-                    await afs.mkdir(eventStorePath, {recursive: true});
-                    eventIndex = new Seshat(eventStorePath, {passphrase: seshatPassphrase});
-                } catch (e) {
-                    if (e instanceof ReindexError) {
-                        // If this is a reindex error, the index schema
-                        // changed. Try to open the database in recovery mode,
-                        // reindex the database and finally try to open the
-                        // database again.
-                        try {
+                const userId = args[0];
+                const deviceId = args[1];
+                const passphraseKey = `seshat|${userId}|${deviceId}`;
+
+                let changePassphrase = false;
+                let passphrase = seshatDefaultPassphrase;
+
+                if (keytar) {
+                    try {
+                        // Try to get a passphrase for seshat.
+                        const storedPassphrase = await keytar.getPassword("element.io", passphraseKey);
+
+                        // If no passphrase was found mark that we should change
+                        // it, if one is found, use that one.
+                        if (storedPassphrase === null) {
+                            changePassphrase = true;
+                        } else {
+                            passphrase = storedPassphrase;
+                        }
+                    } catch (e) {
+                        console.log("Error getting the event index passphrase out of the secret store", e);
+                    }
+                }
+
+                const openSeshat = async () => {
+                    try {
+                        await afs.mkdir(eventStorePath, {recursive: true});
+                        return new Seshat(eventStorePath, {passphrase});
+                    } catch (e) {
+                        if (e instanceof ReindexError) {
+                            // If this is a reindex error, the index schema
+                            // changed. Try to open the database in recovery mode,
+                            // reindex the database and finally try to open the
+                            // database again.
                             const recoveryIndex = new SeshatRecovery(eventStorePath, {
-                                passphrase: seshatPassphrase,
+                                passphrase,
                             });
 
                             const userVersion = await recoveryIndex.getUserVersion();
@@ -530,14 +559,33 @@ ipcMain.on('seshat', async function(ev, payload) {
                                 await recoveryIndex.reindex();
                             }
 
-                            eventIndex = new Seshat(eventStorePath, {
-                                passphrase: seshatPassphrase,
-                            });
-                        } catch (e) {
-                            sendError(payload.id, e);
-                            return;
+                            return new Seshat(eventStorePath, {passphrase});
+                        } else {
+                            throw (e);
                         }
-                    } else {
+                    }
+                };
+
+                try {
+                    eventIndex = await openSeshat();
+                } catch (e) {
+                    sendError(payload.id, e);
+                    return;
+                }
+
+                if (changePassphrase) {
+                    try {
+                        // Generate a new random passphrase.
+                        const newPassphrase = await randomArray(32);
+                        await keytar.setPassword("element.io", passphraseKey, newPassphrase);
+
+                        // Set the new passphrase, this will close the event
+                        // index.
+                        await eventIndex.changePassphrase(newPassphrase);
+
+                        // Re-open the event index with the new passphrase.
+                        eventIndex = new Seshat(eventStorePath, {newPassphrase});
+                    } catch (e) {
                         sendError(payload.id, e);
                         return;
                     }

src/squirrelhooks.js

@@ -51,6 +51,19 @@ function checkSquirrelHooks() {
                 appDataDir, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'New Vector Ltd',
             );
             return fsProm.rmdir(startMenuDir, { recursive: true });
+        }).then(() => {
+            // same for 'Element (Riot) which is old now too (we have to try to delete both because
+            // we don't know what version we're updating from, but of course we do know this version
+            // is 'Element' so the two old ones are all safe to delete).
+            const appDataDir = process.env.APPDATA;
+            if (!appDataDir) return;
+            const oldStartMenuLink = path.join(
+                appDataDir, 'Microsoft', 'Windows', 'Start Menu', 'Programs', 'Element', 'Element (Riot).lnk',
+            );
+            return fsProm.unlink(oldStartMenuLink).catch(() => {});
+        }).then(() => {
+            const oldDesktopShortcut = path.join(app.getPath('desktop'), 'Element (Riot).lnk');
+            return fsProm.unlink(oldDesktopShortcut).catch(() => {});
         }).then(() => {
             const oldDesktopShortcut = path.join(app.getPath('desktop'), 'Riot.lnk');
             return fsProm.unlink(oldDesktopShortcut).catch(() => {});