From f886e4411ce5184bc04d403d4312dc98cb358f03 Mon Sep 17 00:00:00 2001
From: hensm <m@matt.tf>
Date: Sat, 24 Apr 2021 03:18:25 +0100
Subject: [PATCH] Cleanup popup messages

---
 .../receiverSelector/PopupReceiverSelector.ts   | 17 +++++++++--------
 ext/src/messaging.ts                            |  6 ++----
 ext/src/ui/popup/index.tsx                      |  6 +++---
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/ext/src/background/receiverSelector/PopupReceiverSelector.ts b/ext/src/background/receiverSelector/PopupReceiverSelector.ts
index 872f21f..199921f 100644
--- a/ext/src/background/receiverSelector/PopupReceiverSelector.ts
+++ b/ext/src/background/receiverSelector/PopupReceiverSelector.ts
@@ -25,7 +25,8 @@ export default class PopupReceiverSelector extends ReceiverSelector {
     private availableMediaTypes?: ReceiverSelectorMediaType;
 
     private wasReceiverSelected: boolean = false;
-    private requestedAppId?: string;
+
+    private appId?: string;
 
     #isOpen = false;
 
@@ -55,9 +56,9 @@ export default class PopupReceiverSelector extends ReceiverSelector {
             receivers: Receiver[]
           , defaultMediaType: ReceiverSelectorMediaType
           , availableMediaTypes: ReceiverSelectorMediaType
-          , requestedAppId?: string): Promise<void> {
+          , appId?: string): Promise<void> {
 
-        this.requestedAppId = requestedAppId;
+        this.appId = appId;
 
         // If popup already exists, close it
         if (this.windowId) {
@@ -117,7 +118,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
     public update (receivers: Receiver[]) {
         this.receivers = receivers;
         this.messagePort?.postMessage({
-            subject: "popup:/populateReceiverList"
+            subject: "popup:/update"
           , data: {
                 receivers: this.receivers
             }
@@ -130,7 +131,7 @@ export default class PopupReceiverSelector extends ReceiverSelector {
         }
 
         this.#isOpen = false;
-        this.requestedAppId = undefined;
+        this.appId = undefined;
 
         if (this.messagePort && !this.messagePortDisconnected) {
             this.messagePort.disconnect();
@@ -161,12 +162,12 @@ export default class PopupReceiverSelector extends ReceiverSelector {
         }
 
         this.messagePort.postMessage({
-            subject: "popup:/sendRequestedAppId"
-          , data: { requestedAppId: this.requestedAppId }
+            subject: "popup:/init"
+          , data: { appId: this.appId }
         });
 
         this.messagePort.postMessage({
-            subject: "popup:/populateReceiverList"
+            subject: "popup:/update"
           , data: {
                 receivers: this.receivers
               , defaultMediaType: this.defaultMediaType
diff --git a/ext/src/messaging.ts b/ext/src/messaging.ts
index c150ea5..f373358 100644
--- a/ext/src/messaging.ts
+++ b/ext/src/messaging.ts
@@ -14,10 +14,8 @@ import { MediaInfo } from "./shim/cast/media";
 
 
 type MessagesBase = {
-    "popup:/sendRequestedAppId": {
-        requestedAppId?: string
-    }
- , "popup:/populateReceiverList": {
+    "popup:/init": { appId?: string }
+  , "popup:/update": {
         receivers: Receiver[]
       , defaultMediaType?: ReceiverSelectorMediaType
       , availableMediaTypes?: ReceiverSelectorMediaType
diff --git a/ext/src/ui/popup/index.tsx b/ext/src/ui/popup/index.tsx
index a55c99c..c09c225 100755
--- a/ext/src/ui/popup/index.tsx
+++ b/ext/src/ui/popup/index.tsx
@@ -73,15 +73,15 @@ class PopupApp extends Component<{}, PopupAppState> {
 
         this.port.onMessage.addListener((message: Message) => {
             switch (message.subject) {
-                case "popup:/sendRequestedAppId": {
+                case "popup:/init": {
                     this.setState({
-                        requestedAppId: message.data?.requestedAppId
+                        requestedAppId: message.data?.appId
                     });
 
                     break;
                 }
 
-                case "popup:/populateReceiverList": {
+                case "popup:/update": {
                     const { receivers
                           , availableMediaTypes
                           , defaultMediaType } = message.data;