Merge pull request #12 from witchent/PullRequest

Update to newest signal-desktop

index.js

@@ -81,6 +81,7 @@ window.WebAPI = initializeWebAPI({
   certificateAuthority: auth,
   contentProxyUrl: "http://contentproxy.signal.org:443",
   proxyUrl: config.proxyUrl,
+  version: "Dummy",
 });
 
 const Signal = signalRequire('./js/modules/signal');
@@ -176,8 +177,8 @@ window.getGuid = require('uuid/v4');
 
 window.addEventListener = Whisper.events.on;
 
-const { Crypto } = require("node-webcrypto-ossl");
-window.crypto = new Crypto();
+const WebCrypto = require("node-webcrypto-ossl");
+window.crypto = new WebCrypto();
 
 window.dcodeIO = {}
 dcodeIO.Long = signalRequire('components/long/dist/Long');
@@ -215,8 +216,8 @@ signalRequire('js/expiring_messages');
 signalRequire('js/expiring_tap_to_view_messages');
 
 signalRequire('js/chromium');
-signalRequire('js/registration');
-signalRequire('js/expire');
+signalRequire('ts/util/registration');
+//  signalRequire('js/expire');
 signalRequire('js/conversation_controller');
 signalRequire('js/message_controller');
 
@@ -257,7 +258,7 @@ let Item = Model.extend({
         };
         Whisper.events.trigger('userChanged', user);
 
-        Whisper.Registration.markDone();
+        window.Signal.Util.Registration.markDone();
         window.log.info('dispatching registration event');
         Whisper.events.trigger('registration_done');
       });

package.json

@@ -22,9 +22,9 @@
     "mkdirp": "^1.0.4",
     "moment": "^2.24.0",
     "node-persist": "^3.0.5",
-    "node-webcrypto-ossl": "^2.0.1",
+    "node-webcrypto-ossl": "nr23730/node-webcrypto-ossl#aes_ctr256",
     "qrcode-terminal": "^0.12.0",
-    "signal-desktop": "matrix-hacks/signal-desktop#master",
+    "signal-desktop": "matrix-hacks/Signal-Desktop#72b74ed",
     "underscore": "^1.10.2",
     "worker": "^0.4.0",
     "ws": "^7.2.3",