Remove JSON column and Backbone Model for unprocessed

js/modules/data.js

@@ -131,6 +131,8 @@ module.exports = {
   getUnprocessedById,
   saveUnprocessed,
   saveUnprocesseds,
+  updateUnprocessedAttempts,
+  updateUnprocessedWithData,
   removeUnprocessed,
   removeAllUnprocessed,
 
@@ -848,13 +850,8 @@ async function getAllUnprocessed() {
   return channels.getAllUnprocessed();
 }
 
-async function getUnprocessedById(id, { Unprocessed }) {
-  const unprocessed = await channels.getUnprocessedById(id);
-  if (!unprocessed) {
-    return null;
-  }
-
-  return new Unprocessed(unprocessed);
+async function getUnprocessedById(id) {
+  return channels.getUnprocessedById(id);
 }
 
 async function saveUnprocessed(data, { forceSave } = {}) {
@@ -868,6 +865,13 @@ async function saveUnprocesseds(arrayOfUnprocessed, { forceSave } = {}) {
   });
 }
 
+async function updateUnprocessedAttempts(id, attempts) {
+  await channels.updateUnprocessedAttempts(id, attempts);
+}
+async function updateUnprocessedWithData(id, data) {
+  await channels.updateUnprocessedWithData(id, data);
+}
+
 async function removeUnprocessed(id) {
   await channels.removeUnprocessed(id);
 }

js/signal_protocol_store.js

@@ -98,7 +98,6 @@
     return result === 0;
   }
 
-  const Unprocessed = Backbone.Model.extend();
   const IdentityRecord = Backbone.Model.extend({
     storeName: 'identityKeys',
     validAttributes: [
@@ -872,21 +871,23 @@
       return window.Signal.Data.getAllUnprocessed();
     },
     getUnprocessedById(id) {
-      return window.Signal.Data.getUnprocessedById(id, { Unprocessed });
+      return window.Signal.Data.getUnprocessedById(id);
     },
     addUnprocessed(data) {
       // We need to pass forceSave because the data has an id already, which will cause
       //   an update instead of an insert.
       return window.Signal.Data.saveUnprocessed(data, {
         forceSave: true,
-        Unprocessed,
       });
     },
-    saveUnprocessed(data) {
-      return window.Signal.Data.saveUnprocessed(data, { Unprocessed });
+    updateUnprocessedAttempts(id, attempts) {
+      return window.Signal.Data.updateUnprocessedAttempts(id, attempts);
+    },
+    updateUnprocessedWithData(id, data) {
+      return window.Signal.Data.updateUnprocessedWithData(id, data);
     },
     removeUnprocessed(id) {
-      return window.Signal.Data.removeUnprocessed(id, { Unprocessed });
+      return window.Signal.Data.removeUnprocessed(id);
     },
     removeAllUnprocessed() {
       return window.Signal.Data.removeAllUnprocessed();