From bde146215963772b8bc0722bad02388939664c7d Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 19 Nov 2018 17:38:55 -0800
Subject: [PATCH 1/2] Change sessions.id to a TEXT field to prevent type
 coercion

---
 app/sql.js           | 39 ++++++++++++++++++++++++++++++++++++++-
 test/storage_test.js |  4 ++--
 2 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/app/sql.js b/app/sql.js
index 6699a0df5..b52625628 100644
--- a/app/sql.js
+++ b/app/sql.js
@@ -422,13 +422,50 @@ async function updateToSchemaVersion6(currentVersion, instance) {
   console.log('updateToSchemaVersion6: success!');
 }
 
+async function updateToSchemaVersion7(currentVersion, instance) {
+  if (currentVersion >= 7) {
+    return;
+  }
+  console.log('updateToSchemaVersion7: starting...');
+  await instance.run('BEGIN TRANSACTION;');
+
+  // SQLite has been coercing our STRINGs into numbers, so we force it with TEXT
+  // We create a new table then copy the data into it, since we can't modify columns
+
+  await instance.run('DROP INDEX sessions_number;');
+  await instance.run('ALTER TABLE sessions RENAME TO sessions_old;');
+
+  await instance.run(
+    `CREATE TABLE sessions(
+      id TEXT PRIMARY KEY,
+      number TEXT,
+      json TEXT
+    );`
+  );
+
+  await instance.run(`CREATE INDEX sessions_number ON sessions (
+    number
+  ) WHERE number IS NOT NULL;`);
+
+  await instance.run(`INSERT INTO sessions(id, number, json)
+    SELECT "+" || id, number, json FROM sessions_old;
+  `);
+
+  await instance.run('DROP TABLE sessions_old;');
+
+  await instance.run('PRAGMA schema_version = 7;');
+  await instance.run('COMMIT TRANSACTION;');
+  console.log('updateToSchemaVersion7: success!');
+}
+
 const SCHEMA_VERSIONS = [
   updateToSchemaVersion1,
   updateToSchemaVersion2,
   updateToSchemaVersion3,
   updateToSchemaVersion4,
-  // version 5 was dropped
+  () => null, // version 5 was dropped
   updateToSchemaVersion6,
+  updateToSchemaVersion7,
 ];
 
 async function updateSchema(instance) {
diff --git a/test/storage_test.js b/test/storage_test.js
index ab4f847cf..960aef9f5 100644
--- a/test/storage_test.js
+++ b/test/storage_test.js
@@ -940,7 +940,7 @@ describe('SignalProtocolStore', () => {
   describe('getDeviceIds', () => {
     it('returns deviceIds for a number', async () => {
       const testRecord = 'an opaque string';
-      const devices = [1, 2, 3].map(deviceId => {
+      const devices = [1, 2, 3, 10].map(deviceId => {
         return [number, deviceId].join('.');
       });
 
@@ -951,7 +951,7 @@ describe('SignalProtocolStore', () => {
       );
 
       const deviceIds = await store.getDeviceIds(number);
-      assert.sameMembers(deviceIds, [1, 2, 3]);
+      assert.sameMembers(deviceIds, [1, 2, 3, 10]);
     });
     it('returns empty array for a number with no device ids', async () => {
       const deviceIds = await store.getDeviceIds('foo');

From 6a4c7afc45506285d8a8220b65c1ffa6d6970c59 Mon Sep 17 00:00:00 2001
From: Scott Nonnenberg <scott@signal.org>
Date: Mon, 26 Nov 2018 15:44:44 -0800
Subject: [PATCH 2/2] v1.18.1

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 29636466a..7c51d2821 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
   "productName": "Signal",
   "description": "Private messaging from your desktop",
   "repository": "https://github.com/signalapp/Signal-Desktop.git",
-  "version": "1.18.0",
+  "version": "1.18.1",
   "license": "GPL-3.0",
   "author": {
     "name": "Open Whisper Systems",