fix incorrect initialization of promise when initializing pushes
This commit is contained in:
@@ -333,11 +333,11 @@ class TinodeWeb extends React.Component {
|
||||
}).catch((err) => {
|
||||
// registration failed :(
|
||||
onError("Failed to register service worker:", err);
|
||||
return new Promise.reject(err);
|
||||
return Promise.reject(err);
|
||||
});
|
||||
} catch (err) {
|
||||
onError("Failed to initialize push notifications", err);
|
||||
return new Promise.reject(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1031,7 +1031,7 @@ class TinodeWeb extends React.Component {
|
||||
if (enabled) {
|
||||
if (!this.state.firebaseToken) {
|
||||
const fcm = this.fbPush ?
|
||||
new Promise().resolve() :
|
||||
Promise.resolve() :
|
||||
this.initFCMessaging();
|
||||
fcm.then(() => {
|
||||
return this.fbPush.requestPermission();
|
||||
|
||||
+3
-3
@@ -5093,11 +5093,11 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
||||
return reg;
|
||||
}).catch(err => {
|
||||
onError("Failed to register service worker:", err);
|
||||
return new Promise.reject(err);
|
||||
return Promise.reject(err);
|
||||
});
|
||||
} catch (err) {
|
||||
onError("Failed to initialize push notifications", err);
|
||||
return new Promise.reject(err);
|
||||
return Promise.reject(err);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -5796,7 +5796,7 @@ class TinodeWeb extends (react__WEBPACK_IMPORTED_MODULE_0___default().Component)
|
||||
togglePushToken(enabled) {
|
||||
if (enabled) {
|
||||
if (!this.state.firebaseToken) {
|
||||
const fcm = this.fbPush ? new Promise().resolve() : this.initFCMessaging();
|
||||
const fcm = this.fbPush ? Promise.resolve() : this.initFCMessaging();
|
||||
fcm.then(() => {
|
||||
return this.fbPush.requestPermission();
|
||||
}).then(() => {
|
||||
|
||||
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