mirror of
https://github.com/oxen-io/session-desktop.git
synced 2023-12-14 02:12:57 +01:00
fixed file server holding up message sender init.
fix joining closed groups.
This commit is contained in:
parent
38745b2537
commit
75660c7269
|
@ -238,6 +238,18 @@
|
|||
specialConvInited = true;
|
||||
};
|
||||
|
||||
const initLokiMessageAPIs = () => {
|
||||
const ourKey = textsecure.storage.user.getNumber();
|
||||
if (!window.lokiMessageAPI) {
|
||||
window.lokiMessageAPI = new window.LokiMessageAPI(ourKey);
|
||||
}
|
||||
|
||||
if (!window.lokiPublicChatAPI) {
|
||||
// singleton to relay events to libtextsecure/message_receiver
|
||||
window.lokiPublicChatAPI = new window.LokiPublicChatAPI(ourKey);
|
||||
}
|
||||
};
|
||||
|
||||
const initAPIs = async () => {
|
||||
if (window.initialisedAPI) {
|
||||
return;
|
||||
|
@ -1488,8 +1500,8 @@
|
|||
return;
|
||||
}
|
||||
|
||||
await initAPIs();
|
||||
await initSpecialConversations();
|
||||
initLokiMessageAPIs();
|
||||
|
||||
messageReceiver = new textsecure.MessageReceiver(
|
||||
USERNAME,
|
||||
PASSWORD,
|
||||
|
@ -1525,6 +1537,9 @@
|
|||
PASSWORD
|
||||
);
|
||||
|
||||
await initAPIs();
|
||||
await initSpecialConversations();
|
||||
|
||||
// On startup after upgrading to a new version, request a contact sync
|
||||
// (but only if we're not the primary device)
|
||||
if (
|
||||
|
|
|
@ -406,7 +406,8 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
|
|||
return;
|
||||
}
|
||||
|
||||
await window.doCreateGroup(groupName, groupMembers);
|
||||
const groupMemberIds = groupMembers.map(m => m.id);
|
||||
await window.doCreateGroup(groupName, groupMemberIds);
|
||||
this.handleToggleOverlay(undefined);
|
||||
|
||||
window.pushToast({
|
||||
|
|
Loading…
Reference in a new issue