Update 2016-12-20T16:33:32.915Z

js/lib/push_worker.js

@@ -22,6 +22,7 @@ self.addEventListener('push', function(event) {
   var obj = event.data.json()
   console.log('[SW] push', obj)
 
+  var hasActiveWindows = false
   var checksPromise = new Promise(function (resolve, reject) {
     if (!obj.badge) {
       return reject()
@@ -40,7 +41,8 @@ self.addEventListener('push', function(event) {
           nowTime - lastAliveTime < 60000) {
         return clients.matchAll({type: 'window'}).then(function(clientList) {
           console.log('matched clients', clientList)
-          if (clientList.length) {
+          hasActiveWindows = clientList.length > 0
+          if (hasActiveWindows) {
             console.log('Supress notification because some instance is alive')
             return reject()
           }
@@ -58,13 +60,15 @@ self.addEventListener('push', function(event) {
   })
 
   var closePromise = notificationPromise.catch(function () {
-    console.log('[SW] Closing all notifications on push')
+    console.log('[SW] Closing all notifications on push', hasActiveWindows)
     if (userInvisibleSupported) {
       return closeAllNotifications()
     }
     var promise = self.registration.showNotification('Telegram').then(function () {
-      // return closeAllNotifications()
+      // if (hasActiveWindows) {
-      setTimeout(closeAllNotifications, 100)
+      //   return closeAllNotifications()
+      // }
+      setTimeout(closeAllNotifications, hasActiveWindows ? 0 : 100)
     }).catch(function (error) {
       console.error('Show notification error', error)
     })

webogram.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# Time: Tue Dec 20 2016 18:49:49 GMT+0300 (MSK)
+# Time: Tue Dec 20 2016 19:33:22 GMT+0300 (MSK)
 
 
 CACHE:
@@ -9,7 +9,6 @@ service_worker.js
 css/app.css
 css/desktop.css
 css/mobile.css
-js/app.js
 img/Manytabs.png
 img/Manytabs_2x.png
 img/Telegram.png
@@ -27,19 +26,9 @@ img/iphone_home120.png
 img/iphone_startup.png
 img/logo_share.png
 img/sound_a.mp3
+js/app.js
 nacl/mtproto_crypto.nmf
 nacl/mtproto_crypto.pexe
-js/lib/bin_utils.js
-js/lib/crypto_worker.js
-js/lib/polyfill.js
-js/lib/push_worker.js
-js/locales/de-de.json
-js/locales/en-us.json
-js/locales/es-es.json
-js/locales/it-it.json
-js/locales/nl-nl.json
-js/locales/pt-br.json
-js/locales/ru-ru.json
 img/changelog/card_wecandoit.png
 img/icons/AboutLogos.png
 img/icons/AboutLogos_2x.png
@@ -74,9 +63,20 @@ img/placeholders/[email protected]
 img/placeholders/[email protected]
 img/placeholders/VideoThumbConversation.gif
 img/placeholders/VideoThumbModal.gif
+js/lib/bin_utils.js
+js/lib/crypto_worker.js
+js/lib/polyfill.js
+js/lib/push_worker.js
+js/locales/de-de.json
+js/locales/en-us.json
+js/locales/es-es.json
+js/locales/it-it.json
+js/locales/nl-nl.json
+js/locales/pt-br.json
+js/locales/ru-ru.json
 vendor/closure/long.js
-vendor/jsbn/jsbn_combined.js
 vendor/cryptoJS/crypto.js
+vendor/jsbn/jsbn_combined.js
 vendor/leemon_bigint/bigint.js
 vendor/rusha/rusha.js
 vendor/angular/i18n/angular-locale_de-de.js