minor changes

Author: thyttan

apps/messagegui/app.js

@@ -274,14 +274,34 @@ function showMessageScroller(msg) {
   });
 }
 
-function showMessageScroller2(msg, initAtEndOfMsg) {
+function showMessageScroller2(msg, initAtEndOfMsg, persist, alreadyProcessedLines, alreadyProcessedIdx) {
+  if (initAtEndOfMsg===undefined) {initAtEndOfMsg = false;}
+  if (persist===undefined) {persist = true;}
+  if (!!alreadyProcessedLines) {alreadyProcessedLines = [];}
+  if (!!alreadyProcessedIdx) {alreadyProcessedIdx = [];}
 
+  if (replying) { return; }
+  if (persist) {
+    cancelReloadTimeout();
+  } else {
+    resetReloadTimeout();
+  }
 
   let msgIdx = MESSAGES.findIndex((m) =>  m.id == msg.id)
   //print("msgIdx",msgIdx);
-
-  let startIdx = Math.max(msgIdx-1, 0);
-  let stopIdx = Math.min(msgIdx+2, MESSAGES.length);
+  let startIdx;
+  let stopIdx;
+
+  if (alreadyProcessedIdx.length===0){
+    startIdx = Math.max(msgIdx-1, 0);
+    stopIdx = Math.min(msgIdx+2, MESSAGES.length);
+  } else if (msgIdx > alreadyProcessedIdx[0] && msgid < alreadyProcessedIdx[1]){
+    startIdx = msgIdx;
+    stopIdx = msgIdx+1;
+  } else {
+    startIdx = msgIdx;
+    stopIdx = msgIdx;
+  }
 
   active = "scroller";
   var bodyFont = fontBig;
@@ -291,13 +311,14 @@ function showMessageScroller2(msg, initAtEndOfMsg) {
   var j = MESSAGES.length-1;
   var messagesWrapped = [];
   for (let j=startIdx; j<stopIdx; j++) {
-    if (msg.id=="music" || msg.source=="maps") {
+    let msgLocal = MESSAGES[j];
+
+    if (msgLocal.id=="music" || msgLocal.source=="maps" || msgLocal.id =="call") {
       stopIdx++
       if (stopIdx>=MESSAGES.length) break;
       continue;
     }
 
-    let msgLocal = MESSAGES[j];
     var lines = [];
     if (msgLocal.title) {
       lines = g.wrapString(msgLocal.title, g.getWidth()-10);
@@ -325,7 +346,7 @@ function showMessageScroller2(msg, initAtEndOfMsg) {
     initScroll += messagesWrapped[i].length>8?messagesWrapped[i].length-8:0;
   }
 
-  if (allLines2.length == 0) {
+  if (allLines2.length == 0 && alreadyProcessedIdx.length == 0) {
     cancelReloadTimeout();
     returnToClockIfEmpty();
   }
@@ -350,12 +371,12 @@ function showMessageScroller2(msg, initAtEndOfMsg) {
       if (idx>=allLines2.length-1 && msgIdx<MESSAGES.length-1) {
         setTimeout(()=>{
           showMessageScroller2(MESSAGES[msgIdx+1], true);
-        }, 50)
+        }, 0)
       }
       if (idx==0 && msgIdx>0) {
         setTimeout(()=>{
           showMessageScroller2(MESSAGES[msgIdx-1], false);
-        }, 50)
+        }, 0)
       }
     }, select : function(idx, touch) {
       if (touch.type == 0) {
@@ -646,7 +667,7 @@ function checkMessages(options) {
   if (!options.ignoreUnread && newMessages.length) {
     delete newMessages[0].show; // stop us getting stuck here if we're called a second time
     //showMessage(newMessages[0].id, false);
-    showMessageScroller2(MESSAGES[2], false);
+    showMessageScroller2(MESSAGES[2], false, false);
     // buzz after showMessage, so being busy during layout doesn't affect the buzz pattern
     if (global.BUZZ_ON_NEW_MESSAGE) {
       // this is set if we entered the messages app by loading `messagegui.new.js`