Rename selectReceiver-messages

This commit is contained in:
hensm
2021-04-24 03:42:44 +01:00
committed by Matt Hensman
parent fce59e9e16
commit e349ce5db7
3 changed files with 14 additions and 14 deletions

View File

@@ -158,7 +158,7 @@ export default new class ShimManager {
break; break;
} }
case "main:/selectReceiverBegin": { case "main:selectReceiver": {
if (shim.contentTabId === undefined if (shim.contentTabId === undefined
|| shim.contentFrameId === undefined) { || shim.contentFrameId === undefined) {
throw logger.error("Shim associated with content sender missing tab/frame ID"); throw logger.error("Shim associated with content sender missing tab/frame ID");
@@ -174,7 +174,7 @@ export default new class ShimManager {
// Handle cancellation // Handle cancellation
if (!selection) { if (!selection) {
shim.contentPort.postMessage({ shim.contentPort.postMessage({
subject: "shim:/selectReceiverCancelled" subject: "shim:selectReceiver/cancelled"
}); });
break; break;
@@ -191,7 +191,7 @@ export default new class ShimManager {
ReceiverSelectorMediaType.App) { ReceiverSelectorMediaType.App) {
shim.contentPort.postMessage({ shim.contentPort.postMessage({
subject: "shim:/selectReceiverCancelled" subject: "shim:selectReceiver/cancelled"
}); });
loadSender({ loadSender({
@@ -204,7 +204,7 @@ export default new class ShimManager {
} }
shim.contentPort.postMessage({ shim.contentPort.postMessage({
subject: "shim:/selectReceiverEnd" subject: "shim:selectReceiver/selected"
, data: selection , data: selection
}); });
@@ -213,7 +213,7 @@ export default new class ShimManager {
case ReceiverSelectionActionType.Stop: { case ReceiverSelectionActionType.Stop: {
shim.contentPort.postMessage({ shim.contentPort.postMessage({
subject: "shim:/selectReceiverStop" subject: "shim:selectReceiver/stopped"
, data: selection , data: selection
}); });
@@ -223,7 +223,7 @@ export default new class ShimManager {
} catch (err) { } catch (err) {
// TODO: Report errors properly // TODO: Report errors properly
shim.contentPort.postMessage({ shim.contentPort.postMessage({
subject: "shim:/selectReceiverCancelled" subject: "shim:selectReceiver/cancelled"
}); });
} }

View File

@@ -27,10 +27,10 @@ type MessagesBase = {
, "main:/shimReady": { appId: string } , "main:/shimReady": { appId: string }
, "main:/selectReceiverBegin": {} , "main:selectReceiver": {}
, "shim:/selectReceiverEnd": ReceiverSelectionCast , "shim:selectReceiver/selected": ReceiverSelectionCast
, "shim:/selectReceiverStop": ReceiverSelectionStop , "shim:selectReceiver/stopped": ReceiverSelectionStop
, "shim:/selectReceiverCancelled": {} , "shim:selectReceiver/cancelled": {}
, "main:/sessionCreated": {} , "main:/sessionCreated": {}

View File

@@ -172,7 +172,7 @@ export function requestSession (
// Open destination chooser // Open destination chooser
sendMessageResponse({ sendMessageResponse({
subject: "main:/selectReceiverBegin" subject: "main:selectReceiver"
}); });
} }
@@ -323,7 +323,7 @@ onMessage(async message => {
break; break;
} }
case "shim:/selectReceiverEnd": { case "shim:selectReceiver/selected": {
logger.info("Selected receiver"); logger.info("Selected receiver");
if (!sessionRequestInProgress) { if (!sessionRequestInProgress) {
@@ -377,7 +377,7 @@ onMessage(async message => {
break; break;
} }
case "shim:/selectReceiverStop": { case "shim:selectReceiver/stopped": {
logger.info("Stopped receiver"); logger.info("Stopped receiver");
if (sessionRequestInProgress) { if (sessionRequestInProgress) {
@@ -400,7 +400,7 @@ onMessage(async message => {
/** /**
* Popup closed before session established. * Popup closed before session established.
*/ */
case "shim:/selectReceiverCancelled": { case "shim:selectReceiver/cancelled": {
if (sessionRequestInProgress) { if (sessionRequestInProgress) {
sessionRequestInProgress = false; sessionRequestInProgress = false;