mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Voice Notes mini-player: Show with no conversation, fix spacing

Browse source
This commit is contained in:
Scott Nonnenberg 2023-03-20 11:03:21 -07:00 • committed by GitHub
parent 9015837b2e
commit 75d5e81013
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 159 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

19
ts/models/conversations.ts
View file

@ -190,6 +190,7 @@ const {
} = window.Signal.Data;
const FIVE_MINUTES = MINUTE * 5;
const FETCH_TIMEOUT = SECOND * 30;
const JOB_REPORTING_THRESHOLD_MS = 25;
const SEND_REPORTING_THRESHOLD_MS = 25;
@ -1366,10 +1367,12 @@ export class ConversationModel extends window.Backbone
e164,
reason: 'ConversationModel.onNewMessage',
});
const typingToken = `${source?.id}.${sourceDevice}`;
if (source) {
const typingToken = `${source.id}.${sourceDevice}`;
// Clear typing indicator for a given contact if we receive a message from them
this.clearContactTypingTimer(typingToken);
// Clear typing indicator for a given contact if we receive a message from them
this.clearContactTypingTimer(typingToken);
}
// If it's a group story reply or a story message, we don't want to update
// the last message or add new messages to redux.
@ -1451,10 +1454,18 @@ export class ConversationModel extends window.Backbone
resolvePromise = resolve;
});
let timeout: NodeJS.Timeout;
const finish = () => {
resolvePromise();
clearTimeout(timeout);
this.inProgressFetch = undefined;
};
timeout = setTimeout(() => {
log.warn(
`setInProgressFetch(${this.idForLogging()}): Calling finish manually after timeout`
);
finish();
}, FETCH_TIMEOUT);
return finish;
}
@ -5542,7 +5553,7 @@ export class ConversationModel extends window.Backbone
return;
}
const typingToken = `${senderId}.${senderDevice}`;
const typingToken = `${sender.id}.${senderDevice}`;
this.contactTypingTimers = this.contactTypingTimers || {};
const record = this.contactTypingTimers[typingToken];