Merge tag 'v1.15.2-beta.1'

libtextsecure/message_receiver.js

@@ -1183,3 +1183,8 @@ textsecure.MessageReceiver = function MessageReceiverWrapper(
 textsecure.MessageReceiver.prototype = {
   constructor: textsecure.MessageReceiver,
 };
+
+textsecure.MessageReceiver.stringToArrayBuffer =
+  MessageReceiver.stringToArrayBuffer;
+textsecure.MessageReceiver.arrayBufferToString =
+  MessageReceiver.arrayBufferToString;

main.js

@@ -26,7 +26,7 @@ const packageJson = require('./package.json');
 
 const sql = require('./app/sql');
 const sqlChannels = require('./app/sql_channel');
-const attachments = require('./app/attachments');
+// const attachments = require('./app/attachments');
 const attachmentChannel = require('./app/attachment_channel');
 const autoUpdate = require('./app/auto_update');
 const createTrayIcon = require('./app/tray_icon');
@@ -631,12 +631,12 @@ app.on('ready', async () => {
   await sql.initialize({ configDir: userDataPath, key });
   await sqlChannels.initialize({ userConfig });
 
-  const allAttachments = await attachments.getAllAttachments(userDataPath);
+  // const allAttachments = await attachments.getAllAttachments(userDataPath);
-  const orphanedAttachments = await sql.removeKnownAttachments(allAttachments);
+  // const orphanedAttachments = await sql.removeKnownAttachments(allAttachments);
-  await attachments.deleteAll({
+  // await attachments.deleteAll({
-    userDataPath,
+  //   userDataPath,
-    attachments: orphanedAttachments,
+  //   attachments: orphanedAttachments,
-  });
+  // });
 
   ready = true;
 

package.json

@@ -3,7 +3,7 @@
   "productName": "Signal",
   "description": "Private messaging from your desktop",
   "repository": "https://github.com/signalapp/Signal-Desktop.git",
-  "version": "1.15.1",
+  "version": "1.15.2-beta.1",
   "license": "GPL-3.0",
   "author": {
     "name": "Open Whisper Systems",