Merge pull request #4935 from SimonTen/issues/3243

Wait for login before ask for notification permission
This commit is contained in:
Bill Thornton 2024-01-22 00:32:21 -05:00 committed by GitHub
commit 358b1f5275
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -3,6 +3,7 @@ import { playbackManager } from '../playback/playbackmanager';
import Events from '../../utils/events.ts'; import Events from '../../utils/events.ts';
import globalize from '../../scripts/globalize'; import globalize from '../../scripts/globalize';
import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts'; import { getItems } from '../../utils/jellyfin-apiclient/getItems.ts';
import ServerConnections from '../../components/ServerConnections';
import NotificationIcon from './notificationicon.png'; import NotificationIcon from './notificationicon.png';
@ -17,8 +18,27 @@ function onOneDocumentClick() {
} }
} }
document.addEventListener('click', onOneDocumentClick); function registerOneDocumentClickHandler() {
document.addEventListener('keydown', onOneDocumentClick); Events.off(ServerConnections, 'localusersignedin', registerOneDocumentClickHandler);
document.addEventListener('click', onOneDocumentClick);
document.addEventListener('keydown', onOneDocumentClick);
}
function initPermissionRequest() {
const apiClient = ServerConnections.currentApiClient();
if (apiClient) {
apiClient.getCurrentUser()
.then(() => registerOneDocumentClickHandler())
.catch(() => {
Events.on(ServerConnections, 'localusersignedin', registerOneDocumentClickHandler);
});
} else {
registerOneDocumentClickHandler();
}
}
initPermissionRequest();
let serviceWorkerRegistration; let serviceWorkerRegistration;