Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lang/main-es.json
Original file line number Diff line number Diff line change
Expand Up @@ -954,8 +954,8 @@
"videoUnmuteBlockedTitle": "¡Desactivar cámara y compartir pantalla bloqueados!",
"viewLobby": "Ver lobby",
"waitingParticipants": "{{waitingParticipants}} personas",
"encryptionKeySyncFailed": "La sincronización de la clave de cifrado ha fallado. Se recomienda salir de la reunión y vuelva a unirse para restaurar la comunicación segura.",
"encryptionKeySyncFailedTitle": "Error de Sincronización de Cifrado",
"encryptionKeySyncFailed": "El establecimiento de la sesión segura ha fallado. Asegúrese de que todos los participantes tengan una conexión a Internet confiable.",
"encryptionKeySyncFailedTitle": "Error de Establecimiento de la Sesión",
"cryptoFailedTitle": "La operación criptográfica ha fallado",
"cryptoFailed": "La operación criptográfica ha fallado. No puede acceder al video ni al audio de la reunión. Se recomienda reiniciar el navegador. Si eres el organizador de la reunión, vuelva a crearla.",
"encryptionKeySyncRestored": "La sincronización de claves para el cifrado se ha restaurado con éxito. Su comunicación segura está ahora activa.",
Expand Down
4 changes: 2 additions & 2 deletions lang/main.json
Original file line number Diff line number Diff line change
Expand Up @@ -1096,8 +1096,8 @@
"waitingVisitorsTitle": "The meeting is not live yet!",
"whiteboardLimitDescription": "Please save your progress, as the user limit will soon be reached and the whiteboard will close.",
"whiteboardLimitTitle": "Whiteboard usage",
"encryptionKeySyncFailed": "The encryption key synchronization has failed. It is recommended that you leave the meeting and rejoin to restore secure communication.",
"encryptionKeySyncFailedTitle": "Encryption Sync Failed",
"encryptionKeySyncFailed": "The secure session establishement has failed. Please ensure that all participants have a reliable internet connection.",
"encryptionKeySyncFailedTitle": "Session Establishment Failed",
"cryptoFailedTitle": "Cryptographic operation failed",
"cryptoFailed": "Cryptographic operation has failed. You cannot access video or audio of the meeting. It is recommended that you restart the browser. If you are the meeting organizer, recreate it.",
"encryptionKeySyncRestored": "The encryption key synchronization has been successfully restored. Your secure communication is now active.",
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
"js-md5": "0.6.1",
"js-sha512": "0.8.0",
"jwt-decode": "2.2.0",
"lib-jitsi-meet": "https://github.com/internxt/lib-jitsi-meet/releases/download/v.0.0.20/lib-jitsi-meet-0.0.20.tgz",
"lib-jitsi-meet": "https://github.com/internxt/lib-jitsi-meet/releases/download/v.0.0.20-debug/lib-jitsi-meet-0.0.20-debug.tgz",
"lodash-es": "4.17.23",
"moment": "2.29.4",
"moment-duration-format": "2.2.2",
Expand Down
22 changes: 8 additions & 14 deletions react/features/base/connection/actions.web.ts
Original file line number Diff line number Diff line change
Expand Up @@ -39,26 +39,20 @@ export function connect(id?: string, password?: string) {
return getJaasJWT(state);
}
})
.then((j) => j && dispatch(setJWT(j)))
.then(() =>
dispatch(
.then((j) => {
j && dispatch(setJWT(j));
return dispatch(
_connectInternal({
id,
password,
name: user?.name,
lastname: user?.lastname,
isAnonymous: !user,
})
)
)
// latest jitsi changes, test if not works current ones
// .then(j => {
// j && dispatch(setJWT(j));

// return dispatch(_connectInternal(id, password));
// })
.catch(e => {
logger.error('Connection error', e);
}),
);
})
.catch((e) => {
logger.error("Connection error", e);
});
}

Expand Down
27 changes: 2 additions & 25 deletions react/features/base/connection/middleware.web.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import { redirectToStaticPage } from '../../app/actions.any';
import { CONFERENCE_WILL_LEAVE } from "../conference/actionTypes";
import { isLeavingConferenceManually, setLeaveConferenceManually } from "../meet/general/utils/conferenceState";
import MiddlewareRegistry from "../redux/MiddlewareRegistry";

import { CONNECTION_DISCONNECTED, CONNECTION_WILL_CONNECT } from "./actionTypes";
import { CONNECTION_WILL_CONNECT } from "./actionTypes";

/**
* The feature announced so we can distinguish jibri participants.
Expand All @@ -12,7 +9,7 @@ import { CONNECTION_DISCONNECTED, CONNECTION_WILL_CONNECT } from "./actionTypes"
*/
export const DISCO_JIBRI_FEATURE = "http://jitsi.org/protocol/jibri";

MiddlewareRegistry.register(({ getState, dispatch }) => (next) => (action) => {
MiddlewareRegistry.register(({ getState }) => (next) => (action) => {
switch (action.type) {
case CONNECTION_WILL_CONNECT: {
const { connection } = action;
Expand All @@ -25,26 +22,6 @@ MiddlewareRegistry.register(({ getState, dispatch }) => (next) => (action) => {
// @ts-ignore
APP.connection = connection;

setLeaveConferenceManually(false);
break;
}

case CONFERENCE_WILL_LEAVE: {
setLeaveConferenceManually(true);
break;
}

case CONNECTION_DISCONNECTED: {
if (isLeavingConferenceManually()) {
setLeaveConferenceManually(false);

setTimeout(() => {
dispatch(redirectToStaticPage("/"));
}, 2000);
} else {
console.warn("Connection disconnected unexpectedly - waiting for reconnection");
}

break;
}
}
Expand Down

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading