simplify a bit and remove debug logging
This commit is contained in:
@@ -373,16 +373,12 @@ class TinodeWeb extends React.Component {
|
|||||||
try {
|
try {
|
||||||
this.fcm = firebaseGetMessaging(firebaseInitApp(FIREBASE_INIT, APP_NAME));
|
this.fcm = firebaseGetMessaging(firebaseInitApp(FIREBASE_INIT, APP_NAME));
|
||||||
return navigator.serviceWorker.getRegistration('/service-worker.js').then(reg => {
|
return navigator.serviceWorker.getRegistration('/service-worker.js').then(reg => {
|
||||||
if (reg) {
|
return reg || navigator.serviceWorker.register('/service-worker.js').then(reg => {
|
||||||
return reg
|
|
||||||
}
|
|
||||||
return navigator.serviceWorker.register('/service-worker.js').then(reg => {
|
|
||||||
this.checkForAppUpdate(reg);
|
this.checkForAppUpdate(reg);
|
||||||
return reg;
|
return reg;
|
||||||
});
|
});
|
||||||
}).then(reg => {
|
}).then(reg => {
|
||||||
// Pass locale and version config to the service worker.
|
// Pass locale and version config to the service worker.
|
||||||
console.log("SW active:", reg.active, "installing:", reg.installing);
|
|
||||||
(reg.active || reg.installing).postMessage(JSON.stringify({locale: locale, version: PACKAGE_VERSION}));
|
(reg.active || reg.installing).postMessage(JSON.stringify({locale: locale, version: PACKAGE_VERSION}));
|
||||||
// Request token.
|
// Request token.
|
||||||
return TinodeWeb.requestFCMToken(this.fcm, reg);
|
return TinodeWeb.requestFCMToken(this.fcm, reg);
|
||||||
@@ -402,7 +398,7 @@ class TinodeWeb extends React.Component {
|
|||||||
// Handhe FCM pushes
|
// Handhe FCM pushes
|
||||||
// (a) for channels always,
|
// (a) for channels always,
|
||||||
// (b) pushes when the app is in foreground but has no focus.
|
// (b) pushes when the app is in foreground but has no focus.
|
||||||
firebaseOnMessage(this.fcm, (payload) => { this.handlePushMessage(payload); });
|
firebaseOnMessage(this.fcm, payload => { this.handlePushMessage(payload); });
|
||||||
}).catch(err => {
|
}).catch(err => {
|
||||||
// SW registration or FCM has failed :(
|
// SW registration or FCM has failed :(
|
||||||
onError(err);
|
onError(err);
|
||||||
|
|||||||
+1
-5
@@ -8028,15 +8028,11 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
|||||||
try {
|
try {
|
||||||
this.fcm = (0,firebase_messaging__WEBPACK_IMPORTED_MODULE_3__.getMessaging)((0,firebase_app__WEBPACK_IMPORTED_MODULE_2__.initializeApp)(FIREBASE_INIT, _config_js__WEBPACK_IMPORTED_MODULE_12__.APP_NAME));
|
this.fcm = (0,firebase_messaging__WEBPACK_IMPORTED_MODULE_3__.getMessaging)((0,firebase_app__WEBPACK_IMPORTED_MODULE_2__.initializeApp)(FIREBASE_INIT, _config_js__WEBPACK_IMPORTED_MODULE_12__.APP_NAME));
|
||||||
return navigator.serviceWorker.getRegistration('/service-worker.js').then(reg => {
|
return navigator.serviceWorker.getRegistration('/service-worker.js').then(reg => {
|
||||||
if (reg) {
|
return reg || navigator.serviceWorker.register('/service-worker.js').then(reg => {
|
||||||
return reg;
|
|
||||||
}
|
|
||||||
return navigator.serviceWorker.register('/service-worker.js').then(reg => {
|
|
||||||
this.checkForAppUpdate(reg);
|
this.checkForAppUpdate(reg);
|
||||||
return reg;
|
return reg;
|
||||||
});
|
});
|
||||||
}).then(reg => {
|
}).then(reg => {
|
||||||
console.log("SW active:", reg.active, "installing:", reg.installing);
|
|
||||||
(reg.active || reg.installing).postMessage(JSON.stringify({
|
(reg.active || reg.installing).postMessage(JSON.stringify({
|
||||||
locale: locale,
|
locale: locale,
|
||||||
version: _version_js__WEBPACK_IMPORTED_MODULE_14__.PACKAGE_VERSION
|
version: _version_js__WEBPACK_IMPORTED_MODULE_14__.PACKAGE_VERSION
|
||||||
|
|||||||
File diff suppressed because one or more lines are too long
+1
-1
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Reference in New Issue
Block a user