matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-26 17:03:12 +03:00
Code Activity

Merge branch 'develop' into feed

Browse Source
This commit is contained in:
Šimon Brandner
2021-04-07 19:14:17 +02:00
parent 7f4397f8ca f1e1daa194
commit ae69af7e70
2 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/crypto/index.js
View File

@@ -1330,12 +1330,14 @@ Crypto.prototype.checkOwnCrossSigningTrust = async function({
const seenPubkey = newCrossSigning.getId(); const seenPubkey = newCrossSigning.getId();
const masterChanged = this._crossSigningInfo.getId() !== seenPubkey; const masterChanged = this._crossSigningInfo.getId() !== seenPubkey;
const masterExistsNotLocallyCached =
newCrossSigning.getId() && !crossSigningPrivateKeys.has("master");
if (masterChanged) { if (masterChanged) {
logger.info("Got new master public key", seenPubkey); logger.info("Got new master public key", seenPubkey);
} }
if ( if (
allowPrivateKeyRequests && allowPrivateKeyRequests &&
(masterChanged || !crossSigningPrivateKeys.has("master")) (masterChanged || masterExistsNotLocallyCached)
) { ) {
logger.info("Attempting to retrieve cross-signing master private key"); logger.info("Attempting to retrieve cross-signing master private key");
let signing = null; let signing = null;
@@ -1362,6 +1364,15 @@ Crypto.prototype.checkOwnCrossSigningTrust = async function({
const selfSigningChanged = oldSelfSigningId !== newCrossSigning.getId("self_signing"); const selfSigningChanged = oldSelfSigningId !== newCrossSigning.getId("self_signing");
const userSigningChanged = oldUserSigningId !== newCrossSigning.getId("user_signing"); const userSigningChanged = oldUserSigningId !== newCrossSigning.getId("user_signing");
const selfSigningExistsNotLocallyCached = (
newCrossSigning.getId("self_signing") &&
!crossSigningPrivateKeys.has("self_signing")
);
const userSigningExistsNotLocallyCached = (
newCrossSigning.getId("user_signing") &&
!crossSigningPrivateKeys.has("user_signing")
);
const keySignatures = {}; const keySignatures = {};
if (selfSigningChanged) { if (selfSigningChanged) {
@@ -1369,7 +1380,7 @@ Crypto.prototype.checkOwnCrossSigningTrust = async function({
} }
if ( if (
allowPrivateKeyRequests && allowPrivateKeyRequests &&
(selfSigningChanged || !crossSigningPrivateKeys.has("self_signing")) (selfSigningChanged || selfSigningExistsNotLocallyCached)
) { ) {
logger.info("Attempting to retrieve cross-signing self-signing private key"); logger.info("Attempting to retrieve cross-signing self-signing private key");
let signing = null; let signing = null;
@@ -1394,7 +1405,7 @@ Crypto.prototype.checkOwnCrossSigningTrust = async function({
} }
if ( if (
allowPrivateKeyRequests && allowPrivateKeyRequests &&
(userSigningChanged || !crossSigningPrivateKeys.has("user_signing")) (userSigningChanged || userSigningExistsNotLocallyCached)
) { ) {
logger.info("Attempting to retrieve cross-signing user-signing private key"); logger.info("Attempting to retrieve cross-signing user-signing private key");
let signing = null; let signing = null;

7
src/webrtc/call.ts
View File

@@ -367,7 +367,11 @@ export class MatrixCall extends EventEmitter {
this.checkForErrorListener(); this.checkForErrorListener();
try { try {
const screenshareConstraints = await getScreenshareContraints(selectDesktopCapturerSource); const screenshareConstraints = await getScreenshareContraints(selectDesktopCapturerSource);
if (!screenshareConstraints) return; if (!screenshareConstraints) {
this.terminate(CallParty.Local, CallErrorCode.NoUserMedia, false);
return;
}
if (window.electron?.getDesktopCapturerSources) { if (window.electron?.getDesktopCapturerSources) {
// We are using Electron // We are using Electron
logger.debug("Getting screen stream using getUserMedia()..."); logger.debug("Getting screen stream using getUserMedia()...");
@@ -388,6 +392,7 @@ export class MatrixCall extends EventEmitter {
"Failed to get screen-sharing stream: ", err, "Failed to get screen-sharing stream: ", err,
), ),
); );
this.terminate(CallParty.Local, CallErrorCode.NoUserMedia, false);
} }
this.type = CallType.Video; this.type = CallType.Video;
} }