Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2026-05-08 08:58:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Import log instead of using it off of window

Browse Source
This commit is contained in:
Josh Perez
2021-09-17 14:27:53 -04:00
committed by GitHub
parent 8eb0dd3116
commit 65ddf0a9e8
155 changed files with 3654 additions and 3433 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ts/state/smart/CallManager.tsx
+9 -16
View File
@@ -32,6 +32,7 @@ import {
bounceAppIconStart,
bounceAppIconStop,
} from '../../shims/bounceAppIcon';
import * as log from '../../logging/log';
function renderDeviceSelection(): JSX.Element {
return <SmartCallingDeviceSelection />;
@@ -84,16 +85,14 @@ const mapStateToActiveCallProp = (
const call = getActiveCall(calling);
if (!call) {
window.log.error(
'There was an active call state but no corresponding call'
);
log.error('There was an active call state but no corresponding call');
return undefined;
}
const conversationSelector = getConversationSelector(state);
const conversation = conversationSelector(activeCallState.conversationId);
if (!conversation) {
window.log.error('The active call has no corresponding conversation');
log.error('The active call has no corresponding conversation');
return undefined;
}
@@ -160,7 +159,7 @@ const mapStateToActiveCallProp = (
const member = conversationSelectorByUuid(conversationId);
if (!member) {
window.log.error('Group member has no corresponding conversation');
log.error('Group member has no corresponding conversation');
continue;
}
@@ -174,9 +173,7 @@ const mapStateToActiveCallProp = (
remoteParticipant.uuid
);
if (!remoteConversation) {
window.log.error(
'Remote participant has no corresponding conversation'
);
log.error('Remote participant has no corresponding conversation');
continue;
}
@@ -201,9 +198,7 @@ const mapStateToActiveCallProp = (
const remoteConversation = conversationSelectorByUuid(uuid);
if (!remoteConversation) {
window.log.error(
'Remote participant has no corresponding conversation'
);
log.error('Remote participant has no corresponding conversation');
continue;
}
@@ -217,9 +212,7 @@ const mapStateToActiveCallProp = (
peekedParticipantUuid
);
if (!peekedConversation) {
window.log.error(
'Remote participant has no corresponding conversation'
);
log.error('Remote participant has no corresponding conversation');
continue;
}
@@ -252,7 +245,7 @@ const mapStateToIncomingCallProp = (state: StateType) => {
const conversation = getConversationSelector(state)(call.conversationId);
if (!conversation) {
window.log.error('The incoming call has no corresponding conversation');
log.error('The incoming call has no corresponding conversation');
return undefined;
}
@@ -265,7 +258,7 @@ const mapStateToIncomingCallProp = (state: StateType) => {
};
case CallMode.Group: {
if (!call.ringerUuid) {
window.log.error('The incoming group call has no ring state');
log.error('The incoming group call has no ring state');
return undefined;
}
ts/state/smart/GroupV1MigrationDialog.tsx
+3 -6
View File
@@ -12,6 +12,7 @@ import { StateType } from '../reducer';
import { getConversationSelector } from '../selectors/conversations';
import { getIntl } from '../selectors/user';
import * as log from '../../logging/log';
export type PropsType = {
readonly droppedMemberIds: Array<string>;
@@ -32,18 +33,14 @@ const mapStateToProps = (
.map(getConversation)
.filter(Boolean) as Array<ConversationType>;
if (droppedMembers.length !== droppedMemberIds.length) {
window.log.warn(
'smart/GroupV1MigrationDialog: droppedMembers length changed'
);
log.warn('smart/GroupV1MigrationDialog: droppedMembers length changed');
}
const invitedMembers = invitedMemberIds
.map(getConversation)
.filter(Boolean) as Array<ConversationType>;
if (invitedMembers.length !== invitedMemberIds.length) {
window.log.warn(
'smart/GroupV1MigrationDialog: invitedMembers length changed'
);
log.warn('smart/GroupV1MigrationDialog: invitedMembers length changed');
}
return {