Use the new adapter design for browser histroy.

apps/settings/index.html

@@ -489,5 +489,8 @@ <h1 data-l10n-id="ums-warning-title">Enable USB storage?</h1>
     <script src="js/datasync/hawk_creds.js"></script>
     <script src="js/datasync/kinto.dev.js"></script>
     <script src="js/datasync/synccrypto.js"></script>
+    <script src="js/datasync/history_adapter.js"></script>
+    <script src="js/datasync/sync-engine.js"></script>
+    <script src="js/datasync/fxsync-webcrypto.js"></script>
   </body>
 </html>

apps/settings/js/datasync/history_adapter.js

@@ -0,0 +1,49 @@
+var HistoryAPI = {
+  addPlace: function(place) {
+    console.log(place);
+    return IAC.request('sync-history', {
+      method: 'addPlace',
+      args: [place]
+    });
+  }
+};
+
+var SynctoHistoryAdapter = {
+  update: function(kintoCollection) {
+    kintoCollection.list().then(list => {
+      console.log('history adapter update function called with this local copy of the remote data:', list);
+
+      var historyRecords = list.data;
+      var partialRecoreds = historyRecords.slice(0, 10);
+      historyRecords.forEach(function (decryptedRecord){
+        var record = decryptedRecord.payload
+        if(!record.histUri || !record.visits || !record.visits[0]){
+          //console.log('invalid history: ', record);
+          return ;
+        }
+
+        console.log('decrypted record', record);
+
+        var visits = [];
+        record.visits.forEach(function (elem){
+          visits.push(elem.date);
+        });
+
+        var place = {
+          url: record.histUri,
+          title: record.title,
+          visits: visits,
+          visited: record.visits[0]
+        };
+        HistoryAPI.addPlace(place).then(function (d){
+          console.log(d);
+        }, function (e){
+          console.log(e);
+        });
+        document.querySelector('#sync-time').textContent =
+          new Date().toString();
+      });
+
+    });
+  }
+};

apps/settings/js/fxsync.js

@@ -3,7 +3,7 @@
 
 'use strict';
 
-const REMOTE = "http://69b5bd29.ngrok.io/v1/"
+const REMOTE = "http://localhost:8000/v1/"
 
 function toCamelCase(str) {
   var rdashes = /-(.)/g;
@@ -102,24 +102,21 @@ var SyncCredentials = {
   }
 };
 
-var HistoryAdapter = {
-  addPlace: function(place) {
-    console.log(place);
-    return IAC.request('sync-history', {
-      method: 'addPlace',
-      args: [place]
-    });
-  }
-};
-
 define('fxsync', ['modules/settings_utils', 'shared/settings_listener'
 ], function(SettingsUtils, SettingsListener) {
   var FxSync = {
+    _adapters: {},
+    _credentialCache: {},
     init: function fmd_init() {
       this.syncButton = document.querySelector('#sync-button');
       this.syncButton.
         addEventListener('click', FxSync.syncHistory.bind(FxSync));
       SyncCrypto.assignApp(FxSync);
+      this.registerAdapter('history', SynctoHistoryAdapter);
+    },
+
+    registerAdapter: function(collectionName, adapter) {
+      this._adapters[collectionName] = adapter;
     },
 
     ensureDb: function(assertion) {
@@ -128,6 +125,14 @@ define('fxsync', ['modules/settings_utils', 'shared/settings_listener'
           return this._db;
         }
         return SyncCredentials.getXClientState().then(xClientState => {
+          this._credentialCache = {
+            synctoCredentials: {
+             URL: REMOTE,
+             assertion: assertion,
+             xClientState: xClientState
+            }
+          };
+
           this._db = new Kinto({
             bucket: 'syncto',
             remote: REMOTE,
@@ -263,11 +268,17 @@ define('fxsync', ['modules/settings_utils', 'shared/settings_listener'
 
     syncHistory: function() {
       console.log('Retrieving history collection... this may take several minutes on first run');
-      this.getHistoryCollection().then(history => {
-        console.log('History ', history);
-        history.sync().then(result => {
-          console.log('Sync results ', result);
-          this.storeHistoryToDS(result);
+      this.ensureDb().then(db => {
+        SyncCredentials.getKeys().then(credentials => {
+          this._credentialCache.kB = credentials.kB;
+          document.querySelector('#sync-account').textContent = credentials.email;
+
+          var se = new SyncEngine(this._credentialCache.synctoCredentials, ['history'], this._credentialCache.kB);
+          se.connect().then(() => {
+            return se.syncNow();
+          }).then(() => {
+            this._adapters.history.update(se._collections.history);
+          });
         });
       });
     },

apps/settings/locales/settings.en-US.properties

@@ -844,6 +844,7 @@ fxsync-sync-now=Sync now
 fxsync-collections=Collections
 fxsync-collections-bookmarks=Bookmarks
 fxsync-collections-history=History
+fxsync-collections-tabs=Tabs
 fxsync-collections-password=Password
 
 #=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#=#

apps/system/js/sync/sync_iac_api.js

@@ -10,6 +10,18 @@
  * consumed by the System app, so there will be no need to expose anything.
  */
 
+function arrayUnique(array) {
+  var a = array.concat();
+  for(var i=0; i<a.length; ++i) {
+    for(var j=i+1; j<a.length; ++j) {
+      if(a[i] === a[j])
+        a.splice(j--, 1);
+    }
+  }
+
+  return a;
+};
+
 (function() {
 
   function sendPortMessage(portName, message) {
@@ -52,9 +64,20 @@
   function syncHistroyRequest(id, method, args){
     var url = args[0].url;
     var visits =  args[0].visits;
+    var title = args[0].title;
 
     var places = appWindowManager.places;
-    places.setVisits(url, visits);
+    places.editPlace(url, (place, cb) => {
+      if(place.title === place.url){
+        place.title = title;
+      }
+      place.visits = place.visits || [];
+      place.visits = arrayUnique(place.visits.concat(visits));
+      place.visits.sort((a, b) => {
+        return b - a;
+      });
+      cb(place);
+    });
   }
 
   /**