From 373ffe466352e4da50240c271b7c7ac40ad527b5 Mon Sep 17 00:00:00 2001
From: Josh Perez <60019601+josh-signal@users.noreply.github.com>
Date: Tue, 1 Jun 2021 15:47:55 -0400
Subject: [PATCH] Screen sharing improvements

---
 _locales/en/messages.json                            | 12 ++++--------
 package.json                                         |  2 +-
 .../NeedsScreenRecordingPermissionsModal.tsx         |  1 -
 ts/state/ducks/calling.ts                            |  4 ++++
 yarn.lock                                            |  6 +++---
 5 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/_locales/en/messages.json b/_locales/en/messages.json
index 8989eb29e..ed686a4d6 100644
--- a/_locales/en/messages.json
+++ b/_locales/en/messages.json
@@ -1464,23 +1464,19 @@
     "description": "Shown as the title for the modal that requests screen recording permissions"
   },
   "calling__presenting--macos-permission-description": {
-    "message": "On an Apple Mac computer using macOS Catalina version 10.15 or later, Signal needs permission to access your computer's screen recording.",
+    "message": "Signal needs permission to access your computer's screen recording.",
     "description": "Shown as the description for the modal that requests screen recording permissions"
   },
   "calling__presenting--permission-instruction-step1": {
-    "message": "Go to System Preferences and then click Security & Privacy.",
+    "message": "Go to System Preferences.",
     "description": "Shown as the description for the modal that requests screen recording permissions"
   },
   "calling__presenting--permission-instruction-step2": {
-    "message": "Click Privacy.",
+    "message": "Click on the lock icon on the bottom left and enter your computer’s password.",
     "description": "Shown as the description for the modal that requests screen recording permissions"
   },
   "calling__presenting--permission-instruction-step3": {
-    "message": "On the left, click Screen Recording.",
-    "description": "Shown as the description for the modal that requests screen recording permissions"
-  },
-  "calling__presenting--permission-instruction-step4": {
-    "message": "On the right, check the Signal box.",
+    "message": "On the right, check the box next to Signal. If you don’t see Signal in the list, click the + to add it.",
     "description": "Shown as the description for the modal that requests screen recording permissions"
   },
   "calling__presenting--permission-open": {
diff --git a/package.json b/package.json
index 61edc4cbd..2b25dca0d 100644
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
     "redux-ts-utils": "3.2.2",
     "reselect": "4.0.0",
     "rimraf": "2.6.2",
-    "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#17b22fc9d47605867608193202c54be06bce6f56",
+    "ringrtc": "https://github.com/signalapp/signal-ringrtc-node.git#d44ffdaa1edfdbdcdd2e002a278ed595fe4fa853",
     "rotating-file-stream": "2.1.5",
     "sanitize-filename": "1.6.3",
     "sanitize.css": "11.0.0",
diff --git a/ts/components/NeedsScreenRecordingPermissionsModal.tsx b/ts/components/NeedsScreenRecordingPermissionsModal.tsx
index 6cb827b74..a3c1c1da4 100644
--- a/ts/components/NeedsScreenRecordingPermissionsModal.tsx
+++ b/ts/components/NeedsScreenRecordingPermissionsModal.tsx
@@ -35,7 +35,6 @@ export const NeedsScreenRecordingPermissionsModal = ({
         <li>{i18n('calling__presenting--permission-instruction-step1')}</li>
         <li>{i18n('calling__presenting--permission-instruction-step2')}</li>
         <li>{i18n('calling__presenting--permission-instruction-step3')}</li>
-        <li>{i18n('calling__presenting--permission-instruction-step4')}</li>
       </ol>
       <Modal.ButtonFooter>
         <Button
diff --git a/ts/state/ducks/calling.ts b/ts/state/ducks/calling.ts
index c91127a4f..922047649 100644
--- a/ts/state/ducks/calling.ts
+++ b/ts/state/ducks/calling.ts
@@ -631,6 +631,10 @@ function groupCallStateChange(
     if (didSomeoneStartPresenting) {
       callingTones.someonePresenting();
     }
+
+    if (payload.connectionState === GroupCallConnectionState.NotConnected) {
+      ipcRenderer.send('close-screen-share-controller');
+    }
   };
 }
 
diff --git a/yarn.lock b/yarn.lock
index be35ace0f..b17fbba24 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -15728,9 +15728,9 @@ rimraf@^3.0.2, rimraf@~3.0.2:
   dependencies:
     glob "^7.1.3"
 
-"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#17b22fc9d47605867608193202c54be06bce6f56":
-  version "2.10.1"
-  resolved "https://github.com/signalapp/signal-ringrtc-node.git#17b22fc9d47605867608193202c54be06bce6f56"
+"ringrtc@https://github.com/signalapp/signal-ringrtc-node.git#d44ffdaa1edfdbdcdd2e002a278ed595fe4fa853":
+  version "2.10.3"
+  resolved "https://github.com/signalapp/signal-ringrtc-node.git#d44ffdaa1edfdbdcdd2e002a278ed595fe4fa853"
 
 ripemd160@^2.0.0, ripemd160@^2.0.1:
   version "2.0.1"