From c522343eb874bda4e577a34388e5d83ec5c7d134 Mon Sep 17 00:00:00 2001
From: hensm <m+github@matt.tf>
Date: Tue, 14 Jan 2020 05:02:59 +0000
Subject: [PATCH] Fix media casting handling unified receiver selector

---
 ext/src/_locales/en/messages.json             |  4 +++
 ext/src/background/background.ts              | 28 +++++++++----------
 .../ReceiverSelectorManager.ts                | 11 +++++---
 ext/src/lib/knownApps.ts                      |  4 ++-
 4 files changed, 28 insertions(+), 19 deletions(-)

diff --git a/ext/src/_locales/en/messages.json b/ext/src/_locales/en/messages.json
index 45292e7..842404e 100755
--- a/ext/src/_locales/en/messages.json
+++ b/ext/src/_locales/en/messages.json
@@ -13,6 +13,10 @@
         "message": "this site's app"
       , "description": "Receiver selector media type <option> text for current site's sender application."
     }
+  , "popupMediaTypeAppMedia": {
+        "message": "this media"
+      , "description": "Receiver selector media type <option> text for media casting."
+    }
   , "popupMediaTypeTab": {
         "message": "Tab"
       , "description": "Receiver selector media type <option> text for current tab."
diff --git a/ext/src/background/background.ts b/ext/src/background/background.ts
index 6453bce..11f7962 100755
--- a/ext/src/background/background.ts
+++ b/ext/src/background/background.ts
@@ -153,10 +153,23 @@ async function initMenus () {
         const availableMediaTypes = getMediaTypesForPageUrl(info.pageUrl);
 
         switch (info.menuItemId) {
-            case menuIdMediaCast: {
+            case menuIdCast: {
                 const selection = await ReceiverSelectorManager.getSelection(
                         tab.id, info.frameId);
 
+                loadSender({
+                    tabId: tab.id
+                  , frameId: info.frameId
+                  , selection
+                });
+
+                break;
+            }
+
+            case menuIdMediaCast: {
+                const selection = await ReceiverSelectorManager.getSelection(
+                        tab.id, info.frameId, true);
+
                 // Selection cancelled
                 if (!selection) {
                     break;
@@ -192,19 +205,6 @@ async function initMenus () {
 
                 break;
             }
-
-            case menuIdCast: {
-                const selection = await ReceiverSelectorManager.getSelection(
-                        tab.id, info.frameId);
-
-                loadSender({
-                    tabId: tab.id
-                  , frameId: info.frameId
-                  , selection
-                });
-
-                break;
-            }
         }
     });
 
diff --git a/ext/src/background/receiverSelector/ReceiverSelectorManager.ts b/ext/src/background/receiverSelector/ReceiverSelectorManager.ts
index 1efbb10..bafff06 100644
--- a/ext/src/background/receiverSelector/ReceiverSelectorManager.ts
+++ b/ext/src/background/receiverSelector/ReceiverSelectorManager.ts
@@ -7,6 +7,8 @@ import StatusManager from "../StatusManager";
 
 import { getMediaTypesForPageUrl } from "../../lib/utils";
 
+import { DEFAULT_MEDIA_RECEIVER_APP_ID } from "../../shim/cast/media/";
+
 import { ReceiverSelector
        , ReceiverSelectorType } from "./";
 import { ReceiverSelection
@@ -53,7 +55,8 @@ async function getSelector () {
  */
 async function getSelection (
         contextTabId: number
-      , contextFrameId = 0)
+      , contextFrameId = 0
+      , withMediaSender = false)
         : Promise<ReceiverSelection> {
 
     return new Promise(async (resolve, reject) => {
@@ -77,7 +80,7 @@ async function getSelection (
         }
 
         // Enable app media type if initialized sender app is found
-        if (currentShim) {
+        if (currentShim || withMediaSender) {
             defaultMediaType = ReceiverSelectorMediaType.App;
             availableMediaTypes |= ReceiverSelectorMediaType.App;
         }
@@ -96,7 +99,6 @@ async function getSelection (
             availableMediaTypes &= ~ReceiverSelectorMediaType.File;
         }
 
-
         // Close an existing open selector
         if (sharedSelector && sharedSelector.isOpen) {
             sharedSelector.close();
@@ -128,7 +130,8 @@ async function getSelection (
                 Array.from(StatusManager.getReceivers())
               , defaultMediaType
               , availableMediaTypes
-              , currentShim?.requestedAppId);
+              , currentShim?.requestedAppId
+                      ?? (withMediaSender && DEFAULT_MEDIA_RECEIVER_APP_ID));
     });
 }
 
diff --git a/ext/src/lib/knownApps.ts b/ext/src/lib/knownApps.ts
index 0b99af0..3ad43fb 100644
--- a/ext/src/lib/knownApps.ts
+++ b/ext/src/lib/knownApps.ts
@@ -1,5 +1,7 @@
 "use strict";
 
+const _ = browser.i18n.getMessage;
+
 /**
  * TODO: Just keep a list of IDs and cache names from the Google API:
  * https://clients3.google.com/cast/chromecast/device/app?a=[appId]
@@ -19,5 +21,5 @@ export default {
   , "CD7B9F59": "Global Player Live"
   , "B3DCF968": "Twitch"
   , "B88B034A": "Dailymotion"
-  , "CC1AD845": "TEST"
+  , "CC1AD845": _("popupMediaTypeAppMedia")
 } as Record<string, string>;