From 46745d030baa7ab1bbc069503ff51530b6c3729d Mon Sep 17 00:00:00 2001 From: Armin Schrenk Date: Wed, 31 Aug 2022 18:12:59 +0200 Subject: [PATCH 01/29] [ci skip] fix winget release action --- .github/workflows/win-exe.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/win-exe.yml b/.github/workflows/win-exe.yml index 48e9e61ff..91d967bf7 100644 --- a/.github/workflows/win-exe.yml +++ b/.github/workflows/win-exe.yml @@ -204,7 +204,7 @@ jobs: run: | iwr https://aka.ms/wingetcreate/latest -OutFile wingetcreate.exe $github = Get-Content '${{ github.event_path }}' | ConvertFrom-Json - $installerUrl = $github.release.assets | Where-Object -Property name -match 'Cryptomator-*.msi' | Select -ExpandProperty browser_download_url -First 1 + $installerUrl = $github.release.assets | Where-Object -Property name -match '^Cryptomator-.*\.msi' | Select -ExpandProperty browser_download_url -First 1 .\wingetcreate.exe update Cryptomator.Cryptomator -s -v $github.release.tag_name -u $installerUrl -t ${{ secrets.CRYPTOBOT_WINGET_TOKEN }} shell: pwsh From 797dbc0a5733912306c61f555a777eeeafb19784 Mon Sep 17 00:00:00 2001 From: KAMAL AZZOUZI Date: Wed, 7 Sep 2022 00:52:40 +0100 Subject: [PATCH 02/29] Update README.md Update Windows profile name --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index bfc5db571..8e0a16990 100644 --- a/README.md +++ b/README.md @@ -86,7 +86,7 @@ For more information on the security details visit [cryptomator.org](https://doc ``` mvn clean install -# or mvn clean install -Pwindows +# or mvn clean install -Pwin # or mvn clean install -Pmac # or mvn clean install -Plinux ``` From 31d32f201883d0c4f88784f6ab0cf44a9cd4c1e5 Mon Sep 17 00:00:00 2001 From: Tobias Hagemann Date: Sat, 10 Sep 2022 08:30:18 +0200 Subject: [PATCH 03/29] Added macOS ARM64 workflow (#2432) --- .github/workflows/mac-dmg.yml | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/.github/workflows/mac-dmg.yml b/.github/workflows/mac-dmg.yml index 1ba5822e3..0d175fbf9 100644 --- a/.github/workflows/mac-dmg.yml +++ b/.github/workflows/mac-dmg.yml @@ -14,17 +14,28 @@ env: jobs: build: - name: Build Cryptomator.app - runs-on: macos-11 + name: Build Cryptomator.app for ${{ matrix.output-suffix }} + runs-on: ${{ matrix.os }} + strategy: + fail-fast: true + matrix: + include: + - os: macos-11 + architecture: x64 + output-suffix: x64 + - os: [self-hosted, macOS, ARM64] + architecture: aarch64 + output-suffix: arm64 steps: - uses: actions/checkout@v2 with: fetch-depth: 0 - name: Setup Java - uses: actions/setup-java@v2 + uses: actions/setup-java@v3 with: distribution: 'temurin' java-version: ${{ env.JAVA_VERSION }} + architecture: ${{ matrix.architecture }} cache: 'maven' - id: versions name: Apply version information @@ -186,7 +197,7 @@ jobs: --icon ".background" 128 758 --icon ".fseventsd" 320 758 --icon ".VolumeIcon.icns" 512 758 - Cryptomator-${VERSION_NO}.dmg dmg + Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg env: VERSION_NO: ${{ steps.versions.outputs.semVerNum }} - name: Notarize .dmg @@ -198,7 +209,7 @@ jobs: password: ${{ secrets.MACOS_NOTARIZATION_PW }} team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }} - name: Add possible alpha/beta tags to installer name - run: mv Cryptomator-*.dmg Cryptomator-${{ steps.versions.outputs.semVerStr }}.dmg + run: mv Cryptomator-*.dmg Cryptomator-${{ steps.versions.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg - name: Create detached GPG signature with key 615D449FE6E6A235 run: | echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import @@ -213,7 +224,7 @@ jobs: - name: Upload artifacts uses: actions/upload-artifact@v3 with: - name: dmg + name: dmg-${{ matrix.output-suffix }} path: Cryptomator-*.dmg if-no-files-found: error - name: Publish dmg on GitHub Releases @@ -225,5 +236,3 @@ jobs: files: | Cryptomator-*.dmg Cryptomator-*.asc - - From 0021f2d37cf3b5f96350e684a2025e80d9d88944 Mon Sep 17 00:00:00 2001 From: Edward Chow Date: Fri, 16 Sep 2022 01:38:42 +1000 Subject: [PATCH 04/29] Use 2x icon on Mac menu bar (#2345) (#2346) * Use 2x icon on Mac menu bar Use 2x icon on Mac menu bar * Fix #2357 Changed Windows tray icon to 2x --- .../java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java b/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java index ea8599b51..ea7358770 100644 --- a/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java +++ b/src/main/java/org/cryptomator/ui/traymenu/TrayMenuBuilder.java @@ -31,8 +31,8 @@ import java.util.ResourceBundle; public class TrayMenuBuilder { private static final Logger LOG = LoggerFactory.getLogger(TrayMenuBuilder.class); - private static final String TRAY_ICON_MAC = "/img/tray_icon_mac.png"; - private static final String TRAY_ICON = "/img/tray_icon.png"; + private static final String TRAY_ICON_MAC = "/img/tray_icon_mac@2x.png"; + private static final String TRAY_ICON = "/img/window_icon_32.png"; private final ResourceBundle resourceBundle; private final VaultService vaultService; From 4c96c285bfb3ce619fe7e2df58c6449bfd71fff5 Mon Sep 17 00:00:00 2001 From: Carrima Hewitt Date: Mon, 19 Sep 2022 21:17:48 -0400 Subject: [PATCH 05/29] Fixed Next button for Invalid Vault Name --- .idea/misc.xml | 2 +- .../CreateNewVaultNameController.java | 16 ++++++++++------ src/main/resources/fxml/addvault_new_name.fxml | 2 +- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 4731638fd..82dbec8ad 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -8,7 +8,7 @@ - + \ No newline at end of file diff --git a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java index 3068874ec..3776c14af 100644 --- a/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java +++ b/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultNameController.java @@ -40,7 +40,7 @@ public class CreateNewVaultNameController implements FxController { this.chooseLocationScene = chooseLocationScene; this.vaultPath = vaultPath; this.vaultName = vaultName; - this.validVaultName = Bindings.createBooleanBinding(this::isValidVaultNameInternal, vaultName); + this.validVaultName = Bindings.createBooleanBinding(this::isValidVaultName, vaultName); } @FXML @@ -49,10 +49,6 @@ public class CreateNewVaultNameController implements FxController { vaultName.addListener(this::vaultNameChanged); } - private boolean isValidVaultNameInternal() { - return vaultName.get() != null && VALID_NAME_PATTERN.matcher(vaultName.get().trim()).matches(); - } - private void vaultNameChanged(@SuppressWarnings("unused") Observable observable) { if (isValidVaultName()) { if (vaultPath.get() != null) { @@ -79,7 +75,15 @@ public class CreateNewVaultNameController implements FxController { } public boolean isValidVaultName() { - return validVaultName.get(); + return vaultName.get() != null && VALID_NAME_PATTERN.matcher(vaultName.get().trim()).matches(); + //return validVaultName.get(); } + /* + * Issue with next button: + * In the "addvault_new_location.fxml" class's method "buttonMinWidth," the next button was referring to an inValidVaultPath function which does not exist... + * I changed it to "!controller.validVaultName" and that worked + * + * Other "issue" I noticed is that closing the application window does not stop the program. Unsure if this is a major issue. + * */ } diff --git a/src/main/resources/fxml/addvault_new_name.fxml b/src/main/resources/fxml/addvault_new_name.fxml index e7494e116..185f80ed4 100644 --- a/src/main/resources/fxml/addvault_new_name.fxml +++ b/src/main/resources/fxml/addvault_new_name.fxml @@ -71,7 +71,7 @@ + + +