Add comment and fine-tune last-seen indicator when not focused

FREEBIE
signalapp · Jun 1, 2017 · 1775e97 · 1775e97
1 parent 672a517
commit 1775e97
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/js/views/conversation_view.js b/js/views/conversation_view.js
@@ -382,7 +382,12 @@
                 if (!this.lastSeenIndicator) {
                     this.resetLastSeenIndicator({scroll: false});
                 } else if (this.view.atBottom() && this.model.get('unreadCount') === this.lastSeenIndicator.getCount()) {
-                    this.lastSeenIndicator.el.scrollIntoView();
+                    // The count check ensures that the last seen indicator is still in
+                    //   sync with the real number of unread, so we can scroll to it.
+                    //   We only do this if we're at the bottom, because that signals that
+                    //   the user is okay with us changing scroll around so they see the
+                    //   right unseen message first.
+                    this.resetLastSeenIndicator({scroll: true});
                 }
             }
             else if (!this.isHidden() && window.isFocused()) {

diff --git a/test/manual.txt b/test/manual.txt
@@ -22,7 +22,9 @@ Conversation view:
 
     - Scroll up on a conversation then switch to another application, keeping the Signal application visible. Receive new messages on that conversation. Switch back to application. The scroll down button should be blue, and the conversation scroll location should stay where it was. There should be a last seen indicator visible above the new messages.
 
-    - ADVANCED: Set up an automated script (or friend) to send you repeated messages. You should see the right number of unread upon entry of the conversation, along with with the last seen indicator. While the conversation is focused, new messages should increment the last seen indicator. Clicking the scroll down button will eliminate the last seen indicator, then scroll up. New messages received while scrolled up should not scroll the conversation, but will add a new last seen indicator and scroll down button.
+    - Scroll to bottom of a conversation, then switch to another application, keeping Signal application visible. Receive new messages on that conversation. As new messages come in, the last seen indicator should march up the screen. Before it reaches the top, switch back to the application. This will mark those messages as read. Switch away from the application again, and receive new messages. The last seen indicator will scroll off the top of the screen as more and more new messages come in.
+
+    - ADVANCED: Set up an automated script (or friend) to send you repeated messages. You should see the right number of unread upon entry of the conversation, along with with the last seen indicator. While the conversation is focused, new messages should increment the last seen indicator until it is offscreen above. Click the scroll down button to eliminate the last seen indicator, then scroll up. New messages received while scrolled up should not scroll the conversation, but will add a new last seen indicator and scroll down button.
 
     - ADVANCED: Set fetch limit to a low number, like 3 (in models/messages.js, fetchConversation function). Load the application, and don't select the conversation. Receive more than four new messages in that conversation. Select the conversation. The last seen indicator should reflect the total number of new messages and all of them should be visible.