From 5779a543c9dc09a96625dca96656f71c9fb59340 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=A0imon=20Brandner?= <simon.bra.ag@gmail.com>
Date: Sat, 26 Dec 2020 18:10:50 +0100
Subject: [PATCH] Type cleanup
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Šimon Brandner <simon.bra.ag@gmail.com>
---
 src/@types/global.d.ts                        |  9 ++++++++
 src/CallHandler.tsx                           |  8 +------
 .../elements/DesktopCapturerSourcePicker.tsx  | 23 +++++++------------
 3 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/@types/global.d.ts b/src/@types/global.d.ts
index 741798761f..72b9ee56fb 100644
--- a/src/@types/global.d.ts
+++ b/src/@types/global.d.ts
@@ -66,6 +66,15 @@ declare global {
         mxModalWidgetStore: ModalWidgetStore;
     }
 
+    export interface DesktopCapturerSource {
+        id: string;
+        name: string;
+        thumbnail;
+        // This property is not camelcase and isn't used, therefore it is commented
+        //display_id: string;
+        appIcon;
+    }
+
     interface Document {
         // https://developer.mozilla.org/en-US/docs/Web/API/Document/hasStorageAccess
         hasStorageAccess?: () => Promise<boolean>;
diff --git a/src/CallHandler.tsx b/src/CallHandler.tsx
index 3958420329..a8f121dfb9 100644
--- a/src/CallHandler.tsx
+++ b/src/CallHandler.tsx
@@ -84,12 +84,6 @@ import { CallError } from "matrix-js-sdk/src/webrtc/call";
 import { logger } from 'matrix-js-sdk/src/logger';
 import DesktopCapturerSourcePicker from "./components/views/elements/DesktopCapturerSourcePicker"
 
-export interface ElectronDesktopCapturerSource {
-    display_id: string;
-    id: string;
-    name: string;
-}
-
 enum AudioID {
     Ring = 'ringAudio',
     Ringback = 'ringbackAudio',
@@ -485,7 +479,7 @@ export default class CallHandler {
             call.placeScreenSharingCall(
                 remoteElement,
                 localElement,
-                async (sources: Array<ElectronDesktopCapturerSource>) : Promise<ElectronDesktopCapturerSource> => {
+                async (sources: Array<DesktopCapturerSource>) : Promise<DesktopCapturerSource> => {
                     const {finished} = Modal.createDialog(DesktopCapturerSourcePicker, {sources});
                     const [source] = await finished;
                     return source;
diff --git a/src/components/views/elements/DesktopCapturerSourcePicker.tsx b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
index b9e5037dee..a134df6d68 100644
--- a/src/components/views/elements/DesktopCapturerSourcePicker.tsx
+++ b/src/components/views/elements/DesktopCapturerSourcePicker.tsx
@@ -24,19 +24,13 @@ export enum Tabs {
     Screens = "screens",
     Windows = "windows",
 }
-export interface ElectronDesktopCapturerSource {
-    display_id: string;
-    id: string;
-    name: string;
-    thumbnail,
-    appIcon,
-}
+
 export interface DesktopCapturerSourceIProps {
-    source: ElectronDesktopCapturerSource,
-    onSelect(source: ElectronDesktopCapturerSource): void,
+    source: DesktopCapturerSource,
+    onSelect(source: DesktopCapturerSource): void,
 }
 
-export class DesktopCapturerSource extends React.Component<DesktopCapturerSourceIProps> {
+export class ExistingSource extends React.Component<DesktopCapturerSourceIProps> {
     constructor(props) {
         super(props);
     }
@@ -63,13 +57,12 @@ export class DesktopCapturerSource extends React.Component<DesktopCapturerSource
     }
 }
 
-
 export interface DesktopCapturerSourcePickerIState {
     selectedTab: Tabs;
 }
 export interface DesktopCapturerSourcePickerIProps {
-    sources: Array<ElectronDesktopCapturerSource>;
-    onFinished(source: ElectronDesktopCapturerSource): void,
+    sources: Array<DesktopCapturerSource>;
+    onFinished(source: DesktopCapturerSource): void,
 }
 
 // TODO: Figure out a way to update sources for live preview
@@ -110,7 +103,7 @@ export default class DesktopCapturerSourcePicker extends React.Component<
                     return source.id.startsWith("screen");
                 })
                 .map((source) => {
-                    return <DesktopCapturerSource source={source} onSelect={this.onSelect} key={source.id} />;
+                    return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
                 });
         } else {
             sources = this.props.sources
@@ -118,7 +111,7 @@ export default class DesktopCapturerSourcePicker extends React.Component<
                     return source.id.startsWith("window");
                 })
                 .map((source) => {
-                    return <DesktopCapturerSource source={source} onSelect={this.onSelect} key={source.id} />;
+                    return <ExistingSource source={source} onSelect={this.onSelect} key={source.id} />;
                 });
         }
         const buttonStyle = "mx_streamSelectorDialog_tabLabel";