Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/debug_info_on_push_subscription'

Browse Source
This commit is contained in:
Timon Ostertun
2025-02-19 16:49:56 +01:00
parent 49ed27e58f 8972d2d72a
commit b52eea79c2
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
client/scripts/regatten.js.php
View File

@@ -320,7 +320,7 @@ function pushesSubscribe() {
applicationServerKey: applicationServerKey applicationServerKey: applicationServerKey
}) })
.then(async function(subscription) { .then(async function(subscription) {
log('[app] Subscription:', subscription); log('[app] Subscription:', JSON.stringify(subscription));
if (await pushesUpdateServerSubscription(subscription, true)) { if (await pushesUpdateServerSubscription(subscription, true)) {
log('[app] Subscription: Sent to server, updating UI'); log('[app] Subscription: Sent to server, updating UI');
dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint); dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);
@@ -346,7 +346,7 @@ function pushesUnSubscribe(silent = false) {
log('[app] Unsubscribing'); log('[app] Unsubscribing');
swRegistration.pushManager.getSubscription() swRegistration.pushManager.getSubscription()
.then(async function(subscription) { .then(async function(subscription) {
log('[app] Subscription:', subscription); log('[app] Subscription:', JSON.stringify(subscription));
if (subscription) { if (subscription) {
if (await pushesUpdateServerSubscription(subscription, false)) { if (await pushesUpdateServerSubscription(subscription, false)) {
log('[app] Subscription: Removed from server'); log('[app] Subscription: Removed from server');
@@ -374,7 +374,7 @@ function pushesUnSubscribe(silent = false) {
function pushesUpdateServerSubscription(subscription, enabled) { function pushesUpdateServerSubscription(subscription, enabled) {
return new Promise(function(resolve){ return new Promise(function(resolve){
log('[app] updateServer', enabled, subscription); log('[app] updateServer', enabled, JSON.stringify(subscription));
$.ajax({ $.ajax({
url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription', url: QUERY_URL + (enabled ? 'add' : 'remove') + '_subscription',
type: 'POST', type: 'POST',
@@ -477,7 +477,7 @@ function updatePushBadge() {
var dbSub = await dbSettingsGet('notify_endpoint_' + BOATCLASS); var dbSub = await dbSettingsGet('notify_endpoint_' + BOATCLASS);
var isSub = (subscription !== null); var isSub = (subscription !== null);
log('[app] DB Subscription:', dbSub); log('[app] DB Subscription:', dbSub);
log('[app] Real Subscription:', subscription); log('[app] Real Subscription:', JSON.stringify(subscription));
if (isSub) { if (isSub) {
$('#badge-pushes').removeClass('bg-red2-dark').addClass('bg-green2-dark').text('AN'); $('#badge-pushes').removeClass('bg-red2-dark').addClass('bg-green2-dark').text('AN');
if (dbSub === null) dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint); if (dbSub === null) dbSettingsSet('notify_endpoint_' + BOATCLASS, subscription.endpoint);

2
server/version.php
View File

@@ -1,5 +1,5 @@
<?php <?php
define('PWA_VERSION', '1.13h2'); define('PWA_VERSION', '1.13h3');
?> ?>