Bug 1136170 - [Messages] Adjust the read ahead number to be the same …

…or higher than what the max number of threads on Flame r=azasypkin, schung

apps/sms/js/settings.js

@@ -15,6 +15,8 @@ var Settings = {
     smsServiceId: 'ril.sms.defaultServiceId'
   },
 
+  READ_AHEAD_THREADS_KEY: 'ril.sms.maxReadAheadEntries',
+
   // we evaluate to 5KB the size overhead of wrapping a payload in a MMS
   MMS_SIZE_OVERHEAD: 5 * 1024,
 
@@ -194,5 +196,15 @@ var Settings = {
 
     var conn = navigator.mozMobileConnections[index];
     return MobileOperator.userFacingInfo(conn).operator;
+  },
+
+  setReadAheadThreadRetrieval: function(value) {
+    if (!navigator.mozSettings) {
+      return;
+    }
+
+    var setting = {};
+    setting[this.READ_AHEAD_THREADS_KEY] = value;
+    navigator.mozSettings.createLock().set(setting);
   }
 };

apps/sms/js/thread_list_ui.js

@@ -7,6 +7,7 @@
          PerformanceTestingHelper, StickyHeader, Navigation,
          InterInstanceEventDispatcher,
          SelectionHandler,
+         Settings,
          LazyLoader
 */
 /*exported ThreadListUI */
@@ -25,6 +26,7 @@ var ThreadListUI = {
   draftLinks: null,
   draftRegistry: null,
   DRAFT_SAVED_DURATION: 5000,
+  FIRST_PANEL_THREAD_COUNT: 9, // counted on a Peak
 
   // Used to track timeouts
   timeouts: {
@@ -545,12 +547,16 @@ var ThreadListUI = {
     this.sticky && this.sticky.refresh();
   },
 
+  ensureReadAheadSetting: function thlui_ensureReadAheadSettting() {
+    Settings.setReadAheadThreadRetrieval(this.FIRST_PANEL_THREAD_COUNT);
+  },
+
   renderThreads: function thlui_renderThreads(firstViewDoneCb, allDoneCb) {
     window.performance.mark('willRenderThreads');
     PerformanceTestingHelper.dispatch('will-render-threads');
 
     var hasThreads = false;
-    var firstPanelCount = 9; // counted on a Peak
+    var firstPanelCount = this.FIRST_PANEL_THREAD_COUNT;
 
     this.prepareRendering();
 
@@ -605,10 +611,17 @@ var ThreadListUI = {
       }
     }
 
+    function onDone() {
+      /* jshint validthis: true */
+
+      this.ensureReadAheadSetting();
+      allDoneCb && allDoneCb();
+    }
+
     var renderingOptions = {
       each: onRenderThread.bind(this),
       end: onThreadsRendered.bind(this),
-      done: allDoneCb
+      done: onDone.bind(this)
     };
 
     MessageManager.getThreads(renderingOptions);

apps/sms/test/unit/mock_settings.js

@@ -17,6 +17,7 @@ var MockSettings = {
   getServiceIdByIccId: function() { return null; },
   getSimNameByIccId: function(id) { return 'sim-name-' + id; },
   getOperatorByIccId: function(id) { return 'sim-operator-' + id; },
+  setReadAheadThreadRetrieval: function() {},
 
   mSetup: function() {
     MockSettings.mmsSizeLimitation = 295 * 1024;

apps/sms/test/unit/settings_test.js

@@ -87,6 +87,12 @@ suite('Settings >', function() {
     test('getServiceIdByIccId returns null', function() {
       assert.isNull(Settings.getServiceIdByIccId('anything'));
     });
+
+    test('setReadAheadThreadRetrieval does nothing', function() {
+      assert.doesNotThrow(() => {
+        Settings.setReadAheadThreadRetrieval(9);
+      });
+    });
   });
 
   suite('With mozSettings', function() {
@@ -141,6 +147,7 @@ suite('Settings >', function() {
           set: function() {}
         };
         sinon.spy(api, 'get');
+        sinon.spy(api, 'set');
         return api;
       });
     });
@@ -384,8 +391,17 @@ suite('Settings >', function() {
 
         conn.data.state = 'registered';
         listenerSpy.yield();
- 
+
       });
     });
+
+    test('setReadAheadThreadRetrieval()', function() {
+      Settings.setReadAheadThreadRetrieval(9);
+
+      sinon.assert.calledWithMatch(
+        navigator.mozSettings.createLock.lastCall.returnValue.set,
+        { 'ril.sms.maxReadAheadEntries' : 9 }
+      );
+    });
   });
 });

apps/sms/test/unit/thread_list_ui_test.js

@@ -2,7 +2,7 @@
          MessageManager, WaitingScreen, Threads, Template, MockMessages,
          MockThreadList, MockTimeHeaders, Draft, Drafts, Thread, ThreadUI,
          MockOptionMenu, Utils, Contacts, MockContact, Navigation,
-         MockSettings,
+         MockSettings, Settings,
          InterInstanceEventDispatcher,
          MockStickyHeader,
          StickyHeader
@@ -54,7 +54,8 @@ var mocksHelperForThreadListUI = new MocksHelper([
   'Navigation',
   'InterInstanceEventDispatcher',
   'SelectionHandler',
-  'LazyLoader'
+  'LazyLoader',
+  'Settings'
 ]).init();
 
 suite('thread_list_ui', function() {
@@ -1212,6 +1213,9 @@ suite('thread_list_ui', function() {
       this.sinon.spy(ThreadListUI, 'renderDrafts');
       this.sinon.spy(MockStickyHeader.prototype, 'refresh');
       this.sinon.spy(window, 'StickyHeader');
+
+      this.sinon.stub(Settings, 'setReadAheadThreadRetrieval');
+
       firstViewDone = sinon.stub();
 
       Threads.clear();
@@ -1290,6 +1294,11 @@ suite('thread_list_ui', function() {
           // Check that all threads have been properly inserted in the list
           assert.equal(mmsThreads.length, 2);
           assert.equal(smsThreads.length, 8);
+
+          sinon.assert.calledWith(
+            Settings.setReadAheadThreadRetrieval,
+            ThreadListUI.FIRST_PANEL_THREAD_COUNT
+          );
         });
       });
     });