From 0ddf41772621eb6e7433175301278050269b510e Mon Sep 17 00:00:00 2001
From: Igor Zhukov <igor.beatle@gmail.com>
Date: Tue, 5 Aug 2014 15:43:36 +0100
Subject: [PATCH] Added curPeerId check for notifications on mobile

Closes #270
---
 app/js/controllers.js | 1 +
 app/js/services.js    | 8 +++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/js/controllers.js b/app/js/controllers.js
index 534d41be..d40f6bcd 100644
--- a/app/js/controllers.js
+++ b/app/js/controllers.js
@@ -701,6 +701,7 @@ angular.module('myApp.controllers', [])
         return false;
       }
 
+      $rootScope.selectedPeerID = peerID;
       $scope.curDialog.peerID = peerID;
       $scope.curDialog.inputPeer = AppPeersManager.getInputPeer(newPeer);
       $scope.historyFilter.mediaType = false;
diff --git a/app/js/services.js b/app/js/services.js
index 7239905e..cf9b8cf3 100644
--- a/app/js/services.js
+++ b/app/js/services.js
@@ -2021,7 +2021,9 @@ angular.module('myApp.services', [])
         $rootScope.$broadcast('dialogs_update', dialog);
 
 
-        if ($rootScope.idle.isIDLE && !message.out && message.unread) {
+        if ((Config.Navigator.mobile && $rootScope.selectedPeerID != peerID || $rootScope.idle.isIDLE) &&
+            !message.out &&
+            message.unread) {
           NotificationsManager.getPeerMuted(peerID).then(function (muted) {
             if (!message.unread || muted) {
               return;
@@ -3217,6 +3219,10 @@ angular.module('myApp.services', [])
     if (!started) {
       started = true;
       $($window).on('blur focus keydown mousedown touchstart', onEvent);
+
+      setTimeout(function () {
+        onEvent({type: 'blur'});
+      }, 0);
     }
   }