r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Notifications bugfixes

Browse Source
This commit is contained in:
Igor Zhukov 2016-12-16 16:44:27 +03:00
parent 9c2a144f6e
commit a6cf0a7772
7 changed files with 118 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/js/directives.js
View File

@ -803,7 +803,8 @@ angular.module('myApp.directives', ['myApp.filters'])
if (searchFocused && e.keyCode == 13 && !Config.Navigator.mobile) { // Enter
var currentSelected = $(scrollableWrap).find('.im_dialog_selected')[0] || $(scrollableWrap).find('.im_dialog_wrap a')[0]
if (currentSelected) {
if (currentSelected &&
!$(currentSelected).hasClass('disabled')) {
$(currentSelected).trigger('mousedown')
}
return cancelEvent(e)

41
app/js/lib/ng_utils.js
View File

@ -1981,17 +1981,21 @@ angular.module('izhukov.utils', [])
return timeParams
})
.service('WebPushApiManager', function ($window, $timeout, $q, $rootScope, AppRuntimeManager) {
.service('WebPushApiManager', function ($window, $timeout, $q, $rootScope, _, AppRuntimeManager) {
var isAvailable = true
var isPushEnabled = false
var localNotificationsAvailable = true
var started = false
var settings = {}
var isAliveTO
if (!('PushManager' in window) ||
!('Notification' in window) ||
!('serviceWorker' in navigator)) {
console.warn('Push messaging is not supported.')
isAvailable = false
localNotificationsAvailable = false
}
if (Notification.permission === 'denied') {
@ -2006,6 +2010,10 @@ angular.module('izhukov.utils', [])
}
}
function setLocalNotificationsDisabled() {
localNotificationsAvailable = false
}
function getSubscription() {
if (!isAvailable) {
return
@ -2073,12 +2081,33 @@ angular.module('izhukov.utils', [])
$rootScope.idle && $rootScope.idle.deactivated) {
return
}
var baseUrl = (location.href || '').replace(/#.*$/, '') + '#/im'
var eventData = {type: 'alive', baseUrl: baseUrl}
var eventData = {
type: 'ping',
localNotifications: localNotificationsAvailable,
baseUrl: (location.href || '').replace(/#.*$/, '') + '#/im',
lang: {
push_action_mute1d: _(Config.Mobile
? 'push_action_mute1d_mobile_raw'
: 'push_action_mute1d_raw'
),
push_action_settings: _(Config.Mobile
? 'push_action_settings_mobile_raw'
: 'push_action_settings_raw'
),
push_message_nopreview: _('push_message_nopreview_raw'),
},
settings: settings
}
if (navigator.serviceWorker.controller) {
navigator.serviceWorker.controller.postMessage(eventData)
}
setTimeout(isAliveNotify, 10000)
isAliveTO = setTimeout(isAliveNotify, 10000)
}
function setSettings(newSettings) {
settings = newSettings
clearTimeout(isAliveTO)
isAliveNotify()
}
function hidePushNotifications() {
@ -2128,7 +2157,9 @@ angular.module('izhukov.utils', [])
isPushEnabled: isPushEnabled,
subscribe: subscribe,
unsubscribe: unsubscribe,
hidePushNotifications: hidePushNotifications
hidePushNotifications: hidePushNotifications,
setLocalNotificationsDisabled: setLocalNotificationsDisabled,
setSettings: setSettings
}
})

72
app/js/lib/push_worker.js
View File

@ -8,6 +8,9 @@ var lastAliveTime = false
var pendingNotification = false
var muteUntil = false
var baseUrl
var settings
var lang = {}
switch (location.hostname) {
case 'localhost':
baseUrl = 'http://localhost:8000/app/index.html#/im'
@ -24,7 +27,9 @@ self.addEventListener('push', function(event) {
var obj = event.data.json()
console.log('[SW] push', obj)
if (!obj.badge) {
closeAllNotifications(obj, event)
event.waitUntil(self.registration.showNotification('Telegram').then(function () {
return closeAllNotifications(obj)
}))
} else {
fireNotification(obj, event)
}
@ -37,19 +42,30 @@ self.addEventListener('activate', function(event) {
self.addEventListener('message', function(event) {
console.log('[SW] on message', event.data)
port = event.ports[0] || event.source
if (event.data.type == 'alive') {
lastAliveTime = +(new Date())
var client = event.ports[0] || event.source
if (event.data.type == 'ping') {
if (event.data.localNotifications) {
lastAliveTime = +(new Date())
}
if (pendingNotification &&
port &&
'postMessage' in port) {
port.postMessage(pendingNotification)
client &&
'postMessage' in client) {
client.postMessage(pendingNotification)
pendingNotification = false
}
if (event.data.lang) {
lang = event.data.lang
IDBManager.setItem('push_lang', lang)
}
if (event.data.settings) {
settings = event.data.settings
IDBManager.setItem('push_settings', settings)
}
}
if (event.data.type == 'notifications_clear') {
closeAllNotifications(event.data, event)
closeAllNotifications(event.data)
}
if (event.data.baseUrl) {
baseUrl = event.data.baseUrl
@ -60,7 +76,7 @@ function fireNotification(obj, event) {
var nowTime = +(new Date())
if (nowTime - lastAliveTime < 60000) {
console.log('Supress notification because some instance is alive')
return false
// return false
}
if (muteUntil && nowTime < muteUntil) {
console.log('Supress notification because mute for ', (muteUntil - nowTime) / 60000, 'min')
@ -82,20 +98,27 @@ function fireNotification(obj, event) {
peerID = obj.custom && obj.custom.from_id || 0
}
obj.custom.peerID = peerID
var tag = 'peer' + peerID
if (settings && settings.nopreview) {
title = 'Telegram'
body = lang.push_message_nopreview || 'You have a new message'
tag = 'unknown_peer'
}
var notificationPromise = self.registration.showNotification(title, {
body: body,
icon: icon,
tag: 'peer' + peerID,
tag: tag,
data: obj,
actions: [
{
action: 'mute1d',
title: 'Mute background alerts for 1 day'
title: lang.push_action_mute1d || 'Mute for 1D'
},
{
action: 'push_settings',
title: 'Background alerts settings'
title: lang.push_action_settings || 'Settings'
}
]
})
@ -133,22 +156,24 @@ function removeFromNotifications(notification) {
}
}
function closeAllNotifications(obj, event) {
function closeAllNotifications(obj) {
for (var i = 0, len = notifications.length; i < len; i++) {
try {
notifications[i].close()
} catch (e) {}
}
event.waitUntil(self.registration.getNotifications({}).then(function(notifications) {
var p = self.registration.getNotifications({}).then(function(notifications) {
for (var i = 0, len = notifications.length; i < len; i++) {
try {
notifications[i].close()
} catch (e) {}
}
}))
})
notifications = []
return p
}
@ -161,7 +186,10 @@ self.addEventListener('notificationclick', function(event) {
if (action == 'mute1d') {
console.log('[SW] mute for 1d')
muteUntil = +(new Date()) + 86400000
IDBManager.setItem('mute_until', muteUntil.toString())
IDBManager.setItem('push_mute_until', muteUntil.toString())
return
}
if (!notification.data) {
return
}
@ -174,7 +202,7 @@ self.addEventListener('notificationclick', function(event) {
var client = clientList[i]
if ('focus' in client) {
client.focus()
;(port || client).postMessage(pendingNotification)
client.postMessage(pendingNotification)
pendingNotification = false
return
}
@ -318,6 +346,14 @@ self.addEventListener('notificationclose', onCloseNotification)
IDBManager.getItem('mute_until').then(function (newMuteUntil) {
IDBManager.getItem('push_mute_until').then(function (newMuteUntil) {
muteUntil = Math.max(muteUntil || 0, newMuteUntil || 0) || false
})
IDBManager.getItem('push_lang').then(function (newLang) {
lang = newLang || {}
})
IDBManager.getItem('push_settings').then(function (newSettings) {
settings = newSettings || {}
})

6
app/js/locales/en-us.json
View File

@ -601,6 +601,12 @@
"inactive_description_md": "Telegram supports only one active tab with the app.\nPlease reload this page to continue using this tab or close it.",
"inactive_reload_btn": "Reload App",
"push_action_mute1d": "Mute background alerts for 1 day",
"push_action_settings": "Background alerts settings",
"push_action_mute1d_mobile": "Mute for 24H",
"push_action_settings_mobile": "Alerts settings",
"push_message_nopreview": "You have a new message",
"country_select_modal_country_ab": "Abkhazia",
"country_select_modal_country_af": "Afghanistan",

23
app/js/services.js
View File

@ -3693,6 +3693,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
}
}
}
WebPushApiManager.setSettings(settings)
})
}
@ -3846,11 +3847,17 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
var notification
if ('Notification' in window) {
notification = new Notification(data.title, {
icon: data.image || '',
body: data.message || '',
tag: data.tag || ''
})
try {
notification = new Notification(data.title, {
icon: data.image || '',
body: data.message || '',
tag: data.tag || ''
})
} catch (e) {
notificationsUiSupport = false
WebPushApiManager.setLocalNotificationsDisabled()
return
}
}
else if ('mozNotification' in navigator) {
notification = navigator.mozNotification.createNotification(data.title, data.message || '', data.image || '')
@ -3862,7 +3869,7 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
notification = {
index: idx
}
}else {
} else {
return
}
@ -3973,6 +3980,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
token: tokenData.tokenValue
}).then(function () {
registeredDevice = tokenData
}, function (error) {
error.handled = true
})
}
@ -3985,6 +3994,8 @@ angular.module('myApp.services', ['myApp.i18n', 'izhukov.utils'])
token: tokenData.tokenValue
}).then(function () {
registeredDevice = false
}, function (error) {
error.handled = true
})
}

3
app/partials/desktop/error_modal.html
View File

@ -72,8 +72,7 @@
<div ng-if="error" class="error_modal_details" ng-switch="error.detailsShown">
<textarea ng-switch-when="true" rows="3" onclick="this.select()">Method: {{error.input || 'N/A'}}
Url: {{error.url || 'N/A'}}
Result: {{error.originalError ? error.originalError : (error.stack ? (error.name || '') + ' ' + (error.description || error.message) : error)}}
Stack: {{error.originalError.stack || error.stack}}</textarea>
Result: {{error.originalError ? error.originalError : (error.stack ? (error.name || '') + ' ' + (error.description || error.message) : error)}}</textarea>
<div ng-switch-default>
<a class="error_modal_details_link" href="" ng-click="error.detailsShown = true" my-i18n="error_modal_tech_details"></a>
</div>

4
app/service_worker.js
View File

@ -1,3 +1,3 @@
// Version 44
importScripts('js/lib/push_worker.js?44')
// Version 45
importScripts('js/lib/push_worker.js?45')