Merge pull request #797 from loki-project/bug-fixes

Bug fixes

js/background.js

@@ -238,7 +238,7 @@
     specialConvInited = true;
   };
 
-  const initAPIs = async () => {
+  const initAPIs = () => {
     if (window.initialisedAPI) {
       return;
     }
@@ -251,7 +251,7 @@
     // If already exists we registered as a secondary device
     if (!window.lokiFileServerAPI) {
       window.lokiFileServerAPIFactory = new window.LokiFileServerAPI(ourKey);
-      window.lokiFileServerAPI = await window.lokiFileServerAPIFactory.establishHomeConnection(
+      window.lokiFileServerAPI = window.lokiFileServerAPIFactory.establishHomeConnection(
         window.getDefaultFileServer()
       );
     }
@@ -1468,7 +1468,7 @@
       const ourKey = textsecure.storage.user.getNumber();
       window.lokiMessageAPI = new window.LokiMessageAPI(ourKey);
       window.lokiFileServerAPIFactory = new window.LokiFileServerAPI(ourKey);
-      window.lokiFileServerAPI = await window.lokiFileServerAPIFactory.establishHomeConnection(
+      window.lokiFileServerAPI = window.lokiFileServerAPIFactory.establishHomeConnection(
         window.getDefaultFileServer()
       );
       window.lokiPublicChatAPI = null;
@@ -1488,7 +1488,7 @@
       return;
     }
 
-    await initAPIs();
+    initAPIs();
     await initSpecialConversations();
     messageReceiver = new textsecure.MessageReceiver(
       USERNAME,

js/modules/loki_file_server_api.js

@@ -291,14 +291,14 @@ class LokiFileServerFactoryAPI {
     this.servers = [];
   }
 
-  async establishHomeConnection(serverUrl) {
+  establishHomeConnection(serverUrl) {
     let thisServer = this.servers.find(
       server => server._server.baseServerUrl === serverUrl
     );
     if (!thisServer) {
       thisServer = new LokiHomeServerInstance(this.ourKey);
       log.info(`Registering HomeServer ${serverUrl}`);
-      await thisServer.establishConnection(serverUrl);
+      thisServer.establishConnection(serverUrl);
       this.servers.push(thisServer);
     }
     return thisServer;

ts/components/session/LeftPaneChannelSection.tsx

@@ -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({