Bug 1153973 - Don't blindly apply deletions as insertions. r=nalexander

mobile/android/base/reading/LocalReadingListStorage.java

@@ -229,7 +229,12 @@ public class LocalReadingListStorage implements ReadingListStorage {
 
     @Override
     public void addDownloadedRecord(ServerReadingListRecord down) {
-      additionsOrChanges.add(down);
+      final Boolean deleted = down.fields.getBoolean("deleted");
+      if (deleted != null && deleted.booleanValue()) {
+        addDeletion(down.getGUID());
+      } else {
+        additionsOrChanges.add(down);
+      }
     }
   }
 

mobile/android/base/reading/ReadingListRecord.java

@@ -23,7 +23,7 @@ public abstract class ReadingListRecord {
      * From server record.
      */
     public ServerMetadata(ExtendedJSONObject obj) {
-      this(obj.getString("id"), obj.getLong("last_modified"));
+      this(obj.getString("id"), obj.containsKey("last_modified") ? obj.getLong("last_modified") : -1L);
     }
   }