Unread history bugfixes

app/js/controllers.js

@@ -1018,9 +1018,6 @@ angular.module('myApp.controllers', [])
       else if (forceRecent) {
         limit = 10;
       }
-      else if (Config.Mobile) {
-        limit = 20;
-      }
 
       moreActive = false;
       morePending = false;
@@ -1064,6 +1061,9 @@ angular.module('myApp.controllers', [])
           if ($scope.skippedHistory) {
             delete message.unread;
           }
+          if (historyResult.unreadOffset) {
+            message.unreadAfter = true;
+          }
           peerHistory.messages.push(message);
         });
         peerHistory.messages.reverse();

app/js/directives.js

@@ -101,10 +101,13 @@ angular.module('myApp.directives', ['myApp.filters'])
         }
       });
 
-      if ($scope.historyMessage.unread) {
       var deregisterUnreadAfter;
-        if (!$scope.historyMessage.out) {
+      if (!$scope.historyMessage.out &&
+          ($scope.historyMessage.unread || $scope.historyMessage.unreadAfter)) {
         var applyUnreadAfter = function () {
+          if ($scope.peerHistory.peerID != $scope.historyPeer.id) {
+            return;
+          }
           if (unreadAfter != ($scope.historyUnreadAfter == $scope.historyMessage.id)) {
             unreadAfter = !unreadAfter;
             if (unreadAfter) {
@@ -124,6 +127,7 @@ angular.module('myApp.directives', ['myApp.filters'])
         applyUnreadAfter();
         deregisterUnreadAfter = $scope.$on('messages_unread_after', applyUnreadAfter);
       }
+      if ($scope.historyMessage.unread) {
         element.addClass(unreadClass);
         var deregisterUnread = $scope.$on('messages_read', function () {
           if (!$scope.historyMessage.unread) {

app/js/services.js

@@ -929,6 +929,9 @@ angular.module('myApp.services', [])
           unreadOffset = unreadCount;
         }
       }
+      else if (Config.Mobile) {
+        limit = 20;
+      }
     }
     else if (maxID > 0) {
       offsetNotFound = true;