matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-12-01 04:43:29 +03:00
Code Activity

Merge remote-tracking branch 'origin/develop' into dbkr/udd_no_auto_show

Browse Source
This commit is contained in:
David Baker
2017-11-15 12:10:06 +00:00
parent 8fcf55d761 4438d716b9
commit 76b2fc2a6c
8 changed files with 65 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/client.js
View File

@@ -543,11 +543,10 @@ async function _setDeviceVerification(
/**
* Set the global override for whether the client should ever send encrypted
* messages to unverified devices. If false, it can still be overridden
* per-room. If true, it overrides the per-room settings.
* messages to unverified devices. This provides the default for rooms which
* do not specify a value.
*
* @param {boolean} value whether to unilaterally blacklist all
* unverified devices
* @param {boolean} value whether to blacklist all unverified devices by default
*/
MatrixClient.prototype.setGlobalBlacklistUnverifiedDevices = function(value) {
if (this._crypto === null) {
@@ -557,8 +556,7 @@ MatrixClient.prototype.setGlobalBlacklistUnverifiedDevices = function(value) {
};
/**
* @return {boolean} whether to unilaterally blacklist all
* unverified devices
* @return {boolean} whether to blacklist all unverified devices by default
*/
MatrixClient.prototype.getGlobalBlacklistUnverifiedDevices = function() {
if (this._crypto === null) {
@@ -2986,6 +2984,9 @@ MatrixClient.prototype.getTurnServers = function() {
*
* @param {Filter=} opts.filter The filter to apply to /sync calls. This will override
* the opts.initialSyncLimit, which would normally result in a timeline limit filter.
*
* @param {Boolean=} opts.disablePresence True to perform syncing without automatically
* updating presence.
*/
MatrixClient.prototype.startClient = function(opts) {
if (this.clientRunning) {