Fix enum in a definition type

pull/1173/head
Maxim Shishmarev 5 years ago
parent eb280ec1e4
commit b98543a9fc

@ -1,13 +1,6 @@
enum MessageModelType {
INCOMING = 'incoming',
OUTGOING = 'outgoing',
FRIEND_REQUEST = 'friend-request',
}
export enum EndSessionType { type MessageModelType = 'incoming' | 'outgoing' | 'friend-request';
DONE = 'done', export type EndSessionType = 'done' | 'ongoing';
ONGOING = 'ongoing',
}
interface MessageAttributes { interface MessageAttributes {
id: number; id: number;

@ -78,8 +78,8 @@ function handleSessionReset(
message: MessageModel message: MessageModel
) { ) {
const endSessionType = conversation.isSessionResetReceived() const endSessionType = conversation.isSessionResetReceived()
? EndSessionType.ONGOING ? 'ongoing'
: EndSessionType.DONE; : 'done';
message.set({ endSessionType }); message.set({ endSessionType });
} }

@ -735,7 +735,7 @@ export async function handleMessageEvent(event: any): Promise<void> {
// eslint-disable-next-line no-bitwise // eslint-disable-next-line no-bitwise
if (message.flags & SESSION_RESTORE) { if (message.flags & SESSION_RESTORE) {
// Show that the session reset is "in progress" even though we had a valid session // Show that the session reset is "in progress" even though we had a valid session
msg.set({ endSessionType: EndSessionType.ONGOING }); msg.set({ endSessionType: 'ongoing' });
} }
const ourNumber = window.textsecure.storage.user.getNumber(); const ourNumber = window.textsecure.storage.user.getNumber();

Loading…
Cancel
Save