fix-unicode-windows-error

pull/1220/head
Vincent 5 years ago
parent 5a2b91d572
commit e7569a569c

@ -222,7 +222,7 @@
"description": "Message shown if the import went wrong; first paragraph"
},
"importErrorSecond": {
"message": "If these steps don't work for you, please submit a debug log (View 🠖 Debug Log) so that we can help you get migrated!",
"message": "If these steps don't work for you, please submit a debug log (View -> Debug Log) so that we can help you get migrated!",
"description": "Message shown if the import went wrong; second paragraph"
},
"importAgain": {
@ -872,7 +872,7 @@
"message": "Device linking request received."
},
"devicePairingRequestReceivedNoListenerDescription": {
"message": "Device linking request received but you are not on the device linking screen. \nGo to Settings 🠖 Device 🠖 Link New Device."
"message": "Device linking request received but you are not on the device linking screen. \nGo to Settings > Device > Link New Device."
},
"waitingForDeviceToRegister": {
"message": "Waiting for device to register..."

@ -632,11 +632,9 @@ export async function handleMessageEvent(event: any): Promise<void> {
conversationId = primarySource.key;
}
// be sure to call this one with conversationId. because we might need to create the primary conversation from a message of a secondary device
const conversation = await window.ConversationController.getOrCreateAndWait(
conversationId,
type
);
// the conversation with the primary device of that source (can be the same as conversationOrigin)
const conversation = window.ConversationController.get(conversationId);
conversation.queueJob(() => {
handleMessageJob(
msg,

@ -105,8 +105,6 @@ export class SessionProtocol {
public static async sendSessionRequestIfNeeded(
pubkey: PubKey
): Promise<void> {
const { ConversationController } = window;
if (
(await SessionProtocol.hasSession(pubkey)) ||
(await SessionProtocol.hasSentSessionRequest(pubkey))

Loading…
Cancel
Save