From f2b9a7aaaea38511dca2d0c377cb268f88c898c8 Mon Sep 17 00:00:00 2001
From: Jack Myers <jmyers@jackmyers.one>
Date: Wed, 5 Feb 2020 22:48:48 +0800
Subject: [PATCH 1/7] Fixed PreferencesWindow radio button tool tips

---
 Resources/PreferencesWindow.xib | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Resources/PreferencesWindow.xib b/Resources/PreferencesWindow.xib
index e3e34b63..eeec2705 100644
--- a/Resources/PreferencesWindow.xib
+++ b/Resources/PreferencesWindow.xib
@@ -2913,7 +2913,7 @@ After changing the folder, please close System Preferences for this to be taken
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" imageFrameStyle="groove" image="screen0" id="wB2-iW-iua"/>
                 </imageView>
-                <button toolTip="Bottom left corner" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EqM-n4-opf">
+                <button toolTip="Top left corner" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="EqM-n4-opf">
                     <rect key="frame" x="122" y="165" width="22" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="radio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="cUG-A6-9om">
@@ -2946,7 +2946,7 @@ After changing the folder, please close System Preferences for this to be taken
                         <action selector="changePosition:" target="ls3-ia-gMN" id="OZs-BQ-Owq"/>
                     </connections>
                 </button>
-                <button toolTip="Top left corner" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aRt-Pt-u4B">
+                <button toolTip="Centre" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="aRt-Pt-u4B">
                     <rect key="frame" x="193" y="130" width="22" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="radio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="apK-I5-qUa">
@@ -2968,7 +2968,7 @@ After changing the folder, please close System Preferences for this to be taken
                         <action selector="changePosition:" target="ls3-ia-gMN" id="JTt-5y-iiv"/>
                     </connections>
                 </button>
-                <button toolTip="Top left corner" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TYL-NO-mBq">
+                <button toolTip="Top middle edge" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TYL-NO-mBq">
                     <rect key="frame" x="193" y="165" width="22" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="radio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="3Pa-Qv-e2x">
@@ -2979,7 +2979,7 @@ After changing the folder, please close System Preferences for this to be taken
                         <action selector="changePosition:" target="ls3-ia-gMN" id="ghv-GE-4Tn"/>
                     </connections>
                 </button>
-                <button toolTip="Bottom left corner" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MG8-J5-mQV">
+                <button toolTip="Bottom middle edge" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="MG8-J5-mQV">
                     <rect key="frame" x="193" y="95" width="22" height="18"/>
                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                     <buttonCell key="cell" type="radio" bezelStyle="regularSquare" imagePosition="left" alignment="left" inset="2" id="7dh-x8-ZE3">
@@ -3167,4 +3167,4 @@ After changing the folder, please close System Preferences for this to be taken
         <image name="NSStopProgressTemplate" width="11" height="11"/>
         <image name="screen0" width="720" height="400"/>
     </resources>
-</document>
+</document>
\ No newline at end of file

From 18483d2bdabaa113a53ab040525e6932270d0441 Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:04:02 +0100
Subject: [PATCH 2/7] Update Readme.md

Cleaning up documentation a bit
---
 Readme.md | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Readme.md b/Readme.md
index 63909e7b..c6174dac 100644
--- a/Readme.md
+++ b/Readme.md
@@ -28,17 +28,15 @@ You can see a list of contributors [here](https://github.com/JohnCoates/Aerial/g
 
 ## Installation
 
-**Warning :** If you have upgraded to macOS Catalina, you will notice that there are some new restrictions applied to screensavers. You can check [this issue](https://github.com/JohnCoates/Aerial/issues/801) for more information about the current status of Aerial on macOS 10.15.  
+**Warning :** There are still a few issues with macOS Catalina because of new restrictions applied to screensavers. The main one is that auto-updates are broken for the forseeable future. You will need to download updates manually for the time being (or consider [homebrew](Documentation/Installation.md)). You can find all the currently known issues with Catalina [here](Documentation/Troubleshooting.md).
 
-Aerial now includes an auto-update mechanism using the [Sparkle open-source project](https://github.com/sparkle-project/Sparkle). **This mechanism is, for the time being, broken for macOS Catalina**. You will need to download it manually the first time (**and subsequent times in Catalina**) :
+Installation instructions :
 
 1. Quit **System Preferences**.
 2. [Download the latest release of `Aerial.saver.zip`](https://github.com/JohnCoates/Aerial/releases/latest). Alternatively, you can find the [latest beta here](https://github.com/JohnCoates/Aerial/releases). 
 3. Unzip the downloaded file (if you use Safari, it should already be done for you).
 4. Double-click `Aerial.saver`; it will open in `System Preferences` > `Desktop & Screen Saver` and ask you if you want to install for all users or for your user only. Be aware that installing for all users will require a password at install **and each subsequent update, including auto-updates.** By default, Aerial will still share its video cache if you install multiple times on the same system for each user.
 
-After installation, **if you are upgrading from a previous version**, we suggest you check your cache path settings as 1.6.0 includes some significant changes to prepare for macOS Catalina. 
-
 Need more information on install, setup, or uninstall ? Or want to install via homebrew ? Check our extended [instructions here](Documentation/Installation.md). Curious about auto-updates ? [Have a look here](Documentation/AutoUpdates.md).
 
 ## What's new in Aerial 1.7.0 (January 29, 2020)?

From 664902b5e0cb18bee22826e2e7c86a6344d7b870 Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:15:25 +0100
Subject: [PATCH 3/7] Update Troubleshooting.md

Add a recap of still current Catalina issues
---
 Documentation/Troubleshooting.md | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/Documentation/Troubleshooting.md b/Documentation/Troubleshooting.md
index 75451153..1b192d1e 100644
--- a/Documentation/Troubleshooting.md
+++ b/Documentation/Troubleshooting.md
@@ -1,5 +1,15 @@
 # Troubleshooting
 
+## macOS Catalina specific issues
+
+- The sandboxing restrictions make it impossible, as far as we understand, for a screensaver file to auto-update itself, as Aerial did in the past through Sparkle. Technically speaking, you will still be prompted to install new updates, and the updates will look like they install, except the installation will silently fail. You can in the meantime either :
+  - Update manually
+  - Consider using homebrew
+Another solution would be to have a separate updater app, which is something that will hopefully be provided soon. You can follow the progress on this in this issue : https://github.com/JohnCoates/Aerial/issues/909
+- Custom videos location : In Catalina, while it's possible to add videos that are stored in your user's Documents or Downloads folder, these files will not playback when Aerial is running as a screensaver. This is a sandboxing restriction, we recommend that you place your videos in a "less protected" folder such as `/Users/Shared/`.
+- Settings aren't saved : Some users (using MDM management software) seem to have run into an issue where macOS Catalina didn't create the folder where Aerial saves its preferences. You may need to create this folder manually : `~/Library/Containers/com.apple.ScreenSaver.Engine.legacyScreenSaver/Data/Library/Preferences/ByHost/`
+- Some current (or wanted/upcoming) features that require specific privileges are no longer working/impossible because of restrictions, this includes `Right arrow key to skip`.
+
 ## Very common issues/macOS bugs
 
 - "You cannot use the Aerial screen saver with this version of macOS." error: Select Aerial, close `System Preferences` with Aerial still selected, re-open System Preferences and Aerial should now work. This is a known bug with Swift screen savers in macOS/OS X reported (a long time ago...) to Apple as [rdar://25569037](http://www.openradar.me/25569037).

From 9d208e7770c8cb670701f081d7cb88d70a928793 Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:44:17 +0100
Subject: [PATCH 4/7] Update appcast.xml

---
 appcast.xml | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/appcast.xml b/appcast.xml
index 0d784bb5..2d94ea88 100644
--- a/appcast.xml
+++ b/appcast.xml
@@ -2,7 +2,24 @@
 <channel>
 <title>Aerial</title>
 
-  <item>
+<item>
+<title>1.7.1</title>
+  <description>
+          <![CDATA[
+<b>Automatic updates are broken for the time being in Catalina. If you try to auto-update, it will look like it install correctly but the update process will silently fail because of new sandboxing restrictions. You will need to update manually for the time being, my apologies.</b>
+
+<ul><li>Brings back "Allow right arrow to skip" for macOS versions prior to Catalina. That feature still won't work on Catalina.</li>
+<li>Add seamless looping if you only have one video in your playlist.</li>
+<li>Fix "new style" settings that weren't saved immediately, causing a discrepancy if you didn't close the preferences panel before launching the screen saver (with a hot corner).</li></ul>
+          ]]>
+  </description>
+<pubDate>mar., 11 jan. 2020 16:00:00 +0100</pubDate>
+<sparkle:minimumSystemVersion>10.9</sparkle:minimumSystemVersion>
+<enclosure url="https://github.com/glouel/Aerial/releases/download/v1.7.1/Aerial.saver.zip" sparkle:version="1.7.1" 
+sparkle:edSignature="PEHtV0rb00reYVBETDHAj3MgE2ZxeCJA8xwnVAjWtjlmMkVmvgMCNouCYZwamqZ3Kmv26kZLwbl7UkjpeSAdDA==" length="5968662" type="application/octet-stream"/>
+</item>    
+  
+<item>
 <title>1.7.0</title>
   <description>
           <![CDATA[

From 0b8db38e56d1fbfe7a8347d7d6e615c68ed2d71b Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:44:41 +0100
Subject: [PATCH 5/7] Update beta-appcast.xml

---
 beta-appcast.xml | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/beta-appcast.xml b/beta-appcast.xml
index 90af803a..7ef67bf7 100644
--- a/beta-appcast.xml
+++ b/beta-appcast.xml
@@ -1,7 +1,22 @@
 <?xml version="1.0" standalone="yes"?><rss xmlns:sparkle="http://www.andymatuschak.org/xml-namespaces/sparkle" version="2.0">
 <channel>
 <title>Aerial</title>
+<item>
+<title>1.7.1</title>
+  <description>
+          <![CDATA[
+<b>Automatic updates are broken for the time being in Catalina. If you try to auto-update, it will look like it install correctly but the update process will silently fail because of new sandboxing restrictions. You will need to update manually for the time being, my apologies.</b>
 
+<ul><li>Brings back "Allow right arrow to skip" for macOS versions prior to Catalina. That feature still won't work on Catalina.</li>
+<li>Add seamless looping if you only have one video in your playlist.</li>
+<li>Fix "new style" settings that weren't saved immediately, causing a discrepancy if you didn't close the preferences panel before launching the screen saver (with a hot corner).</li></ul>
+          ]]>
+  </description>
+<pubDate>mar., 11 jan. 2020 16:00:00 +0100</pubDate>
+<sparkle:minimumSystemVersion>10.9</sparkle:minimumSystemVersion>
+<enclosure url="https://github.com/glouel/Aerial/releases/download/v1.7.1/Aerial.saver.zip" sparkle:version="1.7.1" 
+sparkle:edSignature="PEHtV0rb00reYVBETDHAj3MgE2ZxeCJA8xwnVAjWtjlmMkVmvgMCNouCYZwamqZ3Kmv26kZLwbl7UkjpeSAdDA==" length="5968662" type="application/octet-stream"/>
+</item>  
 <item>
 <title>1.7.1beta1</title>
   <description>

From ba29833873f8033673e743094ace2d3aa9e098e4 Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:50:44 +0100
Subject: [PATCH 6/7] Update ChangeLog.md

---
 Documentation/ChangeLog.md | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/Documentation/ChangeLog.md b/Documentation/ChangeLog.md
index d8181d5d..72e4987d 100644
--- a/Documentation/ChangeLog.md
+++ b/Documentation/ChangeLog.md
@@ -1,5 +1,23 @@
 #  Aerial change log
 
+## 1.7.1 - February 11, 2020
+
+- Brings back "Allow right arrow to skip" for macOS versions prior to Catalina. That feature still won't work on Catalina.
+- Add seamless looping if you only have one video in your playlist.
+- Fix "new style" settings that weren't saved immediately, causing a discrepancy if you didn't close the preferences panel before launching the screen saver (with a hot corner).
+
+## 1.7.0 - January 29, 2020
+
+- Add support for the 11 new sea videos that were just released, including dolphins, sharks and Tahiti waves.
+
+![Capture d’écran 2020-01-29 à 20 52 20](https://user-images.githubusercontent.com/37544189/73392796-ca25cc80-42da-11ea-913a-c4dc1f310710.jpg)
+
+- Complete rewrite of the text/animation system, you can now select which information appears on which display, and configure more precisely the position of items on screen, or the font used. 
+
+![Capture d’écran 2020-01-29 à 21 00 08](https://user-images.githubusercontent.com/37544189/73392613-731ff780-42da-11ea-8421-8149f24be6e1.jpg)
+
+This version also fixes many issues with macOS Catalina.
+
 ## [1.6.0](https://github.com/JohnCoates/Aerial/releases/tag/v1.6.0) - September 26, 2019
 
 - Support for the 15 new videos included in tvOS 13, including the ten new underwater seascape videos and five new ISS space videos. 

From 16e3777c12f150056f3fbe732e966eb7dc599c32 Mon Sep 17 00:00:00 2001
From: Guillaume Louel <37544189+glouel@users.noreply.github.com>
Date: Tue, 11 Feb 2020 15:52:06 +0100
Subject: [PATCH 7/7] Update ChangeLog.md

---
 Documentation/ChangeLog.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/ChangeLog.md b/Documentation/ChangeLog.md
index 72e4987d..70d4ebc3 100644
--- a/Documentation/ChangeLog.md
+++ b/Documentation/ChangeLog.md
@@ -1,12 +1,12 @@
 #  Aerial change log
 
-## 1.7.1 - February 11, 2020
+## [1.7.1](https://github.com/JohnCoates/Aerial/releases/tag/v1.7.1) - February 11, 2020
 
 - Brings back "Allow right arrow to skip" for macOS versions prior to Catalina. That feature still won't work on Catalina.
 - Add seamless looping if you only have one video in your playlist.
 - Fix "new style" settings that weren't saved immediately, causing a discrepancy if you didn't close the preferences panel before launching the screen saver (with a hot corner).
 
-## 1.7.0 - January 29, 2020
+## [1.7.0](https://github.com/JohnCoates/Aerial/releases/tag/v1.7.0) - January 29, 2020
 
 - Add support for the 11 new sea videos that were just released, including dolphins, sharks and Tahiti waves.