From 0b27d8a7171b139720bceb36efae6c3906b0ece1 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Wed, 6 Mar 2019 09:24:16 +0900
Subject: [PATCH] Fix #4421

---
 src/client/app/mios.ts | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/client/app/mios.ts b/src/client/app/mios.ts
index eb8af9649..9e191bf43 100644
--- a/src/client/app/mios.ts
+++ b/src/client/app/mios.ts
@@ -172,7 +172,11 @@ export default class MiOS extends EventEmitter {
 			callback();
 
 			// Init service worker
-			if (this.shouldRegisterSw) this.registerSw();
+			if (this.shouldRegisterSw) {
+				this.getMeta().then(data => {
+					this.registerSw(data.swPublickey);
+				});
+			}
 		};
 
 		// キャッシュがあったとき
@@ -302,7 +306,7 @@ export default class MiOS extends EventEmitter {
 	 * Register service worker
 	 */
 	@autobind
-	private registerSw() {
+	private registerSw(swPublickey) {
 		// Check whether service worker and push manager supported
 		const isSwSupported =
 			('serviceWorker' in navigator) && ('PushManager' in window);
@@ -328,7 +332,7 @@ export default class MiOS extends EventEmitter {
 
 				// A public key your push server will use to send
 				// messages to client apps via a push server.
-				applicationServerKey: urlBase64ToUint8Array(this.meta.data.swPublickey)
+				applicationServerKey: urlBase64ToUint8Array(swPublickey)
 			};
 
 			// Subscribe push notification