Compare commits

..
5488 Commits
Author SHA1 Message Date
Armin Schrenk ad240eb18b Merge branch 'develop' into release/1.19.0
# Conflicts:
#	pom.xml
2025-12-30 12:40:06 +01:00
Armin Schrenk 8105dbc236 Closes #4058 2025-12-30 12:31:45 +01:00
Armin Schrenk ceed70c314 [skip ci] update changelog 2025-12-29 16:59:01 +01:00
Armin SchrenkandGitHub eddf586b81 Merge pull request #4078 from cryptomator/feature/files-in-use
Feature: Files in use
2025-12-29 16:00:36 +01:00
Armin Schrenk 0d7ddd3189 [skip ci] Update changelog 2025-12-29 15:55:49 +01:00
Armin Schrenk 491cd5e550 install/remove the encrypted mime type on install/uninstall 2025-12-29 15:22:26 +01:00
Armin Schrenk 93d95ecd93 make message more clear
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-21 12:42:11 +01:00
Armin Schrenk 05a41a625c reset selection index everytime window is shown
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-21 12:32:35 +01:00
Armin Schrenk 2aff02a186 cleanup
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-21 12:27:07 +01:00
Armin Schrenk 4b7de11750 dedup css
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-21 12:26:08 +01:00
Armin Schrenk aaf921afcf Adjust notification dialog
* add scrollbar to description content
* move filename to own visual element
* move vaultName above message

Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-21 11:40:02 +01:00
Armin Schrenk 7718445f7c rename method
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-21 11:00:01 +01:00
Armin Schrenk 0fa27f66c9 Use proper icon for in-use event 2025-12-19 13:54:47 +01:00
Armin Schrenk 111c5ae2de correctly convert URI path to system path 2025-12-19 13:25:42 +01:00
Armin Schrenk 8841bb1c6a add c9u as file extension 2025-12-18 17:55:43 +01:00
Armin Schrenk 8ca7e34d8f minor fixes 2025-12-18 16:47:45 +01:00
Armin Schrenk 0fa6f0d915 only close notification window on index error 2025-12-18 16:20:58 +01:00
Armin Schrenk 4ffd8f4467 add localization for file-is-in-use-event in event view 2025-12-18 16:19:42 +01:00
Armin Schrenk bb0c1b54c1 Add log message to get used mount service 2025-12-18 15:39:56 +01:00
Armin Schrenk 8eb91f6471 Change design of files-in-use-notification
* add timestamp of event occurance
* move filename into message section
* remove translations
2025-12-18 13:28:04 +01:00
Armin Schrenk eb20fd7278 add device name to filesystemowner and display device name in notification 2025-12-17 16:55:42 +01:00
Armin Schrenk d836798361 only one instance of notification window 2025-12-17 16:27:10 +01:00
Armin Schrenk 0cd6eb8b5e use Path api to concat (string) paths for events
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-16 12:52:35 +01:00
Armin Schrenk 0b2107309b guard the notification window from theoretical thread races
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-16 12:33:25 +01:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
309881b339 Bump the github-actions group across 1 directory with 8 updates (#4073)
Bumps the github-actions group with 8 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [actions/checkout](https://github.com/actions/checkout) | `5.0.0` | `6.0.1` |
| [actions/setup-java](https://github.com/actions/setup-java) | `5.0.0` | `5.1.0` |
| [actions/upload-artifact](https://github.com/actions/upload-artifact) | `4.6.2` | `5.0.0` |
| [softprops/action-gh-release](https://github.com/softprops/action-gh-release) | `2.4.1` | `2.5.0` |
| [actions/download-artifact](https://github.com/actions/download-artifact) | `5.0.0` | `6.0.0` |
| [fjogeleit/http-request-action](https://github.com/fjogeleit/http-request-action) | `1.16.5` | `1.16.6` |
| [actions/stale](https://github.com/actions/stale) | `10.1.0` | `10.1.1` |
| [skymatic/workflows](https://github.com/skymatic/workflows) | `450e322ff2214d0be0b079b63343c894f3ef735f` | `1074588008ae3326a2221ea451783280518f0366` |



Updates `actions/checkout` from 5.0.0 to 6.0.1
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/08c6903cd8c0fde910a37f88322edcfb5dd907a8...8e8c483db84b4bee98b60c0593521ed34d9990e8)

Updates `actions/setup-java` from 5.0.0 to 5.1.0
- [Release notes](https://github.com/actions/setup-java/releases)
- [Commits](https://github.com/actions/setup-java/compare/dded0888837ed1f317902acf8a20df0ad188d165...f2beeb24e141e01a676f977032f5a29d81c9e27e)

Updates `actions/upload-artifact` from 4.6.2 to 5.0.0
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/ea165f8d65b6e75b540449e92b4886f43607fa02...330a01c490aca151604b8cf639adc76d48f6c5d4)

Updates `softprops/action-gh-release` from 2.4.1 to 2.5.0
- [Release notes](https://github.com/softprops/action-gh-release/releases)
- [Changelog](https://github.com/softprops/action-gh-release/blob/master/CHANGELOG.md)
- [Commits](https://github.com/softprops/action-gh-release/compare/6da8fa9354ddfdc4aeace5fc48d7f679b5214090...a06a81a03ee405af7f2048a818ed3f03bbf83c7b)

Updates `actions/download-artifact` from 5.0.0 to 6.0.0
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/634f93cb2916e3fdff6788551b99b062d0335ce0...018cc2cf5baa6db3ef3c5f8a56943fffe632ef53)

Updates `fjogeleit/http-request-action` from 1.16.5 to 1.16.6
- [Release notes](https://github.com/fjogeleit/http-request-action/releases)
- [Commits](https://github.com/fjogeleit/http-request-action/compare/1297c6fc63a79b147d1676540a3fd9d2e37817c5...c0b95d02a088b47c1f2f4db04fd8af8bd19eee54)

Updates `actions/stale` from 10.1.0 to 10.1.1
- [Release notes](https://github.com/actions/stale/releases)
- [Changelog](https://github.com/actions/stale/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/stale/compare/5f858e3efba33a5ca4407a664cc011ad407f2008...997185467fa4f803885201cee163a9f38240193d)

Updates `skymatic/workflows` from 450e322ff2214d0be0b079b63343c894f3ef735f to 1074588008ae3326a2221ea451783280518f0366
- [Release notes](https://github.com/skymatic/workflows/releases)
- [Commits](https://github.com/skymatic/workflows/compare/450e322ff2214d0be0b079b63343c894f3ef735f...1074588008ae3326a2221ea451783280518f0366)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-version: 6.0.1
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: actions/setup-java
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/upload-artifact
  dependency-version: 5.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: softprops/action-gh-release
  dependency-version: 2.5.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: github-actions
- dependency-name: actions/download-artifact
  dependency-version: 6.0.0
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: github-actions
- dependency-name: fjogeleit/http-request-action
  dependency-version: 1.16.6
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: actions/stale
  dependency-version: 10.1.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: github-actions
- dependency-name: skymatic/workflows
  dependency-version: 1074588008ae3326a2221ea451783280518f0366
  dependency-type: direct:production
  dependency-group: github-actions
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-12-16 09:54:39 +01:00
Armin Schrenk 532cdf30ac Fix typos 2025-12-12 17:41:29 +01:00
Armin Schrenk d746e9e215 add translation to event 2025-12-12 16:55:15 +01:00
Armin Schrenk 408c80744a Show notification for fileIsInUseEvent 2025-12-12 13:29:46 +01:00
Armin SchrenkandGitHub bf890d2165 Merge pull request #4069 from cryptomator/feature/notify-fallback
Feature: Notification Window with JavaFX
2025-12-12 12:42:37 +01:00
Armin Schrenk eb90a7fb33 Merge branch 'feature/files-in-use' into feature/notify-fallback
# Conflicts:
#	src/main/java/org/cryptomator/common/EventMap.java
#	src/main/java/org/cryptomator/common/vaults/Vault.java
2025-12-12 12:31:08 +01:00
Armin Schrenk a47814f38c cleanup 2025-12-12 12:26:46 +01:00
Armin Schrenk 8b157fd935 add dark theme 2025-12-12 12:25:47 +01:00
Armin Schrenk 5e582f666c add accessibleText 2025-12-12 11:37:42 +01:00
Armin Schrenk bebe3064ee hide paging if there is only one event 2025-12-12 11:21:39 +01:00
Armin Schrenk bbf8e1d1e5 Ensure that keyloader is not reused between vaults 2025-12-11 14:35:23 +01:00
Armin Schrenk 98d2442deb For hub vaults set filesystem owner 2025-12-11 14:34:45 +01:00
Armin Schrenk cac5c86dab Merge branch 'develop' into feature/files-in-use
# Conflicts:
#	pom.xml
2025-12-10 13:04:34 +01:00
Armin Schrenk 5a0145800d Redesign notifcation dialog
* add Cryptomator title
* include vault name in message
* remove bottom section and move button to current message area
2025-12-10 13:01:07 +01:00
Armin Schrenk f4b56e5e51 rename variable 2025-12-10 12:34:33 +01:00
Armin Schrenk 7cfb63ed48 cleanup in NotificationController 2025-12-10 12:34:09 +01:00
Armin Schrenk 2521cd2bfb cleanup
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-09 18:13:04 +01:00
Armin Schrenk 1e861ac187 fix av-whitelist workflow 2025-12-09 09:34:25 +01:00
Tobias HagemannandGitHub a4c85be61c Add accessible text to form controls and table columns (#4066) 2025-12-06 07:41:39 +01:00
Armin Schrenk 5b9e70da33 implement code suggestions
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 17:32:24 +01:00
Armin Schrenk b83a3c27c6 [skip ci] remove unused import
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 16:52:04 +01:00
Armin Schrenk 5c2954de03 guard controller from NPE
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 16:43:39 +01:00
Armin Schrenk 8a834fe71c fix window placement
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 16:38:37 +01:00
Armin Schrenk 4ff2905723 regularly poll for notification updates
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 16:37:31 +01:00
Armin Schrenk 538e01b1e5 consider location of system bar when placing notification window
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 15:54:05 +01:00
Armin Schrenk 3135be9178 fix logic in notificationManager
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 12:14:07 +01:00
Armin Schrenk 2c456f5323 fix more issues
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 11:58:16 +01:00
Armin Schrenk 9d464e3a4f fix threading issue in notification manager
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 11:53:43 +01:00
Armin Schrenk 83199eb1de use VaultEvent for notification to also show affected vault
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 11:35:54 +01:00
Armin Schrenk 5772ffec17 activate notifications by consuming vault events
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 11:27:01 +01:00
Armin Schrenk f3415277d7 cleanup
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 11:23:52 +01:00
Armin Schrenk 8e9a001fde clean up
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 10:50:48 +01:00
Armin Schrenk 5e229395f1 remove test code
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-05 10:50:32 +01:00
Armin Schrenk 18dd9770f2 add second fake event
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-04 17:03:47 +01:00
Armin Schrenk 185c5a4f5d implement more ui logic
and reduce css

Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-04 17:03:36 +01:00
Armin Schrenk 285ddac219 ai thoughts
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-04 16:20:49 +01:00
Armin Schrenk 9e631a78f2 Pimp notification dialog
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-12-04 15:35:05 +01:00
Tobias HagemannandGitHub 7fe9049266 Improve accessibility for icon-only controls and input labels (#4064) 2025-12-01 22:06:57 +01:00
Tobias HagemannandGitHub 39ab9ad63f Merge pull request #4055 from tamaracha/fix_a11y_buttons
Fix a11y for no-graphics buttons in main window
2025-12-01 16:13:10 +01:00
Armin Schrenk b4528f825e [skip ci] drop interface approach and just add fx window 2025-11-29 18:03:55 +01:00
Armin Schrenk 3d679c73e7 [skip ci] impl draft
Signed-off-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-11-28 14:31:04 +01:00
Sebastian Stenzel 04bdb2d8c4 fix mocked update check 2025-11-24 20:58:57 +01:00
Sebastian Stenzel f32d24c1c0 Merge branch 'develop' into release/1.19.0 2025-11-24 20:58:25 +01:00
Sebastian Stenzel f4f093bb42 update GitHub Releases Template
[ci skip]
2025-11-24 19:57:24 +01:00
Sebastian Stenzel 3f06460667 bump version 2025-11-24 14:50:19 +01:00
Sebastian Stenzel 617f1bf2c9 CHANGELOG.md: added
[ci skip]
2025-11-24 14:49:12 +01:00
Sebastian StenzelandGitHub 02ad38f871 Merge pull request #3948 from purejava/feature/app-update
Implement new update API
2025-11-24 14:41:55 +01:00
Sebastian Stenzel 7a2944cbea bump integrations version 2025-11-24 14:39:17 +01:00
Sebastian Stenzel 4c47204f92 Merge branch 'develop' into feature/app-update 2025-11-24 14:34:44 +01:00
Tamara Cook b6d0823c24 Add accessible text and tooltips to no-graphics buttons in main window 2025-11-23 22:24:31 +01:00
Tamara Cook 7f4776a995 Make buttons clickable by any input device 2025-11-23 19:26:55 +01:00
Armin Schrenk 9d2b31cd56 Merge branch 'develop' into feature/files-in-use 2025-11-21 10:15:24 +01:00
Tobias HagemannandGitHub f052395a7f Add section on use of Generative AI 2025-11-17 15:03:08 +01:00
Sebastian Stenzel 57be83b38d update license-merges 2025-11-12 11:56:09 +01:00
Sebastian Stenzel c2cd4f5bbf update compiler.xml
[ci skip]
2025-11-12 11:55:59 +01:00
Sebastian Stenzel d3d57312ba Merge branch 'develop' into feature/app-update
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/check-jdk-updates.yml
#	.github/workflows/debian.yml
#	.github/workflows/mac-dmg-x64.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
2025-11-12 11:50:21 +01:00
593a64c9bd Bump JDK to version 25 (#4031)
* first draft for JDK 25 migration (including comments)

* fix unresolvable version in setup-java action

* switch to official `openjdk-25-jdk` ubuntu package

see https://packages.ubuntu.com/search?suite=jammy&arch=any&searchon=names&keywords=openjdk-25

* update jacoco to support JDK 25

* use jdk 25.0.1 for building the app

# Conflicts:
#	.github/workflows/win-exe.yml

* Use correct SHA256 value for openjfx linux arm64

* zulu version is different to temurin :rolling_eyes:

* fix check-jdk-updates

---------

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-11-12 10:50:37 +01:00
sunnyraindyandGitHub 19dc4fb6ff chore: fix typo in comment (#4036)
Signed-off-by: sunnyraindy <sunnyraindy@outlook.com>
2025-11-12 10:49:14 +01:00
Armin Schrenk 81f45012f3 [skip ci] Merge branch 'main' into develop 2025-11-12 10:45:38 +01:00
Armin Schrenk c59554f7bb Merge branch 'release/1.18.0' 2025-11-12 10:43:22 +01:00
Armin Schrenk 11c66e8df7 Use correct SHA256 value for openjfx linux arm64 2025-11-11 16:23:33 +01:00
Armin Schrenk c49bf0f146 finalize 1.18.0 2025-11-11 16:08:00 +01:00
Armin Schrenk e74bd91879 Merge branch 'develop' into release/1.18.0 2025-11-11 15:58:03 +01:00
CryptobotandGitHub 89d9249a08 New Crowdin updates (#4016)
New translations strings.properties

Afrikaans; Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Marathi; Norwegian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Urdu (Pakistan); Uyghur; Vietnamese; 

[ci skip]
2025-11-11 15:57:18 +01:00
Armin SchrenkandGitHub 013fff1223 Feature: Sign files with Azure trusted signing (#4038) 2025-11-11 14:24:20 +01:00
Armin Schrenk fd9d27215e adjust wording 2025-11-11 13:20:02 +01:00
Sebastian Stenzel f91cc2374c fix syntax error (really!) 2025-11-08 10:48:29 +01:00
Sebastian Stenzel 48298bb161 fix syntax error 2025-11-08 10:37:10 +01:00
Sebastian Stenzel 7a1cd9026c use dmg update mechanism 2025-11-08 10:24:11 +01:00
Sebastian Stenzel 754e53d8db cleanup 2025-11-08 10:18:40 +01:00
Sebastian Stenzel c36f1bc8d0 moved update mechanism classes to integrations-* 2025-11-07 13:59:10 +01:00
Sebastian Stenzel 7315b59a6d simplify + allow IDE to find used i18n strings 2025-11-06 15:36:08 +01:00
Sebastian Stenzel 8a243a01aa cleanup + error handling 2025-11-06 15:35:12 +01:00
Sebastian Stenzel 9e4006cc89 improved error handling 2025-11-06 10:47:15 +01:00
Sebastian Stenzel 26b69beb87 prevent updates while having unlocked vaults 2025-11-06 10:08:49 +01:00
Sebastian Stenzel f95bf87a4b reordered getters
[ci skip]
2025-11-06 07:41:30 +01:00
Sebastian Stenzel e854c7d189 detect failed update attempt via new setting 2025-11-05 22:26:45 +01:00
Sebastian Stenzel 8a434dcd96 more robust settings, exposed saveNow() 2025-11-05 22:23:34 +01:00
Sebastian Stenzel 6b7324723e apply more suggestions from code review 2025-11-04 22:07:05 +01:00
Sebastian Stenzel 0bdcb2b3be adjust to type-safe api 2025-11-04 21:42:24 +01:00
Sebastian Stenzel c3931d9d29 apply review suggestions 2025-11-04 21:42:14 +01:00
Sebastian Stenzel 307825a339 fix param order 2025-11-04 11:43:08 +01:00
Sebastian Stenzel 093f0e8c94 cleanup updater 2025-11-04 11:12:43 +01:00
Sebastian Stenzel c938c42c00 unified "check for update" and "do update" button 2025-11-02 15:40:32 +01:00
Armin Schrenk cee22e34db adjust display text 2025-10-31 14:18:07 +01:00
Jerry PanandGitHub 884c6f6bdd Fix : Shortcut doesn’t close SimpleDialogs (#4026) 2025-10-31 13:40:19 +01:00
Tobias Hagemann c5367db971 Fix Hub vault URL to preserve path component 2025-10-29 15:22:24 +01:00
Armin Schrenk 18300ee67f [skip ci] adjust to changed API 2025-10-21 15:36:51 +02:00
Sebastian Stenzel 59560193ee adjust to new multi-step update API 2025-10-21 11:32:45 +02:00
Sebastian Stenzel a6b31e19b9 Merge branch 'feature/jdk25' into feature/app-update
# Conflicts:
#	.idea/compiler.xml
#	pom.xml
2025-10-17 17:03:43 +02:00
Sebastian Stenzel 8a44115234 update jacoco to support JDK 25 2025-10-17 15:25:18 +02:00
Sebastian Stenzel 43a1f00bea switch to official openjdk-25-jdk ubuntu package
see https://packages.ubuntu.com/search?suite=jammy&arch=any&searchon=names&keywords=openjdk-25
2025-10-17 12:47:13 +02:00
Sebastian Stenzel 3e458060bc Merge branch 'develop' into feature/jdk25
# Conflicts:
#	.github/workflows/debian.yml
#	.github/workflows/dependency-check.yml
#	.github/workflows/win-exe.yml
#	.idea/misc.xml
#	dist/linux/debian/control
2025-10-17 12:27:28 +02:00
Sebastian Stenzel 4bb5a3f10d fix unresolvable version in setup-java action 2025-10-17 12:12:44 +02:00
Armin Schrenk 8bb451261e Merge branch 'develop' into release/1.18.0 2025-10-16 16:43:01 +02:00
Armin SchrenkandGitHub de4c7d47e5 Merge pull request #3821 from cryptomator/feature/restore-vaultconfig
Feature: Vault Recovery Enhancements
2025-10-16 16:36:58 +02:00
Jan-Peter Klein b4fe63c966 Merge branch 'feature/restore-vaultconfig' of https://github.com/cryptomator/cryptomator into feature/restore-vaultconfig 2025-10-16 15:38:16 +02:00
Jan-Peter Klein ed45182b6c add IllegalStateException to the catch clause 2025-10-16 15:37:47 +02:00
Armin SchrenkandGitHub afd2d74c90 Merge branch 'develop' into feature/restore-vaultconfig 2025-10-16 15:25:27 +02:00
Jan-Peter Klein 4bcf01270a fix owner 2025-10-16 15:12:22 +02:00
Armin Schrenk 5797108dfe Merge branch 'develop' into feature/files-in-use 2025-10-16 12:33:14 +02:00
Armin Schrenk 64466df6b8 [skip ci] revert powershell build early stop (was intended for testing purpose only) 2025-10-16 10:40:35 +02:00
Armin Schrenk db9bd49dd9 add jdk modules jdk.crypto.ec and jdk.crypto.cryptoki requrired by nimbus-jose-jwt dependency
references e50c949b62
2025-10-16 10:38:01 +02:00
CryptobotandGitHub 4ed4a3e3e5 New Crowdin updates (#4009)
New translations strings.properties

Arabic; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Czech; Danish; Dutch; Filipino; Finnish; French; German; Greek; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Slovak; Slovenian; Spanish; Swedish; Thai; Turkish; Ukrainian; Uyghur; Vietnamese; 

[ci skip]
2025-10-16 10:19:44 +02:00
Armin Schrenk e1ff552f08 [skip ci] pick a distinguishable name for fs owner 2025-10-15 17:27:12 +02:00
Armin Schrenk f3d4494d91 [skip ci] Adjust event view to new API 2025-10-15 17:21:20 +02:00
Armin Schrenk bdc1cc3f05 Merge branch 'develop' into feature/files-in-use
# Conflicts:
#	pom.xml
2025-10-15 17:20:37 +02:00
Armin SchrenkandGitHub ad73b2f31d Merge pull request #4015 from cryptomator/feature/pin-gh-actions-version
Feature: Pin CI actions version
2025-10-15 16:07:09 +02:00
Jan-Peter Klein 227b322b8a revert cleanup that introduced a bug 2025-10-15 15:55:29 +02:00
Armin Schrenk ccf2e60390 add version info in a comment 2025-10-15 14:55:39 +02:00
Jan-Peter Klein 1104c1067a wording changes 2025-10-15 14:06:00 +02:00
Armin Schrenk 83d2c39080 also pin official github actions 2025-10-15 12:48:49 +02:00
Armin Schrenk 446caff901 Pin exact version of external ci actions 2025-10-15 12:31:38 +02:00
Jan-Peter Klein 90537caee7 change wording 2025-10-15 07:34:17 +02:00
Jan-Peter Klein 25dea8ebe6 infeo suggested wordings 2025-10-14 14:51:12 +02:00
Jan-Peter Klein 4a7d2907c8 use ellipsis 2025-10-14 14:28:53 +02:00
Jan-Peter Klein 7f3af0c7f6 add defaults to switches to solve sonar cloud issues 2025-10-14 13:41:15 +02:00
dependabot[bot]andGitHub e6e04078fa Bump the java-production-dependencies group across 1 directory with 5 updates (#4007) 2025-10-14 11:16:41 +00:00
Armin SchrenkandGitHub e3f6b5f812 Feature: JFX 25 (#4013)
Closes #3902. References https://github.com/cryptomator/cryptomator/issues/3453 and references https://github.com/cryptomator/cryptomator/pull/3825
2025-10-14 13:15:49 +02:00
Armin Schrenk f3461f7da4 fix failing CI 2025-10-14 13:06:52 +02:00
Jan-Peter Klein 94518ede99 set the messageLabel directly 2025-10-14 10:04:14 +02:00
Jan-Peter Klein 0fa041da85 remove the unconditional constructor title 2025-10-14 08:15:37 +02:00
Jan-Peter Klein daa4f3a568 recheck directory structure after restoring backup 2025-10-14 08:02:17 +02:00
Jan-Peter Klein fc6f7d184c skip unsafe states and check config file before reload 2025-10-14 07:42:24 +02:00
Armin Schrenk e50c949b62 Bump com.nimbusds:nimbus-jose-jwt from version 9.37.3 to version 10.5
Addresses shaded vulnerability in CVE-2025-53864 (OSSINDEX)
2025-10-13 11:50:54 +02:00
Armin SchrenkandGitHub 349349e057 Add share option in context menu (#4008) 2025-10-10 11:04:37 +02:00
Armin Schrenk 4b36a1219f [skip ci] bump dependency-check-workflow to version 3 2025-10-08 14:11:57 +02:00
Armin Schrenk 6533ba7367 use more env context in CI 2025-10-08 10:36:29 +02:00
7f9c9a7df6 Reinstate original macOS icon shape in macOS 26 Tahoe (#3990)
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2025-10-08 09:57:10 +02:00
Armin Schrenk afda8a4981 only create AUR PR if it is a stable release 2025-09-26 15:39:05 +02:00
Armin Schrenk 153f9b485c prepare 1.18.0 2025-09-26 13:38:53 +02:00
Armin Schrenk b9e91115b4 fix windows installer build 2025-09-26 13:38:02 +02:00
Armin Schrenk cdcd43a805 first draft for JDK 25 migration (including comments) 2025-09-25 12:28:12 +02:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2d29b1a76f Bump the java-production-dependencies group across 1 directory with 5 updates (#3988)
Closes #3883, closes #3932, closes #3982

Bumps the java-production-dependencies group with 5 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [org.cryptomator:fuse-nio-adapter](https://github.com/cryptomator/fuse-nio-adapter) | `5.0.5` | `5.1.0` |
| [org.cryptomator:integrations-api](https://github.com/cryptomator/integrations-api) | `1.6.0` | `1.7.0` |
| [org.cryptomator:integrations-mac](https://github.com/cryptomator/integrations-mac) | `1.4.0` | `1.4.1` |
| [org.cryptomator:integrations-linux](https://github.com/cryptomator/integrations-linux) | `1.6.0` | `1.6.1` |
| [org.cryptomator:integrations-win](https://github.com/cryptomator/integrations-win) | `1.5.0` | `1.5.1` |



Updates `org.cryptomator:fuse-nio-adapter` from 5.0.5 to 5.1.0
- [Release notes](https://github.com/cryptomator/fuse-nio-adapter/releases)
- [Changelog](https://github.com/cryptomator/fuse-nio-adapter/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/fuse-nio-adapter/compare/5.0.5...5.1.0)

Updates `org.cryptomator:integrations-api` from 1.6.0 to 1.7.0
- [Release notes](https://github.com/cryptomator/integrations-api/releases)
- [Changelog](https://github.com/cryptomator/integrations-api/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-api/compare/1.6.0...1.7.0)

Updates `org.cryptomator:integrations-mac` from 1.4.0 to 1.4.1
- [Release notes](https://github.com/cryptomator/integrations-mac/releases)
- [Changelog](https://github.com/cryptomator/integrations-mac/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-mac/compare/1.4.0...1.4.1)

Updates `org.cryptomator:integrations-linux` from 1.6.0 to 1.6.1
- [Release notes](https://github.com/cryptomator/integrations-linux/releases)
- [Changelog](https://github.com/cryptomator/integrations-linux/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-linux/compare/1.6.0...1.6.1)

Updates `org.cryptomator:integrations-win` from 1.5.0 to 1.5.1
- [Release notes](https://github.com/cryptomator/integrations-win/releases)
- [Changelog](https://github.com/cryptomator/integrations-win/blob/develop/CHANGELOG.md)
- [Commits](https://github.com/cryptomator/integrations-win/compare/1.5.0...1.5.1)

---
updated-dependencies:
- dependency-name: org.cryptomator:fuse-nio-adapter
  dependency-version: 5.1.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-api
  dependency-version: 1.7.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-mac
  dependency-version: 1.4.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-linux
  dependency-version: 1.6.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-win
  dependency-version: 1.5.1
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-09-22 15:47:26 +02:00
CryptobotandGitHub f62a5ed74b New Crowdin updates (#3931)
New translations strings.properties

Chinese Traditional; Danish; French; Greek; Korean; Polish; Swedish; Ukrainian; Vietnamese; 

[ci skip]
2025-09-22 15:23:45 +02:00
dependabot[bot]andGitHub 7fe7e1f5bf Bump org.mockito:mockito-core in the java-test-dependencies group (#3985) 2025-09-22 13:20:37 +00:00
dependabot[bot]andGitHub a4d9703cf4 Bump the maven-build-plugins group with 3 updates (#3984) 2025-09-22 13:12:52 +00:00
dependabot[bot]andGitHub c9a3a775cc Bump the java-production-dependencies group across 1 directory with 9 updates (#3978) 2025-09-16 15:08:10 +00:00
dependabot[bot]andGitHub e7cac42d5d Bump the maven-build-plugins group across 1 directory with 2 updates (#3977) 2025-09-16 14:27:31 +00:00
dependabot[bot]andGitHub 983e7d973b Bump the github-actions group across 1 directory with 6 updates (#3970) 2025-09-16 14:19:24 +00:00
dependabot[bot]andGitHub a84ac94701 Bump the java-test-dependencies group across 1 directory with 3 updates (#3956) 2025-09-16 14:18:18 +00:00
Dhruv BajpaiandGitHub 4761c58265 specify JVM crash log path (#3951)
Add jvm option `-XX:+ErrorFile=...` with a clear, but with high possibility not-existing path to use fallback path.
2025-09-16 14:19:59 +02:00
pxwangluandGitHub 682e762a5a chore: fix some typos in comments (#3960)
Signed-off-by: pxwanglu <pxwanglu@icloud.com>
2025-09-08 18:43:50 +02:00
Armin SchrenkandGitHub c3ada43abb Feature: Refactoring for Windows installer build (#3968)
* decouple patchUpdateCheck script from app name
* simplify patchWebdav script and align it with patchUpdate
2025-09-05 13:17:35 +02:00
9a71782fff Add Windows MSI installer option to disable update checks via DISABLEUPDATECHECK property (#3961)
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-09-04 14:39:20 +02:00
Jan-Peter Klein 2f4c12a89e remove no more used injections 2025-09-04 08:45:04 +02:00
Jan-Peter Klein 2b79c58577 renaming and reordering 2025-09-04 08:44:18 +02:00
Jan-Peter Klein 1d3c62e2c7 revert cleanup that introduced a bug 2025-09-03 14:58:25 +02:00
Jan-Peter Klein 17166c45ac show correct message 2025-09-03 14:42:20 +02:00
Jan-Peter Klein f758388063 fix closeOrReturn button 2025-09-03 14:28:16 +02:00
Jan-Peter Klein 8767564977 revert cleanup that introduced a bug 2025-09-03 13:39:08 +02:00
Jan-Peter Klein 59f47116f0 change wording 2025-09-03 12:42:24 +02:00
Armin Schrenk f5bd23de51 test impl 2025-09-02 09:58:52 +02:00
Jan-Peter Klein 8fac541024 use defaults.vault.vaultName as fallback displayName 2025-09-02 07:40:02 +02:00
Jan-Peter Klein 1ba21b531a declare NoSuchElementException in method head 2025-09-02 07:27:02 +02:00
Jan-Peter Klein daad48d5af clarify NoSuchElementException log message 2025-09-01 09:33:03 +02:00
Jan-Peter Klein 8eedc62fbe Check vault path before preparing new vault in recovery flow and refactor chooseValidVaultDirectory() to return Path instead of File 2025-09-01 09:14:21 +02:00
Jan-Peter Klein d65442f042 add explicit VAULT_CONFIG_MISSING case and move legacy comment from LOCKED to NEEDS_MIGRATION 2025-09-01 08:21:28 +02:00
Jan-Peter Klein 216513405a removed unused strings 2025-08-27 10:35:11 +02:00
Jan-Peter Klein f4c0bc29ed handle NoSuchElementException during recovery key validation 2025-08-27 09:43:28 +02:00
Jan-Peter Klein d1ce0362b4 extract vault directory selection into new method chooseValidVaultDirectory using Optional 2025-08-27 09:34:04 +02:00
Jan-Peter Klein 4497fb160e new class VaultPreparator in recovery package 2025-08-27 09:22:26 +02:00
Jan-Peter Klein 5bffa28cdb remove unused method 2025-08-27 08:52:51 +02:00
Jan-Peter Klein 14c5693594 check dir structure first in determineVaultState 2025-08-27 08:37:04 +02:00
Jan-Peter Klein 53c6045cca extend initializeLastKnownKeyLoaderIfPossible and deduplicate in create 2025-08-27 07:26:37 +02:00
Jan-Peter Klein 16d441ec44 cleanup 2025-08-21 12:26:16 +02:00
Jan-Peter Klein fa053ac3df undo no longer needed changes 2025-08-20 10:00:08 +02:00
Jan-Peter Klein e78a064af6 dialogs with icons and some other ui improvements 2025-08-13 11:40:10 +02:00
Sebastian Stenzel d5245009f4 Merge branch 'feature/self-update-poc' into feature/app-update
# Conflicts:
#	src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java
#	src/main/resources/fxml/preferences_updates.fxml
2025-08-09 09:26:38 +02:00
Sebastian Stenzel 8f4392711e moved update API to integrations-api 2025-08-08 18:21:42 +02:00
Jan-Peter Klein 644e38f49e Merge branch 'develop' into feature/restore-vaultconfig 2025-08-06 13:53:04 +02:00
Jan-Peter Klein 3b38049d71 remove Objects.requireNonNull 2025-08-06 08:18:32 +02:00
Ralph Plawetzki 79bb4a5215 Correlate with API as suggested in a separate PoC: UpdateMechanism and UpdateProcess 2025-08-02 11:32:07 +02:00
Jan-Peter Klein c199d1cb3b remove optional 2025-08-01 12:51:27 +02:00
Jan-Peter Klein 164a4de6de fix filter 2025-08-01 09:52:03 +02:00
Ralph Plawetzki 2ce7fee06d Log error messages 2025-07-30 19:43:39 +02:00
Ralph Plawetzki 99e9e92f10 Fix progress bar due to JavaFX limitations 2025-07-30 19:21:34 +02:00
Ralph Plawetzki 8e6500d93f Implement update button that updates and respawns the app 2025-07-30 19:21:34 +02:00
Ralph Plawetzki 89ce99deaf Wire UpdateService 2025-07-30 19:21:34 +02:00
Ralph Plawetzki 510e134605 Have multiple services 2025-07-30 19:21:34 +02:00
Ralph Plawetzki 62b434f549 Invent UpdatesModule 2025-07-30 19:21:33 +02:00
Ralph Plawetzki 1f1e336d57 Start FlatpakUpdater 2025-07-30 19:21:33 +02:00
Armin Schrenk f64455d8fb dedup code
references  #3943
2025-07-29 13:02:01 +02:00
Armin SchrenkandGitHub 8b1d2101db Feature: Switch to different windows signer (#3943)
Replace usage of signtool with Actalis code signer.
2025-07-28 15:13:15 +02:00
Armin Schrenk 22a37699ea Fixes commit 44f92cfb26. 2025-07-22 13:04:33 +02:00
Armin Schrenk 44f92cfb26 replace null parameter 2025-07-17 12:37:57 +02:00
Armin Schrenk 27c10080d6 fixes #3925
Stop listening for ipc messages when to many failed requests in a row
2025-07-14 12:20:49 +02:00
Jan-Peter Klein 2067c5a33b optimize exception handling
exclude only dir.c9r
2025-07-10 18:45:58 +02:00
Jan-Peter Klein fc5ed9ecc0 remove unused property 2025-07-10 17:26:45 +02:00
Jan-Peter Klein 5e956c50c2 handle unexpected recovery action type 2025-07-10 11:54:00 +02:00
Jan-Peter Klein 5110b35690 hard coded UI strings replaced
showThirdText property binding
2025-07-10 10:15:11 +02:00
Jan-Peter Klein 499960b3ec replace while with do-while and use Constants.DATA_DIR_NAME 2025-07-10 09:42:00 +02:00
Jan-Peter Klein f6479ddf24 optimize dialogs 2025-07-10 08:30:46 +02:00
Jan-Peter Klein 5d8b016e5f refactoring 2025-07-10 08:29:51 +02:00
Jan-Peter Klein 2bf2f2b616 exclude dirid.c9r 2025-07-09 19:27:51 +02:00
Jan-Peter Klein 1089e90ebf remove unused imports 2025-07-09 18:39:28 +02:00
Jan-Peter Klein 9fee4afd2a remove duplicate unicode value 2025-07-09 18:37:38 +02:00
Armin SchrenkandGitHub 7ad9b10138 Feature: Windows debug launcher (#2666)
Add additonal launcher to windows release to debug javafx problems.
2025-07-08 17:43:08 +02:00
Armin Schrenk fb6e4f0c15 [skip ci] Merge branch 'main' into develop 2025-07-08 14:08:37 +02:00
Armin Schrenk 6c5f3cb72c Merge branch 'release/1.17.1' 2025-07-08 14:06:54 +02:00
Armin Schrenk 581b16e354 finalize 1.17.1 2025-07-08 13:42:43 +02:00
Armin Schrenk d74248ff63 prepare 1.17.1 2025-07-08 13:41:04 +02:00
CryptobotandGitHub 698ac639e9 New Crowdin updates (#3913)
New translations strings.properties

Arabic; Portuguese;

[ci skip]
2025-07-08 13:40:09 +02:00
Armin Schrenk 5a086f52b5 Revert "exclude early access javafx versions in dependency updates"
This reverts commit 54b7f3c842.
2025-07-08 13:35:43 +02:00
Armin Schrenk 54b7f3c842 exclude early access javafx versions in dependency updates 2025-07-07 16:13:17 +02:00
mindmonkandGitHub 94b9813c50 Merge pull request #3918 from cryptomator/feature/fix-password-tab-on-migrated-legacy-vaults
Fix: Show Change Password tab after vault migration by improving KeyLoader scheme handling
2025-07-07 15:15:06 +02:00
Jan-Peter Klein b00ee4740a legacy vaults supported now 2025-07-07 14:58:19 +02:00
Jan-Peter Klein 78cffe2f60 fix password tab on migrated legacy vaults 2025-07-07 11:32:19 +02:00
Jan-Peter Klein 9d15a7664d fix docs links 2025-07-07 11:14:19 +02:00
Sebastian Stenzel 02186ca17a hooked up in UI 2025-07-06 20:02:41 +02:00
Sebastian Stenzel b0ed133e05 PoC 2025-07-06 14:28:57 +02:00
Jan-Peter Klein f5ecf846f2 resolve SonarCloud issue by safely accessing Optional value 2025-07-05 14:15:59 +02:00
Jan-Peter Klein a9444182bb clean up 2025-07-04 22:17:27 +02:00
Jan-Peter Klein 191d9473c0 small enhancements 2025-07-04 19:17:24 +02:00
Jan-Peter Klein 8089bcd0d0 cleanup 2025-07-04 17:16:32 +02:00
MateoandGitHub 5d8457cbdd Feature: Default to previously used vault directory when creating a vault (#3903) 2025-07-04 11:08:22 +02:00
Jan-Peter Klein f623b1ee7e better naming, void instead of unused boolean and LOGs 2025-07-03 15:48:21 +02:00
Armin Schrenk c546f3363b reduce object creation and conversion 2025-07-03 12:08:41 +02:00
Jan-Peter Klein 8a1ec1d073 read file header instead of allBytes to determine Scheme 2025-07-02 11:29:01 +02:00
Jan-Peter Klein 81307b6d75 remove PosixFilePermissions 2025-07-02 11:26:05 +02:00
Jan-Peter Klein 50fa8e0608 tmpDir renamed to cryptomator 2025-07-01 10:44:11 +02:00
Jan-Peter Klein 626a692d63 optimized LOGs 2025-07-01 10:43:10 +02:00
Jan-Peter Klein c9b9eee564 remove unused methods 2025-07-01 10:42:36 +02:00
Jan-Peter Klein edc308ccd1 recover button now in VaultListController 2025-06-30 17:36:30 +02:00
Jan-Peter Klein ad214691f9 fix sonar cloud quality gate fail 2025-06-30 14:04:13 +02:00
Jan-Peter Klein acf11da202 cleanup
removed MASTERKEY_MISSING
new recoveryActionType RESTORE_ALL
2025-06-30 09:26:30 +02:00
Armin Schrenk 94eb1e365b replace token for PR creation 2025-06-26 15:40:06 +02:00
Armin SchrenkandGitHub 414ccad8fb Feature: Automate AUR release (#3910)
Extend/add workflows to automatically create PRs for aur and aur-bin repos for a release.
2025-06-26 15:35:59 +02:00
Armin Schrenk e57e5358c4 Add workflow to automatically create AUR PR on release 2025-06-25 16:15:46 +02:00
Armin Schrenk e24719ed19 [skip ci] Merge branch 'main' into develop 2025-06-24 16:28:03 +02:00
Armin Schrenk e21525ce2e Merge branch 'release/1.17.0' 2025-06-24 16:26:28 +02:00
Armin Schrenk 9a14cfc674 finalize 1.17.0 2025-06-24 16:11:44 +02:00
Armin Schrenk 9af9362a7b Merge branch 'develop' into release/1.17.0 2025-06-24 16:07:29 +02:00
Armin Schrenk 4d4a93746d disable confusing message of kwallet library 2025-06-23 16:34:31 +02:00
Jan-Peter Klein 4280112eab remove Optional and improve prepareVault() 2025-06-23 13:19:35 +02:00
Jan-Peter Klein 638e1e562d Merge branch 'develop' into feature/restore-vaultconfig 2025-06-23 10:17:43 +02:00
Jan-Peter Klein 321bd2ff8c deduplicate generic.button.close by define a constant 2025-06-23 10:00:38 +02:00
Jan-Peter Klein 323a884718 fix sonar cloud security hotspot 2025-06-23 09:47:07 +02:00
Jan-Peter Klein 5bdfffd151 directoryChooser cancelable 2025-06-23 09:20:25 +02:00
CryptobotandGitHub cb6b77318d New translations strings.properties (Finnish) (#3897)
[ci skip]
2025-06-17 15:09:57 +02:00
Jan-Peter Klein 6fcec26eea removed additional redetermineVaultState 2025-06-17 14:39:10 +02:00
dependabot[bot]andGitHub feb9fb689e Bump the java-production-dependencies group with 2 updates (#3901) 2025-06-17 11:58:45 +00:00
Armin Schrenk 0178ca4080 fix wrong keychain migration 2025-06-16 18:06:04 +02:00
Jan-Peter Klein 4ddb6b73bd optimised structure and new function initializeLastKnownKeyLoaderIfPossible 2025-06-16 15:22:27 +02:00
Jan-Peter Klein da845c6941 combined into a single if 2025-06-16 14:38:37 +02:00
Jan-Peter Klein c30a28aae0 Files.createTempDirectory instead of Files.createDirectory 2025-06-16 14:37:17 +02:00
Jan-Peter Klein 5305c5a631 optimised imports 2025-06-16 14:28:18 +02:00
Jan-Peter Klein b0d2dcbff3 use constants 2025-06-16 14:18:54 +02:00
Jan-Peter Klein 5c1364792e unwrap ObjectProperty<RecoveryAction> 2025-06-16 14:03:59 +02:00
Jan-Peter Klein abf8392baa use !Files.exists instead of Files.notExists 2025-06-16 13:49:59 +02:00
Jan-Peter Klein 034a70d473 throw illegalArgumentException directly 2025-06-16 13:40:57 +02:00
Armin Schrenk 79f2863f24 suppress warning message caused by javafx (see JDK-8345121) 2025-06-16 11:23:25 +02:00
Tobias HagemannandGitHub f1ef506e2b Fix missing characters after Unicode in RTF files (#3898) 2025-06-16 10:36:19 +02:00
Jan-Peter Klein 8c9d75fe57 filter excluded filenames 2025-06-12 14:46:15 +02:00
Jan-Peter Klein d00d77b747 optimised imports and some pr mentioned changes 2025-06-11 13:49:12 +02:00
Armin Schrenk fbeeaa4c93 prepare 1.17.0 2025-06-11 12:38:38 +02:00
dependabot[bot]andGitHub 00f5d433da Bump wlixcc/SFTP-Deploy-Action in the github-actions group (#3840) 2025-06-11 10:32:58 +00:00
dependabot[bot]andGitHub 115a4216ee Bump org.owasp:dependency-check-maven in the maven-build-plugins group (#3896) 2025-06-11 10:31:11 +00:00
dependabot[bot]andGitHub 403d469dff Bump the java-production-dependencies group across 1 directory with 5 updates (#3891) 2025-06-11 10:30:44 +00:00
CryptobotandGitHub ddf112bdfa New Crowdin updates (#3858)
New translations strings.properties

Arabic; Finnish; German; Korean; Macedonian; Vietnamese;

[ci skip]
2025-06-11 12:28:56 +02:00
Armin Schrenk 2ade07da75 remove ci label from dependabot config 2025-06-11 12:27:24 +02:00
dependabot[bot]andGitHub e6a0339878 Bump org.owasp:dependency-check-maven in the maven-build-plugins group (#3890) 2025-06-11 10:25:43 +00:00
dependabot[bot]andGitHub 2b0c2cf90a Bump the java-test-dependencies group across 1 directory with 2 updates (#3875) 2025-06-11 10:25:08 +00:00
2afd8d0988 Build installers for Windows ARM64 (#3825)
---------

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-06-11 12:17:04 +02:00
Armin SchrenkandGitHub f2bda6b5f9 Feature: Update WinFSP to version 2.1 (#3893)
Closes #3887, fixes #3771
2025-06-10 18:43:51 +02:00
Ralph PlawetzkiandGitHub 0bb1bf81ec build.sh improvements (#3889) 2025-06-10 16:18:02 +02:00
Sebastian StenzelandGitHub bf8d5ed09f codesign .dmg (#3886)
fixes #3885
2025-06-10 13:39:34 +02:00
Tobias HagemannandGitHub e9f6854df8 added unlock flow when opening vault via app launch event (#3888) 2025-06-10 13:31:41 +02:00
Jan-Peter Klein 6d47f28634 changed shorteningThreshold to int
optimize imports
2025-06-05 13:15:54 +02:00
Jan-Peter Klein 225332bd4f pr mentioned changes 2025-06-05 13:01:47 +02:00
354225bf1e Switch on Windows Hello (#3808)
---------

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-06-04 11:25:45 +02:00
Jan-Peter Klein 8c84720e24 solve some todos 2025-06-04 10:47:56 +02:00
Armin Schrenk 0d4f373311 enable native access for javafx.graphics during tests
references #3882
2025-06-03 16:52:31 +02:00
Armin Schrenk 1da535e89c don't trigger distribution builds for dependabot 2025-06-03 16:25:13 +02:00
Armin SchrenkandGitHub 941b4e3652 Feature: JavaFX 24 (#3882) 2025-06-03 15:51:37 +02:00
Armin Schrenk dd1af8cd78 add migration for renamed SecretServiceKeychainAccess
references #3877
2025-06-03 15:49:40 +02:00
Armin Schrenk 27ea29ab9d fix IllegalArguemntException
do not try to convert a path which is already an OS path
2025-06-03 13:57:08 +02:00
Armin SchrenkandGitHub a699a794a9 CI: Trigger the appropiate build workflows based on changed files (#3880) 2025-06-02 16:57:30 +02:00
Armin SchrenkandGitHub cd6b1cf129 Update README.md
bump JDK build dependency to 24
2025-06-02 12:08:24 +02:00
Armin SchrenkandGitHub 7d2c4992af update pom and adjust classes to new keychain api. (#3877) 2025-06-02 10:28:52 +02:00
Jan-Peter Klein 968e8f51e4 new onboarding dialog
remove is hub vault dialog
2025-05-30 15:30:38 +02:00
Armin SchrenkandGitHub 6a21d24687 Merge pull request #3863 from cryptomator/feature/jdk-24
Feature: JDK 24
2025-05-22 15:41:53 +02:00
Armin Schrenk cba6ed9875 Merge branch 'develop' into feature/jdk-24 2025-05-21 16:08:38 +02:00
Armin Schrenk 72fdc8f536 [skip ci] allow manual trigger for building macOS x64 dmg 2025-05-21 14:41:48 +02:00
Armin Schrenk 41336cca13 bump to JDK 24 in all java workflows 2025-05-21 13:08:55 +02:00
Armin Schrenk 322907bbcd bump minimal ubuntu version Cryptomator is build on 2025-05-21 13:05:59 +02:00
Armin Schrenk 1f8df6fead fix comparsion to undefined variable 2025-05-21 13:01:54 +02:00
Armin Schrenk 6e085b783d use correct bash syntax to check exit code 2025-05-21 13:01:33 +02:00
Armin Schrenk 59dddd3f4c [skip ci] increase the required build version for coffeelibs to ppa3 build 2025-05-21 12:04:50 +02:00
Armin Schrenk d6bbcfbbc1 Revert "[skip ci] coffeelibs jdk is built with JEP 493"
This reverts commit 0a0dde3f47.
2025-05-21 11:50:55 +02:00
Jan-Peter Klein 4de6b83e2f remove RecoverUtil 2025-05-19 14:37:39 +02:00
Jan-Peter Klein 90cbb0c5f6 new recovery package in common 2025-05-19 14:27:05 +02:00
Armin Schrenk 7260d7f9f8 fixes #3847 2025-05-19 12:20:04 +02:00
Armin Schrenk c39c4be1cd Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2025-05-15 08:59:15 +02:00
Tobias Hagemann 565ab4a09b Merge branch 'hotfix/1.16.2' 2025-05-15 08:47:31 +02:00
Armin Schrenk f797491a17 prepare 1.16.2 2025-05-15 00:50:12 +02:00
Armin Schrenk cff83b6ac6 closes #3852 2025-05-15 00:47:35 +02:00
Armin Schrenk 6f9b3e31e7 [skip ci] prevent gpg from pruning the key cache 2025-05-15 00:27:30 +02:00
Armin Schrenk 0a0dde3f47 [skip ci] coffeelibs jdk is built with JEP 493 2025-05-13 15:22:39 +02:00
Armin Schrenk e27e303c01 [skip ci] use JDK 24 also for deb build 2025-05-13 14:12:07 +02:00
Armin Schrenk ef54b685f6 [skip ci] fix wrong logic to determine linkable runtime image in local build scripts 2025-05-08 16:51:04 +02:00
Jan-Peter Klein 0370fd5848 fix minWidth and minHeight 2025-05-08 11:14:10 +02:00
Armin Schrenk 119d18d699 [skip ci] cleanup 2025-05-08 11:08:02 +02:00
Armin Schrenk 8322633b14 apply workaround for wix burn bug 2025-05-08 11:04:59 +02:00
Armin Schrenk 2f32fc5c16 [skip ci] use different working directory for building the exe 2025-05-07 17:23:52 +02:00
Armin Schrenk 7c44c4f194 fix wrong logic in build scripts 2025-05-07 16:59:36 +02:00
Armin Schrenk bbb663f9d2 update windows ci workflow to wix 6 2025-05-07 12:47:48 +02:00
Armin Schrenk fdb4a2fb5c remove wix version pinning 2025-05-07 12:17:43 +02:00
Armin Schrenk 0a4684133d update ci to JDK 24 2025-05-07 12:17:27 +02:00
Armin Schrenk 0d5e518af3 adjust jlink to JEP 493 2025-05-07 12:16:52 +02:00
Armin Schrenk d47ab43fcf add launch feature to exe installer 2025-05-06 17:01:13 +02:00
Armin Schrenk 19a711d12b migrate wix burn bundle to wix 6 2025-05-06 17:00:17 +02:00
Armin Schrenk bf2db55d00 switch to ubuntu 22.04 (jammy) when deploying to launchpad 2025-05-02 13:49:41 +02:00
Armin Schrenk 885975e099 [skip ci] Merge branch 'main' into develop 2025-04-30 14:05:40 +02:00
Armin Schrenk 85c2901484 Merge branch 'release/1.16.1' 2025-04-30 14:04:43 +02:00
Armin Schrenk 434030b139 finalize 1.16.1 2025-04-30 14:04:32 +02:00
Armin Schrenk e43bb37758 prepare 1.16.1 2025-04-30 12:12:59 +02:00
Armin Schrenk 2eb9f0fca8 Fixes #3838 2025-04-30 12:12:04 +02:00
Armin SchrenkandGitHub 9503feb9c4 Feature: Use user and system certificate stores on macOS (#3837) 2025-04-29 17:02:14 +02:00
Armin Schrenk 08e9f130e4 [skip ci] Merge branch 'main' into develop 2025-04-29 11:28:38 +02:00
Armin Schrenk 4e39eaa1f1 Merge branch 'release/1.16.0' 2025-04-29 11:27:56 +02:00
Armin Schrenk eaca95e8dc finalize 1.16.0 2025-04-29 11:27:44 +02:00
Armin Schrenk cf32e794c8 Merge branch 'develop' into release/1.16.0 2025-04-29 11:26:48 +02:00
Armin Schrenk b5b221a5c7 remove manual wix installation from ci 2025-04-29 11:15:13 +02:00
CryptobotandGitHub d7cb99a12d New Crowdin updates (#3819)
New translations strings.properties

Chinese Traditional; Dutch; French; Hebrew; Italian; Latvian; Persian; Portuguese; Portuguese, Brazilian; Russian; Slovak; Spanish; Swedish; 

[ci skip]
2025-04-29 10:55:33 +02:00
Armin Schrenk b1893c63d4 Bump cryptofs from version 2.9.0-beta2 to 2.9.0 2025-04-28 13:00:21 +02:00
Armin Schrenk 79b3274074 migrate to wix6
* drop custom dialogs in installer
2025-04-24 15:56:02 +02:00
Armin Schrenk 7c86e5e39a update pom to use JDK 24 2025-04-24 15:53:17 +02:00
Armin Schrenk b50cc703b6 Merge branch 'develop' into release/1.16.0 2025-04-15 13:46:30 +02:00
Armin Schrenk 9dc4a1dc5a [skip ci] update distribution build files to jfx 23.0.2 2025-04-15 13:45:14 +02:00
Armin Schrenk f1a63a1679 update debian workflow to use JDK 23.0.2 2025-04-15 13:42:49 +02:00
Armin Schrenk d53d4e3452 Merge branch 'develop' into release/1.16.0 2025-04-15 11:42:17 +02:00
Armin Schrenk b7fa1ae6d8 Merge branch 'develop' into release/1.16.0
# Conflicts:
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellController.java
#	src/main/java/org/cryptomator/ui/eventview/EventListCellFactory.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewController.java
#	src/main/java/org/cryptomator/ui/eventview/EventViewModule.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java
#	src/main/resources/css/dark_theme.css
#	src/main/resources/css/light_theme.css
#	src/main/resources/fxml/eventview.fxml
#	src/main/resources/fxml/vault_detail_unlocked.fxml
#	src/main/resources/fxml/vault_list.fxml
#	src/main/resources/i18n/strings.properties
2025-04-15 11:41:39 +02:00
CryptobotandGitHub 3f192a587c New Crowdin updates (#3725)
New translations strings.properties

Afrikaans; Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Marathi; Norwegian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Urdu (Pakistan); Uyghur; Vietnamese; 

[ci skip]
2025-04-15 11:31:16 +02:00
Armin Schrenk 3a1b0b17d6 fix translations 2025-04-15 11:23:46 +02:00
dependabot[bot]andGitHub 5d2a243c55 Bump the java-test-dependencies group across 1 directory with 2 updates (#3776) 2025-04-15 08:59:50 +00:00
dependabot[bot]andGitHub 008a2a3301 Bump the java-production-dependencies group with 4 updates (#3796) 2025-04-15 08:59:01 +00:00
Armin Schrenk 0680437004 Set a mininum width for the vault choice box in the event view 2025-04-14 17:38:21 +02:00
Armin SchrenkandGitHub db6cf5459e CI: Update and split up anti virus whitelisting flow (#3817) 2025-04-14 16:09:22 +02:00
Armin SchrenkandGitHub 1d8466a9e3 Feature: Decrypt encrypted file name (#3788)
Closes #2713
2025-04-10 17:44:55 +02:00
Armin Schrenk dcbcd692e7 [skip ci] Merge branch 'main' into develop 2025-04-09 14:02:14 +02:00
Armin Schrenk 87fd6c712a Merge branch 'hotfix/1.15.3' 2025-04-09 13:59:50 +02:00
Armin Schrenk 958505559f finalize 1.15.3 2025-04-09 13:54:50 +02:00
Armin Schrenk 4736e5e7e7 prepare 1.15.3 2025-04-09 13:53:07 +02:00
Armin Schrenk 55d217887a fixes #3809 2025-04-09 11:04:20 +02:00
dependabot[bot]andGitHub 34ccd3ff73 Bump the maven-build-plugins group across 1 directory with 4 updates (#3813) 2025-04-08 15:49:18 +00:00
Tobias Hagemann 989c349331 Merge tag '1.15.2' into develop
# -----BEGIN SSH SIGNATURE-----
# U1NIU0lHAAAAAQAAAhcAAAAHc3NoLXJzYQAAAAMBAAEAAAIBAKgu9N6lXOixsGNEmzxZhA
# Rc8ABi3MlOHGT30s3zCQEtvbE/j1QXRycgru5n/TZPKiEqZz5OGLM7FG3lNqHTjrQG1jfZ
# rH9JfmTRX9kLWyDmsiKJkB0L19NcCJQKwhkAdcJkbhQHP4bk1o3uMS+M89n6Y0nmUocGrk
# j7yX/79iQn7PQXdDRk7I+p0p1hCMC7fRlhxPwBX8iPOoty9L75ZoteRoWMGoq4T2fhDdUd
# 5ASRKfdVDjUnFrYvI+o8mhXdbzxNLjp5oN9VWQsb+YIkzApcI1+42BT5WABk+3cLlheqPR
# SocNgYdoZZPA1x6Zlzy2gggm33m/uU7gww2iATphdoyXoj1Nv9loMDOaCQUe6s7Fnnn+xH
# hC1fJoCRlrWJ2QjQmZj18KkrXp2/ZNfvLYUIoQVONF40iizb5GJewH00m1ZV+/oAqbJ/W1
# nfLmXJ/ShwACe3hyZFVOaB2582UyTDFCFJL2Bgbiw8y1ayS15+gs9TkFJlAtbpwofPqVB2
# 16iiE8ViFf//J5ommM1S2sHXaPvu1D038OScIGnz0grhnCjzBr3BduW7EYQ6RhVOqMaEUy
# mQiRKIAtfj+6eHgk3IxB3ynReUFQqE3wreE9buA0vrCO4aWEet+qJsg+395K+/l7E6LQOg
# 5rkgcVj9rtFeo4gFBT2AUUSLmHaqpfABAAAAA2dpdAAAAAAAAAAGc2hhNTEyAAACFAAAAA
# xyc2Etc2hhMi0yNTYAAAIAMAXINugL3MrR1dUYQILEttmSOilND0hlz90eGBXuKRcijebq
# TbIwOrTJBPBlHM5aJC1lzBPcfB5Irz0DWc8eg0u2W/vHxtDXP5VL6me6u92Rz6WV73VWMD
# P8otZlMci0n3C5mM8DhrI9Nvg3qthRS2JW5vt3TFA7rL6IiAqsbA/nXWNGZuQwP+tJGCXg
# lWMD9NHaE1mmCcH+im2Vvnhz0y2Q0IEJCN8MDTrOA3ydnmF+YJ1b2QyQFBGrX3TNitZajX
# Uft3Jw5glpSlcaNEZOPR0cMCPBYy0skMUs4ykq4bVTy3I2qASdY3vb4l795OJPrK5FYyed
# ML5Zad7V8yrif0Cy/Ywy1C4TN6ftoEVH6HFEmJTohEY5BjT5qNK5tpmEs/o7z8W2oJa9Su
# G+KMAGe6AS/4ryQ+OQRJXzzFnAQRnR2Ou3iAA2ypsGWmP09Sr+1bb2qRSvy+lybaayfSLQ
# FouTQxecNq5TVfo1PWaGH9lLxd4i3J0PLk6uM8HfkIFimEN8h+4XT/4YXwO1czwun+IWaS
# nD92KIrdoHth+v05f8PpuqCz6odzojO33GfkMU/6Lkp2RgYeHD4eDb2/vyIJUtZHTPwPPJ
# tDybf2GbcDD4F43+fZdz7Q5A4a9DSDHeB6qZoqou6pUttbTneKQn/tq2yVa0TpyUjbGoCA
# QBvT4=
# -----END SSH SIGNATURE-----
# gpg verification failed.

# Conflicts:
#	pom.xml
2025-04-04 18:26:20 +02:00
Tobias Hagemann b9df56a6de Merge branch 'hotfix/1.15.2' 2025-04-04 18:24:13 +02:00
Tobias Hagemann 38dbefff0b Updated webdav-nio-adapter dependency, fixes #3806, fixes #3807 2025-04-04 18:12:03 +02:00
Tobias Hagemann 4cbe45919b Moved jfuse dependency bump into dependencyManagement 2025-04-04 17:43:44 +02:00
Armin Schrenk b7ccf7986d set version infos 2025-04-04 17:05:49 +02:00
Armin Schrenk 40d632a489 Closes #3807 2025-04-04 16:28:08 +02:00
Armin Schrenk 800aca5207 fix password enter dialog 2025-04-04 16:26:36 +02:00
Armin SchrenkandGitHub 6a26d95c15 Feature: Event view (#3780) 2025-04-03 18:10:22 +02:00
Tobias HagemannandGitHub 439d3d7529 Update CONTRIBUTING.md 2025-03-29 18:00:22 +01:00
Armin Schrenk 7476e192a3 [skip ci] fix wrong JDK version in appimage build 2025-03-24 17:16:46 +01:00
Armin Schrenk c6193bc259 update JDK for release builds to 23.0.2 (except ppa-builds) 2025-03-24 16:55:45 +01:00
Armin Schrenk 7446c69cd8 Update org.cryptomator:fuse-nio-adapter from 5.0.3 to 5.0.4
fixes #3797
2025-03-24 14:38:12 +01:00
Jan-Peter Klein e1cc61037e cleanup 2025-03-23 11:15:36 +01:00
Jan-Peter Klein 1ae951126a refactored key validation 2025-03-21 11:03:24 +01:00
Jan-Peter Klein 6bb8c0d4e7 removed unused fxml and controller
dialog fix
2025-03-19 10:09:55 +01:00
Jan-Peter Klein 087b6162ed recoverType fix and more use of dialogs 2025-03-18 14:25:44 +01:00
Jan-Peter Klein f9e8031acb Merge branch 'develop' into feature/restore-vaultconfig 2025-03-18 11:53:06 +01:00
Armin Schrenk 43c352e0d2 prepare 1.16.0 2025-03-18 11:39:46 +01:00
Armin Schrenk 61ec3bc465 Merge branch 'feature/event-view' into release/1.16.0
# Conflicts:
#	pom.xml
2025-03-18 11:39:22 +01:00
Armin Schrenk 36dd98127d update to cryptofs 2.9.0-beta2 2025-03-18 11:38:52 +01:00
Armin Schrenk 30862146b0 Merge branch 'feature/decrypt-name' into release/1.16.0
# Conflicts:
#	pom.xml
2025-03-18 11:21:54 +01:00
Armin Schrenk c19734da6f decrypt name is always possible 2025-03-18 11:17:49 +01:00
Armin Schrenk ba8fb273c7 cleanup 2025-03-18 11:14:38 +01:00
Armin Schrenk 5204a8e356 remove unused icons 2025-03-18 11:10:38 +01:00
Armin Schrenk 43b341860b extend styling to dark theme 2025-03-18 11:09:43 +01:00
dependabot[bot]andGitHub ad02e43daf Merge pull request #3787 from cryptomator/dependabot/maven/java-production-dependencies-af5d03dc73 2025-03-18 10:07:14 +00:00
Jan-Peter Klein ebd767595b get cipherCombo while key validation 2025-03-17 18:39:17 +01:00
Armin Schrenk 4942bcb52b exclude fasterxml:jackson-core dependency from auth0:java-jwt 2025-03-17 18:15:43 +01:00
dependabot[bot]andGitHub 6b2e718e04 Bump the java-production-dependencies group across 1 directory with 13 updates
Bumps the java-production-dependencies group with 13 updates in the / directory:

| Package | From | To |
| --- | --- | --- |
| [org.cryptomator:cryptolib](https://github.com/cryptomator/cryptolib) | `2.2.0` | `2.2.1` |
| [org.cryptomator:fuse-nio-adapter](https://github.com/cryptomator/fuse-nio-adapter) | `5.0.2` | `5.0.3` |
| [org.cryptomator:webdav-nio-adapter](https://github.com/cryptomator/webdav-nio-adapter) | `2.0.7` | `2.0.8` |
| [org.cryptomator:integrations-api](https://github.com/cryptomator/integrations-api) | `1.5.0` | `1.5.1` |
| org.slf4j:slf4j-api | `2.0.16` | `2.0.17` |
| [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) | `1.5.16` | `1.5.17` |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | `1.5.16` | `1.5.17` |
| [io.github.coffeelibs:tiny-oauth2-client](https://github.com/coffeelibs/tiny-oauth2-client) | `0.8.0` | `0.8.1` |
| [com.auth0:java-jwt](https://github.com/auth0/java-jwt) | `4.4.0` | `4.5.0` |
| [com.fasterxml.jackson.core:jackson-databind](https://github.com/FasterXML/jackson) | `2.18.2` | `2.18.3` |
| com.fasterxml.jackson.datatype:jackson-datatype-jsr310 | `2.18.2` | `2.18.3` |
| [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) | `26.0.1` | `26.0.2` |
| [org.cryptomator:integrations-linux](https://github.com/cryptomator/integrations-linux) | `1.5.2` | `1.5.3` |



Updates `org.cryptomator:cryptolib` from 2.2.0 to 2.2.1
- [Release notes](https://github.com/cryptomator/cryptolib/releases)
- [Commits](https://github.com/cryptomator/cryptolib/compare/2.2.0...2.2.1)

Updates `org.cryptomator:fuse-nio-adapter` from 5.0.2 to 5.0.3
- [Release notes](https://github.com/cryptomator/fuse-nio-adapter/releases)
- [Commits](https://github.com/cryptomator/fuse-nio-adapter/compare/5.0.2...5.0.3)

Updates `org.cryptomator:webdav-nio-adapter` from 2.0.7 to 2.0.8
- [Release notes](https://github.com/cryptomator/webdav-nio-adapter/releases)
- [Commits](https://github.com/cryptomator/webdav-nio-adapter/compare/2.0.7...2.0.8)

Updates `org.cryptomator:integrations-api` from 1.5.0 to 1.5.1
- [Release notes](https://github.com/cryptomator/integrations-api/releases)
- [Commits](https://github.com/cryptomator/integrations-api/compare/1.5.0...1.5.1)

Updates `org.slf4j:slf4j-api` from 2.0.16 to 2.0.17

Updates `ch.qos.logback:logback-core` from 1.5.16 to 1.5.17
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.16...v_1.5.17)

Updates `ch.qos.logback:logback-classic` from 1.5.16 to 1.5.17
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.16...v_1.5.17)

Updates `ch.qos.logback:logback-classic` from 1.5.16 to 1.5.17
- [Release notes](https://github.com/qos-ch/logback/releases)
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.16...v_1.5.17)

Updates `io.github.coffeelibs:tiny-oauth2-client` from 0.8.0 to 0.8.1
- [Release notes](https://github.com/coffeelibs/tiny-oauth2-client/releases)
- [Commits](https://github.com/coffeelibs/tiny-oauth2-client/compare/0.8.0...0.8.1)

Updates `com.auth0:java-jwt` from 4.4.0 to 4.5.0
- [Release notes](https://github.com/auth0/java-jwt/releases)
- [Changelog](https://github.com/auth0/java-jwt/blob/master/CHANGELOG.md)
- [Commits](https://github.com/auth0/java-jwt/compare/4.4.0...4.5.0)

Updates `com.fasterxml.jackson.core:jackson-databind` from 2.18.2 to 2.18.3
- [Commits](https://github.com/FasterXML/jackson/commits)

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.2 to 2.18.3

Updates `com.fasterxml.jackson.datatype:jackson-datatype-jsr310` from 2.18.2 to 2.18.3

Updates `org.jetbrains:annotations` from 26.0.1 to 26.0.2
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/26.0.1...26.0.2)

Updates `org.cryptomator:integrations-linux` from 1.5.2 to 1.5.3
- [Release notes](https://github.com/cryptomator/integrations-linux/releases)
- [Commits](https://github.com/cryptomator/integrations-linux/compare/1.5.2...1.5.3)

---
updated-dependencies:
- dependency-name: org.cryptomator:cryptolib
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:fuse-nio-adapter
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:webdav-nio-adapter
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: io.github.coffeelibs:tiny-oauth2-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.auth0:java-jwt
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.core:jackson-databind
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: com.fasterxml.jackson.datatype:jackson-datatype-jsr310
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
- dependency-name: org.cryptomator:integrations-linux
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: java-production-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-17 16:47:33 +00:00
Ralph PlawetzkiandGitHub a1323b5e81 Merge pull request #3785 from purejava/fix/improve-symbolic-icons 2025-03-17 17:46:23 +01:00
dependabot[bot]andGitHub ab4f487de1 Bump the javafx group with 5 updates (#3703) 2025-03-17 16:40:48 +00:00
Armin Schrenk d506e7472d Bump cryptofs from 2.8.0 to 2.9.0-beta2
Closes #3707
2025-03-17 17:32:48 +01:00
Armin SchrenkandGitHub 2d33d02b46 Feature: TouchID [macOS]
Closes #2180
2025-03-17 17:29:39 +01:00
Armin Schrenk 06ddec4b70 more UI refinment:
* only copy decrypted names to clipboard
* indicate in UI
2025-03-17 17:14:52 +01:00
Jan-Peter Klein 6231c5b8b3 restore checkbox and other small ui rearrangements 2025-03-17 16:10:16 +01:00
Armin Schrenk 24e31553fd refine UI:
* align locate/decrypt buttons horizontally
* change to text icons
* dedup code
2025-03-17 12:02:03 +01:00
Armin Schrenk eaa6b31de8 bump cryptofs to 2.9.0-beta2 2025-03-14 16:15:17 +01:00
Jan-Peter Klein a3b8297e23 recoverykey validate 2025-03-14 13:51:25 +01:00
Ralph PlawetzkiandGitHub 060ae588a2 Improve symbolic icons (#3782)
* Remove the style attributes from the path tags
Fixes #3775
* Improve SVG code using a <g> tag and tighten current-color-scheme definition
* Add missing attribute from original SVG
2025-03-14 13:22:14 +01:00
Armin Schrenk 262f84e8db new design 2025-03-13 16:47:23 +01:00
Armin Schrenk 6d55331ef2 add missing translation key 2025-03-13 10:36:40 +01:00
Armin Schrenk 42269a6057 just a draft 2025-03-12 18:01:06 +01:00
Armin Schrenk 181e45a596 renamed event list item localization keys 2025-03-12 15:27:24 +01:00
Armin Schrenk 3c8e506805 add tooltip for clear all button 2025-03-12 15:21:32 +01:00
Armin Schrenk 401b0afe9f remove unnecessary code 2025-03-12 12:37:06 +01:00
Armin Schrenk 42ec41b991 clean up code 2025-03-12 12:19:27 +01:00
Armin Schrenk 7ec3c5d04f first delete, then write 2025-03-12 11:41:12 +01:00
Armin Schrenk f0a7379575 hide count if vault is locked 2025-03-12 10:50:36 +01:00
Armin Schrenk 0d12b11c48 cleanup 2025-03-12 10:01:09 +01:00
Armin Schrenk 14a025f769 size restrict the eventMap 2025-03-12 10:00:56 +01:00
Armin Schrenk 598fc9bbc8 complete themes 2025-03-12 10:00:34 +01:00
Armin Schrenk fbab2df00f add notification marker for new events 2025-03-12 09:38:56 +01:00
Armin Schrenk fb56b61a75 add exceptionally clause to keychain migration task 2025-03-11 17:14:42 +01:00
Armin Schrenk c5c3d55658 Merge branch 'develop' into feature/touch-id 2025-03-11 17:08:13 +01:00
Armin Schrenk 48c2d49c86 revert default version string 2025-03-11 17:07:46 +01:00
Armin Schrenk 00d68393f6 use beta version of cryptoFs 2025-03-11 17:07:17 +01:00
Armin Schrenk 7a50ba0b43 Merge branch 'develop' into feature/event-view 2025-03-11 17:03:58 +01:00
Armin SchrenkandGitHub b2bee99286 Refactor: Out-of-bounds-check (#3778)
fixes #3723, fixes #3722
2025-03-11 16:03:49 +01:00
Armin Schrenk 88d384afdf reduce tooltip show duration 2025-03-07 11:50:53 +01:00
Armin Schrenk 7af82b831f add event count to viewer 2025-03-07 11:50:40 +01:00
Armin Schrenk a86f42fa44 replace eventList with a eventMap in model to group events 2025-03-07 11:21:23 +01:00
Sebastian Stenzel 70b0413777 replace labels with issue type
see https://github.blog/changelog/2025-01-13-evolving-github-issues-public-preview/#organize-your-work-with-issue-types
[ci skip]
2025-03-07 09:32:39 +01:00
Sebastian Stenzel 577a77af38 moved summary to the top for better link previews 2025-03-07 09:31:35 +01:00
Armin Schrenk 3ba7e9ba00 cleanup 2025-03-06 12:55:12 +01:00
Armin Schrenk b2250e8ce0 add Tooltip 2025-03-06 12:54:58 +01:00
Armin Schrenk f2a480c7a0 reworked event cell texts 2025-03-06 12:40:02 +01:00
Jan-Peter Klein 6715ff9f5f introduce RecoverUtil.Types 2025-03-06 09:17:16 +01:00
Armin Schrenk bda38096e1 fix minor inconsitencies 2025-03-04 12:34:45 +01:00
Armin Schrenk 7e66a61294 add choicebox to filter for single vaults 2025-03-04 12:34:17 +01:00
clkueandGitHub 3aa627a467 fix unicode escaping for rtf file (#3609)
Signed-off-by: C1emency <>
Signed-off-by: clkue <clemens_kuennemann@protonmail.com>
2025-03-03 14:55:09 +01:00
Armin SchrenkandGitHub ae1b5fc925 Switch to ubuntu-22.04 for building the deb package 2025-03-03 12:05:25 +01:00
mindmonkandGitHub b1076f9c86 Merge pull request #3764 from cryptomator/feature/dialogBuilder-one-Button
Feature: Simple Dialog with one Button
2025-02-28 14:53:22 +01:00
Jan-Peter Klein ede1c72595 cancelButtonVisible BooleanProperty to boolean 2025-02-28 13:29:04 +01:00
Jan-Peter Klein 8c5325511c created more static methods in RecoverUtil, added first flow for choose dir and restore 2025-02-28 13:06:35 +01:00
Armin Schrenk d2fcd5b64f adjust stylings 2025-02-28 10:36:13 +01:00
Armin Schrenk 6d9704ffa2 adjust event description when locked 2025-02-28 10:36:03 +01:00
Armin Schrenk 40df3d015a remove optional wrapper of revealService 2025-02-28 10:01:52 +01:00
Armin Schrenk 4e22706d92 add alternative if revealService is not present 2025-02-28 09:51:58 +01:00
Armin Schrenk 341710f724 add time field to the eventcell 2025-02-27 18:56:41 +01:00
Armin Schrenk 8386183f7a * Hide button when not hovering or vault is locked
* localize
2025-02-27 17:25:31 +01:00
Armin Schrenk b76a7d6895 implement event views for all filesystemevents 2025-02-26 18:36:52 +01:00
Jan-Peter Klein 4a397a8151 code cleanup 2025-02-26 12:36:03 +01:00
Armin Schrenk 2239a3e6a3 reduce API to only consider vault events 2025-02-26 11:56:17 +01:00
tturturielloandGitHub 5318368879 Add underline effect to clickable notification labels (#3757) 2025-02-26 11:53:46 +01:00
Jan-Peter Klein 41a279da9d renamed property 2025-02-25 19:04:25 +01:00
Jan-Peter Klein 478c69f82c simple dialog without cancel button 2025-02-25 18:23:17 +01:00
Armin Schrenk eb0e630a44 move migration to KeychainManager 2025-02-25 17:33:14 +01:00
Armin Schrenk 0bcbf9a13a add migration code and synchronize keychain edits 2025-02-25 16:32:38 +01:00
Armin Schrenk e3073a3613 adjust wording for autoLock feature [skip ci] 2025-02-25 15:38:50 +01:00
Armin Schrenk 3333dc7f22 Fix not appearing removeCert dialog 2025-02-25 11:52:00 +01:00
Jan-Peter Klein 895614353e improve RecoverUtil and determineVaultState 2025-02-21 23:24:34 +01:00
Jan-Peter Klein 676c507a50 add RecoverUtil and some ui changes 2025-02-21 19:43:09 +01:00
Jan-Peter Klein 5f4fd92b1d Merge branch 'develop' into feature/restore-vaultconfig 2025-02-19 19:49:35 +01:00
Julian Raufelder 12ec6fbec8 Change /access-token deviceId header name to Hub-Device-ID 2025-02-19 14:25:34 +01:00
Armin Schrenk 43fc976ad7 reduce #3311 to touchID 2025-02-19 11:49:59 +01:00
Armin Schrenk 034278c0a0 changes:
* implement reveal conflictResolved
* removed showVault context menu entry
* cleanup
2025-02-19 11:27:39 +01:00
Julian RaufelderandGitHub 92b3a9e1bd Merge pull request #3752 from cryptomator/feature/add-device-id-during-hub-unlock
Send DeviceId to Hub during vault key retrieval
2025-02-19 09:51:39 +01:00
Julian Raufelder fc7169f2a0 Send DeviceId to Hub during vault key retrieval
See https://github.com/cryptomator/hub/pull/320
2025-02-19 09:05:13 +01:00
Armin Schrenk c39710ede0 show event specific context menu 2025-02-18 18:32:06 +01:00
Armin SchrenkandGitHub cc0b6aed15 Update org.cryptomator.Cryptomator.metainfo.xml
* adjust screenshot captions
* reorder screenshots
* add keywords
2025-02-18 16:52:31 +01:00
Armin Schrenk f8a83c9cc8 scope eventListcell factory 2025-02-18 15:32:34 +01:00
Armin Schrenk 43ce64f01e adjust styling 2025-02-18 11:44:48 +01:00
mindmonkandGitHub d585a03f76 Merge pull request #3699 from cryptomator/feature/vault-scheme-tag
Add lastKnownKeyLoader entry to VaultSettings
2025-02-17 17:35:47 +01:00
Armin Schrenk f953be6237 Merge branch 'develop' into feature/event-view 2025-02-17 17:12:35 +01:00
Armin Schrenk e81bbe197b if mainWindow is closed without tray menu, terminate app 2025-02-17 16:46:25 +01:00
Armin Schrenk 738fa4da12 cleanup 2025-02-17 16:08:09 +01:00
dependabot[bot]andGitHub 9a08dcc46d Bump org.owasp:dependency-check-maven (#3748) 2025-02-17 10:04:30 +00:00
Armin Schrenk 74ef8d915d make eventView independent, but singleton window 2025-02-14 17:26:25 +01:00
Armin Schrenk 025a7a5582 add contextMenu to eventListCell 2025-02-14 17:11:43 +01:00
Armin Schrenk 3b2ddcf98d style the eventlist cell more 2025-02-14 16:47:15 +01:00
Armin SchrenkandGitHub c10fc0ee5b Update README.md
For build badge use develop branch.
2025-02-14 11:56:55 +01:00
aaa37e2c7a Feature: Add UTM parameters to download uri (#3735)
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2025-02-14 11:55:22 +01:00
Armin Schrenk 7af7c920e3 use same listCell factory pattern as in vault list 2025-02-14 11:54:25 +01:00
Armin Schrenk a4f79fb98a unify naming 2025-02-14 11:41:35 +01:00
Armin Schrenk f429f2d3e7 rename method 2025-02-14 10:51:48 +01:00
Armin Schrenk 4f6e091c13 first proper design draft 2025-02-13 16:58:05 +01:00
Jan-Peter Klein 2df779f7ab introduce isMasterkeyFileVault() 2025-02-13 15:44:10 +01:00
Jan-Peter Klein 5b9d9150c5 remove extra try catch block 2025-02-13 15:39:06 +01:00
Jan-Peter Klein f0aaec2058 comparison reversed 2025-02-13 15:15:29 +01:00
Jan-Peter Klein 4adc4a9175 removed unused StringBinding 2025-02-13 15:03:14 +01:00
Armin Schrenk 5a97060fac make the list synchronized 2025-02-13 11:06:48 +01:00
Armin Schrenk db96074119 replace AppEvent by UpdateEvent and emit it on available update 2025-02-12 11:12:40 +01:00
Jan-Peter Klein 7ecc10bc79 removed setVaultScheme method; lastKnownKeyLoader is now set within the create method 2025-02-12 10:35:21 +01:00
Armin Schrenk 44fe4a6f8a displayable event view window 2025-02-11 17:37:04 +01:00
Jan-Peter Klein 76a4ef50cb improve exception handling 2025-02-11 16:21:53 +01:00
Armin Schrenk ca2f80024a impl draft 2025-02-11 15:38:18 +01:00
Armin SchrenkandGitHub dcd7077b08 Feature: readd out of bounds check (#3729)
references #3091
2025-02-11 15:24:36 +01:00
Armin Schrenk 31482d7d18 [skip ci] update ide files 2025-02-11 12:37:45 +01:00
Armin Schrenk 5ef666154e use correct height in css [skip ci] 2025-02-11 10:16:34 +01:00
Armin Schrenk a810eff797 make menu buttons in vault list appear clickable 2025-02-10 18:29:57 +01:00
Jan-Peter Klein 664158eb84 add isHubVault method to KeyLoadingStrategy 2025-02-10 18:09:03 +01:00
Armin Schrenk 6b43881909 [skip ci] update screenshot url in metainfo file 2025-02-10 17:08:03 +01:00
Jan-Peter Klein 126004b1f8 improve error handling 2025-02-10 12:58:54 +01:00
Jan-Peter Klein ba34cfa9d5 renamed to lastKnownKeyLoader 2025-02-10 12:07:25 +01:00
Armin Schrenk 03b4ad85ef [skip ci] Merge branch 'main' into develop 2025-02-05 16:22:09 +01:00
Armin Schrenk 1abfcd495f Merge branch 'release/1.15.1' 2025-02-05 16:19:41 +01:00
Armin Schrenk 69964a80f1 finalize 1.15.1 2025-02-05 16:18:59 +01:00
Armin Schrenk aa8306ea4a prepare 1.15.1 2025-02-05 16:16:53 +01:00
CryptobotandGitHub 3fecde37f4 New Crowdin updates (#3718)
New translations strings.properties

Korean

[ci skip]
2025-02-05 16:16:20 +01:00
Armin Schrenk 2fc5fd99fb remove english "localization" 2025-02-05 16:11:36 +01:00
Armin Schrenk 7edacfea70 fixes #3721 2025-02-05 16:02:27 +01:00
Armin Schrenk 7020fa49d9 [skip ci] remove copyright notice 2025-02-05 11:44:58 +01:00
Armin Schrenk 7cea0bb33c update appstream screenshots 2025-02-05 11:44:40 +01:00
Armin Schrenk 3d622b18dc update flatpak metadata 2025-02-04 11:55:14 +01:00
KuleskoandGitHub 62cd506588 fix broken doc links (#3715) 2025-02-03 17:34:27 +01:00
Armin Schrenk cd830f27a0 update IDE file 2025-02-03 12:54:34 +01:00
Armin Schrenk 3f75018369 fix link in README 2025-02-03 12:54:25 +01:00
Armin Schrenk 270a4c594d [skip ci] Merge branch 'main' into develop 2025-02-03 11:34:16 +01:00
Armin Schrenk a5fdc5755b Merge branch 'release/1.15.0' 2025-02-03 11:16:18 +01:00
Armin Schrenk 0a5a554714 finalize 1.15.0 2025-02-03 11:15:59 +01:00
Armin Schrenk 976f22c27a Merge branch 'develop' into release/1.15.0 2025-02-03 11:12:20 +01:00
CryptobotandGitHub 8267574697 New Crowdin updates (#3697)
New translations strings.properties

Afrikaans; Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Marathi; Norwegian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Urdu (Pakistan); Uyghur; Vietnamese; 

[ci skip]
2025-02-03 10:56:49 +01:00
mindmonkandGitHub 9077c964b3 Fix VaultListCell Padding in Compact Mode (#3709) 2025-02-03 10:50:06 +01:00
Armin Schrenk f80467a3a4 Fixes #3705 2025-01-28 15:09:52 +01:00
Julian RaufelderandGitHub 8c462c4cb7 RIP Twitter
[ci skip]
2025-01-23 12:21:54 +01:00
Jan-Peter Klein b25b5bd5a3 add keyLoader to observables 2025-01-22 16:59:52 +01:00
Jan-Peter Klein 6365c22297 add keyLoader entry to VaultSettings 2025-01-22 16:46:18 +01:00
Armin Schrenk d7dd24b94e linting 2025-01-22 16:26:25 +01:00
Armin Schrenk aee8844558 Fixes #3698 2025-01-22 16:25:56 +01:00
Armin Schrenk c536149c62 specify JDK 23 also in debian control file
References #3641

(cherry picked from commit ca1ae8181b)
2025-01-22 14:12:56 +01:00
Armin Schrenk ca1ae8181b specify JDK 23 also in debian control file
References #3641
2025-01-22 14:11:19 +01:00
Armin Schrenk 2b19c9757b prepare 1.15.0 2025-01-22 12:06:00 +01:00
Armin Schrenk d6871e3d82 clean up pom 2025-01-22 11:58:09 +01:00
CryptobotandGitHub 0432a64537 New Crowdin updates (#3606)
New translations strings.properties

Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Uyghur; Vietnamese; 

[ci skip]
2025-01-22 11:10:17 +01:00
06988b06c7 Feature: Retry if Read-only (#3695)
Closes #3261, closes #2085.

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2025-01-22 11:02:48 +01:00
dependabot[bot]andGitHub 9b72eb8219 Bump the java-production-dependencies group across 1 directory with 8 updates (#3694) 2025-01-21 16:06:50 +00:00
Armin Schrenk ea188f6176 for testing add mockito as javaagent 2025-01-21 15:53:49 +01:00
dependabot[bot]andGitHub cf67d022c8 Bump the java-test-dependencies group across 1 directory with 2 updates (#3671) 2025-01-21 13:36:52 +00:00
dependabot[bot]andGitHub 7ba6e12799 Bump the maven-build-plugins group across 1 directory with 3 updates (#3688) 2025-01-21 13:35:13 +00:00
Armin Schrenk b512518ccc update README [skip ci] 2025-01-21 11:46:30 +01:00
Armin Schrenk 93dfd35627 update Windows build scripts 2025-01-21 11:46:15 +01:00
Armin Schrenk 50b92f9510 fix URL in README [skip ci] 2025-01-21 11:43:38 +01:00
Armin Schrenk 7cca8922d8 Closes #3623 2025-01-21 11:39:14 +01:00
Armin SchrenkandGitHub c00889b1c4 update to javafx 23.0.1 (#3691) 2025-01-21 11:32:48 +01:00
Armin Schrenk b6224f355d Fixes #3693 2025-01-21 10:44:28 +01:00
Armin Schrenk 9a8f96d432 remove unused dll from windows build [skip ci] 2025-01-20 19:18:08 +01:00
Sebastian StenzelandGitHub 3cc199227b Include AppStream metadata in AppImage (#3687) 2025-01-20 17:59:59 +01:00
Sebastian StenzelandGitHub 3d0647bce3 fix appimage build (#3686)
* remove unsupported parameter `--sign-args`

apparently no longer wanted, despite being documented, see https://github.com/AppImage/appimagetool/issues/39

* add usr/share/metainfo/Cryptomator.appdata.xml

* appimagetool fails when adding AppStream metadata

see https://github.com/AppImage/AppImageKit/issues/603
2025-01-18 12:18:25 +01:00
DrSheppardandGitHub 192f35a9dd resolve #3055 (again) (#3685)
* use new build tool with runtime support instead old build tool for appimage

* Update workflow file to use newer appimagetool
2025-01-18 11:09:42 +01:00
Armin Schrenk f2b4c9a35b Update integrations-linux to 1.5.2
Fixes #3611
2025-01-17 18:05:10 +01:00
Armin SchrenkandGitHub 3b8fec4c5a Feature: Use system certificate stores/custom pkcs12 file (#3675)
* for Windows use Windows certificate
* for macOS use macOS Keychain
* for Linux use a custom PKCS12 file under /etc/cryptomator/certs.p12
2025-01-17 15:12:38 +01:00
DrSheppardandGitHub 60b74a018d AppImage: Use new build tool with runtime2 support (#3586)
Closes #3055
2025-01-17 13:49:11 +01:00
Armin Schrenk be69e04f51 fix build due to breaking changes in cryptofs 2025-01-17 13:28:14 +01:00
Armin Schrenk 194f6009df Update cryptofs to version 2.7.2 2025-01-17 13:22:45 +01:00
Sebastian StenzelandGitHub 910a2eace8 build AppImage on ubuntu-24.04-arm (#3681) 2025-01-17 09:08:02 +01:00
Jan-Peter Klein 8191a7dae6 add isHubVault dialog 2025-01-15 21:05:27 +01:00
Jan-Peter Klein 3c95618eec changed dokany dialog icon to EXCLAMATION 2025-01-15 16:16:40 +01:00
Armin Schrenk fc709eb700 use caffeine for building a cache 2025-01-14 19:16:46 +01:00
Julian Raufelder a6c60ac5d0 Hello 2025 🎉 2025-01-14 16:34:32 +01:00
Jan-Peter Klein 756672258d add Hub Vault check for MASTERKEY_MISSING state 2025-01-14 15:29:49 +01:00
Jan-Peter Klein fb6f7072d4 new vault states implemented in selectVaultRemovable 2025-01-14 15:12:21 +01:00
Jan-Peter Klein aa95ad40c0 added vault config success scene 2025-01-13 15:31:55 +01:00
mindmonkandGitHub b88b9c8f92 Merge pull request #3676 from cryptomator/feature/change-zulu-to-temurin
Changed JAVA_DIST zulu to temurin
2025-01-13 13:25:55 +01:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2b8cd36b7b Bump ch.qos.logback:logback-core from 1.5.12 to 1.5.13 (#3655)
Bumps [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) from 1.5.12 to 1.5.13.
- [Commits](https://github.com/qos-ch/logback/compare/v_1.5.12...v_1.5.13)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2025-01-12 15:27:30 +01:00
Jan-Peter Klein 3d23deb744 changed JAVA_DIST zulu to temurin 2025-01-12 14:42:04 +01:00
mindmonkandGitHub de3b2715c7 Merge pull request #3618 from cryptomator/feature/dialog-builder
Feature: SimpleDialogBuilder
2025-01-10 15:17:24 +01:00
Jan-Peter Klein f3d8bd359d Merge branch 'develop' into feature/dialog-builder 2025-01-10 15:05:07 +01:00
Armin SchrenkandGitHub d7d6e46b2a Ensure JDK 23 is used in building mac dmg x64 2025-01-10 14:33:34 +01:00
Jan-Peter Klein 501f682d68 annotate Dialogs with @Singleton
removed redundant providers
2025-01-10 11:58:19 +01:00
Jan-Peter Klein 7cbf1e10e5 refactor dialogs with injected resourceBundle for builder creation 2025-01-09 17:39:02 +01:00
Jan-Peter Klein fb00972bc1 improve naming 2025-01-09 15:31:07 +01:00
Jan-Peter Klein 387fb28c65 remove unused LOGs and improved var naming 2025-01-09 15:22:25 +01:00
Jan-Peter Klein 40fbfd10d1 moved all simple dialogs to Dialogs 2025-01-08 19:17:20 +01:00
Jan-Peter Klein e5e4695cd6 replaced setters and extended the constructor of SimpleDialogController 2025-01-08 17:50:54 +01:00
Armin Schrenk 4a0c8ae80e fix check-jdk-update workflow [ci skip] 2025-01-08 17:09:53 +01:00
Armin Schrenk 384ca8eb2a for testing 2025-01-08 16:02:00 +01:00
Jan-Peter Klein 59f360bde7 improve formatting, rename and simplify vars 2025-01-08 15:07:04 +01:00
Jan-Peter Klein 8830e0f5fb Move repeated 'remove vault' dialog to Dialogs class 2025-01-07 15:19:06 +01:00
Jan-Peter Klein 7a391a2825 reformat code 2025-01-07 14:47:20 +01:00
Jan-Peter Klein a1941911ef renamed to simple Dialog 2025-01-07 14:45:09 +01:00
Jan-Peter Klein a0667ff361 add validation for required parameters and changed exception message 2025-01-07 14:39:22 +01:00
Jan-Peter Klein ba3667ab51 restore config by recoverykey
auto restore when bkup exists
added new VaultStates
2024-12-11 16:30:56 +01:00
Armin SchrenkandGitHub cbc41d535d Merge pull request #3641 from cryptomator/feature/jdk23
Feature: JDK 23
2024-12-11 15:42:09 +01:00
Armin Schrenk f51780dcb5 also update deb rules file [ci skip] 2024-12-10 18:03:07 +01:00
Armin Schrenk c055488df7 update github workflows 2024-12-10 17:47:48 +01:00
Armin Schrenk b15c376e59 fix and update JDK check workflow 2024-12-10 17:42:55 +01:00
Armin Schrenk fdf03d2fdc enable JDK23 for IDE 2024-12-10 17:15:34 +01:00
Armin Schrenk 437350af9f reduce api diff 2024-12-10 17:14:09 +01:00
Julian RaufelderandGitHub 5114e2ad22 Merge pull request #3640 from lamtrinhdev/develop
Correct the link of issues list for both iOS and Android.
2024-12-09 14:09:03 +01:00
LamTrinh.DevandGitHub b3b4f61c42 Correct the link of issues list for both iOS and Android. 2024-12-09 19:13:44 +07:00
Armin Schrenk fa16556af1 do not allow empty display name for vault
Fixes #3633
2024-12-02 11:02:11 +01:00
Armin SchrenkandGitHub de766c2653 Update suppression.xml 2024-12-02 09:40:40 +01:00
Armin Schrenk dcc27efe5c remove unused option in app-image creation [skip ci]
references 84732337ca
2024-11-28 17:26:10 +01:00
Armin Schrenk 78ceb604f9 only use macos intel runner on releases 2024-11-27 16:47:42 +01:00
Armin SchrenkandGitHub 7bdcdcba3d Update suppression.xml 2024-11-26 15:49:43 +01:00
Jan-Peter Klein e929d41d67 reordered and renamed to org.ui.dialogs.SimpleDialog... 2024-11-25 19:23:48 +01:00
Jan-Peter Klein 600aca083c refactor CustomDialog.Builder provisioning to use Dagger's Provider 2024-11-25 15:09:29 +01:00
Jan-Peter Klein 02c20c01ee improve exception handling 2024-11-21 16:55:03 +01:00
mindmonkandGitHub 50cfdbbc0b Merge pull request #3617 from cryptomator/feature/ui-cleanup
Enhance UI Components, Fix Issues, and Improve Visual Consistency
2024-11-20 12:21:31 +01:00
Gutyina Gergő 38c556af0b Update jdk version to 23 2024-11-19 23:31:24 +01:00
Gutyina Gergő 0b9d777109 Remove string templates 2024-11-19 23:31:24 +01:00
Armin Schrenk eb3c1f3c7a Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2024-11-19 10:01:00 +01:00
Armin Schrenk 311c490377 Merge branch 'hotfix/1.14.2' 2024-11-19 09:59:27 +01:00
Armin Schrenk 39ed00ff6f Use correct version 2024-11-19 09:57:56 +01:00
Armin Schrenk 28338d2dcf use stable version 2024-11-19 09:50:46 +01:00
Jan-Peter Klein bba5d11bdc small fixes 2024-11-18 18:07:36 +01:00
mindmonkandGitHub 36ef191874 Merge branch 'develop' into feature/dialog-builder 2024-11-18 17:58:59 +01:00
Jan-Peter Klein 3e4c6c1b61 del old logo file 2024-11-18 16:59:13 +01:00
Jan-Peter Klein c9d0224814 fix logo scaling 2024-11-18 16:48:41 +01:00
Armin SchrenkandGitHub 8aed6045a0 Feature: Show update reminder every 14 days (#3597)
fixes #3596

only show update reminder every 14 days
2024-11-15 18:14:57 +01:00
Jan-Peter Klein 8440705436 set resizable false 2024-11-15 15:49:11 +01:00
Jan-Peter Klein af667b10cf code cleanup 2024-11-14 18:09:23 +01:00
Jan-Peter Klein 1b522fe9a0 undo add uiDesigner 2024-11-14 17:20:08 +01:00
Jan-Peter Klein cb3c46744e removed replaced files 2024-11-14 16:38:44 +01:00
Jan-Peter Klein c471289fb5 changed resolveText() to throw Exceptions
removed fxApplication scope
2024-11-14 16:19:50 +01:00
Jan-Peter Klein 18ca563865 custom dialog init 2024-11-14 11:35:23 +01:00
Jan-Peter Klein 2430526ee7 changed to class Builder
used FxmlLoaderFactory.forController
set title and other string values by key
2024-11-06 16:35:19 +01:00
Armin Schrenk c9bb0235e2 use macos 15 for building [ci skip] 2024-11-05 16:18:32 +01:00
Armin Schrenk 2f8236e9db Update release template [ci skip] 2024-11-05 12:10:57 +01:00
Armin Schrenk e4e757606d update dependencies for patch release
Fixes #3574 and #3499. Closes #3569
2024-11-05 11:11:32 +01:00
CryptobotandArmin Schrenk 6fcb796177 New Crowdin updates (#3559)
New translations strings.properties

Afrikaans; Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; English; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Marathi; Norwegian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Urdu (Pakistan); Uyghur; Vietnamese;

[ci skip]

(cherry picked from commit 0fb0bc8e1d)
2024-11-04 17:59:02 +01:00
CryptobotandArmin Schrenk 4d6b035c29 New Crowdin updates (#3553)
New translations strings.properties

Afrikaans; English; Norwegian; Thai; Uyghur;

[ci skip]

(cherry picked from commit 2939702842)
2024-11-04 17:57:43 +01:00
dependabot[bot]andGitHub 68c206a4fa Bump the java-test-dependencies group across 1 directory with 2 updates (#3591) 2024-11-04 15:49:48 +00:00
dependabot[bot]andGitHub d258171131 Bump the maven-build-plugins group across 1 directory with 3 updates (#3598) 2024-11-04 15:47:08 +00:00
dependabot[bot]andGitHub adaf9ef5ce Bump the java-production-dependencies group across 1 directory with 8 updates (#3603) 2024-11-04 15:43:21 +00:00
Tobias HagemannandGitHub 22f299f67c Update README.md
[ci skip]
2024-11-04 15:13:40 +01:00
CryptobotandGitHub 0fb0bc8e1d New Crowdin updates (#3559)
New translations strings.properties

Afrikaans; Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; English; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Marathi; Norwegian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Urdu (Pakistan); Uyghur; Vietnamese; 

[ci skip]
2024-11-04 15:05:37 +01:00
Armin Schrenk da666410fc update dependabot config 2024-11-04 14:56:02 +01:00
Armin Schrenk ea007f3cfe fix IDE issues 2024-10-29 09:46:56 +01:00
Armin Schrenk 1c868a644f remove unused/obsolete static variable 2024-10-29 09:44:50 +01:00
Jan-Peter Klein 5ff6a8c258 used dialogBuilder for dokankySupportEndDialog 2024-10-23 19:48:55 +02:00
Jan-Peter Klein 62d7b7a0c0 replaced RemoveVaultComponent.Builder with CustomDialogBuilder in all places 2024-10-22 18:53:06 +02:00
Jan-Peter Klein 7fcbb57ab1 used builder pattern 2024-10-22 17:07:42 +02:00
Jan-Peter Klein 8e25dcd396 implement CustomDialogBuilder 2024-10-22 14:56:56 +02:00
mindmonkandGitHub a9f1e5b761 Merge pull request #3550 from cryptomator/feature/gdrive-presets
Feature: Refined GoogleDrive Presets - List Only "My Drive" Root Folders
2024-10-18 13:05:50 +02:00
Jan-Peter Klein f642149723 used List.of() for FALLBACK_LOCATIONS 2024-10-16 18:00:47 +02:00
Jan-Peter Klein 4b359d98cb removed unnecessary stream support 2024-10-10 17:39:53 +02:00
Jan-Peter Klein 764fccf0b5 pr mentioned changes 2024-10-10 17:34:23 +02:00
Jan-Peter Klein 81d1059489 added generic 'Remove' string property 2024-10-09 17:35:33 +02:00
Jan-Peter Klein a2574a5883 unified spacing 2024-10-09 16:59:13 +02:00
Jan-Peter Klein 118a1411d8 fixed empty vaultList contextMenu 2024-10-09 16:55:56 +02:00
Jan-Peter Klein 44310cbd0e set missing min width and height 2024-10-09 16:50:26 +02:00
Jan-Peter Klein 2dce7b6f71 removed drivePath param 2024-10-09 14:50:05 +02:00
Jan-Peter Klein 98db82d137 contains instead of stream 2024-10-09 14:48:40 +02:00
Jan-Peter Klein fd55656261 filtered by 'My Drive' and translations 2024-10-08 20:08:37 +02:00
mindmonkandGitHub 978dec64ee Merge pull request #3549 from cryptomator/feature/improve-preferences-contribute-tab
Feature: Optimize 'Support us' Tab in Preferences - Add Supporter Certificate Removal & Improved Layout
2024-10-04 12:27:13 +02:00
mindmonkandGitHub 8d7bf3a370 Merge pull request #3467 from cryptomator/feature/redesign-mainwindow
Feature: Redesigned MainWindow
2024-10-04 12:13:09 +02:00
Jan-Peter Klein 1cea7bcffc set bigger minHeight 2024-10-02 17:03:52 +02:00
Jan-Peter Klein 16e77d4b9b add clear to setStyleClass 2024-10-02 16:56:39 +02:00
Jan-Peter Klein f22111e36f revert unrelated changes 2024-10-02 16:46:41 +02:00
Jan-Peter Klein c5d4c9a9c1 removed duplicate code 2024-10-02 14:20:09 +02:00
mindmonkandGitHub 4bc9b1d60c Merge pull request #3474 from cryptomator/feature/notificationbar
Feature: Introduce NotificationBars for Update is available, Support Cryptomator, and DEBUG MODE
2024-10-02 11:05:58 +02:00
mindmonkandGitHub 7a40a3cb0c Merge branch 'feature/redesign-mainwindow' into feature/notificationbar 2024-10-02 11:05:39 +02:00
mindmonkandGitHub ad555ece8e Merge pull request #3554 from cryptomator/feature/condensed-vault-list
Feature: Add Option to Enable Compact Vault List View
2024-10-02 10:55:51 +02:00
Jan-Peter Klein 2d96d2e5c6 optimised cellSize binding and removed unused imports 2024-10-01 18:56:21 +02:00
Armin SchrenkandGitHub 0a968b60aa Remove Guava dependency and update Dagger 2024-10-01 17:19:31 +02:00
Jan-Peter Klein 3b4f82092d undo string removal 2024-10-01 13:31:43 +02:00
Jan-Peter Klein de16647d00 reformat code 2024-09-26 11:24:57 +02:00
AhmatjanandGitHub 03403e53bc translation: Add Uyghur Language Translation (#3557) 2024-09-26 11:12:26 +02:00
CryptobotandGitHub 2939702842 New Crowdin updates (#3553)
New translations strings.properties

Afrikaans; English; Norwegian; Thai; Uyghur;

[ci skip]
2024-09-26 11:10:21 +02:00
Jan-Peter Klein b3d09a4cae changed apostroph 2024-09-26 10:41:17 +02:00
Jan-Peter Klein 73c0af9749 changed wording and removed unnecessary method calls 2024-09-25 16:20:19 +02:00
Jan-Peter Klein 53c7e031a3 changes mentioned by infeo 2024-09-24 16:14:52 +02:00
Jan-Peter Klein 1e280f2c97 removed FXML loader, elements created programmatically in NotificationBar 2024-09-24 16:05:31 +02:00
Jan-Peter Klein ce82593fc6 simplified bindings 2024-09-24 15:48:15 +02:00
Jan-Peter Klein c2c3d778d1 added @CheckAvailability
changed exception handling
2024-09-24 15:29:13 +02:00
Jan-Peter Klein 7771181e15 changed wording to compact 2024-09-23 14:21:55 +02:00
Jan-Peter Klein 1a39333b4c cr mentioned changes 2024-09-23 14:02:42 +02:00
Armin Schrenk 85472db00a Merge branch 'main' into develop 2024-09-18 13:25:15 +02:00
Armin Schrenk d6a020994e Merge branch 'hotfix/1.14.1' 2024-09-18 13:17:25 +02:00
Armin Schrenk 518f75be32 fixes #3538 2024-09-18 13:16:45 +02:00
Armin Schrenk 28c7dbad69 prepare 1.14.1 2024-09-18 13:16:16 +02:00
Jan-Peter Klein 31e9f3a025 Merge branch 'feature/redesign-mainwindow' into feature/condensed-vault-list 2024-09-17 18:06:14 +02:00
Jan-Peter Klein a03d5af144 add tilter to display only folders with write permissions 2024-09-17 16:49:31 +02:00
Armin Schrenk 50a654d5af [ci skip] use recommended winget-releaser version 2024-09-17 11:37:27 +02:00
Armin Schrenk 1954f31910 [ci skip] Merge branch 'main' into develop 2024-09-17 10:04:32 +02:00
Armin Schrenk 68bf441fdd Merge branch 'release/1.14.0' 2024-09-17 10:03:02 +02:00
Armin Schrenk a606bcb81e finalize 1.14.0 2024-09-17 09:59:22 +02:00
Armin Schrenk fe93e51ffa Merge branch 'develop' into release/1.14.0 2024-09-17 09:51:23 +02:00
CryptobotandGitHub f2949aae63 New Crowdin updates (#3520)
New translations strings.properties

Chinese Simplified; Chinese Traditional; Filipino; German; Punjabi; Romanian; Russian; Slovenian; Turkish; Ukrainian; 

[ci skip]
2024-09-17 09:49:55 +02:00
Armin Schrenk 80e101456b adjust keychainManager to new API 2024-09-16 17:40:49 +02:00
Armin Schrenk 2f311c1dfe use final releases 2024-09-16 17:29:24 +02:00
Jan-Peter Klein c5cfe4d1b3 removed unnecessary properties 2024-09-16 15:40:52 +02:00
Jan-Peter Klein a09b55c81b triggered updatechecker in constructor 2024-09-16 15:39:14 +02:00
Jan-Peter Klein 32f266c721 removed unused vbox in controller 2024-09-16 15:26:45 +02:00
Jan-Peter Klein 3adffad087 removed ALT+F4 shortcut, it is already registered by default 2024-09-16 14:55:51 +02:00
Jan-Peter Klein 84e3cf0762 removed green border and fixed margin for windows 2024-09-16 14:48:06 +02:00
Jan-Peter Klein 1292936904 clean up 2024-09-13 11:49:05 +02:00
Jan-Peter Klein 7a913c89c9 condensed vault list implemented 2024-09-12 11:36:14 +02:00
Jan-Peter Klein 4c4816bdab fixed missing import 2024-09-11 15:10:23 +02:00
Jan-Peter Klein f9bfd5d1b1 set stage owner 2024-09-11 15:06:27 +02:00
Jan-Peter Klein 00e1e3654e implemented remove cert dialog 2024-09-10 18:01:09 +02:00
Tobias HagemannandGitHub 8aaee3710a Update README.md 2024-09-10 11:57:03 +02:00
Jan-Peter Klein 1946fc6c0e filter hidden directories 2024-09-04 15:05:24 +02:00
Jan-Peter Klein 8fb95b67d9 changes mentioned in pull #3270 2024-09-04 14:28:42 +02:00
Jan-Peter Klein e6890e8fa5 Merge branch 'develop' of https://github.com/siard-y/cryptomator into feature/gdrive-presets 2024-09-04 13:56:47 +02:00
Jan-Peter Klein 7cdb2025dc improved supporter cert ui with cert stemp, donate/sponsors link buttons and remove button with dialog 2024-09-04 13:23:36 +02:00
Armin SchrenkandGitHub 414d81dc06 Update mac-dmg.yml
Switch to macOS-12 due to errors
2024-08-20 18:17:08 +02:00
Armin SchrenkandGitHub b450ab028d Update mac-dmg.yml
macos-11 is no more
2024-08-20 17:42:32 +02:00
Armin Schrenk 5a51e53603 Merge branch 'develop' into release/1.14.0 2024-08-20 11:18:22 +02:00
Armin Schrenk d65beb632d Fixes #3519 2024-08-20 11:10:26 +02:00
Armin Schrenk 2b03477d31 prepare 1.14.0 2024-08-19 16:36:31 +02:00
CryptobotandGitHub f25e23da82 New Crowdin updates (#3463)
New translations strings.properties

Arabic; Chinese Simplified; Chinese Traditional; Dutch; Filipino; French; German; Greek; Italian; Japanese; Korean; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Russian; Slovak; Spanish; Swedish; Turkish; Urdu (Pakistan); 

[ci skip]
2024-08-19 16:33:41 +02:00
dependabot[bot]andGitHub 82368e2632 Bump the java-production-dependencies group across 1 directory with 9 updates (#3516) 2024-08-19 14:29:15 +00:00
dependabot[bot]andGitHub 9057090b56 Bump the maven-build-plugins group across 1 directory with 3 updates (#3513) 2024-08-19 14:18:32 +00:00
dependabot[bot]andGitHub 357937e0bf Bump the java-test-dependencies group across 1 directory with 2 updates (#3514) 2024-08-19 14:17:07 +00:00
Armin Schrenk f84a2396eb ignore integrations-api 2.0.0-alpha1 2024-08-19 10:42:58 +02:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>Armin Schrenk
193dcad6e8 Bump the javafx group with 5 updates (#3498)
* Bump javafx from 22.0.1 to 22.0.2
* update build scripts to updated jfx version

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2024-08-19 10:34:14 +02:00
Armin Schrenk 257f4427b8 catch all methods of adding a vault for #2880 2024-08-19 10:27:13 +02:00
Armin Schrenk 4778ba0770 add autostart for deb artifact 2024-08-16 15:56:58 +02:00
Armin SchrenkandGitHub 77b908199e Mitigates #2880 (#3512) 2024-08-16 12:59:38 +02:00
Armin SchrenkandGitHub d448c42f87 Feature: JDK 22.0.2+9 for release artifacts (#3510)
* update jdks for release artifacts to jdk 22.02+9
2024-08-14 16:40:44 +02:00
Armin Schrenk b9403222ba add java.compiler module to build scripts
references 93d0fd41a6 and https://github.com/google/dagger/issues/4321
2024-08-13 16:28:09 +02:00
Armin Schrenk 93d0fd41a6 Update cryptofs to 2.7.0-beta1
Closes #2058
2024-08-13 11:59:23 +02:00
Armin Schrenk 067bd4752c prevent leaking of NVD API key into logs 2024-08-09 11:30:16 +02:00
Armin Schrenk fb4f9fc68f Update integrations-win and -linux for quickAccess service providers 2024-08-09 11:05:02 +02:00
Armin SchrenkandGitHub a20667a156 Merge pull request #3494 from cryptomator/feature/quick-access
Feature: Add unlocked vaults to an quick access area
2024-08-07 16:42:53 +02:00
Armin Schrenk 4d47544244 cleanup 2024-08-07 16:32:30 +02:00
Armin Schrenk d59f149f7c Load quick access service lazy 2024-08-06 15:17:18 +02:00
Armin Schrenk 028f6e7a02 clean up 2024-08-06 15:08:29 +02:00
Armin Schrenk 71e4f98665 hard code default quickaccess service 2024-08-06 12:26:26 +02:00
Tobias Hagemann d60ced52fe added codesigning jdk files in build.sh for local macos builds to match mac-dmg.yml ci build 2024-07-30 21:14:32 +02:00
Tobias Hagemann 45c7d2b071 added provisioning profile to mac build process with updated entitlements 2024-07-30 18:48:54 +02:00
Ralph PlawetzkiandGitHub 7a789d2eed Fixes #3501 (PR #3502) 2024-07-30 12:27:16 +02:00
Armin Schrenk cc1e542146 clean up 2024-07-23 16:50:27 +02:00
Armin Schrenk e4e84d46b6 hide option, if no quick access service is present 2024-07-23 16:50:15 +02:00
Armin Schrenk 61fc53bf9c rename internal method 2024-07-23 16:39:34 +02:00
Tobias HagemannandGitHub f8386a5a99 Update README.md 2024-07-18 15:09:05 +02:00
Armin Schrenk da7e89fc72 fix windows build script 2024-07-17 16:35:33 +02:00
Armin Schrenk 6b57a0ad9c add translation 2024-07-17 11:34:29 +02:00
Armin Schrenk f1eb997804 make quickAccessService togglable & selectable in UI 2024-07-16 17:25:47 +02:00
Armin Schrenk 2fe5180721 cleanup 2024-07-16 17:19:52 +02:00
Jan-Peter Klein 958c22bed8 Merge branch 'feature/redesign-mainwindow' in feature/notificationbar 2024-07-16 14:52:50 +02:00
Jan-Peter Klein 6ff640648f Merge branch 'develop' into feature/redesign-mainwindow 2024-07-16 14:48:50 +02:00
Jan-Peter Klein 7b132adfe2 adjust add vault button position for improved UI 2024-07-16 14:31:11 +02:00
Armin Schrenk 2fa88490bd update to integrations-api 1.4.0-beta2
* differ between using quick access and actual impl
* rename properties
2024-07-16 13:36:37 +02:00
Jan-Peter Klein 5f5b5a5426 set preferences window min width and height 2024-07-09 13:48:45 +02:00
Jan-Peter Klein cb054bb4f5 fix update available check in preference tab selection 2024-07-09 13:46:41 +02:00
Jan-Peter Klein 3497144034 introduced NotificationBar control 2024-07-08 16:42:49 +02:00
dependabot[bot]andGitHub b4f9bc62ca Bump the maven-build-plugins group across 1 directory with 3 updates (#3484) 2024-07-08 07:52:56 +00:00
Tobias HagemannandGitHub 34bface2d7 Merge pull request #3481 from purejava/fix-#3480 2024-07-07 16:40:40 +02:00
Ralph Plawetzki 70e52b1a31 Fix typo
Closes #3480
2024-07-07 15:41:28 +02:00
Tobias HagemannandGitHub 59a2398c4c Update README.md 2024-07-04 11:49:37 +02:00
Jan-Peter Klein edbeea5502 fixed update check on start and bindings 2024-07-02 15:31:28 +02:00
Jan-Peter Klein a88e08147d changed background color of pref button 2024-07-02 15:08:07 +02:00
Jan-Peter Klein 8ff06a3efd implement hideable notification bars 2024-07-02 12:43:27 +02:00
Jan-Peter Klein 902c66cf1e removed vbox id and renamed style 2024-07-01 18:19:30 +02:00
Jan-Peter Klein d58307d1d6 optimize vaultList height update to avoid repeated bindings 2024-07-01 13:09:53 +02:00
Jan-Peter Klein 3e6204a657 remove showMinimizeButton setting 2024-07-01 12:32:50 +02:00
Jan-Peter Klein e677a0beaa removed MainWindowTitleController and ResizeController and the corresponding fxml 2024-07-01 12:25:48 +02:00
Armin Schrenk e5003c1783 use quick access service in unlock/lock 2024-06-27 17:47:05 +02:00
Jan-Peter Klein d379ada100 addded debug, update and support notification bar 2024-06-26 15:13:28 +02:00
Jan-Peter Klein cb7d0ade47 fixed some SonarCloud mentioned issues 2024-06-26 13:43:21 +02:00
Armin Schrenk d6fd012f71 fix av whitelisting step in win-exe workflow 2024-06-26 13:28:37 +02:00
Armin Schrenk d9d8c84230 adjust formatting of metainfo file 2024-06-26 13:23:38 +02:00
Jan-Peter Klein 4d9dc4312d Merge branch 'develop' into feature/redesign-mainwindow 2024-06-26 13:07:53 +02:00
Julian Raufelder 1ad2cc3ee5 Update to JDK 22 2024-06-26 11:57:17 +02:00
Armin Schrenk 2eac09f6be [ci skip] Merge branch 'main' into develop 2024-06-26 10:29:47 +02:00
Armin Schrenk 4114ea6163 Merge branch 'release/1.13.0' 2024-06-26 10:29:15 +02:00
Armin Schrenk 82da9f7a88 finalize release 2024-06-26 10:27:29 +02:00
Armin Schrenk aa08046c4d Merge branch 'develop' into release/1.13.0 2024-06-21 15:18:39 +02:00
Armin Schrenk b6d7f63470 [ci skip] also sign binaries from CraC project (dammn zulu jdk) 2024-06-21 15:10:47 +02:00
Armin Schrenk 624d18238c Merge branch 'develop' into release/1.13.0 2024-06-21 14:38:38 +02:00
Armin Schrenk 3bfe2b7a9e fix Windows build 2024-06-21 14:38:17 +02:00
Armin Schrenk ba79cd0f8c prepare 1.13.0 2024-06-21 11:55:54 +02:00
Armin Schrenk be63ea1104 Closes #3439 2024-06-21 11:51:49 +02:00
CryptobotandGitHub a3ad2a5677 New Crowdin updates (#3355)
New translations strings.properties

Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Marathi; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2024-06-21 11:29:09 +02:00
dependabot[bot]andGitHub 26e5ceea01 Bump the maven-build-plugins group with 2 updates (#3459) 2024-06-21 08:20:05 +00:00
dependabot[bot]andGitHub 83f1c4ea41 Bump org.mockito:mockito-core in the java-test-dependencies group (#3427) 2024-06-21 08:19:43 +00:00
Armin SchrenkandGitHub 8d78e1432a Merge pull request #3454 from cryptomator/feature/jfx22
Feature: Update to jfx22
2024-06-20 14:43:15 +02:00
mindmonkandGitHub d2ec5a5646 Merge pull request #3457 from cryptomator/feature/dokany-info-dialog
Feature: Migrate volume type Dokany to Default one and Display Info Dialog
2024-06-17 12:20:39 +02:00
Jan-Peter Klein 6bb0328799 removed dialog in naming 2024-06-14 14:20:18 +02:00
Jan-Peter Klein 8a8617b480 renamed method and code refactored 2024-06-14 11:07:21 +02:00
Jan-Peter Klein 92fad41b96 Merge branch 'develop' into feature/redesign-mainwindow 2024-06-13 12:49:59 +02:00
Jan-Peter Klein 7484744038 minor text change 2024-06-13 12:06:38 +02:00
Jan-Peter Klein 0bbc4ecae5 refactored code and new method handleDokanySupportEndAndShowDialog 2024-06-13 12:06:18 +02:00
Jan-Peter Klein 9fcb166047 close dialog by click on 'Open Preferences' 2024-06-13 12:04:34 +02:00
Jan-Peter Klein 1ac017e3ab changed dialog prefix 2024-06-13 11:51:01 +02:00
Jan-Peter Klein 1ba401b8e6 changed wording of button and description
primary color for icon
2024-06-12 12:02:40 +02:00
Armin Schrenk 07303b58f7 Merge branch 'develop' into feature/jfx22 2024-06-12 11:16:41 +02:00
Armin SchrenkandGitHub 32a463768c Merge pull request #3456 from purejava/fix-#3453
Workaround for malformed javafx POM. Closes #3453.
2024-06-12 11:14:52 +02:00
Armin Schrenk 2307950e3b add javafx.platform property workaround to other build/ci scripts 2024-06-12 10:58:49 +02:00
Ralph Plawetzki 8108128c22 Temporary work around for JavaFX upstream bug
Occurs with Maven 3.9.7, fixed with Gluon JavaFX 23-ea+20, that contains a fixed parent POM
See https://mail.openjdk.org/pipermail/openjfx-dev/2024-May/047279.html
2024-06-11 19:59:18 +02:00
Jan-Peter Klein 58fe6da7a8 Merge branch 'develop' into feature/dokany-info-dialog 2024-06-11 15:25:23 +02:00
Jan-Peter Klein 92bf73297a add dokany info dialog 2024-06-11 14:43:56 +02:00
Armin Schrenk 0bf8fb39dd Update to javafx 22.0.1 2024-06-07 15:39:42 +02:00
Armin Schrenk 0dc9a3a834 align local build scripts 2024-06-07 14:56:54 +02:00
Armin Schrenk 91d6264b9f ignore downloaded artifact 2024-06-06 12:10:03 +02:00
Armin Schrenk d2599ea525 closes #2656 2024-06-06 12:07:18 +02:00
dependabot[bot]andGitHub 7180af9bc7 Bump the java-production-dependencies group across 1 directory with 9 updates (#3446) 2024-06-03 10:30:50 +00:00
Armin SchrenkandGitHub dc993dc57c fixes #3440 (PR in #3447) 2024-06-03 12:29:54 +02:00
dependabot[bot]andGitHub 464c74ab6c Bump the maven-build-plugins group across 1 directory with 2 updates (#3431) 2024-06-03 09:39:36 +00:00
Jan-Peter Klein e038348dca changed mainWindow StageStyle to UNDECORATED
removed main_window_title area
moved main_window_resize functions to MainWindowController
put add vault button under the vault list and wrapped both in a ScrollPane
bound vault list height properties to amount of entries and width to scroll pane width
add listener to scroll down after adding a vault
moved preferences button under vault list
new style classes for new elements
changed wording
2024-05-28 21:56:03 +02:00
Armin SchrenkandGitHub 8c7dd8c74f Merge pull request #3435 from cryptomator/feature/jdk22
Feature: JDK22
2024-05-21 16:58:57 +02:00
Armin Schrenk 69bcf6fac6 do not forget to update debian files
(dammn you unflexible launchpad!)
2024-05-21 12:51:01 +02:00
Armin Schrenk 7c243dd434 pin cryptolib version due removed jdk.crypto.ec package 2024-05-16 17:51:04 +02:00
Armin Schrenk 357a0b9c31 closes #3376 2024-05-14 17:58:21 +02:00
Armin Schrenk d69d11b82f update dependencies requiring JDK 22 2024-05-14 17:25:56 +02:00
mindmonkandGitHub 863e9bbcb3 Merge pull request #3362 from cryptomator/feature/update-checker-refactoring
Feature: Expansion of Preferences Update Tab with UI Elements and Refactoring of UpdateChecker
2024-05-10 16:31:26 +02:00
Jan-Peter Klein 1c47012033 undo getter changes 2024-05-10 15:57:04 +02:00
Jan-Peter Klein cd99eaa323 updateAvailable ObservableValue to BooleanBinding 2024-05-10 15:51:41 +02:00
Jan-Peter Klein dda2afda92 refactored ObservableValues to BooleanBindings and code cleanup 2024-05-10 15:45:17 +02:00
Jan-Peter Klein 5519eefcfa cr related changes 2024-05-10 14:55:50 +02:00
Jan-Peter Klein a81352800d removed twoWeeksAgo var 2024-05-08 11:38:23 +02:00
Jan-Peter Klein 6fec16e498 removed unused ui function 2024-05-08 10:57:42 +02:00
Jan-Peter Klein 42f31204a3 removed lastUpdateReminder setting 2024-05-08 09:41:58 +02:00
Jan-Peter Klein 7ab64cfe46 removed lastUpdateReminder setting 2024-05-08 09:05:26 +02:00
Jan-Peter Klein 1581a10c04 removed unused label id 2024-05-08 08:30:06 +02:00
Jan-Peter Klein 249becc25d removed unused instance var 2024-05-08 08:28:53 +02:00
Jan-Peter Klein da8e84f39d removed unnecessary HBox 2024-05-07 13:27:52 +02:00
Jan-Peter Klein 9ad2d223c3 changed BooleanBinding updateAvailable to ObservableValue<Boolean> 2024-05-07 13:23:53 +02:00
Jan-Peter Klein 3bf1e659ef changed checkFailed text wording 2024-05-07 12:41:39 +02:00
Jan-Peter Klein e79257e5ea changed checkFailed property to ObservableValue 2024-05-06 13:46:49 +02:00
Armin Schrenk dac517a6fb update project ot jdk 22
Note: dependency bumps regarding jdk22 compatiblilty are missing!
2024-05-02 16:59:45 +02:00
mindmonkandGitHub 1ab808f1b0 Merge pull request #3414 from MSevenR/feature/double-click-unlocked-vault
Double-click on an Unlocked Vault
2024-05-02 09:31:56 +02:00
Jan-Peter Klein 08f81b7df4 registered module in SettingsJsonTest 2024-04-29 11:12:14 +02:00
Jan-Peter Klein b16f32ca83 introduced new dependency
removed latestVersion from Settings
changed SettingsJson from Date to Instant
new UpdateChecker Property checkFailed
optimized naming
changed wordning
refactoring
2024-04-29 10:34:17 +02:00
MSevenR d6ed88b544 Double-click on an Unlocked Vault
Double-click on an Unlocked Vault in the List to Reveal It
2024-04-26 01:44:45 -05:00
Jan-Peter Klein ae697d7b73 refactor isUpdateSuccessfulAndCurrent to instance variable 2024-04-25 10:54:00 +02:00
Jan-Peter Klein ff3306cc17 removed blank line, unused instance variable, import and Logger
refactored DateTimeFormatter into an instance variable
2024-04-24 15:03:49 +02:00
Armin Schrenk 9ae2f4e0f6 add timezone id to timestamp in settings 2024-04-23 16:12:59 +02:00
Armin Schrenk 4230afcbac refactored timeDiff-message-method to updatePref controller 2024-04-23 16:12:36 +02:00
Armin Schrenk 7fc6ab05a4 use Instant also in UpdateChecker 2024-04-23 15:19:45 +02:00
Armin Schrenk 060f6bfc97 change storage of timestamps in model to Instant 2024-04-23 15:18:37 +02:00
Jan-Peter Klein 919dac6caa refactoring 2024-04-22 16:35:20 +02:00
Jan-Peter Klein 98bcf63b2c remove lastUpdateCheck from Settings; add lastUpdateReminder and lastSuccessfulUpdateCheck
implement updateTimeDifferenceMessage
reorder UI elements
refactor code for clarity and maintainability
2024-04-17 11:40:58 +02:00
Tobias HagemannandGitHub 0585262952 Merge pull request #3395 from purejava/flathub-colour-banners
Add coloured banners for app in Flathub store
2024-04-13 16:33:31 +02:00
Ralph PlawetzkiandGitHub a33dc3980e Use colours from Cryptomator CD manual 2024-04-13 15:36:52 +02:00
Ralph PlawetzkiandGitHub caa5e77386 Swap the light and dark colors, it's calmer for the eye 2024-04-13 08:48:20 +02:00
Ralph Plawetzki c037920e79 Add coloured banners for app in Flathub store 2024-04-12 17:45:38 +02:00
Armin SchrenkandGitHub 3cdd352d39 Update check-jdk-updates.yml
Use latest jdk version for jdk check
2024-04-10 12:27:05 +02:00
dependabot[bot]andGitHub 8ae80e2932 Bump the maven-build-plugins group with 2 updates (#3391) 2024-04-09 08:34:03 +00:00
dependabot[bot]andGitHub 2ffa1ee236 Bump the github-actions group with 2 updates (#3387) 2024-04-09 08:16:34 +00:00
Tobias HagemannandGitHub 2bf5b57823 Update README.md
[ci skip]
2024-04-05 12:33:38 +02:00
Jan-Peter Klein 853ea69180 updated log error message as suggested by coderabbit 2024-04-04 13:30:47 +02:00
Jan-Peter Klein 43d0dd99ec adjusted code as per PR suggestions 2024-04-04 12:37:56 +02:00
Armin Schrenk b40e6db701 Merge branch 'main' into develop 2024-03-27 13:02:32 +01:00
Armin Schrenk 387eb420eb Merge branch 'hotfix/1.12.4' 2024-03-27 12:58:36 +01:00
Armin Schrenk 7785bb8820 finalize 1.12.4 2024-03-27 12:57:55 +01:00
Armin Schrenk de4fa8c7b0 use latest WiX version
fixes CVE-2024-29187 and CVE-2024-29188
2024-03-27 12:55:13 +01:00
Armin Schrenk 17f519e01c prepare 1.12.4 2024-03-27 12:53:49 +01:00
dependabot[bot]andGitHub 6c50023074 Bump the maven-build-plugins group with 2 updates (#3380) 2024-03-25 09:09:23 +00:00
Sebastian Stenzel 0009940e1e adjusted after dependency update 2024-03-14 12:09:10 +01:00
Armin Schrenk f2a50b59b5 well, that should be the last reference to dokany 2024-03-12 09:56:30 +01:00
Armin SchrenkandGitHub ed03606981 One should also remove the actual dependency 2024-03-12 09:51:11 +01:00
Armin Schrenk 4a1eaf25c7 Closes #3361, Fixes #3351 2024-03-12 09:46:37 +01:00
dependabot[bot]andGitHub f5e445a610 Bump the java-production-dependencies group with 3 updates (#3365) 2024-03-12 07:57:00 +00:00
Jan-Peter Klein 6a3a256c0b Merge branch 'develop' into feature/update-checker-refactoring 2024-03-08 10:28:16 +01:00
Jan-Peter Klein 1ed77ebcc0 code cleanup 2024-03-08 10:27:35 +01:00
Jan-Peter Klein db224e9e5c added latestVersion and lastUpdateCheck to settings and integrated with update checker 2024-03-08 09:58:59 +01:00
dependabot[bot]andGitHub c719982ef3 Bump the github-actions group with 1 update (#3354) 2024-03-05 17:24:28 +00:00
dependabot[bot]andGitHub f783f5d5ec Bump the java-test-dependencies group with 1 update (#3358) 2024-03-05 17:21:45 +00:00
dependabot[bot]andGitHub dd4f87b54c Bump the java-production-dependencies group with 4 updates (#3359) 2024-03-05 17:21:09 +00:00
Jan-Peter Klein b3789700e1 add upToDateLabel and fix update indicator issue 2024-03-05 12:56:38 +01:00
Jan-Peter Klein b39834f4eb Merge branch 'develop' into feature/update-checker-refactoring 2024-03-05 10:18:32 +01:00
Jan-Peter Klein 8064d75102 removed state label and reorganized ui elements 2024-03-05 10:15:11 +01:00
Jan-Peter Klein 4064b61cd7 refactored updateChecker by incorporating state management and date tracking 2024-02-29 09:29:26 +01:00
Armin Schrenk ef3affece3 [ci skip] fix wrong PR description in flathub workflow 2024-02-28 13:42:37 +01:00
Armin Schrenk 414465371b [ci skip] refactor win-exe workflow
* only publish, if msi and exe succeed
* make stable release jobs dependent of publish
2024-02-28 13:19:54 +01:00
Armin Schrenk feed72a729 [ci skip] fix flathub workflow 2024-02-27 22:52:56 +01:00
Armin Schrenk bca20a7a66 [ci skip] seperate av whitelisting into own workflow to be able to upload assets on failure 2024-02-27 18:55:14 +01:00
Armin Schrenk a38377baaa [ci skip] Merge branch 'main' into develop 2024-02-27 12:53:30 +01:00
Armin Schrenk 61a45fc738 Merge branch 'release/1.12.3' 2024-02-27 12:52:00 +01:00
Armin Schrenk 3a65b5551f adjust release check to changed metainfo file
references fcb940e29c
2024-02-27 12:48:36 +01:00
Armin Schrenk 94ed5c18b8 damnn merge from develop to release 2024-02-27 12:41:06 +01:00
Armin Schrenk a559483d86 finalize 1.12.3 2024-02-27 12:38:52 +01:00
Armin Schrenk 3acdef1dd0 Merge branch 'develop' into release/1.12.3 2024-02-27 12:37:13 +01:00
Armin Schrenk def6f8ab95 [ci skip] clean up 2024-02-27 12:35:55 +01:00
Armin Schrenk 11ba1f3ddc revert 1ab73be1f4 and 2d968eac8c 2024-02-27 12:32:37 +01:00
CryptobotandGitHub 3228f2cf5f New Crowdin updates (#3343)
New translations strings.properties

Chinese Simplified; Dutch; French; Japanese; Portuguese; Russian; Slovak; Swedish; 

[ci skip]
2024-02-27 10:23:56 +01:00
Armin Schrenk 9c4f7ad79d [ci skip] remove unknown env/style combination from appstream metadata 2024-02-26 17:41:18 +01:00
Armin Schrenk 3bd57d162b [ci skip] update appstream metadata 2024-02-26 17:37:04 +01:00
dependabot[bot]andGitHub 5ea73a5a8d Bump the java-production-dependencies group with 1 update (#3347) 2024-02-26 09:50:42 +00:00
Armin Schrenk 38670838c7 [ci skip] Drop yq usage 2024-02-26 10:15:25 +01:00
Armin Schrenk 3e0b84dbce [ci skip] fix pr body description & reduce log noise 2024-02-23 17:39:38 +01:00
Armin Schrenk 2302db6206 [ci skip] fix create pr command in flathub job 2024-02-23 17:27:48 +01:00
Armin Schrenk a94bf99660 [ci skip] automatically set up tracking branch on push 2024-02-23 17:13:11 +01:00
Armin Schrenk 0c5ce353b1 [ci skip] use github.actor 2024-02-23 17:05:26 +01:00
Armin Schrenk b3ce777a42 [ci skip] configure git in flathub job 2024-02-23 16:29:18 +01:00
Armin Schrenk 3085df3397 [ci skip] further fixes:
* remove yq after update
* set token for git
2024-02-23 16:14:21 +01:00
Armin Schrenk fb740b605f add missing quote char [ci skip] 2024-02-23 15:57:06 +01:00
Armin Schrenk 6a74d9f3b2 use same varaible in get-version job 2024-02-23 15:53:22 +01:00
Armin Schrenk 1c7dffb63f Add ci job to create flathub PR on release [ci skip] 2024-02-23 15:44:48 +01:00
Jan-Peter Klein a213f073b1 enhance screen selection by adding primary fallback 2024-02-23 10:51:23 +01:00
Armin Schrenk 1ab73be1f4 fixes #3344 2024-02-22 16:11:54 +01:00
Armin Schrenk 8412871090 apply proper formatting and state to error dialog 2024-02-22 12:23:43 +01:00
Armin Schrenk fa63f3ca67 Reset develop to SNAPSHOT version 2024-02-22 12:21:00 +01:00
Armin Schrenk dbc0f52481 fix not-uploading artifacts on release 2024-02-21 22:04:35 +01:00
Armin Schrenk b8cd1caeac also upload asc file as artifact for mac build 2024-02-21 13:09:14 +01:00
Armin Schrenk 43c25b6d97 fix ci
references 84732337ca
2024-02-21 12:53:01 +01:00
Armin Schrenk e44bc09074 Merge branch 'develop' into release/1.12.3 2024-02-21 12:20:36 +01:00
CryptobotandGitHub 7b02f78ef5 New Crowdin updates (#3342)
New translations strings.properties

Arabic; Bashkir; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Marathi; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2024-02-21 12:13:24 +01:00
Armin Schrenk f7e8a4d1e6 prepare 1.12.3 2024-02-20 18:13:01 +01:00
Armin Schrenk 664375d692 fix wrong method name 2024-02-20 18:06:55 +01:00
Armin SchrenkandGitHub 2d968eac8c Merge pull request #3336 from cryptomator/feature/3272-vaultid-as-mountpoint
Feature: For FUSE-Ts default mountpoint use vault id as mountpoint
2024-02-20 17:34:09 +01:00
Armin Schrenk 542d2fcfe1 only create winget PR for stable versions [ci skip] 2024-02-19 16:42:42 +01:00
mindmonkandGitHub 144e929896 Merge pull request #3335 from cryptomator/feature/center-unlock-dialog-on-mainstage
Center Unlock Success Dialog on Main Application Window
2024-02-19 15:05:28 +01:00
Armin Schrenk 803748f78d update code-sign-action [ci skip] 2024-02-19 14:46:58 +01:00
Armin Schrenk 3410e7243a Update minimal required macOS version for dmg
due to javafx update in 7d281e2878
2024-02-19 13:02:05 +01:00
Armin Schrenk 84732337ca removed GTK-2 support
due to javafx update in 7d281e2878
2024-02-19 12:17:11 +01:00
dependabot[bot]andGitHub c527808710 Bump the java-production-dependencies group with 4 updates (#3340) 2024-02-19 09:35:25 +00:00
Armin Schrenk 99c89dbf39 fix possible null comparsion 2024-02-19 10:22:22 +01:00
Jan-Peter Klein 829b64cd3d dialog centers on main app screen if mainWindow is hidden 2024-02-19 08:55:16 +01:00
Jan-Peter Klein f4007267fb simplified the code and removed the function 2024-02-16 17:31:20 +01:00
Armin Schrenk c82a0bfaf3 cleanup 2024-02-16 17:09:05 +01:00
Armin SchrenkandGitHub 251ad65344 Merge pull request #3327 from cryptomator/feature/3233-load-presets-background
Feature: Load LocationPresets in background and show indicator in UI
2024-02-16 16:21:01 +01:00
Jan-Peter Klein 155ba4607b introduced functionality to center the unlock screen within the main application window 2024-02-16 15:24:52 +01:00
Armin Schrenk 62f6865d3e cleanup created directories after mount
fails silently
2024-02-14 10:30:51 +01:00
Armin Schrenk ffb3290248 Merge branch 'develop' into feature/3272-vaultid-as-mountpoint 2024-02-14 10:29:30 +01:00
Armin Schrenk a013ae3d91 [ci skip] change mountPointDir for macOS-Dev-run profile
aligns production build
2024-02-14 10:29:14 +01:00
Armin Schrenk 19a954e677 use correct mountProvider 2024-02-14 10:05:56 +01:00
Armin Schrenk f262980acc closes #3272 2024-02-13 16:37:46 +01:00
Armin Schrenk 3b3aa18c92 fixes #3233
this time with gc prevention of a binding
2024-02-13 00:55:07 +01:00
Armin Schrenk c7b8bc89c2 also don't bother upload to av scan, if not published 2024-02-12 13:18:17 +01:00
Armin Schrenk 5fc981abd3 prevent automatic overwrite of already released files 2024-02-12 13:16:45 +01:00
Armin Schrenk 36ec1a5ebc update windows update url [ci skip] 2024-02-09 18:37:19 +01:00
Armin Schrenk be4aad4168 set default value for Windows debug flag 2024-02-09 17:03:22 +01:00
Armin Schrenk fcb940e29c update release section of appstream metainfo file [ci skip] 2024-02-09 14:52:10 +01:00
Armin Schrenk 4f3ca2a6c4 fix appimage build script [ci skip] 2024-02-09 12:56:33 +01:00
Armin Schrenk 27cd34bee0 Merge branch 'main' into develop [ci skip] 2024-02-09 12:53:16 +01:00
Armin Schrenk c07e51be51 Merge branch 'release/1.12.2' 2024-02-09 12:51:57 +01:00
Armin Schrenk 0421879b39 finalize 1.12.2 2024-02-09 12:51:19 +01:00
Armin Schrenk 2d627717a0 prepare 1.12.2 2024-02-09 10:59:33 +01:00
Armin Schrenk dc0e88a694 fixes #3319 2024-02-09 10:55:27 +01:00
Armin Schrenk a5e3630375 also specify version for winget release [ci skip] 2024-02-08 17:47:50 +01:00
Armin Schrenk 17335e8f70 shorten workflow name [ci skip] 2024-02-08 17:39:38 +01:00
Armin Schrenk 42dd2fba48 github cli needs special token in CI env [ci skip] 2024-02-08 17:37:50 +01:00
Armin Schrenk e1cca6427c Add ci job for releasing to winget 2024-02-08 17:34:02 +01:00
Armin Schrenk 42d3dbaa23 always use latest version of winfsp-uninstaller 2024-02-08 17:10:40 +01:00
Armin Schrenk 185d67c492 Merge branch 'main' into develop [ci skip] 2024-02-07 11:43:59 +01:00
Armin Schrenk a8af3c8b40 Merge branch 'release/1.12.1' 2024-02-07 11:42:58 +01:00
Armin Schrenk 038a7fac62 finalize 1.12.1 2024-02-07 11:42:37 +01:00
Armin Schrenk 48408fa40d prepare 1.12.1 2024-02-07 11:37:44 +01:00
Armin Schrenk 18a417667e Fixes #3315 2024-02-07 11:33:45 +01:00
JaniruTEC aab07b13e3 Changed version specifier for dependency-check
See: https://github.com/cryptomator/cryptofs/pull/202#discussion_r1453615249
2024-02-06 22:28:16 +01:00
Armin Schrenk 869e40e351 use latest coffeelibs-jdk release 2024-02-06 15:34:09 +01:00
Armin Schrenk bf91e3f15c Merge branch 'main' into develop [ci skip] 2024-02-06 14:29:19 +01:00
Armin Schrenk 17544828e4 Merge branch 'release/1.12.0' 2024-02-06 14:28:08 +01:00
Armin Schrenk cfef3139b1 finalize 1.12.0 2024-02-06 14:20:50 +01:00
Armin Schrenk b01ba27b06 Partially reverting 24293b316f 2024-02-06 14:16:03 +01:00
Armin Schrenk 5a33e66a7d prepare 1.12.0 2024-02-06 11:31:42 +01:00
Armin Schrenk 3c4e35406e Bump dependencies 2024-02-06 11:27:02 +01:00
CryptobotandGitHub d3275fa4e7 New Crowdin updates (#3256)
New translations strings.properties

Arabic; Bashkir; Belarusian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Czech; Danish; Dutch; Filipino; French; German; Greek; Hebrew; Hungarian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Slovak; Spanish; Swahili, Tanzania; Swedish; Turkish; Vietnamese;

[ci skip]
2024-02-06 11:21:07 +01:00
dependabot[bot]andGitHub a30db34c19 Bump the java-production-dependencies group with 6 updates (#3295) 2024-02-06 10:18:33 +00:00
dependabot[bot]andGitHub 509100e7ae Bump the java-test-dependencies group with 2 updates (#3312) 2024-02-06 10:17:11 +00:00
dependabot[bot]andGitHub 024c34172b Bump the github-actions group with 5 updates (#3308) 2024-02-06 10:16:24 +00:00
dependabot[bot]andGitHub 638570562b Bump the maven-build-plugins group with 3 updates (#3300) 2024-02-06 10:15:06 +00:00
Sebastian StenzelandGitHub ee5a5c6563 Merge pull request #3291 from cryptomator/feature/legacy-device-migration
Hub 1.2.x → Hub 1.3.x Legacy Device Migration
2024-02-02 14:59:30 +01:00
Armin Schrenk 85c52c60c5 Revert "update javafx to 21.0.2"
This reverts commit 93184abd3c.
2024-02-02 10:45:34 +01:00
Armin Schrenk 93184abd3c update javafx to 21.0.2 2024-01-30 12:55:33 +01:00
Armin Schrenk 8062392ccd update jdk to 21.0.2+13 2024-01-30 12:17:45 +01:00
Jan-Peter Klein d49c02c7de optimize share vault fxml 2024-01-29 17:37:55 +01:00
Sebastian Stenzel d66cfe0e7c adjust to new migration API 2024-01-26 16:48:08 +01:00
mindmonkandGitHub fa26fa9dee Merge pull request #3289 from cryptomator/feature/share-vault
Feature: Introduce 'Share Vault' Functionality
2024-01-26 16:08:06 +01:00
Jan-Peter Klein 52fc94ca01 fixed a spelling error 2024-01-26 16:03:51 +01:00
Jan-Peter Klein e9a412ae16 improved layout and added styleClass for add-box 2024-01-26 15:42:25 +01:00
Jan-Peter Klein 8104c35d76 more specific translation keys and consistent spacing 2024-01-23 19:09:49 +01:00
Jan-Peter Klein baa2e05e69 improved wording and layout 2024-01-23 14:00:20 +01:00
Armin SchrenkandGitHub f50b204cef Merge pull request #3288 from cryptomator/feature/3246-split-device-registration
Feature: Split device registration into "normal" and "legacy" flow
2024-01-22 14:56:45 +01:00
lectricalandJaniruTEC ed902bc59f Hello 2024 2024-01-20 16:22:27 +01:00
Sebastian Stenzel 693299a5d7 first draft of legacy device migration
actual migration still missing due to API discussion
2024-01-20 13:28:56 +01:00
Sebastian Stenzel def64aa2ac added tests 2024-01-20 13:25:57 +01:00
Sebastian Stenzel c5bb8a131d dedup 2024-01-20 13:15:33 +01:00
Sebastian Stenzel 2e443c72a9 add new API encryptVaultKey(vaultKey, userKey)
and `decodeECPublicKey(byte[])`
2024-01-20 13:12:59 +01:00
Sebastian Stenzel e9ee17493b refactor API, expose decodeECPrivateKey(byte[]) 2024-01-20 13:01:48 +01:00
Sebastian Stenzel 35eb548d8e replaced Guava's BaseEncoding with Base64 2024-01-20 12:58:44 +01:00
Sebastian Stenzel dc5d6e734e deduplicate code 2024-01-19 17:55:36 +01:00
Sebastian Stenzel 729f38866f use string templates for URI construction 2024-01-19 17:40:39 +01:00
Jan-Peter Klein 4de8434f1b Merge branch 'develop' into feature/share-vault 2024-01-19 12:31:37 +01:00
Jan-Peter Klein cd40731b5f implemented open hub feature
optimized fxml files and img
2024-01-19 12:30:56 +01:00
Armin SchrenkandGitHub 24293b316f Merge pull request #3236 from cryptomator/feature/3233-locationpresets-background
Feature: Load LocationPresets in background and show indicator in UI
2024-01-19 10:51:46 +01:00
Armin Schrenk 062c674ef1 Always hide spinner, as soon as locationPresetLoading is finished 2024-01-19 10:44:06 +01:00
Armin SchrenkandGitHub 830bb5776f Use naming convention for comparator 2024-01-19 10:04:15 +01:00
Armin Schrenk bfdb23785e Merge branch 'develop' into feature/3233-locationpresets-background 2024-01-18 15:57:45 +01:00
Armin Schrenk 248d655afb ditch custom in-place sorting and rely on javafx methods 2024-01-18 15:45:45 +01:00
Armin Schrenk 995c0a4b92 remove unnecessary TODO 2024-01-17 23:30:41 +01:00
Armin Schrenk 42425afe56 closes #3246
splitting registerSuccess into two scenes, one for hub 1.3.x and one for legacy
2024-01-17 16:52:35 +01:00
Sebastian Stenzel a1b712495f switch back to UI thread later
see https://github.com/cryptomator/cryptomator/pull/3287#discussion_r1453196792
2024-01-17 13:35:23 +01:00
Sebastian Stenzel 2225476bf8 reordered methods
[ci skip]
2024-01-17 13:33:38 +01:00
Sebastian StenzelandGitHub 325057c548 Merge pull request #3287 from cryptomator/feature/refactored-hub-unlock
Refactored Hub Unlock
2024-01-17 13:32:09 +01:00
JaniruTECandGitHub b1a5eed2aa Merge pull request #3286 from cryptomator/refactoring/centralize-dependency-check
Externalize dependency-check
2024-01-16 19:54:32 +01:00
Jan-Peter Klein 4ca190cfb9 implemented a 'Share Vault' button in vault_detail_locked and added a new window for vault sharing options 2024-01-16 17:21:07 +01:00
GiwrgosTsifoutisandGitHub 828fd321cc Fixed "Locked Vault Options after unlocking vault #3249" (#3267)
Fixes #3249 

Bound the UIs disabled state to the vault's lock state without the need of a map
2024-01-16 12:32:36 +01:00
Armin Schrenk 2e32f39986 [ci skip] fix missing translation key
(cherry picked from commit daa026b285)
2024-01-16 11:38:54 +01:00
Armin Schrenk daa026b285 [ci skip] fix missing translation key 2024-01-16 11:38:33 +01:00
Sebastian Stenzel 87084e8c2a TODO now obsolete
as we will now re-attempt unlock when returning from device registration

[ci skip]
2024-01-16 04:14:06 +01:00
Sebastian Stenzel 8e52058373 re-attempt receiving key after registering device 2024-01-16 03:58:30 +01:00
Armin Schrenk 8bf0acf35f build release artifacts with javafx 21.0.1
references 7d281e2878
2024-01-15 16:35:34 +01:00
JaniruTECandGitHub e0d3a3d9c7 Externalized dependency-check 2024-01-15 16:12:27 +01:00
Sebastian Stenzel b59ce75ecd add step 0: check API level 2024-01-14 15:02:41 +01:00
Sebastian Stenzel 748f895b98 change unlock request order 2024-01-14 15:01:51 +01:00
Sebastian Stenzel 6d974c7fcf fix incorrect vaultId 2024-01-14 14:58:58 +01:00
Sebastian Stenzel 0ed73e8b41 use string templates for building /api/* URIs 2024-01-14 14:02:35 +01:00
Sebastian Stenzel 538b4ecd0b added javadoc 2024-01-14 13:59:23 +01:00
Armin Schrenk 8f32b46b30 set no jlink compression for build artifacts
references 00fc2a9837
2024-01-12 13:18:05 +01:00
Armin Schrenk 4de25afde0 wrap locations in scrollPane 2024-01-11 23:48:26 +01:00
Armin Schrenk 2e6c228f3f Merge branch 'develop' into feature/3233-locationpresets-background 2024-01-11 22:59:41 +01:00
Armin Schrenk 00fc2a9837 remove deprecate compress options and use default ones
see also https://bugs.openjdk.org/browse/JDK-8301124?jql=text%20~%20%22compress%22
2024-01-11 22:59:08 +01:00
Armin Schrenk 22e80e7dac update local appimage buildscript to download jmods 2024-01-11 22:56:41 +01:00
Armin Schrenk 517e05c378 use stable version of winfsp-uninstaller 2024-01-11 22:35:51 +01:00
Sebastian StenzelandGitHub 5759b7e596 Merge pull request #3210 from cryptomator/feature/3203-device-already-registered
Feature: Adjust Hub workflow, if device is already registerd
2024-01-11 12:05:25 +01:00
Sebastian Stenzel bfb26f6171 renamed field 2024-01-11 11:46:06 +01:00
Sebastian Stenzel f36e2bb4b7 reduced visibility 2024-01-11 11:45:57 +01:00
Sebastian Stenzel b85e455ff5 renamed field 2024-01-11 11:42:08 +01:00
Sebastian Stenzel a902400522 get rid of registerException
use separate views, no need to pass state between views
2024-01-11 11:23:54 +01:00
Sebastian Stenzel a6d6474294 Merge branch 'develop' into feature/3203-device-already-registered 2024-01-11 11:02:45 +01:00
Sebastian Stenzel 06859fe36b remove newline
[ci skip]
2024-01-11 10:27:42 +01:00
Sebastian StenzelandGitHub 7d7b7c1dc9 Merge pull request #3260 from cryptomator/feature/annihilate-FUPFMS
annihilate FUPFMS
2024-01-11 10:25:21 +01:00
Sebastian Stenzel 706d2b51be remove added newline
[ci skip]
2024-01-11 10:24:28 +01:00
Armin SchrenkandGitHub 92bf136a8b Merge pull request #3278 from mooons/issue-3277
Bump README's build dependency JDK version from 19 to 21
2024-01-09 12:03:21 +01:00
mooons f00f028d8b Bump README's build dependency JDK version from 19 to 21. Fix #3277 2024-01-09 01:57:59 -08:00
Siard d85c6c8f41 Create separate files for GoogleDrive presets providers. cryptomator/2921
- Change imports accordingly in module-info.java
2024-01-03 16:42:46 +01:00
Siard 17057e8f8d Add Google Drive presets improvement. cryptomator/2921
- The code now defaults to searching through '~/Library/CloudStorage/GoogleDrive-*/*' before using the fallback options.
2024-01-03 16:41:11 +01:00
dependabot[bot]andGitHub 325092efb0 Bump the java-test-dependencies group with 1 update (#3238) 2023-12-26 04:32:24 +00:00
dependabot[bot]andGitHub aaf8036713 Bump the maven-build-plugins group with 3 updates (#3264) 2023-12-25 19:40:21 +00:00
Sebastian Stenzel c86ee679a9 renamed fuse-specific exception to be more generic 2023-12-21 10:05:22 +01:00
Sebastian Stenzel a0fcb63a1a replaced FUPFMS
with more generic set of used mount services
2023-12-21 09:40:43 +01:00
Armin SchrenkandGitHub 55ba255651 Update dependency-check.yml
to not run into 403 due to rate limit
2023-12-18 10:49:47 +01:00
dependabot[bot]andGitHub 47df4213c3 Bump the java-production-dependencies group with 5 updates (#3255) 2023-12-18 09:40:34 +00:00
Armin Schrenk 6929760979 adjust dependency check plugin 2023-12-13 16:47:30 +01:00
Armin Schrenk 720fbd0e6b use separate cache for dependency-cache data 2023-12-13 16:47:08 +01:00
mindmonkandGitHub 923af4bc83 Merge pull request #3199 from cryptomator/feature/vault-volume-type
Feature: Customizable Volume Type Options for Each Vault
2023-12-13 16:16:08 +01:00
Jan-Peter Klein e9c464ba8f sonar cloud issues solved 2023-12-13 15:56:39 +01:00
Jan-Peter Klein 7b0f616747 Merge branch 'develop' into feature/vault-volume-type 2023-12-13 15:50:55 +01:00
Jan-Peter Klein 65788f3c1f pr mentioned changes 2023-12-13 15:50:37 +01:00
Jan-Peter Klein f55fbf0f64 code cleanup and optimized a description text 2023-12-13 09:25:50 +01:00
Armin Schrenk 851838e3a2 remove run of dependency-chec workflow for release branches (already done in check release workflow) 2023-12-12 14:58:48 +01:00
Armin Schrenk e194f9b205 update dependency check and refactor to own workflow 2023-12-12 14:56:48 +01:00
Jan-Peter Klein 2f8df88ad5 Merge branch 'develop' into feature/vault-volume-type
# Conflicts:
#	src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
2023-12-12 12:48:59 +01:00
Jan-Peter Klein 55247d9f8a moved provideDefaultMountService to MountModule and renamed problematicFuseMountServices to CONFLICTING_MOUNT_SERVICES 2023-12-12 12:38:33 +01:00
dependabot[bot]andGitHub 48f273b755 Bump ch.qos.logback:logback-core from 1.4.13 to 1.4.14 (#3251) 2023-12-12 08:48:54 +00:00
Jan-Peter Klein 4fc31cb13f refactored 'loopbackPortSupported' from 'BooleanExpression' to 'ObservableValue<Boolean>' in VolumePreferencesController and MountOptionsController 2023-12-11 15:16:41 +01:00
Jan-Peter Klein a795b82a42 vault options ui change 2023-12-11 14:49:54 +01:00
Jan-Peter Klein 1e28a04a7b renamed string properties 2023-12-11 10:16:26 +01:00
Jan-Peter Klein b88eef4591 renamed string property 2023-12-08 12:03:08 +01:00
Jan-Peter Klein eef5edf775 code cleanup 2023-12-08 11:14:54 +01:00
Armin Schrenk bdb1d605eb Add cloud vendor to example of involved software 2023-12-07 18:43:10 +01:00
Armin Schrenk dfe4b74f3d clean code:
* remove unused methods
* combine or move methods
2023-12-07 17:48:58 +01:00
Jan-Peter Klein 985a3c30de changed string properties for volume type labels 2023-12-07 13:56:04 +01:00
Jan-Peter Klein 1b5125dfed refactored code, global default volume type settings 2023-12-07 10:48:33 +01:00
Jan-Peter Klein da240ce8b9 optimized error message 2023-12-07 08:40:39 +01:00
Jan-Peter Klein 52affb891e refactored mount method 2023-12-06 16:41:36 +01:00
Jan-Peter Klein fac72ca24a undo remove settings port 2023-12-06 09:44:05 +01:00
Jan-Peter Klein 5cbed502ed undo VaultListManager changes 2023-12-06 08:49:21 +01:00
Jan-Peter Klein dce4c60881 removed pr unrelated changes and code cleanup 2023-12-06 08:40:43 +01:00
Jan-Peter Klein 63bf0315c7 created global mountService 2023-12-05 16:21:12 +01:00
Armin Schrenk 8b543c48ee [ci skip] Merge branch 'main' into develop 2023-12-05 11:11:31 +01:00
Armin Schrenk 087a5326df Merge branch 'release/1.11.1' 2023-12-05 11:09:36 +01:00
Armin Schrenk a4545352d8 finalize 1.11.1 2023-12-05 11:09:09 +01:00
dependabot[bot]andGitHub a07dea7ca8 Bump the github-actions group with 2 updates (#3235) 2023-12-05 08:39:49 +00:00
Jan-Peter Klein c369487e8e Merge branch 'develop' into feature/vault-volume-type 2023-12-01 09:13:38 +01:00
Jan-Peter Klein 98590ecec5 refactoring 2023-12-01 09:11:43 +01:00
Armin SchrenkandGitHub 316f3975ed add missing import 2023-11-30 18:24:52 +01:00
Armin SchrenkandGitHub 71bf7e0913 Simplify handling of window hiding events 2023-11-30 18:22:07 +01:00
dependabot[bot]andGitHub c7839e2c46 Bump the java-production-dependencies group with 2 updates (#3234) 2023-11-30 14:26:07 +00:00
Armin Schrenk 89b8bc4148 adjust ui and add localization 2023-11-30 11:44:41 +01:00
Armin Schrenk 43ad1c05c0 cancel background task, if window is closed 2023-11-30 11:18:33 +01:00
Armin Schrenk 1343099be6 [ci skip] correct dependabot config 2023-11-30 10:03:29 +01:00
Armin Schrenk b895ac69fb fixes #3233 2023-11-29 18:45:52 +01:00
dependabot[bot]andGitHub 7d281e2878 Bump the javafx group with 5 updates (#3229) 2023-11-29 15:08:31 +00:00
Armin Schrenk 688450bf5a prepare 1.11.1 2023-11-28 13:38:05 +01:00
CryptobotandGitHub e994133177 New Crowdin updates (#3191)
New translations strings.properties

Bulgarian; Chinese Simplified; Chinese Traditional; Dutch; Filipino; French; Greek; Hungarian; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Spanish; Swedish; Turkish; 

[ci skip]
2023-11-28 13:32:08 +01:00
dependabot[bot]andGitHub 68713ef9a7 Merge pull request #3228 from cryptomator/dependabot/maven/maven-build-plugins-907533b1a4 2023-11-28 12:28:35 +00:00
Armin Schrenk dbacbc8874 do not exectue dependency-check on CI (due to missing NVD API key) 2023-11-28 13:25:47 +01:00
dependabot[bot]andGitHub 8382299a05 Bump the maven-build-plugins group with 4 updates
Bumps the maven-build-plugins group with 4 updates: [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin), [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire), [org.codehaus.mojo:license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) and [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck).


Updates `org.apache.maven.plugins:maven-dependency-plugin` from 3.6.0 to 3.6.1
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.6.0...maven-dependency-plugin-3.6.1)

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.1.2 to 3.2.2
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.1.2...surefire-3.2.2)

Updates `org.codehaus.mojo:license-maven-plugin` from 2.2.0 to 2.3.0
- [Release notes](https://github.com/mojohaus/license-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/license-maven-plugin/compare/2.2.0...2.3.0)

Updates `org.owasp:dependency-check-maven` from 8.4.0 to 9.0.1
- [Release notes](https://github.com/jeremylong/DependencyCheck/releases)
- [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.4.0...v9.0.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: maven-build-plugins
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven-build-plugins
- dependency-name: org.codehaus.mojo:license-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven-build-plugins
- dependency-name: org.owasp:dependency-check-maven
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: maven-build-plugins
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-11-28 12:20:39 +00:00
dependabot[bot]andGitHub 93b09cf449 Bump the java-production-dependencies group with 6 updates (#3230) 2023-11-28 12:19:58 +00:00
dependabot[bot]andGitHub dac3311b81 Bump the java-test-dependencies group with 2 updates (#3227) 2023-11-28 12:05:42 +00:00
Armin Schrenk 5b1ca7a533 update dependabot config 2023-11-28 12:59:39 +01:00
Armin Schrenk e940c29110 Closes #3226 2023-11-28 12:44:42 +01:00
Jan-Peter Klein 6a704ca0ad Merge branch 'develop' into feature/vault-volume-type 2023-11-27 16:24:35 +01:00
Jan-Peter Klein 38c102a64b refactored code by removing unnecessary observables 2023-11-27 12:46:29 +01:00
Armin Schrenk b632c84bb6 more renaming 2023-11-24 11:23:22 +01:00
Armin Schrenk 6bb5ed1d73 fixes #3207 2023-11-24 11:19:44 +01:00
Jan-Peter Klein 1052e4c3d2 fix gui issues in vault mount settings 2023-11-23 10:55:17 +01:00
44f776050f Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2023-11-22 21:36:15 +01:00
Armin Schrenk baa29dbd73 remove unused translation key 2023-11-17 16:33:53 +01:00
Armin Schrenk 1caf391936 use correct word for button label 2023-11-17 16:24:23 +01:00
Armin Schrenk 82caf76e12 clean up 2023-11-17 15:51:20 +01:00
Armin Schrenk de27bbf96e always cancle unlock result when closing the unlock window 2023-11-17 15:50:39 +01:00
Armin Schrenk 1199ef40dd on 409 repsonse of registerDevice-request, show setupFailed with adjusted message 2023-11-17 15:47:08 +01:00
Jan-Peter Klein e7e88f13e3 improved code quality 2023-11-17 14:51:13 +01:00
Armin Schrenk 41c22b7840 Rename leftovers 2023-11-17 13:30:40 +01:00
Armin SchrenkandGitHub 19cc4e8a37 Merge pull request #3194 from AntoineJT/feature/3155-toggle-vault-status-on-double-click
Feature: Double click on a vault in the list to unlock it
2023-11-15 16:51:44 +01:00
Jan-Peter Klein 7bc1d52bf8 set deprecated since of settingsjson port to 1.12.0, changed button text and added tooltip to 'show vault options' button 2023-11-12 13:49:47 +01:00
Antoine James Tournepiche fd84ff09e1 No longer lock vault on double click
See https://github.com/cryptomator/cryptomator/pull/3194#issuecomment-1806106843
2023-11-10 22:05:58 +01:00
Antoine James Tournepiche 3dce175f94 Improve naming, avoid shadowing 2023-11-10 17:42:19 +01:00
Antoine James Tournepiche 0aaa3263cf Improve feature #3155 implementation 2023-11-09 23:50:34 +01:00
Antoine James Tournepiche c4dcbd8c44 Implement requested feature #3155
Toggle selected vault lock status on double click on a vault item
in the vault list on the main window
2023-11-09 23:42:22 +01:00
Jan-Peter Klein ef9cdd8e92 Merge branch 'develop' into feature/vault-volume-type
# Conflicts:
#	src/main/resources/i18n/strings.properties
2023-11-08 11:45:03 +01:00
Armin Schrenk 09ced50590 [ci skip] reset to snapshot version 2023-11-08 11:28:21 +01:00
Armin Schrenk b2ab1a30a5 Merge branch 'main' into develop 2023-11-08 11:26:49 +01:00
Armin Schrenk 9eff3916b3 Merge branch 'release/1.11.0' 2023-11-08 11:26:13 +01:00
Armin Schrenk 98472d1952 use correct release date 2023-11-08 11:25:45 +01:00
Armin Schrenk 1ceafb69a5 finalize 1.11.0 2023-11-08 11:22:27 +01:00
Armin Schrenk f3f4b6576c Merge branch 'develop' into release/1.11.0
# Conflicts:
#	src/main/resources/i18n/strings.properties
2023-11-08 10:52:30 +01:00
CryptobotandGitHub e699d7dafc New Crowdin updates (#3189)
* New translations strings.properties
German, Spanish, Turkish
[ci skip]
2023-11-08 10:51:07 +01:00
CryptobotandGitHub 5eb6d186c0 New Crowdin updates (#3188)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-11-08 10:41:05 +01:00
Armin Schrenk edc9409e56 pin wording 2023-11-08 10:19:12 +01:00
JaniruTEC d015719fae Removed outdated translations 2023-11-07 18:52:48 +01:00
JaniruTEC afc69e447e Renamed "setup code" to "Account Key" in localization files 2023-11-07 18:20:10 +01:00
JaniruTEC 54fbbd734f Renamed "setup code" to "Account Key" in UI 2023-11-07 18:19:12 +01:00
Jan-Peter Klein 2f657c7c14 migrate port to vault settings 2023-11-07 12:42:07 +01:00
Sebastian StenzelandArmin Schrenk d29872e69e add "Action Required" prompt
when encountering http status 449 during vault unlock. fixes #3181

Co-authored-by: SailReal <julian.raufelder@skymatic.de>
(cherry picked from commit f2e7d0fae2)
2023-11-07 12:20:27 +01:00
Jan-Peter Klein ab9278a9fc Merge branch 'develop' into feature/vault-volume-type 2023-11-03 10:48:00 +01:00
Jan-Peter Klein 49769f986a remove port from settings 2023-11-03 10:47:43 +01:00
Jan-Peter Klein b68b895bba removed tcp port from volume preferences controller 2023-11-02 16:53:29 +01:00
Tobias Hagemann 99fb9972f9 updated sponsors
[ci skip]
2023-11-02 15:37:19 +01:00
Sebastian StenzelandSailReal f2e7d0fae2 add "Action Required" prompt
when encountering http status 449 during vault unlock. fixes #3181

Co-authored-by: SailReal <julian.raufelder@skymatic.de>
2023-11-02 14:41:58 +01:00
Jan-Peter Klein 77f9e6c411 some ui and wording changes 2023-11-02 13:47:58 +01:00
Jan-Peter Klein 31fcf294e9 fix misbehaivour 2023-11-01 14:59:25 +01:00
Jan-Peter Klein a03f00ee9a set up default mount service as pre fallbackProvider 2023-10-31 20:29:54 +01:00
Jan-Peter Klein 80af32bd82 introduced FuseRestartRequiredException and UnlockFuseRestartRequired window 2023-10-30 17:05:09 +01:00
Jan-Peter Klein b7e4c0fe31 set default mount service and port while adding a vault 2023-10-30 15:27:11 +01:00
Jan-Peter Klein 76d499596f Merge branch 'develop' into feature/vault-volume-type 2023-10-30 14:33:32 +01:00
Jan-Peter Klein 1818344c49 different labeling for volume type option in general volume preferences and vault options 2023-10-30 14:33:01 +01:00
Armin Schrenk 7ff2e22f17 Merge branch 'develop' into release/1.11.0 2023-10-30 10:41:11 +01:00
CryptobotandGitHub 4eee66b0ef New Crowdin updates (#3128)
New translations strings.properties

Arabic; Belarusian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Czech; Danish; Dutch; Filipino; Finnish; French; German; Greek; Hebrew; Hungarian; Italian; Japanese; Korean; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Romanian; Russian; Slovak; Spanish; Swahili, Tanzania; Swedish; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-10-30 10:39:04 +01:00
Sebastian Stenzel 19fe7ba6bf updated to tiny-oauth2-client 0.8.0 2023-10-27 19:54:58 +02:00
Armin SchrenkandGitHub 7b522582fb Merge pull request #3163 from cryptomator/feature/3075-fix-ci-jdk-version
Feature: Use fixed JDK version for releases
2023-10-27 12:51:49 +02:00
Jan-Peter Klein e79c975d7b prevent mounting via MountFailedException when fuseRestartRequired 2023-10-27 12:39:25 +02:00
Armin SchrenkandGitHub 7594e51e2b Update debian.yml
Remove architecture in apt install dependency
2023-10-27 12:30:37 +02:00
Armin Schrenk b3f0ff3662 use coffeelibs JDK for release builds 2023-10-27 12:10:37 +02:00
Armin SchrenkandGitHub 8ce304a0c3 Add link to how-to-jdk-update in notification 2023-10-26 16:21:22 +02:00
Jan-Peter Klein c85823fe04 code cleanup 2023-10-26 12:18:40 +02:00
Jan-Peter Klein 8f46aec851 created MountServiceConverter class 2023-10-26 10:35:16 +02:00
Jan-Peter Klein cd6d1eeab3 moved fupfms to VaultModule 2023-10-26 10:25:11 +02:00
Jan-Peter Klein 52b74a74fe display specific mount options according to selected volume type in vault mounting options 2023-10-25 14:02:29 +02:00
Jan-Peter Klein 368f0630c1 some sonar cloud fixes 2023-10-25 12:44:22 +02:00
Jan-Peter Klein 040bc4c5df fix sonar cloud issues 2023-10-24 14:26:06 +02:00
Jan-Peter Klein 07906fbea5 modified mounter to utilize the mount service settings specified in the vault settings 2023-10-24 14:04:53 +02:00
Armin SchrenkandGitHub f893b2b5be Merge pull request #3026 from cryptomator/feature/uninstall-old-winfsp
Feature: Update to WinFsp 2.x and uninstall old winfsp in Windows EXE installer
2023-10-23 12:26:28 +02:00
Armin Schrenk db868c6df7 move worklfow to correct directory 2023-10-20 16:22:45 +02:00
Jan-Peter Klein 44f67b7c89 Merge branch 'develop' into feature/vault-volume-type 2023-10-20 15:58:52 +02:00
Sebastian Stenzel 6225d8d1f0 Merge branch 'develop' into release/1.11.0 2023-10-20 14:00:42 +02:00
Sebastian Stenzel ed975b459e bump dependencies 2023-10-20 14:00:08 +02:00
Armin Schrenk 652a6f5c4d use environment variables and update current jdk 2023-10-20 13:42:00 +02:00
Armin Schrenk a7a94099a8 Closes #3075 2023-10-20 13:35:03 +02:00
Armin Schrenk 71a3cbc334 add workflow to check for jdk updates 2023-10-20 13:29:43 +02:00
Armin SchrenkandGitHub 800b2440b3 Merge pull request #3157 from cryptomator/feature/3113-network-timeout
Time restrict network requests
2023-10-20 12:58:08 +02:00
Sebastian Stenzel f50a49e7a3 prepare 1.11.0 2023-10-20 12:11:06 +02:00
Sebastian Stenzel 92ece4dfb6 increased request timeout to 10s 2023-10-20 12:06:10 +02:00
Sebastian Stenzel 174225c60e add timeout to OAuth2 requests 2023-10-20 12:03:07 +02:00
Sebastian Stenzel 3071410a22 Merge branch 'develop' into feature/3113-network-timeout 2023-10-20 12:00:16 +02:00
Sebastian StenzelandGitHub 5c5777ffc5 Merge pull request #3091 from cryptomator/feature/simplify-out-of-bounds
simplify out-of-bounds check
2023-10-20 11:56:36 +02:00
Sebastian StenzelandGitHub 8dd8b93656 Merge pull request #3041 from cryptomator/feature/new-hub-keyloading
Adjusted to Hub 1.3.x API
2023-10-20 11:55:28 +02:00
Armin Schrenk 3b2d455b4a Update dependencies 2023-10-19 17:31:52 +02:00
Sebastian Stenzel b0dfa22903 removed unused class 2023-10-19 12:49:19 +02:00
Sebastian Stenzel 88b1c28d88 Merge branch 'develop' into feature/new-hub-keyloading 2023-10-19 11:33:13 +02:00
Sebastian Stenzel 5b85d7859a bump webdav-nio-adapter version 2023-10-19 11:28:54 +02:00
Sebastian Stenzel 468eed58d5 cleanup 2023-10-19 10:00:14 +02:00
Sebastian Stenzel 34c17be474 add request timeouts 2023-10-19 10:00:03 +02:00
Sebastian Stenzel 5dedd6b1c1 renamed class again 2023-10-18 11:30:22 +02:00
Sebastian Stenzel 25e8e81686 support apiBaseUrl in hub config 2023-10-18 11:08:42 +02:00
Sebastian Stenzel 1f7ab03bbb undo JEP 443 changes due to bug in javac
leads to invalid class files when built via Maven due to specific combination of javac arguments
2023-10-18 11:01:26 +02:00
Sebastian Stenzel 86f3cb7288 applied suggestions from code review 2023-10-18 09:40:34 +02:00
Sebastian Stenzel a1b8bf23b4 Merge branch 'develop' into feature/new-hub-keyloading 2023-10-18 09:40:03 +02:00
Sebastian StenzelandGitHub 1f21d5ea4c Merge pull request #3129 from cryptomator/feature/jdk21
JDK 21
2023-10-18 09:39:12 +02:00
Sebastian Stenzel f8ff7201d7 Merge branch 'develop' into feature/new-hub-keyloading 2023-10-18 08:50:34 +02:00
Armin Schrenk 3567c036c3 remove unused imports 2023-10-17 17:25:38 +02:00
Armin Schrenk 0cf1f087ad Closes #3113 2023-10-17 11:36:50 +02:00
Armin Schrenk 209f60727e fix f4ad7aa43d 2023-10-16 16:38:12 +02:00
Armin Schrenk 56624fc079 Replace URL files by hardcoded links in build scripts 2023-10-16 16:35:17 +02:00
Armin Schrenk 218c5243e3 Merge branch 'develop' into feature/uninstall-old-winfsp 2023-10-16 16:29:57 +02:00
Armin SchrenkandGitHub 560a979e0e Merge pull request #3131 from cryptomator/feature/sign-all-dlls
Feature: Sign all dlls to pass Microsoft Windows Smart App control
2023-10-16 16:21:08 +02:00
Sebastian Stenzel 1debe4c7c8 explicitly set Logback ConfiguratorRank 2023-10-16 16:20:03 +02:00
Sebastian Stenzel 2e2aa77727 update dependencies 2023-10-16 16:19:11 +02:00
Sebastian Stenzel 162ebf6545 Merge branch 'develop' into feature/jdk21 2023-10-16 16:12:10 +02:00
Armin Schrenk cf09eff640 Use new version of uninstaller:
* logging
* correct reboot
2023-10-13 17:49:48 +02:00
Armin SchrenkandGitHub 2d503a0edb Merge pull request #3148 from cryptomator/feature/propagate-deleted-discussions
Propagate deleted discussions to the error database
2023-10-13 17:01:45 +02:00
Julian Raufelder 7f7f0a099a Propagate deleted discussions to the error database 2023-10-12 14:11:54 +02:00
Julian Raufelder 109f5d1faa Update the error-db when a discussion is deleted 2023-10-12 10:56:14 +02:00
Armin Schrenk 38a5d40b64 Merge branch 'develop' into feature/uninstall-old-winfsp 2023-10-11 16:14:26 +02:00
Armin Schrenk 9b55f6fc56 Refactor extraction and singing in seperate steps 2023-10-11 12:55:05 +02:00
Sebastian Stenzel 83879f5cfe revert 8e9d54b & 6c5ee14 due to bug in JDK 21
see https://bugs.openjdk.org/browse/JDK-8313323
2023-10-09 16:19:56 +02:00
Armin SchrenkandGitHub 083ac5a7e0 Merge pull request #3133 from purejava/build-arch
Improve AppImage build script
2023-10-09 13:10:05 +02:00
dependabot[bot]andGitHub a7eba377ba Bump org.mockito:mockito-core from 5.5.0 to 5.6.0 (#3142) 2023-10-09 09:58:47 +00:00
dependabot[bot]andGitHub 4ee1e6d9f1 Bump the github-actions group with 1 update (#3135) 2023-10-04 20:24:43 +00:00
Ralph Plawetzki 24a63c10d0 Build for aarch64 too 2023-09-30 14:54:15 +02:00
Armin Schrenk 0d805b2d43 clean up 2023-09-28 18:34:38 +02:00
Armin Schrenk 7bc47fe6d7 Really fixes #3130 2023-09-28 18:33:26 +02:00
Armin Schrenk ae50846257 Revert ce466e7715 2023-09-28 18:33:01 +02:00
Armin Schrenk ce466e7715 fixes #3130 2023-09-28 13:47:51 +02:00
Armin Schrenk 15885545b5 supress some output 2023-09-27 11:13:52 +02:00
Armin Schrenk 29fedcd390 integrate code from test script into github workflow 2023-09-27 10:24:59 +02:00
Armin Schrenk fadd6b761f add cert import 2023-09-26 17:30:18 +02:00
Armin Schrenk d857335901 update test script:
* use variables
* use signtool
* find newest signtool version
2023-09-26 16:43:00 +02:00
Armin Schrenk 93b4cbfb2c add test script 2023-09-26 13:42:18 +02:00
Armin Schrenk 625334c6c8 fix windows build script 2023-09-25 16:02:31 +02:00
Sebastian Stenzel 943374856e build using JDK 21 GA 2023-09-25 12:18:01 +02:00
Sebastian Stenzel e1d7fd92ad Merge branch 'develop' into feature/jdk21
# Conflicts:
#	pom.xml
2023-09-25 12:15:14 +02:00
Sebastian Stenzel c10dc74818 update integrations-linux to 1.4.0-beta1 2023-09-25 12:12:28 +02:00
Tobias Hagemann 92d9f2c18d try to fix mac build script to be compatible with create-dmg 1.2.0 2023-09-20 15:27:17 +02:00
Armin SchrenkandGitHub d7488b6984 fix wrong pom version 2023-09-20 15:16:18 +02:00
Tobias Hagemann 88ad3cd724 Merge branch 'develop' into feature/new-hub-keyloading 2023-09-20 14:38:13 +02:00
Armin Schrenk ba9e0b0c12 Merge branch 'main' into develop 2023-09-20 11:34:37 +02:00
Armin Schrenk bbe7255901 Merge branch 'release/1.10.1' 2023-09-20 11:33:39 +02:00
Armin Schrenk 51e55d3e3b finalize 1.10.1 2023-09-20 11:09:37 +02:00
Armin Schrenk f704dc0de9 prepare 1.10.1 2023-09-20 11:07:50 +02:00
CryptobotandGitHub e858280f30 New Crowdin updates (#3110)
New Crowdin updates (#3110)

New translations strings.properties

Bulgarian; Chinese Traditional; 

[ci skip]
2023-09-20 11:05:33 +02:00
Armin SchrenkandGitHub f9b170204a Merge pull request #3118 from cryptomator/feature/3117-disable-update-check
Disable Update Check
2023-09-20 11:02:14 +02:00
Armin SchrenkandGitHub 0ed7415a0d Merge pull request #3109 from cryptomator/feature/error-dialog-request-with-errorcode
Enhance user agent string when downloading error code database
2023-09-20 11:02:01 +02:00
Armin Schrenk 7a0d50ecca removed unnecessary import 2023-09-20 10:48:26 +02:00
Armin SchrenkandGitHub 19e035aa33 Merge pull request #3123 from cryptomator/feature/context-menu-focus
Fix addVaultButton misbehavior
2023-09-19 20:56:56 +02:00
Jan-Peter Klein 830970cb75 improved format and naming 2023-09-19 16:29:12 +02:00
Jan-Peter Klein 9b2987d0a2 improved function naming 2023-09-19 16:26:55 +02:00
Armin Schrenk 76a4062f8b update org.cryptomator.integrations:integrations-win from 1.2.2 to 1.2.3 2023-09-19 15:12:45 +02:00
Jan-Peter Klein 113717f955 addVaultButton context menu event filter removed 2023-09-19 15:12:40 +02:00
Jan-Peter Klein c40ad58028 detached context menu from button to fix misbehavior 2023-09-19 15:03:22 +02:00
Jan-Peter Klein d6a7efcb7f added OS_NAME, OS_VERSION and OS_ARCH to user-agent 2023-09-19 14:00:45 +02:00
Jan-Peter Klein 910b89d6ce Merge branch 'develop' into feature/error-dialog-request-with-errorcode 2023-09-19 13:19:40 +02:00
Tobias Hagemann 5554dfdd89 fixes #3121 2023-09-19 12:22:24 +02:00
Tobias Hagemann 1657cd50fc fixes #3112 2023-09-19 12:12:27 +02:00
Sebastian Stenzel 57bf5e11b5 Merge branch 'develop' into feature/simplify-out-of-bounds 2023-09-18 19:33:25 +02:00
Sebastian Stenzel 594ca47c85 Merge branch 'develop' into feature/jdk21
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
2023-09-18 19:33:06 +02:00
Sebastian Stenzel 6c5ee14c73 rename unused var 2023-09-18 19:29:35 +02:00
Sebastian Stenzel 8e9d54b44b rename unused var 2023-09-18 19:27:28 +02:00
Sebastian Stenzel 70805665bf use features of Java 21 with --enable-preview 2023-09-18 19:21:56 +02:00
Sebastian Stenzel ac243a706e improve readability 2023-09-18 19:13:03 +02:00
Sebastian Stenzel aa382ce80d update coffeelibs jdk to 21 2023-09-18 19:10:54 +02:00
b7da508ccc Update src/main/java/org/cryptomator/ui/mainwindow/ResizeController.java
Co-authored-by: Bas Ruigrok <Rexbas@proton.me>
2023-09-18 13:19:58 +02:00
Sebastian Stenzel 47bd0ca647 disable update check for PPA builds 2023-09-18 13:10:19 +02:00
Sebastian Stenzel c5d6c0ce98 add cryptomator.disableUpdateCheck property 2023-09-18 13:03:09 +02:00
Sebastian Stenzel 6017d6b7a9 bump webdav-nio-adapter
containing fixes for CVE-2023-40167, CVE-2023-2976, CVE-2023-37895
2023-09-18 12:34:49 +02:00
Sebastian Stenzel e31e06b288 added @VisibleForTesting 2023-09-18 10:13:51 +02:00
Sebastian Stenzel 84ac803a7d reordered properties
[ci skip]
2023-09-18 10:10:50 +02:00
Armin SchrenkandGitHub bcb970afb1 Update bug.yml
Add missing FUSE option in volume type selection
2023-09-13 13:59:50 +02:00
Jan-Peter Klein 9d640b57ce added build number to user-agent header 2023-09-13 12:31:53 +02:00
Jan-Peter Klein 4c83617847 fixed build error 2023-09-12 18:07:30 +02:00
Jan-Peter Klein 5d7906972b added user-agent header with <product> / <product-version> to HttpRequest 2023-09-12 17:59:08 +02:00
Jan-Peter Klein 666cd4a4f0 enhanced request URI with URLEncoder for errorCode 2023-09-12 17:14:45 +02:00
Jan-Peter Klein eb4d39e8b4 introduce 'errorCode' parameter in request 2023-09-12 13:34:55 +02:00
Jan-Peter Klein 44ec19122a added port and mountService to vaultSettings 2023-09-12 02:19:08 +02:00
Jan-Peter Klein 8ba2540b35 implemented volume type selection in 'vault options mount' 2023-09-11 14:23:31 +02:00
Armin Schrenk a1ad89a2e2 Merge branch 'main' into develop [ci skip] 2023-09-11 09:56:35 +02:00
Armin Schrenk 38108299fa Merge branch 'release/1.10.0' 2023-09-11 09:55:14 +02:00
Armin Schrenk 189e2679f1 finalize 1.10.0 2023-09-11 09:53:35 +02:00
Armin Schrenk 22ceb57052 Merge branch 'develop' into release/1.10.0 2023-09-11 09:51:13 +02:00
Armin Schrenk 0130c7cce6 fix local windows build script [ci skip] 2023-09-11 09:50:41 +02:00
CryptobotandGitHub 18b6484731 New Crowdin updates (#3095)
New translations strings.properties

Arabic; Chinese Simplified; Filipino; German; Japanese; Norwegian Bokmal; Polish; Portuguese, Brazilian; Spanish; Swedish; Ukrainian; 

[ci skip]
2023-09-11 09:46:49 +02:00
Sebastian Stenzel f19ff59005 add suffix to uploaded artifacts 2023-09-06 16:47:29 +02:00
Sebastian Stenzel 8786b5ee2a can't use env vars in matrix builds 2023-09-06 16:43:58 +02:00
Sebastian Stenzel c7e23f9646 build AppImage for aarch64 2023-09-06 16:40:00 +02:00
Sebastian Stenzel 4043e3f71f build using JDK 21 2023-09-06 16:22:41 +02:00
Tobias Hagemann 08887f1147 Merge branch 'develop' into feature/new-hub-keyloading 2023-09-06 14:18:11 +02:00
Sebastian Stenzel 13a0578ab7 fix checksum file format 2023-09-06 13:05:01 +02:00
Sebastian Stenzel 888bf04ec2 fix workflow files 2023-09-06 13:01:48 +02:00
Sebastian Stenzel d0822041ec renamed workflow file 2023-09-06 12:58:08 +02:00
Sebastian Stenzel e65a57bba9 harmonize workflow files
in regards to JDK distribution and OpenJFX downloads
2023-09-06 12:57:41 +02:00
Armin SchrenkandGitHub 2bb1b09789 Merge pull request #3097 from cryptomator/dependabot/maven/maven-dependencies-a3030d6477
Bump the maven-dependencies group with 3 updates
2023-09-04 14:00:36 +02:00
dependabot[bot]andGitHub b83dad4e24 Bump the maven-dependencies group with 3 updates
Bumps the maven-dependencies group with 3 updates: org.slf4j:slf4j-api, [com.google.dagger:dagger](https://github.com/google/dagger) and [com.google.dagger:dagger-compiler](https://github.com/google/dagger).


Updates `org.slf4j:slf4j-api` from 2.0.7 to 2.0.9

Updates `com.google.dagger:dagger` from 2.47 to 2.48
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.47...dagger-2.48)

Updates `com.google.dagger:dagger-compiler` from 2.47 to 2.48
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.47...dagger-2.48)

---
updated-dependencies:
- dependency-name: org.slf4j:slf4j-api
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: maven-dependencies
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven-dependencies
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: maven-dependencies
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-09-04 06:48:51 +00:00
Armin Schrenk 4bb28f4286 Merge branch 'develop' into release/1.10.0 2023-09-01 16:14:16 +02:00
CryptobotandGitHub 721cdf20e7 New Crowdin updates (#3071)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-09-01 16:13:46 +02:00
Armin SchrenkandGitHub cf248c5cbc Merge pull request #3080 from purejava/fix-3079
Bring up the main window from the tray on pressing "Show" on the tray…
2023-09-01 16:06:15 +02:00
Armin Schrenk 151ca75e5f Merge branch 'develop' into release/1.10.0 2023-09-01 15:43:44 +02:00
mindmonkandGitHub 0e52b7aff4 Merge pull request #3082 from cryptomator/feature/add-vault-button-to-dropdown
UI Enhancement: Improved 'Add Vault' Button Functionality
2023-08-31 15:39:12 +02:00
Jan-Peter Klein 3a0199a1e5 updated menuItemExisting to display folder icon instead of plus icon 2023-08-31 12:17:57 +02:00
Jan-Peter Klein 50e96095ba moved the context menu creation code to the fxml file 2023-08-31 11:49:49 +02:00
Jan-Peter Klein 2f5bce6229 Merge branch 'develop' into feature/add-vault-button-to-dropdown 2023-08-30 12:06:41 +02:00
Armin Schrenk 06f288ef76 only execute winfsp-uninstaller on install or repair 2023-08-29 17:51:05 +02:00
Armin Schrenk ffcad9f1ec reformat 2023-08-29 17:32:49 +02:00
Armin Schrenk 031dc8a31a bump exe uninstaller to new version and skip uninstaller on bundle uninstall 2023-08-29 17:25:43 +02:00
Sebastian Stenzel 62f50ce366 rename groups
[ci skip]
2023-08-29 07:52:37 +02:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
864c1c9c0d Bump the all group with 1 update (#3089)
Bumps the all group with 1 update: [org.mockito:mockito-core](https://github.com/mockito/mockito).

- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.4.0...v5.5.0)

---
updated-dependencies:
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: all
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-08-29 07:48:37 +02:00
Sebastian Stenzel cfd433b328 revert to simple of of bounds check
as suggested in https://github.com/cryptomator/cryptomator/pull/3017#discussion_r1264527894 with minor adjustments
2023-08-29 07:26:46 +02:00
Tobias Hagemann ad97338f9b fixes #2517 2023-08-28 15:13:24 +02:00
Armin SchrenkandGitHub 5d596f4fd0 Merge pull request #3017 from Rexbas/out_of_bounds_fix
Reset position when out of display bounds
2023-08-28 14:58:52 +02:00
Rexbas aa14d79642 Restore a closed minimized window at (-32000, -32000) to the last saved position
Fixes #3079, second scenario.
2023-08-23 18:57:04 +02:00
Rexbas 745d435a57 Remove displayConfiguration from settings 2023-08-23 18:57:04 +02:00
Rexbas 094a7c6a20 Check display bounds onShowing event 2023-08-23 18:57:04 +02:00
Rexbas aedbefc38a Reset window position when out of display bounds 2023-08-23 18:57:00 +02:00
dependabot[bot]andGitHub 0cd3cf9e1c Merge pull request #3081 from cryptomator/dependabot/maven/all-f18bb33e46 2023-08-23 13:51:07 +00:00
Armin Schrenk 422efcc89f [ci skip] use new version of winfsp-uninstaller 2023-08-23 15:43:57 +02:00
Jan-Peter Klein ef24141713 new stage titles for addNewVault and addExistingVault 2023-08-23 13:36:41 +02:00
Jan-Peter Klein 820d4ff573 disabled right click on add vault button and enhanced naming 2023-08-23 13:17:38 +02:00
Armin Schrenk c1c0c2e82f [ci skip] use new version of winfsp-uninstaller 2023-08-22 10:47:18 +02:00
Jan-Peter Klein f024f0ee5d Merge branch 'develop' into feature/add-vault-button-to-dropdown 2023-08-21 13:06:13 +02:00
Jan-Peter Klein a038b34e29 implemented enhanced styling for MenuItems 2023-08-21 13:05:42 +02:00
dependabot[bot]andGitHub 4cc516def6 Bump the all group with 2 updates
Bumps the all group with 2 updates: [com.nulab-inc:zxcvbn](https://github.com/nulab/zxcvbn4j) and [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck).


Updates `com.nulab-inc:zxcvbn` from 1.8.0 to 1.8.2
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/main/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.8.0...1.8.2)

Updates `org.owasp:dependency-check-maven` from 8.3.1 to 8.4.0
- [Release notes](https://github.com/jeremylong/DependencyCheck/releases)
- [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.3.1...v8.4.0)

---
updated-dependencies:
- dependency-name: com.nulab-inc:zxcvbn
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all
- dependency-name: org.owasp:dependency-check-maven
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-21 07:01:49 +00:00
Ralph Plawetzki bb1095eb78 Bring up the main window from the tray on pressing "Show" on the tray menu for Windows
Fixes #3079
2023-08-19 19:14:46 +02:00
Armin Schrenk 4c11190be9 Improve error template 2023-08-18 15:11:19 +02:00
Armin Schrenk c6790fec70 [ci skip] use new version of winfsp-uninstaller 2023-08-17 12:01:58 +02:00
Tobias Hagemann 8a7a5eeea1 fixed grammar 2023-08-16 17:17:27 +02:00
Jan-Peter Klein 34328c10bf changed add vault icon to caret down and set contentDisplay RIGHT 2023-08-15 16:31:42 +02:00
Jan-Peter Klein c4d503c8d5 removed unused import 2023-08-15 16:24:07 +02:00
Jan-Peter Klein 5fdf5141a5 removed addVaultWelcome stuff 2023-08-15 14:47:47 +02:00
Jan-Peter Klein 9be00a2693 removed didClickAddVault and added SHORTCUT_O 2023-08-15 14:34:06 +02:00
Jan-Peter Klein 17778f32b9 expanded functionality: implemented showAddNewVaultWizard and showAddExistingVaultWizard functions 2023-08-15 14:30:55 +02:00
Armin Schrenk bcbdad99bc Closes #1929 2023-08-14 17:26:44 +02:00
Jan-Peter Klein 1e6d2bb6fb enhanced ui by introducing context menu for 'add vault' button 2023-08-14 17:15:17 +02:00
Armin Schrenk e9ef122e7f Merge branch 'develop' into feature/uninstall-old-winfsp 2023-08-14 15:13:11 +02:00
Armin Schrenk 57fee3e428 Adding plugin to display junit tests properly in console 2023-08-14 13:44:47 +02:00
Armin Schrenk 4ea45e937a extract mvn build plugin versions to own properties 2023-08-14 10:50:05 +02:00
Armin SchrenkandGitHub dc80d79da0 Merge pull request #3073 from cryptomator/dependabot/maven/all-f66be4cce2
Bump the all group with 20 updates
2023-08-14 10:42:34 +02:00
Armin Schrenk 57f68376fe Merge branch 'develop' into release/1.10.0 2023-08-14 10:28:13 +02:00
dependabot[bot]andGitHub f47cfa60c5 Bump the all group with 20 updates
Bumps the all group with 20 updates:

| Package | Update |
| --- | --- |
| [ch.qos.logback:logback-core](https://github.com/qos-ch/logback) | 1.4.7 to 1.4.11 |
| [ch.qos.logback:logback-classic](https://github.com/qos-ch/logback) | 1.4.7 to 1.4.11 |
| org.apache.commons:commons-lang3 | 3.12.0 to 3.13.0 |
| [io.github.coffeelibs:tiny-oauth2-client](https://github.com/coffeelibs/tiny-oauth2-client) | 0.5.1 to 0.6.0 |
| [com.nulab-inc:zxcvbn](https://github.com/nulab/zxcvbn4j) | 1.7.0 to 1.8.0 |
| [com.google.guava:guava](https://github.com/google/guava) | 32.0.1-jre to 32.1.2-jre |
| [com.google.dagger:dagger](https://github.com/google/dagger) | 2.45 to 2.47 |
| [com.google.dagger:dagger-compiler](https://github.com/google/dagger) | 2.45 to 2.47 |
| [org.junit.jupiter:junit-jupiter](https://github.com/junit-team/junit5) | 5.9.3 to 5.10.0 |
| [org.mockito:mockito-core](https://github.com/mockito/mockito) | 5.3.1 to 5.4.0 |
| [com.google.jimfs:jimfs](https://github.com/google/jimfs) | 1.2 to 1.3.0 |
| [org.jetbrains:annotations](https://github.com/JetBrains/java-annotations) | 23.0.0 to 24.0.1 |
| [org.cryptomator:integrations-mac](https://github.com/cryptomator/integrations-mac) | 1.2.0 to 1.2.1 |
| [org.apache.maven.plugins:maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) | 3.10.1 to 3.11.0 |
| [org.apache.maven.plugins:maven-resources-plugin](https://github.com/apache/maven-resources-plugin) | 3.3.0 to 3.3.1 |
| [org.apache.maven.plugins:maven-dependency-plugin](https://github.com/apache/maven-dependency-plugin) | 3.3.0 to 3.6.0 |
| [org.apache.maven.plugins:maven-surefire-plugin](https://github.com/apache/maven-surefire) | 3.0.0-M7 to 3.1.2 |
| [org.codehaus.mojo:license-maven-plugin](https://github.com/mojohaus/license-maven-plugin) | 2.0.0 to 2.2.0 |
| [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) | 0.8.9 to 0.8.10 |
| [org.owasp:dependency-check-maven](https://github.com/jeremylong/DependencyCheck) | 8.1.2 to 8.3.1 |


Updates `ch.qos.logback:logback-core` from 1.4.7 to 1.4.11
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.7...v_1.4.11)

Updates `ch.qos.logback:logback-classic` from 1.4.7 to 1.4.11
- [Commits](https://github.com/qos-ch/logback/compare/v_1.4.7...v_1.4.11)

Updates `org.apache.commons:commons-lang3` from 3.12.0 to 3.13.0

Updates `io.github.coffeelibs:tiny-oauth2-client` from 0.5.1 to 0.6.0
- [Release notes](https://github.com/coffeelibs/tiny-oauth2-client/releases)
- [Commits](https://github.com/coffeelibs/tiny-oauth2-client/compare/0.5.1...0.6.0)

Updates `com.nulab-inc:zxcvbn` from 1.7.0 to 1.8.0
- [Release notes](https://github.com/nulab/zxcvbn4j/releases)
- [Changelog](https://github.com/nulab/zxcvbn4j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/nulab/zxcvbn4j/compare/1.7.0...1.8.0)

Updates `com.google.guava:guava` from 32.0.1-jre to 32.1.2-jre
- [Release notes](https://github.com/google/guava/releases)
- [Commits](https://github.com/google/guava/commits)

Updates `com.google.dagger:dagger` from 2.45 to 2.47
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.45...dagger-2.47)

Updates `com.google.dagger:dagger-compiler` from 2.45 to 2.47
- [Release notes](https://github.com/google/dagger/releases)
- [Changelog](https://github.com/google/dagger/blob/master/CHANGELOG.md)
- [Commits](https://github.com/google/dagger/compare/dagger-2.45...dagger-2.47)

Updates `org.junit.jupiter:junit-jupiter` from 5.9.3 to 5.10.0
- [Release notes](https://github.com/junit-team/junit5/releases)
- [Commits](https://github.com/junit-team/junit5/compare/r5.9.3...r5.10.0)

Updates `org.mockito:mockito-core` from 5.3.1 to 5.4.0
- [Release notes](https://github.com/mockito/mockito/releases)
- [Commits](https://github.com/mockito/mockito/compare/v5.3.1...v5.4.0)

Updates `com.google.jimfs:jimfs` from 1.2 to 1.3.0
- [Release notes](https://github.com/google/jimfs/releases)
- [Commits](https://github.com/google/jimfs/compare/v1.2...v1.3.0)

Updates `org.jetbrains:annotations` from 23.0.0 to 24.0.1
- [Release notes](https://github.com/JetBrains/java-annotations/releases)
- [Changelog](https://github.com/JetBrains/java-annotations/blob/master/CHANGELOG.md)
- [Commits](https://github.com/JetBrains/java-annotations/compare/23.0.0...24.0.1)

Updates `org.cryptomator:integrations-mac` from 1.2.0 to 1.2.1
- [Release notes](https://github.com/cryptomator/integrations-mac/releases)
- [Commits](https://github.com/cryptomator/integrations-mac/compare/1.2.0...1.2.1)

Updates `org.apache.maven.plugins:maven-compiler-plugin` from 3.10.1 to 3.11.0
- [Release notes](https://github.com/apache/maven-compiler-plugin/releases)
- [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0)

Updates `org.apache.maven.plugins:maven-resources-plugin` from 3.3.0 to 3.3.1
- [Release notes](https://github.com/apache/maven-resources-plugin/releases)
- [Commits](https://github.com/apache/maven-resources-plugin/compare/maven-resources-plugin-3.3.0...maven-resources-plugin-3.3.1)

Updates `org.apache.maven.plugins:maven-dependency-plugin` from 3.3.0 to 3.6.0
- [Commits](https://github.com/apache/maven-dependency-plugin/compare/maven-dependency-plugin-3.3.0...maven-dependency-plugin-3.6.0)

Updates `org.apache.maven.plugins:maven-surefire-plugin` from 3.0.0-M7 to 3.1.2
- [Release notes](https://github.com/apache/maven-surefire/releases)
- [Commits](https://github.com/apache/maven-surefire/compare/surefire-3.0.0-M7...surefire-3.1.2)

Updates `org.codehaus.mojo:license-maven-plugin` from 2.0.0 to 2.2.0
- [Release notes](https://github.com/mojohaus/license-maven-plugin/releases)
- [Commits](https://github.com/mojohaus/license-maven-plugin/compare/license-maven-plugin-2.0.0...2.2.0)

Updates `org.jacoco:jacoco-maven-plugin` from 0.8.9 to 0.8.10
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/compare/v0.8.9...v0.8.10)

Updates `org.owasp:dependency-check-maven` from 8.1.2 to 8.3.1
- [Release notes](https://github.com/jeremylong/DependencyCheck/releases)
- [Changelog](https://github.com/jeremylong/DependencyCheck/blob/main/CHANGELOG.md)
- [Commits](https://github.com/jeremylong/DependencyCheck/compare/v8.1.2...v8.3.1)

---
updated-dependencies:
- dependency-name: ch.qos.logback:logback-core
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all
- dependency-name: ch.qos.logback:logback-classic
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all
- dependency-name: org.apache.commons:commons-lang3
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: io.github.coffeelibs:tiny-oauth2-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: com.nulab-inc:zxcvbn
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: com.google.guava:guava
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: com.google.dagger:dagger
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: com.google.dagger:dagger-compiler
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: org.junit.jupiter:junit-jupiter
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: org.mockito:mockito-core
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: com.google.jimfs:jimfs
  dependency-type: direct:development
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: org.jetbrains:annotations
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all
- dependency-name: org.cryptomator:integrations-mac
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all
- dependency-name: org.apache.maven.plugins:maven-compiler-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: org.apache.maven.plugins:maven-resources-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all
- dependency-name: org.apache.maven.plugins:maven-dependency-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: org.apache.maven.plugins:maven-surefire-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: org.codehaus.mojo:license-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
- dependency-name: org.jacoco:jacoco-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all
- dependency-name: org.owasp:dependency-check-maven
  dependency-type: direct:production
  update-type: version-update:semver-minor
  dependency-group: all
...

Signed-off-by: dependabot[bot] <support@github.com>
2023-08-14 06:46:37 +00:00
Julian Raufelder de78cd014d Merge branch 'main' into develop 2023-08-11 16:44:23 +02:00
Julian Raufelder 9db53f73e2 Merge branch 'hotfix/1.9.4' 2023-08-11 16:07:37 +02:00
Julian Raufelder e5f0aca477 Finalize 1.9.4 2023-08-11 15:54:50 +02:00
Julian Raufelder 261f2da105 Prepare 1.9.4 2023-08-11 15:53:26 +02:00
Julian Raufelder ef4738f920 Use latest version of Java to avoid using an out of date version when building the release
See https://github.com/actions/setup-java/tree/main#check-latest for further information
2023-08-11 15:52:42 +02:00
Armin Schrenk f23348eda2 Merge branch 'develop' into release/1.10.0 2023-08-09 22:56:05 +02:00
Armin Schrenk 6edfaf3eb6 fix windows installer ci script 2023-08-09 22:55:32 +02:00
Armin Schrenk 9d02035263 Merge branch 'develop' into release/1.10.0 2023-08-09 21:04:54 +02:00
Armin Schrenk 8bbcb86bfc fix windows build script 2023-08-09 20:59:13 +02:00
Armin Schrenk abdc8672f1 update org.openjdk:javafx from 20.0.1 to 20.0.2 2023-08-09 20:41:14 +02:00
Armin Schrenk 333c7457ca bump org.cryptomator:cryptofs from 2.6.6 to 2.6.7 2023-08-09 20:23:51 +02:00
CryptobotandGitHub 9b9a354902 New Crowdin updates (#3029)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-08-09 15:26:10 +02:00
Sebastian Stenzel f48963a6d0 Merge branch 'develop' into feature/new-hub-keyloading
# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/hub/ReceiveKeyController.java
2023-08-09 15:26:03 +02:00
Sebastian Stenzel 83b2ff8ce8 fixes #3051 2023-08-09 15:20:32 +02:00
dependabot[bot]GitHubdependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
b7f514e16b Bump the all group with 2 updates (#3066)
Bumps the all group with 2 updates: [actions/checkout](https://github.com/actions/checkout) and [SamKirkland/FTP-Deploy-Action](https://github.com/samkirkland/ftp-deploy-action).


Updates `actions/checkout` from 2 to 3
- [Release notes](https://github.com/actions/checkout/releases)
- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md)
- [Commits](https://github.com/actions/checkout/compare/v2...v3)

Updates `SamKirkland/FTP-Deploy-Action` from 4.3.0 to 4.3.4
- [Release notes](https://github.com/samkirkland/ftp-deploy-action/releases)
- [Commits](https://github.com/samkirkland/ftp-deploy-action/compare/4.3.0...v4.3.4)

---
updated-dependencies:
- dependency-name: actions/checkout
  dependency-type: direct:production
  update-type: version-update:semver-major
  dependency-group: all
- dependency-name: SamKirkland/FTP-Deploy-Action
  dependency-type: direct:production
  update-type: version-update:semver-patch
  dependency-group: all
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2023-08-09 15:03:35 +02:00
Sebastian Stenzel 5c4c59fe18 add dependabot config 2023-08-09 13:19:23 +02:00
mindmonkandGitHub 296ae20cc2 Merge pull request #3060 from cryptomator/feature/error-dialog-lookup-permission
Ask before looking up error code
2023-08-07 16:25:40 +02:00
Jan-Peter Klein 7af5e00d71 clean up imports 2023-08-07 15:11:10 +02:00
Jan-Peter Klein deaf71b4ce Merge branch 'develop' into feature/error-dialog-lookup-permission 2023-08-07 15:08:44 +02:00
Jan-Peter Klein 27f3d85ae2 renamed lookupDatabaseUserPermission to askedForLookupDatabasePermission 2023-08-07 15:08:25 +02:00
Jan-Peter Klein f91a854b3e removed more info hyperlink and fixed ui by moving isLoadingHttpResponse.set(true) 2023-08-07 14:56:01 +02:00
Armin Schrenk be7b265a00 Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2023-08-07 10:27:13 +02:00
Armin Schrenk 34c0f1d13e Merge branch 'hotfix/1.9.3' 2023-08-07 10:26:43 +02:00
Armin Schrenk da21c7fa80 suppress false positive
cherry picked from 9bd5b45ea7
2023-08-07 10:25:42 +02:00
Armin Schrenk 9ae9473b95 finalize 1.9.3 2023-08-07 10:19:04 +02:00
Armin Schrenk 32a17407de Add -NoProfile to windows build script to follow best practices 2023-08-07 10:15:25 +02:00
Tobias HagemannandGitHub 727c32ad50 Merge pull request from GHSA-62gx-54j7-mjh3
Add -NoProfile option to powershell scripts run during windows installer
2023-08-07 10:14:45 +02:00
Armin Schrenk d939e91661 prepare 1.9.3 2023-08-07 10:04:08 +02:00
Armin Schrenk 151f2babd8 Add NoProfile option to powershell scripts run during windows instaler
Closes #GHSA-62gx-54j7-mjh3
2023-08-07 10:02:39 +02:00
Jan-Peter Klein 76340f31d1 undo changes in REPORT_BODY_TEMPLATE 2023-08-04 17:23:35 +02:00
Jan-Peter Klein b2f2d3ac36 Merge branch 'develop' into feature/error-dialog-lookup-permission 2023-08-04 17:03:26 +02:00
Armin Schrenk 9bd5b45ea7 suppress false positive in dependecy-check (jackrabbit-webdav) 2023-08-04 17:01:19 +02:00
Jan-Peter Klein a17b2029ec moved isLoadingHttpResponse.set(true) into void loadHttpResponse 2023-08-04 16:51:28 +02:00
Jan-Peter Klein 4c819807de implemented 'More Info...' hyperlink functionality 2023-08-04 16:12:01 +02:00
Jan-Peter Klein 175e05aae4 Merge branch 'develop' into feature/error-dialog-lookup-permission 2023-08-03 12:54:01 +02:00
Jan-Peter Klein fa3e0efd12 init commit
added new string properties
added ui elements for user permission to look up error solutions in database
modified ErrorController for permission handling
2023-08-03 12:53:44 +02:00
Armin Schrenk d08d992768 Bump integrations-win to 1.2.2 2023-08-02 09:44:31 +02:00
Armin Schrenk 7f0c92e2f0 Bump integrations-linux to 1.3.0-beta6
Fixes #3020
2023-08-02 09:44:18 +02:00
Armin Schrenk f4ad7aa43d References #3045
Use different encoding reading process output
2023-08-01 16:29:36 +02:00
Armin Schrenk 40611b4ebe improve wording 2023-08-01 10:48:42 +02:00
Sebastian Stenzel 1f09a3fa3a allow notarization on manually dispatched builds 2023-08-01 10:04:34 +02:00
Sebastian Stenzel 7d7b88829d allow notarization on manually dispatched builds 2023-08-01 10:04:07 +02:00
Sebastian Stenzel 4078abeb33 Merge branch 'feature/fix-macOS-build' into release/1.10.0 2023-08-01 09:42:29 +02:00
Julian RaufelderandGitHub 6f6c3936aa Merge pull request #3039 from cryptomator/feature/change-error-codes-url
Change error codes URL
2023-07-29 10:04:50 +00:00
Julian RaufelderandGitHub 6771963686 Merge pull request #3038 from cryptomator/feature/change-update-check-url
Change update check URL
2023-07-29 10:04:28 +00:00
Julian Raufelder ab409152e3 Change error codes URL 2023-07-28 16:14:58 +02:00
Sebastian Stenzel 6ce34efb52 Merge branch 'develop' into feature/new-hub-keyloading 2023-07-28 15:23:00 +02:00
Julian Raufelder f92cf9c9e0 Change update check URL 2023-07-27 15:49:38 +02:00
Armin SchrenkandGitHub 8b9d5d136e Merge pull request #3033 from cryptomator/feature/fix-macOS-build
CI: Use Temurin JVM+JFX Jmods from Gluon instead of Zulu JVM+FX

Fixes #3030
2023-07-26 19:53:48 +02:00
Armin SchrenkandGitHub 3071cfbfb1 Merge pull request #2885 from purejava/libappindicator
appindicator support

Closes #1645
2023-07-26 14:25:55 +02:00
Armin SchrenkandGitHub 1a153e1f6e Merge branch 'develop' into libappindicator 2023-07-26 14:18:42 +02:00
Armin Schrenk b0a7c23055 correct comment 2023-07-26 14:16:07 +02:00
27ca6591ea Apply suggestions from code review
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2023-07-26 13:01:14 +02:00
Armin Schrenk ad3d36e06a check sha256 sum of downloaded artifact in ci 2023-07-26 11:37:05 +02:00
Armin Schrenk 83e91d361f fix errors in build script 2023-07-25 17:29:34 +02:00
JaniruTECandGitHub 221b4e85bc Merge pull request #2996 from cryptomator/feature/2856-folder-mounts-win
Improve handling of folder-mounts on Win
2023-07-25 15:51:18 +02:00
JaniruTEC b536bd3e09 Applied suggestions from code review
Added exception to method signature
Renamed enum constant

See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273497818
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273499227
2023-07-25 15:33:16 +02:00
Armin Schrenk b73993c375 add jfx to module path 2023-07-25 14:43:29 +02:00
JaniruTEC ae392b4014 Refactored "handleMountPointFolder" (now: "getMountPointState")
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273277804
2023-07-25 13:34:39 +02:00
JaniruTEC 1c34402c87 Applied minor corrections
See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273277251
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273280687
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1273287847
2023-07-25 13:17:21 +02:00
Armin Schrenk a415e3b0a9 update local build script to download jfx jmods 2023-07-25 13:08:19 +02:00
Armin Schrenk e41a33d250 fixes #3030 2023-07-25 13:07:40 +02:00
JaniruTEC 587cff9518 Added more tests 2023-07-24 19:22:47 +02:00
JaniruTEC ea8e850aa9 Moved check for dir/emptiness to "handleMountPointFolder" 2023-07-24 19:15:22 +02:00
JaniruTEC 9bb24320bf Stopped user from mounting to vaults to the same path 2023-07-24 18:53:19 +02:00
Armin Schrenk 108df3ddbc Merge branch 'main' into develop
# Conflicts:
#	pom.xml
#	suppression.xml
2023-07-24 16:38:18 +02:00
Armin Schrenk 9ca1ff1a2d Merge branch 'hotfix/1.9.2' 2023-07-24 16:35:33 +02:00
Armin Schrenk 164a350e7e finalize 1.9.2 2023-07-24 16:34:49 +02:00
Tobias HagemannandGitHub b48ebd524b Merge pull request from GHSA-9c9p-c3mg-hpjq
Fix LPE in win installer
2023-07-24 16:23:23 +02:00
Armin Schrenk 7ba9d4de4f Merge branch 'hotfix/1.9.2' into feature/fix-lpe-win-installer 2023-07-24 16:21:54 +02:00
Armin Schrenk 807e718d13 supress non affecting cve
(cherry picked from commit 4e3b2e0be0)
2023-07-24 15:38:42 +02:00
Armin Schrenk 6efb839fd0 prepare 1.10.0 2023-07-24 15:00:28 +02:00
CryptobotandGitHub ca71bb207f New Crowdin updates (#2945)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Bulgarian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; Finnish; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-07-24 14:58:36 +02:00
Armin Schrenk 0800c53aac update to uninstaller-beta4 2023-07-24 10:36:23 +02:00
Armin Schrenk 8ed1878035 prepare 1.9.2 2023-07-21 17:07:33 +02:00
Armin Schrenk 4e3b2e0be0 supress non affecting cve 2023-07-21 16:50:27 +02:00
JaniruTEC 59d89faf38 Turned calls to "assumeTrue" into guard functions
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1270734307
2023-07-21 16:48:33 +02:00
JaniruTEC ca3a11de90 Made AtomicReference to mountHandle final
[ci skip]
2023-07-21 16:37:08 +02:00
Armin Schrenk c2819963d2 Replace custom actions executing bat files to by quiet exec custom actions to surpress shown command prompts
Closes #GHSA-9c9p-c3mg-hpjq

(cherry picked from commit fb1ba6390dfcb7028be0eb051b893b744c0444dc)
2023-07-21 16:05:21 +02:00
JaniruTEC 8f67404766 Fixed method violating API contract
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269458822
2023-07-21 15:35:56 +02:00
mindmonkandGitHub 91ece74f57 Merge pull request #2998 from cryptomator/feature/update-reminder
Update Reminder
2023-07-21 09:46:48 +02:00
JaniruTEC 1942850888 Replaced OS-Check with Assumptions
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269461956
2023-07-20 16:44:49 +02:00
JaniruTEC 821cc0940d Stopped wrapping IOEs as UncheckedIOEs
See:
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269444937
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269445672
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1269445894
2023-07-20 16:34:51 +02:00
Jan-Peter Klein b9f77cb1d6 Merge branch 'develop' into feature/update-reminder 2023-07-20 11:32:12 +02:00
Jan-Peter Klein b6d09016cd rearranged layout elements and changed window width 2023-07-20 11:31:52 +02:00
Jan-Peter Klein 0a07103a4f moved logic of update checking from FxApplication class to UpdateReminderComponent 2023-07-20 11:06:55 +02:00
Jan-Peter Klein 96253f636a removed unused provide method 2023-07-20 11:05:50 +02:00
JaniruTEC 419a7ab245 Fixed faulty unit test 2023-07-19 23:53:58 +02:00
JaniruTEC a29ebfd302 Updated error message 2023-07-19 23:39:11 +02:00
JaniruTEC 73da954355 Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win
# Conflicts:
# src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
# src/main/resources/i18n/strings.properties
2023-07-19 23:38:20 +02:00
Armin Schrenk c6ab05979c cleanup [ci skip] 2023-07-19 16:33:40 +02:00
Armin Schrenk 2c8d5d3d5d update ci script 2023-07-19 16:30:08 +02:00
Armin Schrenk b76a311ddc Replace winfsp-uninstaller by downloadlink 2023-07-19 16:24:44 +02:00
JaniruTEC 879e6dcab7 Updated error message
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1268035540
2023-07-19 16:10:48 +02:00
JaniruTEC f9f8a6b357 Added unit tests for MountWithinParentUtil 2023-07-19 15:39:14 +02:00
JaniruTEC 3ea6da3c6d Fixed thrown exception 2023-07-19 15:36:23 +02:00
JaniruTEC bb0b1b3592 Cleaned up merge 2023-07-19 15:36:22 +02:00
JaniruTEC 0b6782d44b Refactored error message to use ObservableValues 2023-07-18 20:11:24 +02:00
Armin SchrenkandGitHub bd932b1067 Fixes #3021 2023-07-18 17:06:03 +02:00
Armin Schrenk 238aaeb5a0 bump integrations-api to stable version 2023-07-18 12:40:06 +02:00
Jan-Peter Klein ade277daf4 changed naming pattern and wording 2023-07-18 10:29:14 +02:00
Jan-Peter Klein 14776fc571 refactored UpdateReminderComponent.Builder to Factory 2023-07-17 15:40:11 +02:00
Jan-Peter Klein c18f489e9d Merge branch 'develop' into feature/update-reminder 2023-07-17 15:32:25 +02:00
Jan-Peter Klein bfc1e25335 some code cleanup 2023-07-17 12:23:23 +02:00
Jan-Peter Klein 4c2e6088a9 reformat code and optimized imports 2023-07-17 11:26:59 +02:00
JaniruTEC ed6f1ad8d1 Merge branch 'feature/3001-more-error-messages' into feature/2856-folder-mounts-win
# Conflicts:
#	src/main/java/org/cryptomator/common/mount/MountWithinParentUtil.java
2023-07-14 23:05:48 +02:00
JaniruTEC c3ac043c68 Removed MountPointPreparationException
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263572178
2023-07-14 21:13:11 +02:00
Armin Schrenk 315bf0d51f Format confirmation dialog 2023-07-14 16:00:49 +02:00
JaniruTEC a90e75ceba Renamed exceptions
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263563166
2023-07-14 15:09:36 +02:00
JaniruTEC aa2e63acb0 Added @PropertyKey
See: https://github.com/cryptomator/cryptomator/pull/3001#discussion_r1263039593
2023-07-14 14:58:56 +02:00
JaniruTEC a259d554fa Removed unused import
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1263556873
2023-07-14 14:53:00 +02:00
Armin Schrenk 4cdbe50eb6 adjust to new winfsp-uninstaller exe 2023-07-13 17:29:50 +02:00
JaniruTEC f5e035fa3b Applied suggestions from code review
Updated log message
Replaced caught exception

See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1262297316
https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1262298832
2023-07-13 15:22:21 +02:00
Armin Schrenk f1d4bd4cd4 Closes #2989 2023-07-13 12:22:46 +02:00
mindmonkandGitHub 2a0e0738be Merge pull request #2987 from cryptomator/feature/custom-shortening-threshold
Feature/custom shortening threshold
2023-07-13 12:15:07 +02:00
Ralph Plawetzki 9e25d0fcc0 Define property in a single line 2023-07-13 06:43:32 +02:00
JaniruTEC 96ebb67085 Applied suggestions from code review
See: https://github.com/cryptomator/cryptomator/pull/2996#discussion_r1260955250
2023-07-12 19:17:37 +02:00
Ralph Plawetzki 3fbc5e84e3 Define property in a single line 2023-07-12 19:16:04 +02:00
Jan-Peter Klein 1fec9781bf Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-12 16:07:03 +02:00
Jan-Peter Klein 886c69f298 reordered ui elements and added expert settings section to strings.properties 2023-07-12 16:04:29 +02:00
JaniruTEC 614756c740 Added message for HideawayAlreadyExistsException 2023-07-11 22:35:08 +02:00
JaniruTEC 2a9d1e3fba Added messages for MountPointCouldNotBeClearedException and MountPointNotEmptyDirectoryException 2023-07-11 22:33:27 +02:00
JaniruTEC 9361a75cd8 Refactored UnlockInvalidMountPointController to use improved Exceptions 2023-07-11 21:53:18 +02:00
JaniruTEC becc5e316a Made interaction between Unlock logic & UI more consistent 2023-07-11 21:53:18 +02:00
JaniruTEC 08a1e1ec7d Added/Refactored exceptions to account for more cases 2023-07-11 21:53:18 +02:00
JaniruTEC 12f5f41968 Redefined IllegalMountPointException and MountPointPreparationException 2023-07-11 21:53:18 +02:00
JaniruTEC 58c7774e0d Added arg3 to FormattedLabel 2023-07-11 21:50:52 +02:00
Ralph Plawetzki da8410842b Change showTrayIcon to true for all Linux builds 2023-07-11 19:56:22 +02:00
Ralph Plawetzki 1cae1a5f2f Fix setting TRAYICONSDIR 2023-07-11 19:25:37 +02:00
Jan-Peter Klein df31b214f5 changed button wording from "Not now" to "Ask Me Later" 2023-07-11 15:23:50 +02:00
Jan-Peter Klein 25474ce014 changed wording and window size 2023-07-11 14:53:36 +02:00
Jan-Peter Klein 5f62f038d5 removed message below the input field and inserted in the invalid message 2023-07-11 14:41:43 +02:00
Jan-Peter Klein eebba45909 added comment to explain code that sets shorteningThreshold to 0
removed unnecessary introduction text
2023-07-11 14:10:26 +02:00
Armin Schrenk ead0f0fae1 add exe for winfsp uninstallation and include in burn bundle 2023-07-11 09:41:54 +02:00
JaniruTEC 5e2e8c35d5 Added cleanup of junctions on Win 2023-07-10 17:38:30 +02:00
JaniruTEC 328f2f89a8 Removed unnecessary checks 2023-07-10 16:01:39 +02:00
JaniruTEC 92b77baf40 Improved handling of existing hideaways 2023-07-10 15:58:38 +02:00
Jan-Peter Klein 982e88d1c5 changed icon to question mark 2023-07-10 15:47:12 +02:00
Jan-Peter Klein 632d39bc9f added lastUpdateCheck to settings and integrated check in FXApplication start 2023-07-10 14:50:06 +02:00
Jan-Peter Klein f25afb720f optimized isValidShorteningThreshold method and renamed DEFAULT_SHORTENING_THRESHOLD to MAX_SHORTENING_THRESHOLD 2023-07-10 13:14:58 +02:00
Jan-Peter Klein bc361ea592 added ui elements for update reminder 2023-07-10 13:04:07 +02:00
Ralph Plawetzki 3d0741f4d2 Use version 1.3.3 of appindicator-gtk3-java 2023-07-09 19:48:52 +02:00
Ralph Plawetzki b75459fbc6 Revert "Find native libraries on the system"
This reverts commit 58bb266085.
2023-07-09 19:47:52 +02:00
Jan-Peter Klein 2202c91564 rearranged view
added pencil icon
optimized code
cleaned up strings.properties
2023-07-07 16:22:53 +02:00
JaniruTEC e484813233 Added check for deletion of hideaway 2023-07-07 16:19:16 +02:00
Sebastian Stenzel cd10d38990 adjusted to latest API-changes 2023-07-06 18:57:10 +02:00
Jan-Peter Klein f817bc5378 implement requested changes from PR review 2023-07-06 11:03:34 +02:00
JaniruTECandGitHub c30c90d2c3 Merge pull request #2985 from cryptomator/feature/2981-differ-options-preferences
Fix 2981
2023-07-05 16:27:55 +02:00
Jan-Peter Klein 09b638eafa pr mentioned changes implemented 2023-07-05 16:19:11 +02:00
JaniruTEC 91de0c1813 Added called to #showMainWindow
See: https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252863161
2023-07-05 15:50:35 +02:00
JaniruTEC a3c953d437 Refactored decision model
See: https://github.com/cryptomator/cryptomator/pull/2985#pullrequestreview-1514141146
2023-07-05 15:49:43 +02:00
JaniruTEC 743da019f9 Cleaned up UnlockInvalidMountPointController
See:
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252868655
https://github.com/cryptomator/cryptomator/pull/2985#discussion_r1252874468
2023-07-05 15:26:19 +02:00
Jan-Peter Klein 2c506fcc97 rearranged view elements an renamed advancedSettings to expertSettings 2023-07-05 13:17:10 +02:00
Jan-Peter Klein dd71df8382 Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-05 11:55:51 +02:00
Sebastian Stenzel 8cb21c97e3 add mark for future improvement 2023-07-04 16:58:37 +02:00
Sebastian Stenzel 0ad8ce77ef handle "invalid setup code" error properly 2023-07-04 16:55:42 +02:00
Sebastian Stenzel e358ffd666 added tests 2023-07-04 16:47:54 +02:00
Armin Schrenk 2c984ad405 use system property path.separator and fix failing unit test on windows 2023-07-04 16:31:28 +02:00
JaniruTEC 171b0e61ad Finished implementation 2023-07-04 16:14:08 +02:00
JaniruTEC e5047c242c Moved subcomponent-bindings
Moved bindings for VaultOptionsComponent and HealthCheckComponent from MainWindowModule to FxApplicationModule
2023-07-04 15:35:23 +02:00
Sebastian Stenzel 496f9a9cd5 docs
[ci skip]
2023-07-04 15:05:22 +02:00
Sebastian Stenzel 61025de0d6 renamed var
[ci skip]
2023-07-04 14:43:56 +02:00
Sebastian Stenzel f08049b960 fix "register device" on legacy hub instances 2023-07-04 14:34:36 +02:00
JaniruTEC 131145e8b8 Merge branch 'develop' into feature/2981-differ-options-preferences 2023-07-04 14:00:44 +02:00
JaniruTEC 11a0136cb9 Fixed run configurations
See: #2982
2023-07-04 13:55:42 +02:00
Armin Schrenk e92b80bdf4 fix local win build script to download jfxmods 2023-07-04 12:42:55 +02:00
Armin Schrenk 9d81b2312f fix local build script to parse two digit verison nums correctly 2023-07-04 12:41:58 +02:00
Armin Schrenk 511dbe355a Fixes #2982 2023-07-04 12:41:06 +02:00
JaniruTEC cca6d475b3 Updated UI 2023-07-03 21:14:12 +02:00
JaniruTEC 88c6246ceb Prepared UnlockInvalidMountPointController for new feature 2023-07-03 21:08:49 +02:00
Jan-Peter Klein 7bf2de6339 Merge branch 'develop' into feature/custom-shortening-threshold 2023-07-03 16:22:43 +02:00
Jan-Peter Klein 894d0528df refactoring 2023-07-03 15:34:01 +02:00
Armin Schrenk 168b9ef096 changed default folder mount location on macOS 2023-07-03 13:11:38 +02:00
Sebastian Stenzel 711a3881f8 fix appimage CI build 2023-07-03 11:00:12 +02:00
Sebastian Stenzel 399c5c0565 Merge branch 'develop' into feature/libappindicator 2023-07-03 10:59:50 +02:00
Sebastian Stenzel 6c8005e1b2 use github.ref instead of inputs.ref
[ci skip]
2023-07-03 10:59:32 +02:00
Sebastian Stenzel ca6c1e244c use correct integrations API version 2023-07-03 10:40:50 +02:00
Ralph Plawetzki 449e330992 Merge branch cryptomator/develop 2023-07-01 18:45:45 +02:00
Ralph Plawetzki 0f0855165e Changes due to new handling of system environment
Introduced with PR #2957
2023-07-01 18:02:12 +02:00
Sebastian Stenzel 746c8f54eb Merge branch 'develop' into feature/new-hub-keyloading
# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/hub/CreateDeviceDto.java
#	src/main/java/org/cryptomator/ui/keyloading/hub/RegisterDeviceController.java
2023-06-30 16:20:59 +02:00
Sebastian Stenzel ed8457ff36 remove dead test 2023-06-30 13:53:25 +02:00
Sebastian Stenzel a50bc8e05c reduce api surface 2023-06-30 13:53:06 +02:00
Sebastian Stenzel e382a3bab9 make settings' fields public, remove accessor methods 2023-06-30 13:52:15 +02:00
Sebastian StenzelandGitHub 9cd50e8ae4 Merge pull request #2974 from cryptomator/feature/replace-gson
Replace GSON with Jackson
2023-06-30 13:48:19 +02:00
Sebastian Stenzel 1a6836dac6 remove unnecessary annotation
[ci skip]
2023-06-30 12:39:48 +02:00
Armin SchrenkandGitHub 067814d5db Merge pull request #2957 from cryptomator/feature/preprocess-properties
Feature: Preprocess JVM properties at app start to adjust to OS environment.

Closes #2838
2023-06-30 12:38:55 +02:00
Armin Schrenk 29d63a0a83 final clean up 2023-06-30 11:57:09 +02:00
Armin Schrenk 8c3ede0d2a clean up 2023-06-30 11:20:28 +02:00
Armin Schrenk ee82965ef5 adding "integration tests" 2023-06-30 11:20:07 +02:00
Armin Schrenk ab048508a8 change getProperty(key, default) and add unit test 2023-06-30 10:57:36 +02:00
Sebastian Stenzel 47ae271126 cleanup
[ci skip]
2023-06-29 23:00:19 +02:00
Sebastian Stenzel ef22928e01 undo formatter-induced changes
[ci skip]
2023-06-29 22:53:19 +02:00
Sebastian Stenzel 287584429b update code style
remove line break from `new Object() {}`

[ci skip]
2023-06-29 22:45:57 +02:00
Sebastian Stenzel e23c0c23c9 remove GSON from dependencies 2023-06-29 22:44:22 +02:00
Sebastian Stenzel e9bb3195dd cleanup 2023-06-29 22:44:05 +02:00
Sebastian Stenzel b1ff94bdd6 replace GSON from settings 2023-06-29 22:41:19 +02:00
Armin Schrenk 79eea4814e renamed class 2023-06-29 18:56:32 +02:00
Armin Schrenk cee0486d71 adding unit tests for getProperty 2023-06-29 18:55:49 +02:00
Armin Schrenk 12e990a8b3 cleanup 2023-06-29 18:24:48 +02:00
Armin Schrenk 24fc2888ef more unit tests 2023-06-29 18:20:25 +02:00
Armin Schrenk 9b0c940195 readd unit tests for Environment.java 2023-06-29 18:13:54 +02:00
Armin Schrenk ce596698e3 stick to a unified path separator for cryptomator properties 2023-06-29 17:58:52 +02:00
Armin Schrenk 9383abbdbd let child method match parent 2023-06-29 15:55:07 +02:00
Armin Schrenk a31d3185dc move boilerplate code to own class 2023-06-29 15:51:46 +02:00
Armin Schrenk 3098628db1 Fix problem of circular class init 2023-06-29 15:32:15 +02:00
Sebastian Stenzel 3c53968dd2 replace GSON from update checker 2023-06-29 13:20:39 +02:00
Armin Schrenk 6c18e3a929 apply suggestion from sonarCloud 2023-06-29 13:04:00 +02:00
Sebastian Stenzel 99862869bc replace GSON from error dialog 2023-06-29 13:03:27 +02:00
Armin Schrenk c0368f2a50 Merge branch 'develop' into feature/preprocess-properties 2023-06-29 12:39:31 +02:00
Armin Schrenk c6c292b505 bump google guava to 32.0.1 2023-06-29 12:39:19 +02:00
Armin Schrenk ebc60c4fb3 make process function reliable testable and adjust unit test 2023-06-29 12:35:59 +02:00
Sebastian Stenzel 5f2497de90 replace GSON in "hub" 2023-06-29 12:26:45 +02:00
Sebastian Stenzel b2a184bdf0 ignore unknown fields during JWT deserialization 2023-06-29 12:02:33 +02:00
Armin Schrenk 01da51e6e7 Refactor properties preprocessing:
* decorate Properties class
* set the system properties to decorator
* for logging setup, skip enviroment and access props over decorator
2023-06-29 11:37:35 +02:00
Sebastian Stenzel 9fc1efa005 adjust labels 2023-06-29 10:38:31 +02:00
Armin Schrenk 8417618615 Revert "fix missing logDir path resolution"
This reverts commit b3d8df0da0.
2023-06-28 16:04:10 +02:00
Jan-Peter Klein 386bdd3490 added new AdvancedSettings scene in AddVaultWizard 2023-06-28 12:24:14 +02:00
Tobias Hagemann fe3abcaaa8 added leitzcloud location preset 2023-06-27 09:36:14 +02:00
Tobias Hagemann 56ba12fe56 fixed location presets of google drive and pcloud on macos 2023-06-27 09:31:43 +02:00
Sebastian Stenzel 448eac8ff5 cleanup 2023-06-23 12:06:06 +02:00
Sebastian Stenzel 5a18d086e0 register device using a setup code 2023-06-22 17:16:00 +02:00
Armin Schrenk 5e52f715ce Merge branch 'develop' into feature/preprocess-properties 2023-06-21 10:31:43 +02:00
Armin SchrenkandGitHub 2c2606d6ad Merge pull request #2961 from sschuberth/win-drive-occupied
Show a dedicated message when mounting to an occupied Windows drive

Fixes #2309
2023-06-20 18:25:00 +02:00
Armin Schrenk b3d8df0da0 fix missing logDir path resolution 2023-06-20 18:08:31 +02:00
Armin Schrenk ebea8ef7e5 adjust windows buildscripts to use appdata instead of userhome/hard/coded/path 2023-06-20 17:32:23 +02:00
Armin Schrenk ec645a4bb9 replace ~ by @{userhome} on unix systems 2023-06-20 16:37:32 +02:00
Armin Schrenk 2c0474ec46 add test 2023-06-20 12:37:07 +02:00
Sebastian Schuberth 4d09728880 Suppress a CVE false-positive for jackson-databind 2.14.2
Also see https://github.com/cryptomator/cryptomator/pull/2961#issuecomment-1597652134.
2023-06-19 22:31:50 +02:00
Sebastian Schuberth 173b1e8386 Show a dedicated message when mounting to an occupied Windows drive
The error message was restored from 6395f17. Fixes #2309.
2023-06-16 19:17:30 +02:00
mindmonkandGitHub 9b18a179c2 Merge pull request #2953 from cryptomator/feature/error-dialog
Improved Error Dialog
2023-06-16 15:55:43 +02:00
Jan-Peter Klein 12b38ad8c8 removed extra tabs generated by reformat code 2023-06-16 15:25:22 +02:00
Armin SchrenkandSebastian Stenzel 4065e15aa1 Apply code suggestion from review
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2023-06-16 13:12:00 +02:00
Jan-Peter Klein 6fda206b9e just one little change 2023-06-16 12:57:21 +02:00
Jan-Peter Klein 638a6d1195 optimized code 2023-06-16 12:56:07 +02:00
Jan-Peter Klein 27bc62e602 Merge branch 'develop' into feature/error-dialog 2023-06-16 12:48:28 +02:00
Tobias HagemannandGitHub 2e7af0affa Update SECURITY.md
[ci skip]
2023-06-16 11:41:33 +02:00
Tobias HagemannandGitHub 19c41a3cca Update SECURITY.md
[ci skip]
2023-06-16 11:20:26 +02:00
Jan-Peter Klein 3bf4473f9d implemented changes mentioned by overheadhunter 2023-06-16 11:13:24 +02:00
Jan-Peter Klein f92c436339 reformat code and optimize imports 2023-06-15 13:12:10 +02:00
Jan-Peter Klein f054a1af03 optimized tests and some code docu 2023-06-15 10:54:44 +02:00
Armin Schrenk c46eeb0401 first impl draft 2023-06-15 10:38:19 +02:00
Ralph Plawetzki 3ae847d5ad Code improvements and changes
Discussion: https://github.com/cryptomator/integrations-linux/pull/22#pullrequestreview-1479004107
2023-06-15 06:46:05 +02:00
Jan-Peter Klein d680c5812d cleaned up code and using parameterized tests 2023-06-14 16:10:11 +02:00
Ralph PlawetzkiandGitHub 58bb266085 Find native libraries on the system 2023-06-14 11:20:15 +02:00
Sebastian Stenzel 918ace2eb6 Merge branch 'develop' into feature/new-hub-keyloading 2023-06-14 10:31:58 +02:00
Ralph Plawetzki c8ed30574a Introduce JVM property for the SVG image loading path 2023-06-14 06:02:03 +02:00
Jan-Peter Klein 3120751d3e resolved sonarclouds mentioned issues 2023-06-13 12:48:35 +02:00
Jan-Peter Klein 3c623b7ed1 cleaned up code 2023-06-12 21:04:54 +02:00
Jan-Peter Klein 150dd3e542 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into feature/error-dialog 2023-06-12 13:52:23 +02:00
Jan-Peter Klein 8f3f23939c created some tests for ErrorController 2023-06-12 13:50:43 +02:00
Armin Schrenk 5d796efe30 Merge branch 'main' into develop 2023-06-07 12:56:23 +02:00
Armin Schrenk 702ae72063 Merge branch 'release/1.9.1' 2023-06-07 12:55:46 +02:00
Armin Schrenk b296dc775c finalize 1.9.1 2023-06-07 12:55:28 +02:00
Armin Schrenk e5e0d4076a prepare 1.9.1 2023-06-07 12:52:42 +02:00
Armin Schrenk da0eeb2e45 bump dependency-check 2023-06-07 12:50:24 +02:00
Armin Schrenk ff49094f35 fixes #2936 2023-06-07 12:50:09 +02:00
CryptobotandGitHub be1c5da54e New Crowdin updates (#2931)
New translations strings.properties

Filipino; Finnish; Hungarian; Slovak;

[ci skip]
2023-06-07 11:08:14 +02:00
Ralph Plawetzki 1cb5a3531a Fix symlinks for icons installed with the ppa 2023-06-06 19:44:02 +02:00
Ralph Plawetzki d5cad1a704 Lost+found
Things I forgot or could be more simple
2023-06-05 19:13:25 +02:00
Sebastian Stenzel c9dd7454f5 Merge branch 'develop' into feature/libappindicator
# Conflicts:
#	pom.xml
2023-06-04 20:40:03 +02:00
Sebastian Stenzel 7a7332a3f6 remove executable bit 2023-06-04 14:29:17 +02:00
Sebastian Stenzel a22bfacfa2 create symlinks from "symbolic" to "scalable" icons 2023-06-04 14:18:05 +02:00
Sebastian Stenzel 1abf591459 cleanup 2023-06-04 14:17:57 +02:00
Ralph Plawetzki 641b21a144 Symbolic icons for the ppa 2023-06-02 06:31:35 +02:00
Ralph Plawetzki 20664ff3d3 1.3.0-beta3 is available 2023-06-02 05:42:04 +02:00
Armin Schrenk 40abf582c5 bump guava 2023-06-01 17:48:14 +02:00
Armin Schrenk a8377be691 adjust init release notes file 2023-06-01 17:47:18 +02:00
Sebastian Stenzel fe733967dc send device type in device registration request 2023-06-01 15:06:21 +02:00
Jan-Peter Klein 0e7a27b2e1 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into feature/error-dialog 2023-05-30 12:06:50 +02:00
Jan-Peter Klein d82d11feb7 optimized implementation 2023-05-30 12:03:56 +02:00
Armin Schrenk 81c12f50fe Merge branch 'main' into develop [ci skip] 2023-05-30 10:46:07 +02:00
Armin Schrenk e2eac0e398 Merge branch 'release/1.9.0' 2023-05-30 10:44:02 +02:00
Armin Schrenk 9d573c497e finalize 1.9.0 2023-05-30 10:34:51 +02:00
Armin Schrenk 81087a9568 Merge branch 'develop' into release/1.9.0 2023-05-30 10:30:47 +02:00
CryptobotandGitHub 2806525397 New Crowdin updates (#2881)
New translations strings.properties

Bulgarian; Finnish; German; Japanese; Portuguese; Portuguese, Brazilian; Turkish; Ukrainian; 

[ci skip]
2023-05-30 10:29:07 +02:00
Ralph Plawetzki c8cfe473f1 Set icons by icon name
Needed for icons to work on Mate DE
2023-05-29 15:55:01 +02:00
Ralph Plawetzki ec03bc569c Find tray icons in mounted AppImage 2023-05-27 16:39:24 +02:00
Armin Schrenk 0c0060262a prepare 1.9.0 2023-05-26 16:37:53 +02:00
Armin Schrenk 9af4ffe83b use correct webdav adapter version 2023-05-26 15:44:10 +02:00
Armin Schrenk c6f963793d bump dependencies 2023-05-26 13:10:11 +02:00
Ralph Plawetzki 1093cb618f Remove double setting symbolic links 2023-05-25 18:56:04 +02:00
Ralph Plawetzki 8c05c774bf Remove unneeded cp launcher.sh 2023-05-25 18:15:39 +02:00
Ralph Plawetzki 6af9132721 Add tray icons to AppImage build script 2023-05-25 18:07:13 +02:00
Ralph Plawetzki 1f443453c7 Modify copy-dependencies for new modules
Fix java.lang.module.FindException: Module jdk.net not found, required by org.freedesktop.dbus.transport.jre
Enable native access for module org.purejava.appindicator
2023-05-25 17:32:06 +02:00
Ralph Plawetzki 71caefbe70 Rename icons and bring them in place 2023-05-25 11:23:24 +02:00
Armin Schrenk 8c34fc76c5 prevent regressions for google drive preset 2023-05-24 12:07:08 +02:00
Armin SchrenkandGitHub 785cf7a9a6 Merge pull request #2918 from cryptomator/feature/refactor-location-presets
Feature: Refactor finding and showing cloud location presets
2023-05-23 17:32:48 +02:00
Armin Schrenk c63837c4ce renaming class 2023-05-23 17:01:14 +02:00
Armin Schrenk b1a3ef9023 prevent dealing with unclosed directory streams 2023-05-23 12:35:14 +02:00
Armin Schrenk 32436f779f increase readability 2023-05-23 10:54:34 +02:00
Sebastian Stenzel ccc6f605ba Merge branch 'develop' into feature/refactor-location-presets 2023-05-23 10:19:00 +02:00
Sebastian Stenzel f338d2447b improved AutoUnlocker readability 2023-05-23 09:48:27 +02:00
Armin Schrenk 179240b325 Readd mac specifc google drive location provider 2023-05-23 09:44:37 +02:00
Armin Schrenk 32a65bddce Add OneDrive Mac location provider 2023-05-22 17:16:03 +02:00
Armin Schrenk 710cdf800d fix compile errors 2023-05-22 15:21:19 +02:00
Armin Schrenk 1d6edb8373 Apply code suggestions 2023-05-22 15:19:15 +02:00
Armin Schrenk a3d30612ec Add linux paths for Dropbox and OneDrive 2023-05-22 14:51:52 +02:00
Armin Schrenk 6acda9b13c also adjust styleClass of location label 2023-05-17 18:48:12 +02:00
Armin Schrenk 28cb812dab add uses field to module info 2023-05-17 18:38:24 +02:00
Armin Schrenk 68ea4af0ad use correct import 2023-05-17 17:26:37 +02:00
Armin Schrenk 0af0a9e440 refactor location ui in addVault workflow to new locationPreset framework 2023-05-17 17:21:02 +02:00
Armin Schrenk 0989c735c0 improve error handling when querying registry 2023-05-17 14:25:46 +02:00
Armin Schrenk a3492b9ea3 use correct registry keys for onedrive detection 2023-05-17 14:25:16 +02:00
Armin Schrenk e345e6415f use @CheckAvailability annotation correctly 2023-05-17 14:17:28 +02:00
Armin Schrenk 5b6d09308b Create SPI for cloud location presets 2023-05-16 17:16:42 +02:00
Armin SchrenkandGitHub 49bda58993 Merge pull request #2690 from Rexbas/auto-unlock
Auto unlock vaults that were missing at startup
2023-05-15 10:46:28 +02:00
Rexbas 32d7189a12 Add time unit parameter 2023-05-12 21:52:30 +02:00
Rexbas 1253b7db2b Make unlock method private and simplify missing vaults unlocker 2023-05-11 20:43:23 +02:00
Sebastian StenzelandGitHub 6bb69ea8d3 Merge branch 'develop' into libappindicator 2023-05-10 20:21:54 +02:00
Armin SchrenkandGitHub 067a7ad3ee Merge pull request #2897 from cryptomator/feature/jdk20
Upgrade to jdk20 and jfx20
2023-05-10 14:16:42 +02:00
Ralph Plawetzki 06690e98c7 Code improvements continued
Discussion: https://github.com/cryptomator/cryptomator/pull/2885
2023-05-10 06:53:40 +02:00
Ralph Plawetzki 6e858746c1 Keep change to JDK 20 outside of this PR 2023-05-10 06:35:52 +02:00
Ralph Plawetzki 8b94c82889 Use icons provided by tobihagemann 2023-05-10 06:23:57 +02:00
Ralph Plawetzki fbe997e6c4 Revert "Use second icon too provided by tobihagemann"
This reverts commit 491fdaa9bb.
2023-05-10 05:44:53 +02:00
Ralph Plawetzki 491fdaa9bb Use second icon too provided by tobihagemann 2023-05-09 19:52:41 +02:00
Armin Schrenk a9ec76a344 update wix main file due to updated jpackage installer template 2023-05-09 17:40:13 +02:00
Sebastian Stenzel 59f5c0cb12 started new unlock workflow using user-specific private key 2023-05-09 17:09:49 +02:00
Armin Schrenk 085f762a35 further fixing debian 2023-05-09 15:48:06 +02:00
Armin Schrenk 7dd1c3576f always use the same JDK version in debian workflow 2023-05-09 15:02:15 +02:00
Armin Schrenk d23bd2865a update location preset for Dropbox 2023-05-09 14:56:44 +02:00
Armin Schrenk 4429d57b5e ensure mutability of temporary collection 2023-05-09 14:52:15 +02:00
Armin Schrenk 2ff71ed7b0 remove langauges with insufficient translation 2023-05-09 14:51:44 +02:00
Armin Schrenk 82de8b6994 remove unrelated change 2023-05-09 09:57:23 +02:00
Armin Schrenk d4cba2fd6e fix errors 2023-05-09 09:55:56 +02:00
ff80f634d2 Apply suggestions from code review
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2023-05-09 09:42:01 +02:00
Jan-Peter Klein b10523ea6c init commit 2023-05-09 09:00:56 +02:00
Armin Schrenk 6386dd3d50 update workflows 2023-05-08 19:41:58 +02:00
Armin Schrenk a3f05db189 bump javafx 2023-05-08 19:41:02 +02:00
Armin Schrenk 151ef6c7b2 upgrade to jdk20
* use pattern matching preview feature
* bump fuse-nio-adapter
2023-05-08 19:12:35 +02:00
Ralph Plawetzki 2d17ad9a2e Add SVG icons to Linux build scripts 2023-05-06 17:36:39 +02:00
Ralph Plawetzki 5502f58637 Move SVG icons for Linux to the right location 2023-05-06 17:29:48 +02:00
Ralph Plawetzki 1006cb506f Fix wrong reference 2023-05-06 17:16:17 +02:00
Ralph Plawetzki d7bc92aa09 org.cryptomator.integrations.linux not needed at all 2023-05-06 17:15:28 +02:00
Rexbas 72fd38baf1 Add timeout to periodic missing vaults check 2023-05-06 15:40:24 +02:00
Ralph Plawetzki 948a62b482 Code improvements continued
Discussion: https://github.com/cryptomator/integrations-linux/pull/18
2023-05-06 09:18:47 +02:00
Tobias HagemannandGitHub 532ffb1202 Merge pull request #2882 from bluen/develop
Respect user's locale when sorting language list
2023-05-05 11:51:17 +02:00
Tobias Hagemann 2a704d5eb4 init collator once 2023-05-05 11:45:02 +02:00
Sebastian Stenzel e8f8466d9a adjusted labels used in auto-generated release notes
[ci skip]
2023-05-05 10:56:44 +02:00
Sebastian Stenzel 9297562c99 improve auto-generated release notes
[ci skip]
2023-05-05 10:52:51 +02:00
Ralph Plawetzki 2fbdce26ea Use JEP 433 pattern matching for switch 2023-05-03 09:50:44 +02:00
Ralph Plawetzki 317f3c3458 Move stuff to integrations-linux 2023-04-30 17:08:08 +02:00
Ralph Plawetzki 97cede12b7 Update to JDK 20 2023-04-27 18:39:46 +02:00
Jürgen Kleer 7d62fc78de Set preferred locale in constructor, make it default in applyPreferred 2023-04-27 18:03:41 +02:00
Rexbas ba627d0d60 Add a scheduled service to auto unlock vaults that were missing at startup 2023-04-27 11:06:09 +02:00
Ralph Plawetzki 6da107f4db Add AppindicatorTrayMenuController 2023-04-26 18:24:01 +02:00
Jürgen Kleer 8e7e7de358 Refactoring
make LANGUAGE_TAGS private and provide a getter
2023-04-26 17:34:47 +02:00
Jürgen Kleer 10c60d7492 https://github.com/cryptomator/cryptomator/issues/2813
> List of languages should have system default, English and then all other languages in alphabetic order.
> That is, in alphabetic order with respect to the language the list is localized in (seems to be English always)
2023-04-26 15:24:50 +02:00
Armin Schrenk aa03bd119a Merge branch 'main' into develop 2023-04-25 10:45:51 +02:00
Armin Schrenk 325ffda9af Merge branch 'release/1.8.0' 2023-04-25 10:45:08 +02:00
Armin Schrenk d1270ceeb2 finalize 1.8.0 2023-04-25 10:44:41 +02:00
Armin Schrenk 901a290dd9 prepare 1.8.0 2023-04-24 17:35:25 +02:00
CryptobotandGitHub 35b9dadfc2 New Crowdin updates (#2848)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-04-24 17:33:59 +02:00
Armin SchrenkandGitHub 5f57678edc Merge pull request #2840 from cryptomator/feature/convert-hub-to-local
Feature: convert hub-based vault to password-based
2023-04-21 15:31:28 +02:00
Tobias Hagemann 30e1922bc9 fixed spacing
[ci skip]
2023-04-21 15:23:06 +02:00
Armin Schrenk 2e0908ab15 replace config manually instead of using CryptoFileSystem.init() 2023-04-21 09:40:34 +02:00
Julian Raufelder 689ce5b985 Revive status and no-response bot 2023-04-20 15:38:57 +02:00
Tobias Hagemann a71a23aa31 replaced password bullet point with a different char that exists in open sans
[ci skip]
2023-04-18 16:36:27 +02:00
Tobias Hagemann 864454e6fc updated strings
[ci skip]
2023-04-18 16:03:05 +02:00
Armin Schrenk 94c3381723 forgot one renaming 2023-04-18 15:40:44 +02:00
d9f945e70a Apply suggestions from code review
more renaming

Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2023-04-18 15:34:20 +02:00
Armin Schrenk dc9b39202f rename classes 2023-04-18 14:34:48 +02:00
Armin Schrenk 2a01aba3cf clean up 2023-04-17 12:51:36 +02:00
Armin Schrenk 4305fd3285 close also vault options window to prevent invalid state of options window 2023-04-17 12:50:46 +02:00
a24cd1ba7f Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2023-04-14 16:47:45 +02:00
Tobias Hagemann 2ba0d963ec updated insets
[ci skip]
2023-04-13 16:12:08 +02:00
Julian Raufelder cd0c6fbd33 Merge branch 'hotfix/1.7.5' into develop 2023-04-07 11:45:08 +02:00
Julian Raufelder f4374a2606 Merge branch 'hotfix/1.7.5' 2023-04-07 11:41:24 +02:00
Julian Raufelder a1d5b8a4e2 Prepare 1.7.5 2023-04-07 11:39:21 +02:00
Julian Raufelder 34e430aff6 Revert "bump cryptofs"
This reverts commit db2560fccf.
2023-04-07 11:35:38 +02:00
Armin Schrenk c79766cdf6 Merge branch 'main' into develop 2023-04-05 09:58:30 +02:00
Armin Schrenk bf76bad626 Merge branch 'release/1.7.4' 2023-04-05 09:57:55 +02:00
Armin Schrenk c3f654b454 finalize release 2023-04-05 09:56:34 +02:00
Armin Schrenk d1d990d47c prepare 1.7.4 2023-04-04 18:17:24 +02:00
CryptobotandGitHub 6052c0589e New Crowdin updates (#2800)
New translations strings.properties

Belarusian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Danish; Dutch; French; German; Greek; Hebrew; Hungarian; Italian; Japanese; Norwegian Bokmal; Polish; Portuguese; Portuguese, Brazilian; Romanian; Russian; Slovak; Spanish; Swahili, Tanzania; Swedish; Turkish; 

[ci skip]
2023-04-04 18:15:07 +02:00
Armin Schrenk db2560fccf bump cryptofs 2023-04-04 13:44:19 +02:00
Armin Schrenk 3a50c32e50 rework convert button logic 2023-04-04 12:42:23 +02:00
Armin Schrenk 65eca31d26 integrate internationalization 2023-04-04 12:17:22 +02:00
Armin Schrenk 3462e0b540 further design adjustment 2023-04-03 10:42:25 +02:00
Armin Schrenk 697529136e use regular jdk 2023-03-31 18:27:35 +02:00
Armin Schrenk 50d31bdc18 integrate debug installer feature into regular windows ci workflow 2023-03-31 18:24:10 +02:00
Armin Schrenk 84caf96d3f closes #2814
Zulu JDK does not create required directory structure, so use temurin + gluon jfx jmods instead
2023-03-31 18:21:30 +02:00
Armin Schrenk a1a5fd3609 adjust design 2023-03-30 17:35:32 +02:00
Armin Schrenk 6c11cc8f1d complete workflow 2023-03-30 16:47:30 +02:00
Armin Schrenk 2b391a6ee3 Merge branch 'develop' into feature/convert-hub-to-local 2023-03-30 15:54:20 +02:00
Armin Schrenk b7fc03213d bump fuse-nio-adapter
Fixes #2801
2023-03-30 11:28:07 +02:00
Armin SchrenkandGitHub dfe17569e1 Merge pull request #2789 from cryptomator/feature/2786-only-restart-macfuset
Feature: Only require app restart if switching between macFUSE and FUSE-T
2023-03-30 11:23:09 +02:00
Armin Schrenk 827f9ad141 adjust comment 2023-03-30 11:18:28 +02:00
Armin Schrenk c8a6d0339e Use in volume preferences controller same objet as in MountModule to store first used fuse mount service 2023-03-29 17:42:18 +02:00
Tobias Hagemann b5bbd21f25 refactored the refactoring to a macfuse/fuse-t workaround again 2023-03-29 16:50:02 +02:00
Tobias Hagemann 771468c8c6 refactored macfuse/fuse-t specific workaround to a generic fuse workaround 2023-03-29 16:16:04 +02:00
Armin Schrenk ea2a48771f Closes #2829 2023-03-29 12:03:35 +02:00
Tobias Hagemann 0e10da25b3 Update README.md
[ci skip]
2023-03-29 11:58:14 +02:00
Armin Schrenk 943a3e9cfd adjust visibility 2023-03-29 11:42:14 +02:00
Armin Schrenk c988fb50a7 increase readability 2023-03-29 11:39:18 +02:00
Armin Schrenk 219ee0da9a implement core functionality 2023-03-28 14:02:11 +02:00
Armin Schrenk 5665e92839 deduplicate and add convenience method 2023-03-28 14:01:57 +02:00
Armin Schrenk 04ff188624 rename method in recoveryKeyFactory 2023-03-28 13:59:59 +02:00
Armin Schrenk ec7d6eafec add new password screen for convert hub vault flow 2023-03-24 18:11:39 +01:00
Armin Schrenk 28bb2ff9b1 add stub for vault conversion (hub to local) 2023-03-24 17:22:05 +01:00
Armin Schrenk a92ebfdc7b replace builder by stateless, threadsafe factory 2023-03-24 16:42:04 +01:00
Armin Schrenk f1e97fa64b fix workflow 2023-03-22 10:44:54 +01:00
Armin Schrenk b9d5cf04c2 fix workflow 2023-03-22 10:40:52 +01:00
Armin Schrenk 75cd3e44d8 change win-debug workflow to use temurin and openjfx jmods from gluon 2023-03-22 10:39:00 +01:00
Armin Schrenk 3cf1b829b8 make recovery key ui validation reusable 2023-03-20 21:40:16 +01:00
Armin Schrenk 6e4e9cd261 Merge branch 'develop' into feature/hub-local-access 2023-03-20 20:43:34 +01:00
Armin Schrenk e15dd7565f add workflow to build a windows debug launcher 2023-03-20 10:35:42 +01:00
Tobias Hagemann 77bc60fe5b Update README.md 2023-03-17 17:56:46 +01:00
Tobias HagemannandGitHub 9f633a1ecb Update README.md 2023-03-17 17:06:34 +01:00
Armin Schrenk fcf59d12a8 remove winget workflow 2023-03-15 16:47:34 +01:00
Armin Schrenk 6721075831 Merge branch 'main' into develop 2023-03-15 13:51:59 +01:00
Armin Schrenk 4bb0026415 Merge branch 'release/1.7.3' 2023-03-15 13:51:20 +01:00
Armin Schrenk bebae14744 finalize release 2023-03-15 13:51:09 +01:00
Armin Schrenk 997315eaf5 prepare 1.7.3 2023-03-15 13:49:53 +01:00
CryptobotandGitHub 16d677c40f New Crowdin updates (#2766)
New translations strings.properties

Belarusian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; French; German; Hebrew; Norwegian Bokmal; Russian; Swahili, Tanzania; Turkish; 

[ci skip]
2023-03-15 13:47:22 +01:00
Armin Schrenk 42a1913c17 Fixes #2797 and fixes #2760 2023-03-15 13:42:03 +01:00
Armin Schrenk c3f6655e48 add developer 2023-03-15 12:34:13 +01:00
Armin Schrenk fa1b0f2de8 reestablish interrupt state 2023-03-15 12:29:19 +01:00
Armin Schrenk 385574a618 prevent infinite loop 2023-03-15 12:10:15 +01:00
Armin Schrenk a67477bf3b Fixes #2778
ensure that mountpoint is ready
2023-03-15 11:40:44 +01:00
Armin Schrenk 03a362e9b4 fix compilation 2023-03-13 13:01:13 +01:00
Armin Schrenk 2223bc5e78 use correct selection logic 2023-03-13 12:58:34 +01:00
Armin Schrenk fdc0d2d6b5 only require restart in case if macFUSE or FUSE-T
Closes #2786
2023-03-13 12:44:56 +01:00
Armin Schrenk 58ed48b097 UI:
* remove restart notice for volume type
* only show restart label, when switching between macFUSE and FUSET
2023-03-13 11:17:56 +01:00
Julian Raufelder 7a0d255bd3 Use the same source tarball for signing that is linked in the release 2023-03-07 13:44:36 +01:00
Armin Schrenk 228fa099cb Merge branch 'main' into develop 2023-03-07 12:24:26 +01:00
Armin Schrenk a60ff20f15 Merge branch 'release/1.7.2' 2023-03-07 12:23:30 +01:00
Armin Schrenk 2328a5e3a8 finalize release 2023-03-07 12:19:35 +01:00
Armin Schrenk e7e181b1a5 Merge branch 'develop' into release/1.7.2 2023-03-07 12:19:23 +01:00
Armin Schrenk f3e7c08b43 deactivate winget workflow 2023-03-07 12:19:05 +01:00
Armin Schrenk 2a41afcfa9 prepare 1.7.2 2023-03-07 11:52:04 +01:00
CryptobotandGitHub 5bf38a328c New Crowdin updates (#2743)
New translations strings.properties

Arabic; Belarusian; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; French; German; Greek; Hebrew; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Norwegian Nynorsk; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Slovak; Spanish; Swahili, Tanzania; Swedish; Tamil; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-03-07 11:49:50 +01:00
Armin Schrenk f983b29034 use correct docs URL for volume type 2023-03-07 11:40:10 +01:00
Armin Schrenk 4bc217e489 fixes #2761 2023-03-07 11:36:59 +01:00
Armin Schrenk b24f52a4ec fixes 2741 2023-03-07 10:58:34 +01:00
Armin Schrenk 91e7fa3de3 fixes #2758, fixes #2754 2023-03-06 15:58:02 +01:00
Armin Schrenk 1365efab3f use recommended notation of unit prefixes 2023-03-06 15:54:43 +01:00
Armin Schrenk 852963b785 check for correct WinFsp version 2023-03-06 15:50:21 +01:00
Armin Schrenk c47d4eaf02 Merge branch 'main' into develop 2023-03-03 16:37:45 +01:00
Armin Schrenk 36da26c6b9 Merge branch 'release/1.7.1' 2023-03-03 16:19:49 +01:00
Armin Schrenk 33e1cb3131 finalize release 2023-03-03 16:19:37 +01:00
Armin Schrenk ed4b433df0 prepare 1.7.1 2023-03-03 16:14:01 +01:00
Armin Schrenk d2ece543c8 suppress false positive 2023-03-03 16:04:34 +01:00
Armin Schrenk 4bb2df7d8f Fixes #2730 2023-03-03 16:03:36 +01:00
CryptobotandGitHub 4d5c6ca29a New Crowdin updates (#2712)
New translations strings.properties

Danish; German; Hebrew; 

[ci skip]

Closes #2724
2023-03-03 16:02:09 +01:00
Armin Schrenk f0d597ba73 require fuse3 packge for deb to have fusermount3 2023-03-01 19:28:40 +01:00
Armin Schrenk 310329d0b5 use correct javafx patch version for debia build 2023-03-01 15:51:42 +01:00
Julian Raufelder 30f86a7f2a Fix issue template 2023-03-01 15:23:30 +01:00
Armin Schrenk 5237dc8cae Merge branch 'main' into develop 2023-03-01 12:07:46 +01:00
Armin Schrenk 67ff4da05b Merge branch 'release/1.7.0' 2023-03-01 12:06:40 +01:00
Armin Schrenk 947eb11198 set correct version in pom 2023-03-01 12:06:25 +01:00
Armin Schrenk c6a9af1a04 update metainfo.xml 2023-03-01 12:03:03 +01:00
Armin Schrenk 0ddf221e26 Merge branch 'develop' into release/1.7.0 2023-03-01 11:43:49 +01:00
CryptobotandGitHub 3f2b5ccde9 New Crowdin updates (#2698)
New translations strings.properties

Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; French; Japanese; 

[ci skip]
2023-03-01 11:42:57 +01:00
Armin Schrenk 4fc07c27b3 Merge branch 'develop' into feature/hub-local-access 2023-02-27 15:35:40 +01:00
Armin SchrenkandGitHub 3d0b6dde28 Update README.md 2023-02-27 13:09:56 +01:00
Armin Schrenk 45534b0a2b suppress false positive 2023-02-27 12:19:13 +01:00
Armin Schrenk 6d906beeb8 bump dependency-check 2023-02-27 12:17:47 +01:00
Tobias Hagemann e577c64c35 arm64 dmg installer (link + bg) for fuse-t 2023-02-27 11:06:19 +01:00
Armin Schrenk b848e78372 Merge branch 'develop' into release/1.7.0 2023-02-24 14:16:38 +01:00
Armin Schrenk 39e9395b4b bump fuse-nio-adapter 2023-02-24 14:16:20 +01:00
CryptobotandGitHub ca3157cc70 New Crowdin updates (#2695)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-02-24 14:15:50 +01:00
Armin Schrenk f94c1f07d6 add new wix extension to ci build 2023-02-24 13:23:10 +01:00
Armin Schrenk d43f197c11 fix 67e566832c 2023-02-24 13:14:14 +01:00
Armin Schrenk 67e566832c use correct path to get winfsp download url 2023-02-24 13:13:07 +01:00
Armin Schrenk 6f5a88af1d extend winfsp uninstall instruction by reboot step 2023-02-24 13:10:15 +01:00
Armin Schrenk 210b891616 block exe installation if winFsp is outdated 2023-02-24 12:50:20 +01:00
Armin Schrenk 20e820c903 update IDE specific files 2023-02-24 12:48:41 +01:00
Armin Schrenk 5307e93c1b bump fuse-nio-adapter
fix illegalArgumentException when setting loopbackHostName
2023-02-24 12:48:29 +01:00
Armin Schrenk ec1d25bf65 Merge branch 'develop' into feature/hub-local-access 2023-02-23 21:10:03 +01:00
Armin Schrenk 7aa554498b move new password files to changepassword package 2023-02-23 13:00:51 +01:00
Armin Schrenk 85ac3c244d rename forgetPassword package 2023-02-23 12:55:30 +01:00
Armin Schrenk 5db5346c88 refactor error component to own package 2023-02-23 12:53:29 +01:00
Armin Schrenk e221019b57 Merge branch 'develop' into release/1.7.0 2023-02-23 12:09:03 +01:00
Armin Schrenk eeaaced976 reorder settingsJsonAdapter switch statements 2023-02-23 12:08:48 +01:00
Armin Schrenk d246b54268 ignore lastWrittenByVersion when reading settings 2023-02-23 12:00:14 +01:00
Armin Schrenk 8f4bf144c3 Merge branch 'develop' into feature/hub-local-access 2023-02-23 11:38:33 +01:00
Armin Schrenk e94572960e enable drag and drop for linux aswell 2023-02-23 11:16:48 +01:00
Armin Schrenk 2d1c59bea9 Renamed objects related to license exceeded user flow 2023-02-23 10:45:55 +01:00
Armin Schrenk 921cbd6439 Merge branch 'develop' into release/1.7.0 2023-02-22 17:47:14 +01:00
Armin Schrenk f811144ffa pom cleanup [ci skip] 2023-02-22 17:46:56 +01:00
Armin Schrenk 2ecc711f50 bump dependencies 2023-02-22 17:28:34 +01:00
Armin Schrenk cfcc8782ef bump cryptomator dependencies to stable versions 2023-02-22 17:19:40 +01:00
Armin Schrenk a1379bac40 For Windows try to migrate all user settings, not only the ones of local users 2023-02-22 15:33:37 +01:00
Armin Schrenk fe3f2b5bd3 Merge branch 'develop' into release/1.7.0 2023-02-22 15:14:43 +01:00
CryptobotandGitHub 7fc07ae02c New Crowdin updates (#2689)
New translations strings.properties

Arabic; Belarusian; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Czech; Danish; Dutch; French; German; Greek; Hebrew; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Norwegian Bokmal; Norwegian Nynorsk; Polish; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Turkish; Vietnamese; 

[ci skip]
2023-02-22 15:12:58 +01:00
Armin Schrenk 268c66a108 add hub specific tab to vault options 2023-02-21 23:18:00 +01:00
Armin SchrenkandGitHub 2a70e2f0f4 Merge pull request #2686 from cryptomator/feature/recovery-key-wrong-key
Display message if recovery key is not valid
2023-02-17 15:41:39 +01:00
Tobias Hagemann ffe0302fba updated access modifier 2023-02-17 15:33:00 +01:00
Armin Schrenk c5b86bc355 Closes #2648 2023-02-17 14:46:45 +01:00
Armin Schrenk 5f86473e3e fix recovery key state logic 2023-02-17 12:49:38 +01:00
Armin Schrenk a91c74b6eb Revert "Update translation key"
This reverts commit 71a09eae67.
2023-02-17 11:19:21 +01:00
76949d6ccb Update src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyRecoverController.java
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2023-02-17 11:18:55 +01:00
Armin Schrenk 71a09eae67 Update translation key 2023-02-17 10:59:04 +01:00
8087fcecfb Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2023-02-17 10:56:18 +01:00
Armin Schrenk 29c73e1bc8 display different messages if recovery key is either not valid or does not belong to the vault 2023-02-16 11:51:03 +01:00
Armin Schrenk 8bbdb69cda Update doc links to 1.7 2023-02-16 09:55:42 +01:00
Armin Schrenk e9ee15dcd5 add info about html comments to error form 2023-02-16 09:42:28 +01:00
Armin Schrenk 03f6e0a33c Use Label instead of Text 2023-02-15 23:44:51 +01:00
Armin Schrenk c5b21b0d8c Add warning about error report deletion to the error controller 2023-02-15 11:44:37 +01:00
Armin Schrenk c5c5e297b7 Fix getCiphertextPath for Windows again. 2023-02-14 17:39:34 +01:00
Armin Schrenk 24839985e9 Merge branch 'develop' into release/1.7.0 2023-02-14 11:40:10 +01:00
Armin Schrenk a7b2802f34 show correct error message when using custom mountpoint with webdav (Http address) 2023-02-14 11:39:16 +01:00
Armin Schrenk c85d0b4beb bump webdav-nio-adapter 2023-02-14 11:22:11 +01:00
Armin Schrenk 3dff3a8664 Fixes #2682
* allow windows installer to remove same version
* add revisionNumber to installer version
2023-02-14 11:20:22 +01:00
Armin Schrenk 5b0bbf539b improve FailOnRunningApp action 2023-02-13 23:34:43 +01:00
Armin Schrenk 1ff7c40fd9 Fixes #2672 and fixes #2668 2023-02-13 10:42:17 +01:00
Armin SchrenkandGitHub d0875ef49e Merge pull request #2669 from cryptomator/feature/virtual-volume-doc-link
Add link to volume type documentation
2023-02-09 13:06:03 +01:00
Armin Schrenk e35ed9af72 enable localization of tooltip 2023-02-08 20:11:34 +01:00
Armin Schrenk ac43efe149 change UI to be not so clunky:
* only use question mark icon
* use tooltip at icon instead of explicit label
* icon is the hyperlink
2023-02-08 11:33:41 +01:00
Armin Schrenk 202a2ea79f Load revealPathServiceProvider at app startup 2023-02-08 11:14:54 +01:00
Armin Schrenk c19a86a348 add link to mounting documentation 2023-02-07 15:23:04 +01:00
Armin Schrenk 539dcaa85a Update issue template 2023-02-07 12:23:25 +01:00
Armin Schrenk fb91c1a461 Merge branch 'develop' into release/1.7.0 2023-02-06 14:45:56 +01:00
CryptobotandGitHub bd75370dfd New Crowdin updates (#2646)
New translations strings.properties

Catalan; Chinese Simplified; Dutch; Italian; Persian; Polish; Slovak;

[ci skip]
2023-02-06 14:44:45 +01:00
Armin Schrenk 7a9a9cf4eb Follow up of 69d73d0fb9: Remove standalone launchers 2023-02-06 12:31:56 +01:00
Armin Schrenk 489e9fce90 bump integrations-win to 1.2.0-beta2
Closes #2657
2023-02-03 13:19:53 +01:00
Armin Schrenk d378d84832 bump fuse-nio-adapter 2023-02-03 13:19:43 +01:00
Armin Schrenk 69d73d0fb9 Remove standalone launchers 2023-02-03 13:15:03 +01:00
Armin Schrenk 97c0cb4f5f add to settings.json the app version written to it last 2023-02-02 16:44:03 +01:00
Armin Schrenk b4faae7fa0 make debug logs readable by filter out internal fuse-nio locking 2023-02-02 10:36:31 +01:00
Armin Schrenk 55d76b65cc Add IOException to log message during revealPath 2023-02-01 22:31:27 +01:00
Armin Schrenk fd6e1e6741 fix bug 2023-02-01 19:23:28 +01:00
Armin Schrenk 155558caa8 add style class to text object 2023-02-01 13:50:56 +01:00
Armin Schrenk 28217b2de3 only perform mountpoint move and cleanup, if mountpoint is not a drive letter 2023-02-01 13:44:57 +01:00
Armin SchrenkandGitHub b9e57ce895 Merge pull request #2654 from cryptomator/feature/2652-migrate-dir-mounts
Feature/2652 migrate dir mounts
2023-02-01 11:17:11 +01:00
Armin Schrenk 95ea23ee6e add more comments regarding removal evaluation of this workaround 2023-02-01 11:07:23 +01:00
Armin Schrenk c269184217 ensure that settings.json is a file 2023-01-31 18:05:31 +01:00
Armin Schrenk 68d32957e4 fix errors 2023-01-31 16:37:25 +01:00
Armin Schrenk a771f0a5b7 doc doc doc 2023-01-31 13:59:18 +01:00
Armin Schrenk e56e6a8359 integrate script into installer 2023-01-31 13:58:56 +01:00
Armin Schrenk 5f9b77241f extend migration script to all local users 2023-01-31 13:40:25 +01:00
Armin Schrenk fb54ee04a6 Remove Dokany advertisement from msi installer 2023-01-30 13:32:56 +01:00
Armin Schrenk a106b04c7e prototpye for powershell script to be executed after installation 2023-01-30 13:30:06 +01:00
Armin Schrenk 285d48b70b Merge branch 'develop' into release/1.7.0 2023-01-27 13:27:31 +01:00
Armin Schrenk 0d8d7e4ee5 fix debian artifact upload 2023-01-27 13:27:03 +01:00
Armin Schrenk f232f9d958 Merge branch 'develop' into release/1.7.0 2023-01-27 12:31:00 +01:00
Armin Schrenk 88c3b0cc4f remove tag-name from release action to just add to current release on debian build 2023-01-27 12:30:44 +01:00
Armin Schrenk ef190db739 Merge branch 'develop' into release/1.7.0 2023-01-27 11:36:28 +01:00
CryptobotandGitHub b378354bb9 New Crowdin updates (#2562)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian(Cyrillic); Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean( Latin); Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Sinhala; Slovak; Slovenian; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2023-01-27 11:35:50 +01:00
Armin Schrenk 822e863e27 partially revert 220782b84f 2023-01-26 16:29:43 +01:00
Armin Schrenk 40fbe4f59d remove more libffi workaround leftovers 2023-01-26 16:05:53 +01:00
Tobias Hagemann bf779b5b41 updated dmg background 2023-01-26 15:57:10 +01:00
Tobias Hagemann ce5dbd14d8 reverted be7ac50928 2023-01-26 15:57:10 +01:00
Armin Schrenk 48744018a2 Merge branch 'release/1.7.0' into develop 2023-01-26 15:56:48 +01:00
Armin Schrenk bd9f79cb56 add cryptomator.mountPointsDir property to macOS installer scripts 2023-01-26 15:54:31 +01:00
Armin Schrenk f4c4f72539 remove libjffi stuff from appimage 2023-01-26 14:31:23 +01:00
Armin Schrenk 74718754ad fix merge 2023-01-26 13:48:30 +01:00
Armin Schrenk eb595379d6 Merge branch 'develop' into release/1.7.0
# Conflicts:
#	dist/linux/debian/control
#	dist/linux/debian/cryptomator.sh
2023-01-26 13:47:46 +01:00
Armin Schrenk 220782b84f reduce jars neede to stay on classpath due to missing module info 2023-01-26 13:28:55 +01:00
Armin SchrenkandGitHub 1c104737c1 Merge pull request #2639 from cryptomator/feature/mount-provider
Refactoring: Use mount service
2023-01-26 13:20:11 +01:00
Armin Schrenk 7c8a519919 bump webdav-nio-adapter 2023-01-26 13:10:32 +01:00
Armin Schrenk ae1fa5851f remove traces of ActualMountService from volume preferences controller 2023-01-26 13:02:21 +01:00
Armin Schrenk 86ccb1a58f changing volume provider requires restart due to macFUSE/FUSE-T lib loaded in same JVM 2023-01-26 12:05:34 +01:00
Armin Schrenk c3fb58f7d0 bump fuse-nio-adapter 2023-01-25 16:49:00 +01:00
Armin Schrenk b4c384acc9 use speciaized translation key 2023-01-25 12:44:09 +01:00
Armin Schrenk 8580e97791 cleanup 2023-01-23 14:39:46 +01:00
Armin Schrenk 5d348ee229 Bump WebDAV dependency 2023-01-23 14:39:21 +01:00
Armin Schrenk dda0ff545c add point of automatic mount point selection 2023-01-23 13:47:00 +01:00
Armin Schrenk 708b5938ac Add info about the dependency of volume type and mountOptions 2023-01-23 13:11:01 +01:00
Armin SchrenkandGitHub a3cb8cd2f1 Merge pull request #2641 from purejava/jdk.security.auth
Add jdk.security.auth module as it's required by dbus-java-core

Closes #2640
2023-01-23 11:10:59 +01:00
Armin Schrenk 3587d53d15 bump integrations-mac, fixes NoSuchServiceException for RevealPathService on macOS 2023-01-23 11:09:15 +01:00
Tobias HagemannandGitHub 2f5e2af8d9 Merge pull request #2638 from cryptomator/feature/traymenu-onbeforeopenmenu-macos-fix
Fixed vault list refresh when tray icon is clicked on macOS
2023-01-23 10:24:57 +01:00
Ralph PlawetzkiandGitHub 8139cb8c38 Add jdk.security.auth module to rules 2023-01-22 20:05:13 +01:00
Armin Schrenk 09d5f71335 do not reset mountflags to default ones when window opens 2023-01-22 19:24:35 +01:00
Ralph Plawetzki 3a638735b7 Add jdk.security.auth module to appimage.yml 2023-01-22 18:11:50 +01:00
Ralph Plawetzki f1f5f7e02f Add jdk.security.auth module as it's required by dbus-java-core 2023-01-22 17:59:20 +01:00
Tobias Hagemann 94fe8ca449 updated string
[ci skip]
2023-01-20 17:18:05 +01:00
Tobias Hagemann 1251e1b873 updated separator styling 2023-01-20 17:14:02 +01:00
Armin Schrenk 50405c0bd5 remove debug message 2023-01-20 17:07:19 +01:00
Armin Schrenk 774d24625c change styling of volume preferences 2023-01-20 17:07:04 +01:00
Tobias Hagemann ba4902a5bc Fixed vault list refresh when tray icon is clicked on macOS 2023-01-20 16:45:35 +01:00
Armin Schrenk 90408504e2 Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/Vault.java
#	src/main/java/org/cryptomator/ui/mainwindow/VaultDetailUnlockedController.java
2023-01-20 15:27:48 +01:00
Armin Schrenk c8c44e0554 bump fuse-nio-adapter dependency 2023-01-20 15:01:31 +01:00
Armin Schrenk 7afab6fe78 add auto option to volume type selection 2023-01-20 12:29:17 +01:00
Armin Schrenk ad321dfe55 migrate 1.6.x volumeimpl to hardcoded mountservices 2023-01-20 11:49:15 +01:00
d6388d6205 Added drop zone for revealing encrypted files or folders (#2592)
* Added drop zone for revealing encrypted files or folders

* Split god drop zone into distinct drop zones in vault list and vault detail unlocked

* Prevent cursor from changing if content doesn't match during drag over

[ci skip]

* Removed unused methods / css classes

[ci skip]

* Updated method name

* Refactor Vault::getCiphertextPath to only accept strings starting with "/"

* bump cryptofs

* ensure that path cleartext path always starts with "/"

* added file chooser for revealing encrypted items

* Trying to fix path parsing again

* Updated drag & drop design for buttons

* use RevealPathService to reveal files in file manager

* fix compilation error

* Copy paths to clipboard if no revealService is present

* reintegrate wongFileAlert

* Only accept TrasnferMode.LINK

* updated drag-n-drop button styling

* added tooltip

* updated string

* cleanup

Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2023-01-20 10:46:00 +01:00
Armin SchrenkandGitHub b8326907bf Merge pull request #2624 from purejava/update-appimage-build-script
Update build.sh to .github/workflows/appimage.yml
2023-01-19 13:37:10 +01:00
Armin Schrenk 5beeeae27f Sign integrations.dll during build 2023-01-16 18:47:41 +01:00
Armin Schrenk fb1f3c4757 fix bug using wrong mount flags 2023-01-16 14:14:03 +01:00
Armin Schrenk 5e32cbcdd0 show supported mount features in preferences/volume 2023-01-13 18:11:36 +01:00
Armin Schrenk 08d741ecf5 address TODOs 2023-01-13 16:24:15 +01:00
Armin Schrenk 23060a8497 reinitate workaround for MOUNT_WITHIN_PARENT 2023-01-13 15:59:44 +01:00
Armin Schrenk 47a32893f0 Refactor mounter class 2023-01-13 13:46:41 +01:00
Armin Schrenk 0f7ba4e00e remove updating driveletter strings 2023-01-13 12:53:41 +01:00
Armin Schrenk 0d75b999a3 cleanup 2023-01-13 12:50:38 +01:00
Armin Schrenk b6d97528d2 fix driveletter selection 2023-01-13 12:49:20 +01:00
Armin Schrenk 94c53989b1 MountOptions window: Reset to auto mount, if no dir selected 2023-01-13 11:27:30 +01:00
Armin Schrenk a72ea1b9f5 move mount prepartions to own class 2023-01-13 11:20:23 +01:00
Armin Schrenk 6395f17736 Handle illegelArgumentException when setting custom mountpoint 2023-01-12 17:21:54 +01:00
Armin Schrenk 5c61944757 fix minor ui bugs 2023-01-12 12:53:58 +01:00
Armin Schrenk c641695a40 migrate 1.6.x vault settings on-the-fly 2023-01-12 12:11:03 +01:00
Armin Schrenk d93ef2e905 Reinitiate force lock 2023-01-11 16:40:14 +01:00
Armin Schrenk 8b9377cf4e only fix custom mount flags, if explicitly desired. Otherwise use the ones provided by mount service 2023-01-11 16:35:12 +01:00
Armin Schrenk 991b03e000 use function paramter, not instance variable 2023-01-11 16:21:49 +01:00
Armin Schrenk 73d8c4098e resolve TODOs 2023-01-11 16:18:05 +01:00
Armin Schrenk 6a52d15510 Show mountpath in reveal button 2023-01-11 16:01:59 +01:00
Armin Schrenk d07b1b96dd Use first available mount provider if none is selected or selected is not present 2023-01-11 16:01:51 +01:00
Armin Schrenk 24d472ed8b Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
2023-01-11 16:01:27 +01:00
Armin Schrenk 6fe2d73c52 copy uri to clipboard when using fallback mounter 2023-01-11 15:59:39 +01:00
Armin Schrenk 523e5d7904 bump webdav- and dokany-adapter 2023-01-11 15:59:17 +01:00
Tobias Hagemann 304064d9ab updated dependency-check version 2023-01-09 11:59:51 +01:00
Tobias Hagemann 0d49c60d4d reverted 1a6258eb17 2023-01-09 11:32:11 +01:00
Ralph Plawetzki 0e0e00f116 Remove stuff not needed when run locally
From: changes requested for PR #2624
2023-01-08 14:10:38 +01:00
Ralph Plawetzki 77c0a3e265 Update build.sh to .github/workflows/appimage.yml 2023-01-07 15:31:32 +01:00
Tobias Hagemann 1807888860 updated sponsors
[ci skip]
2023-01-05 11:16:22 +01:00
Tobias Hagemann be7ac50928 added new app icon for macos, fixes #2517 2023-01-04 16:32:40 +01:00
Julian Raufelder 9182c415eb Hello 2023 🎉 2023-01-04 13:35:58 +01:00
Armin Schrenk 1a6258eb17 revert eea568ca4e and e2898f0c8b 2023-01-04 12:52:16 +01:00
Armin SchrenkandGitHub 9c0c6a91fb Merge pull request #2580 from jacob-willden/develop
Add more info to Migration Screen
2023-01-03 16:47:18 +01:00
Armin Schrenk 53436520c9 fix using the wrong property 2023-01-03 12:38:18 +01:00
Armin Schrenk fd5aeaf90a Merge branch 'develop' into feature/mount-setting-per-vault 2023-01-02 13:47:30 +01:00
Armin Schrenk f3fcfc913b Remove unused class 2023-01-02 12:10:46 +01:00
Armin SchrenkandGitHub 0b0870e313 Merge pull request #2575 from VsevolodGolovanov/issue_2557_unlocked_status_indicator_in_tray_icon
Unlocked status indicator in tray icon 

Closes #2557
2022-12-30 11:40:51 +01:00
Armin SchrenkandGitHub 6704bb1f8c Merge pull request #2612 from cryptomator/feature/2597-no-keychain-dialog
Feature: Show dialog for hub vaults, if keychain is disabled'

Closes #2597
2022-12-30 11:32:40 +01:00
Armin Schrenk 48d1938b99 Refine dialog text 2022-12-30 11:19:37 +01:00
Armin Schrenk 6199277002 Add Button to open preferences 2022-12-29 18:26:13 +01:00
Armin Schrenk 9fefe8e462 Show info dialog when keychain is deactivated 2022-12-29 18:20:46 +01:00
Armin Schrenk 5fcd53be18 load device key before showing UI to prevent uncatched failure of UI loading 2022-12-29 18:17:47 +01:00
Jacob Willden 7147636428 Switch term for new vault migration dialog 2022-12-21 18:56:17 -07:00
Jacob Willden 690bd833e8 Add more info to Migration Screen 2022-12-16 13:28:57 -07:00
1e12590681 Update src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
Co-authored-by: Tobias Hagemann <tobias.hagemann@gmail.com>
2022-12-15 13:34:52 +04:00
Tobias Hagemann eea568ca4e GCM is explicitly ready! 2022-12-14 22:27:34 +01:00
Armin Schrenk 8009205da7 Merge branch 'main' into develop
# Conflicts:
#	pom.xml
2022-12-14 20:07:24 +01:00
Armin Schrenk c0f73a2802 Merge branch 'hotfix/1.6.17' 2022-12-14 20:06:35 +01:00
Armin Schrenk 8e902877a3 Update dependency-check plugin and exclude false positive
(cherry picked from commit ebcd0adf78)
2022-12-14 20:06:23 +01:00
Armin Schrenk fd76c89393 update metainfo 2022-12-14 20:02:12 +01:00
Armin Schrenk 975baf594c Fixes #2576 2022-12-14 19:58:22 +01:00
Vsevolod Golovanov 5a99c7bb61 Unlocked status indicator in tray icon #2557
Now tracking unlockedness and updating the icon accordingly.
2022-12-14 21:18:37 +04:00
Tobias Hagemann e2898f0c8b GCM is ready! 2022-12-14 17:36:06 +01:00
Tobias Hagemann cf2b236df5 added tray icons for unlocked state 2022-12-14 17:28:59 +01:00
Tobias Hagemann 819fa803f3 cleaned up tray icons 2022-12-14 16:47:07 +01:00
Armin Schrenk 980e2b184b use correct tag name for gh release in debian workflow 2022-12-13 12:48:29 +01:00
Sebastian Stenzel ebad677e84 fix path to downloaded jmod files 2022-12-12 09:14:24 +01:00
Sebastian Stenzel 4fda4a2b2e fix makefile 2022-12-12 09:09:25 +01:00
Sebastian Stenzel ffaf7ad360 adjust package dependencies to new mount api and jfuse 2022-12-12 09:03:56 +01:00
Sebastian Stenzel 76689705f5 remove LD_PRELOAD workaround, which should no longer be required with jfuse 2022-12-12 08:54:18 +01:00
Armin Schrenk 1a358f06e8 revert 0725a63b09 and fix workflow
(cherry picked from commit 9dfd8adcce)
2022-12-09 17:01:42 +01:00
Armin Schrenk db4d845a5b adjust matching rules for version type detection
(cherry picked from commit cd358916260e713d4119c20b1bcb5b448a017365)
(cherry picked from commit 433eecc6a8)
2022-12-09 17:01:33 +01:00
Armin Schrenk 0d6d7b0dd6 directly use inputs object 2022-12-09 16:56:45 +01:00
Armin Schrenk 9dfd8adcce revert 0725a63b09 and fix workflow 2022-12-09 16:56:02 +01:00
Armin Schrenk 433eecc6a8 adjust matching rules for version type detection
(cherry picked from commit cd358916260e713d4119c20b1bcb5b448a017365)
2022-12-09 16:50:39 +01:00
Armin Schrenk 36ed4554b2 Fixes #2570
Dabian build: Make libffi7 a runtime dependency and preload it.
2022-12-09 15:12:04 +01:00
Armin Schrenk c2dac30f2d Merge branch 'develop' into release/1.7.0 2022-12-08 17:50:55 +01:00
Armin Schrenk 63a89b5bcf adjust post-release and win-exe workflow 2022-12-08 17:50:31 +01:00
Armin Schrenk 12b53acd22 Merge branch 'develop' into release/1.7.0 2022-12-08 17:37:29 +01:00
Armin Schrenk 9105d1af16 Merge branch 'feature/mount-provider' into release/1.7.0
# Conflicts:
#	dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml
2022-12-08 17:02:44 +01:00
Armin Schrenk de46b91420 use directly inputs object 2022-12-08 13:59:55 +01:00
Armin Schrenk 67b40649bc fix version number in debian workflow 2022-12-08 13:56:42 +01:00
Armin Schrenk c41af77108 remove unused translation keys 2022-12-08 10:50:04 +01:00
Armin Schrenk ba66d4bfce bump fuse-nio-adapter 2022-12-07 17:39:27 +01:00
Armin Schrenk c45a00377d Merge branch 'develop' into feature/mount-provider
# Conflicts:
#	.github/workflows/appimage.yml
#	.github/workflows/mac-dmg.yml
#	.github/workflows/win-exe.yml
#	pom.xml
#	src/main/java/org/cryptomator/common/vaults/WebDavVolume.java
#	src/main/java/org/cryptomator/ui/traymenu/AwtTrayMenuController.java
2022-12-07 17:01:56 +01:00
Armin Schrenk f9d588320c add slack notification to release PPA 2022-12-07 14:53:41 +01:00
Armin Schrenk c61087e697 create and upload source signature after release publish 2022-12-07 14:52:33 +01:00
Armin Schrenk 0725a63b09 release winget manually 2022-12-07 14:29:00 +01:00
Armin Schrenk ebcd0adf78 Update dependency-check plugin and exclude false positive 2022-12-07 14:17:42 +01:00
Armin Schrenk 0e7ec8eb37 bump replace deprecated syntax and dependencies in win-exe build 2022-12-07 12:24:42 +01:00
Armin Schrenk 0e9b115647 debian build: use correct package names 2022-12-07 11:43:59 +01:00
Armin Schrenk 5ba137dda5 Add additional build dependencies to debian build 2022-12-07 11:11:31 +01:00
Sebastian Stenzel db928ba034 try fixing debian build 2022-12-06 20:49:09 +01:00
Sebastian Stenzel 2cc01be236 simplify jmod compatibility check 2022-12-06 20:44:51 +01:00
Sebastian Stenzel ba2a4955d0 fix expected orig.tar.gz name 2022-12-06 20:27:19 +01:00
Sebastian Stenzel d1971e3c2a yml validation error 2022-12-06 20:18:55 +01:00
Sebastian Stenzel 5665984a9b trigger Debian build and provide version info by hand 2022-12-06 20:13:34 +01:00
Armin Schrenk 1f2225991a Merge branch 'main' into develop 2022-12-06 15:46:19 +01:00
Armin Schrenk 1f0fe161fd Merge branch 'release/1.6.16' 2022-12-06 15:45:34 +01:00
Armin Schrenk 4ff8bbaa62 Merge branch 'develop' into release/1.6.16 2022-12-06 15:44:18 +01:00
Armin Schrenk e188169916 add missing javafx getter in resultListCell 2022-12-06 15:44:02 +01:00
Armin Schrenk 1b9480293a Bump cryptofs 2022-12-06 15:43:25 +01:00
Armin Schrenk d8b71db8e5 bump metainfo.xml 2022-12-06 15:27:17 +01:00
Armin Schrenk 4bd99d2b66 preparing 1.6.16 2022-12-06 15:24:52 +01:00
CryptobotandGitHub 61027852e1 New Crowdin updates (#2474)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Serbian (Cyrillic); Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Latin) Sinhala; Slovak; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2022-12-06 15:20:47 +01:00
Armin Schrenk 512500aaef bump cryptofs version 2022-12-06 11:03:29 +01:00
Armin SchrenkandGitHub f9d28f20b3 Update README.md
* update number of commits
* remove "start" section
2022-12-06 10:59:18 +01:00
Armin SchrenkandGitHub 7f79c554f7 Merge pull request #2553 from cryptomator/feature/health-check-fix-batch
Improve Health Check (Fix-all-button, result filtering and more)
2022-12-06 10:47:11 +01:00
Armin Schrenk 3cbe4aa7eb use functional style 2022-12-06 10:39:38 +01:00
Armin Schrenk 06922717c4 adjust spacing and window size to fit (english) labels 2022-12-05 23:32:49 +01:00
Armin SchrenkandGitHub 32399c4a09 Merge pull request #2546 from cryptomator/feature/javafx-jmods
Use OpenJFX jmods in jlink
2022-12-05 23:18:52 +01:00
Armin Schrenk 00a3692dcf final adjustments 2022-12-05 23:06:03 +01:00
Armin Schrenk 83b198d491 only run jfx guard on one mac system 2022-12-05 22:38:37 +01:00
Armin Schrenk 8086ec1c10 improve check on debian to not return non-zero code 2022-12-05 22:37:21 +01:00
Armin Schrenk b2b49f4d2f use correct pwsh syntax on all publish workflows 2022-12-05 16:49:19 +01:00
Armin Schrenk d6e14dab9a version defined in javafx.properties is also the complete version 2022-12-05 16:43:58 +01:00
Armin Schrenk 497ddcfc9c shoulda used quotes 2022-12-05 16:37:48 +01:00
Armin Schrenk 169039903d Use correct cmdlet 2022-12-05 16:31:09 +01:00
Armin Schrenk 3641b34c2d add guard to ensure pom defined jfx version matches the jdk bundled/jmod one 2022-12-05 16:10:39 +01:00
Armin SchrenkandGitHub 42400d1f0c Merge pull request #2233 from cryptomator/feature/stats-counter-for-metadata
Add to statistics window a counter for metadata

Closes #1511
2022-12-02 13:09:25 +01:00
Armin SchrenkandGitHub 8f7f8ffb11 Merge branch 'develop' into feature/stats-counter-for-metadata 2022-12-02 12:19:53 +01:00
Armin Schrenk 3016d35c9b closes #2488 2022-12-02 11:22:50 +01:00
Armin Schrenk f21b8a0f7a Merge branch 'develop' into feature/health-check-fix-batch
# Conflicts:
#	pom.xml
2022-12-02 11:08:58 +01:00
Armin Schrenk 0c1bbc5bfd remove labels and change alignment 2022-12-02 10:53:30 +01:00
Armin Schrenk d932091021 add translations for fixState filter 2022-12-01 22:20:31 +01:00
Armin Schrenk 216abf224e add severity and its list filter translatable 2022-12-01 17:37:26 +01:00
Armin Schrenk d5523f07bd adjust translations and translation keys 2022-12-01 13:32:39 +01:00
Armin Schrenk e097bea1f5 adjust stats alignment 2022-12-01 13:28:36 +01:00
Armin Schrenk 920866b1a1 Merge branch 'develop' into feature/stats-counter-for-metadata
# Conflicts:
#	pom.xml
2022-12-01 12:44:09 +01:00
Armin SchrenkandGitHub c41ffe2568 Merge pull request #2489 from ledwardchow/fix/2383-tray-icon-refresh
Refresh vault list when tray icon is clicked
2022-11-30 16:37:19 +01:00
Armin Schrenk 792fe1eafe use jfx19 API 2022-11-30 16:23:44 +01:00
Armin Schrenk 348bc2b2ec add translation to filter labels 2022-11-30 13:53:29 +01:00
Armin Schrenk 7bac78bc5d Center Filters and let result list grow to bottom 2022-11-30 13:50:31 +01:00
Armin Schrenk 65e1993b43 Add tooltip to result severity icon 2022-11-30 13:35:06 +01:00
Armin Schrenk b98eb8c656 Using Zulu JDK, codesign addiitonal files on macOS 2022-11-30 12:48:18 +01:00
Sebastian StenzelandGitHub 33ebc17619 Merge branch 'develop' into fix/2383-tray-icon-refresh 2022-11-30 11:46:36 +01:00
Sebastian Stenzel ba7029968d try fixing dpkg-shlibdeps: error: cannot find library libgtk-x11-2.0.so.0 ... 2022-11-30 11:16:38 +01:00
Sebastian Stenzel a3fc68ab6f jlink javafx.* modules from arch-dependent jmod path 2022-11-30 11:16:38 +01:00
Sebastian Stenzel abf944a130 add required openjfx jmods to debian source package 2022-11-30 11:16:38 +01:00
Sebastian Stenzel 99bc4dbdc5 use openjfx jmods instead of jars 2022-11-30 11:16:38 +01:00
Armin SchrenkandGitHub 019292f1db Merge pull request #2521 from cryptomator/feature/mac-screenshot-fix
Fixes wrong screenshot shown in Open Existing Vault

Fixes #2512
2022-11-29 17:19:31 +01:00
Armin Schrenk 2f9818aade use new JavaFX 19 API 2022-11-29 17:07:43 +01:00
Armin Schrenk 9cec45dc1f Add context menu to copy single result info 2022-11-29 14:18:43 +01:00
Armin Schrenk 5f55530b4a Add filters to results list 2022-11-29 13:49:11 +01:00
Armin Schrenk 96de2556a9 apply correct style class on check icon 2022-11-28 15:00:16 +01:00
Armin Schrenk db63a82d76 bump version of skymatic actions 2022-11-28 13:46:02 +01:00
Armin Schrenk 11aea06ecf replace deprecated set-output command in ci 2022-11-28 13:36:15 +01:00
Armin SchrenkandGitHub 932cfd2200 Merge pull request #2541 from cryptomator/feature/reusable-workflow-version
Use reusable workflow to get version information
2022-11-28 13:17:23 +01:00
Armin Schrenk edaa2b7391 Revert partially 9984b2af9b 2022-11-25 18:07:07 +01:00
Armin Schrenk 9984b2af9b Fix errors 2022-11-25 17:56:24 +01:00
Armin Schrenk 34986f5919 migrate other build worfklows to use get-version.yml 2022-11-25 17:46:24 +01:00
Armin Schrenk 23d9521724 Remove resolved TODO (see https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_call) 2022-11-25 17:29:36 +01:00
Armin Schrenk 4dc1d59305 Implement fix all button 2022-11-25 17:17:55 +01:00
Armin Schrenk 74e3c28441 bump cryptofs 2022-11-25 16:54:21 +01:00
Sebastian Stenzel 6e526ba796 draft release 2022-11-25 14:47:07 +01:00
Sebastian Stenzel b978044383 Merge branch 'feature/mount-provider' into release/1.7.0 2022-11-25 14:44:41 +01:00
Sebastian Stenzel 6325c6f450 fixed java options required for panama 2022-11-25 14:42:18 +01:00
Armin Schrenk dd79b46d72 add --enable-preview flag to java runtime options 2022-11-25 12:21:37 +01:00
Armin Schrenk d896fe21b5 adapt result fixing to new api 2022-11-24 10:13:37 +01:00
Armin Schrenk 6983d9d72d Remove cryptolib dependency, bump cryptofs 2022-11-24 10:12:59 +01:00
Armin Schrenk faf39c2507 fix wrong name 2022-11-22 15:01:47 +01:00
Armin Schrenk 083d0cfbc4 migrate windows build to use get-version workflow 2022-11-22 14:51:12 +01:00
Armin Schrenk 9ca8072ab6 Rename workflow and add type output 2022-11-22 14:45:49 +01:00
Armin Schrenk 3223ea2e5d Refactor version parsing and validation to reusable workflow 2022-11-22 11:18:05 +01:00
Armin Schrenk 83af5e796f publish only production versions to winget 2022-11-21 22:10:06 +01:00
Armin SchrenkandGitHub 9d9f118a32 Merge pull request #2537 from cryptomator/feature/generalize-win-installer
Windows Installer: Parameterize Hardcoded Values
2022-11-21 13:55:34 +01:00
Armin Schrenk 1b0eb34734 set loopback alias via parameter in ps1 script 2022-11-21 13:46:12 +01:00
Armin Schrenk 79952418f4 only use lower characters in loopback alias 2022-11-21 13:26:14 +01:00
Armin Schrenk 65e26971ff make loopback alias depend on appName 2022-11-21 13:12:32 +01:00
Armin Schrenk 13debaafbe set loopback alias in Cryptomator app during build time 2022-11-18 13:34:38 +01:00
Armin Schrenk 5729e2885d fix typo [ci skip] 2022-11-18 12:42:11 +01:00
Armin Schrenk 043184cf53 set loopback device alias during build
instead of hardcode
2022-11-18 12:36:10 +01:00
Armin Schrenk 38062f9a8d Move Cryptomator installer defaults to actual installer file 2022-11-18 11:32:39 +01:00
Armin Schrenk 14d0d95f23 add variable to skip legacy check in installer 2022-11-18 11:20:51 +01:00
Armin Schrenk 8f42c1c9ce Merge branch 'develop' into release/1.7.0 2022-11-18 10:47:33 +01:00
Armin SchrenkandGitHub 37f89fd235 Move release precondition checks to own workflow (#2535) 2022-11-18 10:46:22 +01:00
Armin Schrenk 668feb73f9 Merge branch 'feature/mount-provider' into release/1.7.0 2022-11-17 09:59:46 +01:00
Armin Schrenk ba0569deb1 preparing 1.7.0 2022-11-17 09:59:38 +01:00
Armin Schrenk a70d8e1567 update nonModularGroupIds 2022-11-17 09:50:39 +01:00
Armin Schrenk 96b7a8df3f bump dokany-nio-adapter 2022-11-17 09:24:51 +01:00
Edward Chow 759c21e5cf fix preconditions import 2022-11-13 11:43:05 +11:00
Edward Chow d8ed9f854a update pom.xml for integrations-api 1.2.0-beta1 2022-11-13 11:42:41 +11:00
Edward Chow 1414ab4681 use preconditions instead of try...catch 2022-11-12 22:26:08 +11:00
Edward Chow 1486826883 remove unused imports 2022-11-12 22:19:22 +11:00
Armin Schrenk 5143fdccbb Refactor mount point setting and controller :
* remove CustomMountPath, winDriveLetter and usesCustomMountPath
* new property mountPoint (can be null)
* differentiation between driveLetter and directory happens in controller
2022-11-11 19:42:59 +01:00
Armin Schrenk 3c5502955a bump version of dokany-nio-adapter 2022-11-11 15:20:13 +01:00
Armin Schrenk 2d3a035d9e renamed mount option controller members 2022-11-11 11:44:50 +01:00
Tobias Hagemann dda7255d8e deduplicated code 2022-11-10 18:36:14 +01:00
Tobias Hagemann 6caf132cfb fixes #2512 2022-11-10 18:18:34 +01:00
Sebastian Stenzel 4029f86a0d reveal OR copy mount point depending on chosen mounter 2022-11-10 14:11:06 +01:00
Sebastian Stenzel 6dac00625c updated mount API 2022-11-09 15:33:20 +01:00
Sebastian Stenzel 41b7bd54f1 use vault id as a volume id 2022-11-08 16:38:45 +01:00
Sebastian Stenzel f236614bd0 allow repeated mount & unmount of the same vault 2022-11-08 16:38:31 +01:00
Sebastian Stenzel 31c69f145e use a fallback mount point absed on -Dcryptomator.mountPointsDir=... vm param 2022-11-07 18:17:20 +01:00
Sebastian Stenzel b5a00f5ebe added --enable-preview --enable-native-access to run config 2022-11-07 18:07:45 +01:00
Sebastian Stenzel 40c4300012 fixed json syntax error 2022-11-07 16:20:19 +01:00
Sebastian Stenzel 5369ddb1f9 adjust suppression.xml to jfuse 2022-11-07 16:17:50 +01:00
Sebastian Stenzel 1b4117de38 volume settings → change tcp port 2022-11-07 16:16:10 +01:00
Sebastian Stenzel 3e5a7fadd0 only set the mount point when a mount point is explicitly required
(didn't work for the webdav fallback provider, which doesn't _not_ MOUNT_TO_SYSTEM_CHOSEN_PATH, as it does not mount at all)
2022-11-07 15:55:26 +01:00
Sebastian Stenzel eff2530e70 pre-select chosen mount service 2022-11-07 15:52:48 +01:00
Armin Schrenk 0f84d0c990 adapt to new APIs 2022-11-07 14:49:56 +01:00
Armin Schrenk fbe33e21fb Fixes #2498
Bump winfsp for windows bundle distribution
2022-11-03 10:16:53 +01:00
Edward Chow dc310c009f rename to onBeforeOpenMenu and init local reference in showTrayIcon() 2022-11-01 22:37:11 +11:00
Sebastian StenzelandGitHub 7091839f08 Merge pull request #2505 from cryptomator/feature/javafx-19 2022-10-28 22:09:29 +02:00
Sebastian StenzelandGitHub 79bf1759c7 Merge pull request #2509 from cryptomator/feature/jdk19 2022-10-28 22:09:06 +02:00
Sebastian Stenzel 70e5f53009 Merge branch 'develop' into feature/jdk19 2022-10-27 18:13:42 +02:00
Sebastian Stenzel c79cfe1c9d Merge branch 'develop' into feature/javafx-19
# Conflicts:
#	pom.xml
2022-10-26 11:43:07 +02:00
Sebastian Stenzel d619a0cbf4 bump jwt version 2022-10-26 11:40:09 +02:00
Sebastian StenzelandGitHub 517b5958b0 Merge pull request #2487 from cryptomator/feature/ppa-jdk-19
Use `coffeelibs-jdk-19` during PPA build
2022-10-18 16:48:28 +02:00
Armin Schrenk 01a6475d5f replace deprecated method call 2022-10-17 17:13:12 +02:00
Edward Chow 445be3b668 remove straggling lines of awt code 2022-10-16 22:36:25 +11:00
Edward Chow f852ae0392 remove AWT code and relocate to TrayMenuController 2022-10-16 22:26:30 +11:00
Edward Chow e5e606f3ae refresh vault list on tray icon click (#2383) 2022-10-16 17:42:07 +11:00
Sebastian Stenzel 69641ed3b6 Merge branch 'develop' into feature/jdk19
[ci skip]
2022-10-14 13:55:15 +02:00
Sebastian Stenzel 1f01923169 build on Ubuntu Focal 2022-10-14 13:44:50 +02:00
Sebastian Stenzel 687bed6984 use the correct name of required build-dependency 2022-10-14 13:24:08 +02:00
Sebastian Stenzel 01698d1393 install required build-dependency 2022-10-14 13:21:28 +02:00
Sebastian Stenzel 6367cc2dfb depend on coffeelibs-jdk-19 2022-10-14 13:10:37 +02:00
Armin Schrenk bcfda68bef bump used gh actions 2022-10-13 12:48:48 +02:00
Sebastian Stenzel 2399e29d75 update logback 2022-10-12 13:42:11 +02:00
322779ee88 Refactor winget release to own workflow file (#2471)
... and call it on release windows build

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-10-11 20:16:24 +02:00
Julian Raufelder fd6eb2139d Minor cleanup in build.yml 2022-10-11 17:45:59 +02:00
Julian Raufelder 26ecd67a79 Update linux common metainfo.xml file 2022-10-11 15:33:44 +02:00
Julian Raufelder e06240cbb9 Merge pull request #2475 from cryptomator/feature/add-release-check-precondition
Check POM version and linux metainfo.xml file during release steps
2022-10-11 15:11:54 +02:00
Julian Raufelder b10d892b12 Skip release tests too when ci-skip provided in commit message 2022-10-11 15:09:19 +02:00
Julian Raufelder 45c2dd0358 Validate release check precondition in separate job 2022-10-11 12:45:49 +02:00
Julian Raufelder 34d6e8c419 Validate POM version and linux metainfo.xml file during build 2022-10-10 15:28:16 +02:00
Julian Raufelder ae6a15b391 Check POM version and linux metainfo.xml file during release steps 2022-10-10 14:49:36 +02:00
Sebastian Stenzel 8040b71a51 simplified some more bindings 2022-10-10 12:09:30 +02:00
Sebastian Stenzel 76e7a0a7b8 bump OpenJFX to version 19
replaced EasyBind with `ObservableValue.map()` where possible
2022-10-10 10:24:42 +02:00
Sebastian Stenzel 910efc0b7b prepare macOS builds for diverging Xcode versions
[ci skip]
2022-10-07 12:03:00 +02:00
Sebastian Stenzel c805a820a4 Merge branch 'main' into develop
[ci skip]
2022-10-06 17:42:00 +02:00
Sebastian Stenzel 3ed8316b60 Merge branch 'release/1.6.15' 2022-10-06 17:40:22 +02:00
Sebastian Stenzel b6e381f0bf apply cryptofs hotfix 2022-10-06 17:37:03 +02:00
Sebastian Stenzel aef3f4c6e2 prepare 1.6.15 2022-10-06 16:49:12 +02:00
Sebastian Stenzel 7bc5a336e4 dependency bump 2022-10-06 16:48:12 +02:00
Sebastian Stenzel 672b4aee2d added Belgian, Danish, Farsi, Sinhala, Vietnamese to language chooser 2022-10-06 16:19:16 +02:00
CryptobotandGitHub d4ab17b38c New Crowdin updates (#2427)
[ci skip]
2022-10-06 16:11:29 +02:00
Sebastian Stenzel 91f49c5642 update cryptolib + cryptofs
fixes #2451
2022-10-06 15:20:21 +02:00
Julian Raufelder da2f97b1c4 Fix communitcation with hub if it supports only HTTP version 1.1 2022-10-06 09:38:02 +02:00
Tobias HagemannandGitHub 5d647d20a5 Update README.md 2022-09-22 15:00:22 +02:00
Armin SchrenkandGitHub ce96d1c65e Merge pull request #2452 from chewitt1/chewitt-next-button
Fixes #2447
2022-09-21 21:31:33 +02:00
Carrima Hewitt f02a8e14ff Fixed Trim and Bidirectional Bind 2022-09-21 11:11:00 -04:00
Armin Schrenk dd31908f3a Use for windows exe and msi build same JDKs 2022-09-21 15:50:08 +02:00
Sebastian Stenzel 495a1884c3 Merge branch 'develop' into feature/jdk19
[ci skip]
2022-09-21 13:21:18 +02:00
Sebastian Stenzel 49c3b1fa43 fix font loading warning visible in console
see https://stackoverflow.com/a/65127949/4014509
2022-09-21 13:20:34 +02:00
Sebastian Stenzel cde67966da fix test 2022-09-21 09:49:57 +02:00
Sebastian Stenzel d19e77432e build with jdk 19 2022-09-21 09:28:37 +02:00
Sebastian StenzelandGitHub cc24a4c9ae Merge pull request #2445 from purejava/disable-keyrings
fixes #2047, fixes #2219
2022-09-21 09:12:40 +02:00
Ralph Plawetzki 1101a7574c Beautify the code 2022-09-20 20:12:44 +02:00
Ralph Plawetzki 30de04e291 Move CheckBox (injected from JavaFX) below the final fields (injected by Dagger) 2022-09-20 20:12:43 +02:00
Ralph Plawetzki 2e3d2e86e2 Cut off the application from accessing keychains at the earliest point possible
as suggested in the discussion to #2445
2022-09-20 20:12:43 +02:00
Ralph Plawetzki 78cf082096 Rename properties as suggested in the discussion to #2445 2022-09-20 20:12:43 +02:00
Ralph Plawetzki 64c90f8107 Move checkbox to the front and rename members 2022-09-20 20:12:43 +02:00
Ralph Plawetzki b34bf6f161 Handle further queries of the backend for disabled keyrings 2022-09-20 20:12:43 +02:00
Ralph Plawetzki 17d3d7307d Wire disable all keyrings setting checkbox to the KeychainManager 2022-09-20 20:12:43 +02:00
Ralph Plawetzki e6c7fed662 Add disable all keyrings setting checkbox
and connect it to the settings file
2022-09-20 20:12:42 +02:00
Ralph Plawetzki 23fad16742 Revert "Add disable all keyrings setting checkbox"
This reverts commit d037c6bc140495b5469c2a25ae2a7a2752bc35dc.
2022-09-20 20:12:42 +02:00
Ralph Plawetzki ec794cdca2 Add disable all keyrings setting checkbox
and connect it to the settings file
2022-09-20 20:12:42 +02:00
Carrima Hewitt 2def9216ec Trimmed Vault Name StringProperty 2022-09-20 10:33:26 -04:00
Carrima Hewitt 4f9759af58 Merge branch 'chewitt-next-button' of https://github.com/chewitt1/cryptomator into chewitt-next-button 2022-09-20 10:20:10 -04:00
Carrima Hewitt 382f6b7851 Reverted Misc 2022-09-20 10:19:38 -04:00
Carrima HewittandGitHub d60eb470ea Merge branch 'cryptomator:develop' into chewitt-next-button 2022-09-20 08:41:38 -04:00
Carrima Hewitt 97a61ef717 Removed Comments 2022-09-20 08:37:38 -04:00
Armin Schrenk 08fc5e9a77 Fixes #2454 2022-09-20 10:58:48 +02:00
Carrima Hewitt 4c96c285bf Fixed Next button for Invalid Vault Name 2022-09-19 21:17:48 -04:00
Edward ChowandGitHub 0021f2d37c 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
2022-09-15 17:38:42 +02:00
Tobias HagemannandGitHub 31d32f2018 Added macOS ARM64 workflow (#2432) 2022-09-10 08:30:18 +02:00
Armin SchrenkandGitHub b9c087b48e Merge pull request #2430 from youscam/patch-1
Update README.md
2022-09-07 09:53:52 +02:00
KAMAL AZZOUZIandGitHub 797dbc0a57 Update README.md
Update Windows profile name
2022-09-07 00:52:40 +01:00
Armin Schrenk 46745d030b [ci skip] fix winget release action 2022-08-31 18:12:59 +02:00
Armin Schrenk 3cdf124e54 Merge branch 'main' into develop
[ci skip]
2022-08-31 16:02:28 +02:00
Armin Schrenk d37147c73e Merge branch 'release/1.6.14' 2022-08-31 15:59:56 +02:00
Armin Schrenk 67dd1548cc finalize release 2022-08-31 15:47:23 +02:00
Armin Schrenk 008bb38e30 preparing 1.6.14 2022-08-31 15:41:18 +02:00
CryptobotandGitHub 1be6128523 New Crowdin updates (#2350)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional (Hong Kong); Croatian (Cyrillic); Czech; Danish; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean (Latin); Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Sinhala; Slovak; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2022-08-31 15:17:19 +02:00
Armin Schrenk b4f95c465a Fixes #2408 2022-08-31 13:35:27 +02:00
Sebastian Stenzel 40fa961b9b clean up module-info 2022-08-31 11:40:18 +02:00
Sebastian Stenzel 659123fe7a regenerate keypair if .p12 _or_ keychain item is missing
it used to depend only on the keychain item
2022-08-31 11:25:25 +02:00
Sebastian Stenzel 2448963161 class does not need to be generic 2022-08-31 10:57:41 +02:00
Sebastian Stenzel 16c0431f6f use release versions of slf4j + logback 2022-08-31 10:52:53 +02:00
Sebastian Stenzel 2d99d1bdd4 Adding EaseUS as a sponsor
[ci skip]
2022-08-31 10:46:11 +02:00
Sebastian StenzelandGitHub 86ed0d3c0e Merge pull request #2390 from cryptomator/feature/slf4j-2
Upgrade to SLF4J 2.x and Logback 1.3.x
2022-08-12 09:53:27 +02:00
Sebastian Stenzel 0501b0ef39 fixed test 2022-08-11 18:23:33 +02:00
Sebastian Stenzel 2c2b208de7 no need to reset anything, since there is no previous config 2022-08-11 18:18:48 +02:00
Sebastian Stenzel ec7ad0f479 use new ServiceLoader based log configurator 2022-08-11 18:14:54 +02:00
Sebastian Stenzel 5267a04491 make org.cryptomator.desktop an open module 2022-08-11 17:36:10 +02:00
Sebastian Stenzel 04714cd0de make singleton Environment accessible outside of Dagger graph 2022-08-11 17:35:35 +02:00
Sebastian Stenzel 46dbe15e4a update dependencies 2022-08-11 17:34:34 +02:00
Armin SchrenkandGitHub 7abf167ba2 Merge pull request #2381 from cryptomator/feature/hub-handle-402
handle 402 error when authenticating with Cryptomator Hub
2022-08-09 10:55:41 +02:00
44d19bdefe Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2022-08-09 10:37:22 +02:00
Armin Schrenk f84eef5639 actually use the scene in ui flow 2022-08-08 16:37:30 +02:00
Armin Schrenk 281f6f727f show info for 402 response on unlock 2022-08-08 16:33:07 +02:00
Sebastian Stenzel bf83df3cd3 Merge branch 'main' into develop
# Conflicts:
#	pom.xml

[ci skip]
2022-08-05 14:31:59 +02:00
Sebastian Stenzel be4f6f2b9b Merge branch 'hotfix/1.6.13' 2022-08-05 14:31:25 +02:00
Sebastian Stenzel bf84598131 set version to 1.6.13 2022-08-05 14:31:10 +02:00
Sebastian Stenzel 943be4557f fixes #2374 2022-08-05 14:28:47 +02:00
Sebastian Stenzel 649e029d4f added cryptomator.integrationsMac.keychainServiceName system property 2022-08-05 11:09:49 +02:00
Sebastian StenzelandGitHub 1cd3d1d67f Merge pull request #2365 from purejava/fix-2301
Pass on CLI parameters from launch scripts to executables
2022-08-02 08:44:04 +02:00
Ralph Plawetzki 8290df9ea6 Pass on CLI parameters for Cryptomator started as an AppImage or installed from PPA
Fixes #2301
2022-08-01 18:17:41 +02:00
Armin Schrenk 47f2d423b9 Remove code smells 2022-07-28 11:16:59 +02:00
Armin Schrenk 80b5b6af00 simplify app version code 2022-07-28 10:58:50 +02:00
Armin Schrenk 414c4e20b8 remove code smell 2022-07-28 10:47:46 +02:00
Armin Schrenk 11a55f382a fix winget release 2022-07-27 17:16:33 +02:00
Armin Schrenk 0c5021913c Merge branch 'main' into develop 2022-07-27 12:11:13 +02:00
Armin Schrenk 8bc0b3a700 Merge branch 'hotfix/1.6.12' 2022-07-27 12:10:01 +02:00
Armin Schrenk 57110ff417 add release to metainfo 2022-07-27 11:57:45 +02:00
Armin Schrenk d5bdea4a75 fix debian build script
Fixes #2352
2022-07-27 11:57:00 +02:00
Armin Schrenk 72c8ca3368 preparing 1.6.12 2022-07-27 11:55:24 +02:00
Armin Schrenk 2ca824696c Merge branch 'main' into develop 2022-07-26 13:24:11 +02:00
Armin Schrenk 43d8f7c47f Merge branch 'release/1.6.11' 2022-07-26 13:23:54 +02:00
Armin Schrenk 9209e7698c add release info to linux metainfo file 2022-07-26 13:23:31 +02:00
Armin Schrenk 6e75f1fea8 Merge branch 'main' into develop 2022-07-26 13:11:13 +02:00
Armin Schrenk 2bdb0c3e6a Merge branch 'release/1.6.11' 2022-07-26 13:08:59 +02:00
Armin Schrenk 677634930d Fix windows run config [ci skip] 2022-07-26 13:03:43 +02:00
Armin Schrenk 546da7d11f preparing 1.6.11 2022-07-26 12:39:45 +02:00
Armin Schrenk 8662abae5a Merge branch 'feature/hub' into develop
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	dist/win/build.ps1
#	src/main/java/org/cryptomator/common/Environment.java
2022-07-26 12:29:33 +02:00
CryptobotandGitHub f98782ba4e New Crowdin updates (#2313)
New translations strings.properties

Arabic; Belarusian; Bengali; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Chinese Traditional, Hong Kong; Croatian; Serbian (Cyrillic); Czech; Dutch; Filipino; French; Galician; German; Greek; Hebrew; Hindi; Hungarian; Indonesian; Italian; Japanese; Korean (Latin); Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Persian; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Sinhala; Slovak; Spanish; Swahili, Tanzania; Swedish; Tamil; Telugu; Thai; Turkish; Ukrainian; Vietnamese; 

[ci skip]
2022-07-26 12:14:32 +02:00
Armin Schrenk 422077ac08 adjust pom 2022-07-20 17:01:29 +02:00
Armin Schrenk 10b9e75972 degenerify button description and rename things in resetPasswordController 2022-07-19 16:36:32 +02:00
Armin Schrenk 00e420a248 Improve add vault wizard:
* adjust ok/not-ok-design to other textfields
* add info, what characters to use
2022-07-19 15:51:58 +02:00
Armin Schrenk f7ddb6e714 Update and deduplicate winfsp download link
Fixes #2117
2022-07-18 14:56:39 +02:00
Armin Schrenk f1c8e3d3f2 Change CatchingExecutor:
* ignore cancellation exception
* remove assertion (Closes #2270)
2022-07-18 12:22:57 +02:00
Armin Schrenk cfc8c7bed7 remove unused instance var 2022-07-18 12:15:48 +02:00
Armin Schrenk 71b876b32d Fixes #1900 2022-07-18 11:42:12 +02:00
Armin Schrenk cdc60abf66 Fixes #2292 2022-07-18 10:23:12 +02:00
Armin Schrenk b73ab4645b only publish to winget, if workflow triggered by release or explicitly stated 2022-07-15 11:14:21 +02:00
Sebastian Stenzel c70961405c updated code sign cert
[ci skip]
2022-07-15 09:52:25 +02:00
d814c1cfca Update integrations-win lib (#2331)
* update to integrations-win 1.1.2

* refactor environment class to reduce maintenance

* fix test

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-07-11 15:59:54 +02:00
Armin SchrenkandGitHub 50413ca9d8 Merge pull request #2329 from barimess/update-link
updated links to the latest version.
2022-07-11 13:37:58 +02:00
Sebastian Stenzel 2a91403f2f bumped webdav-nio-adapter to version 1.2.8, containing vulnerability fixes in jetty 2022-07-11 10:09:22 +02:00
barimess 5ec499ff01 updated links to the latest version.
updated links from 1.5 to 1.6
2022-07-08 18:30:49 +01:00
Armin SchrenkandGitHub 86cf0d4d4e Merge pull request #2328 from cryptomator/feature/hub-device-name-taken
Display message when device name is already in use
2022-07-08 13:44:04 +02:00
Sebastian StenzelandGitHub f2af6f355c remove debug step
[ci skip]
2022-07-08 13:09:26 +02:00
Sebastian StenzelandGitHub 58d01b5bf5 fixed errors
[ci skip]
2022-07-08 13:07:30 +02:00
Sebastian StenzelandGitHub 5e19cd409f use different action for getting the gist
[ci skip]
2022-07-08 12:56:02 +02:00
Sebastian StenzelandGitHub 4dd58a664e Update error-db.yml
add discussion data to errorcodes.json gist

[ci skip]
2022-07-08 12:48:50 +02:00
Armin Schrenk a7fc8d6fc4 hide alreadyExistingLabel when deviceName changed by user 2022-07-08 12:03:38 +02:00
Armin Schrenk 5c31a34d5f Show message in register dialog if device name is already in use 2022-07-08 11:33:59 +02:00
Armin SchrenkandGitHub 67264c0d8c Merge pull request #2319 from cryptomator/feature/hub-better-dialogs
Improve Hub dialogs
2022-07-07 20:54:11 +02:00
mindmonkandGitHub 153ccef8a2 Merge pull request #2325 from cryptomator/feature/recoverykey-success-notification
implemented recoverykey reset password success notification screen
2022-07-07 18:12:12 +02:00
Armin Schrenk 0e853b25f7 simplify the prefill of device registration name textbox 2022-07-07 17:54:53 +02:00
Sebastian StenzelandGitHub 12302162b1 Update error-db.yml
[ci skip]
2022-07-07 17:35:48 +02:00
Jan-Peter Klein 7d14b55bcb Merge branch 'develop' into feature/recoverykey-success-notification 2022-07-07 17:23:32 +02:00
Jan-Peter Klein 69fe5b8c27 changed buttonOrder and buttonData in recovery_reset_password.fxml and removed blank line in string.properties 2022-07-07 17:23:10 +02:00
Sebastian StenzelandGitHub df099df334 Create error-db.yml
Eventually append discussion data to error database
2022-07-07 17:13:27 +02:00
Jan-Peter Klein 6bbdb4baa0 Merge branch 'develop' into feature/recoverykey-success-notification 2022-07-07 16:18:26 +02:00
Jan-Peter Klein ea6318dfc4 comments of the PR were taken into account as well as a few small changes in the recoverykey recover dialog 2022-07-07 16:17:41 +02:00
Armin Schrenk 93500a4efd use try-with-resource 2022-07-07 12:27:20 +02:00
Jan-Peter Klein b132bb6412 implemented recoverykey reset password success notification screen 2022-07-07 12:16:04 +02:00
Armin Schrenk cf38a10284 Change text from registration to "naming" and prefill device name 2022-07-07 12:01:34 +02:00
Sebastian Stenzel 15781b685d use new github "inputs" context, where booleans are supposed to actually be booleans
see https://github.com/actions/runner/issues/1483
see https://docs.github.com/en/actions/learn-github-actions/contexts#inputs-context

[ci skip]
2022-07-06 17:09:02 +02:00
Armin Schrenk 73442cddc8 Change register device dialog text to make intent clear 2022-07-06 10:41:13 +02:00
mindmonkandGitHub bce9833929 Merge pull request #2273 from cryptomator/feature/lock-and-quit-without-asking
implemented functionality of feature request issue #1713 "On closing …
2022-07-05 16:46:45 +02:00
Jan-Peter Klein 29d0e258f1 deleted unused and unnecessary code in QuitController 2022-07-05 16:30:32 +02:00
Jan-Peter Klein 1305e45564 Merge branch 'develop' into feature/lock-and-quit-without-asking 2022-07-05 16:18:06 +02:00
Jan-Peter Klein 9e18215d10 removed unused method, del .idea/uiDesigner.xml and code cleanup 2022-07-05 16:17:42 +02:00
Jan-Peter Klein 683276a6c6 switch scene in quitDialog to quitForcedDialog instead of init new window 2022-07-05 14:22:05 +02:00
Sebastian Stenzel f16a30ef29 Merge branch 'develop' into feature/hub
# Conflicts:
#	pom.xml
2022-07-05 13:28:41 +02:00
Sebastian Stenzel 82db3b59fb bump jwt dependency 2022-07-05 13:22:43 +02:00
Armin Schrenk c191df9ee3 add device registration failed controller 2022-07-05 11:20:52 +02:00
Armin Schrenk a2d6db0415 Add device registrations success screen 2022-07-05 11:09:29 +02:00
Armin Schrenk 077825f98a Add desgin to recieve key dialog 2022-07-05 09:29:49 +02:00
Armin Schrenk 381c1cd8d3 Bump tinyoauth2 dependecy and adjust to new api 2022-07-04 17:15:00 +02:00
Armin Schrenk ae2c67a88b fit unauthorized device dialog to new design 2022-07-04 11:50:07 +02:00
Armin Schrenk 3ce0270cde Adjust hub register device to new design 2022-07-04 11:37:49 +02:00
Armin Schrenk e011a98fa0 add window title to hub keyloading 2022-07-04 10:36:15 +02:00
Armin Schrenk 9386804216 redesign auth processing dialog:
* adjust to new design
* add translation keys
2022-07-04 10:33:58 +02:00
Jan-Peter Klein b791df01f7 removed quitforced package, moved QuitForcedController into quit package and deleted not required files 2022-06-30 15:41:33 +02:00
Jan-Peter Klein 376733106b Merge branch 'develop' into feature/lock-and-quit-without-asking
# Conflicts (solved):
#	src/main/resources/i18n/strings.properties
2022-06-30 15:22:57 +02:00
Jan-Peter Klein 8e6d2cf45a Merge branch 'develop' into feature/lock-and-quit-without-asking 2022-06-30 15:13:06 +02:00
Armin Schrenk 63cd3a02de Merge branch 'develop' into feature/hub 2022-06-30 12:13:29 +02:00
Armin SchrenkandGitHub 1795a7aaa4 Merge pull request #2311 from cryptomator/feature/1430-embark-on-unity
Embark on unity.

Closes #1430
2022-06-30 11:07:25 +02:00
Armin Schrenk c8e4ed1ce4 Merge branch 'feature/translations' into feature/1430-embark-on-unity
# Conflicts:
#	src/main/resources/i18n/strings_de.properties
#	src/main/resources/i18n/strings_pl.properties
#	src/main/resources/i18n/strings_pt_BR.properties
#	src/main/resources/i18n/strings_zh_TW.properties
2022-06-30 10:20:44 +02:00
Armin Schrenk 99b25d0792 migrate translations 2022-06-30 10:00:22 +02:00
Jan-Peter Klein e640e36744 show forced dialog if normal lock and quit fails in quit dialog 2022-06-29 15:27:19 +02:00
Jan-Peter Klein d10d8fb208 implemented force quit dialog 2022-06-29 15:12:43 +02:00
Tobias Hagemann 43e6ca41aa more consistency 2022-06-29 11:34:07 +02:00
e2b4566174 Update src/main/resources/i18n/strings.properties
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2022-06-29 11:15:26 +02:00
d203db8075 Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2022-06-29 11:14:14 +02:00
Armin Schrenk 7c4f5b28a7 use correct translation key 2022-06-29 11:10:55 +02:00
Armin Schrenk 7edd1dfa40 Reintegrate forget password dialog into application 2022-06-29 11:10:15 +02:00
Armin Schrenk 09550b77dc Merge branch 'feature/1430-embark-on-unity' of https://github.com/cryptomator/cryptomator into feature/1430-embark-on-unity 2022-06-29 10:54:59 +02:00
3bd43908ac Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2022-06-29 10:54:42 +02:00
Armin Schrenk f69efb85a5 more translation adjustments 2022-06-29 10:54:17 +02:00
Armin Schrenk bc5091a0d7 adjust forget password dialog 2022-06-29 10:52:39 +02:00
Armin Schrenk a199a2a06b add ux todo 2022-06-29 10:08:18 +02:00
Armin Schrenk dffd4d9dd9 change translation keys to use unified dialog scheme 2022-06-29 10:07:03 +02:00
Armin Schrenk 737d98775b Revert "rename recovery_create.fxml file"
This reverts commit 78e458f01a.
2022-06-28 16:41:53 +02:00
Armin Schrenk bee9c9f452 closes #1713
quit application by locking open vaults, if user wished so.
2022-06-28 15:39:04 +02:00
Armin Schrenk 2b19fd6852 adjust lock failed dialog 2022-06-28 10:32:47 +02:00
Armin Schrenk a5e9837c99 Adjust design of unlock invalid mp dialog 2022-06-28 10:15:39 +02:00
Armin Schrenk 81a1052a76 cleanup 2022-06-27 19:08:00 +02:00
Armin Schrenk ab2d740722 adjust choose masterkeyfile dialog 2022-06-27 19:04:14 +02:00
Armin Schrenk bf3a62a6b4 Rename translation key for unlock window title 2022-06-27 18:56:53 +02:00
Armin Schrenk d163d02077 Change window title for removeVault dialog 2022-06-27 18:49:26 +02:00
Armin Schrenk 677607d210 adjust remove vault dialog 2022-06-27 18:24:54 +02:00
Armin Schrenk fd3c8d7f78 Adjust design of lock_forced dialog 2022-06-27 18:07:41 +02:00
Armin Schrenk cce74ef5e4 add TODO 2022-06-27 17:52:49 +02:00
Armin Schrenk 74058238ec adjust design of wrong file alert 2022-06-27 17:52:34 +02:00
Armin Schrenk 78e458f01a rename recovery_create.fxml file 2022-06-27 17:26:21 +02:00
Armin Schrenk 07cfef2e41 adjust design of auth for recovery key 2022-06-27 17:21:45 +02:00
Armin Schrenk 35c5bd03de Changed design for unlock success dialog 2022-06-27 16:26:35 +02:00
Jan-Peter Klein 7cc1a1728c removed unused parameter 2022-06-27 14:40:20 +02:00
Cryptobot a79bf1952d New translations strings.properties (Vietnamese)
[ci skip]
2022-06-25 18:41:43 +02:00
Armin Schrenk c7ad587aa2 Changed design for quit screen as template for other dialogs 2022-06-24 15:34:01 +02:00
Armin Schrenk 22b842e6c2 Rename styleclass 2022-06-24 12:27:38 +02:00
Armin Schrenk f96c52cdb1 Disable Password tab if vault.config.keyid.scheme is not masterkeyfile 2022-06-24 10:26:34 +02:00
Cryptobot ca426f6535 New translations strings.properties (Vietnamese)
[ci skip]
2022-06-22 17:10:33 +02:00
Armin Schrenk d6f489ea98 bump dependencies 2022-06-22 12:36:00 +02:00
Tobias HagemannandGitHub 8043a4ea10 Update README.md 2022-06-22 10:42:59 +02:00
Tobias HagemannandGitHub e5cb271e28 Update README.md 2022-06-22 10:42:13 +02:00
Armin Schrenk 45f038bae2 Merge branch 'develop' into feature/hub
# Conflicts:
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
#	pom.xml
2022-06-22 09:55:02 +02:00
Cryptobot 3580728a5a New translations strings.properties (Hindi)
[ci skip]
2022-06-21 12:42:13 +02:00
Cryptobot 749c5d9f24 New translations strings.properties (Vietnamese)
[ci skip]
2022-06-21 00:39:49 +02:00
Cryptobot 6ae872fa85 New translations strings.properties (Vietnamese)
[ci skip]
2022-06-20 21:27:37 +02:00
Cryptobot 773fa9804a New translations strings.properties (Hindi)
[ci skip]
2022-06-20 14:07:39 +02:00
Cryptobot cfa9beec8b New translations strings.properties (Hindi)
[ci skip]
2022-06-20 11:11:16 +02:00
Cryptobot 5f4d13f662 New translations strings.properties (Japanese)
[ci skip]
2022-06-20 04:29:20 +02:00
Cryptobot f0d69b645b New translations strings.properties (Hindi)
[ci skip]
2022-06-19 13:23:39 +02:00
Cryptobot 797724e640 New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2022-06-17 01:12:50 +02:00
Cryptobot 3488db8c0e New translations strings.properties (Vietnamese)
[ci skip]
2022-06-15 21:47:37 +02:00
Cryptobot d53e0b24a4 New translations strings.properties (German)
[ci skip]
2022-06-15 15:40:48 +02:00
Cryptobot 347a7b3ef7 New translations strings.properties (Vietnamese)
[ci skip]
2022-06-15 12:35:10 +02:00
Cryptobot ff80585a2f New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2022-06-15 09:29:10 +02:00
Armin Schrenk 8c65bd19c2 Make FUSE the default volume impl 2022-06-13 10:00:14 +02:00
Cryptobot ad7a8835b3 New translations strings.properties (German)
[ci skip]
2022-06-07 20:28:24 +02:00
Cryptobot 9f2b5b6ee3 New translations strings.properties (Croatian)
[ci skip]
2022-06-06 11:29:54 +02:00
Cryptobot 15726c6b21 New translations strings.properties (Indonesian)
[ci skip]
2022-06-03 05:53:25 +02:00
Cryptobot 1c824a37b0 New translations strings.properties (French)
[ci skip]
2022-06-01 12:36:32 +02:00
Cryptobot 7c04ba48a8 New translations strings.properties (Turkish)
[ci skip]
2022-06-01 12:36:24 +02:00
Jan-Peter Klein 6f33cf8df7 removed checkbox in quit prompt 2022-05-31 14:09:12 +02:00
Jan-Peter Klein 8f85777887 implemented functionality of feature request issue #1713 "On closing of the application: Always lock and quit – without asking" 2022-05-31 11:18:20 +02:00
Cryptobot 931d6f0048 New translations strings.properties (Polish)
[ci skip]
2022-05-30 22:16:25 +02:00
Cryptobot 692b3828b8 New translations strings.properties (Sinhala)
[ci skip]
2022-05-28 19:53:25 +02:00
Cryptobot 320be05a66 New translations strings.properties (Sinhala)
[ci skip]
2022-05-28 10:53:36 +02:00
Cryptobot 2c7b407e94 New translations strings.properties (Sinhala)
[ci skip]
2022-05-28 07:54:01 +02:00
Cryptobot 20c66a6005 New translations strings.properties (Sinhala)
[ci skip]
2022-05-27 21:40:27 +02:00
JaniruTECandGitHub e6ff7a6d88 Merge pull request #2259 from cryptomator/fix/2258-catching-executors
Added catching executors
2022-05-27 18:24:55 +02:00
Sebastian StenzelandGitHub aca55734b0 Use Xcode Notarization Action (#2267)
[ci skip]
2022-05-27 12:21:13 +02:00
JaniruTEC f740a93b6c Applied suggestions from code review
Changed signature of afterExecuteTask
See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875548549

--

Changed name of "afterExecute0" to "afterExecuteInternal"
See: https://github.com/cryptomator/cryptomator/pull/2259/files#r875551994
2022-05-27 01:48:11 +02:00
e9a71827ed Apply suggestions from code review
Establishing symmetry with `afterExecuteTask`

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-05-27 01:36:10 +02:00
Sebastian Stenzel dc3f80ffc9 fix build 2022-05-26 12:04:33 +02:00
Cryptobot 75633a10bd New translations strings.properties (Czech)
[ci skip]
2022-05-25 13:41:37 +02:00
Cryptobot dda526b83e New translations strings.properties (Ukrainian)
[ci skip]
2022-05-24 00:49:03 +02:00
Tobias Hagemann 47f7c437fe added separate definition for green tones used for password strength indicator 2022-05-23 13:39:07 +02:00
Tobias Hagemann 15e46f8ca5 Merge branch 'feature/optimize-logo' into develop 2022-05-23 13:17:38 +02:00
Tobias Hagemann 5b13553866 cleanup
[ci skip]
2022-05-23 13:17:02 +02:00
Tobias Hagemann e14d1f4028 cleaned up css files
[ci skip]
2022-05-23 13:15:24 +02:00
Cryptobot a7405b4fca New translations strings.properties (Dutch)
[ci skip]
2022-05-21 11:41:58 +02:00
Jan-Peter Klein 8c52c740d3 removed /bot/bot.png 2022-05-20 11:30:23 +02:00
Jan-Peter Klein 1d70eecbb7 added title-logo file and rearranged files 2022-05-20 11:24:51 +02:00
3d95276a7f Feature/2200 illegal use of builders (#2262)
* Replaced Builder in VaultComponent with Factory
* migrate VaultOptionsComponent

Co-authored-by: JaniruTEC <JaniruTEC@gmail.com>
2022-05-19 22:07:56 +02:00
Cryptobot 88020fcaf4 New translations strings.properties (Ukrainian)
[ci skip]
2022-05-19 15:51:15 +02:00
Cryptobot 4e89b6365a New translations strings.properties (Chinese Traditional, Hong Kong)
[ci skip]
2022-05-17 19:47:14 +02:00
Cryptobot 52396f68f5 New translations strings.properties (Chinese Traditional)
[ci skip]
2022-05-17 19:47:13 +02:00
Tobias Hagemann 5233e6b690 improved cleanup in manual build script for macos
[ci skip]
2022-05-17 18:33:02 +02:00
Cryptobot 3c469c80be New translations strings.properties (Chinese Traditional)
[ci skip]
2022-05-17 16:44:35 +02:00
JaniruTEC 0040c8a5f8 Added catching executors 2022-05-17 16:30:23 +02:00
Cryptobot e8751d2116 New translations strings.properties (Swahili, Tanzania)
[ci skip]
2022-05-17 10:51:44 +02:00
Cryptobot 9bc439a913 New translations strings.properties (Indonesian)
[ci skip]
2022-05-16 21:08:12 +02:00
Armin Schrenk 4989eacaf9 Fixes #2256 2022-05-16 12:58:36 +02:00
Cryptobot c7b257eb66 New translations strings.properties (Polish)
[ci skip]
2022-05-15 23:47:27 +02:00
Cryptobot 2f76b724a7 New translations strings.properties (Swedish)
[ci skip]
2022-05-14 18:55:21 +02:00
Sebastian Stenzel cd709260ce ignore autogenerated file
[ci skip]
2022-05-13 15:48:15 +02:00
Sebastian Stenzel 87202453b1 added Swahili to language picker
[ci skip]
2022-05-13 15:43:43 +02:00
4786193731 New Crowdin updates (#2212)
[ci skip]

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-05-13 15:28:33 +02:00
90f523bee8 parameterize patchWebDAV.ps1 and add default values to .bat file (#2251)
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2022-05-13 15:11:41 +02:00
Tobias Hagemann 78bb996072 updated integrations-mac dependency 2022-05-13 13:42:40 +02:00
Armin Schrenk 822963e1a9 bump cryptofs
Fixes #2238
2022-05-13 13:17:11 +02:00
Tobias HagemannandGitHub 773a5d3570 Merge pull request #2244 from cryptomator/feature/parameterize-mac-build-script
Parameterized macOS build script
2022-05-12 16:19:14 +02:00
Armin SchrenkandGitHub acc5277258 Merge pull request #2242 from cryptomator/feature/parameterize-win-build-script
Parameterize local windows build script
2022-05-12 16:17:34 +02:00
Armin SchrenkandGitHub 4ecb98a5e6 Merge pull request #2245 from cryptomator/feature/location-preset-enum
Enumeenize well-known local cloud storage paths
2022-05-12 16:14:43 +02:00
Armin Schrenk 75093f1c09 Make lauchner class configurable 2022-05-12 16:12:20 +02:00
Tobias Hagemann 0351595243 parameterized MODULE_AND_MAIN_CLASS 2022-05-12 16:07:47 +02:00
Armin SchrenkandSebastian Stenzel 5ab74affb5 Refactor LocationPreset enum:
* use static inner class
* add getDisplayName method
* make instance variables final

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-05-12 13:47:57 +02:00
Sebastian Stenzel 8230b74c78 moved file picker filter glob to Constants.java 2022-05-12 13:17:33 +02:00
Armin Schrenk 5832e8cd49 Apply suggestions from code review
Co-authored by: Tobias Hagemann <tobihagemann@users.noreply.github.com>
2022-05-12 12:15:16 +02:00
Tobias Hagemann 0220af24d0 actually use vault config filename from constants when creating vault 2022-05-12 10:51:00 +02:00
Armin Schrenk 3e6d81ef1b Use parameter for main jar glob pattern 2022-05-12 09:15:04 +02:00
Tobias Hagemann 852daaa88e parameterized mac build script 2022-05-12 09:14:10 +02:00
Armin Schrenk 7dfc4d9ded allow custom name for c9r/c9s icon file 2022-05-12 09:14:03 +02:00
Armin Schrenk 98002f63dc Use enum for well-known local cloud storage paths and move class to commons package 2022-05-12 08:45:03 +02:00
Armin Schrenk 80696972cb allow upgrade-uuid to be customized in build script 2022-05-11 13:00:32 +02:00
Sebastian Stenzel a3d4eb6048 adjust build to integrations-win 1.1.1 2022-05-11 12:51:48 +02:00
Armin Schrenk 0f88e6c2fe fix errors 2022-05-11 12:48:56 +02:00
Armin Schrenk 3524f273de Merge branch 'develop' into feature/parameterize-win-build-script
# Conflicts:
#	dist/win/build.ps1
2022-05-11 12:48:31 +02:00
Armin Schrenk fb3d64c43f update integrations-win dependency 2022-05-11 12:41:33 +02:00
Armin Schrenk 90d43f28d9 eradicate last hard coded app name occurences in build script 2022-05-11 12:25:53 +02:00
Armin Schrenk a29f10a504 refactor build scipt to be easiert customizable 2022-05-11 12:22:29 +02:00
Armin Schrenk 6702747652 separate cryptomator labels and asset paths from installer file 2022-05-10 18:35:04 +02:00
Armin Schrenk a8b920698d Generify error message in installer 2022-05-10 16:32:59 +02:00
Sebastian Stenzel 0b2685f271 adjusted .gitignore to latest IntelliJ IDEA standards
see https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems

[ci skip]
2022-05-10 15:23:02 +02:00
Sebastian Stenzel 120be431ee prepare Cryptomator to eventually change the update check URL 2022-05-10 11:36:40 +02:00
Armin Schrenk f50eb1f047 Revert "Reset webdavport field if changes are not applied and focus lost"
This reverts commit c6e9e33feb.
2022-05-09 13:06:15 +02:00
Armin SchrenkandGitHub 32d6661a72 Merge pull request #2235 from cryptomator/feature/automate-winget
Add automatic release to winget to msi/exe ci job
2022-05-06 17:44:33 +02:00
Armin Schrenk f57d8dab6d instead of defining pwsh as default for winget job, only use it in specific step 2022-05-06 17:34:04 +02:00
Armin Schrenk 5ba0e674f2 Add automatic release to winget to msi/exe ci job 2022-05-06 13:13:45 +02:00
Sebastian Stenzel 55f67785cd don't cause the job to fail if the upload fails
[ci skip]
2022-05-05 09:05:05 +02:00
Sebastian Stenzel 6d082330e6 replace failing curl with http-request-action
[ci skip]
2022-05-05 08:00:21 +02:00
Sebastian Stenzel 0fdc5b2826 fix duplicate arm64 dmg and duplicate appimage
[ci skip]
2022-05-05 07:50:06 +02:00
Sebastian Stenzel 31f77e62ea configurable time interval 2022-05-05 07:44:28 +02:00
Sebastian Stenzel 3435a6701a round timestamp to latest 15min mark 2022-05-05 07:41:36 +02:00
Sebastian Stenzel d4367b97a6 adjust interval to 900s, when reporting stats every 15min 2022-05-05 07:39:05 +02:00
Sebastian StenzelandGitHub 1151157dff Report Download Stats (#2230)
[ci skip]
2022-05-05 07:32:19 +02:00
Martin Beyer e3c609351f Add third stats graph, displaying general file(attribute) accesses 2022-05-05 00:09:39 +02:00
Martin Beyer 01412070ad Merge remote-tracking branch 'origin/develop' into feature/stats-counter-for-metadata 2022-05-04 15:41:33 +02:00
Julian Raufelder e9c58ac3d5 Merge branch 'hotfix/1.6.10' into develop 2022-05-03 16:38:51 +02:00
Julian Raufelder 2833015ff1 Merge branch 'hotfix/1.6.10' 2022-05-03 16:18:05 +02:00
Julian Raufelder 12ef32835c Prepare 1.6.10
[ci skip]
2022-05-03 16:15:33 +02:00
Julian Raufelder eae5f4d870 Fix truncation if new size is larger than the current file size when FUSE is used to mount the vault
Fixes #2218
2022-05-03 16:10:41 +02:00
JaniruTECandGitHub 30e1c989d0 Fixed typo 2022-05-01 00:46:36 +02:00
Sebastian Stenzel d4b3eff42f restored success/error redirects 2022-04-28 12:59:27 +02:00
Sebastian Stenzel 9f0e269baf Merge branch 'develop' into feature/hub
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2022-04-28 12:55:55 +02:00
Armin Schrenk c6e9e33feb Reset webdavport field if changes are not applied and focus lost 2022-04-28 12:00:06 +02:00
Armin Schrenk 62c7f95f7c removed logging of unused property 2022-04-28 11:54:51 +02:00
Armin Schrenk a304427973 Remove last reference of "donationkey" 2022-04-28 11:53:54 +02:00
Sebastian Stenzel c04597eca5 Merge branch 'main' into develop
[ci skip]
2022-04-27 15:52:15 +02:00
Sebastian Stenzel ba1945ebb8 Merge branch 'release/1.6.9' 2022-04-27 15:51:50 +02:00
Sebastian Stenzel e9551a076d Merge branch 'develop' into release/1.6.9 2022-04-27 15:30:59 +02:00
Sebastian StenzelandGitHub ccd3da3b09 Merge pull request #2096 from cryptomator/feature/integrations-api-1.1.0
Integrations API 1.1.0
2022-04-27 15:29:47 +02:00
Sebastian Stenzel 5e06fa7385 Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
#	pom.xml
2022-04-27 15:23:38 +02:00
Sebastian Stenzel c3969f2f33 bumped integrations version 2022-04-27 15:19:54 +02:00
Sebastian Stenzel 0a8cc7ed1e Merge branch 'develop' into release/1.6.9 2022-04-27 13:19:41 +02:00
CryptobotandGitHub 74f5be1605 New Crowdin updates (#2146)
[ci skip]
2022-04-27 13:19:03 +02:00
Sebastian Stenzel 3c376c4bf6 add -Dsun.java2d.metal=true, which fixes #2194 2022-04-27 13:18:25 +02:00
Armin SchrenkandGitHub fedb62d99a Merge pull request #2175 from cryptomator/feature/binary-stylesheets
Prefer binary stylesheets
2022-04-27 13:06:18 +02:00
Armin SchrenkandGitHub 8f97235b9a Merge pull request #2189 from cryptomator/feature/on-the-fly-license
Generate app license on release/ installer build and remove commited third party file
2022-04-27 13:05:53 +02:00
Julian Raufelder d127121007 Update metainfo.xml to 1.6.9
[ci skip]
2022-04-26 19:51:43 +02:00
Armin Schrenk d6a55d3006 preparing 1.6.9 2022-04-26 18:14:40 +02:00
Armin Schrenk d3d0cef2bb bumping dependencies 2022-04-26 18:07:37 +02:00
Armin Schrenk c514dc6235 fixes #2205 2022-04-26 17:58:37 +02:00
Armin Schrenk 98b3b14e6a Reverted bundle license to show links again and adjusted license template
* only those are depicted as clickable http links
2022-04-26 17:48:05 +02:00
Sebastian Stenzel 9d4f9c12b9 outsourced authorization flow to https://github.com/coffeelibs/tiny-oauth2-client 2022-04-25 16:28:54 +02:00
Sebastian Stenzel d1c4eda072 Merge branch 'develop' into feature/hub
# Conflicts:
#	.github/workflows/appimage.yml
#	dist/linux/appimage/build.sh
#	dist/linux/debian/rules
#	dist/mac/dmg/build.sh
#	dist/win/build.ps1
2022-04-25 15:30:56 +02:00
Armin Schrenk 835a5592fc use pwsh for license generation to circumvent slash problem in url 2022-04-22 17:18:28 +02:00
Armin Schrenk c429de6a66 third slash's the charm 2022-04-22 16:52:49 +02:00
Armin Schrenk afe7737129 wrong usage of github workspace var 2022-04-22 16:25:00 +02:00
Armin Schrenk 94b3ea37d6 use absolute path in workflow 2022-04-22 16:19:09 +02:00
Tobias Hagemann 4d7e16d58e updated license templates 2022-04-22 12:34:25 +02:00
Armin Schrenk 2f17d80fe6 Revert "removed license dir, renamed merge file and adjusted paths"
This reverts commit d053367f83.
2022-04-22 11:51:22 +02:00
Armin Schrenk fbc598fed7 Reordered steps in vault creation and renamed methods 2022-04-22 10:40:18 +02:00
Armin Schrenk d053367f83 removed license dir, renamed merge file and adjusted paths 2022-04-22 09:49:04 +02:00
Armin Schrenk 9f5c31e4e7 Move app specific license template to resources directory 2022-04-21 14:21:40 +02:00
Armin Schrenk 68d4b440e1 use spaces instead of tabs in app license file 2022-04-20 17:47:50 +02:00
Armin Schrenk bcfba21900 Create third-party-license file in target directory, use plugin defaults to let it placed inside jar 2022-04-20 17:46:58 +02:00
Armin Schrenk c1801e3d22 fixed typo 2022-04-20 12:12:25 +02:00
Armin Schrenk bff0194f3e Fixed wrong file format and url of lcense merge file 2022-04-20 12:12:00 +02:00
Armin Schrenk 75f96eb08f removing static third-party-licenses file 2022-04-20 10:37:13 +02:00
Armin SchrenkandSebastian Stenzel 4d1d6f449e Apply suggestions from code review
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-04-20 10:31:25 +02:00
Armin Schrenk eb0a2c1267 On macOS show example in dark mode when adding existing vault 2022-04-19 17:34:12 +02:00
Armin Schrenk 51d715caa1 apply same config to license generation 2022-04-19 16:47:33 +02:00
Sebastian Stenzel b55bd8075c relax stale bot
[ci skip]
2022-04-18 09:18:51 +02:00
Sebastian StenzelandGitHub d368b01038 Merge pull request #2105 from cryptomator/feature/gtk2-launcher
Add additional GTK2 launcher to AppImage, fixes #1432
2022-04-18 08:24:13 +02:00
Martin Beyer 4944a634fb Add counter for file access 2022-04-14 15:47:41 +02:00
Tobias Hagemann dc3894290b updated license template for macos, fixed manual build script 2022-04-14 13:52:10 +02:00
Armin Schrenk 597bbdbdb8 for mac build generate license on the fly
References 7172462b4b
2022-04-13 17:53:44 +02:00
Sebastian Stenzel 2b255ed101 Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
#	src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
2022-04-13 07:21:59 +02:00
Sebastian Stenzel 9ece1f66a1 bumped API to 1.1.0-rc1 2022-04-13 07:16:19 +02:00
JaniruTECandGitHub e71b375437 Added "--version" (short: "-v")
Merge pull request #2064 from cryptomator/1996-cli-version
2022-04-13 00:57:08 +02:00
JaniruTEC bcb2b088ba Applied suggestions from code review 2022-04-13 00:46:11 +02:00
JaniruTEC f123dff0cd Merge remote-tracking branch 'origin/develop' into 1996-cli-version
# Conflicts:
#	src/main/java/org/cryptomator/launcher/Cryptomator.java
2022-04-12 17:44:13 +02:00
Sebastian Stenzel 0ace5bb42b fix copy-paste error in log message 2022-04-11 12:34:50 +02:00
Sebastian Stenzel b656b591ed prefer .bss over .css 2022-04-11 12:32:07 +02:00
Sebastian Stenzel 564370ec7a compile .css into .bss file 2022-04-11 12:31:57 +02:00
Tobias HagemannandGitHub 7dd0f0cb31 Merge pull request #2173 from cryptomator/feature/preferences-interface
Moved interface preferences to its own tab
2022-04-11 10:49:14 +02:00
Tobias Hagemann 79e1285b38 increased margins and spacings even further 2022-04-11 10:48:47 +02:00
Sebastian Stenzel 9c26d17733 log durations of application start 2022-04-11 09:36:34 +02:00
Sebastian Stenzel 69f3a2bd5a log errors when showing main window 2022-04-11 09:35:35 +02:00
Sebastian Stenzel 9a9ef6c583 updated license file
[ci skip]
2022-04-11 09:23:53 +02:00
Sebastian Stenzel a8e73350a6 renamed translation keys 2022-04-09 15:30:16 +02:00
Sebastian Stenzel c8e131c49f reordered controls 2022-04-09 15:25:27 +02:00
Sebastian Stenzel 3b8f2adedf increased margins and spacings 2022-04-09 15:18:44 +02:00
Sebastian Stenzel 9b00cd923c moved interface settings to separate preferences tab 2022-04-09 15:13:53 +02:00
Sebastian Stenzel 12d38335d8 increase width of preferences window, which should fix #2107 2022-04-09 15:05:05 +02:00
Sebastian Stenzel 2108a77e12 adjusted build scripts for Cryptomator Hub 2022-04-08 20:45:22 +02:00
Sebastian Stenzel f3bfe7b64c Merge branch 'develop' into feature/hub
# Conflicts:
#	.github/workflows/release.yml
#	.idea/runConfigurations/Cryptomator_Linux.xml
#	.idea/runConfigurations/Cryptomator_Linux_Dev.xml
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	.idea/runConfigurations/Cryptomator_macOS.xml
#	.idea/runConfigurations/Cryptomator_macOS_Dev.xml
#	pom.xml
#	src/main/java/module-info.java
#	src/main/java/org/cryptomator/ui/controls/NiceSecurePasswordField.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingStrategy.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/PassphraseEntryController.java
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/SelectMasterkeyFileController.java
#	src/main/resources/license/THIRD-PARTY.txt
2022-04-08 20:27:02 +02:00
Sebastian StenzelandGitHub 752e61219c Merge pull request #2161 from cryptomator/feature/check-vaultconfig-sig-during-key-recovery
Prevent key recovery for foreign vault
2022-04-05 12:03:12 +02:00
Sebastian Stenzel d308ee626a more descriptive name
[ci skip]
2022-04-05 09:27:44 +02:00
Sebastian Stenzel d861ef0d22 Make use of extended validation to prevent applying a recovery key that didn't sign the vault config 2022-04-05 09:21:33 +02:00
Sebastian Stenzel 78a50548ab optionally allow extended key validation in RecoveryKeyFactory#validateRecoveryKey 2022-04-05 09:19:58 +02:00
Sebastian Stenzel 4c363a9abc dealing with deprecation 2022-04-05 08:14:14 +02:00
Sebastian Stenzel 9ed7438f05 bump zxcvbn4j version, fixes #979 2022-04-05 08:00:05 +02:00
Sebastian Stenzel 5a4f714c93 Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
2022-04-05 07:49:25 +02:00
Sebastian Stenzel c03bc9ed0b removed unused imports
[ci skip]
2022-04-05 07:47:54 +02:00
Sebastian Stenzel 7c772e2767 removed user.language=en and jdk.gtk.version=2 flags from run configurations
[ci skip]
2022-04-05 07:46:17 +02:00
Sebastian StenzelandGitHub 3136e22414 Merge pull request #2150 from cryptomator/feature/language-switcher 2022-04-04 20:59:23 +02:00
Sebastian Stenzel 508b9f5c64 test if bundle for supported locales exist and are not empty 2022-04-04 15:57:01 +02:00
Sebastian Stenzel d10c8fcf17 amend settings deserialization test 2022-04-04 15:13:27 +02:00
Sebastian Stenzel ceb3cbc43f remove unused imports 2022-04-04 15:10:35 +02:00
Sebastian Stenzel ec909ce723 rethrow AWTException as TrayMenuException 2022-04-04 15:10:24 +02:00
Sebastian Stenzel 2ce7e84e3c Merge branch 'develop' into feature/gtk2-launcher 2022-04-04 06:58:07 +02:00
Sebastian Stenzel d7da78fc07 adjust to latest API 2022-04-03 15:26:04 +02:00
Sebastian Stenzel e93e31e745 Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
#	pom.xml
#	src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java
#	src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java
#	src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
#	src/main/resources/license/THIRD-PARTY.txt
2022-04-03 12:53:08 +02:00
Sebastian Stenzel 5dc8fd2582 made constant final 2022-04-03 12:25:15 +02:00
Sebastian Stenzel 77d81acb1e added "English" as first option 2022-04-02 15:54:37 +02:00
Sebastian Stenzel 71d346eddd apply chosen language at application start 2022-04-02 12:17:10 +02:00
Sebastian Stenzel d9aa6ae91a display "language" chooser in general preferences 2022-04-02 12:16:57 +02:00
Sebastian Stenzel c130441700 add setting for user-chosen "language" 2022-04-02 12:15:09 +02:00
Sebastian Stenzel 6af016f1fe log errors occuring in async "show window" tasks 2022-04-02 11:51:34 +02:00
Sebastian Stenzel ec2524f6ff use correct StartupWMClass (fixes #1955)
[ci skip]
2022-04-02 10:06:15 +02:00
Sebastian Stenzel 27d4e00210 Merge branch 'develop' into feature/gtk2-launcher 2022-04-02 10:01:25 +02:00
Sebastian StenzelandGitHub 0cd2ecb0b3 Merge pull request #2139 from cryptomator/feature/javafx-launcher
Refactored Launcher Component Graph
2022-04-02 09:59:45 +02:00
Sebastian Stenzel a143ecdcf8 Refactored use of StageFactory 2022-04-01 17:42:29 +02:00
Sebastian Stenzel 2d830cdb31 easier-to-understand if/else for combinations of "startHidden" and "hasTrayIcon"
fixes bug when startHidden was false and hasTrayIcon was true
2022-04-01 15:36:20 +02:00
Sebastian Stenzel 887e0332da changed misleading comment
[ci skip]
2022-04-01 14:50:27 +02:00
Sebastian Stenzel c1504e29c1 added documentation
[ci skip]
2022-04-01 14:48:14 +02:00
Sebastian Stenzel 0bb6e64d83 when "starting hidden", only minimize when there is no tray icon 2022-04-01 14:01:58 +02:00
Sebastian Stenzel c7d1b9dbd6 don't prompt user if quitting directly after app start 2022-03-31 16:32:17 +02:00
Armin Schrenk a4c50da222 replicate naming scheme of win exe installer in CI job to local build 2022-03-31 11:12:50 +02:00
Sebastian StenzelandGitHub a558135fec Rename .exe Installer Bundle (#2145) 2022-03-31 11:03:15 +02:00
Sebastian Stenzel 7df449524a fixed lock workflow 2022-03-31 10:03:02 +02:00
Sebastian Stenzel d475444829 fixed some code smells 2022-03-31 09:59:16 +02:00
Sebastian Stenzel 828f32d3f6 Merge branch 'develop' into feature/gtk2-launcher 2022-03-31 08:57:27 +02:00
Sebastian Stenzel dc6b5774b8 Merge branch 'develop' into feature/javafx-launcher
# Conflicts:
#	pom.xml
2022-03-31 08:55:49 +02:00
Sebastian Stenzel 28db04e621 arm av allowlisting
[ci skip]
2022-03-31 08:37:00 +02:00
Sebastian Stenzel e2184ec009 upload .msi and .exe to AV allowlisting servers 2022-03-31 08:20:49 +02:00
Sebastian Stenzel 5f1f95da74 Merge branch 'main' into develop
[ci skip]
2022-03-31 08:05:53 +02:00
Sebastian Stenzel 4b29f0b4f3 Merge branch 'release/1.6.8' 2022-03-30 18:03:54 +02:00
Sebastian Stenzel f8bcbda8d7 add safeguard to prevent release in case of missing signature 2022-03-30 18:03:15 +02:00
Sebastian Stenzel e368087c3e Merge branch 'develop' into release/1.6.8 2022-03-30 18:02:13 +02:00
Sebastian Stenzel ddb5da1d79 reintroduce condition for signing the tarball
[ci skip]
2022-03-30 17:56:01 +02:00
Sebastian Stenzel d2374fb8cd deleted yet another use of github.ref 2022-03-30 17:50:45 +02:00
Sebastian Stenzel c73aa49b59 always run the tarball signature step (for testing ${{ github.ref_name }}) 2022-03-30 17:46:31 +02:00
Armin Schrenk de86760a75 Merge branch 'release/1.6.8' 2022-03-30 17:23:49 +02:00
Armin Schrenk bfd8a62015 preparing 1.6.8 2022-03-30 17:22:25 +02:00
9292a3c89c Sign again tarball in release using GPG (#2140)
Co-authored-by: infeo <armin.schrenk@skymatic.de>
Co-authored-by: overheadhunter <sebastian.stenzel@skymatic.de>
2022-03-30 17:19:27 +02:00
Julian Raufelder 732fc2f3dd Update metainfo.xml to 1.6.8
[ci skip]
2022-03-30 17:17:48 +02:00
CryptobotandGitHub 9fb00fcc38 New Crowdin updates (#2119)
New translations strings.properties

Chinese Traditional; German; 

[ci skip]
2022-03-30 17:16:49 +02:00
Armin Schrenk 12b58a8a32 Update third-party license file 2022-03-30 17:10:10 +02:00
Armin Schrenk 338eb45e24 bump dependencies 2022-03-30 16:17:06 +02:00
Armin Schrenk e8c63dd3f3 Fixes #2138, closes #2127
Return code 0 when running application found
2022-03-30 16:00:05 +02:00
Armin Schrenk 2de23f8fff bump jwt lib to fix possible vulnerability 2022-03-30 15:56:22 +02:00
Armin Schrenk 1a0624cc81 Closes #2130
Prevent Windows installation if app is running
2022-03-29 23:47:03 +02:00
Sebastian Stenzel e907360419 refactored launcher, deleted UiLauncherModule
component graph is now: Main → FxApplicationComponent → Tray, MainWindow, etc
2022-03-29 20:39:46 +02:00
Armin Schrenk ef6f87bb19 Fixes #2126
Remove deprecated env variable
2022-03-29 17:24:01 +02:00
Sebastian Stenzel 73bbcdcca1 start javafx via Application.launch(...) again 2022-03-28 17:52:39 +02:00
Sebastian Stenzel 6da8fc1f70 optionally specify version in manually dispatched builds 2022-03-25 08:20:18 +01:00
Armin Schrenk 49e90515a1 Fixes #2125 2022-03-24 17:49:12 +01:00
Armin Schrenk 983c35eb37 Remove Codacy badge and ci action 2022-03-24 17:35:36 +01:00
Armin Schrenk 1f0c12ef7a Fix wrong debug message 2022-03-24 12:28:21 +01:00
Sebastian Stenzel ba514c8896 Merge branch 'main' into develop
[ci skip]
2022-03-23 16:38:40 +01:00
Sebastian Stenzel 76c310f1fc Merge branch 'release/1.6.7'
# Conflicts:
#	pom.xml
2022-03-23 16:36:59 +01:00
Sebastian Stenzel 874f0ee611 preparing 1.6.7 2022-03-23 15:19:11 +01:00
Sebastian Stenzel 957f067e9b update license info
[ci skip]
2022-03-23 14:41:29 +01:00
CryptobotandGitHub b1931f2c13 New Crowdin updates (#1966) 2022-03-23 14:40:21 +01:00
Sebastian Stenzel 156e7bbb91 also run PR tests in virtual x environment (allowing UI tests) 2022-03-23 11:03:59 +01:00
Sebastian Stenzel 4abb41aebd Merge branch 'develop' into feature/integrations-api-1.1.0
# Conflicts:
#	src/main/java/org/cryptomator/ui/traymenu/TrayMenuController.java
2022-03-23 11:02:48 +01:00
Sebastian Stenzel 67e1626de0 Merge branch 'develop' into feature/gtk2-launcher 2022-03-23 10:56:01 +01:00
Sebastian Stenzel aebe848bef run tests in virtual x environment (allowing UI tests) 2022-03-23 10:50:30 +01:00
Sebastian Stenzel c40ef2f0f2 bump webdav dependency, which fixes #1273 2022-03-23 10:42:58 +01:00
Sebastian Stenzel 8fa562aa60 bumped dependencies 2022-03-23 10:42:20 +01:00
Armin SchrenkandGitHub 303f84166f Merge pull request #2101 from kevinstsauveur/1583-vault-state-in-title-tray
Show vault locked/unlocked state in the vault title in the tray menu

Closes #1583
2022-03-22 12:45:21 +01:00
Armin Schrenk 9e594ea127 Fix not showing dir picker dialog when path does not exist 2022-03-22 12:44:06 +01:00
Sebastian StenzelandGitHub 88977ecf20 Merge pull request #1983 from cryptomator/feature/simplified-workflow-results 2022-03-21 21:19:32 +01:00
Kevin St-Sauveur 538cac3749 Changing prefix marker in unlocked vault name in tray menu 2022-03-21 15:37:32 -04:00
Armin Schrenk 30196f6a68 Display correct name during in uac dialog during install 2022-03-21 16:40:57 +01:00
Sebastian Stenzel 8bc79e684d fix syntax errors and switch back to bash 2022-03-21 15:28:49 +01:00
Sebastian Stenzel 7183efa073 attempt to fix broken CI build 2022-03-21 15:22:33 +01:00
Sebastian Stenzel 92f621cd25 Merge branch 'develop' into feature/simplified-workflow-results 2022-03-21 14:08:45 +01:00
snyk-botandSebastian Stenzel 19d26de4ec fix: pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMFASTERXMLJACKSONCORE-2421244
2022-03-21 14:06:43 +01:00
Sebastian Stenzel d39c3969df share charset configuration
[ci skip]
2022-03-21 14:05:29 +01:00
Armin Schrenk c781755c6e use special sign process for windows exe bundle 2022-03-21 14:02:02 +01:00
Sebastian Stenzel 4a3d579b76 changed button title as suggested in review 2022-03-21 14:01:35 +01:00
Sebastian Stenzel 6bad74720f Merge branch 'develop' into feature/simplified-workflow-results 2022-03-21 13:56:24 +01:00
Sebastian Stenzel 77e2be22de updated .gitignore
[ci skip]
2022-03-18 18:06:31 +01:00
Sebastian Stenzel 7b4a3e1313 make sure not to upload unrelated artifacts to a release 2022-03-18 18:06:08 +01:00
Sebastian Stenzel 504a384225 fix envsubst 2022-03-18 17:58:21 +01:00
Sebastian Stenzel 550546c4b7 not required in yml multiline strings 2022-03-18 17:42:28 +01:00
Sebastian Stenzel 8dce21ea40 run envsubst as an independent step 2022-03-18 17:31:49 +01:00
Sebastian Stenzel b565f1d0c0 remove unused java binaries from jlinked runtime image 2022-03-18 17:26:28 +01:00
Sebastian Stenzel fab70ef8c9 run Cryptomator binaries instead of java from AppImage launcher .sh 2022-03-18 17:25:04 +01:00
Sebastian Stenzel 0d78318373 Revert "attempt to trigger build when drafting a release"
This reverts commit e67772c9a6.
2022-03-18 16:44:17 +01:00
Sebastian Stenzel e67772c9a6 attempt to trigger build when drafting a release 2022-03-18 16:10:40 +01:00
Sebastian StenzelandGitHub a1becd9a1f Merge pull request #2103 from cryptomator/feature/separate-release-actions
Build binary packages in separate workflows
2022-03-18 15:58:26 +01:00
Sebastian Stenzel c22ede3bf4 only enforce version if tag contains semver string 2022-03-18 15:52:56 +01:00
Sebastian Stenzel d680d7fe9d renamed step
[ci skip]
2022-03-18 14:58:53 +01:00
Sebastian Stenzel 746d3974a0 treat workflow input as string
see https://github.com/actions/runner/issues/1483
2022-03-18 14:54:20 +01:00
Sebastian Stenzel e2f872ba9b control whether to run dput when manually dispatching debian workflow 2022-03-18 14:18:05 +01:00
Sebastian Stenzel b37886c98c remove debug options
[ci skip]
2022-03-18 14:10:28 +01:00
Sebastian Stenzel 88db74d595 remove old release workflow 2022-03-18 14:03:07 +01:00
Sebastian Stenzel 5f17a66632 draft a release for tagged builds if build succeeds 2022-03-18 14:02:00 +01:00
Sebastian Stenzel e0b3525504 bumped actions/upload-artifact version 2022-03-18 14:01:06 +01:00
Sebastian Stenzel 0443bfb0a2 wrong job name in expression 2022-03-18 13:14:18 +01:00
Sebastian Stenzel 6cd349523b separate workflow for building .exe 2022-03-18 13:00:14 +01:00
Sebastian Stenzel c7f64f4974 remove debug options
[ci skip]
2022-03-18 12:59:56 +01:00
Sebastian Stenzel be44812896 fix copy-paste errors 2022-03-18 12:36:13 +01:00
Sebastian Stenzel c8651d9375 only use three version numbers for mac apps 2022-03-18 12:29:45 +01:00
Sebastian Stenzel 709d211928 separate workflow for building .dmg 2022-03-18 12:20:43 +01:00
Sebastian Stenzel f43b033ac1 remove debug options
[ci skip]
2022-03-18 12:19:25 +01:00
Sebastian Stenzel 184b7799ea use README.md for dry-running gpg 2022-03-18 11:21:21 +01:00
Sebastian Stenzel 47a206cf25 separate workflow for building .deb 2022-03-18 11:16:46 +01:00
Sebastian Stenzel e078869f33 Create .asc signatures 2022-03-18 10:51:09 +01:00
Sebastian Stenzel 0f5a358c42 read version from pom.xml (except for tagged commits) 2022-03-18 10:37:29 +01:00
Sebastian Stenzel ba037007a4 run workflow on push
(otherwise it won't show up)
2022-03-18 10:34:41 +01:00
Sebastian Stenzel 6c176d5484 separate workflow for building .AppImage 2022-03-18 10:31:45 +01:00
Armin Schrenk 1c76c50a4b Merge commit 'c29cc9ab85f582c458ce981559d3b6f7bfd82803' into 1583-vault-state-in-title-tray 2022-03-16 16:12:39 +01:00
Armin Schrenk d3e9239531 simplify name of test file for location check on vault creation 2022-03-16 15:24:55 +01:00
Armin Schrenk f231c25dfc Update maven plugin dependencies 2022-03-16 15:08:46 +01:00
Armin Schrenk c29cc9ab85 supress false positive in dependency-check plugin 2022-03-16 15:08:09 +01:00
Kevin St-Sauveur 79e6a4cd48 Modify vault title when unlocked 2022-03-14 02:29:25 -04:00
Sebastian Stenzel ad6d5bfae9 resolved class name conflict 2022-03-07 17:42:56 +01:00
Sebastian Stenzel a404740ceb Updated to integrations-api 1.1.0-beta2 2022-03-07 17:35:48 +01:00
Ralph PlawetzkiandSebastian Stenzel a32f5bb6d9 Use updated Cryptomator screenshots (1.6.5)
They do appstream-util validate
2022-03-07 11:59:54 +01:00
Sebastian Stenzel d9af387a69 updated public key url
[ci skip]
2022-03-07 08:46:46 +01:00
Armin SchrenkandGitHub f7f83708a5 Merge pull request #2082 from cryptomator/feature/winfsp-mountpoint
Enable directory mountpoint with Winfsp
2022-03-04 10:16:49 +01:00
Armin SchrenkandSebastian Stenzel 9b001b5071 Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com> 2022-03-03 17:45:21 +01:00
Sebastian StenzelandGitHub 349cefcbf5 Merge pull request #2073 from cryptomator/feature/dedup-freedesktop-metadata
Deduplicate Freedesktop Metadata
2022-03-03 13:08:36 +01:00
Sebastian Stenzel 3f596b3853 attempt to fix dput 2022-03-03 12:45:12 +01:00
Sebastian Stenzel 962b4f28af simplify dput using globs 2022-03-03 11:59:59 +01:00
Sebastian Stenzel 0c6f4297a2 display version as x.y.z deb-1234 instead of x.y.z ppa-1234 2022-03-03 10:40:40 +01:00
Armin SchrenkandSebastian Stenzel 14dc026354 Cleanup
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-03-02 17:24:54 +01:00
Armin Schrenkandsonarcloud fba0df10f9 Resolve code smells and a bug
Co-authored-by: sonarcloud <sonarcloud@users.noreply.github.com>
2022-03-02 15:28:01 +01:00
Armin Schrenk f148973bef fix wrong visibillity 2022-03-02 14:50:26 +01:00
Armin Schrenk 4f4c992493 Further improvements:
* make PARENT_NO_MOUNTPOINT preps system agnostic
* add unit tests for cleanup
2022-03-02 14:40:27 +01:00
Armin Schrenk e4bb7adbdc Merge branch 'develop' into feature/winfsp-mountpoint 2022-03-02 13:44:23 +01:00
Armin Schrenk df7d9ba79e Update winfsp download links 2022-03-01 15:25:00 +01:00
Sebastian StenzelandGitHub ed1459a0f0 Update pom.xml 2022-03-01 08:49:47 +01:00
Armin Schrenk e15b68fc9b Refactor winfsp mount preps and add unit tests 2022-02-28 18:54:01 +01:00
Sebastian StenzelandGitHub 5a8aacb7c0 Merge branch 'develop' into feature/dedup-freedesktop-metadata 2022-02-28 14:16:27 +01:00
Armin Schrenk 3ff3b1c63e refactor controller:
* fix vault options UI not showing
* rename from "get" to "is" methods in vault options controller
2022-02-28 13:03:36 +01:00
Sebastian Stenzel c2d0a2a029 install dput 2022-02-28 12:33:21 +01:00
Sebastian Stenzel 7096265fed also build and release .deb file via GitHub Actions
(second attempt)
2022-02-28 12:09:07 +01:00
Sebastian Stenzel ccf4b9c4f2 also build and release .deb file via GitHub Actions 2022-02-28 11:00:26 +01:00
Sebastian Stenzel f7c4fc5fda fix .deb binary build 2022-02-28 11:00:08 +01:00
Armin SchrenkandGitHub 767bdbad5b Merge pull request #2072 from cryptomator/feature/win-installbundle-with-winfsp
Add windows install bundle to build artifacts:
* build with wix
* installs cryptomator and winfsp
2022-02-28 10:22:06 +01:00
Armin Schrenk 467d9e56a0 remove resolved TODO 2022-02-25 13:24:58 +01:00
Armin Schrenk 55d1a8e935 Allow custom mount point for winfsp 2022-02-25 13:21:45 +01:00
Sebastian Stenzel 8ee47aad0f remove version entirely (should have been 1.0, but not required) 2022-02-25 09:58:47 +01:00
Sebastian Stenzel 7afc17e34e fix path 2022-02-25 09:43:10 +01:00
Sebastian Stenzel 6553e48ea3 use oars-1.1 as suggested by @x80486 2022-02-25 09:33:15 +01:00
Sebastian Stenzel 10999b2725 renamed .appdata.xml to .metainfo.xml as suggested by @x80486 2022-02-25 09:28:58 +01:00
Sebastian Stenzel 02fe63c7bc version of the spec, not version of the software
see https://specifications.freedesktop.org/desktop-entry-spec/latest/ar01s06.html
2022-02-25 09:28:14 +01:00
Sebastian Stenzel 891b5597de fix build, add common/ to debian orig.tar.xz 2022-02-24 16:29:21 +01:00
Sebastian Stenzel 7d9aab46a8 fix broken path during mimetype installation 2022-02-24 16:27:28 +01:00
Sebastian Stenzel 69ff0e44f5 fix build 2022-02-24 12:00:02 +01:00
Sebastian Stenzel ec1c255bb4 update appstream metadata 2022-02-24 10:56:36 +01:00
Sebastian Stenzel 43e936d117 rename mimetype file 2022-02-24 10:56:23 +01:00
Sebastian Stenzel 90da61e495 adjust ppa build to use "common" resources 2022-02-24 10:41:40 +01:00
Sebastian Stenzel d38c19cffc adjust appimage build to use "common" resources 2022-02-24 10:38:32 +01:00
Sebastian Stenzel 0556bcd576 move metadata to "common" dir 2022-02-24 10:26:37 +01:00
Armin Schrenk 771e3ab6f3 remove unused ui elements from theme bundle 2022-02-24 09:53:26 +01:00
7cfcfda66f Apply suggestions from code review
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2022-02-24 09:46:05 +01:00
Armin Schrenk 8090f95495 integrate windows installation bundle creation into gh action "release" 2022-02-23 22:30:22 +01:00
Armin Schrenk 7172462b4b Create installation bundle with winfsp:
* via wix burn engine
* licenses generated on the fly
* customized theme
* local only
2022-02-23 22:27:41 +01:00
Sebastian Stenzel 9f7442c1c0 read clientId from vault config 2022-02-23 12:49:39 +01:00
Tobias Hagemann 64845f0ffa Merge branch 'hotfix/1.6.6' 2022-02-21 14:45:19 +01:00
Tobias Hagemann ee68f9d47b preparing 1.6.6 2022-02-21 14:45:01 +01:00
Tobias Hagemann 65bb6773cb Merge branch 'hotfix/1.6.6' 2022-02-21 14:25:05 +01:00
Tobias Hagemann 4bd4cd671b removed unnecessary entitlement in mac build
(cherry picked from commit 3e8690ca11)
2022-02-21 14:24:04 +01:00
Sebastian Stenzel 64abbc8205 Merge branch 'develop' into feature/hub
# Conflicts:
#	.github/workflows/release.yml
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2022-02-18 09:38:25 +01:00
Sebastian Stenzel 165f190004 read device registration url from vault config 2022-02-18 09:13:33 +01:00
JaniruTEC 12a21bbb71 Added "--version" (short: "-v") 2022-02-17 02:39:48 +01:00
JaniruTECandGitHub da2d647361 Merge pull request #2013 from cryptomator/feature/1888-existing-drive-letter-error
Added error message if user tries to mount to occupied drive
2022-01-30 01:38:16 +01:00
JaniruTEC 1641a06d65 Renamed NO_PARENT_NO_MOUNT_POINT to UNUSED_ROOT_DIR in MountPointRequirement 2022-01-30 01:35:02 +01:00
Sebastian StenzelandSebastian Stenzel d6ccb41027 add modules required for JFR 2022-01-26 19:47:51 +01:00
KarlKeu00andGitHub a9846744fe Update JavaFX to 17.0.2 (#2031)
Updating JavaFX inside Maven to 17.0.2 to fix JDK-8275723. This is only relevant for development on a Mac with an M1 processor.
2022-01-21 13:16:06 +01:00
Sebastian Stenzel e1a72c41a5 remove unused imports 2022-01-19 20:01:48 +01:00
Sebastian Stenzel 4d4098e0e0 cleanup 2022-01-19 19:49:33 +01:00
Sebastian Stenzel d52e59d7a4 dedup by setting title when setting the scene 2022-01-19 19:08:54 +01:00
Sebastian Stenzel 9440fb186f Merge branch 'develop' into feature/simplified-workflow-results,
solving conflict with 5509033

# Conflicts:
#	src/main/java/org/cryptomator/ui/keyloading/masterkeyfile/MasterkeyFileLoadingModule.java
2022-01-19 17:35:04 +01:00
Sebastian Stenzel 9856792921 replaced UserInteractionLock with CompletableFuture in LockWorkflow 2022-01-19 17:21:32 +01:00
JaniruTEC 080ddbbb01 Applied changes from code review. 2022-01-18 02:25:25 +01:00
Tobias Hagemann 3e8690ca11 removed unnecessary entitlement in mac build
[ci skip]
2022-01-12 11:01:59 +01:00
httpjamesmandGitHub f1fdd7960c Update copyright years from 2021 to 2022 to reflect the new year (#2015) 2022-01-10 10:01:07 +01:00
JaniruTEC b7902ad8fd Merge branch 'develop' into feature/1888-existing-drive-letter-error 2022-01-09 00:35:32 +01:00
Armin Schrenk bf382d928f Update dokan.dll [ci skip] 2022-01-05 10:53:18 +01:00
Armin Schrenk 7486fa2167 update Third parties license file 2022-01-04 16:35:42 +01:00
Armin Schrenk 550903325d Add vault name in unlock window titles 2022-01-04 16:35:09 +01:00
Armin Schrenk 2afd9f1c1d Bump logback
hotfix 1.2.8 is superseded by 1.2.9 as stated in https://jira.qos.ch/browse/LOGBACK-1591?focusedCommentId=20920&page=com.atlassian.jira.plugin.system.issuetabpanels%3Acomment-tabpanel#comment-20920
2021-12-17 14:52:18 +01:00
Sebastian StenzelandGitHub b142904cc3 Merge pull request #1980 from cryptomator/feature/hub-integrated-device-registration
Register device from within client application
2021-12-16 18:02:00 +01:00
Sebastian Stenzel 806ffe704c convert Dagger modules to interfaces 2021-12-16 17:09:25 +01:00
Sebastian Stenzel 6ca87d13f5 renamed class 2021-12-16 17:01:56 +01:00
Sebastian Stenzel 983a4d0b0f move masterkey selection to subcomponent
and use CompletableFuture instead of UserInteractionLock + AtomicReference
2021-12-16 17:00:49 +01:00
Sebastian Stenzel e95853deac make test public, fixing InaccessibleObject error in maven build 2021-12-16 16:46:57 +01:00
Sebastian Stenzel d72d9f533c Replace CharBuffer and char[] instances by destroyable Passphrase 2021-12-16 16:41:07 +01:00
Tobias HagemannandGitHub 6403991bad Update release.yml
[ci skip]
2021-12-16 14:03:15 +01:00
Sebastian Stenzel 85a5146d4b wipe pw before losing reference
[ci skip]
2021-12-16 13:59:10 +01:00
Sebastian Stenzel 0bece0f591 move passphrase entry to subcomponent
and use CompletableFuture instead of UserInteractionLock + AtomicReference
2021-12-16 13:56:59 +01:00
Armin Schrenk 196521bfd0 Merge tag '1.6.5' into develop
1.6.5

# Conflicts:
#	pom.xml
2021-12-16 13:33:40 +01:00
Armin Schrenk a05dcd2f14 Merge branch 'hotfix/1.6.5' 2021-12-16 13:32:21 +01:00
Armin Schrenk 9775eaa2a8 bump logback to close possible vulnerability 2021-12-16 13:31:38 +01:00
Sebastian Stenzel abc0f952e0 closing the window will cancel implicitly 2021-12-15 17:32:11 +01:00
Sebastian Stenzel e6f43d1f05 no need to run code in ui thread 2021-12-15 17:31:08 +01:00
Sebastian Stenzel 25b9722019 Use CompletableFuture instead of UserInteractionLock + AtomicReference 2021-12-15 17:19:59 +01:00
Sebastian Stenzel 157bef5df6 close dialog after successful device registration (to be improved lol) 2021-12-15 17:19:00 +01:00
Armin Schrenk 36f87b3643 closes #1961 2021-12-15 12:46:23 +01:00
Armin Schrenk 8ac7ba8f56 preparing hotfix 1.6.5 2021-12-15 12:45:52 +01:00
Sebastian Stenzel ef281f810f register device via rest api 2021-12-14 17:35:24 +01:00
JaniruTEC 46a3a4fc11 Added error message if user tries to mount to occupied drive.
Fixes #1888
2021-12-13 00:46:18 +01:00
921dd8fe67 Add query to redirection to provide more context in the frontend (#1973)
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
2021-12-10 13:42:37 +01:00
Sebastian Stenzel fb580ff79d read masterkey from JWE 2021-12-09 14:03:39 +01:00
Sebastian Stenzel 0110e5bedd added JWE decryption helper 2021-12-09 14:02:39 +01:00
Sebastian Stenzel 0fd6e5bbb0 fixed code smells 2021-12-03 12:17:07 +01:00
Sebastian Stenzel f277d4d21b fix resource leak 2021-12-03 12:10:40 +01:00
Sebastian Stenzel 085304ec04 set up SonarCloud 2021-12-02 17:16:01 +01:00
Armin Schrenk 335a91d24a reset to snapshot version
[ci skip]
2021-12-02 12:34:09 +01:00
Armin Schrenk e0a3b7a9df Merge branch 'release/1.6.4' 2021-12-02 12:24:47 +01:00
Armin Schrenk c6a1690753 Merge tag '1.6.4' into develop
1.6.4
2021-12-02 12:24:47 +01:00
Armin Schrenk 4e3742c206 Merge branch 'develop' into release/1.6.4 2021-12-02 12:22:29 +01:00
Armin Schrenk 919257a99e Bump dagger 2021-12-02 11:23:27 +01:00
Sebastian StenzelandGitHub ae6766fa79 Merge pull request #1823 from purejava/feature/displayName
Pass the name of the vault on storing and changing a passphrase
2021-12-02 09:00:03 +01:00
Sebastian Stenzel 2c42a9573e Merge branch 'develop' into feature/displayName
# Conflicts:
#	pom.xml
2021-12-02 08:52:40 +01:00
Sebastian Stenzel 4baf05e684 prepare 1.6.4 2021-12-02 08:46:35 +01:00
CryptobotandGitHub 61d84a0da7 New Crowdin updates (#1894)
* New translations strings.properties
[ci skip]
2021-12-02 08:45:23 +01:00
Sebastian Stenzel 799b2c91bf Merge branch 'feature/patch-webdav' into develop
# Conflicts:
#	dist/win/contrib/patchWebDAV.ps1
#	dist/win/resources/main.wxs
2021-12-01 14:01:02 +01:00
Armin SchrenkandSebastian Stenzel eee672f9ee closes #1932, closes #1931 2021-12-01 13:53:51 +01:00
Sebastian Stenzel 9f4a7c8cce renamed scripts 2021-12-01 12:35:01 +01:00
Armin Schrenk b9bbbc1f86 Bump javafx 2021-11-30 17:02:37 +01:00
Armin Schrenk 13e9775458 Closes #1918 2021-11-29 17:33:11 +01:00
Armin Schrenk e9e5df6310 Bump dependencies:
* cryptofs
* gson
* logback

Closes #1825
2021-11-29 17:31:27 +01:00
2808d777e0 Add cryptomator-vault alias to etc/hosts during (re)install (#1914)
Co-authored-by: Armin Schrenk <armin.schrenk@skymatic.de>
2021-11-29 16:37:23 +01:00
Sebastian Stenzel 3cd99f680a Merge branch 'develop' into feature/hub 2021-11-24 16:23:10 +01:00
Sebastian StenzelandSebastian Stenzel 9b8661fe3c use setup-java@v2 in release action 2021-11-24 16:22:09 +01:00
Sebastian Stenzel 34e4383c1e adjust release build to support hub features 2021-11-24 14:46:21 +01:00
Tobias Hagemann d4c3f02d8a beautified hub_register_device 2021-11-18 17:02:58 +01:00
Martin Beyer 63b40091ea rename supporterCert WhiteSpace and VaultNameLength methods 2021-11-18 12:06:50 +01:00
Sebastian StenzelandGitHub 0c47af2f15 Merge pull request #1935 from cryptomator/feature/lock-retry-loop
Handle exception when force-locking
2021-11-17 16:00:41 +01:00
Sebastian Stenzel 5a735191a4 adjust heading
(as it applies to both graceful and forced lock attempts)
2021-11-17 14:05:42 +01:00
Sebastian Stenzel 21d342d117 Add non-forced retry lock button 2021-11-17 14:03:04 +01:00
Sebastian Stenzel 1b43bf395f apply same error handling to "force lock" as well 2021-11-17 13:45:43 +01:00
Sebastian Stenzel 839175a5e6 Merge branch 'develop' into feature/hub
# Conflicts:
#	pom.xml
2021-11-11 16:04:26 +01:00
Sebastian Stenzel 71a575e079 add build scripts for windows
[ci skip]
2021-11-10 16:08:11 +01:00
Sebastian StenzelandGitHub c5b6d8f81f target Ubuntu Bionic in PPA release (#1909) 2021-11-10 12:20:52 +01:00
Tobias HagemannandGitHub 0c6ecef92b Update README.md
[ci skip]
2021-11-10 08:51:50 +01:00
Tobias Hagemann b565a5a3f4 added dmg step to mac build script
[ci skip]
2021-11-09 15:49:25 +01:00
Armin Schrenk ce9e1184ec bump cryptofs dependency 2021-11-09 12:39:45 +01:00
Armin Schrenk c1c5367e2a closes #1891 2021-11-03 11:54:24 +01:00
Sebastian Stenzel 55a0fe97d8 Merge branch 'main' into develop
[ci skip]
2021-11-03 09:01:45 +01:00
Sebastian Stenzel f7f1afbf7d Merge branch 'release/1.6.3' 2021-11-03 09:01:11 +01:00
Sebastian Stenzel 14395516c5 preparing 1.6.3 2021-11-03 08:59:12 +01:00
CryptobotandGitHub 9ef9499506 New Crowdin updates (#1886)
* New translations strings.properties
[ci skip]
2021-11-03 08:58:04 +01:00
Sebastian Stenzel 1ca803691b Revert "increase robustness of vault creation:"
This reverts commit f7fdb87d6d.
2021-11-03 08:57:35 +01:00
Sebastian Stenzel 5924e443fb Merge branch 'develop' into feature/hub
# Conflicts:
#	.idea/runConfigurations/Cryptomator_Linux.xml
#	.idea/runConfigurations/Cryptomator_Linux_Dev.xml
#	.idea/runConfigurations/Cryptomator_Windows.xml
#	.idea/runConfigurations/Cryptomator_Windows_Dev.xml
#	.idea/runConfigurations/Cryptomator_macOS.xml
#	.idea/runConfigurations/Cryptomator_macOS_Dev.xml
#	pom.xml
2021-11-02 15:53:23 +01:00
CryptobotandGitHub 27aea6cce9 New Crowdin updates (#1844)
New translations strings.properties

Arabic; Bosnian; Catalan; Chinese Simplified; Chinese Traditional; Czech; Dutch; Filipino; French; German; Greek; Hungarian; Indonesian; Italian; Japanese; Korean; Latvian; Macedonian; Norwegian Bokmal; Norwegian Nynorsk; Polish; Portuguese; Portuguese, Brazilian; Punjabi; Romanian; Russian; Serbian (Cyrillic); Serbian (Latin); Slovak; Spanish; Swedish; Turkish; Ukrainian; 

[ci skip]
2021-11-02 15:37:46 +01:00
Armin Schrenk e2ff3f10c1 reset dev branch to SNAPSHOT version 2021-11-02 15:36:09 +01:00
Armin Schrenk 811b538668 Merge tag '1.6.2' into develop
1.6.2
2021-11-02 12:21:57 +01:00
Armin Schrenk 8151cc9714 Merge branch 'release/1.6.2' 2021-11-02 12:21:56 +01:00
Armin Schrenk fdbaa5b892 prepare 1.6.2 2021-11-02 12:11:48 +01:00
Armin Schrenk f7fdb87d6d increase robustness of vault creation:
* clean up after failed vault creation
* ignore if storage readme cannot be created
2021-11-02 11:50:14 +01:00
what-next-githubandGitHub 9408117028 Including pluginDir to linux/appimage/build.sh (#1850) 2021-11-02 10:40:41 +01:00
Armin Schrenk c6c2133b34 closes #1863 2021-10-29 17:08:03 +02:00
Sebastian Stenzel 7a3205b19c updated choose file dialog screenshots for Windows #1863 2021-10-29 17:02:24 +02:00
Sebastian Stenzel 8fadd34498 prepared (currently unused) dark mode screenshots for #1863 2021-10-29 16:49:51 +02:00
Sebastian Stenzel 1ffcc8eacb desaturate irrelevant parts of image 2021-10-29 16:03:10 +02:00
Sebastian Stenzel dfd4b86b06 Updated "choose file dialog" image
references #1863
2021-10-29 14:22:02 +02:00
Sebastian Stenzel 02a59dd538 support loading @2x images 2021-10-29 14:21:04 +02:00
Sebastian Stenzel a79e385594 fixes #1866 2021-10-28 08:23:45 +02:00
Tobias Hagemann a4070f551b fixes #1404 2021-10-27 11:56:49 +02:00
Sebastian Stenzel 5c98fe4145 fixed accessibility issue 2021-10-25 19:50:39 +02:00
Sebastian Stenzel 9b79e9e69e fixed second part of error code (#1741) 2021-10-25 19:34:45 +02:00
BartandGitHub 520b3a8f08 Remove IPC socket before creation (#1852)
(to make sure that socket path can be created)
2021-10-25 09:47:02 +02:00
Armin Schrenk 28d2262962 on windows allow installations only on windows 10 1803 or newer due to unix socket support 2021-10-22 19:21:10 +02:00
Julian Raufelder c87b559313 Merge branch 'main' into develop 2021-10-20 13:47:39 +02:00
Julian Raufelder cea8b7556e Merge branch 'release/1.6.1' 2021-10-20 13:40:49 +02:00
Julian Raufelder 5dde332b8b Preparing 1.6.1 2021-10-20 13:39:20 +02:00
Sebastian Stenzel 0980e4776b fixes #1843 2021-10-20 12:46:37 +02:00
Tobias Hagemann fd7a6f42f1 added x64 suffix to msi installer name 2021-10-19 22:05:59 +02:00
Armin Schrenk 8bfbfc7700 Update installer workflow to add options introduced in JDK 17 2021-10-19 19:12:53 +02:00
Armin Schrenk ec72762548 fix windows installer 2021-10-19 18:45:25 +02:00
Sebastian Stenzel 6abe39679e Merge branch 'master' into develop
[ci skip]
2021-10-19 15:58:51 +02:00
Sebastian Stenzel 1daab1a4f1 Merge branch 'release/1.6.0'
# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
#	main/ui/src/main/resources/license/THIRD-PARTY.txt
2021-10-19 15:57:51 +02:00
Armin Schrenk 39d1a3d5a6 Merge branch 'develop' into release/1.6.0 2021-10-19 15:47:17 +02:00
Tobias HagemannandGitHub a6b50bde75 Merge pull request #1796 from PBillodeau/fix/linux-build
Relative paths in linux build are incorrect
2021-10-19 13:51:00 +02:00
Armin Schrenk 3f569fe33e Merge branch 'develop' into release/1.6.0 2021-10-19 13:31:27 +02:00
Armin Schrenk 4801ae3fe3 final dependency bump 2021-10-19 13:31:11 +02:00
Sebastian Stenzel 5f672880b9 Merge branch 'develop' into release/1.6.0 2021-10-19 09:34:24 +02:00
Sebastian Stenzel 6ccbc2b806 update cryptofs 2021-10-18 13:44:15 +02:00
Sebastian Stenzel 3492ddbee1 fixes #1833 2021-10-18 13:43:45 +02:00
Sebastian Stenzel 65b85fa4d8 Merge commit 'b211cb1856ef8d07583819b25586151471720cfd' into release/1.6.0 2021-10-14 14:00:11 +02:00
CryptobotandGitHub b211cb1856 New Crowdin updates (#1822)
[ci skip]
2021-10-14 13:58:57 +02:00
Sebastian Stenzel d7f48866da updated license infos 2021-10-13 13:01:53 +02:00
Snyk botandGitHub 0872d84662 bump fuse-nio-adapter to 1.3.3 (#1829)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGITHUBJNR-1570422
2021-10-13 12:32:17 +02:00
Sebastian Stenzel a86bd9f13a implemented new algorithm
[ci skip]
2021-10-13 12:12:56 +02:00
Armin Schrenk e436ce372d Merge branch 'develop' into release/1.6.0 2021-10-08 16:35:19 +02:00
Sebastian Stenzel c7c7cdfdce Merge branch 'develop' into feature/displayName 2021-10-08 16:16:18 +02:00
Sebastian Stenzel 1c62467fd2 run codacy for labeled pull requests _and_ push events 2021-10-08 15:39:44 +02:00
Sebastian Stenzel 7f833d2567 update CI config for pull requests
see https://securitylab.github.com/research/github-actions-preventing-pwn-requests/
2021-10-08 15:30:28 +02:00
Sebastian StenzelandGitHub 6c6f6baf12 Update to JDK 17 (#1828)
fixes #1404
2021-10-08 14:59:24 +02:00
Armin Schrenk 8319a09b12 fix alignment in vault detail error screen 2021-10-08 14:24:50 +02:00
Ralph Plawetzki d4e0b4d07d Change to 1.1.0-beta1 for now, so CI can load the dependency 2021-10-08 12:13:28 +02:00
Ralph Plawetzki 445cb7e242 Pass the name of the vault on changing a passphrase 2021-10-06 18:32:15 +02:00
Ralph Plawetzki 54a005a5c9 Pass the name of the vault on storing a passphrase 2021-10-06 18:32:14 +02:00
Armin Schrenk ac1ff5fb79 Rework vautl detail unknown error dialog:
* add buttons to reload, remove and show error dialog
* restyling
* add new strings
2021-10-06 14:27:28 +02:00
Sebastian Stenzel 1ac0820f93 updated release note formatting
[ci skip]
2021-10-05 14:23:41 +02:00
Armin Schrenk 2f868304e4 Merge branch 'develop' into release/1.6.0 2021-10-05 11:59:57 +02:00
Sebastian Stenzel 813c69f6ac fixed broken bidi binding 2021-10-05 10:09:33 +02:00
Sebastian Stenzel 0d240cdb2d simpler spacing 2021-10-05 10:09:09 +02:00
1ef3e948be Fixes #1547: "Custom path" retains invalid value/state (#1548)
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
2021-10-04 14:31:48 +02:00
Armin Schrenk 2200a100e0 Merge branch 'develop' into release/1.6.0 2021-10-04 13:08:27 +02:00
Armin Schrenk f5822fc568 fix bug in check run selection and add small space between buttons 2021-10-04 12:49:28 +02:00
Armin Schrenk 126201506c closes #1662 2021-10-04 12:02:55 +02:00
Sebastian Stenzel c7d8cf5465 Merge branch 'develop' into release/1.6.0 2021-09-30 12:54:38 +02:00
CryptobotandGitHub 6415c29e3e New translations strings.properties (Greek) (#1816)
[ci skip]
2021-09-30 12:52:45 +02:00
Sebastian Stenzel c1965086f3 update dagger to 2.39 2021-09-30 12:52:04 +02:00
Julian Raufelder c8b9deccb9 Remove incorrect quote in release note 2021-09-29 17:49:54 +02:00
Julian Raufelder 9586e4e65a Compute checksum for *.msi and *.tar.gz as well #1808 2021-09-29 17:48:13 +02:00
Julian Raufelder 0fb5867bd8 Merge branch 'develop' into release/1.6.0 2021-09-29 16:43:26 +02:00
Julian Raufelder 3cc1bef4a6 Bump cryptomator.integrations-linux which fixes #1815 2021-09-29 13:30:29 +02:00
Sebastian Stenzel 907d097e2c store multiline string in env var (fixes #1808) 2021-09-29 11:31:31 +02:00
Tobias Hagemann c9907d6085 added manual build script for mac (missing: notarization, create-dmg)
[ci skip]
2021-09-28 11:45:49 +02:00
Julian Raufelder 5eac665a93 Fixes #1814
Add missing backslash while setting the pluginDir
2021-09-27 18:50:26 +02:00
PBillodeauandGitHub aa7ee65d99 Update build version variable
Add path to pom.xml and move after preconditions
2021-09-27 09:54:43 -05:00
PBillodeauandGitHub 279db5ffd0 Merge branch 'cryptomator:develop' into fix/linux-build 2021-09-27 09:51:20 -05:00
772e3ae68a Apply suggestions from code review
Co-authored-by: Tobias Hagemann <tobias.hagemann@gmail.com>
2021-09-27 09:50:51 -05:00
Sebastian Stenzel 8795e5c8d2 Merge branch 'develop' into release/1.6.0
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2021-09-27 13:52:29 +02:00
CryptobotandGitHub 069c07cbf1 New Crowdin updates (#1807)
* New translations strings.properties
[ci skip]
2021-09-27 13:49:32 +02:00
Sebastian Stenzel cda7cc8ef9 dependency bump 2021-09-27 13:41:02 +02:00
Sebastian Stenzel 1015542629 adjust to latest API 2021-09-27 13:31:05 +02:00
Sebastian Stenzel 18be4ba257 update integrations-api 2021-09-27 13:03:55 +02:00
Sebastian StenzelandGitHub 90bceb0f68 Update to OpenJFX 17 (#1809)
* update to openjfx 17.0.0.1
* use new javafx API instead of AWT
2021-09-24 21:01:19 +02:00
Armin Schrenk 53afaf1b12 Replace Files.isWritable() by real write test 2021-09-24 16:31:07 +02:00
Sebastian Stenzel 6b0625609b case insensitive semver validation 2021-09-24 15:43:52 +02:00
Armin Schrenk 5670e77908 closes #1783 2021-09-24 11:47:57 +02:00
Sebastian Stenzel 79c48778ce Be more lenient when handling open vault events
either via drag and drop or registered file extensions
2021-09-24 10:57:05 +02:00
Sebastian Stenzel f9889c16de attempted fix for #1808 2021-09-23 15:08:24 +02:00
Sebastian Stenzel cbe26d8a4f Merge branch 'develop' into release/1.6.0, fixing appimage version number 2021-09-23 14:04:54 +02:00
Sebastian Stenzel b3c2d68d9b Partial revert of 0d5a3346: Build PPA independently of other installers 2021-09-23 14:04:26 +02:00
Sebastian Stenzel d07c018670 adjust appimage launcher script to comply with appdir built during CI
fixes #1806
2021-09-23 14:01:07 +02:00
Armin Schrenk 0d5a3346f6 execute ppa _after_ all successufl installer builds 2021-09-22 17:54:08 +02:00
Armin Schrenk cfaa4ceffc fix draft release job in release workflow 2021-09-22 17:51:27 +02:00
Tobias Hagemann db843bb1d5 codesigning dylib/jnilib inside jars needs to be forced as well (they may already be signed but could be problematic for notarization) 2021-09-22 17:33:46 +02:00
Armin Schrenk b4539979a4 fix module-info 2021-09-22 16:43:47 +02:00
Armin Schrenk d241f022ab Merge branch 'develop' into release/1.6.0
# Conflicts:
#	pom.xml
2021-09-22 16:36:36 +02:00
CryptobotandGitHub 2a5e09bc32 New Crowdin updates (#1758)
New translations strings.properties

Turkish; Latvian; Slovak; Polish; Norwegian Nynorsk; Hungarian; Norwegian Bokmal; Russian; Catalan; Spanish; Portuguese; French; Japanese; German; Portuguese, Brazilian; Arabic; Latin); Czech; Italian; Punjabi; Greek; Swedish; Indonesian; Serbian (Cyrillic); Chinese Traditional; Hindi; Korean; Dutch; Bosnian; Romanian; Chinese Simplified; 

[ci skip]
2021-09-22 16:27:28 +02:00
Armin Schrenk 85a7383c56 bump fuse dependency 2021-09-22 16:21:06 +02:00
Armin Schrenk 526b2a1e72 Bump cryptofs and adjust usages 2021-09-22 16:20:48 +02:00
Sebastian Stenzel e4da494202 updated 3rd party licenses
[ci skip]
2021-09-22 12:18:35 +02:00
Sebastian Stenzel 55c7636a7b simplified toggle boolean
[ci skip]
2021-09-22 12:17:47 +02:00
Armin SchrenkandGitHub af4603f022 Merge pull request #1761 from cryptomator/feature/#1733-window-position
Persist last known window position and improve resizing
2021-09-22 11:39:51 +02:00
Armin Schrenk 09cf76df68 minor code cleanup 2021-09-22 11:28:45 +02:00
Armin SchrenkandGitHub cfe61a51b6 Merge pull request #1767 from cryptomator/feature/early-loading
Eagerly load vault config
2021-09-22 11:20:14 +02:00
Tobias Hagemann 9c83baabd5 fixes #1740 2021-09-22 09:25:16 +02:00
3e216ed0ac Added error codes to error screen (#1741)
Added error codes based on a translation of GeneratedErrorCode.kt (Cryptomator Android) into Java:

Source of GeneratedErrorCode.kt: https://github.com/cryptomator/android/blob/3ae90ab521a4aa69f394c0490f27e9db6106ce0e/presentation/src/main/java/org/cryptomator/presentation/logging/GeneratedErrorCode.kt

Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
2021-09-21 17:41:54 +02:00
Armin Schrenk 0b488efbb3 remove another convinience method from vault class 2021-09-21 16:15:53 +02:00
Armin Schrenk ae2ad6e00f Replace ObjectProperty with atomicRef to prevent problems with background reloading 2021-09-21 12:32:36 +02:00
Armin Schrenk 76811f92e6 Improve error handling:
* Vault only returns the confiCache
* cache has safe and unsafe method to get config
2021-09-21 12:28:41 +02:00
Armin Schrenk 1fbd07b4a6 Refine impl:
* rename wrapper to cache
* reset the cache to null if error during config loading happens
* always set the the cache in the vault obj
2021-09-20 15:34:53 +02:00
PBillodeau 96d37096c1 Relative paths in linux build are incorrect 2021-09-18 14:07:42 -05:00
Martin Beyer 21774784a1 Reduce ResizeRegion to 6px, only save positions at MouseRelease 2021-09-17 18:51:09 +02:00
Martin Beyer 4a13b4145d Use javaFx-graphics for display information 2021-09-17 17:46:54 +02:00
Armin Schrenk efc77e4997 updating dependencies 2021-09-17 17:46:28 +02:00
Martin Beyer cf17a3f9ca Saving settings on Drag release 2021-09-17 17:44:26 +02:00
Martin Beyer 560513d7e8 Rearrange Imports 2021-09-17 15:54:45 +02:00
Sebastian StenzelandGitHub 9e66f4b93e Release to PPA (#1791)
Create a Debian source package and dput it to the cryptomator-beta staging repo
2021-09-16 13:01:34 +02:00
Sebastian Stenzel 407718d0a1 fixes #1789 2021-09-16 10:02:38 +02:00
Sebastian StenzelandGitHub b98691ee52 Provide version string when manually triggering a build (#1790)
* fixed inclusion of launcher script in buildkit

* renamed variable

* version must be manually provided during workflow_dispatch
2021-09-15 15:25:52 +02:00
Armin Schrenk e482574aaf Block windows installation if old innosetup version is installed 2021-09-15 12:16:25 +02:00
Sebastian Stenzel 9f068d0b2c add playground workflow 2021-09-13 16:45:05 +02:00
Tobias Hagemann 78e4c714a1 preparing 1.5.19 2021-09-09 14:14:36 +02:00
Tobias Hagemann 9d43f8bb81 updated dependency, fixes #1778 2021-09-09 14:13:42 +02:00
Tobias Hagemann 4e31f7e5c7 updated THIRD-PARTY 2021-09-07 12:49:10 +02:00
Tobias Hagemann d9a35a4f93 preparing 1.5.18 2021-09-07 12:39:24 +02:00
Tobias Hagemann 80b4aea7e0 updated dependencies 2021-09-07 12:38:39 +02:00
Armin Schrenk bbb30ebe0f keep name of icon file 2021-09-03 12:54:24 +02:00
Armin Schrenk a0fd6618a7 Change logic on how the config wrapper is injected 2021-09-03 12:25:26 +02:00
Armin Schrenk 09a2f76e15 remove startFail controller entirely 2021-09-03 12:02:45 +02:00
Armin Schrenk 775fbf4873 update cryptofs- and dokany-dependency 2021-09-03 11:44:10 +02:00
Armin Schrenk 5cdd2e006b more bug fixing in release workflow 2021-09-02 15:25:27 +02:00
Armin Schrenk f187decf0a fix installer-ci bugs 2021-09-02 15:14:48 +02:00
Armin Schrenk 869407cded Win installer: use different icon file for Cryptomator files and make c9r/c9s file extensions non executing 2021-09-02 13:30:12 +02:00
Armin Schrenk 1ad6dbba64 preparing 1.5.17 2021-09-02 13:01:19 +02:00
Armin Schrenk 3a2420dd91 Add sha256 sum of release artifacts to release text 2021-08-31 16:02:46 +02:00
Armin Schrenk bca920c75e Upload release dmg and msi aritfacts with full version string 2021-08-31 14:15:50 +02:00
Armin Schrenk a457355a25 allow drive letters A and B as mount targets 2021-08-31 10:04:42 +02:00
Martin Beyer 947344e5bc remove border color, reduce default cursor size, enforce minWidth of 650 2021-08-30 17:13:46 +02:00
Armin Schrenk cc6471840f Update build for mac installer:
* use correct mime type for vault metadata
* add icons file for cryptomator files
2021-08-30 15:58:23 +02:00
Martin Beyer cf633d74d2 add extra regions to reset to cursor to the default (+coloring the borders red for debugging and testing) 2021-08-30 15:16:52 +02:00
Armin Schrenk 2f32ab1376 fix bug, where password is not saved to keychain 2021-08-30 13:19:40 +02:00
Armin Schrenk 460e6528bf Eagerly load vault config:
* wrap (re-)loading in new class
* assume existence of config in certain vault states
* deprecate classes which are not used anymore
2021-08-26 21:12:07 +02:00
Martin Beyer 348b015bdc reformat to use fxml to trigger resizing 2021-08-26 17:56:20 +02:00
Martin Beyer 903e022d29 change from LOG.debug "init..." to LOG.trace 2021-08-26 17:22:11 +02:00
Martin Beyer e5f66281c2 centering window as before, renaming 2021-08-26 17:20:53 +02:00
Martin Beyer 21f45d43f7 remove dead code 2021-08-26 11:15:19 +02:00
Martin Beyer 72286de9fe minor string rewriting 2021-08-26 10:46:28 +02:00
Martin Beyer 981902409c calculate new position on display configuration change 2021-08-26 10:33:31 +02:00
Sebastian Stenzel aef1bf821a fixed pluginDir path
thanks @purejava for noticing
[ci skip]
2021-08-25 11:57:40 +02:00
Martin Beyer 6b4ea9a9eb fix fullscreen binding 2021-08-25 11:31:29 +02:00
Sebastian StenzelandGitHub e7b9f73516 Merge pull request #1759 from cryptomator/feature/plugin-loader 2021-08-24 19:28:59 +02:00
Martin Beyer 957640b1ba block moving and resizing in fullscreen 2021-08-24 19:21:53 +02:00
Martin Beyer 31ca102263 update position in settings when moving 2021-08-24 19:09:27 +02:00
Martin Beyer 7df028b0b8 add top, right, bottom and left resizer 2021-08-24 18:52:55 +02:00
Martin Beyer 03eebfe486 add double click on titleBar to min/maximize application 2021-08-24 18:03:55 +02:00
Martin Beyer 58d65c609f set the position on illegal position 2021-08-24 17:38:01 +02:00
Martin Beyer b529764eb4 remove max width and max heigth 2021-08-24 17:37:15 +02:00
Sebastian Stenzel ec9a4465eb add cryptomator.pluginDir environment variable 2021-08-24 16:35:07 +02:00
Sebastian Stenzel e5509bd63f load certain services from jars located in plugin dir 2021-08-24 16:33:05 +02:00
Martin Beyer 4223d15c08 set stored window size to initial window size 2021-08-24 16:23:46 +02:00
Martin Beyer 396b541cd2 safe position settings 2021-08-24 15:36:10 +02:00
Sebastian Stenzel 346ce67bc4 add "unauthorized device" scene 2021-08-24 14:43:26 +02:00
Sebastian Stenzel 1477bf07a9 use public key hash as device id 2021-08-24 13:59:51 +02:00
Sebastian Stenzel 056990151a adjusted vault config 2021-08-24 12:39:29 +02:00
Sebastian Stenzel fa86d890fe use application-global device key that requires a system keychain 2021-08-20 17:16:07 +02:00
CryptobotandGitHub a097a42a9b New Crowdin updates (#1681)
[ci skip]
2021-08-20 10:07:50 +02:00
Armin Schrenk e811f5313d fixes #1755
use system property instead of package version
2021-08-19 12:23:00 +02:00
Sebastian Stenzel 5922743f19 removed dead code
[ci skip]
2021-08-17 16:52:28 +02:00
Armin Schrenk b710fd33ce updating third party license file 2021-08-16 15:27:06 +02:00
Armin Schrenk dd70984d07 Bump dependencies 2021-08-16 14:43:47 +02:00
Armin Schrenk cf900429cd Merge branch 'develop' into release/1.6.0 2021-08-16 14:33:07 +02:00
Sebastian Stenzel afc853f5f5 append device registration params to hub url 2021-08-13 21:41:43 +02:00
Sebastian Stenzel be8243d9d1 cleanup 2021-08-13 21:41:10 +02:00
Sebastian Stenzel 1322b872b6 adjusted to new vault config format and unlock status codes 2021-08-13 19:59:31 +02:00
Armin Schrenk 1e2b80d02b remove leftovers from autolock tab 2021-08-13 15:32:57 +02:00
Sebastian Stenzel e46072c726 Merge branch 'develop' into feature/hub
[ci skip]
2021-08-13 12:13:49 +02:00
Sebastian Stenzel a6e28ca387 remove debug stuff
[ci skip]
2021-08-13 12:13:04 +02:00
Sebastian Stenzel 3e6acb2561 attempt to fix release 2021-08-13 11:53:33 +02:00
Sebastian Stenzel 32bd84d754 attempt to fix release 2021-08-13 11:23:59 +02:00
Sebastian Stenzel 2fcff5fb17 strip non-numerical suffix from version number 2021-08-13 10:52:07 +02:00
Sebastian Stenzel 7b8ddbd8d7 adjusted release action
[ci skip]
2021-08-13 10:35:01 +02:00
Sebastian Stenzel 33ed41307e Merge branch 'develop' into feature/hub 2021-08-12 17:39:25 +02:00
Sebastian Stenzel e865eaf412 added quick & dirty device registration 2021-08-12 17:38:50 +02:00
Sebastian Stenzel e866b64352 fix build 2021-08-12 17:05:59 +02:00
Sebastian Stenzel a3a96496b6 use new auth flow
talking directly to Authorization Server and Resource Server instead of web frontend
2021-08-12 16:18:22 +02:00
Armin Schrenk f7ff2c1e80 patch release workflow 2021-08-12 15:43:16 +02:00
Armin SchrenkandGitHub 8c7c09b613 Merge pull request #1744 from cryptomator/feature/installers
Build native installers via CI in main repository
2021-08-12 15:41:29 +02:00
Armin Schrenk 12720d67e8 Revert "windows installer: disallow downgrades, allow upgrades"
This reverts commit 4b9ae03bc2.
2021-08-12 15:07:53 +02:00
Armin Schrenk d319b45fce add file associations for msi installer 2021-08-12 14:43:10 +02:00
Sebastian Stenzel 75644a35ec cleanup
[ci skip]
2021-08-12 12:19:09 +02:00
Sebastian Stenzel ec09413575 renamed controller 2021-08-12 12:18:36 +02:00
Armin Schrenk 4b9ae03bc2 windows installer: disallow downgrades, allow upgrades 2021-08-12 11:04:16 +02:00
Sebastian Stenzel f9c2807ce1 added basic OAuth 2.0 Authorization Code Flow + PKCE impl 2021-08-12 10:54:58 +02:00
Armin Schrenk b255996619 acticate release workflow on any tag 2021-08-11 18:16:16 +02:00
Armin SchrenkandSebastian Stenzel 16e1c6f8c9 create gpg signature for each release artifact 2021-08-11 17:40:44 +02:00
Armin SchrenkandSebastian Stenzel 410215b318 Run release workflow on tag pushes 2021-08-11 17:40:44 +02:00
Armin SchrenkandSebastian Stenzel 637c21c6cc Bug fix and clean up 2021-08-11 17:40:18 +02:00
Sebastian Stenzel b4ee85f911 Merge branch 'feature/installers' into feature/installers-2
# Conflicts:
#	.github/workflows/release.yml
2021-08-11 17:21:29 +02:00
Sebastian Stenzel d2aca07fc8 renamed workflow
[ci skip]
2021-08-11 17:15:12 +02:00
Sebastian Stenzel 8075d33d39 fix key/iv extraction from sharedSecret 2021-08-11 16:13:14 +02:00
Armin Schrenk 42a49d9dce split test& compile and installer creation into two workflows:
* installers only created on manual trigger
* releases only drafted on tags
2021-08-11 13:06:29 +02:00
Armin SchrenkandGitHub 87f4a9ba5b Allow manual build from any valid ref 2021-08-10 17:08:21 +02:00
Armin Schrenk c0ee8ec3fc Allow manual worklfow triggering with invalid version 2021-08-10 16:35:10 +02:00
Sebastian Stenzel d7dcc46988 spec correction
[ci skip]
2021-08-10 13:23:29 +02:00
Sebastian Stenzel 01b2b47823 Switching to P-384 + X9.63 KDF SHA-256 + AES-GCM 2021-08-10 12:36:22 +02:00
Tobias Hagemann 90381ee53e setting keychain path via env didn't seem to work 2021-08-10 09:53:31 +02:00
Tobias Hagemann 7527a8f018 keychain has to be actually used 2021-08-10 09:36:10 +02:00
Tobias Hagemann ce348c0a63 using tmp keychain for notarization credentials instead of pw via stdin because it didn't work 2021-08-10 09:12:06 +02:00
Sebastian Stenzel d087a5fdde derive masterkey from received ECIES params 2021-08-09 23:03:36 +02:00
Sebastian Stenzel 43dbdb3e8f prepare local webserver for cross-origin requests 2021-08-09 18:11:44 +02:00
Tobias Hagemann 558a81a80e fixing notarization step, apparently that was not how you run multi-line commands 2021-08-09 17:21:11 +02:00
Tobias Hagemann 95d8951da0 provide macos notarization pw via stdin 2021-08-06 08:47:55 +02:00
Sebastian Stenzel 1bbc6697ac attempt to use v1 instead of v1.1.0
after creating a v1 branch for the action (see https://github.community/t/version-numbering-for-actions/16307/5)
2021-08-06 08:07:12 +02:00
Tobias Hagemann 8a387d040e added notarization step to mac-dmg 2021-08-05 14:52:48 +02:00
Armin Schrenk 2ea2a4ecec clean up 2021-08-04 11:41:56 +02:00
Armin Schrenk c19a92733c remove obligatory win desktop shortcut from installer 2021-08-04 11:41:18 +02:00
Sebastian Stenzel 2290d47f0e add descriptive name to signature 2021-08-04 11:27:31 +02:00
Sebastian Stenzel 9c7b86f270 try a simpler way to set an environment variable 2021-08-04 08:39:03 +02:00
Armin Schrenk 69dfc00a73 bloody gud damm typo 2021-08-03 18:20:52 +02:00
Armin Schrenk 5edbfa1967 more pwsh fixes 2021-08-03 18:00:25 +02:00
Armin Schrenk 0aef7c4a6a use call operator to start second command 2021-08-03 17:41:13 +02:00
Armin Schrenk e8a163b36d default shell is bash, not pwsh 2021-08-03 17:16:10 +02:00
Armin Schrenk 19d7aa09f3 use multiline command for msi job 2021-08-03 16:50:23 +02:00
Armin Schrenk 0e7e58d144 restore accidentally removed file in 8764c81 2021-08-03 15:51:15 +02:00
Armin Schrenk 8764c814d9 Adjust windows installer build:
* add branding
* only link third party drivers, don't ship'em
* add license
2021-08-03 14:03:36 +02:00
Sebastian Stenzel d938b1c3f7 keep window open while waiting for http callback 2021-07-30 16:55:05 +02:00
Sebastian Stenzel 59eda3159b Merge branch 'develop' into feature/hub 2021-07-30 14:04:07 +02:00
Sebastian Stenzel fa5248c781 fix weird fxml bug with spinner, remove redundant functionality from autoanimator 2021-07-30 14:03:45 +02:00
Sebastian Stenzel 7fabc6f52d spawn server listening on localhost, used for oauth redirect_uri 2021-07-29 16:57:28 +02:00
Sebastian Stenzel b21ea61342 add first draft for hub+http / hub+https keyloading scheme 2021-07-28 17:29:44 +02:00
Sebastian Stenzel 2952733a11 add PKCS12 support for on-demand creation and storage of an EC keypair 2021-07-28 17:04:12 +02:00
Sebastian Stenzel 8896723ff2 fix broken passwordsMatchAndSufficientProperty which didn't update more than once 2021-07-28 16:57:54 +02:00
Armin Schrenk 9b57c8fc71 Animate spinner in health check 2021-07-26 18:55:28 +02:00
Armin SchrenkandGitHub c81ef1c109 Feature/simple spinning (#1728)
* Define discrete rotation animation
* New class FontAwesome5Spinner extending FontAwesome5IconView, animated
* New class AutoAnimator to play Animation on a Node conditionally
* Replace all occurences of Progress Indicator with FontAwesome5Spinner
* Spin spinner icon in processing vault state
* remove undocumented progress indicator styling
2021-07-26 18:40:55 +02:00
Armin SchrenkandGitHub 2aa17edd8c Merge pull request #1712 from cryptomator/feature/improve-health-check
Refactor health check to improve UX
2021-07-26 18:33:40 +02:00
Armin Schrenk 2d5a65b953 removing dummy checks 2021-07-26 18:09:42 +02:00
Armin Schrenk 37ff638361 Apply more code review suggestion:
* use more specific localization key
* decouple internal localized error message from external localization
2021-07-26 16:57:24 +02:00
4672a23344 Apply suggestions from code review regarding localization. [ci skip]
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
2021-07-26 16:03:28 +02:00
Armin Schrenk d2a3ce2474 Catch UnlockCancelled exception during unlock of health check 2021-07-26 12:41:48 +02:00
Armin Schrenk 65b4fef7e8 Further adjusting checkstate icon view style 2021-07-26 10:04:50 +02:00
Sebastian Stenzel 2f1d91ae9d remove read-only flag from .exe before signing it 2021-07-24 00:22:52 +02:00
Sebastian StenzelandGitHub 56b80be22c Update build.yml 2021-07-23 16:01:05 +02:00
Sebastian Stenzel e7266070a0 use the most awesome codesign action 2021-07-23 15:11:10 +02:00
Sebastian Stenzel d2f4927634 first attempt to codesign windows app 2021-07-23 14:17:37 +02:00
Tobias Hagemann b4806daca6 maybe fixing create-dmg 2021-07-23 11:49:25 +02:00
Sebastian Stenzel 279f82415e install create-dmg via homebrew 2021-07-23 10:54:46 +02:00
Sebastian Stenzel 89688b7d18 first attempt to create a .dmg file 2021-07-23 10:35:45 +02:00
Sebastian Stenzel 9fd9f94823 add .bat file for easier debugging on console
(see https://bugs.openjdk.java.net/browse/JDK-8253461)
2021-07-23 09:27:16 +02:00
Sebastian Stenzel fd4bd66ac4 Merge branch 'develop' into feature/installers 2021-07-23 09:24:07 +02:00
Sebastian Stenzel bd87defe29 Resiliency fixes for missing integrations-api implementation 2021-07-23 09:23:08 +02:00
Sebastian Stenzel 33a6158ed7 fix profile name (so integrations-win is included) 2021-07-23 09:04:47 +02:00
Sebastian Stenzel d46b04c025 rename buildkit artifacts for easier sort-by-platform 2021-07-23 08:41:48 +02:00
Sebastian Stenzel da1e619bbb MSI metadata adjustments 2021-07-23 08:19:28 +02:00
Sebastian Stenzel fe489a9911 add contrib files, add metadata to MSI 2021-07-23 08:10:58 +02:00
Sebastian Stenzel 6cb0688c65 try to point jpackage to correct dir 2021-07-22 16:52:42 +02:00
Sebastian Stenzel b6feb35642 add name required for building MSI 2021-07-22 16:50:11 +02:00
Sebastian Stenzel fe7c9d5a92 build MSI using jpackage 2021-07-22 16:37:00 +02:00
Sebastian Stenzel 5573da169e shell-agnostic "find all jars" 2021-07-22 15:28:19 +02:00
Sebastian Stenzel 2c0bcc40a2 run codesign in zsh 2021-07-22 15:24:32 +02:00
Sebastian Stenzel 065f32fff0 cleanup 2021-07-22 15:14:33 +02:00
Sebastian Stenzel fbace5bd52 SIGN ALL!!! 2021-07-22 15:04:53 +02:00
Sebastian Stenzel 7dad145581 also sign binaries in mods/*.jar 2021-07-22 14:50:19 +02:00
Sebastian Stenzel e85a989e44 minor adjustments
[ci skip]
2021-07-22 14:36:02 +02:00
Sebastian Stenzel 3563ed3394 restructured dist/ dir 2021-07-22 14:09:06 +02:00
Sebastian Stenzel 62c81716c9 adjust paths 2021-07-22 13:56:43 +02:00
Sebastian Stenzel eddb9f1d85 attempt to build mac app 2021-07-22 13:48:34 +02:00
Sebastian Stenzel fc4c98601c wtf 2021-07-22 13:00:10 +02:00
Sebastian Stenzel 2a40282d73 apparently actions/download-artifact untars automatically? 2021-07-22 12:54:04 +02:00
Sebastian Stenzel fee6e2fb46 debug download-artifacts / untar steps 2021-07-22 12:46:19 +02:00
Sebastian Stenzel 8a644c575a fixing tar path 2021-07-22 12:27:41 +02:00
Sebastian Stenzel 9faf7e9b81 tar before upload to keep permissions 2021-07-22 12:09:57 +02:00
Sebastian Stenzel c7c910f738 fixing path, fixing variable 2021-07-22 08:42:07 +02:00
Armin Schrenk 2edbd2a7e2 Set correct styleclass for a skipped or cancelled check for right coloring 2021-07-21 18:04:41 +02:00
Sebastian Stenzel aa7a4dbda9 further adjustments to new directory structure 2021-07-21 12:57:45 +02:00
Sebastian Stenzel 81ab8b7803 adjust AppImage build instructions to new jpackage directory structure 2021-07-21 12:39:51 +02:00
Sebastian Stenzel 27a7c8323b dedup 2021-07-21 12:30:23 +02:00
Sebastian Stenzel b5fcfec4a4 further CSS fixes (TODO glyph-icon classes are misused frequently to simply set a fill...) 2021-07-21 12:26:10 +02:00
Sebastian Stenzel d3cf199741 cleanup 2021-07-21 11:58:57 +02:00
Sebastian Stenzel 9f7c69388c make the view depend on state, not on another view 2021-07-21 11:36:41 +02:00
Sebastian Stenzel 7a1b1292ae fix css instead of defining style from within code 2021-07-21 09:57:56 +02:00
Sebastian Stenzel c193e16256 "debug logging" 2021-07-20 18:55:32 +02:00
Sebastian Stenzel 880a342f4e I've given up. Just have to deal with the artifact always containing a directory. 2021-07-20 18:33:40 +02:00
Sebastian Stenzel 066f24a19f I repeat: Please do not include parent dir in artifact 2021-07-20 18:04:44 +02:00
Sebastian Stenzel 339be371cd upload contents of appdir without the "Cryptomator[.app]" itself 2021-07-20 17:54:03 +02:00
Sebastian Stenzel 45777b12cd add icon to linux appdir 2021-07-20 17:51:07 +02:00
Sebastian Stenzel a1bec81429 use three-segment app-version for mac (as per CFBundleVersion spec) 2021-07-20 17:31:38 +02:00
Sebastian Stenzel 559f3116f9 create app dir in matrix build 2021-07-20 17:08:08 +02:00
Sebastian Stenzel 1a6877b9ff fix metadata outputs 2021-07-20 15:36:35 +02:00
Sebastian Stenzel bae9541e8c renamed job
[ci skip]
2021-07-20 15:32:31 +02:00
Sebastian Stenzel d5588b9739 determine revision number via git rev-list --count HEAD 2021-07-20 15:31:23 +02:00
Sebastian Stenzel a46bfd5a65 use correct JDK 2021-07-20 14:17:43 +02:00
Sebastian Stenzel 17cae18216 fix escaping 2021-07-20 14:12:01 +02:00
Sebastian Stenzel 18305ca2d6 build windows app dir 2021-07-20 13:51:03 +02:00
Sebastian Stenzel 8d17042456 updated standalone build.sh
[ci skip]
2021-07-20 12:33:35 +02:00
Armin SchrenkandSebastian Stenzel 4a8dbfbc15 Code review suggestion
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2021-07-20 12:17:08 +02:00
Armin Schrenk 6ed7ed61b3 enrich DummyChecks with some mock results 2021-07-20 12:14:06 +02:00
Armin Schrenk ffe4201921 Add tooltip for fix icon. 2021-07-20 12:02:50 +02:00
Sebastian Stenzel be44dcd569 added standalone build.sh for manually building AppImages 2021-07-20 10:47:42 +02:00
Sebastian Stenzel 24188b3892 Merge branch 'develop' into feature/installers 2021-07-20 00:28:08 +02:00
Sebastian Stenzel d7c70ed841 install non-modular linux keychain libs to libs instead of mods 2021-07-20 00:27:49 +02:00
Sebastian Stenzel 01a3d16007 adjust launcher sh 2021-07-20 00:23:40 +02:00
Sebastian Stenzel 0a421ab9db download runtime to AppDir/runtime 2021-07-20 00:06:20 +02:00
Sebastian Stenzel 64fc11eb5f fixing AppImage build 2021-07-20 00:01:42 +02:00
Sebastian Stenzel 6a8f975955 build appimage 2021-07-19 23:57:26 +02:00
Sebastian Stenzel 0b6529c75d next attempt to create a runtime image 2021-07-19 23:39:12 +02:00
Sebastian Stenzel b8642677ba run jlink with default shell on each OS
(bash on mac causes problems with variable substitution)
2021-07-19 23:32:58 +02:00
Sebastian Stenzel 039044ed1a hard code required modules for now 2021-07-19 23:17:20 +02:00
Sebastian Stenzel c79c7459c6 create custom runtime image 2021-07-19 23:10:28 +02:00
Sebastian Stenzel 8394aa12b5 Merge branch 'develop' into feature/installers 2021-07-19 22:41:06 +02:00
Sebastian Stenzel 7efdc41edc removed unused requirement (related to #1589) 2021-07-19 22:40:37 +02:00
Sebastian Stenzel f1f55fc0dd include crytomator-*.jar in mods dir 2021-07-19 22:03:20 +02:00
Sebastian Stenzel b7012d7b83 removed duplicate key 2021-07-19 21:53:12 +02:00
Sebastian Stenzel f0cee47aea let actions/upload-artifact assemble the buildkit 2021-07-19 21:50:07 +02:00
Sebastian Stenzel edc06898fb added missing checkout step 2021-07-19 21:31:52 +02:00
Sebastian Stenzel 45d9cd601a create buildkit via CI 2021-07-19 21:20:27 +02:00
Armin Schrenk 3df688236d minor ui fixes 2021-07-19 18:03:28 +02:00
Armin Schrenk f907e2d033 delocalize check names 2021-07-19 16:45:10 +02:00
Armin Schrenk 38c4b3c4a3 Merge branch 'develop' into feature/improve-health-check
# Conflicts:
#	src/main/java/org/cryptomator/ui/health/HealthCheckTask.java
#	src/main/java/org/cryptomator/ui/health/ReportWriter.java
#	src/main/resources/fxml/health_check_list.fxml
#	src/main/resources/fxml/vault_options.fxml
2021-07-19 16:44:43 +02:00
Sebastian StenzelandGitHub 6da26b09b6 Merge pull request #1688 from cryptomator/feature/modular
Add module-info.java
2021-07-19 16:08:45 +02:00
Sebastian StenzelandGitHub 1ab4aa94b3 Merge branch 'develop' into feature/modular 2021-07-19 15:54:02 +02:00
Sebastian Stenzel 397061a6e7 dependency update 2021-07-19 15:52:40 +02:00
Tobias HagemannandGitHub 8d9dc3bd90 Update README.md
[ci skip]
2021-07-17 12:35:50 +02:00
Sebastian Stenzel 1ccce71abc Revert "no need for wysiwyg in this plain list"
This reverts commit 0db2aac7b5.
2021-07-16 12:43:01 +02:00
Sebastian Stenzel 0db2aac7b5 no need for wysiwyg in this plain list
[ci skip]
2021-07-16 10:14:41 +02:00
Sebastian Stenzel 79a2d00eb6 adjusted bug report templates
[ci skip]
2021-07-16 10:11:14 +02:00
Armin Schrenk 747ebaea7c localize health check 2021-07-15 16:50:20 +02:00
Armin Schrenk 97c52d788c fit result list to window size 2021-07-15 12:55:43 +02:00
Armin Schrenk 3f76a04b38 Refactor CheckListCell to display ellipsis rather than allow horizontal scrolling 2021-07-15 12:48:39 +02:00
Armin Schrenk 8d9c33f7df Relayout health start 2021-07-15 11:59:42 +02:00
Sebastian Stenzel 44cadce23d Merge branch 'develop' into feature/modular 2021-07-15 11:58:44 +02:00
Sebastian StenzelandGitHub 9eaf700b87 Merge pull request #1719 from cryptomator/feature/1589-unix-sockets
Changed IPC to Unix domain sockets, fixes #1589, fixes #1716
2021-07-15 11:42:46 +02:00
Sebastian Stenzel 8271428d64 cleanup 2021-07-15 08:36:37 +02:00
Sebastian Stenzel fe84783fac add shutdown hook to make sure ipc socket gets cleaned up even in event of fire 2021-07-14 17:54:08 +02:00
Armin Schrenk a71e344036 ui adjustments & code cleanup 2021-07-14 17:33:29 +02:00
Sebastian Stenzel 7d3678dc36 adjusted logging 2021-07-14 17:23:08 +02:00
Sebastian Stenzel de07c0aa9a Merge branch 'develop' into feature/1589-unix-sockets
# Conflicts:
#	src/main/java/org/cryptomator/launcher/Cryptomator.java
2021-07-14 17:22:16 +02:00
Sebastian Stenzel b47beabc2f startup time optimization 2021-07-14 17:17:25 +02:00
Sebastian Stenzel f8c6191588 only attempt client connection to non-regular-file nodes 2021-07-14 15:41:16 +02:00
Sebastian Stenzel 87d481ccc3 yet another attempt to skip client connection attempts for non-existing socket files 2021-07-14 15:07:13 +02:00
Sebastian Stenzel 03182ae4e0 fixed typos 2021-07-14 12:46:17 +02:00
Sebastian Stenzel c10a909ea4 attempt to fix socket on Windows 2021-07-14 12:45:09 +02:00
Sebastian Stenzel e9461b4fc7 fixed launcher scripts 2021-07-13 18:52:00 +02:00
Sebastian Stenzel d82a91f896 give thread a good name 2021-07-13 18:51:48 +02:00
Sebastian Stenzel c87264f653 Merge branch 'develop' into feature/1589-unix-sockets 2021-07-13 18:41:24 +02:00
Sebastian Stenzel 6eacc6a9d3 fix premature shutdown (e.g. on ⌘Q on macOS) 2021-07-13 18:41:03 +02:00
Sebastian Stenzel 80874ea199 fixed test 2021-07-13 18:21:49 +02:00
Sebastian Stenzel 755eb70ae8 Use UNIX Sockets for IPC 2021-07-13 18:18:38 +02:00
Armin Schrenk 21946ae6aa Fill health start fail screen with information 2021-07-13 16:55:21 +02:00
Armin Schrenk 102ab93dbd Add introductory screen to check view if main run is not started 2021-07-13 15:52:53 +02:00
Armin Schrenk e40ce62877 Remove count of warnings/criticals from GUI 2021-07-13 12:03:34 +02:00
Armin Schrenk 05f5856d66 adjust fix workflow:
* add icon for failed fix
* add style class for fix iconView
* replace progress indicator by spinner icon
2021-07-13 12:02:29 +02:00
Armin Schrenk 6292ad059c set correct style class for all used check state icons 2021-07-12 20:03:14 +02:00
Armin Schrenk c6a79de6f3 fixing small problems:
* unscoped controller
* gc'ed bindings
2021-07-12 14:57:04 +02:00
Armin Schrenk f4c8fd26d3 Same window size for all screens, fix check list size 2021-07-12 11:21:56 +02:00
Armin Schrenk c0d552da92 Add CheckState icon to check detail view 2021-07-12 10:34:36 +02:00
Armin Schrenk 720478c2f4 Further adjustment to workflow:
* bind modality to vault options window
* open unlock in a new window and close it afterwards
2021-07-09 14:47:07 +02:00
Armin Schrenk cb5d628cfc Refactor health check start:
* replace health tab in options by a button in gernal tab
* move info text of health tab into start controller
* replace lazy loading of config in controller by loading in dagger module
* add new scene+controller for failed config loading
* don't close options window on health check start
2021-07-09 13:51:54 +02:00
Armin Schrenk 8ecb78abec use fixed width for check state icon in list 2021-07-08 16:01:03 +02:00
Armin Schrenk a9db8eb0d5 Small UI adjustments 2021-07-08 16:00:36 +02:00
Armin Schrenk f61073d1c6 adding a result to list needs to be done on FX thread 2021-07-08 15:30:36 +02:00
Armin Schrenk 419eb93cb3 Apply code suggestions
* use Futures done() method
* single deque interaction during cancel()
* use enum compareTo method
2021-07-08 10:59:41 +02:00
Armin Schrenk b4a530b2eb Apply suggestions from review 2021-07-07 15:36:10 +02:00
Armin Schrenk 0395ef2b44 remove glyph icon styleclass from result icon view 2021-07-07 13:00:30 +02:00
Armin Schrenk 19c61ffea8 Further Refactoring:
* simplyify check executor by using Fx TaskAPI
*  reduce number of check states
2021-07-07 12:54:43 +02:00
Armin Schrenk fd12116ce7 cleanup & renaming 2021-07-06 16:40:38 +02:00
Armin Schrenk 6250f3d89c Refactor internal processing of HealthChecks:
* replace HealthCheckTask by Check class (not Wrapping TaskAPI)
* replace Task-API and BatchService by CheckExecutor (using CompletionStage-API)
* adjust other classes
2021-07-06 16:33:17 +02:00
Sebastian StenzelandGitHub cf7a2db7ec Merge branch 'develop' into feature/modular 2021-07-06 13:19:07 +02:00
97222d3d67 Updated README.md
Co-authored-by: Zane Campbell <development@zappcodestudios.com>
2021-07-06 08:52:16 +02:00
Sebastian Stenzel 172593517a show warning glyph in check list, if check contains non-good results 2021-06-30 17:29:59 +02:00
Sebastian Stenzel 16c64a20e3 reordered
[ci skip]
2021-06-30 17:28:14 +02:00
Sebastian Stenzel d6f8ab13aa prevent weird window resizing 2021-06-30 16:34:57 +02:00
Sebastian Stenzel d92a8e7980 class not meant to be part of DI graph
[ci skip]
2021-06-30 16:34:45 +02:00
Sebastian Stenzel 374493e8b4 implemented async sequential fix queue 2021-06-30 14:15:23 +02:00
Sebastian Stenzel f3953c2fb1 wrap DiagnosticResult in Result in order to track the state of applied fixes 2021-06-30 14:13:05 +02:00
Sebastian Stenzel 5c9c336a33 allow setting glyph to null 2021-06-30 14:08:06 +02:00
Sebastian Stenzel 6b113f26ba reduce Platform.runLater() invokations 2021-06-29 16:26:16 +02:00
Sebastian Stenzel dbef1466c1 read vault config async 2021-06-29 16:07:46 +02:00
Sebastian Stenzel 6b0d8a48c2 added temporary dummy health checks for testing purposes
[ci skip]
2021-06-29 14:05:01 +02:00
Sebastian Stenzel c7b9735f13 simplify task selection code 2021-06-29 14:04:32 +02:00
Armin SchrenkGitHubSnyk botTobias HagemannSebastian Stenzel <sebastian.stenzel@skymatic.de >
a96115ecd6 Feature: revamp health workflow init (#1695)
* Add health tab to vault options:
* health tool is started from there
* health tool closes old Window and creates new one
* added info and remarks about health tool
* adds confirmation checkbox before starting health tool
* close vault options window when starting health workflow
* Remove AutoLock tab, move options to general tab

Co-authored-by: Snyk bot <snyk-bot@snyk.io>
Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@skymatic.de >
2021-06-29 09:57:45 +02:00
Sebastian Stenzel c6aceb3e59 don't setPassphraseStored to true after changing pw, when it isn't actually stored 2021-06-28 18:52:34 +02:00
Sebastian Stenzel cadd071ebd update cryptofs 2021-06-28 18:42:10 +02:00
Sebastian Stenzel b64264ef8b updated 3rd party licenses
[ci skip]
2021-06-26 17:49:18 +02:00
Sebastian Stenzel 429ca6cfd0 Merge branch 'develop' into feature/modular
# Conflicts:
#	pom.xml
#	src/main/resources/license/THIRD-PARTY.txt
2021-06-26 17:48:13 +02:00
Sebastian Stenzel 46691f057e dependency update 2021-06-26 17:42:40 +02:00
Sebastian Stenzel f1b40e32a7 dependency update 2021-06-26 17:25:00 +02:00
b4a97803ff [Snyk] Security upgrade org.cryptomator:webdav-nio-adapter from 1.2.2 to 1.2.3 (#1698)
* fix: pom.xml to reduce vulnerabilities

The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1313686

* adjusted suppression config

* bump webdav version

Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
2021-06-24 09:58:47 +02:00
JaniruTECandGitHub 8ac253504f Merge pull request #1697 from cryptomator/refactoring/spellchecking
Enabled spellchecking, added dictionaries, fixed spelling mistakes
2021-06-23 22:49:57 +02:00
JaniruTEC 135b61070d Fixed misspelled key 2021-06-23 22:48:18 +02:00
Armin Schrenk 903f55a24f improve health check gui:
* convert milliseconds to hours, minutes and seconds
* spelling
* adjust to dark theme
2021-06-22 17:17:28 +02:00
Sebastian Stenzel 94e26da693 Re-enable FUSE
This reverts commit 0e924e7429.
2021-06-22 17:16:36 +02:00
Sebastian Stenzel 458a466c7f updated and excluded dependencies 2021-06-18 15:17:38 +02:00
Sebastian Stenzel 4f3cd2f47c replace JSR-305 Nullable annotation 2021-06-18 15:16:57 +02:00
Julian Raufelder f2fadafa66 Fix snyk.io badge in README due to switch to single maven module 2021-06-16 16:11:31 +02:00
Julian RaufelderandGitHub 0676732796 Merge pull request #1693 from cryptomator/feature/sign-src-tarball
Sign tarball in release using GPG
2021-06-16 12:54:37 +00:00
Julian Raufelder 08cbfd47ea Prefix signature of tarball in release with cryptomator
To apply convention of the other release assets
2021-06-16 14:20:52 +02:00
b15cda260e Apply suggestions from code review
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2021-06-16 12:13:49 +00:00
Julian Raufelder 74355b128a Sign tarball in release using GPG 2021-06-16 13:49:26 +02:00
JaniruTEC 000f27e166 Fixed spelling mistakes that required API breaking changes 2021-06-12 01:56:15 +02:00
JaniruTEC e1d83c996e Fixed independent spelling mistakes
Added @SuppressWarnings("SpellCheckingInspection") to binary data (e.g. keys) or deliberately misspelled strings
2021-06-12 01:45:31 +02:00
JaniruTEC 0dc401883f Enabled proofreading
Removed dict_* files from .gitignore
Added dict_de.xml
Added dict_project.xml
2021-06-12 01:35:36 +02:00
JaniruTEC 364d59fdf7 Added ".idea/**/shelf" to .gitignore
See: https://github.com/github/gitignore/blob/991e760c1c6d50fdda246e0178b9c58b06770b90/Global/JetBrains.gitignore#L9
2021-06-11 18:28:25 +02:00
Sebastian Stenzel be6b6e4541 adjusted launcher scripts to use the module path 2021-06-10 10:35:02 +02:00
Sebastian Stenzel 6f3c90465c adjust fxml loading to modular setup 2021-06-09 21:25:00 +02:00
Sebastian Stenzel 0e924e7429 disable fuse for now 2021-06-09 21:23:40 +02:00
Sebastian Stenzel 52940d6a19 add module-info
[ci skip] due to split package in jnr-fuse
2021-06-09 18:37:58 +02:00
Sebastian Stenzel 7f4a9c13dc update easybind 2021-06-09 18:33:08 +02:00
Sebastian Stenzel 210050d9d5 update cryptofs 2021-06-09 18:15:39 +02:00
Sebastian Stenzel f10d2b713b made tests public to avoid reflection and "open modules"
see also https://issues.apache.org/jira/browse/SUREFIRE-1909
2021-06-09 10:14:08 +02:00
JaniruTEC f9545b5532 Refactored MPC priority 2021-06-09 01:16:51 +02:00
Sebastian StenzelandGitHub 58376bddef Merge pull request #1685 from cryptomator/feature/provider-agnostic-keychains
Remove all references to specific keychain access providers
2021-06-08 14:42:56 +02:00
Sebastian Stenzel 72e2f64a68 show provided display name 2021-06-07 16:24:42 +02:00
Sebastian Stenzel 48ad74715e * store class name of selected keychain in settings.json
* prepared GeneralPreferencesController to use a provider-supplied display name
2021-06-07 15:17:58 +02:00
Ralph PlawetzkiandGitHub 2e1f33ca82 Fix instructions for building (#1682) 2021-06-06 21:56:28 +02:00
2d3f4d1c03 New Crowdin updates (#1678)
[ci skip]

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2021-06-05 09:11:48 +02:00
04c13ba242 New Crowdin updates (#1677)
[ci skip]

Co-authored-by: Cryptobot <cryptobot@users.noreply.github.com>
2021-06-04 21:00:56 +02:00
Cryptobot b70033e777 Update Crowdin configuration file 2021-06-04 20:48:48 +02:00
Sebastian Stenzel fafb7b229f update i18n config
[ci skip]
2021-06-04 20:29:15 +02:00
Sebastian Stenzel fef5be95ec Merge branch 'develop' into release/1.6.0
# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
2021-06-04 20:24:33 +02:00
Sebastian StenzelandGitHub 7fac6da448 Single maven module (#1676)
combined all sources into single maven module
2021-06-04 20:09:10 +02:00
Sebastian StenzelandGitHub 72bd9c1fdf New Crowdin updates (#1643)
[ci skip]
2021-06-04 15:44:48 +02:00
Sebastian StenzelandGitHub 39b8e25f4f Merge pull request #1596 from eas5/test_improvement
Improved grouped assertions
2021-06-04 15:42:16 +02:00
Sebastian Stenzel c8fa7f1edd fix NPE in autolocker, when reading "lastActivity" before any activity happened 2021-06-04 09:40:23 +02:00
Sebastian StenzelandGitHub 95b98b8a36 Merge pull request #1603 from cryptomator/feature/autoLock
fixes #274
2021-06-02 16:24:26 +02:00
Sebastian Stenzel 005d2a82fe use stopwatch item for autolock tab 2021-06-02 16:22:19 +02:00
Sebastian Stenzel 820f7989d0 remove debug log statement
[ci skip]
2021-06-02 16:10:42 +02:00
Sebastian Stenzel 751a6079c3 use explicit imports
[ci skip]
2021-06-02 16:09:23 +02:00
Sebastian Stenzel 9be95efd10 store autolock time in seconds instead of minutes 2021-06-02 16:08:46 +02:00
Sebastian Stenzel 8f8fa0248c converted lock after "time" to "idle time" 2021-06-02 15:53:57 +02:00
Sebastian Stenzel cd7acea54e Use of NumericTextField 2021-06-02 14:52:27 +02:00
Sebastian StenzelandGitHub 18152e4f3d Merge branch 'develop' into feature/autoLock 2021-06-02 14:31:28 +02:00
7b689c6b78 Keychain is locked (#1550)
Fixes #1526

Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
Co-authored-by: Sebastian Stenzel <sebastian.stenzel@gmail.com>
2021-06-02 14:24:51 +02:00
Armin Schrenk 9fce262acb Merge branch 'develop' into release/1.6.0 2021-06-01 18:21:04 +02:00
Armin SchrenkandGitHub 1159681824 Merge pull request #1615 from cryptomator/feature/sanitizer
Add Vault Health Check

Fixes #312 and fixes #1224.
2021-06-01 18:09:22 +02:00
Armin Schrenk c868ac32cc Change localized text and tweak ui 2021-06-01 18:01:54 +02:00
Sebastian Stenzel f85f953668 Bind countOfWarnSeverity and countOfCritSeverity to list 2021-06-01 15:01:23 +02:00
Armin Schrenk 5185df631d rather add functionality to formattedLabel class than to extend it 2021-06-01 13:22:56 +02:00
Armin Schrenk 617feec111 deactivate fix button 2021-06-01 13:14:31 +02:00
Armin Schrenk eb196165c5 move healthcheck button to vault options 2021-06-01 11:53:33 +02:00
Armin Schrenk 8c37ab3675 Closes #961 2021-06-01 10:45:48 +02:00
Armin Schrenk 7eaade1555 Depeding on state of selected task, show appropiate status text in check detail view 2021-06-01 10:29:41 +02:00
Armin Schrenk 186c129a30 Replace stub check detail description with info about check duration and count of warnings and critical errors 2021-05-31 15:28:30 +02:00
Armin Schrenk f74b9d3347 Remove Scope 2021-05-26 15:50:50 +02:00
Armin Schrenk 6038559172 Localization and small ui fixes 2021-05-26 15:50:03 +02:00
Armin Schrenk 98a899c7e2 scope checklist cell and properly update graphic property 2021-05-25 13:21:13 +02:00
Armin Schrenk 783c8718c1 add localization for health check names 2021-05-25 13:20:18 +02:00
Armin Schrenk b47382811f apply ugly workaround for new vault config loading 2021-05-25 12:37:29 +02:00
Armin Schrenk 62f279b9f7 Merge branch 'develop' into feature/sanitizer 2021-05-25 11:16:27 +02:00
Armin Schrenk ab961f1a8b update thrid party licences 2021-05-25 11:16:17 +02:00
Armin Schrenk 9562db7e13 Closes 1659 2021-05-25 11:10:03 +02:00
Armin SchrenkandGitHub 1ca2e029dc method loadVaultConfig() throws exception instead of returning optional (#1661) 2021-05-21 18:51:49 +02:00
Sebastian Stenzel 944e3e6c50 placeholder: use identifier to look up human-readable names from ResourceBundle instead of if/elsing on classes
(e.g. `resourceBundle.getString(identifier() + ".name")`)

TODO @infeo
2021-05-21 17:55:39 +02:00
Sebastian Stenzel e134d2f422 keep more ui code in fxml 2021-05-21 17:48:20 +02:00
Sebastian Stenzel 04e5170403 * Made DiagnosticResultAction a "pseudo-singleton" that consumes diagnostic results
* renamed FxmlFile.HEALTH_CHECK to match fxml file name
* added missing DI scopes
* simplified cell layout
2021-05-21 17:47:42 +02:00
Armin Schrenk ea008df9f7 Add error screen to vault check start screen 2021-05-21 16:25:37 +02:00
Armin Schrenk e25dfaad35 clean up 2021-05-21 15:59:43 +02:00
Armin Schrenk e98f92c63f Only use CheckTask title in UI instead of HealthCheck::identifier 2021-05-21 15:56:32 +02:00
Armin Schrenk 85b761a9d7 show error screen when unable to write report 2021-05-21 15:29:14 +02:00
Armin Schrenk be8dcd4dc4 remove obsolete TODOs 2021-05-21 13:41:19 +02:00
Armin Schrenk c01c405f20 add select all checkbox 2021-05-21 13:16:14 +02:00
Armin Schrenk b4f268f551 more ui & clean up 2021-05-21 13:15:51 +02:00
Armin Schrenk 21f9e72cc5 preselect correct check in check screen 2021-05-21 12:48:58 +02:00
Armin Schrenk 4845984a35 ui sugar
* show correct name for health check tasks
* some padding
* resize window when run button is hit
2021-05-21 12:45:00 +02:00
Armin Schrenk b6f5ddaf30 Only show button when severity is WARN 2021-05-21 12:40:44 +02:00
Armin Schrenk 1abf0e1bfa Replace result table by result list 2021-05-21 12:00:46 +02:00
Armin Schrenk a8364a8c1a show directory containing exported health report 2021-05-20 16:52:28 +02:00
Armin Schrenk 13c95868fa fix report writer. Ignore not run tests 2021-05-20 16:46:34 +02:00
Armin Schrenk 85ff7542f1 rework gui to be more wizard like:
* show first only checkbox list of checks and single run button
* then show list of check run status with results
2021-05-20 16:35:37 +02:00
Armin Schrenk 432be6dd80 more ui alignments 2021-05-19 13:18:54 +02:00
Armin Schrenk ca0402aaf0 clear styleclass of icon view when content of ResultSeverityCell changes. 2021-05-19 12:38:04 +02:00
Armin Schrenk c7ef0056f9 let UI take space if window size is increased 2021-05-19 09:47:38 +02:00
Armin Schrenk cf13311665 add style class to used icon in result view 2021-05-19 09:32:55 +02:00
Armin Schrenk a7133dbebe Add icon to severity column 2021-05-18 17:12:37 +02:00
Armin Schrenk 168f9b9fb9 fix report writer 2021-05-18 16:57:25 +02:00
Armin Schrenk 2b332c3831 Add column with action button 2021-05-18 16:53:48 +02:00
Armin Schrenk 66e3625a0b Wrap diagnostic result in object to prepare it for possible fix action 2021-05-18 16:49:39 +02:00
Armin Schrenk 20f88e203a simplification and cleanup 2021-05-18 13:40:56 +02:00
Armin Schrenk 66a8dc9811 Revert d2680b9857 2021-05-18 13:36:00 +02:00
Armin Schrenk 9d89efc98c Unify interface:
* move all buttons to one button bar
* switch between runAll and runSelected, depending on list selection
* add a little localization
2021-05-18 09:09:53 +02:00
Armin Schrenk dfbe017316 Partially revert 8e1be4c 2021-05-18 08:47:40 +02:00
Armin Schrenk d2680b9857 Rename controller and fxml file which represents the whole health check screen 2021-05-17 13:06:28 +02:00
Armin Schrenk 8e1be4c67b remove redundant property, fix logic error 2021-05-17 12:49:08 +02:00
Armin Schrenk 749e0ac02d disable export-button as long as no batch run is finished 2021-05-17 12:40:29 +02:00
Armin SchrenkandGitHub a2ad7d69ab Simplify password creation (#1646)
* Remove the password properties and directly access password fields from included fxml files
* wipe the password fields when closing a window
2021-05-17 10:18:10 +02:00
Sebastian Stenzel a47c05c87d hide/disable elements if not relevant in current state 2021-05-10 15:56:46 +02:00
Sebastian Stenzel 6b871e56c8 hide results until task is started 2021-05-10 15:38:52 +02:00
Sebastian Stenzel 40dbc0ba48 cleanup 2021-05-10 15:38:37 +02:00
Sebastian Stenzel 2e52afed51 write report synchronously, reducing complexity 2021-05-10 13:39:46 +02:00
Sebastian Stenzel 64d54133f8 split up check view:
- checkListController is responsible for selecting and (batch)running checks
- checkDetailController is responsible for displaying results
2021-05-07 15:51:47 +02:00
Sebastian Stenzel ac289cc3f7 Merge branch 'develop' into feature/sanitizer
# Conflicts:
#	main/pom.xml
2021-05-07 09:20:54 +02:00
Armin Schrenk 189699d359 sh*te happens
check value instead reference for null
2021-05-06 15:44:27 +02:00
Armin Schrenk 8e5035f506 preparing 1.6.0 2021-05-06 14:27:34 +02:00
Sebastian StenzelandGitHub 0ce41e7ac3 New Crowdin updates (#1628)
New translations strings.properties

Japanese; Polish; Spanish; Dutch; Czech; Norwegian Bokmal; Korean; Greek; Catalan; Slovak; Russian; Punjabi; Italian; Arabic; Bosnian; Hungarian; German; Cyrillic); Latin); Romanian; French; Chinese Simplified; Croatian; Chinese Traditional; Portuguese; Latvian; Hindi; Indonesian; Turkish; Portuguese, Brazilian; Swedish; Norwegian Nynorsk; 

[ci skip]
2021-05-06 14:25:59 +02:00
Armin SchrenkandGitHub c1a249fd7f Merge pull request #1454 from cryptomator/feature/vault-format-8
Vault Format 8
2021-05-06 14:05:26 +02:00
Armin Schrenk c266c7583b bump dependencies (same as in cryptofs) 2021-05-06 13:59:37 +02:00
Armin Schrenk 00331d4857 check for vaultpath existence instead of catching (undocumented) exception 2021-05-06 13:51:30 +02:00
Armin Schrenk 8fd484e2bb Revert "Move window placements of "popup dialogs" to their corresponding controller"
This reverts commit bc83e23a34.
2021-05-06 13:44:05 +02:00
Armin Schrenk 165d740acd if vault directory is not present, declare it as missing 2021-05-06 12:51:39 +02:00
Armin Schrenk fd4010c6c9 cleanup 2021-05-06 12:43:15 +02:00
Armin Schrenk aa2900fa9e ensure to use cryptolib rc 2021-05-06 12:27:07 +02:00
Sebastian Stenzel 76d1875e01 adjusted to new CryptoFileSystemProvider.checkDirStructureForVault API 2021-05-06 09:56:50 +02:00
Armin Schrenk bc83e23a34 Move window placements of "popup dialogs" to their corresponding controller 2021-05-05 15:03:09 +02:00
Armin Schrenk 6a326bcbce remove password of migration window, when window is closed 2021-05-04 10:51:12 +02:00
Armin Schrenk 573ad03d68 bug fixin' 2021-05-03 17:33:28 +02:00
Sebastian Stenzel 07efb3e94d Merge branch 'feature/vault-format-8' into feature/sanitizer
# Conflicts:
#	main/pom.xml
2021-05-03 12:34:28 +02:00
Armin Schrenk 89e680fb45 reveal report storage location when task is finished. 2021-04-30 11:42:31 +02:00
Armin Schrenk 54128a0016 Refined exportet health report 2021-04-30 11:32:56 +02:00
Armin Schrenk e2565097cd add function to export a report of health checks 2021-04-29 16:31:39 +02:00
Armin Schrenk f827b1fc89 Refactor HealthCheckTask execution:
* new class HealthCheckSupervisor which encapsulates execution of all selected health checks
* checkControllor only users supervisor
2021-04-29 16:31:05 +02:00
Armin Schrenk c0baab2329 change comments 2021-04-28 09:58:14 +02:00
Armin Schrenk 70baa4d09f Rework sanitizer workflow:
* select set of performed HealthChecks prior to loading masterkey
* two predefined healthcheck sets and custom one
* start sequential execution of checks after successful masterkey loading
* removed vault config info
* destroy masterkey on window close, on cancellation, on check finish
2021-04-27 17:41:28 +02:00
Armin Schrenk d710d406d0 Merge branch 'master' into develop 2021-04-23 10:30:12 +02:00
Armin Schrenk 554f245f5d Merge branch 'hotfix/1.5.16' 2021-04-23 10:27:48 +02:00
Sebastian Stenzel 34995088ba addressed some issues identified during code review 2021-04-23 10:24:31 +02:00
Sebastian Stenzel 69c63702f2 pass a single keyloader to cryptofs 2021-04-23 09:55:08 +02:00
Armin Schrenk db7e731554 bumping dokany-nio-adapter 2021-04-23 09:48:56 +02:00
Armin Schrenk e08b43bf17 preparing hotfix 1.5.16 2021-04-23 09:48:40 +02:00
Sebastian Stenzel 58b45bacd1 Merge branch 'develop' into feature/vault-format-8
[ci skip]
2021-04-21 13:27:54 +02:00
Sebastian Stenzel 4f942bc23f reset version
[ci skip]
2021-04-21 13:27:25 +02:00
Armin Schrenk 09a8618fa0 Merge tag '1.5.15' into develop
1.5.15
2021-04-21 12:26:46 +02:00
Armin Schrenk 52af530d1b Merge branch 'release/1.5.15' 2021-04-21 12:26:45 +02:00
Armin Schrenk 86a42234c6 preparing 1.5.15 2021-04-21 12:21:50 +02:00
Armin Schrenk 37c4e78b1d update third party licenses
[ci skip]
2021-04-21 12:05:37 +02:00
Sebastian StenzelandGitHub 9c2c234bee New Crowdin updates (#1604)
New translations strings.properties

Slovak; Czech; Italian; French; Catalan; Romanian; Polish; Chinese Simplified; Dutch; Chinese Traditional;
Norwegian Nynorsk; Croatian; Turkish; German; Spanish; Russian; Hungarian; Punjabi; Portuguese;
Norwegian Bokmal; Indonesian; Hindi; Bosnian; Cyrillic); Swedish; Greek; Korean; Portuguese, Brazilian; Latin); Arabic; Latvian; Japanese; 

[ci skip]
2021-04-21 12:01:09 +02:00
Sebastian Stenzel 59f91267ae fix save password 2021-04-21 11:20:44 +02:00
Sebastian Stenzel b3ff9423b4 Merge branch 'develop' into feature/vault-format-8
# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
#	main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java
#	main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockWorkflow.java
2021-04-21 11:20:31 +02:00
Armin Schrenk e3f3090341 bump javafx to version 16 2021-04-21 11:08:42 +02:00
Armin Schrenk 83be6c0864 enhanced release template for ci 2021-04-21 10:41:58 +02:00
Sebastian Stenzel c654951dc1 removed ambiguous filenameLengthLimit from settings, added maxCleartextFilenameLength, shortening is now a 100% independent setting stored in the vault rather than the device settings 2021-04-20 18:15:25 +02:00
Armin Schrenk 4e177c9ea7 Correcting misleading log message 2021-04-20 16:53:59 +02:00
Armin Schrenk dc3a951a1b add hotkeys to remove a vault 2021-04-20 15:07:14 +02:00
Armin Schrenk defa9c75eb add hotkeys for vault selection 2021-04-20 12:18:15 +02:00
Nour AghaandGitHub c1f498a114 Add MEGA & pCloud providers to vault location presets (#1622)
Fixes #1621
2021-04-20 08:09:17 +02:00
Armin Schrenk 8457c50ebc add muted style class to status text of newVaultLocationScreen 2021-04-19 16:11:28 +02:00
Armin SchrenkandGitHub 0144cbb99f Merge pull request #1618 from cryptomator/feature/#1508-observable-mounts
Closes #1508
2021-04-16 16:27:40 +02:00
Armin SchrenkandGitHub d6e4c7d177 Rework choose-location-screen in add vault wizard: (#1620)
* more checks for the chosen vault path
* every check has own error message
* perform checks when vault path changes
* if any radio button selected, enable vault path field (no-edit)
2021-04-16 16:18:01 +02:00
3376b16b7b Rename Donation Key to Supporter Certificate (#1613)
Renamed all occurences of donation key to supporter certificate and adjust ui.

Co-authored-by: Tobias Hagemann <tobias.hagemann@skymatic.de>
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2021-04-16 12:18:03 +02:00
Sebastian Stenzel 673fdcd095 stupid. 2021-04-15 13:45:20 +02:00
Armin Schrenk 0d00520ac1 Throw specifc exception on not completed lock of a vault 2021-04-15 12:54:19 +02:00
Armin Schrenk 22a0d3a9a5 bump fuse/dokany-nio versions 2021-04-15 11:11:05 +02:00
Sebastian Stenzel 24baa44e70 stronger encapsulation of vault state await/signal mechanism 2021-04-15 10:30:29 +02:00
Armin Schrenk 03886f88e8 Fix lock workflow for webdav:
* internally, wait for condition that onExit-Method is exceuted (with timeout)
* store and execute onExitAction also for webdav
2021-04-15 10:14:28 +02:00
Armin Schrenk 642816b631 rebuild tray menu when vaultname changes 2021-04-14 17:26:04 +02:00
Sebastian Stenzel f3a03c71ec implemented cancellable health checks 2021-04-14 10:20:34 +02:00
Sebastian Stenzel 1fab246fcd ugly PoC for new UI 2021-04-13 15:43:59 +02:00
Armin Schrenk cd5c55aad7 Refactor lock/unlock workflows:
* don't set vault state on successful lock workflow
* improved error handling
2021-04-13 11:22:42 +02:00
Armin Schrenk b066b4b045 opening a vault in read-only always assumes a filename length limit of 220
references #1605
2021-04-12 18:06:09 +02:00
JaniruTEC 41d2a2c77e Added .idea/uiDesigner.xml to .gitignore 2021-04-10 23:16:00 +02:00
Sebastian Stenzel 69186b916c adjusted to new async health check api 2021-04-09 16:04:52 +02:00
Armin Schrenk 0840695e0a Refactor lock/unlock convinience methods in FxApplication:
* execute vault state transition here
* on failed transition show error window
* only start worfklow on successful transition
2021-04-08 17:28:49 +02:00
Armin Schrenk 8447f105b0 rename instance variables 2021-04-08 13:08:05 +02:00
Sebastian Stenzel c306d8df04 alternative thread-safe vault state without requiring explicit synchronization 2021-04-08 11:23:57 +02:00
Armin Schrenk beba6490c3 Add locking mechanism to change the vault state t 2021-04-06 13:26:58 +02:00
Armin Schrenk fb1078b35b bump to SNAPSHOT nio-adapter and refactor Volume.mount() method:
* returns void
* add onExitAction parameter
* adjust classes
2021-04-06 10:05:32 +02:00
Armin Schrenk be0912e6ca Merge branch 'develop' into feature/#1508-observable-mounts 2021-04-06 09:00:05 +02:00
Sebastian Stenzel 13db1aa9b9 Actually run tests from within Sanitizer UI 2021-04-01 17:40:53 +02:00
Sebastian Stenzel d2cd2c923d unlock for health check 2021-04-01 13:26:33 +02:00
Martin Beyer 92de05b3db Changed textfield to only accept Integers, Using scheduled Executor as Timer 2021-04-01 11:42:41 +02:00
Sebastian Stenzel c1000d9958 Merge branch 'feature/vault-format-8' into feature/sanitizer 2021-04-01 09:26:21 +02:00
Sebastian Stenzel 2810c044ea reduced visibility 2021-03-31 16:23:54 +02:00
Sebastian Stenzel e09bd160b7 Made masterkey loading strategies reusable 2021-03-31 16:12:31 +02:00
Sebastian Stenzel e6d1e4697c Merge develop into feature/vault-format-8 2021-03-31 11:39:16 +02:00
Sebastian Stenzel 497e5ce73f Add health check window 2021-03-31 11:37:55 +02:00
Armin Schrenk cf7cbae567 Set dev branch back to SNAPSHOT version
[ci skip]
2021-03-31 11:32:06 +02:00
Armin Schrenk 803f517c62 Merge tag '1.5.14' into develop
1.5.14
2021-03-31 11:11:34 +02:00
Armin Schrenk 0afa7b8e37 Merge branch 'release/1.5.14' 2021-03-31 11:11:27 +02:00
Armin Schrenk 1a0f70f8e8 updating third-party-licenses 2021-03-31 10:59:21 +02:00
Armin Schrenk 8737eb83f0 Bumping webdav-nio-adapter dependency 2021-03-31 10:58:23 +02:00
Armin Schrenk a96239a19f closes #1245 2021-03-31 10:52:30 +02:00
Armin Schrenk 2b7cfcd1dc preparing 1.5.14 2021-03-31 09:52:24 +02:00
Sebastian StenzelandGitHub ebccb61750 New Crowdin updates (#1560) 2021-03-31 09:46:45 +02:00
Armin Schrenk 285f2aec23 unify wording
[ci skip]
2021-03-30 16:10:24 +02:00
Armin SchrenkandGitHub 217e31fbd7 Merge pull request #1595 from cryptomator/feature/MCGA
Feature: Make Context menu Great Again
* adding additional entries
* fixes #1478
* only appears on a selected vault
2021-03-30 16:03:41 +02:00
Sebastian Stenzel f0ebf7a638 EasyBind rulez 2021-03-30 14:20:05 +02:00
Armin Schrenk c05c5e3f90 closes #961 2021-03-30 13:57:21 +02:00
Sebastian Stenzel 30f0c5e697 split VaultList and ContextMenu into two separate controllers 2021-03-30 13:43:37 +02:00
Armin Schrenk f989b8627c Update java-jwt 2021-03-30 13:10:54 +02:00
Armin Schrenk ff84230566 structure constructor 2021-03-30 11:53:30 +02:00
Armin Schrenk 3b4f6276b5 Improve selection model of list view:
* Clear selection if an empty space is clicked
* only open context menu if an item is selected
2021-03-30 11:25:22 +02:00
Armin Schrenk 2be7a050a4 refine wording
[ci skip]
2021-03-30 09:47:11 +02:00
Martin Beyer 1c01228778 Removing LockOnSleep UI elements (not implemented yet) 2021-03-29 19:29:17 +02:00
Martin Beyer 1c35780d9e Cleaned up integrations implementation and added Regex for input 2021-03-29 19:10:05 +02:00
Armin Schrenk 96a612127c add reveal entry to context menu. 2021-03-29 16:23:24 +02:00
Armin Schrenk 0bdfb7c9f9 Distinct between "unlock" and "unlock now" in context menu:
* inject keychainManager
* bind/unbind passphraseStored property to selected vault
* rename bindings to show possible action
* removed unused binding
* initialize properties properly
2021-03-29 12:59:48 +02:00
Armin Schrenk f556301249 fix suggestion 2021-03-29 12:47:46 +02:00
f77b237e59 simplify private function
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2021-03-29 12:44:57 +02:00
Armin Schrenk 61b7a39aad change level of a log message from warn to debug
[ci skip]
2021-03-29 10:53:48 +02:00
Martin Beyer 2cee6e45f1 Merge remote-tracking branch 'upstream/develop' into feature/autoLock 2021-03-29 10:45:32 +02:00
Martin Beyer 1292548042 Implementing new settings and locking after a certain amount of minutes 2021-03-29 10:44:39 +02:00
Tobias HagemannandGitHub 16bd84ee62 Update README.md
[ci skip]
2021-03-26 10:46:49 +01:00
Tobias HagemannandGitHub 3d0a97fcdf Update README.md
[ci skip]
2021-03-25 17:06:15 +01:00
Elvys Soares 5ae2419e6d Improved grouped assertions
Signed-off-by: Elvys Soares <eas5@cin.ufpe.br>
2021-03-23 21:46:32 -03:00
Armin Schrenk 786d156b9f change wording in context menu entries 2021-03-23 15:08:23 +01:00
Armin Schrenk 629b6fb97d execute Service tasks on application thread 2021-03-23 12:53:17 +01:00
Armin Schrenk 17dc32bb79 lock vault on external unmount 2021-03-23 12:52:38 +01:00
Armin Schrenk c05e00d32a Change volume interface to observe mounts 2021-03-23 12:37:36 +01:00
Armin Schrenk 9dc8b2cb47 Use Bindings instead of properties 2021-03-23 10:50:04 +01:00
Armin Schrenk 0e32e96c7d made context menu great again:
* added entry to unlock / lock a vault
* added entry to show vault options
2021-03-22 17:10:45 +01:00
Armin Schrenk 97afadd7b9 fixes #1478 2021-03-22 12:58:45 +01:00
Armin Schrenk b199b65e38 closes #176 2021-03-22 12:51:07 +01:00
Tobias HagemannandGitHub 999abf3c13 Update README.md
[ci skip]
2021-03-22 12:24:54 +01:00
Sebastian Stenzel 2cdde54db6 updated mockito due to build errors caused by bytebuddy 2021-03-17 13:14:55 +01:00
Sebastian Stenzel 6941603cdd update to latest cryptolib/cryptofs beta 2021-03-17 13:03:55 +01:00
Sebastian Stenzel cdca4e047d Merge branch 'develop' into feature/vault-format-8 2021-03-17 12:55:47 +01:00
Sebastian StenzelandGitHub 31e938de6a Merge pull request #1587 from cryptomator/feature/jdk-16
Update to JDK 16
2021-03-17 12:29:29 +01:00
Sebastian Stenzel 4c10ab764a updated README 2021-03-17 09:33:43 +01:00
Sebastian Stenzel 4e075ab0ca using pattern-matching instanceof where applicable 2021-03-17 09:22:16 +01:00
Sebastian Stenzel f73ae9759f use new Stream.toList() where applicable 2021-03-17 09:16:44 +01:00
Sebastian Stenzel f6283b2f7e using text blocks where applicable 2021-03-17 09:12:54 +01:00
Sebastian Stenzel b23d2e4def allow use of reflection in codacy coverage reporter 2021-03-17 08:19:58 +01:00
Sebastian Stenzel 91a2943599 update to JDK 16 2021-03-17 08:16:26 +01:00
Sebastian Stenzel e32ce22d24 Merge branch 'develop' into feature/vault-format-8 2021-03-10 12:48:58 +01:00
Armin Schrenk e75c415b46 Load vault config on demand and don't cache it
* fixes issue with unlock after vault migration
2021-03-10 12:03:46 +01:00
Martin Beyer 8592e3667b Applying a SystemListener when the notify gets called with SLEEP 2021-03-09 18:55:35 +01:00
Martin Beyer 5a11d02fa8 Splitting the "Lock after X minutes" Checkbox in to two string resources. 2021-03-09 18:52:53 +01:00
Sebastian Stenzel 0ab28602d1 bumped cryptofs version 2021-03-05 17:33:58 +01:00
Sebastian Stenzel 62c8edff04 Choose key loading workflow depending on vaultconfig's key ID and allow KeyLoadingComponent to decide itself, what exceptions it can handle 2021-03-03 17:41:17 +01:00
Sebastian Stenzel d01c6268f8 remove unused field
[ci skip]
2021-03-02 16:16:24 +01:00
Sebastian Stenzel e083fd0bcc skip certain steps on forks 2021-03-02 11:55:20 +01:00
ff687f1bae fix: main/pom.xml to reduce vulnerabilities (#1569)
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-ORGECLIPSEJETTY-1080611

Co-authored-by: snyk-bot <snyk-bot@snyk.io>
2021-03-02 08:43:10 +01:00
Sebastian Stenzel 557aaa2480 Removed unused imports
[ci skip]
2021-03-01 15:59:13 +01:00
Sebastian Stenzel 78e43d401d split package org.cryptoamtor.ui.unlock to allow for different kinds of unlock workflows 2021-03-01 15:58:00 +01:00
Sebastian Stenzel 7b08c5d287 Merge branch 'develop' into feature/vault-format-8
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/resources/license/THIRD-PARTY.txt
[ci skip]
2021-02-26 10:10:50 +01:00
Sebastian Stenzel 84d2644f19 fix wrong versions that have been merged from main branch 2021-02-26 10:05:26 +01:00
Martin Beyer d13dfe3526 First take at UI implementation of a Auto-Lock Tab 2021-02-24 16:23:49 +01:00
Armin Schrenk f9a9d7b870 Merge tag '1.5.13' into develop
1.5.13
2021-02-24 16:21:07 +01:00
Armin Schrenk d75a8c4bba Merge branch 'release/1.5.13' 2021-02-24 16:21:06 +01:00
Martin Beyer 8fccb1b8f0 Added some Settings 2021-02-24 16:20:34 +01:00
Armin Schrenk d326c7c990 preparing 1.5.13 2021-02-24 16:17:35 +01:00
Armin SchrenkandGitHub e8e63ca4fc Merge pull request #1517 from cryptomator/feature/translations
New Crowdin updates
2021-02-24 16:12:30 +01:00
Martin Beyer c82e5577a1 New Tab AutoLock in VaultOptions 2021-02-24 15:17:23 +01:00
Armin SchrenkandGitHub 6878f2e94b Merge pull request #1556 from cryptomator/feature/win-auto-theme
Feature/win auto theme
2021-02-24 14:31:17 +01:00
Armin Schrenk a17b416262 only remove system theme change listener, if one was previously registered. 2021-02-24 12:54:56 +01:00
Armin Schrenk fed572694f Merge branch 'develop' into feature/win-auto-theme
# Conflicts:
#	main/pom.xml
2021-02-24 12:25:04 +01:00
Armin Schrenk fe3d67d937 update build workflow 2021-02-24 12:21:13 +01:00
Armin Schrenk 3dcdeb1033 refactor pom to store targeted jdk build version in variable 2021-02-24 12:19:12 +01:00
Armin Schrenk 0898158c5a remove bintray as source repository in pom 2021-02-24 12:18:38 +01:00
Armin Schrenk 81091d4bdf bump integrations-* repos and implement new interface methods 2021-02-24 12:18:24 +01:00
Martin Beyer c9b1b1baa5 Fixes #1291 (Windows Automatic Theme) 2021-02-23 17:26:50 +01:00
Tobias Hagemann c81f3bd972 updated dependencies 2021-02-23 13:43:07 +01:00
Sebastian Stenzel 9f86b74320 New translations strings.properties (Greek)
[ci skip]
2021-02-23 09:32:09 +01:00
Sebastian Stenzel 2d8390a0f3 New translations strings.properties (Chinese Simplified)
[ci skip]
2021-02-22 11:47:50 +01:00
Sebastian Stenzel 8d3671175f New translations strings.properties (Swedish)
[ci skip]
2021-02-21 16:16:10 +01:00
Sebastian Stenzel 366011a222 New translations strings.properties (Swedish)
[ci skip]
2021-02-21 15:45:39 +01:00
Sebastian Stenzel c0c2e21055 New translations strings.properties (Korean)
[ci skip]
2021-02-20 02:29:34 +01:00
Sebastian Stenzel 63be96a151 New translations strings.properties (Korean)
[ci skip]
2021-02-20 01:58:05 +01:00
Sebastian Stenzel fc1df4bd99 New translations strings.properties (Catalan)
[ci skip]
2021-02-19 21:46:49 +01:00
Sebastian Stenzel 7657330931 New translations strings.properties (German)
[ci skip]
2021-02-19 13:17:33 +01:00
Sebastian Stenzel 4e44de3c3b New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2021-02-19 01:07:24 +01:00
Sebastian Stenzel 8d902a72ca New translations strings.properties (Turkish)
[ci skip]
2021-02-18 19:39:40 +01:00
Sebastian Stenzel 7378031a72 New translations strings.properties (Spanish)
[ci skip]
2021-02-18 17:15:20 +01:00
Sebastian Stenzel f898c07c27 New translations strings.properties (German)
[ci skip]
2021-02-18 16:41:50 +01:00
Sebastian Stenzel c8f02d1045 New translations strings.properties (Czech)
[ci skip]
2021-02-18 14:56:07 +01:00
Sebastian Stenzel 4cc13b986b New translations strings.properties (Slovak)
[ci skip]
2021-02-18 14:22:12 +01:00
Sebastian Stenzel af7b6780f3 New translations strings.properties (Italian)
[ci skip]
2021-02-18 14:22:10 +01:00
Sebastian Stenzel 4a17d01004 New translations strings.properties (French)
[ci skip]
2021-02-18 13:42:57 +01:00
Sebastian Stenzel 1d68408e21 New translations strings.properties (Japanese)
[ci skip]
2021-02-18 13:42:49 +01:00
Sebastian Stenzel 821b1ee660 New translations strings.properties (Russian)
[ci skip]
2021-02-18 13:42:45 +01:00
Sebastian Stenzel c6616bd467 New translations strings.properties (Slovak)
[ci skip]
2021-02-18 13:42:44 +01:00
Sebastian Stenzel 4bb2589f16 New translations strings.properties (Polish)
[ci skip]
2021-02-18 13:42:37 +01:00
Sebastian Stenzel 896c3b3565 New translations strings.properties (Norwegian Bokmal)
[ci skip]
2021-02-18 13:09:32 +01:00
Sebastian Stenzel 6ee717a693 New translations strings.properties (French)
[ci skip]
2021-02-18 13:09:31 +01:00
Sebastian Stenzel 07ec858e1e New translations strings.properties (Spanish)
[ci skip]
2021-02-18 13:09:29 +01:00
Sebastian Stenzel a7c1e43ebc New translations strings.properties (Arabic)
[ci skip]
2021-02-18 13:09:28 +01:00
Sebastian Stenzel ac1cd3b073 New translations strings.properties (Catalan)
[ci skip]
2021-02-18 13:09:27 +01:00
Sebastian Stenzel 7474519faf New translations strings.properties (Czech)
[ci skip]
2021-02-18 13:09:26 +01:00
Sebastian Stenzel 340e474c33 New translations strings.properties (German)
[ci skip]
2021-02-18 13:09:24 +01:00
Sebastian Stenzel c90ab75427 New translations strings.properties (Greek)
[ci skip]
2021-02-18 13:09:23 +01:00
Sebastian Stenzel 848b3f77d3 New translations strings.properties (Hungarian)
[ci skip]
2021-02-18 13:09:21 +01:00
Sebastian Stenzel fb8cdb31ca New translations strings.properties (Italian)
[ci skip]
2021-02-18 13:09:20 +01:00
Sebastian Stenzel ba5f8053fb New translations strings.properties (Japanese)
[ci skip]
2021-02-18 13:09:19 +01:00
Sebastian Stenzel 38165becca New translations strings.properties (Korean)
[ci skip]
2021-02-18 13:09:17 +01:00
Sebastian Stenzel f731ac5c90 New translations strings.properties (Dutch)
[ci skip]
2021-02-18 13:09:16 +01:00
Sebastian Stenzel 0291702736 New translations strings.properties (Polish)
[ci skip]
2021-02-18 13:09:15 +01:00
Sebastian Stenzel ab63929861 New translations strings.properties (Portuguese)
[ci skip]
2021-02-18 13:09:12 +01:00
Sebastian Stenzel ca36fb8af3 New translations strings.properties (Slovak)
[ci skip]
2021-02-18 13:09:11 +01:00
Sebastian Stenzel 8cb29ff83b New translations strings.properties (Swedish)
[ci skip]
2021-02-18 13:09:10 +01:00
Sebastian Stenzel 304fa67dd7 New translations strings.properties (Turkish)
[ci skip]
2021-02-18 13:09:09 +01:00
Sebastian Stenzel a80ec32d2c New translations strings.properties (Chinese Simplified)
[ci skip]
2021-02-18 13:09:07 +01:00
Sebastian Stenzel dc4f21162e New translations strings.properties (Chinese Traditional)
[ci skip]
2021-02-18 13:09:06 +01:00
Sebastian Stenzel 3b8d7e0241 New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2021-02-18 13:09:05 +01:00
Sebastian Stenzel 6891c68cf1 New translations strings.properties (Norwegian Nynorsk)
[ci skip]
2021-02-18 13:09:01 +01:00
Sebastian Stenzel 18b26fbc58 New translations strings.properties (Latvian)
[ci skip]
2021-02-18 13:09:00 +01:00
Sebastian Stenzel 1db8da6b6b New translations strings.properties (Bosnian)
[ci skip]
2021-02-18 13:08:57 +01:00
Sebastian Stenzel 14bce7e91d New translations strings.properties (Russian)
[ci skip]
2021-02-18 13:08:56 +01:00
Sebastian Stenzel 2674bc6f23 New translations strings.properties (Punjabi)
[ci skip]
2021-02-18 13:08:55 +01:00
Tobias HagemannandGitHub 74e1d6f991 Merge pull request #1545 from cryptomator/feature/save-password-clarification
"Save Password" Clarification
2021-02-18 13:07:04 +01:00
Tobias Hagemann 25dba028f8 added deep-linking to vault options tabs, changed "password saved" label to hyperlink 2021-02-18 11:32:14 +01:00
Tobias Hagemann bf51cc13d1 renamed "save password" to "remember password", switched placements of "vault options" hyperlink/button and "password saved" label 2021-02-18 09:15:19 +01:00
Sebastian Stenzel 24be36cccb New translations strings.properties (Spanish)
[ci skip]
2021-02-15 18:19:27 +01:00
Sebastian Stenzel 797e15c775 New translations strings.properties (Chinese Traditional)
[ci skip]
2021-02-15 17:08:04 +01:00
Sebastian Stenzel 2395dbcae9 New translations strings.properties (Italian)
[ci skip]
2021-02-15 16:09:11 +01:00
Sebastian Stenzel efacbbe2b6 New translations strings.properties (Bosnian)
[ci skip]
2021-02-15 15:40:45 +01:00
Sebastian Stenzel 2518086e46 New translations strings.properties (Polish)
[ci skip]
2021-02-15 15:40:44 +01:00
Sebastian Stenzel c733247611 New translations strings.properties (Japanese)
[ci skip]
2021-02-15 15:40:42 +01:00
Sebastian Stenzel 4f44e71e13 New translations strings.properties (Czech)
[ci skip]
2021-02-15 15:40:40 +01:00
Sebastian Stenzel 02aa46ece8 New translations strings.properties (Bosnian)
[ci skip]
2021-02-15 15:09:58 +01:00
Sebastian Stenzel 635f64c847 New translations strings.properties (German)
[ci skip]
2021-02-15 15:09:56 +01:00
Sebastian Stenzel 0a8516ae9a New translations strings.properties (French)
[ci skip]
2021-02-15 15:09:55 +01:00
Sebastian Stenzel c1edb30472 New translations strings.properties (Bosnian)
[ci skip]
2021-02-15 14:41:51 +01:00
Sebastian Stenzel 93c78b63ca New translations strings.properties (Russian)
[ci skip]
2021-02-15 14:41:50 +01:00
Sebastian Stenzel 3ccae93757 New translations strings.properties (Norwegian Bokmal)
[ci skip]
2021-02-15 14:09:30 +01:00
Sebastian Stenzel 450dec2baf New translations strings.properties (French)
[ci skip]
2021-02-15 14:09:29 +01:00
Sebastian Stenzel 36121527ca New translations strings.properties (Spanish)
[ci skip]
2021-02-15 14:09:27 +01:00
Sebastian Stenzel f30451f7e1 New translations strings.properties (Catalan)
[ci skip]
2021-02-15 14:09:25 +01:00
Sebastian Stenzel 74d7f63f64 New translations strings.properties (Czech)
[ci skip]
2021-02-15 14:09:24 +01:00
Sebastian Stenzel 350a4ab762 New translations strings.properties (German)
[ci skip]
2021-02-15 14:09:23 +01:00
Sebastian Stenzel 0e0e75b89c New translations strings.properties (Greek)
[ci skip]
2021-02-15 14:09:22 +01:00
Sebastian Stenzel e76440d928 New translations strings.properties (Hungarian)
[ci skip]
2021-02-15 14:09:20 +01:00
Sebastian Stenzel 0cbace67a5 New translations strings.properties (Italian)
[ci skip]
2021-02-15 14:09:19 +01:00
Sebastian Stenzel 84a3082589 New translations strings.properties (Japanese)
[ci skip]
2021-02-15 14:09:17 +01:00
Sebastian Stenzel cdfcca06d1 New translations strings.properties (Korean)
[ci skip]
2021-02-15 14:09:16 +01:00
Sebastian Stenzel 630bfa4cee New translations strings.properties (Dutch)
[ci skip]
2021-02-15 14:09:15 +01:00
Sebastian Stenzel 90cb7beb1f New translations strings.properties (Polish)
[ci skip]
2021-02-15 14:09:14 +01:00
Sebastian Stenzel d37fa33278 New translations strings.properties (Slovak)
[ci skip]
2021-02-15 14:09:11 +01:00
Sebastian Stenzel eed9c906cc New translations strings.properties (Swedish)
[ci skip]
2021-02-15 14:09:09 +01:00
Sebastian Stenzel 2b7ed5f4dd New translations strings.properties (Turkish)
[ci skip]
2021-02-15 14:09:08 +01:00
Sebastian Stenzel 6a7a309a2b New translations strings.properties (Chinese Simplified)
[ci skip]
2021-02-15 14:09:07 +01:00
Sebastian Stenzel 0382069995 New translations strings.properties (Chinese Traditional)
[ci skip]
2021-02-15 14:09:05 +01:00
Sebastian Stenzel 7c5f40d7d1 New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2021-02-15 14:09:04 +01:00
Sebastian Stenzel 09e9530660 New translations strings.properties (Russian)
[ci skip]
2021-02-15 14:08:57 +01:00
Sebastian Stenzel 947d25b335 New translations strings.properties (Punjabi)
[ci skip]
2021-02-15 14:08:56 +01:00
Sebastian Stenzel 80cbc6699a fixed label
[ci skip]
2021-02-15 13:53:05 +01:00
Sebastian Stenzel da0933fa92 New translations strings.properties (Punjabi)
[ci skip]
2021-02-08 04:36:28 +01:00
Sebastian Stenzel 9ad217ca55 Merge branch 'develop' into feature/vault-format-8
[ci skip]
2021-02-04 12:38:01 +01:00
Sebastian Stenzel adc9f32fb3 Merge branch 'master' into develop 2021-02-04 12:31:18 +01:00
Sebastian Stenzel 65369bdbff Merge branch 'release/1.5.12' 2021-02-04 12:27:42 +01:00
Sebastian Stenzel d18e618ef1 preparing 1.5.12 2021-02-04 12:27:02 +01:00
Armin Schrenk 970216dd59 Merge tag '1.5.12' into develop
1.5.12
2021-02-04 10:49:52 +01:00
Armin Schrenk 6840a649c7 Merge branch 'release/1.5.12' 2021-02-04 10:49:08 +01:00
Sebastian Stenzel 1a0bc92bde Merge branch 'develop' into feature/vault-format-8 2021-02-01 12:08:23 +01:00
Sebastian Stenzel e4709ed6fe Refactored FxmlFile and FxmlLoaderFactory 2021-02-01 12:06:38 +01:00
Sebastian Stenzel 21038212c1 remove unused property
[ci skip]
2021-02-01 11:54:21 +01:00
Sebastian Stenzel b15471b4ff add new (optional) "choose masterkey file" step to unlock dialog 2021-01-29 17:44:45 +01:00
Armin Schrenk 19ebc7e562 preparing 1.5.12 2021-01-27 15:30:56 +01:00
Armin SchrenkandGitHub 0fa052d2d1 Merge pull request #1518 from cryptomator/fix/1515-suppressed-messages
Fixed suppressed "invalid mountpoint" messages
2021-01-27 15:22:47 +01:00
Armin Schrenk 402861b9c0 Update third party licenses 2021-01-27 12:37:50 +01:00
Armin Schrenk aca1666dea closes #1479 2021-01-27 12:36:22 +01:00
Sebastian Stenzel ff17b60f56 Refactored UnlockWorkflow using new vault format 8 APIs 2021-01-27 12:09:09 +01:00
Sebastian Stenzel 3284578445 Merge branch 'develop' into feature/vault-format-8
# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java
2021-01-25 21:42:13 +01:00
Sebastian Stenzel 70f6a4877c Make sure not to catch Errors 2021-01-25 21:38:46 +01:00
Sebastian Stenzel 85c5dc8dfb removed tmp workaround 2021-01-25 21:32:33 +01:00
Sebastian Stenzel 4b670a59a3 adjusted to new cryptolib/cryptofs API 2021-01-25 21:31:16 +01:00
JaniruTEC 23c113948f Replaced catch with wildcard catch and added additional logger call
See #1509 for further information and reasoning
2021-01-25 16:21:35 +01:00
JaniruTEC d86ea20c31 Fixed suppressed "invalid mountpoint" messages
Fixed #1515
2021-01-23 22:13:07 +01:00
Sebastian Stenzel 3f928cf958 Merge branch 'develop' into feature/vault-format-8
[ci skip]
2021-01-22 22:47:54 +01:00
Sebastian Stenzel 01929c2288 New translations strings.properties (Hungarian)
[ci skip]
2021-01-22 13:48:57 +01:00
Sebastian Stenzel 2634433b2c New translations strings.properties (Hungarian)
[ci skip]
2021-01-22 13:19:41 +01:00
Armin SchrenkandGitHub c1f44f76b9 Merge pull request #1512 from cryptomator/feature/refactor-reveal 2021-01-22 11:42:20 +01:00
Sebastian Stenzel b2f27c0a3d removed dead code
[ci skip]
2021-01-22 09:34:18 +01:00
Sebastian Stenzel b1d7cfc81b change scope of HostServiceRevealer to @FxApplicationScoped
because unlock always happens after application start anyway
2021-01-22 09:31:43 +01:00
Armin Schrenk 7cd5c66836 Refactor reveal() methods:
* new class HostServiceRevealer implemeting the Volume.Revealer-Interface
* this class is injected in vault service and always used for revealing
* removed Revealer parameter from several reveal methods
2021-01-21 17:25:23 +01:00
Armin Schrenk 95cef34234 remove unnecessary awtReavealer and trayModule 2021-01-21 16:09:16 +01:00
Armin Schrenk 8977440697 Rename RevealerFacade to Revealer 2021-01-21 15:29:04 +01:00
Armin Schrenk d5eb84a000 change reveal method in vault service:
* revealer is no member anymore
* reveal() takes as second argument revealer object
* several other classes hand over a revealer object
* added awt-revealer if application is not yet started
2021-01-21 15:26:35 +01:00
Sebastian Stenzel 81fb6b8794 get rid of RevealException 2021-01-21 15:06:37 +01:00
Armin Schrenk 92b390d5bb update third-party licenses 2021-01-21 12:44:32 +01:00
Armin Schrenk 8867532210 add javadoc 2021-01-21 12:44:11 +01:00
Armin Schrenk 77db435b4f Refactor reveal call stack to apply facade pattern. 2021-01-21 12:41:52 +01:00
Sebastian Stenzel cb2bc17283 New translations strings.properties (Hungarian)
[ci skip]
2021-01-21 11:06:22 +01:00
Tobias HagemannandGitHub aaa93239d0 Merge pull request #1516 from stacksnack/feature/translations
New translations strings.properties (Hungarian)
2021-01-21 11:03:27 +01:00
Sebastian Stenzel 93445e22d4 update library versions 2021-01-21 06:37:41 +01:00
stacksnackandGitHub 64897cfa21 New translations strings.properties (Hungarian)
Add hungarian translation
2021-01-20 21:37:41 +01:00
Armin Schrenk 7349a29831 Ensure that on windows systems always the gui chooses the mountpoint for webdav 2021-01-19 15:52:52 +01:00
Armin Schrenk 73554b4759 split WebDAV Volume mount method into servlet start and servlet mount 2021-01-19 15:52:20 +01:00
Armin Schrenk 0312f045aa add a logger to WebDAV-Volume 2021-01-19 15:28:50 +01:00
Armin Schrenk 1134c1b2ff closes #1471
hand the javafx hostservice showDocument() method from ui package to the underlying nio-adapter-libraries through
2021-01-19 15:27:46 +01:00
Sebastian Stenzel efebbc059a keep CTR+HMAC for now (until GCM is supported on all platforms) 2021-01-19 15:09:47 +01:00
Sebastian Stenzel 6e860d293a Merge branch 'develop' into feature/vault-format-8
[ci skip]
2021-01-19 15:05:15 +01:00
Armin Schrenk 8bb925fd93 fixes #1509 2021-01-18 18:41:21 +01:00
Sebastian Stenzel ca5d9eba36 New translations strings.properties (Norwegian Bokmal)
[ci skip]
2021-01-16 04:07:35 +01:00
Sebastian Stenzel 1a49e24d8a New translations strings.properties (Norwegian Bokmal)
[ci skip]
2021-01-16 03:37:26 +01:00
Sebastian Stenzel 24b0ed2502 New translations strings.properties (German)
[ci skip]
2021-01-14 18:18:01 +01:00
Sebastian Stenzel a226d5403a New translations strings.properties (Japanese)
[ci skip]
2021-01-14 14:02:17 +01:00
Sebastian Stenzel 0f3085cc73 fixes #1476 2021-01-14 09:56:57 +01:00
Sebastian Stenzel f0a040cf29 cleanup
[ci skip]
2021-01-14 09:56:36 +01:00
Sebastian StenzelandGitHub 0676748dde New Crowdin updates (#1466)
[ci skip]
2021-01-14 09:24:42 +01:00
Armin Schrenk 589b8384eb Only determine filenamelength limit if the the vault is mounted not read-only. 2021-01-11 14:15:37 +01:00
Julian RaufelderandGitHub 9e3947f337 Happy 2021 🎉 2021-01-11 10:08:35 +01:00
Tobias Hagemann 790cc4e772 simplified issue template
[ci skip]
2021-01-06 12:01:07 +01:00
Tobias Hagemann 72f4988632 fixes #1452 2021-01-05 14:14:14 +01:00
Sebastian StenzelandGitHub b3fa6bbf32 Merge pull request #1472 from cryptomator/feature/minimize
Add Minimize Button
2020-12-18 15:58:02 +01:00
Sebastian Stenzel c2dc487c79 make field volatile that might be modified concurrently 2020-12-18 13:37:23 +01:00
Sebastian Stenzel e74dd3be9e remove unused param 2020-12-18 13:36:16 +01:00
Sebastian Stenzel 1eeee61572 Add option to show minimize button despite tray icon being present
fixes #1179
2020-12-17 14:50:33 +01:00
Sebastian Stenzel 984b7a2d0e Removed @Named("trayMenuSupported") from FxApplication component 2020-12-17 14:46:52 +01:00
Sebastian Stenzel 45c714a123 Added checkbox in settings to start without a tray icon
references #1113, #1078, #1079, #1344
2020-12-16 16:53:49 +01:00
Sebastian Stenzel 96bb97d50a Added new setting showTrayIcon defaulting to new environment property cryptomator.showTrayIcon 2020-12-16 13:48:33 +01:00
Sebastian Stenzel 046acb9bbf mark fuse.experimental deprecated
[ci skip]
2020-12-16 13:33:50 +01:00
Armin SchrenkandGitHub ce4ec16c62 Update bug.md
Add info to also specify desktop environment on Linux systems in section system setup
2020-12-16 12:16:32 +01:00
Tobias HagemannandGitHub 96c8c9a9a9 Update bug.md 2020-12-16 09:07:39 +01:00
Tobias HagemannandGitHub 44db97327d Update feature.md 2020-12-16 09:06:11 +01:00
Sebastian Stenzel f441700c25 Merge branch 'master' into develop 2020-12-15 13:23:21 +01:00
Sebastian Stenzel 76b023bdbd Merge branch 'release/1.5.11' 2020-12-15 12:42:13 +01:00
Sebastian Stenzel 241d9781bb bump integrations-win version 2020-12-15 12:41:39 +01:00
Sebastian Stenzel ff94532560 Merge branch 'release/1.5.11' 2020-12-15 10:53:40 +01:00
Tobias Hagemann e949023321 updated third-party list [ci skip] 2020-12-15 10:37:27 +01:00
Sebastian Stenzel da31407d63 Preparing 1.5.11 2020-12-15 08:57:35 +01:00
Sebastian Stenzel 8c7c5da89a not sure what makes this "real" [ci skip] 2020-12-15 08:04:16 +01:00
Sebastian StenzelandGitHub e3a0e1ec5a New Crowdin updates (#1413)
[ci skip]
2020-12-14 17:38:49 +01:00
Sebastian Stenzel 4cee27d8dd bump webdav dependencies 2020-12-14 17:30:29 +01:00
Armin Schrenk b0fce66d77 Add OWASP Dependency-Check Maven Plugin
* only active if profile dependency check is active
* added suppresion.xml for false positives
* added tmp fix for jwt lib
2020-12-14 17:02:35 +01:00
Armin SchrenkandGitHub bf47ba0145 Merge pull request #1440 from cryptomator/feature/#1439-finish-migration
closes #1439
2020-12-14 15:41:52 +01:00
Armin Schrenk fc7b484c9a unwrap the Platform.runLater() statement because it is always executed on JavaFX thread 2020-12-14 15:34:03 +01:00
Armin Schrenk 4402c19d90 Simplifications and clean up 2020-12-14 11:47:02 +01:00
Armin Schrenk 4e89de9e47 activate force locking for dokany 2020-12-14 10:23:27 +01:00
Armin Schrenk a27c9d63d9 Bump dokany-nio-adapter version 2020-12-14 10:09:13 +01:00
Armin Schrenk da6aa0f002 bump integrations-win version 2020-12-11 16:23:57 +01:00
Armin Schrenk 0bf3533f45 Workaround for #1421 2020-12-11 13:25:02 +01:00
Sebastian Stenzel 295cb0ef6d fixes #1446, fixes #1415 2020-12-09 17:17:51 +01:00
Armin SchrenkandGitHub 6fac84e9c2 Replace "may" by "can"
... the end of a great and fierce war.
2020-12-09 15:39:49 +01:00
Sebastian Stenzel 77b2e67c49 updated labels 2020-12-09 15:16:45 +01:00
Armin SchrenkandGitHub c48c9b1568 Merge pull request #1416 from cryptomator/feature/#1228-forcedUnmountDialog
Feature/#1228 forced unmount dialog
2020-12-09 15:04:30 +01:00
Armin Schrenk 6da7eae2f8 Minor changes in lettering 2020-12-09 14:55:22 +01:00
Armin Schrenk aec56c48c5 Merge branch 'develop' into feature/#1228-forcedUnmountDialog
# Conflicts:
#	main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java
2020-12-09 14:51:00 +01:00
Sebastian Stenzel c0a9a95e4f Adjusted to CryptoFS 2.0.0 2020-12-08 14:39:46 +01:00
Sebastian Stenzel 3b73544766 Simplified observation of visible stages 2020-12-08 12:56:44 +01:00
Sebastian Stenzel fbc471635a fixed test 2020-12-08 12:51:34 +01:00
Sebastian Stenzel 3c5b9ed3a6 remove rarely used, complex class 2020-12-08 12:51:11 +01:00
Sebastian Stenzel 8479122561 temp fix for vulnerability in upstream lib
[ci skip]
2020-12-08 08:30:16 +01:00
Tobias HagemannandGitHub 91c883d5cc Create config.yml 2020-12-07 18:11:25 +01:00
Sebastian StenzelandGitHub 1cd4da0796 Merge branch 'develop' into feature/#1228-forcedUnmountDialog 2020-12-07 17:55:29 +01:00
Armin SchrenkandGitHub 935aaccdae Update bug template
* Make introduction section more visible
* emphasize task to complete for successful bug ticket
2020-12-02 15:05:59 +01:00
Tobias Hagemann ab3dd779d2 partially reverted 900fdd7f, fixing "stutter" startup on macos 2020-12-02 14:59:17 +01:00
Armin Schrenk 1fbcf6d517 closes #1439 2020-11-27 15:53:33 +01:00
Armin SchrenkandGitHub 82538091c9 Merge pull request #1427 from cryptomator/feature/#1323-singleQuitWindow
Show only one quit dialogue at a time
2020-11-24 15:31:31 +01:00
Sebastian Stenzel 62ade6113b cleanup
[ci skip]
2020-11-24 15:07:23 +01:00
Sebastian Stenzel 4779bbf415 Don't bother FxApplication with stuff that is meant to be dealt with internally within QuitComponent 2020-11-24 15:04:09 +01:00
Armin Schrenk c6b786a771 Reworked implemenation by using dagger now:
* create and inject QuitResponse container
* QuitComponent manges now if quit window needs to be created
* controller only handles the most recent QuitResponse
2020-11-24 13:34:12 +01:00
Armin Schrenk 6381227897 Stylin:
* change css styleclass of dialogue headings to `label-large`
* remove newly introduced style class `label-medium`
2020-11-23 16:14:31 +01:00
Armin Schrenk e82167b5e6 correct wrong method name 2020-11-20 17:29:56 +01:00
Armin Schrenk dc4fd482b5 Filter any whitespaces when entering text in donationkey form. 2020-11-20 17:17:16 +01:00
Armin Schrenk a71f8b350e Show only one quit dialogue at a time 2020-11-20 16:12:49 +01:00
Armin Schrenk c9ec8fecef fix wrong method name 2020-11-20 16:09:31 +01:00
e72d32f2d1 Remove empty line
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2020-11-20 14:34:34 +01:00
2545aa2a7e Removed default clause from switch expression on enums
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2020-11-20 14:33:57 +01:00
Armin Schrenk 51aac15622 Changed forced lock description and clean up 2020-11-20 12:23:44 +01:00
Armin Schrenk afa0cfeafb Replace lock failed dialogue stub and integrate it into workflow 2020-11-20 12:23:18 +01:00
Armin Schrenk 19e24ba12c refactor structure of LockWorkflow class 2020-11-20 12:22:26 +01:00
Armin Schrenk c47ce2c730 clean up 2020-11-20 11:25:39 +01:00
Armin Schrenk 5d00b3dd76 activate ability to abort vault locking if it is mounted with dokany and still busy
references #1228
2020-11-19 17:20:08 +01:00
Armin Schrenk 4db57cc0dc Further improvements:
* adding Log messages
* change lock workflow to type of Task<Void>
* set vault state based solely on task state
* replaced dialogue stubs with real text
2020-11-19 16:31:16 +01:00
Armin Schrenk 432a9a27f1 Add forceLock Dialogue:
* integrate it in workflow if normal lock throws exception
* add stubs if also forced lock fails
2020-11-19 12:52:16 +01:00
Armin Schrenk 57bfa3276d Integrate new lockWorkflow into application (gui and tray) 2020-11-19 11:42:00 +01:00
Sebastian Stenzel 02fc9b263a re-added applicable choosers to exception text 2020-11-18 18:12:41 +01:00
Sebastian Stenzel 4c66f81736 simplified line 2020-11-18 18:09:30 +01:00
Sebastian Stenzel 2de151aebe use less generic name 2020-11-18 18:08:00 +01:00
Armin Schrenk c44911dcac Prepare strucutre and classes for lock workflow 2020-11-18 17:16:58 +01:00
Armin Schrenk bcf2a3d20c Setting default onFailed handler in lock tasks 2020-11-18 17:16:43 +01:00
JaniruTEC 422ce4a387 Moved actual choosing of MPCs to MountPointHelper 2020-11-18 16:27:43 +01:00
JaniruTEC 21387bd76c Renamed IrregularUnmountCleaner to MountPointHelper 2020-11-18 16:18:31 +01:00
JaniruTEC 52cd560cb2 Generifyed #chooseMountPoint() 2020-11-18 16:09:09 +01:00
JaniruTEC 6c440dfbbb Re-Added check for non-emtpy dirs 2020-11-18 15:53:33 +01:00
Sebastian Stenzel a074450452 Merge branch 'master' into develop 2020-11-18 15:03:37 +01:00
Sebastian Stenzel b781cf6f25 Merge branch 'hotfix/1.5.10' 2020-11-18 15:03:11 +01:00
Sebastian Stenzel 9b653f488b Merge branch 'develop' into hotfix/1.5.10 2020-11-18 15:02:33 +01:00
Armin Schrenk 17c580267f prevent race conditions 2020-11-18 14:35:16 +01:00
Sebastian Stenzel 490d1b8f87 cancel unlock workflow, if closing window with shortcut 2020-11-18 14:21:18 +01:00
Armin Schrenk b0ad86f16b Perform cleanup of tmp mount points dir only once. 2020-11-18 14:07:34 +01:00
Sebastian Stenzel df2b4ac086 cleanup 2020-11-18 13:17:35 +01:00
Sebastian Stenzel aee4ececba Merge branch 'fix/1409' into hotfix/1.5.10
fixes #1409
2020-11-18 13:16:36 +01:00
Sebastian Stenzel b2992aa6ae Merge branch 'fix/1408' into hotfix/1.5.10
fixes #1408

# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
2020-11-18 13:16:19 +01:00
Sebastian Stenzel 4c546d281a Bumped version 2020-11-18 13:15:33 +01:00
Sebastian Stenzel c90e445a67 Removed -Dcryptomator.mountPointsDir="/Volumes/" from macOS run profiles
[ci skip]
2020-11-18 13:10:01 +01:00
Sebastian Stenzel d3c2b0509e Lazily call IrregularUnmountCleaner from (and only from!) TemporaryMountPointChooser 2020-11-18 13:08:48 +01:00
Sebastian Stenzel c6d1c2ca6b added MacVolumeMountChooser and refactored "priority" of mount point choosers: now all priorities are set in MountPointChooserModule (as a map key) 2020-11-18 13:07:12 +01:00
Sebastian Stenzel 86dec80726 avoid weird iteration counter manipulation 2020-11-18 10:33:04 +01:00
JaniruTEC 9083976989 Fixed #1409 by addig an additonal check 2020-11-18 00:46:24 +01:00
JaniruTEC d9c5d76417 Fixed irregular quoting 2020-11-17 22:41:41 +01:00
JaniruTEC c19c3754c6 Fixed high-spirited concatenation 2020-11-17 22:27:41 +01:00
JaniruTEC 947e0e2369 Fixed #1408 2020-11-17 22:00:41 +01:00
JaniruTEC 6eca8f2e0c Added support for quote escaped values for mount arguments 2020-11-17 21:56:43 +01:00
Sebastian Stenzel 9f61ad1941 Merge branch 'master' into develop
[ci skip]
2020-11-17 17:03:40 +01:00
Sebastian Stenzel 41492a951a Merge branch 'release/1.5.9' 2020-11-17 17:02:14 +01:00
Sebastian Stenzel cbbfec5531 Merge branch 'develop' into release/1.5.9 2020-11-16 17:16:54 +01:00
Sebastian StenzelandGitHub d7a4dff080 New Crowdin updates (#1401)
New translations strings.properties
[ci skip]
2020-11-16 17:15:37 +01:00
Armin SchrenkandGitHub 8e56218fbb Update launcher-linux.sh
drastically reducing the allowed stacksize to 2m
2020-11-11 17:13:11 +01:00
Sebastian Stenzel 9c40386106 fix CI release build 2020-11-10 12:54:01 +01:00
Sebastian Stenzel c865805f55 Preparing 1.5.9 2020-11-10 12:41:10 +01:00
Sebastian StenzelandGitHub 8e352301cd New Crowdin updates (#1392)
[ci skip]
2020-11-10 12:39:15 +01:00
Armin SchrenkandGitHub 52db1e8bdd Merge pull request #1396 from cryptomator/feature/#1013-#1061-cleanupAndInformation 2020-11-10 12:33:23 +01:00
Armin Schrenk 1947623be8 final cleanup:
* renamed methods
* apply code style
2020-11-10 12:24:49 +01:00
Armin Schrenk 4f8602684d Merge branch 'develop' into feature/#1013-#1061-cleanupAndInformation 2020-11-10 12:08:23 +01:00
Armin Schrenk 75f66e40bf Add additional mountName crunching to be urlconform when WebDAV is used 2020-11-10 12:05:30 +01:00
Sebastian Stenzel 73587437cb fixes #1400 2020-11-10 08:27:47 +01:00
Sebastian Stenzel 18f6e70bba Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop
# Conflicts:
#	main/ui/src/main/resources/i18n/strings.properties
2020-11-09 17:53:18 +01:00
Sebastian Stenzel e067b94aca fixed labels 2020-11-09 17:52:48 +01:00
Armin Schrenk b04d5669fb Format lables the same way 2020-11-09 17:40:57 +01:00
Armin SchrenkandGitHub ad44af338d Merge pull request #1399 from cryptomator/feature/io-stats
closes #1070
2020-11-09 17:20:10 +01:00
Sebastian Stenzel 4f4ddbc3e0 allow GCing of Stats Window while remaining reusability and preventing opening multiple windows per vault 2020-11-09 13:49:28 +01:00
Sebastian Stenzel 4e9af1c713 cleanup 2020-11-09 13:12:42 +01:00
Sebastian Stenzel 9a94b6f95e fixed typo 2020-11-09 13:10:35 +01:00
Sebastian Stenzel 371b826aa0 Merge branch 'develop' into feature/io-stats 2020-11-09 13:05:44 +01:00
Sebastian Stenzel d3fb90bf6d fixed NPE if winDriveLetter is null (on Linux/Mac) 2020-11-09 13:05:06 +01:00
Sebastian Stenzel d24c478faa more dependency updates 2020-11-09 12:01:38 +01:00
Sebastian Stenzel 48d0aa423c fixed getter name 2020-11-09 11:54:15 +01:00
Sebastian StenzelandGitHub 5695fa2916 Merge branch 'develop' into feature/io-stats 2020-11-09 11:48:17 +01:00
Armin Schrenk bcea1a4b32 Bumping dependencies:
* javafx to 15
* webdav-nio-server to 1.0.13
2020-11-09 11:17:52 +01:00
Armin Schrenk 2f8d4568fc Updating CryptoFS Dependency.
Closes #1293
2020-11-09 10:33:27 +01:00
Armin Schrenk 5b55318e52 Bumping integrations-linux dependency, removing unused legacy property
closes #1308
2020-11-09 10:28:07 +01:00
Armin Schrenk 459f2ea2c3 Updating Dokany-nio-adapter dependency
References #1228
2020-11-09 10:27:52 +01:00
Martin Beyer d26147a34a bumped up depencency of cryptofs to 1.9.13 2020-11-08 20:51:47 +01:00
JaniruTEC afb9d4f010 Fixed exception on startup if mount folder doesn't exist
IrregularUnmountCleaner should not be called if there is no folder that could contain mountpoints.
2020-11-06 18:44:47 +01:00
JaniruTEC db3bf9723e Merge branch 'feature/additional-error-messages' into develop 2020-11-06 17:34:23 +01:00
JaniruTEC 3a5937b35f Added runLater to implementation of ErrorComponent#showErrorScene() 2020-11-06 17:09:44 +01:00
Sebastian StenzelandGitHub f5cddda7a8 Merge branch 'develop' into feature/#1013-#1061-cleanupAndInformation 2020-11-06 15:17:45 +01:00
Sebastian Stenzel e9fa1d6476 removed old jni dependency 2020-11-06 14:53:45 +01:00
Sebastian Stenzel 084c1881ba removed unused imports
[ci skip]
2020-11-06 14:47:47 +01:00
Sebastian Stenzel ce131e4653 Implemented AutoStart integration for macOS 2020-11-06 14:46:32 +01:00
Tobias Hagemann a121c7d0fe added tooltip to path in vault list cell 2020-11-06 14:42:21 +01:00
Sebastian Stenzel 603bf99b25 Replaced MacFunctionsUiState using new integrations api 2020-11-06 14:18:23 +01:00
Sebastian Stenzel 9076fe5b46 Reintroduced trimming of vault display name 2020-11-06 11:07:45 +01:00
Sebastian Stenzel 6848f1a38e Renamed IrregularUnmountCleaner and relayouted code 2020-11-06 11:07:22 +01:00
Sebastian Stenzel f4103fc917 reducing complexity of normalizedDisplayName 2020-11-06 09:54:25 +01:00
Sebastian Stenzel c838da9df4 reducing complexity for "vault name max length" 2020-11-06 09:52:31 +01:00
Sebastian Stenzel 78df4e24b3 keep iconography consistent by reusing already existing icons 2020-11-06 09:51:51 +01:00
Sebastian Stenzel c0e2d01297 Migrated from deprecated MacFunctions to UiAppearanceProvider for UI theme switching 2020-11-05 17:49:39 +01:00
JaniruTEC 313f8b36d2 Replaced dependency with call to getter 2020-11-05 17:11:35 +01:00
JaniruTEC 343794c1fe Redo "Added UI error messages"
This reverts commit d331c302
2020-11-05 17:04:31 +01:00
Armin Schrenk 813c01aaed Use mountName instead of display name 2020-11-05 13:23:30 +01:00
Armin Schrenk 510ea8a6f6 refined normalize Method, fxied Tests for it:
* all unicode spaces are now replaced with \u0020
* if the end string only contains whitspaces, "_" will be returned
2020-11-05 12:44:51 +01:00
Armin Schrenk a22fbea467 The display/vault name is now constrained:
* should not be empty
* is stripped of leading & trailing whitespaces
* is truncated to 50 characters
2020-11-05 11:55:25 +01:00
Armin Schrenk f64144d1da Revert 1554437884 2020-11-05 11:52:38 +01:00
Armin Schrenk c01dd225c9 Refactor normalizedMountname to only exclude certain, filesystem reserved characters or Unicode control sequences 2020-11-05 11:47:18 +01:00
Sebastian Stenzel 18b408a83a Adjusted keychain display names
[ci skip]
2020-11-05 11:15:39 +01:00
Sebastian StenzelandGitHub efaf107b20 Merge pull request #1393 from cryptomator/feature/modular-keychains
Modularized Keychain Access, references #1301
2020-11-05 11:10:15 +01:00
Sebastian Stenzel 86cba5e8a7 partial revert of 6ccd2486 2020-11-04 16:11:16 +01:00
Sebastian Stenzel f4cee6d161 made KeychainManager immutable
[ci skip]
2020-11-04 14:15:28 +01:00
Sebastian Stenzel 28c40b2277 WHY? 2020-11-04 14:13:53 +01:00
Armin Schrenk 8853054ed4 fixing test 2020-11-03 14:53:51 +01:00
Armin Schrenk 3eb44b06af Fixes #1061:
* temp mount point is first tried without any addition
* then with id Suffix in brackets
* then with underscores, id suffix and count
2020-11-03 12:50:52 +01:00
Armin Schrenk 1554437884 Use regular display name and only normalize if webdav is used:
* rename StringBinding mountName to normalizedDisplayName
* replace in all other occurences mountName with DisplayName
2020-11-03 12:44:09 +01:00
Armin Schrenk 268bae8879 Change Invalid mount point error window:
* Add heading
* change icon to times_with_circle
* reformat text
2020-11-03 12:13:22 +01:00
Sebastian Stenzel b382e436e2 minor CI fixes 2020-11-03 11:27:10 +01:00
Sebastian Stenzel 6ccd248675 use maven profiles to build different buildkits 2020-11-03 11:21:08 +01:00
Armin Schrenk c760e63995 only use supported keychainAccessProviders 2020-11-03 10:54:32 +01:00
Armin Schrenk 959dee153e fixing bug where stored password is not used 2020-11-03 10:03:14 +01:00
Armin Schrenk aa22f656e8 Moving the code for unregular unmount leftovers from mountpoint chooser to an own class and execute it at each application start. 2020-11-02 17:34:34 +01:00
Armin Schrenk d24734e16f Revert "Adding method to clean up _our_ tmp mounting dirs to mitigate #1061 and #1013"
This reverts commit 01522e8c97.
2020-11-02 17:25:43 +01:00
Armin Schrenk 01522e8c97 Adding method to clean up _our_ tmp mounting dirs to mitigate #1061 and #1013 2020-11-02 14:49:57 +01:00
Sebastian Stenzel 14e056551d no longer track coverage for deleted keychain module 2020-11-02 14:07:21 +01:00
Sebastian Stenzel 82a42ea183 Removed keychain module. Implemented new KeychainManager in various UI controller classes 2020-11-02 14:03:39 +01:00
Sebastian Stenzel bfde26be79 Added new keychain module and refactored UI parts 2020-11-02 13:09:30 +01:00
Sebastian Stenzel 51e43a0567 include system integration lib automatically depending on current OS 2020-11-02 13:08:50 +01:00
Sebastian Stenzel 9a375cb3f6 updated label
[ci skip]
2020-11-02 09:43:54 +01:00
Sebastian Stenzel 2b8f39a149 ignored some derived files 2020-11-02 09:41:07 +01:00
2720a999d1 Updated codestyle (#1388)
Co-authored-by: Sebastian Stenzel <overheadhunter@users.noreply.github.com>
2020-11-02 08:45:41 +01:00
Ralph PlawetzkiandGitHub f675bd5017 Feature/change password backend 2 (#1375)
* Add option to choose from available password backends on Linux
Implements #1301
2020-11-02 08:19:26 +01:00
JaniruTECandGitHub 16be3e7a97 Merge pull request #1384 from cryptomator/fix/missing-exceptions
Fix/missing exceptions
2020-10-29 16:58:51 +01:00
JaniruTEC 551d9d1af1 Added default Errorhandler to all Tasks and Services 2020-10-28 16:21:14 +01:00
JaniruTEC 0acc8ddb0a Fixed UnlockWorkflow
Partly reverted 253abd4930
2020-10-28 15:50:20 +01:00
JaniruTEC f0e1bcb899 Moved call to #setOnFailed() to UpdateStatsService implementation 2020-10-28 15:40:59 +01:00
JaniruTEC d331c30224 Revert "Added UI error messages"
This reverts commit eb8f5f523d.
2020-10-28 15:21:59 +01:00
JaniruTEC d0d39a1c72 Merge branch 'develop' into fix/missing-exceptions 2020-10-27 17:04:32 +01:00
JaniruTEC 8904df91b4 Reverted accidental changes to Project_Default.xml [Skip CI] 2020-10-27 16:18:55 +01:00
JaniruTEC 786365c095 Added ability to skip CI
Added check for "Skip CI", added comment
Added filter for skipping CI
2020-10-27 16:12:35 +01:00
JaniruTEC eb8f5f523d Added UI error messages
Added UI error message to GeneralPreferencesController for ToggleAutoStartTask
Added UI error message to RecoveryKeyCreationController
2020-10-26 21:19:24 +01:00
JaniruTEC 9c22adc97d Added/Fixed error logging
Added error logging to VaultStats and GeneralPreferencesController
Fixed possible missing error logging in VaultService
2020-10-26 21:17:22 +01:00
Sebastian StenzelandGitHub 265212cc0f New Crowdin updates (#1302)
* New translations strings.properties [ci skip]
2020-10-26 10:00:58 +01:00
Sebastian StenzelandGitHub 9c860cc17c Merge pull request #1380 from cryptomator/snyk-fix-bc2c8d6dd6d679e9ec6736de3d13592d
[Snyk] Security upgrade com.google.guava:guava from 29.0-jre to 30.0-jre
2020-10-24 09:55:05 +02:00
Sebastian StenzelandGitHub 7f63153bc1 Update main/pom.xml 2020-10-24 09:47:09 +02:00
snyk-bot 9531d44ab5 fix: main/pom.xml to reduce vulnerabilities
The following vulnerabilities are fixed with an upgrade:
- https://snyk.io/vuln/SNYK-JAVA-COMGOOGLEGUAVA-1015415
2020-10-24 01:50:58 +00:00
JaniruTEC 253abd4930 Refactored UnlockWorkflow
Replaced protected state methods (scheduled, etc.) with lambdas in the constructor
Replaced try-multi-catch with if-instanceof in onFailed-lambda
2020-10-22 18:58:46 +02:00
JaniruTEC 022ba81f2f Reformatted classes ErrorComponent and Tasks 2020-10-22 18:33:20 +02:00
Armin SchrenkandGitHub 26160e9bbc Merge pull request #1346 from purejava/fix-isSupported
Evade DBusException
2020-10-21 10:56:16 +02:00
JaniruTEC 0a32de2c92 Addded dev run configs, removed fuse-setting from win prod config 2020-10-16 22:38:39 +02:00
JaniruTECandGitHub 60aeb6a04b Merge pull request #1307 from cryptomator/feature/fuse-on-win
Added (experimental) support for using FUSE on Windows (using WinFSP)
2020-10-14 15:29:37 +02:00
JaniruTEC 0206fc0b8f Bumped required version of fuse-nio-adapter to 1.2.5 2020-10-14 15:26:28 +02:00
JaniruTEC 06b3343a6d Partly Revert "Finished feature: Fuse on Win"
Revert changes to TemporaryMountPointChooser introduced by 598bec3050
2020-10-13 18:30:00 +02:00
JaniruTEC 598bec3050 Finished feature: Fuse on Win
Bumped required version of fuse-nio-adapter to 1.2.4
Added comments
Changed log messages to be more descriptive
2020-10-12 21:34:56 +02:00
Reid RankinandGitHub 0e5d72c22a shorten FS_TYPE_NAME to "CryptomatorFS" (#1371)
This fixes part of #1033 by shortening the FS_TYPE_NAME so that it can be returned inside a 48-byte-long FILE_FS_ATTRIBUTE_INFORMATION buffer, which only has room for up to 17 UTF-16 characters in the file system name field.
2020-10-12 14:12:09 +02:00
JaniruTEC 21f4fab9ed Fixed bug: Strange error message if no MPC was applicable 2020-10-09 18:40:50 +02:00
JaniruTEC 58e2ec4742 Changed contract of priorities in MPC, added null-check
See: ab538cd215 (original commit)
See: 6b6867b826 (reverting commit)
2020-10-08 19:14:03 +02:00
JaniruTEC 6b6867b826 Reverted ab538cd215 2020-10-08 18:51:03 +02:00
Ralph Plawetzki 92321a7569 Remove unneeded access modifier 2020-10-08 12:57:50 +02:00
JaniruTEC 7781572b6d Replaced call to Validate with call to Preconditions
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r500760560
2020-10-07 23:27:08 +02:00
JaniruTEC b5efe39eb8 Refactored Vault, MPCs, Unlock to integrate better with latest changes
Removed delegate to Volume#getMountPointRequirement() from Vault
Added getter for the Vault's Volume (#getVolume())

Changed CustomMountPointChooser to use VaultSettings instead of Vault for the constructor/field declaration
Updated CustomMountPointChooser#isApplicable() to be disabled when using FUSE on Windows (without useExperimentalFuse)
Updated CustomMountPointChooser to call Volume#getMountPointRequirement() directly

Replaced OS-Check in TemporaryMountPointChooser with MPR-Check

Replaced call to Vault#getMountPointRequirement() with call to Vault#getVolume() (and Volume#getMountPointRequirement()) in UnlockInvalidMountPointController and UnlockWorkflow
Cleaned up UnlockWorkflow
2020-10-07 23:19:24 +02:00
Ralph Plawetzki cae86cd71f Get more information logged in case something goes wrong 2020-10-07 18:55:18 +02:00
Ralph Plawetzki 667617b480 Update kdewallet to latest 1.1.1 2020-10-07 18:32:16 +02:00
JaniruTEC 9329311491 Merge branch 'feature/volume-type-getter' into feature/fuse-on-win 2020-10-07 16:59:54 +02:00
JaniruTEC 22438d1eba Added api for getting the implemented VolumeImpl (type) of a Volume 2020-10-07 16:46:58 +02:00
JaniruTEC d295084312 Changed contracts in MPC interface
Added Volume parameter to the method signature of all MPC methods and updated implementations to use the change.

Changed contract of the MPC interface: Validation of the MPC (call to #isApplicable()) moved from the Module to the Volume.
Updated docs to reflect those changes. Fixed typos.
Updated method/qualifier names.
Updated implementation of #provideOrdered(Valid)MountPointChoosers() to reflect this change and to build the set differently.
Updated #determineMountPoint() to work with the new set.
2020-10-06 19:52:59 +02:00
JaniruTEC ab538cd215 Fixed bug: Dropped MPCs if priorities were equal
Fixed bug that caused MPCs with equal priorities to be dropped (even if they weren't equal).
Added additional criteria (hashCode) for cases were priorities are equal.

See the docs of ImmutableSortedSet for further information.
2020-10-06 19:40:03 +02:00
Armin Schrenk f9cb438a0b Closes #1065 for real by adding missing style in dark theme for debug mode 2020-10-01 18:37:32 +02:00
JaniruTEC 354de225ed Reverted changes to WebDavVolume#getMountPoint()
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472888268
2020-09-30 14:09:01 +02:00
Armin Schrenk 0b7f8d71ed closes #1065 2020-09-29 12:12:59 +02:00
JaniruTEC 9657a13912 Updated MPCModule to return a SortedSet and switched collector
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r474452898
2020-09-28 23:34:47 +02:00
Ralph Plawetzki c5a3b29554 Make logger static 2020-09-16 18:56:54 +02:00
Ralph Plawetzki ae957c2588 Print error message instead of stacktrace
Fixes #1345
2020-09-16 06:55:37 +02:00
Tobias Hagemann da84133732 allows running launcher-mac.sh from any path 2020-09-15 16:23:31 +02:00
Tobias HagemannandGitHub 10275eb80f Merge pull request #1326 from TheShellLand/linux-libs
allows running launcher-linux.sh from any path
2020-09-15 09:28:04 +02:00
Sebastian Stenzel 29a9c7dffe auto-close bugs violating the issue template
[ci skip]
2020-09-13 11:50:26 +02:00
JaniruTEC d5b8996a39 Fixed violation of method contract
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472857043
2020-09-11 22:23:48 +02:00
JaniruTEC f012977aac Fixed spelling
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472825411
2020-09-11 21:47:30 +02:00
JaniruTEC 8680bd1dee Updated MountPointChooserModule and MPCs
Updated MountPointChooserModule and MPCs to use bindings (@'Binds) instead of providers (@'Provides)
Updated CustomDriveLetterChooser and TemporaryMountPointChooser  to use VaultSettings instead of Vaults

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872166
2020-09-07 22:25:01 +02:00
JaniruTEC 528510eb53 Renamed binding fuseAndWindows to restrictToStableFuseOnWindows
Renamed binding fuseAndWindows to restrictToStableFuseOnWindows in MountOptionsController

See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r477135521
2020-09-07 22:24:59 +02:00
ainiml e8d17cfb7b allows running launcher-linux.sh from any path 2020-09-06 19:25:50 -04:00
JaniruTEC cdbcd20241 Fixed faulty access introduced by parallel release of 1.5.8 2020-09-05 22:15:02 +02:00
JaniruTEC fef3ade5c6 Merge branch 'develop' into feature/fuse-on-win
Fixed conflicts in WebDavVolume
2020-09-04 22:28:53 +02:00
Tobias Hagemann 194d7f0da9 Merge branch 'hotfix/1.5.8' into develop 2020-08-28 16:01:35 +02:00
Tobias Hagemann 8ad20c27da Merge branch 'hotfix/1.5.8' 2020-08-28 15:57:54 +02:00
Tobias Hagemann f891a9f1a7 refactored that fix from 2a335eb7af 2020-08-28 14:25:26 +02:00
Tobias Hagemann 2a335eb7af fixed test 2020-08-28 14:06:09 +02:00
Tobias Hagemann 6578ac0121 use mountName in FUSE on macOS instead of displayName 2020-08-28 13:55:17 +02:00
Tobias Hagemann 83f9514a42 fixed icon views of labels in new password screen that could only appear once
(cherry picked from commit 4723416d45)
2020-08-28 13:41:43 +02:00
Tobias Hagemann c92f1aa655 updated third-party licenses 2020-08-28 13:34:41 +02:00
Tobias Hagemann 688993ba37 preparing 1.5.8 2020-08-28 12:58:50 +02:00
Armin Schrenk ddfc8d5bc3 Merge branch 'feature/#1289-introduceVaultname' into hotfix/1.5.8 2020-08-28 11:59:56 +02:00
Armin Schrenk c3141e3601 minor adjustments 2020-08-28 11:58:46 +02:00
Armin Schrenk f49974180b Fixing test 2020-08-28 11:19:56 +02:00
Armin Schrenk eb6ade49f6 refactor to use parameterized test 2020-08-27 16:18:20 +02:00
Armin Schrenk 6553c04256 add code to migrate legacy settings.json files to new property. 2020-08-27 15:53:20 +02:00
Armin Schrenk a8cb015a06 rename property and getters in vault class for display name. 2020-08-27 15:52:16 +02:00
Martin Beyer ee81dca71c Nice implementation of only one stats window per vault 2020-08-26 17:23:39 +02:00
Sebastian StenzelandArmin Schrenk ce06ddf312 updated webdav dependencies
(cherry picked from commit 8c4d35d3db)
2020-08-26 12:51:28 +02:00
Armin SchrenkandGitHub fee2d4bc0c Merge pull request #1311 from cryptomator/feature/alternativeAutostartWin
Feature/alternative autostart win
2020-08-26 11:44:37 +02:00
Armin Schrenk a2a990bd0c Correct spelling 2020-08-26 11:36:46 +02:00
Armin SchrenkandGitHub cedbe6523d Merge pull request #1294 from purejava/access-kde-wallets
This adds the missing part to linux system keychain access: use KDE wallets
2020-08-26 10:03:55 +02:00
JaniruTEC ec64055d93 Renamed property "position" (defined by MPC) to "priority" 2020-08-21 22:41:15 +02:00
JaniruTEC 6f542ac8b8 Replaced "assert" with IllegalStateException 2020-08-21 21:57:12 +02:00
Ralph Plawetzki 8a3c101764 Merge remote branch 'cryptomator/develop' into access-kde-wallets 2020-08-21 19:30:46 +02:00
infeo 49a8689090 Remove legacy concepts:
* in vaultSettings, displayName does not listen on path
* the caller/creater of vault settings must set the name explicitly
* add localizable default vault name
2020-08-21 13:30:05 +02:00
infeo 8f5c4997b1 closes #1300 2020-08-21 11:32:51 +02:00
infeo 900fdd7f6f minor changes
* removing unused imports
* exchanging addListener() by Easybind.subscribe()
2020-08-21 11:17:55 +02:00
Tobias Hagemann 4723416d45 fixed icon views of labels in new password screen that could only appear once 2020-08-21 10:13:45 +02:00
JaniruTEC 8483f71f57 Refactored CustomMountPointChooser
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472832435
2020-08-21 00:55:33 +02:00
JaniruTEC 5dac594cc9 Removed Phasesystem, specified docs, removed default #isApplicable()
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472835069 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472839837 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472820689 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872901
2020-08-21 00:00:13 +02:00
infeo 06f4e160d6 Migrate to easybind fork 2020-08-20 21:25:54 +02:00
infeo 1d38ee2fcb Further improvements:
* corrected bad english
* improved documentation
* restricted visibility of specific exception
2020-08-20 13:49:31 +02:00
Sebastian Stenzelandinfeo 921b70ebaa updated webdav dependencies
(cherry picked from commit 8c4d35d3db)
2020-08-20 13:38:40 +02:00
infeo 0f56d424da Refactored AutoStartStrategy:
* prevented on best effort basis inconsistent states
* extracted the registry setting as an own strategy (by methods)
* refactored the overriden methods to call the strategies (registry or folder) depending on the different variables
* removed Powershell specific ToggleException
* added documentation
2020-08-20 12:18:57 +02:00
JaniruTEC 4cd43a2b1c Merge branch 'develop' into feature/fuse-on-win 2020-08-19 15:53:26 +02:00
JaniruTEC 1ef359e68b Added messages to rethrown IOExceptions 2020-08-19 15:47:09 +02:00
JaniruTEC 58ce1e45b8 Updated Codestyle to not use any arrangements 2020-08-19 15:34:08 +02:00
Martin Beyer bd854e7f7a updates secret-service for linux keychains and fixes #1268 2020-08-19 15:31:42 +02:00
JaniruTEC 3ecc0cf906 Cleaned up MountPointRequirement
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472827299
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472826920
2020-08-19 14:45:10 +02:00
JaniruTEC ea6925f905 Replaced #wrapAsIMPE() with explicit call to IMPExc
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472872373 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472859488 https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472827776
2020-08-19 11:44:18 +02:00
JaniruTEC f45b78d8c0 Removed accidental debugcode, updated lookup for env-var
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472848604
See: https://github.com/cryptomator/cryptomator/pull/1307#discussion_r472851003
2020-08-19 11:44:01 +02:00
JaniruTEC 75ca8a91f8 Merge remote-tracking branch 'upstream/develop' into feature/fuse-on-win 2020-08-19 11:42:55 +02:00
JaniruTEC 16462d05c8 Refactored changes, cleaned up
Changed visibility of methods
Removed Logger from AbstractVolume
Moved mountPoint and #getMountPoint()
Renamed fuseMnt to mount in FuseVol (as in DokanyVol)
Removed unnecessary mountPoint-field from WebDavVolume
2020-08-18 21:27:13 +02:00
JaniruTEC cbef54f05c Added Logger, moved cleanup, moved choosing 2020-08-18 21:27:03 +02:00
JaniruTEC f601ff4ce3 Moved #isSupported() in the file, moved #determineMountPoint() 2020-08-18 21:26:52 +02:00
JaniruTEC 84fbf7392b Updated usage of FuseNotSupportedException 2020-08-18 16:57:56 +02:00
JaniruTEC bbf9379f56 Changed DokanyVolumes and FuseVolumes to use mountnames
Changed DokanyVolumes and FuseVolumes to use mountnames for automatic, folder-based mounting instead of ids.
2020-08-18 16:57:55 +02:00
JaniruTEC 6aa14fcfb1 Updated Errorhandling of UnlockWorkflow 2020-08-18 16:57:55 +02:00
Tobias Hagemann 710c7d0da7 added button to main window title if debug mode is enabled, fixes #1065 2020-08-18 16:08:23 +02:00
Tobias Hagemann 841d4eb9c7 updated third-party licenses 2020-08-18 13:59:37 +02:00
Sebastian Stenzel 8c4d35d3db updated webdav dependencies 2020-08-18 10:36:55 +02:00
JaniruTEC 4110057fa1 Refactored multiple classes
Refactored UnlockWorkflow, CustomMountPointChooser, DokanyVolume and UnlockInvalidMountPointController

Changed UnlockWorkflow#handleGenericError() to accept Throwables

Added check for parent to CustomMountPointChooser (when using FUSE on Win)

Removed legacy constant from DokanyVolume

Added asserts to UnlockInvalidMountPointController and UnlockWorkflow
2020-08-16 18:40:11 +02:00
Tobias Hagemann 9b1d6d2f2f Merge branch 'release/1.5.7' into develop 2020-08-14 12:59:07 +02:00
Tobias Hagemann 1c45455cb2 Merge branch 'release/1.5.7' 2020-08-14 12:58:26 +02:00
Tobias Hagemann 411aca8695 preparing 1.5.7 2020-08-14 12:55:46 +02:00
Sebastian StenzelandTobias Hagemann 3de69021df New Crowdin updates (#1255)
[ci skip]
2020-08-14 12:49:55 +02:00
Tobias Hagemann 8418038736 dependency update 2020-08-14 12:47:11 +02:00
Ralph Plawetzki 3bf2b499a7 Reverse order to initialize backend
The GNOME keyring feature was implemented first and we don't want to confuse users who used it before
2020-08-14 07:40:46 +02:00
JaniruTEC 430da2b78d Implemented MPC-System in FuseVolume and DokanyVolume, did refactoring
Implemented MPC-System in FuseVolume and DokanyVolume
Removed methods from FuseVol and DokanyVol
Renamed methods
Added chooser logic instead

Added imports for VolumeException to multiple classes
Added support for throwing and handling of InvalidMountPointException from Volume up to UnlockWorkflow (changed method signatures, added try-catchs, etc.)
2020-08-12 23:42:38 +02:00
JaniruTEC 51047dcbce Added additional debug messages 2020-08-12 23:42:38 +02:00
JaniruTEC 708bcaa630 Updated CustomMountPointChooser to use MPR instead of OS-Checks
Updated CustomMountPointChooser to use MountPointRequirements instead of OS-Checks.

This led to the discovery of the bug that was fixed in 724b20c826.
2020-08-12 23:42:37 +02:00
JaniruTEC 724b20c826 Fixed possible racecondition at Vault initialization
Fixed possible racecondition at Vault initialization: VaulSettings were read before the Vault was fully initialized resulting in breakage of the code if the excact order was to be changed.
2020-08-12 21:43:24 +02:00
Tobias Hagemann 69f8c46f15 ui adjustments in vault detail missing 2020-08-12 17:35:11 +02:00
JaniruTEC b7f2fb0bdf Added cleanup to TemporaryMountPointChooser 2020-08-11 23:35:43 +02:00
JaniruTEC 222ffd8c53 Implemented MountPointChooserModule 2020-08-11 23:35:42 +02:00
JaniruTEC 00e0a0f79a Fixed doc for MountPointChooser 2020-08-11 23:35:42 +02:00
JaniruTEC d6bbc4383b Added implementations for MountPointChooser
Added AvailableDriveLetterChooser for automatic DriveLetter-choice
Added CustomDriveLetterChooser for a chosen DriveLetter
Added CustomMountPointChooser for a chosen directory
Added TemporaryMountPointChooser for automatic directory-choice
2020-08-11 23:03:12 +02:00
JaniruTEC b51a2602a9 Documented MountPointChooser 2020-08-11 23:03:12 +02:00
JaniruTEC c3fbddc671 Refactored PerVault, Vault and VaultSettings
Made @`PerVault public
Added import for VaultException to Vault
Added convenience method to VaultSettings
2020-08-11 22:26:15 +02:00
JaniruTEC ce262b691a Added base classes for MountPointChoosers and added module to component 2020-08-11 22:26:15 +02:00
Martin Beyer 65de6fef9b Allowing only one io-stats window per vault to be open at the same time. 2020-08-11 17:32:39 +02:00
Armin Schrenk 31d95ae5b0 Remove restrictions of vault name filed to only contain alpha numeric characters 2020-08-11 12:04:02 +02:00
Armin Schrenk 429098733c Improve the vault/mount name system:
* fix bug where the default name is not replaced by the actual folder name
* introduce new field in settings "mountName" as binding on displayName
* change volumes to use mountName instead of displayName
2020-08-11 11:19:54 +02:00
JaniruTEC 597899d2bf Fixed random set order and updated #getAvailableDriveLetter()
Fixed bug introduced by 32a810fe1d:
The Set of existing DriveLetters was in random order because Collectors#toUnmodifiableSet is an unordered collector.

Changed #getAvailableDriveLetter() to use Stream#findFirst() instead of #findAny()
2020-08-11 02:24:44 +02:00
Ralph Plawetzki b1c66b181d Depend on kdewallet 1.0.1, hence dbus-java 3.2.3
that fixes issues when dealing with multiple signals of the same name but different signatures
2020-08-09 11:18:17 +02:00
Ralph Plawetzki 100b836979 Adjust buildkit to exclude kdewallet for Windows and macOS 2020-08-07 18:49:07 +02:00
Ralph Plawetzki 817907c25a Add access functionality for KDE kwallets 2020-08-07 18:32:54 +02:00
Tobias Hagemann 25195fffe2 added icon to password strength label in new password controller 2020-08-07 17:47:49 +02:00
Tobias Hagemann 0e784a6ffc also disable finish button in change password if old password field is empty 2020-08-07 17:09:55 +02:00
Tobias Hagemann 351f96fa8b switch to light theme if donation key has changed and is invalid 2020-08-07 09:30:22 +02:00
Tobias Hagemann 703fb4fb51 fixed https://github.com/cryptomator/cryptomator/commit/0091c401df3589e9e4236698690d242af77ffc1e#r40816364 2020-08-06 18:32:57 +02:00
Tobias Hagemann a975df6f8c added "Automatic" theme on macOS 2020-08-06 18:30:34 +02:00
Armin Schrenk fb90128b63 Move option to change display name of a vault from mount options to general options 2020-08-06 15:33:28 +02:00
Armin Schrenk ea4c91fb37 change meaning of mount name setting:
* it is now considered the gerenal vault name
* methods (except parsing) are renamed accordingly
2020-08-06 15:20:32 +02:00
Armin Schrenk 7c1d6973ba fixes #1289 by decoupling storage path from vault name 2020-08-06 15:18:30 +02:00
JaniruTEC 4f2120b729 Added support for folderbased backup-mountpoint to DokanyVol and FuseVol 2020-08-03 22:20:20 +02:00
JaniruTEC 51f7d74e4a Changed cryptomator.mountPointsDir-property in Windows Configs
Changed cryptomator.mountPointsDir-property in Windows Configs from "~/Mount" to "~/Cryptomator
2020-08-03 21:22:22 +02:00
JaniruTEC 32a810fe1d Changed FuseVolume to choose a DriveLetter instead of a folder
Changed FuseVolume to choose a DriveLetter instead of a folder if the the mountpoint is chosen by the app.
Reworked priorities when choosing
Changed DokanyVolume to use the new methods supplied by WindowsDriveLetters
2020-07-29 22:15:12 +02:00
JaniruTEC 570482521a Delegated choice of DriveLetter to WDL and made internal Set immutable
Delegated choice of DriveLetter to WindowsDriveLetters
Made internal Set ("C_TO_Z") immutable, that is returned by getAvailableDriveLetters()
Changed direct reference to C_TO_Z to use getAvailableDriveLetters() instead
2020-07-29 22:14:51 +02:00
Martin Beyer 3bd2a2f911 Fixes #1262 by adding new buttons, if a vault cannot be found 2020-07-29 10:21:16 +02:00
JaniruTEC 1ac6d086bd Disabled some experimental FUSE Features on Windows
Disabled some experimental FUSE Features on Windows unless they are explicitly enabled by using the flag '-Dfuse.experimental="true"'

They are enabled in the default IntelliJ-Config (disabled on Build)
2020-07-28 19:15:56 +02:00
JaniruTEC 8374599183 Modified creation of temporary mountpoint, fixed bugs, added comments
Changed FuseVolume#prepareTemporaryMountPoint to handle FUSE on Windows correctly (WinFSP requires the folder to NOT exist...)
See: https://github.com/billziss-gh/winfsp/issues/320

Added comments
Fixed bug: Message showing a malformed path
2020-07-26 23:03:36 +02:00
Martin Beyer 0091c401df Fixes #1267 by binding the settings.preferredVolumeImpl to VolumeImpl.WEBDAV, if preferredVolimeImpl isn't available 2020-07-22 15:26:21 +02:00
Martin Beyer 00dd67e345 Refactoring 2020-07-21 15:16:53 +02:00
Martin Beyer 158677bd54 Using new methods from CryptoFs to get correct statistics 2020-07-21 11:10:05 +02:00
JaniruTEC a1b375316c Specified the messages of failed UnlockWorkflows
Specified the messages of failed UnlockWorkflows by adding the ability to distinguish between the different MountPointRequirements

Translation for all languages but German and Englisch required
2020-07-20 22:06:15 +02:00
JaniruTEC dae2814b0f Added MountPointRequirement-Enum
Added MountPointRequirement-Enum and added method getMountPointRequirement() to Volume (and all implementing classes) to query the requirment for the specific VolumeProvider.
2020-07-20 22:01:10 +02:00
JaniruTEC 341a98848d Modified check of provided mountpoint
Changed FuseVolume#checkProvidedMountPoint to handle FUSE on Windows correctly (WinFSP requires the folder to NOT exist...)
2020-07-20 22:00:35 +02:00
JaniruTEC 902e66906a Refactored method FuseVolume#prepareTemporaryMountPoint
Refactored method FuseVolume#prepareTemporaryMountPoint to be more readable (removed duplicated code)
2020-07-20 21:55:49 +02:00
JaniruTEC c59d3cd03f Removed check for OS from FuseVolume#isSupportedStatic 2020-07-20 21:23:35 +02:00
Martin Beyer ed9f16e012 Displaying additional stats with a new DataLabel 2020-07-20 16:09:45 +02:00
Martin Beyer ed77a4aacd Added basic counting of additional total stats (not correct) 2020-07-20 16:08:25 +02:00
Martin Beyer ff2fa70bd6 preperation for displaying en-de-crypted bytes per second 2020-07-20 11:00:59 +02:00
Martin Beyer 3519346df9 cleaned up unlock window 2020-07-20 10:59:48 +02:00
JaniruTEC 45f6caa7bd Added basic support for FUSE-Mounting on Windows 2020-07-18 19:05:18 +02:00
JaniruTEC e2e7755af2 Added cryptomator.mountPointsDir-property to Windows Configs 2020-07-18 18:57:11 +02:00
Armin Schrenk 4ab7bfaa20 reformat 2020-07-17 11:58:11 +02:00
Armin Schrenk 7e0ffb43a6 fixing bug where the mountName of the vault is initially set as the default one 2020-07-17 11:57:53 +02:00
Martin Beyer 526c8328f6 Refactoring - Removing unnecessary environment variable 2020-07-13 15:21:24 +02:00
JaniruTEC 81bad4eb25 Fixed bug: Some exceptions caused by unlock were not shown
If an unmatched exception occurred during unlocking it was neither logged nor shown to the user.
2020-07-09 22:34:57 +02:00
Martin Beyer dcaa6e81a3 Improving Exception calling and logging 2020-07-08 14:53:15 +02:00
Martin Beyer e78155396d Implementing #1251 2020-07-08 14:01:10 +02:00
Sebastian Stenzel d3063c8117 Make sure not to launch the FX app more than once. 2020-07-07 16:01:32 +02:00
Armin SchrenkandGitHub cd1ed088c3 Update bug.md
Change bullet point "Drive" to "Volume type" such that users are less confused by this field. Also added where this info can be found.
2020-07-03 10:37:02 +02:00
Martin Beyer e831debb94 fixes #1244 by renaming the refresh button and adding a method call 2020-06-30 09:36:46 +02:00
Martin 8d15a6612f Implements #1244 by adding a small button to regain focus 2020-06-28 11:05:27 +02:00
Sebastian Stenzel 9c034f3be6 split up read and write charts and added cache efficiency chart
(because we will add further read/write-specific stats like total number of files read/written, bytes encrypted/decrypted, etc)
2020-06-25 17:16:42 +02:00
Sebastian Stenzel 60dd9349a8 Merge branch 'develop' into feature/io-stats 2020-06-25 17:15:22 +02:00
Sebastian Stenzel 330b1cbf7d derived resources after dependency update
[ci skip]
2020-06-25 17:15:07 +02:00
Sebastian Stenzel 9ffa38d54e Merge branch 'develop' into feature/io-stats 2020-06-22 17:24:18 +02:00
Sebastian Stenzel c925727269 Merge branch 'master' into develop 2020-06-22 17:23:58 +02:00
Sebastian Stenzel ac2dc06bd6 Merge branch 'release/1.5.6' 2020-06-22 17:23:27 +02:00
Sebastian Stenzel 80b83adb53 Preparing 1.5.6 2020-06-22 17:08:48 +02:00
Sebastian StenzelandGitHub ddc31ac2bb New Crowdin translations (#1227)
[ci skip]
2020-06-22 17:08:09 +02:00
Sebastian Stenzel eb7c5d0b2b Dependency update 2020-06-22 10:21:44 +02:00
Armin Schrenk e5ce3cb62d closes #1254 2020-06-19 15:57:12 +02:00
Martin Beyer 7a69692999 Prettied up the statistics window for both Ui Themes 2020-06-17 11:04:36 +02:00
Sebastian Stenzel d00d9d98dc make sure to release all strong referenced to the I/O chart when closing the window 2020-06-16 15:35:12 +02:00
Sebastian Stenzel 1846c5c14c formatting 2020-06-16 15:05:24 +02:00
Sebastian Stenzel 0d9db783f7 Merge branch 'develop' into feature/io-stats 2020-06-16 15:04:47 +02:00
Sebastian Stenzel d3a6964d8f fixes #1249 2020-06-16 15:02:38 +02:00
Martin Beyer 55e9cabf51 Updated Graph to use Timeline + minor UI changes + wording 2020-06-16 14:13:17 +02:00
Sebastian Stenzel 5180f2061a add series only once (in scene initialization instead of on every tick) - thus fixing IAE 2020-06-10 13:58:02 +02:00
Martin BeyerandSebastian Stenzel 05154cf6aa Added Graph to statistics window 2020-06-10 13:38:58 +02:00
Martin BeyerandSebastian Stenzel f61e955945 First Dummy window to show statistics 2020-06-10 13:38:57 +02:00
Armin Schrenk d80605532f closes #1141 2020-05-28 16:26:22 +02:00
Sebastian Stenzel 8d5fb14b50 Merge branch 'master' into develop 2020-05-27 12:43:56 +02:00
Sebastian Stenzel 570286c7df Merge branch 'release/1.5.5' 2020-05-27 12:43:35 +02:00
Sebastian Stenzel 11e3ee8d90 formatted code
[ci skip]
2020-05-27 12:43:18 +02:00
Sebastian Stenzel 0664c670f7 Merge branch 'develop' into release/1.5.5 2020-05-27 12:33:55 +02:00
Martin Beyer f36f9d412c Fixes #1203 2020-05-27 12:04:34 +02:00
Sebastian Stenzel bd734f1960 preparing 1.5.5 2020-05-27 11:23:09 +02:00
Sebastian StenzelandGitHub 675a0b1a73 New Crowdin translations (#1194)
[ci skip]
2020-05-26 16:50:01 +02:00
Martin Beyer a2816277bf Refactor unlock Window in preparation of #1203 2020-05-26 14:00:25 +02:00
Tobias Hagemann e37f1f914b some layout adjustments in vault detail 2020-05-26 13:20:47 +02:00
Sebastian Stenzel adf7694308 fixes #1021, fixes #1170, fixes #1180 2020-05-26 10:04:32 +02:00
Sebastian Stenzel c13449c6ad fixes #1214 2020-05-26 09:21:18 +02:00
Armin Schrenk f72035210c fixing error where vault stays in processing state if unlock is canceld via system close button (window decoration bar) 2020-05-25 13:51:14 +02:00
Martin Beyer 89ef5238ea Fixes #1218 by setting the maxWidth of each button to Infinity 2020-05-24 12:41:45 +02:00
Armin Schrenk 8198f66c1f fixes #1208 2020-05-22 12:39:41 +02:00
Armin Schrenk eb5aa4ee44 remove unnecessary binding 2020-05-22 11:14:35 +02:00
Tobias Hagemann adb09a0efe proofread strings 2020-05-20 17:45:54 +02:00
Martin Beyer 241eb8bed5 Implements #1182 By adding a button to forget the saved password 2020-05-20 15:04:33 +02:00
Martin Beyer 842a0d6ff3 Implements #1183 Saved Passwords are indicated 2020-05-20 15:02:53 +02:00
Martin Beyer 3200917df2 Merge remote-tracking branch 'origin/develop' into develop 2020-05-20 14:51:57 +02:00
Martin Beyer 12dcf0647d Reverted small error in 22859c9ffa to fix#1082 2020-05-20 14:49:12 +02:00
Martin Beyer 22859c9ffa Fixes #1082 Illegal mount options cannot be selected (WebDav + Windows)
By adding the visible and managed flags to the corresponding fxml tags, it is no longer possible to select illegal combinations.
2020-05-20 13:02:14 +02:00
Sebastian Stenzel 29182156df fixes #1196 2020-05-19 11:21:20 +02:00
Sebastian Stenzel 357d63f398 Added animation to unlock dialog 2020-05-14 10:37:51 +02:00
Sebastian Stenzel e594bf208d moved images to subdir 2020-05-14 07:53:51 +02:00
Sebastian Stenzel 2f0de3520a Refactored KeychainAccess in preparation of #1183, #1182 2020-05-13 19:59:32 +02:00
Sebastian Stenzel 8def68eb02 Merge branch 'master' into develop 2020-05-12 16:27:14 +02:00
Sebastian Stenzel aef33dc864 Merge branch 'release/1.5.4' 2020-05-12 16:26:44 +02:00
Sebastian Stenzel 06d2f2d9e9 Preparing 1.5.4 2020-05-12 16:21:50 +02:00
Sebastian StenzelandGitHub dad0ad76fb New Crowdin translations (#1166)
[ci skip]
2020-05-12 16:20:49 +02:00
Sebastian Stenzel 99fa8e7c8e fixes #1171 (or rather applying a workaround until we get an upstream fix) 2020-05-12 16:18:11 +02:00
Martin Beyer ab0f175edf Implemented hyperlink in preferences to reveal log files (#1184) 2020-05-12 11:59:22 +02:00
Ralph PlawetzkiandGitHub 8cb9728565 Implement changePassphrase from the secret-service API (#1191)
Fixes #1189
2020-05-12 07:41:10 +02:00
Ralph PlawetzkiandGitHub d91d27f2a4 Close unlockScene after entering the phrase and unlocking the vault (#1186) 2020-05-12 07:40:38 +02:00
Sebastian Stenzel b2a6e038ae Updated secret-service lib to 1.0.0
references #1169
2020-05-11 17:34:12 +02:00
Sebastian Stenzel 75f360903c recheck vault state when focusing window
fixes #1190
fixes #1110
fixes #1139
2020-05-11 08:08:15 +02:00
Sebastian Stenzel 79c3137b90 no need to be application-scoped 2020-05-11 07:58:29 +02:00
Sebastian Stenzel d2189d379c Using switch expressions 2020-05-11 07:47:15 +02:00
Sebastian Stenzel 49aead7323 Merge branch 'feature/refactored-unlock' into develop 2020-05-08 15:08:46 +02:00
Sebastian Stenzel 7bd610563f exception not thrown here
[ci skip]
2020-05-08 09:30:21 +02:00
Sebastian Stenzel 5c1a1ad162 respect choice made in #1083 2020-05-07 16:57:57 +02:00
Sebastian Stenzel 86906d0049 fixes #1083 2020-05-07 16:45:24 +02:00
Sebastian Stenzel 93011dc754 cleanup 2020-05-07 16:33:05 +02:00
Sebastian Stenzel b084b651af wipe memory when setting a new password 2020-05-07 15:57:56 +02:00
Sebastian Stenzel fecf9c0423 Fixes #1088 2020-05-07 14:18:09 +02:00
Sebastian Stenzel 117fe78a4a Refactored stage creation 2020-05-07 12:35:01 +02:00
Tobias Hagemann 153d43573a Merge branch 'master' into develop 2020-04-30 16:51:48 +02:00
Tobias Hagemann 9145f5d2f8 Merge branch 'release/1.5.3' 2020-04-30 16:51:01 +02:00
Tobias Hagemann 835ea3b640 preparing 1.5.3 2020-04-30 16:50:16 +02:00
Sebastian StenzelandGitHub 1e7eb23d1b New Crowdin translations (#1164)
[ci skip]
2020-04-30 16:48:22 +02:00
Sebastian Stenzel cfe25d0bf5 updating siv-mode for twice as fast filename encryption/decryption 2020-04-30 16:37:07 +02:00
Sebastian StenzelandGitHub b14939bd77 New Crowdin translations (#1159)
[ci skip]
2020-04-30 16:33:33 +02:00
Tobias Hagemann 26e140ee22 fixed checkmark color if it's selected and disabled 2020-04-30 16:31:25 +02:00
Tobias Hagemann 1c5ecf8c01 centered main.vaultlist.emptyList.onboardingInstruction 2020-04-30 14:52:16 +02:00
Tobias Hagemann 9b528a05b5 localized display name of ui themes, now actually use vaultOptions.mount.winDriveLetterOccupied localizations 2020-04-30 14:42:51 +02:00
Sebastian Stenzel 3a7aa6d64f fixes #1163, fixes #1131 2020-04-30 13:41:18 +02:00
Sebastian Stenzel 55820e47f9 Merge branch 'master' into develop 2020-04-29 16:47:55 +02:00
Sebastian Stenzel 94af8bd15a Merge branch 'release/1.5.2' 2020-04-29 16:47:22 +02:00
Sebastian Stenzel 4712c4f593 preparing 1.5.2 2020-04-29 16:34:06 +02:00
Sebastian StenzelandGitHub 42c856fc6f New Crowdin translations (#1135)
[ci skip]
2020-04-29 16:15:24 +02:00
Sebastian Stenzel 3618c4b8db Merge branch 'feature/NewMigrationFlow' into develop 2020-04-29 16:14:44 +02:00
Sebastian Stenzel bb681fa6d9 fixes #1116, at least properly handle errors if the underlying file system doesn't support migration 2020-04-29 14:59:16 +02:00
Armin SchrenkandGitHub 22e3840caa Update README.md 2020-04-29 12:02:15 +02:00
Sebastian Stenzel 461ec3ca43 Simpler solution to 8aa3da1 and 1702c6a2 2020-04-28 21:17:41 +02:00
Armin Schrenk 8aa3da14a4 fixing bug where unlock dialog is not shown anymore 2020-04-28 19:43:10 +02:00
Sebastian Stenzel 670d4a165c fixes #1134, fixes #1116
references #1144
2020-04-28 18:58:25 +02:00
Tobias Hagemann 9a9b19e6e2 fixed error message and removed wrong comment [ci skip] 2020-04-28 17:48:48 +02:00
Tobias Hagemann 206ba4c69a improved migration impossible 2020-04-28 17:46:45 +02:00
Tobias Hagemann 1702c6a243 hide/disable interactive elements when vault is processing 2020-04-28 17:05:00 +02:00
Armin Schrenk 8d2fe2fc03 Improving vault migration impossible dialogue 2020-04-28 12:26:38 +02:00
Armin Schrenk 4864eb3204 integrate migratiion impossible scene to migration workflow 2020-04-28 12:16:07 +02:00
Sebastian Stenzel 5721b63135 fixes #1115 2020-04-28 10:36:35 +02:00
Sebastian Stenzel c99e0ea656 Determine path length limitations during unlock 2020-04-28 09:48:25 +02:00
Armin Schrenk b1dc983d6b adding cryptofs to pom and add implementation notes to migrate dialogue 2020-04-27 18:06:37 +02:00
Armin Schrenk 808223d58e refined migration not possible dialogue 2020-04-27 16:59:09 +02:00
Armin Schrenk 4d5f6cbb52 update migration dialogue 2020-04-27 13:17:31 +02:00
Armin Schrenk fcdbc7a6cc Add migration impossible dialogue 2020-04-27 11:58:45 +02:00
Armin Schrenk 113b745050 add missing translation keys 2020-04-27 10:55:34 +02:00
Sebastian StenzelandGitHub e4cde7f66f Merge pull request #1143 from jellemdekker/feature/keycombo_clear_password_filed
Allow password field to be cleared with Ctrl/Command + backspace, fixes #885
2020-04-24 15:27:07 +02:00
jellemdekker f6c834fee2 Merged if-statements. 2020-04-24 15:23:08 +02:00
jellemdekker 96990788d9 Indent using tabs instead of spaces. 2020-04-24 15:22:33 +02:00
jellemdekker c204ed2601 Allow password field to be cleared with Ctrl/Command + backspace, implements #885. 2020-04-24 14:30:19 +02:00
Tobias Hagemann b882296c19 fixes #1123 2020-04-24 11:21:59 +02:00
Tobias Hagemann 186ed5c115 set title to vault name in unlock screen for improved compatibility with password managers 2020-04-23 22:16:23 +02:00
Sebastian Stenzel db29513376 one more switch expression 2020-04-23 14:36:41 +02:00
Sebastian Stenzel 0469e99baa Updated build dependencies 2020-04-23 14:22:24 +02:00
Sebastian Stenzel 37fcae8f0e replaced some "old" switch statements by switch expressions 2020-04-23 14:21:41 +02:00
Sebastian Stenzel 2902479fc1 Speed up build, make cache more efficient 2020-04-21 14:27:42 +02:00
Sebastian Stenzel 5ef7a3e76d Updated Build Badge 2020-04-21 14:15:56 +02:00
Sebastian Stenzel 041ce2504c Merge branch 'master' into develop 2020-04-21 14:12:00 +02:00
Sebastian Stenzel 8db889dbf5 Merge branch 'release/1.5.1' 2020-04-21 14:11:05 +02:00
Sebastian Stenzel a869fc219d Use tags, not maven versions 2020-04-21 14:05:36 +02:00
Sebastian Stenzel 002935af60 preparing 1.5.1 2020-04-21 13:49:37 +02:00
Sebastian Stenzel f3db7722b1 Updated CI config 2020-04-21 13:48:35 +02:00
Sebastian Stenzel 169014ef62 Updated CI config 2020-04-21 13:40:12 +02:00
Sebastian Stenzel 32d9e37708 Updated CI config 2020-04-21 13:27:28 +02:00
Sebastian Stenzel 57ee96a739 Merging CI workflows 2020-04-21 13:25:55 +02:00
Sebastian Stenzel 72f2bf4c42 Updated CI config 2020-04-21 13:19:21 +02:00
Sebastian Stenzel b8b2265f9d Updated CI config 2020-04-21 13:13:22 +02:00
Sebastian StenzelandGitHub 56db682571 New Crowdin translations (#1100)
[ci skip]
2020-04-21 12:54:13 +02:00
Sebastian Stenzel 3b690dfc6e More resilient loading of settings.json 2020-04-21 12:53:36 +02:00
Sebastian Stenzel 243c74b0cb Show stack trace in UI for vaults in error state 2020-04-21 12:38:36 +02:00
Sebastian Stenzel a9a983d7ed Apply upstream fix helping us to debug #1125 2020-04-21 12:37:55 +02:00
Tobias Hagemann 880260d467 disable password field und unreveal password when vault is processing 2020-04-21 08:40:12 +02:00
Sebastian Stenzel 07e5e18d4d Updated IDE settings to use JDK 14
[ci skip]
2020-04-21 08:00:55 +02:00
Sebastian Stenzel 9e243daffa Propagate upstream fix for #1124 2020-04-20 17:57:37 +02:00
Sebastian Stenzel 3ec2d4b701 Merge branch 'feature/gh-actions' into develop 2020-04-20 15:09:58 +02:00
Sebastian Stenzel 3eee522897 Log cause if a vault is in error state
[ci skip]
2020-04-20 15:09:32 +02:00
Sebastian Stenzel 408d16fabf store to run-specific cache, but restore from any previous run 2020-04-20 11:18:56 +02:00
Sebastian Stenzel 830941755b use cache key depending on git sha 2020-04-20 11:13:49 +02:00
Sebastian Stenzel 84cc81ec40 upload buildkits 2020-04-20 11:03:44 +02:00
Sebastian Stenzel a8b76a6914 if we want this to run package, we should ask it to package. 2020-04-20 10:55:35 +02:00
Sebastian Stenzel c9f560eb04 first attempt to make this a multi-stage build 2020-04-20 10:52:33 +02:00
Sebastian Stenzel 8993b3584b made sure to run jacoco 2020-04-20 10:33:24 +02:00
Sebastian Stenzel 93048647f5 Added env.CODACY_PROJECT_TOKEN 2020-04-20 10:24:59 +02:00
Sebastian Stenzel 75e35ca0e1 Manually run Codacy 2020-04-20 10:20:58 +02:00
Sebastian Stenzel 9205bafc56 Added maven dependency cache 2020-04-20 10:20:31 +02:00
Sebastian Stenzel 4a9dd7f175 Moving to GitHub Actions 2020-04-20 10:06:15 +02:00
m-p-3andGitHub 8d0c370f5a Update README.md, Security Architecture URL 404 (#1107)
[ci skip]
2020-04-18 09:51:24 +02:00
Tobias Hagemann 200e8f7b79 added missing text flow class 2020-04-18 00:35:22 +02:00
Sebastian Stenzel 467e87813d fixed typo
[ci skip]
2020-04-17 11:06:42 +02:00
Sebastian Stenzel 5b2af73c50 Merge branch 'master' into develop 2020-04-16 13:05:34 +02:00
Sebastian Stenzel d107917065 Merge branch 'release/1.5.0' 2020-04-16 13:04:27 +02:00
Tobias Hagemann d111a34736 updated third-party licenses [ci skip] 2020-04-16 09:50:33 +02:00
Tobias HagemannandGitHub a40847a280 updated sponsors [ci skip] 2020-04-14 18:58:15 +02:00
Sebastian Stenzel 6fc010e638 fixes #1092 2020-04-14 18:45:20 +02:00
Sebastian Stenzel d42ff80b25 Merge commit '1e76a5e92c3725dd46eb47a6651f2b4a0a7fab3f' into release/1.5.0 2020-04-14 18:44:31 +02:00
Sebastian StenzelandGitHub 1e76a5e92c New Crowdin translations (#1084)
[ci skip]
2020-04-14 18:43:33 +02:00
Sebastian Stenzel 05d21f6784 Fixed SNYK-JAVA-COMMONSCODEC-561518 by updating transitive dependency commons-codec 2020-04-08 10:24:23 +02:00
Sebastian Stenzel c1bd777c17 updated links to docs
[ci skip]
2020-03-30 11:11:20 +02:00
Sebastian Stenzel 128176db1f Added posibility to add build number to "about" dialog 2020-03-26 15:09:29 +01:00
Tobias Hagemann 005c4787a2 updated icloud drive path for windows 2020-03-26 14:46:47 +01:00
Sebastian Stenzel d1b364fd1b Added ~/iCloudDrive (default location on Windows) to cloud storage autodetection 2020-03-26 14:24:14 +01:00
Sebastian Stenzel 006d201400 Merge branch 'develop' into release/1.5.0 2020-03-26 11:59:50 +01:00
Sebastian StenzelandGitHub 2a964ae501 New Crowdin translations (#1081)
* New translations strings.properties
[ci skip]
2020-03-26 11:59:12 +01:00
Tobias Hagemann 09b6b0da28 renamed secondary css classes to muted, made "locked" badge muted 2020-03-26 11:55:46 +01:00
Sebastian Stenzel cceea1c7c1 Updated dependencies 2020-03-25 17:57:17 +01:00
Sebastian Stenzel 8c339d4f3c updated links to docs
[ci skip]
2020-03-25 10:40:53 +01:00
Sebastian Stenzel 85eb459182 Replaced bullet points in license list, because windows -.-
[ci skip]
2020-03-25 10:28:29 +01:00
Sebastian Stenzel fc818b37fd fixes #1077 2020-03-25 10:10:03 +01:00
Sebastian Stenzel cb9a33eeb3 Merged localizations from 'develop' into release/1.5.0
[ci skip]
2020-03-25 08:52:52 +01:00
Sebastian StenzelandGitHub 10d39f6192 New Crowdin translations (#1076)
* New translations strings.properties
[ci skip]
2020-03-25 08:51:38 +01:00
Sebastian Stenzel 2e6246528e updated link to documentation
[ci skip]
2020-03-13 16:08:06 +01:00
Sebastian Stenzel 0732a55d0e updated link to documentation
[ci skip]
2020-03-13 14:27:09 +01:00
Armin Schrenk c7597fbcc2 update strings.properties 2020-03-13 13:33:39 +01:00
Sebastian Stenzel 84bf7f0332 Preparing 1.5.0 2020-03-12 15:26:10 +01:00
Sebastian StenzelandGitHub abc518f907 New Crowdin translations (#1069)
* New translations
[ci skip]
2020-03-12 15:24:58 +01:00
Tobias Hagemann 25fd0de5d4 updated third-party licenses 2020-03-12 15:08:21 +01:00
Tobias Hagemann 70fcaff7f6 updated assets 2020-03-12 15:05:55 +01:00
Sebastian Stenzel cf668e820b Replaced mockup image 2020-03-12 13:42:40 +01:00
Sebastian Stenzel f688db310f Updated fuse-nio-adapter to get notarization working (see cryptomator/fuse-nio-adapter#41) 2020-03-12 11:35:19 +01:00
Sebastian Stenzel 45c7bc12bf Updated dependencies 2020-03-12 10:42:12 +01:00
Sebastian Stenzel 3d0d2903f7 Replaced dummy screenshot in "wrong file" dialog 2020-03-11 17:25:25 +01:00
Armin Schrenk 99ca7168e3 reworking the wrong file alert dialogue 2020-03-11 17:00:02 +01:00
Armin Schrenk c8e33acaf7 set owner of wrong file alert window 2020-03-11 16:58:51 +01:00
Armin Schrenk ce90b2b286 changing vault info text to be less demanding 2020-03-11 16:57:45 +01:00
Armin Schrenk 168245b31f adding generic close button label 2020-03-11 16:57:05 +01:00
Armin Schrenk cc86b11db9 adding fontawesome-info icon 2020-03-11 16:56:45 +01:00
Tobias Hagemann bca8121732 enabled image auto size of tray icon (only linux should have an effect) 2020-03-11 15:03:59 +01:00
Tobias Hagemann a0807c2e0c updated about screen, updated third-party license generation 2020-03-11 14:21:13 +01:00
Tobias Hagemann 96a3c025ab hide access point in reveal button if it's empty 2020-03-11 14:07:40 +01:00
Sebastian Stenzel 63a51ecee7 Added about dialog and use license-maven-plugin to generate list of third party licenses 2020-03-10 13:24:31 +01:00
Sebastian Stenzel 4976df4139 Some more error handling 2020-03-10 09:34:26 +01:00
Sebastian Stenzel 7fc5b1e55f Refactored handling of unexpected errors 2020-03-10 09:25:15 +01:00
Sebastian Stenzel cdb0fb37a9 localized recovery key printout 2020-03-09 22:27:10 +01:00
Sebastian Stenzel 6dbe136f39 custom maven settings should no longer be required here 2020-03-09 16:55:59 +01:00
Sebastian Stenzel 73266d53d1 fixes #960 2020-03-09 16:12:35 +01:00
Sebastian Stenzel 76ddca0b47 Added hyperlink to downloads page in updates notification window 2020-03-09 16:10:52 +01:00
Sebastian Stenzel 3f2f368dca Show errors in GUI during vault creation 2020-03-09 15:46:22 +01:00
Sebastian Stenzel 54c0df51d5 replaced AddVaultFailureExistingController by AddVaultGenericErrorController 2020-03-09 14:38:36 +01:00
Sebastian Stenzel 7f8659afed did some more TODOs 2020-03-09 12:12:35 +01:00
Sebastian Stenzel 4881565744 Added welcome screen and onboarding text 2020-03-09 11:36:22 +01:00
Sebastian Stenzel f2f14063a4 fixed NPE when deselecting vault 2020-03-09 11:33:00 +01:00
Tobias Hagemann bf27ec2968 proofreading 2020-03-07 10:26:31 +01:00
Armin Schrenk 1c30b20969 updating text of first document inside a vault 2020-03-06 18:53:26 +01:00
Armin Schrenk f4a2d960cf Merge branch 'fix' into develop 2020-03-06 18:52:18 +01:00
Armin Schrenk 70b70c55f3 addtional removal of RTF sequences in strings.properties 2020-03-06 18:49:00 +01:00
Armin Schrenk 99ed87de17 updating vault file text and removing RTF format instructions from strings.properties 2020-03-06 18:28:56 +01:00
Sebastian Stenzel 8033c85727 some cleanup, did some todos 2020-03-06 16:24:16 +01:00
Tobias Hagemann 0eec66a9e0 updated logo [ci skip] 2020-03-06 16:11:29 +01:00
Sebastian Stenzel fca793e403 Added "Vault Missing" screen 2020-03-06 16:05:16 +01:00
Tobias Hagemann b5a8442ed2 added "unlock themes" hyperlink in general preferences if no valid license has been found 2020-03-06 12:20:33 +01:00
Sebastian Stenzel 99315f8038 auto unlock vaults sequentially (#1044) 2020-03-04 10:01:53 +01:00
Tobias Hagemann 2c422d5e78 updated logo 2020-03-03 15:30:36 +01:00
Tobias Hagemann 37d84d3f7f updated tray icons, heights weren't quite right 2020-03-02 12:36:50 +01:00
Tobias Hagemann de1bed6742 updated tray and window icons 2020-03-01 15:01:16 +01:00
Sebastian Stenzel c3db5438da Merge branch 'master' into develop 2020-02-27 10:03:13 +01:00
Sebastian Stenzel c6d88f1dc4 Merge branch 'release/1.5.0-beta3' 2020-02-27 10:02:37 +01:00
Sebastian Stenzel 4a2d71405d preparing 1.5.0-beta3 2020-02-27 09:58:37 +01:00
Sebastian StenzelandGitHub f98c3aa5ca New Crowdin translations (#1064)
[ci skip]
2020-02-27 09:54:48 +01:00
Sebastian Stenzel 7d389b561d use shorter names for rtf files to make sure the name doesn't get collapsed in the file explorer 2020-02-27 09:40:52 +01:00
Sebastian Stenzel 7056d35254 refer to docs.cryptomator.org instead of google.com in README file 2020-02-27 09:39:03 +01:00
Sebastian Stenzel 6a8234ddd9 fixes #1046 2020-02-26 16:09:08 +01:00
Tobias Hagemann 3d3eed0ed2 updated logo and removed unused assets 2020-02-21 12:08:58 +01:00
Sebastian Stenzel e479b35846 typo
[ci skip]
2020-02-20 17:43:19 +01:00
Sebastian Stenzel 83c7421a96 renamed keys
[ci skip]
2020-02-20 17:19:56 +01:00
Sebastian StenzelandGitHub 116091f2e0 New Crowdin translations (#1041)
* New translations
[ci skip]
2020-02-20 17:17:49 +01:00
Sebastian Stenzel ce11017609 Moved masterkey-related vault options to its own tab
Also made remaining vault recovery labels localizable
2020-02-20 16:27:21 +01:00
Sebastian Stenzel caa8c84d8a Can now use a recovery key to reset a vault's password 2020-02-20 15:31:22 +01:00
Sebastian Stenzel e14fc56b37 fixed autocompletion for pasting text 2020-02-20 14:09:32 +01:00
Sebastian Stenzel 0d29e56948 Implemented word auto-completion for recovery key entry field 2020-02-20 11:10:42 +01:00
Sebastian Stenzel d2a27c782d No longer warn about this method invocation 2020-02-20 11:09:52 +01:00
Sebastian Stenzel 864e92ea59 updated funding.yml 2020-02-20 09:51:43 +01:00
Sebastian Stenzel 97dfe9a1d4 fixed unit test 2020-02-20 00:28:48 +01:00
Sebastian Stenzel d7edfd13a7 Began vault recovery wizard 2020-02-19 17:27:07 +01:00
Sebastian Stenzel 35207de7cc fixes #1056 2020-02-17 22:36:13 +01:00
Sebastian Stenzel adf0e3720d dedup 2020-02-17 20:34:20 +01:00
Sebastian Stenzel f73c1889b7 Show generic error screen in case of exceptions during migration (references #1056) 2020-02-17 20:23:19 +01:00
Sebastian Stenzel 18ff1d2898 fixes #986, fixes #1062 2020-02-17 18:45:31 +01:00
Sebastian Stenzel c6e2fa11a4 updated cryptofs to 1.9.2, fixes #1057, references #1056 2020-02-17 18:14:08 +01:00
Sebastian Stenzel 3fac8b7cd6 updated dependencies 2020-02-17 18:12:58 +01:00
Sebastian Stenzel f62faa72ce (Auto)Unlock via VaultService (fixes #1044) 2020-02-13 23:50:26 +01:00
Sebastian Stenzel 57256d0733 began implementation of new auto unlocker (references #1044) 2020-02-13 17:16:09 +01:00
Sebastian Stenzel e1f44fb48a App lifecycle fixes 2020-02-13 16:29:49 +01:00
Sebastian Stenzel 62676d5a83 minor ui state tweaks
[ci skip]
2020-02-13 14:32:23 +01:00
Armin Schrenk 7755256956 further additions to #1060 2020-02-12 16:19:42 +01:00
Armin Schrenk e1cf8546b7 adding recover vault dialogue stub 2020-02-12 15:02:06 +01:00
Tobias Hagemann e40837da2c updated primary_d2 color (somehow there was a small discrepancy in the corporate design manual) [ci skip] 2020-01-31 13:25:11 +01:00
Tobias Hagemann e7c3c0ab53 updated color palette 2020-01-30 15:33:54 +01:00
Sebastian Stenzel 2336b9c622 write vault migration events to additional upgrade log (references #1058) 2020-01-30 09:24:46 +01:00
Sebastian StenzelandGitHub 4e2122a64f Merge pull request #1050 from zhouer/close_request
Handle close request event for main window, fixes #1040
2020-01-16 12:22:56 +01:00
Sebastian Stenzel 833bb085e6 Using disting ExecutorService and ScheduledExecutorService since the latter doesn't scale beyond its pre-defined number of core threads
fixes #1051
2020-01-15 13:07:19 +01:00
En-Jan Chou 1ec9b0507d Prevent window close if user choose cancel in quit window 2020-01-14 17:12:36 -05:00
En-Jan Chou b6a4f70ec9 Handle close request event for main window
When receiving close request event, main window should quit program
if there is no system tray available, and just like the close button
was clicked. The window close request event happens when user close
window by pressing alt-f4 (Gnome) or when receiving WM_DELETE_WINDOW
xwindow event. Current behavior is just close the window and let the
program keep running, and there is no way to quit program without
system tray.
2020-01-14 16:54:47 -05:00
Sebastian Stenzel eb047e29a0 jcenter requires https now
[ci skip]
2020-01-14 22:06:01 +01:00
Sebastian Stenzel 5dc1d9b2e0 Fail fast (ammendment for #1047) 2020-01-14 21:46:52 +01:00
Sebastian Stenzel 362f3eac63 Certain app lifecycle event handlers are now now longer @TrayMenuScoped but rather @Singleton, so they get set up even if there is no TrayIcon (references #1035) 2020-01-14 21:43:45 +01:00
Sebastian StenzelandGitHub f0b26c60c4 Merge pull request #1045 from zhouer/minimize
Add minimize button, fixes #1035
2020-01-14 20:59:10 +01:00
Sebastian StenzelandGitHub e827d86967 Merge pull request #1047 from zhouer/icons
Add multiple icons and let system choose the best size
2020-01-14 20:54:18 +01:00
Tobias Hagemann 04533c0338 downgrading font awesome from pro to free 2020-01-14 16:57:13 +01:00
En-Jan Chou e148e39fef Rollback TrayMenuController to FxApplication code moving 2020-01-13 03:48:34 -05:00
En-Jan Chou cb97905c98 Use static emptyList and close InputStream 2020-01-12 21:17:56 -05:00
En-Jan Chou 7ec7cecbfd Add multiple icons and let system choose the best size 2020-01-12 13:42:17 -05:00
En-Jan Chou 3369401f1c Add minimize button and tray menu refactoring
* Add minimize button and change close button behavior
  * close main window (minimize to tray) if system tray available,
    quit application otherwise.
  * show minimize button if system tray unavailable
* Move some codes from TrayMenuController to FxApplication, includes:
  * Desktop integrations (shortcut, quit handlers...)
  * vaults change listener for sudden termination
  * public method showPreferenceWindow change to showPerferenceTab
    due to name conflict
  * public method quitApplication for both main window and system tray
  * shutdown hook for unmounting vaults on shutdown
* Add a new i18n string: main.minimizeBtn.tooltip
2020-01-12 05:29:56 -05:00
Sebastian Stenzel 09b9cfe027 onboarding text in empty vault list is now centered 2020-01-10 16:12:00 +01:00
Sebastian Stenzel e94ac3720b onboarding text in empty vault list is now centered 2020-01-10 14:46:25 +01:00
Sebastian Stenzel 4414d60026 Merge branch 'master' into develop 2020-01-09 17:16:40 +01:00
Sebastian Stenzel a6e680e32d Merge branch 'release/1.5.0-beta2' 2020-01-09 17:15:55 +01:00
Sebastian Stenzel d60a024c63 preparing 1.5.0-beta2 2020-01-09 16:50:38 +01:00
Sebastian StenzelandGitHub cc1b536656 New Crowdin translations (#1039)
[ci skip]
2020-01-09 16:49:39 +01:00
Sebastian Stenzel 85e773abef enable themes for donators 2020-01-09 16:34:31 +01:00
Sebastian Stenzel 4690bc56aa fixes #1038 2020-01-09 16:04:46 +01:00
Sebastian Stenzel 292c2676fd fixes #980 2020-01-09 15:44:25 +01:00
Sebastian Stenzel f7c6604c7c fixes #1029 2020-01-09 15:16:13 +01:00
Sebastian Stenzel 22310eb957 updated donation key store uri 2020-01-09 14:38:23 +01:00
Sebastian Stenzel 6d17d1298b removed unused fields 2020-01-09 13:03:22 +01:00
Sebastian Stenzel e90a680620 Split up MainWindowController, as it grew too big. The title bar is now handled by MainWindowTitleController
(@zhouer add the minimize button for #1035 to this new controller and fxml file)
2020-01-09 12:18:24 +01:00
Sebastian Stenzel 35d0ccfe89 allow resizing main window on all four corners
fixes #995
2020-01-09 12:06:12 +01:00
Tobias Hagemann 62cc454367 updated license public key 2020-01-09 10:35:27 +01:00
Tobias Hagemann 8bb277fe56 added iCloud Drive and OneDrive location presets 2020-01-09 10:27:56 +01:00
Sebastian Stenzel 67485b76af Make sure that adding a vault located at ~/foo is noop when a vault located at /home/user/foo already exists
fixes #1032
2020-01-08 16:50:08 +01:00
Sebastian Stenzel 270e60d7cf updated logging
[ci skip]
2020-01-08 15:41:26 +01:00
Sebastian Stenzel 11ffec862e Added autostart support for windows
fixes #418
2020-01-07 17:56:05 +01:00
Sebastian Stenzel d37e0dd5e1 Determine autostart state async (#418) 2020-01-07 17:55:36 +01:00
Sebastian Stenzel 960c3665e0 Localizations 2020-01-06 12:54:51 +01:00
Sebastian Stenzel 3396c79c38 updated intellij config
[ci skip]
2020-01-06 12:45:01 +01:00
Sebastian Stenzel cc1517f1b8 Added checkbox for auto start on macOS (#418) 2020-01-06 12:37:36 +01:00
Sebastian Stenzel 4f3ff55ae7 updated stale config
[ci skip]
2020-01-06 09:48:18 +01:00
Sebastian Stenzel f51362e95e cleanup
[ci skip]
2020-01-06 09:46:14 +01:00
Sebastian Stenzel 415dfece58 sames as in 9b6145ce:
We only want the user to trigger the listener
2020-01-06 09:46:01 +01:00
Sebastian StenzelandGitHub 3bdb5353da New Crowdin translations (#1015)
[ci skip]
2020-01-04 22:11:48 +01:00
Sebastian StenzelandGitHub 6ddf1b59ef Merge pull request #1031 from zhouer/hide_start_hidden
Hide startHidden setting when system tray is not supported
2019-12-29 14:18:35 +01:00
En-Jan Chou ef88f11c4f Hide startHidden setting when system tray is not supported
For platform not supporting system tray, users will have no chance to show
window and modify settings back again if the window is hidden at startup.
2019-12-26 09:40:33 -05:00
Sebastian Stenzel ec800c5439 Enforce minimum password length (amendment to #1018) 2019-12-18 15:31:52 +01:00
Sebastian Stenzel a2f3f5d254 fixes #1018, references #979 2019-12-18 14:58:36 +01:00
Sebastian Stenzel f475f70adf Updated zxcvbn4j to 1.3.0, which allows us to swipe the password from memory even after measuring its strength 2019-12-18 14:40:04 +01:00
Sebastian StenzelandGitHub 93c3da66da Merge pull request #1024 from zhouer/fix_mount_point
Initialize radio button before binding settings to it
2019-12-18 12:16:12 +01:00
En-Jan Chou 9b6145ce3f Initialize radio button before binding settings to it
The usesIndividualMountPath setting will be cleared if it bind to
an uninitialized radio button. This patch sets radio button with
current settings before binding the setting to the radio button.
2019-12-18 02:39:03 -05:00
Sebastian Stenzel 148eed172a Deduplicated UI code
Made "Enter Password" and "Reenter Password" a reusable component that is included in its original places
preparation for #1018
2019-12-17 17:35:16 +01:00
Sebastian Stenzel c97f146964 enabled "lock all" from tray menu (#297, #863) 2019-12-16 14:44:14 +01:00
Sebastian Stenzel a1034f5663 Refactored "lock all" task 2019-12-16 14:43:33 +01:00
Sebastian Stenzel 938b351f33 enabled "reveal" from tray menu (#297) 2019-12-16 13:10:43 +01:00
Sebastian Stenzel d870ecbcdb moved reveal() to VaultService 2019-12-16 13:03:28 +01:00
Sebastian Stenzel 5dff2126c4 cleanup of new VaultService 2019-12-16 11:22:30 +01:00
Sebastian Stenzel 41a6cc15e8 run "lock all" service on shared executorservice 2019-12-16 10:32:35 +01:00
Sebastian Stenzel f21b30c009 removed unused field 2019-12-16 10:31:04 +01:00
Sebastian Stenzel d69b63acc3 enabled "lock" from tray menu (#297) 2019-12-11 15:57:39 +01:00
Sebastian Stenzel f95b2baad5 "lock" deduplication 2019-12-11 15:57:14 +01:00
Sebastian Stenzel 1a4d1fffb3 shutdown logback manually 2019-12-11 13:53:32 +01:00
Sebastian Stenzel ac536ba125 Some shutdown hook refactorings for #980 2019-12-04 17:50:30 +01:00
Sebastian Stenzel 362b225d66 Fixes #939 2019-11-27 16:39:40 +01:00
Sebastian Stenzel 7d0bdc1a63 Show stack trace in case of unexpected exceptions 2019-11-27 15:44:53 +01:00
Sebastian Stenzel 94e3b21e44 Typo
[ci skip]
2019-11-27 13:20:44 +01:00
Sebastian Stenzel 23f89c1dc9 Reevaluate vault state when selecting vault 2019-11-26 17:21:28 +01:00
Sebastian Stenzel ce9c2f2c7a removed unused import
[ci skip]
2019-11-26 17:21:08 +01:00
Tobias Hagemann 44e97ab046 smaller text size for path in reveal button [ci skip] 2019-11-26 17:02:13 +01:00
Sebastian Stenzel 5d0a1fd49f tabpane styling
[ci skip]
2019-11-26 16:39:32 +01:00
Sebastian Stenzel ffc1d8dc1e simplified 2019-11-22 14:23:55 +01:00
Sebastian Stenzel 54fca93bba deduplicated code 2019-11-22 14:21:51 +01:00
Sebastian Stenzel c281687910 added copy/print buttons to recovery key dialog 2019-11-22 13:43:40 +01:00
Sebastian Stenzel 6229d7abbe Updated password and recovery key instructions 2019-11-22 13:10:50 +01:00
Sebastian Stenzel 01644eddb6 increase wizard dimensions
[ci skip]
2019-11-21 16:58:05 +01:00
Sebastian Stenzel 6e30df3796 Let the user choose whether a recovery key should be shown during vault creation 2019-11-21 16:57:43 +01:00
Sebastian Stenzel f87fa319ff renamed class 2019-11-20 17:14:31 +01:00
Sebastian Stenzel 9b019726bb show badge for missing license key in window title 2019-11-20 17:12:11 +01:00
Sebastian StenzelandGitHub cceafb76ed New Crowdin translations
New translations strings.properties
[ci skip]
2019-11-20 17:09:01 +01:00
Tobias Hagemann 39e2994c69 updated drag-n-drop-indicator styling 2019-11-20 16:53:02 +01:00
Sebastian Stenzel 1ddfcc3219 reworked drag'n'drop l&f 2019-11-20 15:03:03 +01:00
Tobias Hagemann 687f11596e added disabled styling to choice-box 2019-11-19 21:52:52 +01:00
Sebastian Stenzel b445f614fb Made mount point settings localizable
(and some fxml cleanup)
[ci skip]
2019-11-19 21:39:00 +01:00
Sebastian Stenzel c6fc1d93a0 save donation key to settings 2019-11-19 21:20:00 +01:00
Sebastian Stenzel 28d58922e3 TextArea needs a prefRowCount, otherwise it attempts to use all available space, displacing other elements.
fixes #1012
2019-11-18 10:11:20 +01:00
Sebastian Stenzel b884ea7ddc added registration key to preferences 2019-11-15 15:56:35 +01:00
Sebastian Stenzel 1717e20b61 Add JWT verifier 2019-11-14 17:02:41 +01:00
Sebastian Stenzel 6222f96b01 Merge branch 'master' into develop 2019-11-12 13:40:34 +01:00
Sebastian Stenzel 88f83c5cdb Merge branch 'release/1.5.0-beta1' 2019-11-12 13:33:08 +01:00
Sebastian Stenzel c8059bef78 bumped version
[ci skip]
2019-11-12 13:32:51 +01:00
Sebastian Stenzel 638b731cf8 always set version to SNAPSHOT-{commit} for untagged CI builds 2019-11-12 13:23:05 +01:00
Sebastian Stenzel b2b6e304ed updated CI config 2019-11-12 13:13:58 +01:00
Sebastian Stenzel 0748709f40 Updated dependencies 2019-11-11 16:42:56 +01:00
Sebastian StenzelandGitHub d8ee446d37 New Crowdin translations (#987)
* New translations strings.properties
[ci skip]
2019-11-11 16:36:48 +01:00
Sebastian Stenzel 9932185ccc fixed typo
kudos to our translation team
[ci skip]
2019-10-31 22:10:37 +01:00
Sebastian Stenzel 77afd4688a ide settings
[ci skip]
2019-10-31 22:10:09 +01:00
Sebastian Stenzel 9a5ef3f6ff updated cryptofs to 1.9.0-rc1 2019-10-31 01:29:30 +01:00
Sebastian Stenzel c99f23a4c7 Merge branch 'support/1.4.x' into develop
# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
2019-10-31 01:11:02 +01:00
Sebastian Stenzel 274c3886f5 Merge branch 'hotfix/1.4.17' into support/1.4.x 2019-10-31 01:01:24 +01:00
Sebastian Stenzel 95db29158c fixes #997 2019-10-31 00:54:49 +01:00
Sebastian Stenzel 872680a737 updated dependencies, removed commons-io 2019-10-31 00:54:37 +01:00
Sebastian Stenzel 0ba12f6301 bumped version to 1.4.17 2019-10-31 00:54:09 +01:00
Armin Schrenk 248df9da51 TODOs 2019-10-23 14:23:53 +02:00
Armin Schrenk 702408d488 phrasing 2019-10-23 14:23:44 +02:00
Armin Schrenk dd1506f17a windows: fixing that already used drive letters are not shown as such in drop down menu 2019-10-23 13:07:41 +02:00
Sebastian Stenzel 7fb5c741ad get rid of some legacy code with too much if/else 2019-10-18 14:34:48 +02:00
Sebastian Stenzel aa61ab2b6e allow changing of user interface orientation via settings 2019-10-18 12:51:41 +02:00
Armin Schrenk 7a1e20d732 showing custom mountPath if selected 2019-10-16 16:58:50 +02:00
Armin Schrenk c1a5e187b6 localization 2019-10-16 16:49:21 +02:00
Armin Schrenk 57d3f788e6 further improving windows mount options 2019-10-16 16:41:28 +02:00
Armin Schrenk ca73c3ad90 Updating WinDriveLetters since Dokany be installed in version 1.3.x 2019-10-16 15:57:08 +02:00
Armin Schrenk aec367dcc7 adding TODO 2019-10-16 15:49:17 +02:00
Armin Schrenk 56e7c13cb1 including windows mount option for selecting mount point (without functionality) 2019-10-16 14:32:10 +02:00
Sebastian Stenzel 3b4f384bfd there shouldn't be a "."
[ci skip]
2019-10-14 10:51:16 +02:00
Sebastian Stenzel d1a20da7e0 Localization [ci skip] 2019-10-14 10:22:23 +02:00
Tobias HagemannandGitHub 4b3533f717 say my name [ci skip] 2019-10-14 00:31:49 +02:00
Sebastian Stenzel 6535adef44 Merge branch 'master' into develop 2019-10-13 15:42:09 +02:00
Sebastian Stenzel f69cde1469 Merge branch 'release/1.5.0-alpha2' 2019-10-13 15:41:27 +02:00
Sebastian Stenzel 59643b762f Preparing 1.5.0-alpha2 2019-10-13 15:36:52 +02:00
Sebastian Stenzel ec69c1411b Merge commit 'ad28d4510d8b99db02c1883f1061817b658f3407' into develop
# Conflicts:
#	main/ui/src/main/resources/i18n/strings_de.properties
2019-10-13 15:35:00 +02:00
Sebastian Stenzel ad28d4510d New translations strings.properties (German)
[ci skip]
2019-10-13 15:26:53 +02:00
Sebastian Stenzel 111e500928 only show migration's progressbar when there actually is any progress 2019-10-13 15:20:38 +02:00
Sebastian Stenzel b5cb129ff0 updated to lastest cryptofs beta 2019-10-13 14:46:25 +02:00
Sebastian Stenzel 8a1586e5e8 New translations strings.properties (Japanese)
[ci skip]
2019-10-12 08:15:37 +02:00
Sebastian Stenzel e1959211de New translations strings.properties (French)
[ci skip]
2019-10-11 22:50:43 +02:00
Sebastian Stenzel 53494fa141 New translations strings.properties (French)
[ci skip]
2019-10-11 22:08:38 +02:00
Sebastian Stenzel 7fdab3a2ab New translations strings.properties (French)
[ci skip]
2019-10-11 21:27:17 +02:00
Sebastian Stenzel cb749c2fba New translations strings.properties (French)
[ci skip]
2019-10-11 19:58:32 +02:00
Sebastian Stenzel 453efe9998 New translations strings.properties (French)
[ci skip]
2019-10-11 19:26:49 +02:00
Sebastian Stenzel 2948b78cbe showing the window shouldn't be a decision made by the vault list controller.
when opening a .cryptomator file, the handler for open file requests is responsible for showing the main window.
2019-10-11 15:48:28 +02:00
Sebastian Stenzel 5a9f993df8 updated cryptofs to fix a migration problem 2019-10-11 13:23:19 +02:00
Sebastian Stenzel 4936cc76d0 New translations strings.properties (Korean)
[ci skip]
2019-10-11 00:45:55 +02:00
Sebastian Stenzel 4a15467ff5 New translations strings.properties (Italian)
[ci skip]
2019-10-10 22:41:06 +02:00
Sebastian Stenzel bb09b32885 New translations strings.properties (French)
[ci skip]
2019-10-10 18:57:37 +02:00
Sebastian Stenzel 4c9372747c New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2019-10-10 12:59:48 +02:00
Sebastian Stenzel 1c04c22617 New translations strings.properties (Japanese)
[ci skip]
2019-10-10 10:18:14 +02:00
Sebastian Stenzel 675146d20c New translations strings.properties (Japanese)
[ci skip]
2019-10-10 09:48:14 +02:00
Sebastian Stenzel 56ee6af9de New translations strings.properties (Russian)
[ci skip]
2019-10-10 08:32:02 +02:00
Sebastian Stenzel 926a0b3717 New translations strings.properties (Spanish)
[ci skip]
2019-10-10 06:26:05 +02:00
Sebastian Stenzel eae28ce76d New translations strings.properties (Spanish)
[ci skip]
2019-10-10 05:57:57 +02:00
Sebastian Stenzel 99c34539e6 New translations strings.properties (German)
[ci skip]
2019-10-09 21:28:50 +02:00
Sebastian Stenzel 0dfafdd874 New translations strings.properties (German)
[ci skip]
2019-10-09 21:02:41 +02:00
Sebastian Stenzel a8cb40831e New translations strings.properties (Dutch)
[ci skip]
2019-10-09 20:21:07 +02:00
Sebastian Stenzel 3b1bed9345 New translations strings.properties (Swedish)
[ci skip]
2019-10-09 19:29:01 +02:00
Sebastian Stenzel f18b81bdb7 New translations strings.properties (Spanish)
[ci skip]
2019-10-09 19:01:38 +02:00
Armin Schrenk 4a61fe372e enhancing error handling in storage location selection when creating a new vault 2019-10-09 18:24:23 +02:00
Sebastian Stenzel 0bd0543d10 New translations strings.properties (Russian)
[ci skip]
2019-10-09 17:49:00 +02:00
Sebastian Stenzel 06a3a04840 New translations strings.properties (Italian)
[ci skip]
2019-10-09 17:48:58 +02:00
Sebastian Stenzel 3eb379b1e9 New translations strings.properties (Swedish)
[ci skip]
2019-10-09 17:07:27 +02:00
Sebastian Stenzel 52e7707f81 New translations strings.properties (Greek)
[ci skip]
2019-10-09 17:07:25 +02:00
Sebastian Stenzel 28d2424cd5 New translations strings.properties (Japanese)
[ci skip]
2019-10-09 17:07:23 +02:00
Sebastian Stenzel 187e9f17fc New translations strings.properties (Korean)
[ci skip]
2019-10-09 17:07:22 +02:00
Sebastian Stenzel b9776a1017 New translations strings.properties (Croatian)
[ci skip]
2019-10-09 17:07:21 +02:00
Sebastian Stenzel 3fbf28eea9 New translations strings.properties (Portuguese)
[ci skip]
2019-10-09 17:07:19 +02:00
Sebastian Stenzel 99e7ec7dc2 New translations strings.properties (Turkish)
[ci skip]
2019-10-09 17:07:18 +02:00
Sebastian Stenzel a9b4512ce6 New translations strings.properties (Dutch)
[ci skip]
2019-10-09 17:07:16 +02:00
Sebastian Stenzel feb9ee238d New translations strings.properties (French)
[ci skip]
2019-10-09 17:07:14 +02:00
Sebastian Stenzel 748f7ca889 New translations strings.properties (Czech)
[ci skip]
2019-10-09 17:07:12 +02:00
Sebastian Stenzel 87a469f264 New translations strings.properties (Spanish)
[ci skip]
2019-10-09 17:07:11 +02:00
Sebastian Stenzel 59e0175d65 New translations strings.properties (Russian)
[ci skip]
2019-10-09 17:07:09 +02:00
Sebastian Stenzel 7595f5317d New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2019-10-09 17:07:07 +02:00
Sebastian Stenzel 3ba4e87f1d New translations strings.properties (Italian)
[ci skip]
2019-10-09 17:07:06 +02:00
Sebastian Stenzel 0a7aec26cc New translations strings.properties (German)
[ci skip]
2019-10-09 17:07:04 +02:00
Armin Schrenk d70b7e12ef add TODO 2019-10-09 16:48:20 +02:00
Armin Schrenk 54d2591391 adding error screen for adding existing vault 2019-10-09 16:48:07 +02:00
Armin Schrenk 4f70695ceb reducing possible mistake when adding new controller to module 2019-10-09 16:45:50 +02:00
Sebastian Stenzel 8f0a151018 New translations strings.properties (Spanish)
[ci skip]
2019-10-09 16:24:33 +02:00
Sebastian Stenzel cd64460e62 added shake animation 2019-10-09 16:15:58 +02:00
Sebastian Stenzel db3c0622c6 New translations strings.properties (Swedish)
[ci skip]
2019-10-09 15:55:05 +02:00
Sebastian Stenzel ac0092b178 New translations strings.properties (Korean)
[ci skip]
2019-10-09 15:55:02 +02:00
Sebastian Stenzel fab32e9e93 New translations strings.properties (Russian)
[ci skip]
2019-10-09 15:55:00 +02:00
Sebastian Stenzel 3d1129b0f3 New translations strings.properties (Italian)
[ci skip]
2019-10-09 15:54:57 +02:00
Sebastian Stenzel 89b2ff74f3 New translations strings.properties (German)
[ci skip]
2019-10-09 15:54:54 +02:00
Sebastian Stenzel a43e8fc461 New translations strings.properties (Swedish)
[ci skip]
2019-10-09 15:21:38 +02:00
Sebastian Stenzel 98d3fddfcc New translations strings.properties (Greek)
[ci skip]
2019-10-09 15:21:36 +02:00
Sebastian Stenzel ff36fff091 New translations strings.properties (Japanese)
[ci skip]
2019-10-09 15:21:35 +02:00
Sebastian Stenzel 7d02108c8b New translations strings.properties (Korean)
[ci skip]
2019-10-09 15:21:33 +02:00
Sebastian Stenzel 593f37d5fe New translations strings.properties (Croatian)
[ci skip]
2019-10-09 15:21:32 +02:00
Sebastian Stenzel 7abe9c627b New translations strings.properties (Portuguese)
[ci skip]
2019-10-09 15:21:30 +02:00
Sebastian Stenzel a0923c3c9b New translations strings.properties (Turkish)
[ci skip]
2019-10-09 15:21:29 +02:00
Sebastian Stenzel 439042ab95 New translations strings.properties (Dutch)
[ci skip]
2019-10-09 15:21:28 +02:00
Sebastian Stenzel 113e505c52 New translations strings.properties (French)
[ci skip]
2019-10-09 15:21:26 +02:00
Sebastian Stenzel f01e0ae194 New translations strings.properties (Czech)
[ci skip]
2019-10-09 15:21:25 +02:00
Sebastian Stenzel 5540cef257 New translations strings.properties (Spanish)
[ci skip]
2019-10-09 15:21:23 +02:00
Sebastian Stenzel ab16ee493f New translations strings.properties (Russian)
[ci skip]
2019-10-09 15:21:21 +02:00
Sebastian Stenzel b1a1d1029c New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2019-10-09 15:21:20 +02:00
Sebastian Stenzel a46b4aa768 New translations strings.properties (Italian)
[ci skip]
2019-10-09 15:21:18 +02:00
Sebastian Stenzel 245fe4b525 New translations strings.properties (German)
[ci skip]
2019-10-09 15:21:17 +02:00
Sebastian Stenzel c5a9926652 Added localizable labels to recovery key display window 2019-10-09 15:15:13 +02:00
Sebastian Stenzel 7032862a65 Added basic CSS for TextArea 2019-10-09 15:01:43 +02:00
Sebastian Stenzel 2012229c46 fixed tests 2019-10-09 14:14:38 +02:00
Sebastian Stenzel a6672ddbfc oxfordTop5000WordsSortedByLength.stream().filter(Pattern.compile("[a-z]{2,8}").asMatchPredicate()).distinct().limit(4096) 2019-10-09 14:04:28 +02:00
Sebastian Stenzel 8dd2147638 AppleScriptEngineFactory no longer exists since Java 9 (see https://bugs.openjdk.java.net/browse/JDK-8143404)
Formerly used in TrayIconUtil.java, which no longer exists either
2019-10-09 11:30:01 +02:00
Sebastian Stenzel 7a29a1b680 New translations strings.properties (Swedish)
[ci skip]
2019-10-09 08:48:14 +02:00
Sebastian Stenzel f4983f7862 New translations strings.properties (Spanish)
[ci skip]
2019-10-08 23:46:34 +02:00
Sebastian Stenzel 488bd1087a New translations strings.properties (German)
[ci skip]
2019-10-08 22:23:21 +02:00
Sebastian Stenzel d557136295 New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2019-10-08 21:42:26 +02:00
Sebastian Stenzel 87f4b639a0 New translations strings.properties (Italian)
[ci skip]
2019-10-08 20:38:54 +02:00
Sebastian Stenzel dbb9379a2e New translations strings.properties (Swedish)
[ci skip]
2019-10-08 20:10:14 +02:00
Sebastian Stenzel fa86ae68ea Removed old 1.4.x localizations 2019-10-08 20:03:02 +02:00
Sebastian Stenzel f82fddc8fe Made recovery key creation a two-step wizard 2019-10-08 19:18:49 +02:00
Sebastian Stenzel e6f0b321cb New translations strings.properties (German)
[ci skip]
2019-10-08 18:36:38 +02:00
Sebastian Stenzel 41fef58450 New translations strings.properties (Dutch)
[ci skip]
2019-10-08 18:01:08 +02:00
Sebastian Stenzel 268026629d New translations strings.properties (Spanish)
[ci skip]
2019-10-08 18:01:07 +02:00
Sebastian Stenzel b95fa1868a New translations strings.properties (German)
[ci skip]
2019-10-08 18:01:06 +02:00
Sebastian Stenzel d2b7376e37 New translations strings.properties (Korean)
[ci skip]
2019-10-08 17:19:31 +02:00
Sebastian Stenzel 8d6eac63e2 New translations strings.properties (Turkish)
[ci skip]
2019-10-08 17:19:29 +02:00
Sebastian Stenzel b8fc2dcb64 New translations strings.properties (Russian)
[ci skip]
2019-10-08 17:19:27 +02:00
Sebastian Stenzel 671f934934 New translations strings.properties (Swedish)
[ci skip]
2019-10-08 16:28:17 +02:00
Sebastian Stenzel 58ff6554fc New translations strings.properties (Japanese)
[ci skip]
2019-10-08 16:28:14 +02:00
Sebastian Stenzel cad6b221d9 New translations strings.properties (Korean)
[ci skip]
2019-10-08 16:28:13 +02:00
Sebastian Stenzel c02d5a9794 New translations strings.properties (Turkish)
[ci skip]
2019-10-08 16:28:09 +02:00
Sebastian Stenzel aac71277e3 New translations strings.properties (Dutch)
[ci skip]
2019-10-08 16:28:07 +02:00
Sebastian Stenzel aa61be7bf5 New translations strings.properties (French)
[ci skip]
2019-10-08 16:28:05 +02:00
Sebastian Stenzel 3a4f796c79 New translations strings.properties (Czech)
[ci skip]
2019-10-08 16:28:04 +02:00
Sebastian Stenzel f070cdc12d New translations strings.properties (Spanish)
[ci skip]
2019-10-08 16:28:02 +02:00
Sebastian Stenzel e14911d4d5 New translations strings.properties (Russian)
[ci skip]
2019-10-08 16:28:00 +02:00
Sebastian Stenzel aa666ad025 New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2019-10-08 16:27:59 +02:00
Sebastian Stenzel cd55c2666f New translations strings.properties (Italian)
[ci skip]
2019-10-08 16:27:57 +02:00
Sebastian Stenzel 0dc6032209 New translations strings.properties (German)
[ci skip]
2019-10-08 16:27:56 +02:00
Sebastian Stenzel f7630c28d6 Generate recovery key during vault creation 2019-10-08 16:26:57 +02:00
Sebastian Stenzel 08d9beb6b8 Externalized logic of recovery key creation to reusable utility class 2019-10-08 14:58:55 +02:00
Sebastian Stenzel 5808239416 Refactored shortcut handlers 2019-10-08 12:46:10 +02:00
Sebastian Stenzel e2f400340b added test for issue #979 2019-10-08 11:16:13 +02:00
Sebastian Stenzel 5854b24c44 updated badge link 2019-10-08 11:16:07 +02:00
Tobias Hagemann 7adaf44fb3 added progress bar 2019-10-08 01:06:50 +02:00
Sebastian Stenzel 0bd74056a0 New translations strings.properties (Swedish)
[ci skip]
2019-10-07 13:42:39 +02:00
Sebastian Stenzel bbeea7a2ee New translations strings.properties (Swedish)
[ci skip]
2019-10-06 17:55:46 +02:00
Sebastian Stenzel e3548737f1 New translations strings.properties (Russian)
[ci skip]
2019-10-06 17:55:44 +02:00
Sebastian Stenzel 75d7656824 New translations strings.properties (Swedish)
[ci skip]
2019-10-06 17:26:01 +02:00
Sebastian Stenzel c292f18915 New translations strings.properties (Russian)
[ci skip]
2019-10-06 17:25:59 +02:00
Sebastian Stenzel 9636e7c700 New translations strings.properties (Swedish)
[ci skip]
2019-10-06 16:56:15 +02:00
Sebastian Stenzel eb8f7840cc New translations strings.properties (Korean)
[ci skip]
2019-10-06 11:55:39 +02:00
Sebastian Stenzel 180d79f49e New translations strings.properties (Korean)
[ci skip]
2019-10-06 11:25:49 +02:00
Sebastian Stenzel 29cb1c96b1 New translations strings.properties (Swedish)
[ci skip]
2019-10-06 10:26:28 +02:00
Sebastian Stenzel f61432fc52 New translations strings.properties (French)
[ci skip]
2019-10-05 12:16:15 +02:00
Sebastian Stenzel 8e7dbf4640 New translations strings.properties (French)
[ci skip]
2019-10-05 11:50:53 +02:00
Sebastian Stenzel d2528faf3a New translations strings.properties (French)
[ci skip]
2019-10-05 10:07:47 +02:00
Sebastian Stenzel c1a3fe66ef New translations strings.properties (Japanese)
[ci skip]
2019-10-05 09:36:19 +02:00
Sebastian Stenzel ecb4c114a2 New translations strings.properties (French)
[ci skip]
2019-10-05 09:36:17 +02:00
Sebastian Stenzel 1ecaf5ae6e New translations strings.properties (Spanish)
[ci skip]
2019-10-05 00:55:54 +02:00
Sebastian Stenzel e88b7f00b3 New translations strings.properties (Spanish)
[ci skip]
2019-10-05 00:22:30 +02:00
Sebastian Stenzel 91aaabc7fb New translations strings.properties (French)
[ci skip]
2019-10-04 23:45:54 +02:00
Sebastian Stenzel 7414c29593 New translations strings.properties (French)
[ci skip]
2019-10-04 23:17:06 +02:00
Sebastian Stenzel 79ae5b7bff New translations strings.properties (French)
[ci skip]
2019-10-04 15:26:28 +02:00
Sebastian Stenzel 486a3a07f5 New translations strings.properties (Japanese)
[ci skip]
2019-10-04 14:50:00 +02:00
Sebastian Stenzel 02d44eb0e7 New translations strings.properties (Japanese)
[ci skip]
2019-10-04 13:56:22 +02:00
Sebastian Stenzel 3aff7bd956 New translations strings.properties (Japanese)
[ci skip]
2019-10-04 13:20:39 +02:00
Sebastian Stenzel cd6a6cc55a New translations strings.properties (Korean)
[ci skip]
2019-10-04 07:36:24 +02:00
Sebastian Stenzel d0a30a1779 New translations strings.properties (Korean)
[ci skip]
2019-10-04 03:26:03 +02:00
Sebastian Stenzel a5fb30d7c7 New translations strings.properties (Japanese)
[ci skip]
2019-10-04 01:55:05 +02:00
Sebastian Stenzel ba4e813a35 New translations strings.properties (French)
[ci skip]
2019-10-04 01:16:25 +02:00
Sebastian Stenzel f6d4caee07 New translations strings.properties (Japanese)
[ci skip]
2019-10-04 00:46:37 +02:00
Sebastian Stenzel d3a00e726f New translations strings.properties (French)
[ci skip]
2019-10-04 00:46:35 +02:00
Sebastian Stenzel d71c0695f4 New translations strings.properties (French)
[ci skip]
2019-10-04 00:19:26 +02:00
Sebastian Stenzel 394c91c50c New translations strings.properties (Czech)
[ci skip]
2019-10-03 18:06:06 +02:00
Sebastian Stenzel 71c35eaf4c New translations strings.properties (Greek)
[ci skip]
2019-10-03 15:44:58 +02:00
Sebastian Stenzel 70790d0e6a New translations strings.properties (Japanese)
[ci skip]
2019-10-03 14:08:44 +02:00
Sebastian Stenzel 8fbc00a417 New translations strings.properties (Japanese)
[ci skip]
2019-10-03 13:41:10 +02:00
Sebastian Stenzel 080bf7f540 New translations strings.properties (Japanese)
[ci skip]
2019-10-03 13:08:50 +02:00
Sebastian Stenzel 9d988294f3 New translations strings.properties (Czech)
[ci skip]
2019-10-03 12:30:27 +02:00
Sebastian Stenzel a712013507 New translations strings.properties (Czech)
[ci skip]
2019-10-03 12:00:54 +02:00
Sebastian Stenzel 0aab22975a New translations strings.properties (Czech)
[ci skip]
2019-10-03 11:25:33 +02:00
Sebastian Stenzel fde6555e4d New translations strings.properties (Czech)
[ci skip]
2019-10-03 10:55:07 +02:00
Sebastian Stenzel 748e76e187 New translations strings.properties (Czech)
[ci skip]
2019-10-03 10:24:17 +02:00
Sebastian Stenzel 55a627f718 New translations strings.properties (Czech)
[ci skip]
2019-10-03 08:58:08 +02:00
Sebastian Stenzel a19cbff12f New translations strings.properties (Czech)
[ci skip]
2019-10-03 08:27:39 +02:00
Sebastian Stenzel d5e098a6cd New translations strings.properties (Czech)
[ci skip]
2019-10-03 08:00:05 +02:00
Sebastian Stenzel 3f9fc28e3c New translations strings.properties (Spanish)
[ci skip]
2019-10-02 17:59:29 +02:00
Sebastian Stenzel 0bf4081d71 New translations strings.properties (Spanish)
[ci skip]
2019-10-02 17:29:19 +02:00
Sebastian Stenzel de3e392aa3 New translations strings.properties (Czech)
[ci skip]
2019-10-02 16:48:00 +02:00
Sebastian Stenzel 44a5f51c93 New translations strings.properties (Korean)
[ci skip]
2019-10-02 14:34:11 +02:00
Sebastian Stenzel 9c8ea3c2e5 New translations strings.properties (Croatian)
[ci skip]
2019-10-02 14:34:10 +02:00
Sebastian Stenzel 4208d1e036 New translations strings.properties (Portuguese)
[ci skip]
2019-10-02 14:34:08 +02:00
Sebastian Stenzel 154198fd5c New translations strings.properties (Turkish)
[ci skip]
2019-10-02 14:34:06 +02:00
Sebastian Stenzel 0ad0d79a54 New translations strings.properties (Dutch)
[ci skip]
2019-10-02 14:34:05 +02:00
Sebastian Stenzel 966538e47b New translations strings.properties (French)
[ci skip]
2019-10-02 14:34:03 +02:00
Sebastian Stenzel 181a1e7248 New translations strings.properties (Czech)
[ci skip]
2019-10-02 14:34:01 +02:00
Sebastian Stenzel 1a13e03a08 New translations strings.properties (Spanish)
[ci skip]
2019-10-02 14:33:59 +02:00
Sebastian Stenzel 0fa0568f24 New translations strings.properties (Russian)
[ci skip]
2019-10-02 14:33:58 +02:00
Sebastian Stenzel d7e76bee6d New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2019-10-02 14:33:56 +02:00
Sebastian Stenzel 77dcf4da62 New translations strings.properties (Italian)
[ci skip]
2019-10-02 14:33:55 +02:00
Sebastian Stenzel 6eb0384fa6 New translations strings.properties (German)
[ci skip]
2019-10-02 14:33:54 +02:00
Armin Schrenk 5af5a6c5b0 enhancing fxml loading to add local specific stylesheets, for #754 2019-10-02 14:27:10 +02:00
Armin Schrenk 0e4c833be0 loaading dosis-bold font via @font-face in css 2019-10-02 13:39:38 +02:00
Sebastian Stenzel a2e4a2c78a New translations strings.properties (Korean)
[ci skip]
2019-10-02 13:07:55 +02:00
Sebastian Stenzel f4ab2b590f New translations strings.properties (Korean)
[ci skip]
2019-10-02 12:32:27 +02:00
Sebastian Stenzel 80b3d7ab6b New translations strings.properties (Korean)
[ci skip]
2019-10-02 10:54:40 +02:00
Sebastian Stenzel b23fbd4507 New translations strings.properties (Korean)
[ci skip]
2019-10-02 10:29:20 +02:00
Sebastian Stenzel 5b56ff6d55 New translations strings.properties (Korean)
[ci skip]
2019-10-02 09:58:16 +02:00
Sebastian Stenzel 143b691c61 New translations strings.properties (Korean)
[ci skip]
2019-10-02 09:31:50 +02:00
Sebastian Stenzel 88e4c88a87 New translations strings.properties (Croatian)
[ci skip]
2019-10-01 22:37:58 +02:00
Sebastian Stenzel c9e06ad2d2 New translations strings.properties (Turkish)
[ci skip]
2019-10-01 22:07:35 +02:00
Sebastian Stenzel bd814f729d New translations strings.properties (Italian)
[ci skip]
2019-10-01 22:07:33 +02:00
Sebastian Stenzel 8c8b50b83a New translations strings.properties (Portuguese)
[ci skip]
2019-10-01 21:39:03 +02:00
Sebastian Stenzel e9f4790b40 New translations strings.properties (Turkish)
[ci skip]
2019-10-01 21:39:01 +02:00
Sebastian Stenzel ac1149b873 New translations strings.properties (Dutch)
[ci skip]
2019-10-01 21:39:00 +02:00
Sebastian Stenzel 51b6f828ed New translations strings.properties (Italian)
[ci skip]
2019-10-01 21:38:59 +02:00
Sebastian Stenzel b97a99d4e2 New translations strings.properties (Turkish)
[ci skip]
2019-10-01 21:09:42 +02:00
Sebastian Stenzel 6ed661aa13 New translations strings.properties (Dutch)
[ci skip]
2019-10-01 20:44:03 +02:00
Sebastian Stenzel f3d46ed767 New translations strings.properties (Italian)
[ci skip]
2019-10-01 20:44:02 +02:00
Sebastian Stenzel 3bde55c4df New translations strings.properties (Dutch)
[ci skip]
2019-10-01 20:08:57 +02:00
Sebastian Stenzel dd591ec258 New translations strings.properties (Spanish)
[ci skip]
2019-10-01 20:08:56 +02:00
Sebastian Stenzel 4ce035b554 New translations strings.properties (French)
[ci skip]
2019-10-01 18:38:52 +02:00
Sebastian Stenzel cdc451fdca New translations strings.properties (Czech)
[ci skip]
2019-10-01 18:38:50 +02:00
Sebastian Stenzel 0680d16708 New translations strings.properties (Italian)
[ci skip]
2019-10-01 18:09:13 +02:00
Sebastian Stenzel 1f1792522e New translations strings.properties (German)
[ci skip]
2019-10-01 18:09:12 +02:00
Sebastian Stenzel db53a7a3dc New translations strings.properties (Russian)
[ci skip]
2019-10-01 17:18:13 +02:00
Sebastian Stenzel 9362196d4c New translations strings.properties (Spanish)
[ci skip]
2019-10-01 16:51:17 +02:00
Sebastian Stenzel 527d387640 New translations strings.properties (Russian)
[ci skip]
2019-10-01 16:51:16 +02:00
Sebastian Stenzel 5f9dda4bbb New translations strings.properties (Portuguese, Brazilian)
[ci skip]
2019-10-01 16:51:14 +02:00
Sebastian Stenzel 6a991f3ab5 New translations strings.properties (Italian)
[ci skip]
2019-10-01 16:51:13 +02:00
Sebastian Stenzel 4c023f792c New translations strings.properties (German)
[ci skip]
2019-10-01 15:27:40 +02:00
Sebastian Stenzel 6b5f7d37ca more crowdin fine tuning
[ci skip]
2019-10-01 15:26:18 +02:00
Sebastian Stenzel 87158b1e7a Update Crowdin configuration file 2019-10-01 13:53:37 +02:00
Sebastian Stenzel 0b132b7d10 updaten OpenJFX to version 13 2019-10-01 13:04:44 +02:00
Sebastian Stenzel cd4cb70896 show progress during vault migration (ugly prototype) 2019-09-27 21:44:24 +02:00
Sebastian Stenzel 633470b0d6 reduced visibility of scope annotation 2019-09-27 21:43:56 +02:00
Sebastian Stenzel 1930090044 Added first prototyp for recovery key generation 2019-09-27 21:43:42 +02:00
Sebastian Stenzel ccefb3613e renamed file 2019-09-27 20:01:02 +02:00
Sebastian Stenzel 9e79350b9e added the strongest avenger 😜
[ci skip]
2019-09-27 10:56:44 +02:00
Sebastian Stenzel 9092c2325a Merge branch 'master' into develop 2019-09-19 11:23:58 +02:00
Sebastian Stenzel 5cd3a6dbaf Merge branch 'release/1.5.0-alpha1' 2019-09-19 11:22:25 +02:00
Sebastian Stenzel 9934a4ea3a Preparing 1.5.0-alpha1 2019-09-19 11:13:07 +02:00
Sebastian Stenzel 3468a88268 Made most Window-specific Qualifiers package-private 2019-09-19 11:11:51 +02:00
Sebastian Stenzel 4d916cd5cc stage cleanup 2019-09-19 11:00:24 +02:00
Sebastian Stenzel 24f13e2afe added stage title for display in window managers 2019-09-19 11:00:03 +02:00
Sebastian Stenzel ad29c009b2 Disable custom theme for now 2019-09-19 10:42:14 +02:00
Sebastian Stenzel d87955adb6 Disable custom theme for now 2019-09-19 10:40:20 +02:00
Sebastian Stenzel 07aa71bb9d temporarily disabled vault migration 2019-09-19 09:19:07 +02:00
Sebastian Stenzel ea3ef8b60f removed outdated german localization 2019-09-19 09:18:45 +02:00
Tobias Hagemann a33df54ed3 updated localization, fixed wrongfilealert layout 2019-09-19 01:12:50 +02:00
Tobias Hagemann 3107f16768 fixed color palette in dark theme, caused by 04800407 [ci skip] 2019-09-19 00:55:17 +02:00
Sebastian Stenzel 230436be8a Merge branch 'feature/new-ui' into develop
fixes #931, fixes #930, fixes #927, fixes #926, fixes #925, fixes #458, fixes #621, fixes #957, fixes #225, fixes #341, fixes #329, fixes #577, fixes #283 and last but not least: fixes #891
2019-09-19 00:21:43 +02:00
Sebastian Stenzel 7fefeee145 Supress ugly error log during unit tests 2019-09-18 23:44:01 +02:00
Sebastian Stenzel db836a9dc3 JNI interfaces are now singletons 2019-09-18 23:40:53 +02:00
Tobias Hagemann ba22f0ed3c updated jni lib to 2.2.1 2019-09-18 23:16:11 +02:00
Sebastian Stenzel a731b1b569 fixed illegalstate exceptions when spamming "check for updates" button 2019-09-18 23:11:03 +02:00
Sebastian Stenzel 8bb3530928 major cleanup of old 1.4.x code 2019-09-18 23:10:38 +02:00
Sebastian Stenzel 2567ca50e7 Merged from develop 2019-09-18 22:29:58 +02:00
Sebastian Stenzel 8d00b926c4 Merge branch 'master' into develop 2019-09-18 22:09:14 +02:00
Sebastian Stenzel 7636d6874b Merge branch 'release/1.4.16' 2019-09-18 22:08:26 +02:00
Sebastian Stenzel 66c098c746 Preparing 1.4.16 2019-09-18 22:02:57 +02:00
Sebastian Stenzel 7534bb3c7e fixes #955 2019-09-18 22:01:16 +02:00
Armin Schrenk 200fc1a563 refactoring forget password dialog ( when unlocking a vault) 2019-09-18 19:12:01 +02:00
Armin Schrenk c961eb0ca0 adding version number to settings dialogue 2019-09-18 14:36:35 +02:00
Sebastian Stenzel d2086d100e Added utility to encode a recovery key to a human-friendly sequence of words 2019-09-16 17:39:10 +02:00
Sebastian Stenzel 2a33705cc6 removed irrelevant comment [ci skip] 2019-09-16 14:25:34 +02:00
Sebastian Stenzel 4b48f75aed Fine foreground/background switching, added reopen listener 2019-09-13 16:02:05 +02:00
Sebastian Stenzel 2bbc3e5834 Refactored adding vaults 2019-09-12 17:01:50 +02:00
Sebastian Stenzel 9e14b5e70f bulk changes
[ci skip]
2019-09-12 15:48:38 +02:00
Sebastian Stenzel 161a4cd511 Handling launch events (such as doubleclicking a .cryptomator file)
Also refactored dagger component graph during launch
2019-09-11 16:44:41 +02:00
Sebastian Stenzel 2cf97b5f77 fixed test on headless ci system 2019-09-11 16:25:50 +02:00
Sebastian Stenzel 0d6df6e6c1 Fixed tests 2019-09-11 16:22:10 +02:00
Sebastian Stenzel 6a4edbf73d drop multipe vaults at once 2019-09-10 17:08:00 +02:00
Sebastian Stenzel d6ffb890e3 preparations for reacting to externally triggered requests to open a masterkey file 2019-09-10 16:59:51 +02:00
Sebastian Stenzel 5b83456e6d fxml cleanup 2019-09-10 10:07:51 +02:00
Sebastian Stenzel 3ad6784961 improved sudden termination handling 2019-09-10 09:41:25 +02:00
Sebastian Stenzel 3fa1ed1928 clean up vault list controller 2019-09-10 09:41:01 +02:00
Sebastian Stenzel d27466d49e replaced gap + element + gap by larger gap
[ci skip]
2019-09-06 19:32:47 +02:00
Sebastian Stenzel d9677fe7c4 Split up vault detail view 2019-09-06 19:25:25 +02:00
Sebastian Stenzel fa7421b1b0 Added migration workflow 2019-09-06 18:55:47 +02:00
Sebastian Stenzel 602bccae2a fixed NiceSecurePasswordField#requestFocus() 2019-09-06 18:50:24 +02:00
Sebastian Stenzel 0acd3b427f stop the madness! new approach to scene-independent shortcuts 2019-09-06 17:43:01 +02:00
Sebastian Stenzel f35f04851e Hook up migration window 2019-09-06 15:26:01 +02:00
Sebastian Stenzel cb4717b770 cancel stats task on any state other than UNLOCKED 2019-09-06 15:20:32 +02:00
Sebastian Stenzel 68e69790cf Don't trigger quit handler on new non-unlocked vault states 2019-09-06 14:05:17 +02:00
Tobias Hagemann 2bd93469bb added cmd+w shortcuts to more dialogs 2019-09-06 13:59:22 +02:00
Tobias Hagemann 6fc37d48ff adjusted min-height of some dialogs to prevent the smallest jitter ;) 2019-09-06 13:36:21 +02:00
Tobias Hagemann df8fbe6440 added disabled state to reveal button in unlock success 2019-09-06 13:29:22 +02:00
Sebastian Stenzel 9eee7883c5 Introducing more vault states 2019-09-06 10:40:57 +02:00
Sebastian Stenzel 7de08f52df Vault Format 7 2019-09-06 10:21:37 +02:00
Sebastian Stenzel b4bf5415bc Refactored Vault's observable accessPoint property 2019-09-05 15:42:45 +02:00
Tobias Hagemann c8e22fe2e3 updated reveal button in vault detail 2019-09-05 15:27:34 +02:00
Tobias Hagemann af89cee619 reverted orange glyph icons 2019-09-05 11:09:10 +02:00
Sebastian Stenzel 216f3620e1 We need to know what happened
[ci skip]
2019-09-05 09:38:47 +02:00
Armin Schrenk ae97e42d11 adding round corners to dragNdrop area 2019-09-04 17:25:50 +02:00
Armin Schrenk c6ad677e2b monster commit: Adding drag'n'drop functionality to add already existing vaults to cryptomator 2019-09-04 17:19:30 +02:00
Armin Schrenk e1a1f0bbdb renaming method in removeVaultModule 2019-09-04 17:19:30 +02:00
Sebastian Stenzel efaf5a1553 Pimped Password Field
Added reveal icon as well, capslock warnings as well a warning for unprintable chars (fixes #458)
2019-09-04 17:16:24 +02:00
Tobias Hagemann 9c104beeba replaced text-flow with label+graphic 2019-09-04 16:54:40 +02:00
Tobias Hagemann 31bad3191d added menu item disabled state styling 2019-09-04 16:01:50 +02:00
Tobias Hagemann 1089497c08 added context-menu styling (basically the same as the one from choice-box) 2019-09-04 15:42:20 +02:00
Tobias Hagemann 73bc2d06a7 updated "add vault" button styling 2019-09-04 15:27:42 +02:00
Armin Schrenk 040d913693 adding text to button 2019-09-04 14:13:32 +02:00
Armin Schrenk 52a488f967 removing minus button from vault list 2019-09-04 13:53:29 +02:00
Armin Schrenk 7511a676d4 adding context menu to vault list 2019-09-04 12:59:46 +02:00
Tobias Hagemann 6b7964f5d9 added hdd icon to vault detail for unlocked state 2019-09-03 23:30:09 +02:00
Tobias Hagemann 98e843aa0d added window shake animation when entering invalid passphrase 2019-09-03 21:33:06 +02:00
Tobias Hagemann c364a743ae finetuning almost all dialogs 2019-09-03 16:31:45 +02:00
Tobias Hagemann b36c5fa60f added disabled checkbox styling [ci skip] 2019-09-03 15:06:07 +02:00
Tobias Hagemann bd0ece8020 added highlight fill to text fields [ci skip] 2019-09-03 13:58:22 +02:00
Tobias Hagemann 9b15254880 added wrap text to formatted labels 2019-09-03 10:32:12 +02:00
Tobias Hagemann 4f039b9708 new vault detail layout for unlocked state 2019-09-03 10:31:42 +02:00
Tobias Hagemann 2ab823239c updated localization [ci skip] 2019-09-03 09:21:31 +02:00
Tobias Hagemann 78d4f2e479 exchanged icon in unlock/lock button [ci skip] 2019-09-02 14:52:24 +02:00
Tobias Hagemann 6513fc6ed4 added color to icon in password match label [ci skip] 2019-09-02 14:49:33 +02:00
Tobias Hagemann e41ddedce7 updated colors of password strength indicator [ci skip] 2019-09-02 14:45:26 +02:00
Sebastian Stenzel 88220cabee Added access location readme file 2019-08-30 10:59:37 +02:00
Tobias Hagemann 33252c1775 changed icon of stacked glyphs to white instead of main bg 2019-08-30 10:23:38 +02:00
Sebastian Stenzel 57553bbda1 Replaced TransformationList by simpler List with listener, because Property Extractor didn't work properly 2019-08-29 23:18:03 +02:00
Sebastian Stenzel 4a02bf529d Add readme file to vault storage directory 2019-08-29 22:20:27 +02:00
Sebastian Stenzel e55b1f8ff9 all vaults are locked when starting the application
[ci skip]
2019-08-29 21:33:31 +02:00
Sebastian Stenzel 73314ee985 Thread safety when quitting the application: Altering vault states (unlocking/locking/...) will now trigger a listener (on the fx application thread) which sets an AtomicBoolean. Previously the value has been read by an AWT thread from a (non-volatile) BooleanBinding 2019-08-29 17:13:32 +02:00
Sebastian Stenzel 5196dbe9af button labels
[ci skip]
2019-08-29 16:33:15 +02:00
Sebastian Stenzel 68454e914b Clarified some steps of create vault workflow 2019-08-29 16:29:53 +02:00
Sebastian Stenzel d0924e246f Added success screen to add vault workflow 2019-08-29 15:59:47 +02:00
Sebastian Stenzel 59a277f0c7 added missing $ sign
[ci skip]
2019-08-29 15:31:27 +02:00
Sebastian Stenzel 5ef0dc5505 same design for unlock success and remove vault dialog 2019-08-29 14:15:49 +02:00
Sebastian Stenzel 08434c36ee adjusted unlock success screen 2019-08-28 16:22:09 +02:00
Sebastian Stenzel 2f288dc92b replaced glyph="CIRCLE" by circle. 2019-08-28 16:21:52 +02:00
Armin Schrenk 421a21aced adding german localization 2019-08-28 16:08:45 +02:00
Armin Schrenk 98a3a1a372 adding section in strings.properties 2019-08-28 16:08:25 +02:00
Armin Schrenk da65e98030 set wrapText attribute in addExistingVault dialogue 2019-08-28 16:07:57 +02:00
Sebastian Stenzel 7bbbd3c849 no longer change window size during unlock workflow 2019-08-28 16:06:33 +02:00
Armin Schrenk 0481bb02af renaming string property for volume type 2019-08-28 15:35:47 +02:00
Tobias Hagemann c47d9c95c7 restyled disabled button & glyph icons 2019-08-28 14:41:55 +02:00
Sebastian Stenzel a122159268 Made tray menu localizable 2019-08-28 14:17:34 +02:00
Armin Schrenk 474064df3a adding window icon to vaultOptions dialogue 2019-08-28 14:12:03 +02:00
Armin Schrenk 1f65a626e4 changePassword window is now subcomponent of vaultOptions 2019-08-28 14:08:14 +02:00
Tobias Hagemann 04800407d7 added color palette 2019-08-28 14:05:42 +02:00
Armin Schrenk f306184b53 adding icon to main window 2019-08-28 13:55:14 +02:00
Armin Schrenk c1a8844f27 improving removeVault dialogue 2019-08-28 13:51:09 +02:00
Sebastian Stenzel d4e118f331 quit refinements 2019-08-28 13:35:57 +02:00
Armin Schrenk 2900a9672a refining english localization 2019-08-28 13:32:22 +02:00
Armin Schrenk e8ba94942d setting managed property to false if no dropbox or gdrive are found 2019-08-28 13:32:22 +02:00
Armin Schrenk b3a96aed74 WebDavScheme setting only shown under linux 2019-08-28 13:32:22 +02:00
Sebastian Stenzel 0db2068344 Added window icon to dialogs 2019-08-28 13:27:23 +02:00
Sebastian Stenzel 6da0d023ff Localized quit dialog 2019-08-28 13:05:20 +02:00
Armin Schrenk 88d522501f if vault is added (new or existing), it is selected in the vault list 2019-08-28 11:53:43 +02:00
Armin Schrenk 6b31e6cdc2 closing window after vault is removed 2019-08-28 11:53:43 +02:00
Sebastian Stenzel 1ef8668c4d Replaced TextFlows by FormattedLabel if applicable 2019-08-28 11:42:26 +02:00
Sebastian Stenzel 6721baf293 Replaced TextFlows by FormattedLabel if applicable 2019-08-28 11:35:07 +02:00
Sebastian Stenzel f4ec9c277f Formatting throughput stats properly 2019-08-28 11:18:21 +02:00
Sebastian Stenzel c9d897edd1 added window prefix "main.*" to localizable strings in main window 2019-08-28 11:17:45 +02:00
Tobias Hagemann ef07edf8c3 made button-group into an actual button 2019-08-27 16:11:24 +02:00
Armin Schrenk 36d49a6e1e vault options: read only only selectable when custom mount options are _not_ used 2019-08-27 15:51:22 +02:00
Sebastian Stenzel f4ee8d0a15 Added I/O stats (work in progress) 2019-08-27 15:50:15 +02:00
Armin Schrenk 71e414ae5c formatting 2019-08-27 15:23:48 +02:00
Armin Schrenk acda11f110 adding confirmation dialogue when removing a vault 2019-08-27 15:23:35 +02:00
Armin Schrenk a96935bfb5 unused imports removed 2019-08-27 14:35:51 +02:00
Armin Schrenk b74b4ce244 bug fix when switching vault during lock operation 2019-08-27 14:02:56 +02:00
Armin Schrenk 638dac9cb6 adding missing acces location text 2019-08-27 13:48:05 +02:00
Tobias Hagemann 249af4c397 decreased width of add vault wizard 2019-08-27 13:18:50 +02:00
Tobias Hagemann 4130dbea91 added checkmark icon to unlock success 2019-08-27 12:57:51 +02:00
Sebastian Stenzel ee57cd7d3b don't mark blocked issues as stale
[ci skip]
2019-08-27 10:32:31 +02:00
Tobias Hagemann 8939b196c0 reverted 5dcdaf45 2019-08-26 20:36:47 +02:00
Sebastian Stenzel f1b5ec6481 Updated FFI package to 2.2.0 2019-08-26 20:30:42 +02:00
Tobias Hagemann 50ace8c6a4 added ffi-version to buildkit 2019-08-26 20:22:52 +02:00
Sebastian Stenzel 264e81b4a0 macOS: Only show application menu and dock icon when a Window is visible (related to #957, #283, #346, #62) 2019-08-26 18:03:26 +02:00
Sebastian Stenzel 282b80fe24 downgraded jni lib (due to incompatibilites on macOS 10.13.x) 2019-08-26 17:59:46 +02:00
Tobias Hagemann 547e5dae52 Merge branch 'feature/jni-mac-tray-icon' into ‘feature/new-ui' 2019-08-26 16:58:28 +02:00
Tobias Hagemann 5dcdaf459f reverted jni version for merging, kept new code as comment 2019-08-26 16:56:23 +02:00
Tobias Hagemann ab89f59dd1 defined color constants for password strength indicator, updated labels 2019-08-26 16:29:50 +02:00
Tobias Hagemann 98451759f0 updated unlock success layout, reverted back from buttonbar to hbox in some dialogs 2019-08-26 15:54:21 +02:00
Sebastian Stenzel b22ddaf13e reveal vault access and storage location from vault detail view 2019-08-26 15:22:54 +02:00
Tobias Hagemann 7eaf598089 added open sans font 2019-08-26 15:15:01 +02:00
Sebastian Stenzel 3d7b504504 Added styleable PasswordStrengthIndicator 2019-08-26 14:47:25 +02:00
Tobias Hagemann 4dc8693216 updated change password layout & some other stuff 2019-08-26 13:33:24 +02:00
Sebastian Stenzel ac472393aa Began error handling during add vault workflow 2019-08-26 13:03:19 +02:00
Tobias Hagemann 477fd7d2e9 increased paddings in add vault wizard 2019-08-26 00:40:00 +02:00
Tobias Hagemann 468723ad92 centered check for updates button 2019-08-26 00:34:12 +02:00
Tobias Hagemann d58ad1e0a2 updated add vault wizard layout & stylings 2019-08-26 00:28:01 +02:00
Tobias Hagemann 8c94245102 updated menu item stylings of choicebox, updated window sizes & disabled resizable of preferences and vault options 2019-08-25 00:34:16 +02:00
Tobias Hagemann b4f697e052 updated vault detail layout, disabled focus traversable in main window's title buttons, updated other minor stylings 2019-08-23 17:57:02 +02:00
Tobias Hagemann 428ffbf705 updated vault detail layout 2019-08-23 00:56:39 +02:00
Tobias Hagemann d25a903556 updated vault detail layout, moved change password button to vault options, updated other minor stylings 2019-08-23 00:22:57 +02:00
Tobias Hagemann 3db906de10 updated vault list cell styling & added text-flow style class in vault detail 2019-08-20 16:09:17 +02:00
Sebastian Stenzel 486d3170e2 Relaxed vault list cell layout and added highlight colors (inspired by google backup & sync settings) 2019-08-19 17:21:49 +02:00
Sebastian Stenzel 15bdba85bb less annoying "armed" indicator 2019-08-19 17:19:37 +02:00
Sebastian Stenzel db1a2538cb removed unused logger 2019-08-19 17:18:33 +02:00
Sebastian Stenzel 3d61fab8b6 Deduplication 2019-08-19 16:27:35 +02:00
Sebastian Stenzel 644f2d9a89 Removed dependency to fontawesomefx, using fontawesome 5 instead (which we have a pro license for) 2019-08-19 16:15:10 +02:00
Sebastian Stenzel 46a4060814 fixed unlock 2019-08-19 16:14:11 +02:00
Tobias Hagemann 5c26c23619 added mac native function for listening to system interface theme changes and changing the tray icon accordingly [ci skip] 2019-08-19 15:55:07 +02:00
Sebastian Stenzel 60bdafca94 Merge branch 'develop' into feature/new-ui
# Conflicts:
#	main/pom.xml
2019-08-18 16:24:48 +02:00
Sebastian Stenzel 59cd3defce Merge branch 'master' into develop 2019-08-18 15:22:28 +02:00
Sebastian Stenzel f8d28ba30a Merge branch 'release/1.4.15' 2019-08-18 15:21:53 +02:00
Sebastian Stenzel f1b96b29a7 Preparing 1.4.15 2019-08-18 14:47:45 +02:00
Sebastian Stenzel 6670e37050 Updated CryptoFS (which now adds a version suffix to masterkey backup files) 2019-08-18 14:46:46 +02:00
Sebastian Stenzel 2d6254b427 fixes #943 2019-08-17 11:16:12 +02:00
Sebastian Stenzel c287294890 catch unchecked exceptions when checking whether linux keychain is accessible
fixes #950, fixes #952, fixes #954
2019-08-17 10:43:33 +02:00
Armin Schrenk fc51e5caff #926 replacing boolean by a string for current vault state 2019-08-16 15:54:08 +02:00
Armin Schrenk e32ddd07ea #926 Adding information to the main window 2019-08-16 15:51:39 +02:00
Armin Schrenk 6b47cf54e2 adding references for Label nodes in fxml 2019-08-16 12:24:47 +02:00
Armin Schrenk 40c3e7a417 #929, simplyfing add existing vault dialogue 2019-08-16 12:00:51 +02:00
Armin Schrenk 4bfb543419 #927 adding logic to stub 2019-08-14 18:27:31 +02:00
Armin Schrenk 8c9d78337e name the reenter field properly 2019-08-14 17:37:42 +02:00
Sebastian Stenzel 0a132351a8 load bundled font for "Cryptomator" title 2019-08-14 17:11:18 +02:00
Sebastian Stenzel ded43f7e7b apply default text color to all font awesome icons (except for title buttons) 2019-08-14 17:10:40 +02:00
Sebastian Stenzel cf91a8b62c Moved volume type settings to custom preferences controller
Added icons to preferences
2019-08-14 16:42:06 +02:00
Armin Schrenk 948659f3cd #927 :adding stubs for change password dialogue 2019-08-14 13:10:38 +02:00
Armin Schrenk c7e0015ffd Merge branch 'feature/new-ui' of https://github.com/cryptomator/cryptomator into feature/new-ui 2019-08-14 03:08:58 +02:00
Sebastian Stenzel 2fd671f513 New approach to shortcuts 2019-08-13 16:54:00 +02:00
Sebastian Stenzel 5fa86fad5e style adjustments
[ci skip]
2019-08-13 16:14:38 +02:00
Sebastian Stenzel c6d90cdb17 Added vault location presets to dialog (references #929) 2019-08-13 15:43:16 +02:00
Armin Schrenk dcf44aa134 add indicator when passwords match 2019-08-13 14:36:27 +02:00
Sebastian Stenzel 7de8e180dc Merge branch 'master' into develop 2019-08-12 16:44:35 +02:00
Sebastian Stenzel 7fee6ad52f Merge branch 'release/1.4.14' 2019-08-12 16:43:47 +02:00
Sebastian Stenzel 157e459a2e Preparing 1.4.14 2019-08-12 16:39:46 +02:00
Sebastian Stenzel 50b2b0dc57 Merge branch 'develop' into feature/new-ui
new keychain API
2019-08-12 16:32:24 +02:00
Sebastian Stenzel 4f76295438 made class package-private
[ci skip]
2019-08-12 16:23:55 +02:00
Sebastian Stenzel d4c14ffb74 Added checked exception to keychain api and reworked the way we attempt to access the gnome keyring.
(references #947)
2019-08-12 16:08:20 +02:00
Tobias Hagemann 111d20a1cf updated button paddings, unlock dialog layout, localizations [ci skip] 2019-08-12 16:08:00 +02:00
Sebastian Stenzel 19840663a8 fixes #948 2019-08-11 22:01:29 +02:00
armin 4b7527bf0c refactoring PasswordStrengthUtil to use ressource bundle 2019-08-11 18:32:46 +02:00
armin 0a5bfa1ccb implementing password strength indicator 2019-08-11 18:12:47 +02:00
armin 21e1d303aa replacing hardcoded descriptions by strings.properties references for addvault new password controller 2019-08-11 16:42:41 +02:00
armin e0d5641d26 replacing hardcoded descriptions by strings.properties references for addvault new location controller 2019-08-11 16:40:37 +02:00
armin 529780f2c9 replacing hardcoded descriptions by strings.properties references for addvault new name controller 2019-08-11 16:35:07 +02:00
armin 19f1093d2c replacing hardcoded descriptions by reference to strings.properties for addvault existing controller 2019-08-11 16:29:04 +02:00
armin 5807e10286 replacing hardcoded descriptions by reference to strings.properties for addvault welcome controller 2019-08-11 16:19:58 +02:00
armin 0a1ad9f4d6 completing functionality of addVault wizard 2019-08-11 13:33:31 +02:00
armin 2a3e2e315e implementing finish-button logic for addNewVault wizard 2019-08-11 13:25:04 +02:00
armin 23c868b646 fix spelling 2019-08-11 13:23:41 +02:00
Tobias Hagemann ed8af54324 updated theme [ci skip] 2019-08-10 10:52:07 +02:00
Tobias Hagemann d8c3ba1e36 updated theme [ci skip] 2019-08-08 16:07:49 +02:00
Sebastian Stenzel 17f45c6dab Implemented some mount options (references #931) 2019-08-07 17:04:56 +02:00
Sebastian Stenzel 86745c5962 fixed copy/pasted comment
[ci skip]
2019-08-07 14:49:33 +02:00
Tobias Hagemann ca72c7a51f added button default styling [ci skip] 2019-08-07 00:47:16 +02:00
Tobias Hagemann 012c7cede9 updated update indicator styling [ci skip] 2019-08-07 00:35:20 +02:00
Sebastian Stenzel 15a55e996b Merge branch 'feature/new-ui' of https://github.com/cryptomator/cryptomator into feature/new-ui 2019-08-06 17:05:42 +02:00
Sebastian Stenzel cb50b2011f Lock remaining vaults on shutdown (references #838) 2019-08-06 17:03:05 +02:00
Sebastian Stenzel 04c45756b9 removed unused imports 2019-08-06 17:02:21 +02:00
Sebastian Stenzel 8d08d81f45 more specific throws statement 2019-08-06 17:02:06 +02:00
Tobias Hagemann d77403c403 updated tab pane styling [ci skip] 2019-08-06 16:15:43 +02:00
Sebastian Stenzel 1d94069144 Added proper Quit dialog (not yet fully implemented), fixes #838 2019-08-06 13:34:29 +02:00
Sebastian Stenzel 6e10d6bcd7 simplification 2019-08-06 13:32:56 +02:00
Sebastian Stenzel 7453431bcd Trigger list change events when a vault changes its state, thus removing need for additional state listeners 2019-08-06 13:09:42 +02:00
Sebastian Stenzel 2f953061b3 Experimenting with ⌘W shortcuts on windows (TODO: we should find some better way to do this) 2019-08-06 12:06:03 +02:00
Sebastian Stenzel 67610b935e Added vault settings window (references #931) 2019-08-06 11:09:00 +02:00
Sebastian Stenzel 09e5ee9e26 Merge branch 'develop' into feature/new-ui
[ci skip]
2019-08-02 16:50:23 +02:00
Sebastian Stenzel 54c5f9b041 Merge branch 'master' into develop
# Conflicts:
#	main/buildkit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/ui/pom.xml
2019-08-02 16:36:41 +02:00
Sebastian Stenzel 3da45dc884 Merge branch 'hotfix/1.4.13' 2019-08-02 16:35:28 +02:00
Sebastian Stenzel afb2b5e383 Updated dokany-nio-adapter to version 1.1.10
fixes #884
2019-08-02 16:03:53 +02:00
Sebastian Stenzel e23dc72856 Can now unlock directly from menu bar 2019-08-01 16:14:38 +02:00
Sebastian Stenzel b86d4b5a37 rebuild tray menu when vault state changes 2019-08-01 16:02:48 +02:00
Sebastian Stenzel 2024c95be5 add actionlistener to tray icon 2019-08-01 16:02:09 +02:00
Sebastian Stenzel d51debf736 fixed exception when scheduling the next regular update check while auto check is disabled
[ci skip]
2019-08-01 13:24:47 +02:00
Sebastian Stenzel 70b4b5fb2d only check for updates automatically if set so in preferences 2019-08-01 13:14:01 +02:00
Sebastian Stenzel e32fbc1d79 Select updates tab when showing preferences window and an update is available 2019-07-31 19:28:27 +02:00
Sebastian Stenzel be43279574 cleanup [ci skip] 2019-07-31 19:17:57 +02:00
Sebastian Stenzel 900e556369 Show TrayMenu sooner, don't wait for FxApplication to initialize 2019-07-31 19:16:14 +02:00
Sebastian Stenzel 09aca188fe Implemented manual update check button (references #272) 2019-07-31 18:39:13 +02:00
Sebastian Stenzel fc9565e13c Prepared "check for updates" button 2019-07-31 17:32:34 +02:00
Sebastian Stenzel e7f7321393 Split preferences into multiple tabs 2019-07-31 17:15:27 +02:00
infeo ddbe1c4546 implement first stub for password dialogue in create new vault wizard 2019-07-31 16:57:29 +02:00
infeo e3fa31b701 Merge branch 'feature/new-ui' of https://github.com/cryptomator/cryptomator into feature/new-ui 2019-07-31 16:55:29 +02:00
Sebastian Stenzel bfe8a22b48 fixed style class of preferences window
[ci skip]
2019-07-31 16:20:39 +02:00
Sebastian Stenzel dab779cbef Added new UpdateChecker that checks periodically (fixes #272) and added it to the main window (references #925) 2019-07-31 15:47:21 +02:00
infeo 66104bb753 removing wrong doc 2019-07-31 15:29:54 +02:00
infeo 37c69f991f implement next window of create new vault workflow 2019-07-31 15:26:41 +02:00
infeo 610460b3e4 add suffix to to create new vault workflow since there will be more than one step 2019-07-31 14:33:12 +02:00
infeo 43750e2bad adding first createNewVault dialogue 2019-07-31 14:14:51 +02:00
infeo a7df100e56 simplifying bindings 2019-07-31 12:49:21 +02:00
Sebastian Stenzel 4afb9d86c7 Added unlock success message (references #939) 2019-07-31 11:45:04 +02:00
Sebastian Stenzel 1b7a7060a8 moved Unlock component from MainWindow to FxApplication component 2019-07-31 11:44:39 +02:00
Sebastian Stenzel 1f6b94003e bring window to front
[ci skip]
2019-07-31 09:46:15 +02:00
Tobias Hagemann 2f1a7821b0 forgot to add text flow class in 4931e670 2019-07-30 21:11:30 +02:00
Sebastian Stenzel 1ec887092f Moved various non-ui related stuff to commons 2019-07-30 14:49:35 +02:00
Sebastian Stenzel 71afb088b5 show vault list in tray menu 2019-07-30 11:26:37 +02:00
Armin Schrenk 01ca501607 disabling open button in addExistingVault wizard if no file is selected. 2019-07-29 19:15:10 +02:00
Sebastian Stenzel ba34b37f8a Added options to start Cryptomator in background (references #418) 2019-07-29 16:28:29 +02:00
Sebastian Stenzel 62ff954558 Minimize mainwindow (instead of closing) when tray icon is not supported by the OS 2019-07-29 16:17:18 +02:00
Sebastian Stenzel fead9a48eb Reuse existing Stages and Scenes 2019-07-29 16:07:34 +02:00
Sebastian Stenzel 10e842e457 added tray icon, refactored dagger component graph:
singleton -> tray -> fxapplication -> mainwindow
2019-07-29 12:38:24 +02:00
Tobias Hagemann 4931e6707a added text flow styling, localized preferences title, renamed some i18n keys 2019-07-26 14:05:19 +02:00
Tobias Hagemann 036dca33be mac appearance changes with light/dark theme, updated jni 2019-07-26 11:42:46 +02:00
Sebastian Stenzel 74565d7995 fixed unit tests 2019-07-25 15:48:10 +02:00
Sebastian Stenzel 65ab09e63c added style classes for vault list cells during a drag'n'drop-event
[ci skip]
2019-07-25 15:29:25 +02:00
Sebastian Stenzel 8e305b0e21 minor layout adjustments
[ci skip]
2019-07-25 14:32:15 +02:00
Sebastian Stenzel ff66e07c65 Added save password checkbox to unlock dialog 2019-07-25 13:26:34 +02:00
Sebastian Stenzel 4138747fc3 Localizable file picker title 2019-07-25 12:41:02 +02:00
Sebastian Stenzel 87c654b43d using vaultlist from parent scope, no need to duplicate variable in subscope 2019-07-25 12:29:14 +02:00
Sebastian Stenzel d0062b7e22 inject resource bundle 2019-07-25 12:25:53 +02:00
Tobias Hagemann 1d3900b86c added dark theme 2019-07-24 23:28:16 +02:00
Armin Schrenk b799ce34f6 renaming methods 2019-07-24 17:14:28 +02:00
Armin Schrenk 8d6cf9581b reformatting 2019-07-24 17:12:51 +02:00
Armin Schrenk 1a5853766a #929, implemented functionality to add existing vault 2019-07-24 17:12:09 +02:00
Armin Schrenk cd284304cd replacing selfplaced buttons by button bar 2019-07-24 17:02:50 +02:00
Armin Schrenk 363e4152a5 implementing remove vault functionality 2019-07-24 16:34:27 +02:00
Tobias Hagemann 0ce4ddb874 added scrollbar to theme 2019-07-24 15:04:31 +02:00
Sebastian Stenzel 3c574b97cb Added unlock window (issue #928) 2019-07-24 14:58:43 +02:00
Sebastian Stenzel b7b8f26992 cleanup and simplification 2019-07-24 14:57:56 +02:00
Sebastian Stenzel 4eca5069b3 moved class 2019-07-24 14:56:52 +02:00
Armin Schrenk 03618f547d fitting the layout for the existing vault controller 2019-07-24 11:41:54 +02:00
Armin Schrenk 12477c07d6 refactoring ChooseExistingVaultControllor to use a scoped ObjectProperty for the vault path 2019-07-24 11:31:49 +02:00
Armin Schrenk 0fb2d445b0 cleaning up addExistingVault controller 2019-07-24 11:21:05 +02:00
Armin Schrenk 43c5482542 move text labeling of addExisting vault wizard to string properties file 2019-07-24 11:12:29 +02:00
Sebastian Stenzel dc8e7a86b0 Merge branch 'develop' into feature/new-ui 2019-07-24 10:21:17 +02:00
Sebastian Stenzel 8f9e117169 Merge branch 'master' into develop 2019-07-24 10:12:49 +02:00
Sebastian Stenzel 14766b89ab Merge branch 'release/1.4.12' 2019-07-24 10:12:07 +02:00
Sebastian Stenzel 2a69740559 sharper gradient stops on hi-res displays
[ci skip]
2019-07-23 18:15:12 +02:00
Sebastian Stenzel dd0e548353 schön is German for beautiful
[ci skip]
2019-07-23 17:14:22 +02:00
Tobias Hagemann 0eb19a287f updated theme 2019-07-23 17:02:05 +02:00
Sebastian Stenzel 14de8ffd59 make window resizable (fixes #932)
[ci skip]
2019-07-23 16:51:25 +02:00
Sebastian Stenzel ac6249f541 toolbar styling 2019-07-23 16:17:30 +02:00
Sebastian Stenzel 5af2a392ea show stuff in vault list cells 2019-07-23 14:21:08 +02:00
Sebastian Stenzel edfdca6e5f Load vault list cells from FXML 2019-07-23 13:13:36 +02:00
Armin Schrenk c2ed9958c7 changing test functionality by intended showing now selected file 2019-07-22 17:12:22 +02:00
Armin Schrenk fddae7d0e1 adding back, open and file chooser button. 2019-07-22 16:53:06 +02:00
Tobias Hagemann fa729e220c updated theme 2019-07-22 16:16:15 +02:00
Sebastian Stenzel c917fb6a57 Added UI theme switcher (issue #930) 2019-07-22 15:05:23 +02:00
Sebastian Stenzel cf2e026f75 NONONO
[ci skip]
2019-07-19 16:23:29 +02:00
Sebastian Stenzel c340544152 Add Vault Wizard: Navigation between scenes
[ci skip]
2019-07-19 16:22:27 +02:00
Sebastian Stenzel 00c7cae923 cleanup [ci skip] 2019-07-19 14:15:45 +02:00
Sebastian Stenzel 80cff6912b Hooked up "add vault" wizard 2019-07-19 13:35:08 +02:00
Sebastian Stenzel b76e1d4167 Each window is now a separate @Subcomponent of the FxApplicationComponent 2019-07-19 12:46:34 +02:00
Sebastian Stenzel f7759d2547 hooked up all controls in Preferences window 2019-07-17 16:17:23 +02:00
Tobias HagemannandGitHub bf0e984e6c added links to some images [ci skip] 2019-07-17 14:16:25 +02:00
Tobias HagemannandGitHub b33dd62dc5 updated sponsors [ci skip] 2019-07-17 14:12:56 +02:00
Sebastian Stenzel d51e3979ff Added SplitPane css
[ci skip]
2019-07-17 10:54:40 +02:00
Sebastian Stenzel 01275fce9f add movable divider between vault list and vault detail view 2019-07-16 17:16:19 +02:00
Sebastian Stenzel 261b18f4eb First CSS for basic UI controls 2019-07-16 16:08:47 +02:00
Sebastian Stenzel fdc20aa84f Added controls to preferences screen 2019-07-16 16:08:34 +02:00
Sebastian Stenzel a3382c2d5b hook up preferences window 2019-07-15 16:39:21 +02:00
Sebastian Stenzel 52a9a2f018 starting with blank css 2019-07-15 11:32:58 +02:00
Sebastian Stenzel cfea1c16bc added vault list and vault detail view 2019-07-15 11:32:49 +02:00
Sebastian Stenzel 180c07cf61 new class layout for viewcontrollers 2019-07-11 00:19:18 +02:00
Sebastian Stenzel 53cc93a2b4 don't attempt to access linux keychain on non-linux systems, even if classes are present (i.e. when starting from IDE)
[ci skip]
2019-07-10 15:15:37 +02:00
Sebastian Stenzel f880db4902 fixes #842 2019-07-10 15:14:23 +02:00
Sebastian Stenzel f16c887911 Updated CryptoFS 2019-07-10 12:48:24 +02:00
Sebastian Stenzel dc889b8810 fixes #919 2019-07-09 17:04:05 +02:00
Sebastian Stenzel 903d8187e9 Preparing 1.4.12 2019-07-04 15:59:16 +02:00
Tobias Hagemann 7fedcafa9e Updated localizations 2019-07-04 15:48:42 +02:00
infeo 15dcf10ad7 fixing error where wrong mount flags are displayed (app started with webDAV and then switched to Fuse/Dokany) 2019-07-04 15:20:14 +02:00
infeo 1a99ae3e44 deactivating mout flags in the ui when WebDAV is used 2019-07-04 14:31:16 +02:00
infeo 82ff5ddabe due to change in type of winDriveLetters (from Character to Path) need addtional adjustment 2019-07-04 14:07:21 +02:00
infeo 67c29603da removing white spaces before and after additional dokany mount options 2019-07-04 14:04:19 +02:00
infeo 20e7186256 correcting wrong mount option 2019-07-04 14:03:14 +02:00
infeo 66d7621bc9 Merge branch 'bugfix/872-vaultLetterChangesAutomatically' into develop 2019-07-04 13:41:20 +02:00
infeo 5e46236cb2 formatting 2019-07-04 13:37:39 +02:00
infeo ffb6cc354b fix for more consistent ui 2019-07-04 13:37:27 +02:00
infeo 23da229d81 spelling error 2019-07-04 13:06:38 +02:00
infeo fe7e9d84ca fixing labels and gui element positions 2019-07-04 12:03:54 +02:00
infeo ea1edb2320 Merge branch 'develop' into bugfix/872-vaultLetterChangesAutomatically 2019-07-04 11:38:37 +02:00
infeo 688726b98d Merge develop into /bugfix/872-vaultLetterChange 2019-07-04 11:22:08 +02:00
Sebastian StenzelandGitHub e108bdbdb4 Update stale.yml 2019-07-03 18:57:30 +02:00
Sebastian Stenzel b71c6a9d9f Merge branch 'feature/802-custom-mount-flags' into develop
fixes #802
2019-07-03 16:08:38 +02:00
Sebastian Stenzel 5d0e153155 no longer using snapshot 2019-07-03 15:46:56 +02:00
Sebastian Stenzel 0e40e785d5 Merge branch 'develop' into feature/802-custom-mount-flags
[ci skip]
2019-07-02 16:49:20 +02:00
Sebastian Stenzel 5b2bd86e32 Added paragraph about running Cryptomator using the .jar files within the buildkit.
This fixes #917
[ci skip]
2019-07-02 16:48:51 +02:00
Sebastian Stenzel 8f1fd24746 fixes #843 2019-07-02 16:41:44 +02:00
Sebastian Stenzel f974876bf2 Merge branch 'feature/422-save-pw-linux' into develop
fixes #422
2019-07-02 16:12:45 +02:00
Sebastian Stenzel 7fcaded720 minor amendment to #905
[ci skip]
2019-07-02 16:09:48 +02:00
Sebastian StenzelandGitHub c66519a2d0 Merge pull request #905 from purejava/secret-service-simple
Fixes #422
2019-07-02 16:06:06 +02:00
Ralph Plawetzki 1aec6ef877 Include required jar files for secret-service in Linux build 2019-06-29 15:34:15 +02:00
Ralph Plawetzki 5217546f73 Isolate SimpleCollection via an interface and avoid imports for it
This is needed on other platforms than Linux to avoid class loading problems on runtime in case secret-service.jar is missing
2019-06-29 15:31:22 +02:00
Ralph Plawetzki 63383866ea Add access functionality for Gnome login keyring 2019-06-29 15:28:26 +02:00
Sebastian Stenzel 0da567613d custom mount flag support for Dokany (#802)
[ci skip]
2019-06-25 11:32:53 +02:00
Sebastian Stenzel 5688289918 UI tweaks to unlock screen (to be tested under windows) 2019-06-24 14:47:58 +02:00
Sebastian Stenzel b15d410378 Re-layouted unlock UI and added textfield for custom mount flags (atm only supported for FUSE - see #802) 2019-06-18 16:39:56 +02:00
Sebastian Stenzel ed9adab9b4 store custom mount flags in settings.json as string instead of string array 2019-06-18 16:31:10 +02:00
Sebastian Stenzel 06abbf2dd1 custom mount flags default to empty flags 2019-06-18 15:00:54 +02:00
Sebastian Stenzel f909f384be improved error logging 2019-06-18 15:00:25 +02:00
Sebastian Stenzel 367281fccb overwrite settings atomically 2019-06-18 14:45:43 +02:00
Sebastian Stenzel f53f2d2ca4 allow to store custom mount flags in the vault settings (required for #802)
[ci skip]
2019-06-17 13:55:31 +02:00
Sebastian Stenzel af73dab795 Merge branch 'master' into develop 2019-06-11 12:58:44 +02:00
Sebastian Stenzel 569a2c86ba Merge branch 'release/1.4.11' 2019-06-11 12:57:36 +02:00
Sebastian Stenzel 37f9ec31a5 fixes #900 2019-06-06 16:41:50 +02:00
Tobias Hagemann 8db856855e Updated issue templates, code of conduct, and contributing [ci skip] 2019-05-24 14:51:48 +02:00
Tobias HagemannandGitHub c31212a73a Create SECURITY.md 2019-05-23 16:12:53 +02:00
Sebastian StenzelandGitHub bcbf53a606 Create FUNDING.yml
[ci skip]
2019-05-23 16:01:12 +02:00
Sebastian Stenzel e35c7a6991 Updated issue templates
[ci skip]
2019-05-23 12:50:40 +02:00
Sebastian Stenzel ff80b4c61d Preparing 1.4.11 2019-05-22 17:17:08 +02:00
Sebastian Stenzel 295400cb97 fixes #890, fixes #867 2019-05-22 17:13:57 +02:00
Tobias Hagemann e1a9a3d519 Added French (BE), French (CA), Indonesian, and Swedish localizations 2019-05-22 16:26:54 +02:00
Tobias HagemannandGitHub 393628bf70 Merge pull request #896 from purejava/fix-887
Fixes https://github.com/cryptomator/cryptomator/issues/887
2019-05-19 13:37:21 +02:00
Ralph Plawetzki 31dd78ee28 Fixes https://github.com/cryptomator/cryptomator/issues/887
Set text in password field to null when they get swiped
2019-05-18 13:27:29 +02:00
Tobias Hagemann f0f3b97a4f Annoying IDE [ci skip] 2019-05-09 16:29:25 +02:00
Tobias Hagemann e9f55da573 Merge branch 'master' into develop 2019-05-09 13:29:10 +02:00
Tobias Hagemann 272115d2f7 Merge branch 'release/1.4.10' 2019-05-09 13:19:09 +02:00
infeo 95ae0ac9fd fixes #867 2019-05-08 15:11:14 +02:00
Sebastian Stenzel c2e1f8d7f7 preparing 1.4.10 2019-05-07 13:21:54 +02:00
Sebastian Stenzel 8205e4dd5a fixes #880
fixes #862
2019-05-07 13:16:23 +02:00
Sebastian Stenzel e83aab9968 fixes #883 2019-05-07 12:37:43 +02:00
Sebastian Stenzel 19222475ec Updated README.md
(due to confusions, see #682)
[ci skip]
2019-05-07 11:33:06 +02:00
Tobias Hagemann a304b9a5c7 Merge branch 'master' into develop 2019-04-27 22:43:18 +02:00
Tobias Hagemann 0037c12326 Merge branch 'release/1.4.9' 2019-04-27 22:42:26 +02:00
Tobias Hagemann 5908249325 Preparing 1.4.9 2019-04-27 22:41:46 +02:00
Tobias Hagemann debdf92cfc Updated CryptoFS to 1.8.2, fixes #877 2019-04-27 22:37:48 +02:00
Tobias Hagemann 5944086510 Switching to Xenial for CI builds 2019-04-27 22:25:19 +02:00
Sebastian Stenzel a551663127 Merge branch 'master' into develop 2019-04-24 14:01:25 +02:00
Sebastian Stenzel 1cc0b0728d Merge branch 'release/1.4.8' 2019-04-24 14:00:50 +02:00
Tobias Hagemann 7e7d5e46d3 Updated localizations 2019-04-24 13:29:04 +02:00
Sebastian Stenzel 5625525b21 Preparing 1.4.8 2019-04-24 13:00:02 +02:00
Sebastian Stenzel b8fa226163 Updated dokany-nio-adapter to 1.1.7, required by #783 2019-04-24 12:58:29 +02:00
Unknown 2b44f0ee9f updated IDE config
[ci skip]
2019-04-24 12:49:35 +02:00
Sebastian Stenzel b1ea21809b Updated CryptoFS to 1.8.1, fixes #875 2019-04-24 11:05:00 +02:00
Tobias Hagemann 8def0b2060 Fixed localization 2019-04-12 16:09:38 +02:00
Tobias Hagemann 2f61964758 Updated localizations 2019-04-12 14:35:13 +02:00
Sebastian Stenzel 2668299131 Merge branch 'master' into develop 2019-04-12 13:33:35 +02:00
Sebastian Stenzel a7de849800 Merge branch 'release/1.4.7' 2019-04-12 13:33:00 +02:00
Sebastian Stenzel c66a8d0cfe Preparing 1.4.7 2019-04-12 13:24:27 +02:00
Sebastian Stenzel efa7f78ffd Added IDE run configuration
[ci skip]
2019-04-12 13:20:42 +02:00
Sebastian Stenzel 57c858351d Further dependency updates 2019-04-12 12:42:12 +02:00
Sebastian Stenzel c3e48934b2 fixes #862, fixes #853 2019-04-12 12:40:27 +02:00
Sebastian Stenzel 06b8c7cdf4 Fixes #866 2019-04-12 12:19:54 +02:00
Sebastian Stenzel cbf677a51c Fixes #776, fixes #791, fixes #837 2019-04-12 12:17:27 +02:00
Sebastian Stenzel 923e58ba18 Simplified I/O graph calculation, reusing datapoints (might be a fix for #827, might also be related to #284) 2019-04-08 17:28:22 +02:00
infeo 65c12d7ae1 fixes #847 2019-04-03 16:56:44 +02:00
Sebastian Stenzel 8e324ef0eb code quality [ci skip] 2019-03-27 09:08:18 +01:00
Sebastian Stenzel 29a0336bf4 code quality [ci skip] 2019-03-27 08:50:20 +01:00
Sebastian Stenzel 44fc6761e3 fixes #858 2019-03-19 15:02:48 +01:00
Armin Schrenk a4ef082bc4 fixes #854 2019-03-14 11:12:25 +01:00
Tobias Hagemann 1272279b96 Merge branch 'master' into develop 2019-03-01 15:02:37 +01:00
Tobias Hagemann 6aafa7bb5c Merge branch 'release/1.4.6' 2019-03-01 15:01:03 +01:00
Tobias Hagemann 43f2110f68 Preparing 1.4.6 2019-03-01 15:00:27 +01:00
Sebastian Stenzel 0b8f8e53af Re-added "Implementation-Version" to the jars' manifest to determine Cryptomator version at runtime 2019-02-28 23:45:10 +01:00
Sebastian Stenzel 336d67195d Merge branch 'feature/663-refactored-launcher' into develop
fixes #663
2019-02-28 20:52:01 +01:00
Sebastian Stenzel 6677079623 partial revert of dd3c969f, now using Application.launch(MainApp.class) again 2019-02-28 20:46:24 +01:00
Sebastian Stenzel 0974a57671 Merge branch 'develop' into feature/663-refactored-launcher 2019-02-28 20:20:58 +01:00
Tobias Hagemann ab77673fed Fixed IllegalStateException when trying to show graceful shutdown dialog from non-FX thread 2019-02-28 15:38:45 +01:00
Tobias Hagemann a70401596f Updated localizations 2019-02-28 00:36:37 +01:00
Tobias Hagemann ab198271a1 #458, #841: Improved layout of the indicator inside SecPasswordField 2019-02-28 00:16:53 +01:00
Sebastian Stenzel d62edcda73 improved password field: added caps lock indicator (see #458) and a warning + tooltip if control characters are found in the password (fixes #841) 2019-02-27 22:15:01 +01:00
Sebastian Stenzel 8cba58075d fixes #840 2019-02-27 17:23:08 +01:00
Sebastian Stenzel 426f36ce04 fixes #753 2019-02-27 17:22:48 +01:00
Sebastian Stenzel dd3c969f0f FxApplication now part of the Dagger graph
(references #663)
2019-02-26 22:41:33 +01:00
Tobias Hagemann 6a270ceccd Updated dependencies 2019-02-26 13:43:23 +01:00
Sebastian Stenzel a3474e05eb Fixes #835 2019-02-26 12:26:14 +01:00
Sebastian Stenzel dd190b5a16 added vm arg for mount dir 2019-02-26 12:15:35 +01:00
Sebastian Stenzel fe722629be moved vault upgrade classes to custom package with custom log config 2019-02-26 12:15:15 +01:00
Sebastian Stenzel f8e5d8aefb added macOS run configuration 2019-02-25 21:20:12 +01:00
Sebastian Stenzel 3e3a4ceefc allow configuration of custom logback configuration via -Dlogback.configurationFile vm arg 2019-02-25 15:54:43 +01:00
Tobias Hagemann a09edad165 Removed unused terms and updated some texts 2019-02-25 15:42:16 +01:00
Tobias Hagemann 129e9c63f8 Clearer distinction between messageText and progressText in UnlockController 2019-02-25 15:33:54 +01:00
Sebastian StenzelandGitHub 9af58b8e6e Merge pull request #834 from adrian/fix-logging-tests
Fixed Environment logDir tests
2019-02-24 22:32:52 +01:00
Adrian Smith 1048ff5728 Fix DisplayName on testRelativeLogDir 2019-02-24 21:01:04 +00:00
Adrian Smith 6adb591c9a Fix EnvironmentTest.testRelativeLogDir 2019-02-24 20:04:31 +00:00
Sebastian Stenzel d06720838e Logback configuration is now done programmatically, fixes #832 2019-02-23 03:43:06 +01:00
Sebastian Stenzel cf020e5b96 disable UI control tests on headless systems 2019-02-22 16:50:05 +01:00
Sebastian Stenzel 4bfd1e6433 Improved SecPasswordField and added unit tests
SecPasswordFields will now normalize any input to NFC on the fly. Any input typed into the password field will now get converted to NFC on-the-fly. This allows subsequent code to keep working on the CharSequence returned by getCharacters() without the need of additional Normalization. Affects #521
2019-02-22 16:38:39 +01:00
Sebastian Stenzel deded33da8 fixed hard-coded path in log config and refinded logging in settingsprovider 2019-02-21 14:52:35 +01:00
Sebastian Stenzel be5fce0ee9 make sure the directory containing temporary mount points exists 2019-02-21 14:17:44 +01:00
Sebastian Stenzel 39f9da16f9 mount path is now configurable via -Dcryptomator.mountPointsDir and no longer hardcoded to ~/.Cryptomator or ~/Library/Application\ Support/Cryptomator
fixes #710
2019-02-21 14:03:52 +01:00
Sebastian Stenzel 53b0d5cb9f Environment now being injected into WindowsProtectedKeychainAccess 2019-02-21 13:38:30 +01:00
Sebastian Stenzel b9a120b51b internalized logback config, added -Dcryptomator.logDir=path/relative/to/home. external logback configuration can still be used via -Dlogback.configurationFile=/path/to/logback.xml 2019-02-21 11:39:56 +01:00
Sebastian Stenzel debcab47e2 Refactored "file open events" to "app launch events", fixes #55 2019-02-21 00:02:12 +01:00
Sebastian Stenzel 8814372c68 made Settings and DebugMode a Singleton 2019-02-20 23:28:33 +01:00
Sebastian Stenzel 98e5c3ff88 simplified handling of fileOpenRequests 2019-02-20 15:39:00 +01:00
Sebastian Stenzel f1c332f455 Refactored IPC, fixes #663 2019-02-19 16:46:21 +01:00
Sebastian Stenzel 79306ea498 Introduced new scope @FxApplicationScoped below @Singleton.
This allows us to initialize Dagger before we start the JavaFX application, which will in turn allow us to access Environment from within the IPC classes.

Affects #663
2019-02-19 00:11:58 +01:00
Sebastian Stenzel d7dda7d249 Preparations for allowing to specify multiple paths to which Cryptomator writes settings, logs, etc. see #710 2019-02-18 16:53:41 +01:00
Sebastian Stenzel 1e80f4bba4 Upgrade to JUnit 5 2019-02-18 15:28:11 +01:00
Sebastian Stenzel ffd3981f36 Merge branch 'master' into develop
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2019-02-16 11:41:50 +01:00
Sebastian Stenzel aa23635744 Merge branch 'hotfix/1.4.5' 2019-02-16 11:41:08 +01:00
Sebastian Stenzel 0317e7c21d preparing 1.4.5 2019-02-16 11:40:50 +01:00
Sebastian Stenzel ec5e8bba30 fixes #826 2019-02-16 11:35:27 +01:00
Sebastian Stenzel 0caa9988d3 add version.txt to buildkit 2019-02-15 19:38:21 +01:00
Sebastian Stenzel f16c3d5110 updated build config 2019-02-15 16:00:59 +01:00
Sebastian Stenzel e1930505d1 updated build config 2019-02-15 15:46:44 +01:00
Sebastian Stenzel 757549919c updated CI config 2019-02-15 15:32:26 +01:00
Sebastian Stenzel 0257802bb0 Merge branch 'openjdk11' into develop 2019-02-15 15:22:00 +01:00
Sebastian Stenzel 5cb4b403cd updated travis-to-bintray upload config 2019-02-15 15:15:26 +01:00
Sebastian Stenzel 8831df9242 Removed creation of fat jar for now. 2019-02-15 14:45:12 +01:00
Sebastian Stenzel 2229a56831 Merge branch 'master' into develop
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2019-02-15 08:45:05 +01:00
Sebastian Stenzel c3370a8388 Merge branch 'hotfix/1.4.4' 2019-02-15 08:43:57 +01:00
Sebastian Stenzel 1175a114ec bumping version number [ci skip] 2019-02-15 08:41:20 +01:00
Sebastian Stenzel 3374dbf9a5 Fixes #825, fixes #823 2019-02-15 08:39:31 +01:00
Sebastian Stenzel 26aee9e42c create os-dependent buildkit.zip with all java resources required to build a self-contained package 2019-02-14 18:20:11 +01:00
Sebastian Stenzel ab82874013 Merge branch 'develop' into openjdk11
# Conflicts:
#	main/pom.xml
2019-02-14 18:12:10 +01:00
Sebastian Stenzel 39f1da105e Merge branch 'master' into develop
[ci skip]
2019-02-12 14:19:43 +01:00
Sebastian Stenzel 207bfee6e5 Merge branch 'release/1.4.3' 2019-02-12 14:19:14 +01:00
Sebastian Stenzel d08f3d03d0 preparing 1.4.3 2019-02-12 14:18:12 +01:00
Sebastian Stenzel a88bd81347 reverted change from previous commit 2019-02-12 14:13:45 +01:00
Sebastian Stenzel 8e2d2b899e moved ui control logic from initializer to setVault, removed readonly mode from windows 2019-02-12 13:59:38 +01:00
Tobias Hagemann 3b4870a98a Updated localizations 2019-02-12 13:33:19 +01:00
Sebastian Stenzel ef5eabdb79 Updated SecPasswordField, which will now no longer store passwords in Strings but rather in char[].
Affects #409
2019-02-12 12:02:09 +01:00
Sebastian Stenzel f52b2f323a empty custom mount point checks 2019-02-12 11:01:22 +01:00
Tobias Hagemann 7e60e5606c Updated custom mount point layout 2019-02-12 01:56:35 +01:00
Sebastian Stenzel 8e2fa082cc improved cleanup after unmounting and support for force-unmounting fuse volumes 2019-02-11 15:55:09 +01:00
Sebastian Stenzel d8ef402607 Merge branch 'feature/375-readonly' into develop
fixes #375
2019-02-11 15:41:23 +01:00
Sebastian Stenzel 748f1be0c5 fixes #757 2019-02-11 15:40:04 +01:00
Sebastian Stenzel 608d54a8f2 fixes #810 2019-02-11 15:35:00 +01:00
Sebastian Stenzel 50b167e28f improved logging in case of "java.lang.IllegalStateException: Mount failed: Cannot assign a drive letter or mount point. Probably already used by another volume." (#806) 2019-02-11 13:28:38 +01:00
Sebastian Stenzel b7d06783dd Dokany-specific amendment for #752 2019-02-11 13:21:55 +01:00
Sebastian StenzelandGitHub 5ef3d23970 Merge pull request #817 from Gregvh/feature/375-readonly
Unlock vault with readonly flag if requested (fixes #375)
2019-02-08 17:38:13 +01:00
Gregvh 200a195f3b Unlock vault with readonly flag if requested 2019-02-08 15:39:09 +01:00
Sebastian Stenzel db0aceefdf Merge branch 'develop' into feature/375-readonly
# Conflicts:
#	main/commons/src/main/java/org/cryptomator/common/settings/VaultSettingsJsonAdapter.java
#	main/ui/src/main/java/org/cryptomator/ui/controllers/UnlockController.java
#	main/ui/src/main/resources/fxml/unlock.fxml
2019-02-08 15:28:40 +01:00
Sebastian Stenzel 492e986608 Custom mount point now selected via DirectoryChooser. Fixes #762 2019-02-08 12:32:00 +01:00
Sebastian Stenzel 98cab7e4d8 Delete automatically generated mount point after locking, attempt to fix #773 2019-01-31 15:38:05 +01:00
Sebastian Stenzel 384c9de7aa disabled spell checks [ci skip] 2019-01-31 15:37:20 +01:00
Sebastian Stenzel 528005a623 fixes #752 2019-01-31 15:37:01 +01:00
Tobias Hagemann c78d4c2d0e Updated localizations, added Catalan 2019-01-27 14:57:03 +01:00
Sebastian Stenzel c8e9201692 Merge branch 'master' into develop 2019-01-17 13:06:26 +01:00
Sebastian Stenzel 536da2621a Merge branch 'release/1.4.2' 2019-01-17 13:02:58 +01:00
Sebastian Stenzel 6167eeecb4 Preparing 1.4.2 2019-01-17 13:00:36 +01:00
Sebastian Stenzel 9cc873a344 No longer assigning drive letters A-C to fix problems with older Dokany versions 2019-01-17 11:38:48 +01:00
Sebastian Stenzel b539590d7a updated IDE settings and removed duplicate gitignore [ci skip] 2019-01-17 11:07:01 +01:00
Tobias Hagemann 5209bef1a9 Merge branch 'master' into develop 2019-01-16 16:55:53 +01:00
Tobias Hagemann ee5505362c Merge branch 'release/1.4.1' 2019-01-16 16:50:44 +01:00
Tobias Hagemann 82f388d420 Preparing 1.4.1 2019-01-16 16:38:37 +01:00
Tobias Hagemann 70e733f341 Updated localizations 2019-01-16 16:27:00 +01:00
Tobias Hagemann 3af5d5f267 Repositioned messageText in unlock, updated "unlock.pendingMessage.unlocking" copy 2019-01-16 16:23:03 +01:00
Sebastian Stenzel 28bf9e2ab1 fixes #732 2019-01-16 16:10:11 +01:00
Sebastian Stenzel 2f3a576de9 Renewed BINTRAY_API_KEY [ci skip] 2019-01-16 16:02:52 +01:00
Armin SchrenkandSebastian Stenzel bbe1ef3dbc Feature/custom mount point generalizing (#797)
* changing naming of individual mout path property

* adding input/output for the new custom mount points

* ui integration of custom mount point

* removing unused variable

* Improving UX

* Simplify mountPathProperty and implement its usage

* reverting renaming of Properties concerning the usage of own mount point (rescheduled for 1.5.0)

* changing displayed message when no mount path given

* fixing ui error

* applying suggestion of comment https://github.com/cryptomator/cryptomator/pull/797/files/7338fda41858942ee17daf436979e2a69114a108#r248254180
2019-01-16 15:08:00 +01:00
Tobias Hagemann 078a127182 Shortened "welcome.askForUpdateCheck.dialog.content" copy 2019-01-16 14:15:26 +01:00
Tobias Hagemann 240bf122dd Hide "check for updates" indicator by default 2019-01-16 14:00:32 +01:00
Sebastian Stenzel f2f8f9b28c added intellij project configuration 2019-01-15 13:15:38 +01:00
Sebastian Stenzel af03e0d73d updated dagger [ci skip] 2019-01-15 13:07:39 +01:00
Sebastian StenzelandGitHub 7844078203 Merge pull request #784 from jellemdekker/bugfix/771_abort_graceful_shutdown_dialog
Added a Cancel button to the graceful shutdown-dialog
2019-01-14 13:05:40 +01:00
Armin Schrenk da62a22faf fixes #750 2019-01-09 17:59:41 +01:00
Armin Schrenk c36a1a4aef closes #711 2019-01-09 17:58:23 +01:00
Armin Schrenk 86d8599d07 Merge branch 'develop' into openjdk11 2019-01-09 16:07:47 +01:00
Armin Schrenk f760347d9d fixes #787 2019-01-09 15:28:05 +01:00
Armin Schrenk 8fc647eb2b Updating Apache Commons libraries 2019-01-09 15:26:02 +01:00
jellemdekker 69b1bf5a26 Added a Cancel button to the graceful shutdown-dialog. Fixes issue #771. 2018-12-22 12:53:42 +01:00
Sebastian Stenzel 6951edac96 fixes #770 2018-12-05 18:22:48 +01:00
Sebastian Stenzel 76c84b34e9 bumped version 2018-11-05 10:46:39 +01:00
Sebastian Stenzel 1362720011 Merge branch 'master' into develop
[ci skip]
2018-10-31 16:21:48 +01:00
Sebastian Stenzel 3f15352ebf Merge branch 'release/1.4.0-rc1' 2018-10-31 16:21:09 +01:00
Sebastian Stenzel fdedee49d3 Preparing 1.4.0-rc1 2018-10-31 16:20:42 +01:00
Sebastian Stenzel b506493c13 updated localization 2018-10-31 16:17:20 +01:00
Sebastian Stenzel bc09f28120 updating dependencies
fixes #742, fixes #705
2018-10-31 16:03:37 +01:00
Sebastian Stenzel eba0935900 attempting to downgrade to oracle jdk 9 because of stupid jdk 10 deprecation 2018-10-31 15:56:18 +01:00
Armin Schrenk 744225cf7a changing build to jdk11 2018-10-31 15:51:00 +01:00
Armin Schrenk 54f2667e45 openjdk 11 migration 2018-10-31 15:50:05 +01:00
Armin Schrenk 050a6e6a57 use jdk 10 for 1.4.0 release 2018-10-31 15:22:00 +01:00
Armin Schrenk dbcb407a7c updating travis config 2018-10-31 14:41:30 +01:00
Armin Schrenk b1acdf9e61 fixex #738 2018-10-31 14:13:03 +01:00
Armin Schrenk 9c6a0b3e0c readjust columns in settings dialogue 2018-10-31 13:36:52 +01:00
Sebastian Stenzel f6df442948 Merge branch 'master' into develop
[ci skip]
2018-10-15 14:37:05 +02:00
Sebastian Stenzel 29038a679f Merge branch 'release/1.4.0-beta3' 2018-10-15 14:36:27 +02:00
Sebastian Stenzel 2e042423d0 Preparing 1.4.0-beta3 2018-10-15 14:35:34 +02:00
Sebastian Stenzel e08c2b7dc3 updated dependencies 2018-10-11 00:31:22 +02:00
infeo d5d0589dec changing description of own mount point usage 2018-10-10 12:34:23 +02:00
infeo a760edcab9 fixing settings bug under linux 2018-10-05 18:31:38 +02:00
infeo a759455473 removing testsetting 2018-10-05 17:53:10 +02:00
Armin Schrenk 50d2f16f71 fixing ui bug: setting fields did not disappeared with mount adapter change 2018-10-05 17:42:35 +02:00
infeo 8afa09007b aligning webdav port number textfield 2018-10-04 16:12:07 +02:00
Sebastian StenzelandGitHub fccd02a7e8 Merge pull request #730 from Gregvh/read-only-setting
Add read-only option to the advanced settings (references #375)
2018-10-04 10:05:16 +02:00
Gregvh 7e46957bcb Add read-only option to the advanced settings 2018-10-03 11:30:44 +02:00
infeo 194f373c08 changes spelling of the word dokany 2018-10-01 23:12:51 +02:00
Sebastian Stenzel 5f11e1aa8b Next attempt to provide a solution for #656. 2018-09-17 22:39:46 +02:00
Sebastian Stenzel 0ac1b406b7 tmp fix from https://github.com/cryptomator/cryptomator/pull/29 apparently no longer needed with latest JDK. 2018-09-17 22:38:35 +02:00
Sebastian Stenzel ade2db7cc0 attempt to correctly size the UI (#656) 2018-09-16 14:46:50 +02:00
Sebastian StenzelandGitHub eb911aeb6c Merge pull request #690 from jellemdekker/feature/230-graceful-quit
Implemented graceful shutdown confirmation dialog, fixes #230.
2018-08-21 18:15:02 +02:00
jellemdekker a58259d4f0 As per feedback on PR #690: refactored if-statement. 2018-08-21 15:27:32 +02:00
jellemdekker 963a731202 As per feedback on PR #690: redid line wrapping, refactored signature for dialog builder method to include a default button, and the default button for the graceful shutdown dialog is now 'Force shutdown'. 2018-08-21 15:26:10 +02:00
Tobias Hagemann 5ea0fc4b6f updated localizations [ci skip] 2018-08-08 23:42:54 +02:00
Sebastian Stenzel 4becdf7e1e now publishing ant-kit to bintray instead of github releases 2018-07-23 23:21:10 +02:00
Sebastian Stenzel 8ab8798381 jdk_switcher no longer needed, since codacy-coverage-reporter should now support jdk 10 (see https://github.com/codacy/codacy-coverage-reporter/issues/83) 2018-07-23 21:01:43 +02:00
Sebastian Stenzel c3f8fa1662 code refinements 2018-07-19 18:13:19 +02:00
infeo 59d019f34a fixes #700 2018-07-19 15:40:45 +02:00
infeo ee99e9994e closes #695 2018-07-17 18:36:30 +02:00
infeo 019b7ac643 refactoring inconsistent method in vault class 2018-07-17 18:18:23 +02:00
infeo 7392a99da5 small ui fix: text for using individual mount path is not shown completely 2018-07-17 18:17:27 +02:00
Sebastian Stenzel e909269ae0 Merge tag '1.4.0-beta2' into develop
1.4.0-beta2
2018-07-12 15:22:42 +02:00
Sebastian Stenzel 45ad496f41 Merge branch 'release/1.4.0-beta2' 2018-07-12 15:21:50 +02:00
Sebastian Stenzel a272bf2614 preparing 1.4.0-beta2 2018-07-12 15:14:36 +02:00
infeo 119e0724d5 fixing broken option "reveal after mount" 2018-07-12 14:58:34 +02:00
Sebastian Stenzel 76a9cb9a06 using different threadpools for normal ExecutorService (will spawn threads on demand) and ScheduledExecutorService (limited to 4 scheduler threads) 2018-07-12 14:53:27 +02:00
infeo acb8d4cd0c fixing display issue when locking a vault and changign to another vault during the lock process 2018-07-12 11:53:44 +02:00
Sebastian Stenzel ffe8887114 no longer using jdk.incubator.httpclient, because windows app doesn't start with --add-modules arg in cfg file 2018-07-12 11:03:35 +02:00
Sebastian Stenzel d8c8c2380a trying to move coverage report to end of build to workaround https://github.com/travis-ci/travis-cookbooks/issues/989 2018-07-11 16:12:07 +02:00
Sebastian Stenzel fe5ce79802 updated mockito (restoring jdk 10 compatibility) 2018-07-11 15:52:07 +02:00
Sebastian Stenzel bf7a8686a6 fix build 2018-07-11 15:45:05 +02:00
Sebastian Stenzel 143070d02d Updated to JDK 10 2018-07-11 15:40:28 +02:00
Sebastian Stenzel 06827a7466 changed ant-kit format to zip (because windows..) 2018-07-10 22:57:33 +02:00
Sebastian Stenzel 5add862ce8 updated ant-kit 2018-07-10 17:44:22 +02:00
Sebastian Stenzel 2b8d7c6c3b linux logback configuration moved to https://github.com/cryptomator/cryptomator-linux
[ci skip]
2018-07-10 17:05:45 +02:00
Sebastian Stenzel f5da13d3b4 Updated ant-kit. To be used by Windows and Mac build as well 2018-07-10 16:59:07 +02:00
Sebastian Stenzel 03dfd3e887 Replaced AsyncTaskService by new Tasks utility using javafx.concurrent API 2018-07-10 14:51:33 +02:00
infeo 8241559362 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop 2018-07-09 18:43:51 +02:00
infeo c289040624 fixes a display error where a vault appeared unlocked even when a wrong password was given 2018-07-09 18:43:45 +02:00
Sebastian StenzelandGitHub 767acbd922 Merge pull request #689 from jellemdekker/feature/296-status-indicator-in-system-tray
[Help needed] Different system tray icon is shown when one or more vaults are unlocked

fixes #296
2018-07-09 17:54:47 +02:00
Tobias Hagemann ccd4cedb08 Unlocked tray icons for macOS 2018-07-09 17:37:16 +02:00
jellemdekker 0ddd6d767d Implemented confirmation dialog when graceful shutdown of Cryptomator fails, so that the user can try again or opt to shutdown forcefully. 2018-07-09 16:42:53 +02:00
jellemdekker 6a5a1e5bae Replaced spaces in indentation with tabs. 2018-07-09 14:56:22 +02:00
jellemdekker b3d76bb394 Created the unlocked version of the tray icon for every operating system except macOS. Uses the free-for-commercial-use 'Lock, open icon' from the Hawcons icon set by Yannick Lung over at Iconfinder.com: https://www.iconfinder.com/icons/314694/lock_open_icon 2018-07-06 17:43:43 +02:00
jellemdekker 1924a7dec9 Implemented that a different system tray icon is shown to indicate when one or more vaults are unlocked. The unlocked icons are placeholders and will updated visually in following commits. 2018-07-06 17:34:39 +02:00
Sebastian StenzelandGitHub b65da30899 Merge pull request #688 from Gregvh/fix-broken-links
Fix broken links in CONTRIBUTING.md
[ci skip]
2018-07-06 17:33:56 +02:00
Sebastian StenzelandGitHub 7de8b3da02 Merge pull request #686 from jellemdekker/bugfix/update-readme.md-build-dependency-java
Updated minimum required version of Java Development Kit
[ci skip]
2018-07-06 17:33:02 +02:00
Gregvh 48ac8da1a7 Fix broken links in CONTRIBUTING.md 2018-07-06 14:13:15 +02:00
jellemdekker 86ae35c7eb Updated minimum required version of Java Development Kit, because this has changed since Cryptomator version 1.4.0. Source: https://community.cryptomator.org/t/how-to-run-cryptomator-1-4-0-beta1-jar/1599/4 . Skipping over Java 9, because its support has already ended. Also, JCE unlimited strength policy files are now included in the JDK by default, so they no longer need to be mentioned separately. 2018-07-06 03:52:04 +02:00
infeo 8421a8fc7b updating version of dokany-nio-adapter 2018-07-05 16:44:13 +02:00
infeo b579e03bc8 workaround for the combination of windows + dokany + (automatic drive letter selection) 2018-06-28 16:55:00 +02:00
infeo 9217b11e61 adding automatic drive letter selection to dokany volume 2018-06-28 16:02:11 +02:00
Tobias Hagemann e16bd7373c updated dokany version [ci skip] 2018-06-22 17:00:48 +02:00
Sebastian Stenzel ef53561bf0 Improvements suggested in #598 2018-06-21 17:47:47 +02:00
Sebastian Stenzel 3165c4ba86 Add GPG signature for antkit.tar.gz, fixes #522 2018-06-17 23:22:48 +02:00
Sebastian StenzelandGitHub f1bf157cac Update stale.yml
[ci skip]
2018-06-17 16:20:00 +02:00
Sebastian StenzelandGitHub 9c75dd48dd Create no-response.yml
[ci skip]
2018-06-17 15:55:09 +02:00
Sebastian StenzelandGitHub 74d4b4ea47 Rename style.yml to stale.yml
[ci skip]
2018-06-17 15:49:19 +02:00
Sebastian StenzelandGitHub 6f66f4cbf1 Create style.yml
[ci skip]
2018-06-17 15:48:59 +02:00
Sebastian Stenzel 874c5506a7 Added Dokany to volume type setting.
Restart no longer required, when changing preferred volume type.
References #207
2018-06-17 14:19:22 +02:00
Sebastian Stenzel aed35c17c8 Added Dokany Support
fixes #207
2018-06-17 13:59:28 +02:00
Sebastian Stenzel 873e438759 merging jacoco reports via codacy, subproject no longer needed 2018-06-17 11:58:26 +02:00
Sebastian Stenzel 5b45893c7b Renamed CommandFailedException to VolumeException 2018-06-15 09:48:46 +02:00
Sebastian Stenzel 5515258af1 updated FUSE, fixed reveal after unlock 2018-06-14 17:37:32 +02:00
Sebastian Stenzel dd5d52d25a updated dependencies 2018-05-24 14:19:59 +02:00
Sebastian Stenzel 24236f3844 Merge commit '458866f7d6460e688897b851248c8a2c22dc80d1' into develop 2018-05-24 14:14:44 +02:00
Markus Kreusch 458866f7d6 Asking user once before enabling update check 2018-05-22 11:36:00 +02:00
Sebastian Stenzel 525b0a7982 updated dependencies 2018-05-14 21:38:22 +02:00
Sebastian Stenzel d53af61b58 Removed "Mount after unlock" option. Mounting/unmounting no longer visible to the user, but merged with unlocking/locking. 2018-05-14 21:37:38 +02:00
Sebastian Stenzel b0ab46b7b6 Removed copy WebDAV URL button 2018-05-14 21:04:00 +02:00
infeo 9107d296c3 fixes partially #660 2018-04-09 18:07:04 +02:00
Sebastian Stenzel 6be95963a1 moved issue templates to .github directory
[ci skip]
2018-04-07 00:42:08 +02:00
Sebastian Stenzel 09c9361e94 Merge branch 'release/1.4.0-beta1' into develop
[ci skip]
2018-04-06 16:55:22 +02:00
Sebastian Stenzel 5e7cea216d Merge branch 'release/1.4.0-beta1' 2018-04-06 16:54:12 +02:00
Sebastian Stenzel 6d91992102 preparing 1.4.0-beta1 2018-04-06 16:31:08 +02:00
Sebastian Stenzel 5a23ee0be6 updated dependencies 2018-04-06 16:29:40 +02:00
Sebastian Stenzel 31e186dd15 bumped fuse version 2018-04-05 23:24:47 +02:00
Sebastian Stenzel c7beb4a93c Default to FUSE. Use WebDAV as Backup, if FUSE isn't supported 2018-04-03 17:32:26 +02:00
Sebastian Stenzel 6aff94a8f8 Merge tag '1.3.5' into develop
1.3.5

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2018-04-03 10:41:43 +02:00
Sebastian Stenzel 273f6907c9 Merge branch 'hotfix/1.3.5' 2018-04-03 10:41:03 +02:00
Sebastian Stenzel 95df963913 Updated CryptoFS to version 1.5.1, fixing #643 2018-04-03 10:32:40 +02:00
infeo 13c5e2470b UI improvement: adding checkbox before textbox for entering own mountpath is given 2018-03-30 12:43:50 +02:00
Sebastian Stenzel 2341440ed9 Merge tag '1.3.4' into develop
1.3.4

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2018-03-29 13:26:13 +02:00
Sebastian Stenzel 558f4be945 Merge branch 'hotfix/1.3.4' 2018-03-29 13:25:44 +02:00
Sebastian Stenzel d63735df1a bumped version to 1.3.4 2018-03-29 13:24:12 +02:00
Sebastian Stenzel 8be9cbbab7 Merge tag '1.3.4' into develop
1.3.4

# Conflicts:
#	.travis.yml
2018-03-29 12:58:53 +02:00
Sebastian Stenzel 191d7561f0 Merge branch 'hotfix/1.3.4' 2018-03-29 12:58:03 +02:00
Sebastian Stenzel 49a6fe9571 updated api key for github releases 2018-03-29 12:57:18 +02:00
Sebastian Stenzel 8b85fa5928 Merge tag '1.3.4' into develop
1.3.4

# Conflicts:
#	.travis.yml

[ci skip]
2018-03-29 12:42:39 +02:00
Sebastian Stenzel 2695979ae2 Merge branch 'hotfix/1.3.4' 2018-03-29 12:40:11 +02:00
Sebastian Stenzel f2212169be updated api key for github releases 2018-03-29 12:39:32 +02:00
Sebastian Stenzel 5898a4d584 Merge tag '1.3.4' into develop
1.3.4

# Conflicts:
#	main/pom.xml
2018-03-29 12:17:34 +02:00
Sebastian Stenzel 42b5b2663e Merge branch 'hotfix/1.3.4' 2018-03-29 12:16:57 +02:00
Sebastian Stenzel a0a867474b updated dependencies 2018-03-29 12:16:37 +02:00
Sebastian Stenzel c98f7f8574 fixes #645 2018-03-29 12:06:49 +02:00
Sebastian Stenzel fae2e19b96 try to set icon and window title on Linux. Might still be buggy, see https://bugs.openjdk.java.net/browse/JDK-8092837 2018-03-28 17:59:46 +02:00
Sebastian Stenzel 45548a0023 jq is already installed on Travis container environment 2018-03-27 17:48:28 +02:00
Sebastian Stenzel 8edd5326fa fixed if..elif..fi statement 2018-03-27 17:42:57 +02:00
Sebastian Stenzel 1d178674ce updated travis config 2018-03-27 17:39:09 +02:00
Sebastian Stenzel 7593d5cd40 using commit hash instead of timestamp for snapshot versions 2018-03-27 17:26:07 +02:00
Sebastian Stenzel 9e8f88f000 fixed ci build 2018-03-27 16:49:48 +02:00
Sebastian Stenzel e1eafbc838 always delete continuous release from github releases
re-create it if untagged, otherwise create regular release
2018-03-27 16:42:01 +02:00
Sebastian Stenzel f2107954b3 trying to force github releases to overwrite existing continuous release 2018-03-27 14:12:57 +02:00
Sebastian Stenzel db3dabe3c5 clean target dir before re-building for deployment 2018-03-27 14:03:37 +02:00
Sebastian Stenzel 76f69dec34 fixing travis config 2018-03-27 13:53:44 +02:00
Sebastian Stenzel 1b130ab58e updated settings.xml, caching versions-maven-plugin 2018-03-27 13:17:43 +02:00
Sebastian Stenzel a12e2ae6cd attempt to fix use of org.codehaus.mojo:versions-maven-plugin 2018-03-27 12:17:32 +02:00
Sebastian Stenzel 7441f67b03 fixing syntax errors 2018-03-27 11:51:56 +02:00
Sebastian Stenzel d02d521856 fixing syntax errors 2018-03-27 11:46:22 +02:00
Sebastian Stenzel e6dd14d0e5 Enabling continuous releases 2018-03-27 11:34:20 +02:00
infeo e257d8e497 implementing the per-vault mount-directory-creation and just removing the id from the volume name 2018-03-23 17:05:15 +01:00
Tobias Hagemann 2d6d3084b0 updated localizations, added czech [ci skip] 2018-03-23 14:33:46 +01:00
Sebastian Stenzel 4fffc63869 new antkit for upcoming AppImage build (see issue #469) 2018-03-23 12:57:04 +01:00
Sebastian Stenzel ce457ae20e No longer selecting first vault by default, when showing welcome screen after start of application. 2018-03-23 06:51:24 +01:00
Sebastian Stenzel 5b9efcc16f Merge commit 'cc40d05e44780cd52757e8afa0a917dce4f5a377' into develop
fixes #79
2018-03-23 06:47:46 +01:00
Sebastian Stenzel 28001710b3 Merge commit '8ec2b10a4d546b148ec2d6f75b284a636b2b9edf' into develop
# Conflicts:
#	main/ui/src/main/java/org/cryptomator/ui/model/Vault.java

fixes #627
2018-03-23 06:23:04 +01:00
Sebastian Stenzel 32e81796ae Merge commit '68445befeb17cee00c3b7d050edd0404ae3089d2' into develop 2018-03-23 06:16:31 +01:00
infeo 68445befeb simplifying the state enum to prevent illegal states 2018-03-22 17:47:43 +01:00
infeo da31a9d2a0 integrating changes proposed by comments in commit e808db51a5 2018-03-22 15:21:11 +01:00
Sebastian Stenzel 9b3167c886 added dropdown css for mac 2018-03-17 19:11:06 +01:00
Sebastian Stenzel 7c1a0b5fdf Renamed nioAdapterImpl to volumeImpl. 2018-03-17 16:08:58 +01:00
Sebastian Stenzel a666c80ef5 only initialize jetty on demand 2018-03-17 15:54:32 +01:00
Sebastian Stenzel 2610ef4645 Using enum instead of string to choose between FUSE and WebDAV 2018-03-17 15:44:27 +01:00
Sebastian StenzelandGitHub 357f659c8d Update README.md
[ci skip]
2018-03-13 12:13:16 +01:00
Sebastian Stenzel 19225c058d Include logback.xml in antkit, so .deb, .rpm and ppa releases can use it. fixes #650 2018-03-13 11:52:48 +01:00
Sebastian Stenzel f1ee991d07 code format + exception handling 2018-03-06 16:31:08 +01:00
infeo 562daf990f reactivating reveal method 2018-03-06 12:32:23 +01:00
Sebastian Stenzel 19cd0d70e7 Merge branch 'feature/fuse-integration' into develop 2018-03-06 11:46:13 +01:00
Sebastian Stenzel d38b488ee0 using customized maven settings.xml 2018-03-06 11:42:56 +01:00
Sebastian Stenzel 84d6f11be2 Merge branch 'develop' into feature/fuse-integration
# Conflicts:
#	main/commons/pom.xml
#	main/pom.xml
2018-03-06 11:34:41 +01:00
Sebastian Stenzel b3cf7eee16 updated fuse-adapter version 2018-03-06 11:26:53 +01:00
Sebastian Stenzel 9e5e14e462 Merge commit 'bfd8918e6ab3d0a01e9326eb35ce53203876b746' into develop 2018-03-02 12:46:05 +01:00
infeo b165f41c6b fixed test 2018-03-01 23:31:48 +01:00
infeo 41358e6715 fixing issue using an individual mountPath, renaming mountPath-Property, fixing gui issues with mountPath, 2018-03-01 23:27:01 +01:00
infeo c8387c7e3c adding "_ID-" suffix to mount name 2018-03-01 15:27:26 +01:00
infeo 8ace293701 fixing issue in the default vault path (missing leading '/') 2018-03-01 15:24:43 +01:00
infeo f5a08f05c1 fixing visibillity bug in settings of webdav properties shown when fuse is selected 2018-03-01 14:46:37 +01:00
infeo 9707d951d6 fixing a renaming issue 2018-03-01 14:39:12 +01:00
infeo 242b1e92a3 renaming NioAdapter-Interface to Volume to prevent confusing to FUSE-project 2018-03-01 14:35:03 +01:00
infeo 3bc7df9e83 moving the nioAdapterImpl to the commons package 2018-03-01 14:31:49 +01:00
infeo f774829fb1 Pushing FuseEnvironment to other project, using fuseMount now in FuseNioAdapter 2018-02-27 15:38:25 +01:00
Sebastian Stenzel bfd8918e6a updated pom.xml files 2018-02-26 18:33:51 +01:00
Sebastian Stenzel 3989316269 replaced org.apache.httpcomponents:httpclient by jdk.incubator.httpclient (will become official standard in jdk10) 2018-02-23 18:21:38 +01:00
infeo d0d83c6833 removing defaultMountDir from the settings 2018-02-19 23:14:28 +01:00
infeo c957f93ce6 activate reveal-method in vault again 2018-02-05 21:22:35 +01:00
infeo b069a16f0c introduce new FuseEnvironment Interface such that the fuseNioAdapter gets os-dependent information from it 2018-02-05 21:20:29 +01:00
infeo bf637f8361 reactivate reveal()-method of the vault 2018-02-04 00:12:18 +01:00
infeo a2f6a85334 extended settingstest to check new setting-attributes 2018-02-03 22:18:28 +01:00
infeo 8a359704ca removed redundant maven dependency 2018-02-03 22:16:03 +01:00
infeo e3b9601721 fixing a general setting not showing up on Mac OS 2018-02-03 17:42:48 +01:00
infeo d170e87c1b integration of the fuseNioAdapter, including all the gui (controller & fxml) and settings wiring. english localization fitted and enriched for fuse 2018-02-03 17:26:59 +01:00
infeo 39d1d9c561 adapted vault class to nioAdapter Interface (and some other classes) 2018-02-03 17:15:51 +01:00
infeo 2914af5f7b reformatting & removing unused imports 2018-02-03 17:02:05 +01:00
infeo fa10a92fa4 commit of the webDavNioAdapter 2018-02-03 16:44:07 +01:00
infeo 1e7478a89f commit of the nioAdapter Interface, implementation enum and the commandFailedException 2018-02-03 16:43:33 +01:00
Marc Stammerjohann 8ec2b10a4d #627: refactor adding trailing slash to copied WebDAV URL 2018-01-30 20:05:01 +01:00
Marc Stammerjohann 2001e768d4 add trailing slash when WebDAV Url gets copied to the clipboard 2018-01-29 11:23:07 +01:00
Sebastian Stenzel 79fd17250b updated dependency 2018-01-06 08:07:35 +01:00
Sebastian Stenzel b8ee19b395 fixing use of desktop features on headless platform 2017-12-30 21:05:01 +01:00
Sebastian Stenzel 08cfcffa72 updated CI config 2017-12-30 20:49:25 +01:00
Sebastian Stenzel 9e82739c16 fixed dependency version 2017-12-30 20:22:59 +01:00
Sebastian Stenzel 6534242275 updated dependencies and CI config 2017-12-30 20:19:27 +01:00
Marc Stammerjohann cc40d05e44 #79: replace shortcut with CRTL + NUM 2017-12-22 12:53:53 +01:00
Marc Stammerjohann 5fcbe7eff1 #79: add shortcut to navigate through vaults
* CTRL + UP
* CTRL + DOWN
2017-12-21 14:00:51 +01:00
Sebastian Stenzel 4be842aff5 first attempt of building Cryptomator with jdk9 2017-12-20 18:42:16 +01:00
Marc Stammerjohann e808db51a5 #114: show success message
* after creating a vault
* after changing password
* after upgrade
2017-12-20 15:50:31 +01:00
Sebastian Stenzel 8e1bb121bb Merge branch 'release/1.3.3' into develop
[ci skip]
2017-11-28 00:33:08 +01:00
Sebastian Stenzel 355c1934f9 Merge branch 'release/1.3.3' 2017-11-28 00:32:22 +01:00
Sebastian Stenzel b47ced1173 Preparing 1.3.3 2017-11-28 00:04:11 +01:00
Sebastian Stenzel a66e08ee9b No longer using Files.isRegularFile(), fixing "add existing vault located on OneDrive's FoD" 2017-11-27 16:20:35 +01:00
Sebastian Stenzel ad27094d63 Merge branch 'release/1.3.2' into develop
Fixes #554, fixes #542
2017-11-25 17:29:39 +01:00
Sebastian Stenzel 0be97b309b Merge branch 'release/1.3.2' 2017-11-25 17:27:51 +01:00
Sebastian Stenzel b8de68bf3b Preparing 1.3.2 2017-11-25 17:03:24 +01:00
Sebastian Stenzel f9dba09003 more password field focus fixes 2017-11-25 16:37:51 +01:00
Sebastian Stenzel a428e62891 more password field focus fixes 2017-11-24 22:01:31 +01:00
Sebastian Stenzel 424ea8429c focusing password fields on a few more occasions 2017-11-24 21:22:59 +01:00
Sebastian Stenzel a52adc1871 request focus on password field after selecting a vault 2017-11-24 20:16:16 +01:00
Sebastian Stenzel 08d5335b74 unwobblyfied win theme (focus border) 2017-11-24 20:15:07 +01:00
Sebastian Stenzel 8741c64b86 updated dependencies 2017-11-24 20:14:38 +01:00
Sebastian Stenzel b64f7cc7a8 Reverting commit 296848b41e, reopen #542 2017-11-23 12:48:57 +01:00
Sebastian Stenzel f84760746f Updated localizations, added Thai 2017-11-23 12:08:22 +01:00
armin 296848b41e fixes #542 2017-11-21 16:54:08 +01:00
Sebastian Stenzel 51e6ee5be5 fixes #592 2017-11-20 17:45:05 +01:00
armin 9d5609b129 Added highlighting of focused UI elements in windows and linux, for mac it is still missing (see issue #547) 2017-11-20 15:32:24 +01:00
armin e18d62d57f closes #547 2017-11-17 23:54:00 +01:00
Markus Kreusch 9ff710ddf5 Forcing RMI to use sotimeout set by socket factory 2017-11-16 15:29:11 +01:00
Sebastian Stenzel 02f3f5ad53 fixed log message [ci skip] 2017-11-16 14:56:16 +01:00
Sebastian Stenzel 40caba847b Removes ipc port file after shutdown, reduced so timeout for rmi clients 2017-11-16 14:54:54 +01:00
Sebastian Stenzel 467e242df4 Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop 2017-11-14 18:14:01 +01:00
Sebastian Stenzel a7c42c3d59 Removed use of Files.isRegularFile from UI module, references #592 2017-11-14 18:12:22 +01:00
Markus Kreusch ecdd3bc5ec Fixes #600 2017-11-10 15:04:21 +01:00
armin 46cab2ef9a Merge branch 'develop' of https://github.com/cryptomator/cryptomator into develop 2017-11-06 13:55:42 +01:00
Sebastian Stenzel a7b036d441 fixes #598 2017-11-02 11:16:41 +01:00
armin 17bbd9161f adapted project-files such that project can be used with intellij IDEA IDE 2017-10-24 18:04:19 +02:00
Sebastian Stenzel a850e8b816 Added unit tests for vault format "3 to 4" migration 2017-10-19 13:10:29 +02:00
Sebastian Stenzel 95b8240a21 fixed vault migration version 3 to 4: conflicting .lng files are now properly migrated 2017-10-18 12:35:20 +02:00
Sebastian Stenzel 69d379d03b fixes #583 2017-10-18 12:34:53 +02:00
Sebastian StenzelandGitHub 1b9951e90e Merge pull request #586 from hodyroff/patch-1
Add ownCloud
2017-09-27 16:21:57 +02:00
hodyroffandGitHub e62e9a1dff Add ownCloud
Cryptomator is used by many ownCloud users and the interview and installation guidance was well received.
2017-09-27 15:54:08 +02:00
Sebastian StenzelandGitHub 6d1989bbfe Merge pull request #580 from swiesend/develop
Hide tmp file under Linux
2017-09-12 12:28:27 +02:00
swiesend c41973a8d6 Hide tmp file under Linux 2017-09-12 11:31:31 +02:00
Sebastian Stenzel f84bb4710f Updated webdav-nio-adapter to 1.0.0 2017-08-16 21:06:28 +02:00
Tobias Hagemann d1a9233557 fixed #567: added drag & drop support for password fields 2017-08-07 11:04:44 +02:00
Tobias Hagemann 1a73f84d83 updated issue template [ci skip] 2017-08-03 14:15:39 +02:00
Sebastian Stenzel 36cf3c2283 fixes #546, fixes #557 2017-07-26 16:17:02 +02:00
Marc Stammerjohann 091fab90ee fix english typo [ci skip] 2017-07-25 16:01:02 +08:00
Sebastian StenzelandGitHub d81bf2e301 Update README.md
This is the 1000th commit! 🎉
[ci skip]
2017-07-22 01:29:08 +02:00
Tobias Hagemann cd3cf3da0e updated issue template [ci skip] 2017-07-21 16:11:04 +02:00
Tobias Hagemann 3e961dabdd updated readme [ci skip] 2017-07-21 15:50:27 +02:00
Sebastian Stenzel dde7d263b9 Merge branch 'release/1.3.1' into develop 2017-07-04 15:41:56 +02:00
Sebastian Stenzel ff373b9a3f Merge branch 'release/1.3.1' 2017-07-04 15:41:20 +02:00
Sebastian Stenzel 0a7d102981 Some controllers no longer singleton, preventing reuse of internal states. Fixes #537 2017-07-04 15:41:03 +02:00
Sebastian Stenzel 10867e87c9 Preparing release 1.3.1 2017-07-04 13:20:03 +02:00
Sebastian Stenzel 7900f0ea8c fixes #536 2017-07-04 13:03:13 +02:00
Sebastian Stenzel f0d364a6c5 formatting [ci skip] 2017-07-01 14:49:49 +02:00
Sebastian Stenzel 5ed50c50c7 Merge branch 'release/1.3.0' into develop 2017-07-01 14:48:23 +02:00
Sebastian Stenzel 020f12a2a9 Merge branch 'release/1.3.0' 2017-07-01 14:46:42 +02:00
Sebastian Stenzel 8aa5a8d7e8 Preparing 1.3.0 2017-07-01 14:38:46 +02:00
Sebastian Stenzel 72733f556c Merge branch 'release/1.3.0-rc9' into develop 2017-06-30 13:41:05 +02:00
Sebastian Stenzel 0fa03e05a8 Merge branch 'release/1.3.0-rc9' 2017-06-30 13:40:28 +02:00
Sebastian Stenzel b7ac5dcf88 preparing 1.3.0-rc9 2017-06-30 13:37:11 +02:00
Sebastian Stenzel 0ce48fab25 mount "cryptomator-vault" instead of 127.0.0.1, if this happens to be an localhost alias (references #529) 2017-06-30 12:55:33 +02:00
Sebastian Stenzel f50766c684 updated readme.md 2017-06-28 16:29:11 +02:00
Sebastian Stenzel 6dc597f826 Merge branch 'release/1.3.0-rc8' into develop 2017-06-28 11:39:11 +02:00
Sebastian Stenzel 509f132bc8 Merge branch 'release/1.3.0-rc8' 2017-06-28 11:37:38 +02:00
Sebastian Stenzel 096e063754 Dependency cleanup 2017-06-28 11:25:42 +02:00
Sebastian Stenzel 5e621eb0fb Preparing 1.3.0-rc8 2017-06-28 11:12:00 +02:00
Sebastian Stenzel 4e5edc834f fixes #526 2017-06-28 11:10:35 +02:00
Tobias Hagemann 4de1ac6e40 updated localizations [ci skip] 2017-06-27 16:58:45 +02:00
Sebastian Stenzel 9d2aa62785 Using 127.0.0.1 instead of localhost. References #512 2017-06-27 16:07:55 +02:00
Sebastian Stenzel 917c2a345f Merge branch 'hotfix/1.2.5' into develop 2017-06-23 13:50:57 +02:00
Sebastian Stenzel 6932fe4ab4 preparing hotfix 1.2.5 2017-06-23 13:38:09 +02:00
Sebastian Stenzel 332890d92b fixes #523 2017-06-23 13:37:45 +02:00
Sebastian Stenzel 39abdcb90f Updated Readme [ci skip] 2017-06-22 19:34:58 +02:00
Sebastian Stenzel 4e11b5bf37 Changed license to GPLv3 [ci skip] 2017-06-21 12:56:40 +02:00
Sebastian Stenzel d446541f34 added copyright statement 2017-06-21 11:41:34 +02:00
Sebastian Stenzel 0a9fe818dc Updated copyright statement 2017-06-21 11:40:38 +02:00
Sebastian Stenzel d26437ccd5 removed copyright comment from pom.xml 2017-06-21 11:34:40 +02:00
Sebastian Stenzel 54e9b2e1c1 updated dependency 2017-06-20 14:19:13 +02:00
Sebastian Stenzel 3d030cb6b0 New vault format: Passwords are now strictly used in unicode NFC when passed to key derivation. References #521 2017-06-20 12:08:36 +02:00
Tobias Hagemann 56db4aa038 updated localizations [ci skip] 2017-06-17 00:51:07 +02:00
Sebastian Stenzel 0acfdec238 Updated log config [ci skip] 2017-06-08 15:06:10 +02:00
Sebastian Stenzel 86b4ce6243 Fixes #510 2017-06-07 16:47:24 +02:00
Sebastian Stenzel 7436c398f8 fixes #511 2017-06-07 13:10:50 +02:00
Sebastian Stenzel 3c4494a14f cleanup 2017-06-02 00:18:11 +02:00
Sebastian Stenzel 345f515372 Merge branch 'release/1.3.0-rc7' into develop 2017-06-02 00:15:33 +02:00
Sebastian Stenzel b6b660ec06 Merge branch 'release/1.3.0-rc7' 2017-06-02 00:15:01 +02:00
Sebastian Stenzel f9596ec2c1 Preparing release 1.3.0-rc7 2017-06-01 23:53:30 +02:00
Sebastian Stenzel df9fa9ebad Fixes #507 2017-06-01 23:52:23 +02:00
Sebastian Stenzel 8a6c43ee69 Updated dependencies 2017-05-30 17:58:36 +02:00
Sebastian Stenzel c4b2a66152 fixes #498 [ci skip] 2017-05-29 11:14:42 +02:00
Sebastian Stenzel c8dadca564 Added “unmount without lock” to UnlockedController 2017-05-29 09:31:04 +02:00
Sebastian Stenzel 4ea3e8de8b moved mount + reveal from UnlockController to UnlockedController 2017-05-29 01:03:22 +02:00
Sebastian Stenzel 8c55946cf0 cleanup 2017-05-28 00:08:08 +02:00
Sebastian Stenzel f4265e1d73 added cmd+, shortcut to macOS menubar 2017-05-27 01:20:44 +02:00
Sebastian Stenzel 96c2272b03 Merge branch 'release/1.3.0-rc6' into develop 2017-05-26 16:16:18 +02:00
Sebastian Stenzel 7b7684f0af Merge branch 'release/1.3.0-rc6' 2017-05-26 16:15:48 +02:00
Sebastian Stenzel bff3dbd777 Preparing release 2017-05-26 14:51:48 +02:00
Sebastian Stenzel 0fc2b18f68 updated dependencies [ci skip] 2017-05-26 14:50:37 +02:00
Sebastian Stenzel e5dff4322a moved dagger-compiler as suggested on github.com/google/dagger 2017-05-26 13:47:43 +02:00
Sebastian Stenzel 167944e8ed fixed NPE during startup 2017-05-19 18:22:00 +02:00
Sebastian Stenzel 1af94c9c21 rotate log files in .rpm and .deb [ci skip] 2017-05-17 17:49:57 +02:00
Sebastian Stenzel 63df9a4d8f Added log rotation utility class 2017-05-17 17:46:29 +02:00
Tobias Hagemann 24c45c8539 updated localization [ci skip] 2017-05-16 23:03:51 +02:00
Sebastian Stenzel d1d3974610 updated log config [ci skip] 2017-05-16 17:42:03 +02:00
Sebastian Stenzel e6cd505767 added logback config for uber-jar, deb and rpm. 2017-05-16 17:31:15 +02:00
Sebastian Stenzel 2d68e27d3d moved from log4j to logback 2017-05-16 17:13:03 +02:00
Tobias Hagemann 05cc248417 fixes startup delay due to dns lookup 2017-05-16 13:22:54 +02:00
Sebastian Stenzel 10bff4c4fd fixes coverity CID 167209 2017-05-12 16:07:16 +02:00
Sebastian Stenzel b53da45a15 fixes coverity CID 169315 2017-05-12 16:02:55 +02:00
Sebastian Stenzel 67a7dcdc4b fixes coverity CID 169314 2017-05-12 15:59:34 +02:00
Sebastian Stenzel f87f10f332 Merge branch 'release/1.3.0-rc5' into develop 2017-05-12 15:47:49 +02:00
Sebastian Stenzel 3d47b30193 Merge branch 'release/1.3.0-rc5' 2017-05-12 15:46:47 +02:00
Sebastian Stenzel 1370b200bb Preparing 1.3.0-rc5 2017-05-12 15:42:02 +02:00
Sebastian Stenzel 2f249d557e Merge branch 'release/1.3.0-rc4' into develop 2017-05-12 15:40:19 +02:00
Sebastian Stenzel ce17fff1ac Merge branch 'release/1.3.0-rc4' 2017-05-12 15:40:19 +02:00
Sebastian Stenzel 2d55da309b preparing 1.3.0-rc4 2017-05-12 15:32:54 +02:00
Sebastian Stenzel 761207155d updated dependency 2017-05-12 15:28:44 +02:00
Sebastian Stenzel 456a879181 removed unused badges [ci skip] 2017-05-12 15:02:57 +02:00
Sebastian Stenzel 2e02e70916 Removed codecov, reporting coverage to codacy 2017-05-12 14:48:15 +02:00
Sebastian Stenzel dbc803a0d9 Removed unused classes 2017-05-12 12:06:28 +02:00
Sebastian Stenzel fdccafaa68 cleanup 2017-05-12 12:03:28 +02:00
Sebastian Stenzel deebd82ecd updated javadoc [ci skip] 2017-05-11 17:16:36 +02:00
Sebastian Stenzel 0906abdea9 fixes #499 2017-05-11 17:14:23 +02:00
Sebastian Stenzel da94fe4f6f fixes #491 2017-05-11 10:13:41 +02:00
Sebastian Stenzel 79672a28ee UI improvements for unlock options (fixes #40) 2017-05-09 14:55:26 +02:00
Sebastian Stenzel e052a4b261 AutoUnlocker now workes sequentially and takes a small nap between unlocks. 2017-05-09 14:48:04 +02:00
Sebastian Stenzel 425d4e8fed code cleanup 2017-05-04 16:53:58 +02:00
Sebastian Stenzel d2a2e2304d Implemented #40, tested on macOS 2017-05-04 12:47:15 +02:00
Sebastian Stenzel e7157a64ed removed slack build notifications [ci skip] 2017-04-30 09:51:10 +02:00
Sebastian Stenzel 245a995203 Filtering key events using Guava 2017-04-30 01:00:39 +02:00
Sebastian Stenzel c29d7fb6a2 fixes unit test 2017-04-30 00:59:07 +02:00
Sebastian Stenzel 8cada6d0a2 Guava convenience functions instead of reinventing the wheel 2017-04-30 00:21:29 +02:00
Sebastian Stenzel d03446beef adjusted unit tests 2017-04-29 10:31:22 +02:00
Sebastian Stenzel f62c0b4ca8 Create non-existing parent directories of IPC port file. 2017-04-29 10:12:39 +02:00
Sebastian Stenzel c046056736 Updated JNI dependency [ci skip] 2017-04-29 00:09:15 +02:00
Sebastian Stenzel e63cbf94d0 Logging IOExceptions in main method. 2017-04-28 23:54:23 +02:00
Markus Kreusch d48247b7c6 #386: Allow forced locking after failed locking on Windows 2017-04-28 13:23:51 +02:00
Markus Kreusch 695dcd5de7 Using orange color from iOS for unlocked vault icons 2017-04-28 12:53:53 +02:00
Sebastian Stenzel 5e35985a3f Merge branch 'release/1.3.0-rc3' 2017-04-26 17:21:22 +02:00
Sebastian Stenzel d9325819fd Merge branch 'release/1.3.0-rc3' into develop 2017-04-26 17:20:26 +02:00
Sebastian Stenzel f960238b47 Preparing 1.3.0-rc3 2017-04-26 16:25:20 +02:00
Sebastian Stenzel d0aef5b683 Updated dependencies 2017-04-26 16:24:03 +02:00
Sebastian Stenzel c69fc95126 fixed test 2017-04-26 14:35:26 +02:00
Sebastian Stenzel 51cb41975b Updated dependencies (fixing broken directory listing). Loading correct default settings now 2017-04-26 14:30:49 +02:00
Sebastian Stenzel 0debbb83b1 Merge branch 'release/1.3.0-rc2' into develop 2017-04-25 15:39:01 +02:00
Sebastian Stenzel fbfe2b0a31 Merge branch 'release/1.3.0-rc2' 2017-04-25 15:37:37 +02:00
Sebastian Stenzel a719a83bce Merge branch 'develop' into release/1.3.0-rc2 2017-04-25 15:36:54 +02:00
Sebastian Stenzel d353a9cb9d added OS name + version to version checker user agent header [ci skip] 2017-04-25 15:36:24 +02:00
Sebastian Stenzel ee2e07a9a3 Updated dependencies and localization 2017-04-25 14:33:03 +02:00
Sebastian Stenzel f6689043c7 Preparing 1.3.0-rc2 2017-04-24 16:45:06 +02:00
Sebastian Stenzel 45531dc54a upgraded webdav-nio-adapter to 0.5.0 2017-04-24 15:46:57 +02:00
Sebastian Stenzel 0a26c192fe Merge branch 'release/1.3.0-rc1' into develop 2017-04-20 16:12:54 +02:00
Sebastian Stenzel 281cfb74d9 Merge branch 'release/1.3.0-rc1'
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/launcher/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2017-04-20 16:11:37 +02:00
Sebastian Stenzel 0d03eeb5bd Adjusted build config for 1.3.0 2017-04-20 15:02:29 +02:00
Sebastian Stenzel 36e669d729 Preparing 1.3.0-rc1 2017-04-20 14:49:32 +02:00
Sebastian Stenzel b1f55d7cfe updated version check url [ci skip] 2017-04-19 15:25:51 +02:00
Sebastian Stenzel 9aa8c46560 Updated SemVerComparator to support pre-release versions. 2017-04-19 15:09:30 +02:00
Sebastian Stenzel 2ed00ed02d fixes #435 2017-04-19 14:02:37 +02:00
Sebastian Stenzel 5d56f5beb6 Enhanced error reporting [ci skip] 2017-04-19 00:12:10 +02:00
Sebastian Stenzel 1b937dfb06 renamed variable [ci skip] 2017-04-19 00:07:10 +02:00
Sebastian Stenzel 42be5330fe Refactored FXML loading 2017-04-19 00:06:46 +02:00
Sebastian Stenzel be8949157f Removed unused classes 2017-04-18 13:46:25 +02:00
Sebastian Stenzel 93b2a4e07a Refactored Cryptomator UI. Extracted Launcher to its own Maven module. 2017-04-18 13:40:59 +02:00
Sebastian Stenzel ada1195a26 Updated dependencies, which fixes #473 2017-04-04 18:00:48 +02:00
Sebastian Stenzel 93563f68e0 fixes #430 2017-03-17 16:45:20 +01:00
Sebastian Stenzel 3faa0e83cc fixes #387 2017-03-17 13:16:45 +01:00
Sebastian Stenzel 1985e2af72 fixes #452 and fixes #143 2017-03-15 12:13:34 +01:00
Sebastian Stenzel 3f03d36ad6 configurable mount + reveal during unlock, preparation for #452 and #143 (still needs a little refactoring, though) 2017-03-14 20:46:31 +01:00
Sebastian Stenzel 8359deb8eb Merge branch 'feature/cryptofs' into develop 2017-03-06 22:33:55 +01:00
Sebastian Stenzel e1f2330f95 Updated dependencies 2017-03-06 17:08:05 +01:00
Sebastian Stenzel 87014c4db2 fixed build 2017-03-01 19:04:34 +01:00
Sebastian Stenzel c9eb9b1938 Dependency cleanup, migrated from commons-httpclient to org.apache.httpcomponents:httpclient 2017-03-01 18:59:37 +01:00
Sebastian Stenzel 28cb2e1301 Merge branch 'develop' into feature/cryptofs
# Conflicts:
#	main/filesystem-crypto/src/main/java/org/cryptomator/crypto/engine/impl/Scrypt.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/DavFileWithRange.java
#	main/frontend-webdav/src/main/java/org/cryptomator/frontend/webdav/jackrabbitservlet/FilesystemResourceFactory.java
#	main/frontend-webdav/src/test/java/org/cryptomator/frontend/webdav/WebDavServerTest.java
2017-02-24 16:51:42 +01:00
Sebastian Stenzel 277999112e Updated dependencies 2017-02-24 16:48:15 +01:00
Sebastian StenzelandGitHub a7fdf3d325 Merge pull request #454 from jordanbtucker/scrypt-typo
Fix typo in Scrypt Javadoc: `costParam` -> `blockSize`
2017-02-14 10:48:40 +01:00
Jordan Tucker 54ae332364 Fix typo in Scrypt Javadoc: costParam -> blockSize
> Cost parameter `N`, larger than 1, a power of 2 and
> less than `2^(128 * costParam / 8)`

didn't make any sense. It was meant to be

> Cost parameter `N`, larger than 1, a power of 2 and
> less than `2^(128 * blockSize / 8)`
2017-02-13 22:28:07 -08:00
Tobias HagemannandGitHub 76075ffec4 Update CONTRIBUTING.md 2017-02-10 01:52:13 +01:00
Tobias HagemannandGitHub ed448146f7 Update CONTRIBUTING.md 2017-02-10 01:50:20 +01:00
Tobias HagemannandGitHub 638e9c1a8b Update ISSUE_TEMPLATE.md 2017-02-10 01:37:21 +01:00
Markus KreuschandGitHub 1624cffb2a Update README.md 2017-02-02 17:34:39 +01:00
Sebastian Stenzel f391a6521d automatically save settings when chaning vault properties. fixes #446 2017-02-02 11:31:00 +01:00
Sebastian Stenzel 02ae2e7ca0 Vastly refactored settings, integrated new webdav-nio-adapter snapshot version, allow reconfiguration of IPv6 and Port settings during runtime 2017-01-31 22:30:44 +01:00
Tobias Hagemann 40bd84a09c updated contribution guide 2017-01-30 21:22:10 +01:00
Tobias Hagemann 0c0fb1c4c5 Merge branch 'release/1.2.4' 2017-01-27 11:22:14 +01:00
Tobias Hagemann ab39bd1667 updated to version 1.2.4 2017-01-27 11:12:45 +01:00
Tobias Hagemann b41636a208 added japanese localization, updated other localizations 2017-01-26 16:01:49 +01:00
Tobias Hagemann 0902de821a fixed unit test 2017-01-25 17:32:50 +01:00
Tobias Hagemann 8a6265658e fixed range requests 2017-01-25 15:48:21 +01:00
Sebastian Stenzel 7750a49e65 specifying masterkey filename as introduced in cryptofs 1.1.0 2017-01-20 14:01:39 +01:00
Sebastian Stenzel b75b9781c1 implemented “change password” etc 2017-01-02 17:29:43 +01:00
Sebastian Stenzel 2687c02e31 now passing unchecked CryptoExceptions up through various closures, thus being able to catch “InvalidPassphraseException” in UI 2016-12-21 17:29:54 +01:00
Sebastian Stenzel 71b65e03d6 implemented unlock/reveal/lock 2016-12-20 20:26:17 +01:00
Sebastian Stenzel e09ee27219 connected filesystem stats 2016-12-20 10:45:40 +01:00
Sebastian Stenzel 5a3428d9b0 cleanup 2016-12-19 17:21:33 +01:00
Sebastian Stenzel ed109977f8 removed mac warning window fxml 2016-12-19 13:57:59 +01:00
Sebastian Stenzel d6c6f177e8 code simplification 2016-12-19 13:57:30 +01:00
Sebastian Stenzel 97f2cee1ae mount name now included in servlet path 2016-12-19 13:57:14 +01:00
Sebastian Stenzel 4fb8a27a78 removed MAC warning screen 2016-12-19 13:55:39 +01:00
Sebastian Stenzel 79b825aaad call me THE DESTROYER!!!
first compile-clean but totally fubar version
2016-12-16 17:20:56 +01:00
Sebastian Stenzel 28fedafb59 added linux-launcher-* to RPM [ci skip] 2016-12-12 11:39:23 +01:00
Tobias Hagemann d9bff68555 updated localization stuff
- added title text to upgrade strategy
- added texts for upgrade 4 to 5
- changed most texts to title style capitalization
2016-11-30 17:22:29 +01:00
Tobias Hagemann cef3a5fc77 Merge branch 'release/1.2.3'
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-11-29 23:03:26 +01:00
Tobias Hagemann 9956f43fd9 updated to version 1.2.3 2016-11-29 22:24:26 +01:00
Tobias Hagemann 2b84593bde updated localization 2016-11-29 22:16:46 +01:00
Markus Kreusch 4e728fd387 Merge branch 'feature/issue-363' into develop 2016-11-29 15:21:48 +01:00
Tobias Hagemann 438ade1106 fixes #382 2016-11-27 14:28:44 +01:00
Sebastian StenzelandGitHub fe54f4ec66 Update README.md
As suggested by @tallesh in #135
2016-11-27 10:14:34 +01:00
Markus Kreusch fe86b4c593 Implemented #363 2016-11-14 22:26:55 +01:00
Markus Kreusch a583afeb60 Merge branch 'feature/issue-393' into develop 2016-11-14 15:08:31 +01:00
Sebastian Stenzel a585d3cf16 cherry picked from bac1d6f [ci skip] 2016-11-12 17:04:58 +01:00
Sebastian Stenzel 3db757193e Merge branch 'hotfix/1.2.2' 2016-11-12 17:02:04 +01:00
Sebastian Stenzel bac1d6fd83 Updated siv-mode to 1.2.0 to be consistent with CryptoLib 2016-11-12 16:41:26 +01:00
Sebastian Stenzel 39ee8a9cde coverity issue 151831 2016-11-11 17:11:21 +01:00
Markus Kreusch 1263b3af81 fixed 'a' really bad thing in the last commit 2016-11-11 09:56:45 +01:00
Markus Kreusch dafa29d8a3 Implemented #393 2016-11-10 22:58:45 +01:00
Sebastian Stenzel 2bc6fe89ad Merge branch 'release/1.2.1' 2016-11-10 15:23:11 +01:00
Sebastian Stenzel 8439216233 Updated version to 1.2.1 2016-11-10 15:13:28 +01:00
Sebastian Stenzel aab616d184 Updated CryptoLib, hopefully fixes #373 2016-11-10 15:11:04 +01:00
Sebastian Stenzel 70c3a38c49 invoking UI methods on UI thread, might solve #351 2016-11-10 14:07:37 +01:00
Sebastian Stenzel c64294ac3e Added chinese localizations, updated dutch localization 2016-11-10 13:41:09 +01:00
Markus Kreusch 82330db871 Additional logging for vault version upgrade 2016-11-09 15:54:10 +01:00
Sebastian StenzelandGitHub c54a721f9a Merge pull request #385 from IAMtheIAM/patch-1
Update README.md
2016-11-06 21:59:16 +01:00
Sebastian StenzelandGitHub 355bbb5459 Merge branch 'develop' into patch-1 2016-11-06 21:53:28 +01:00
IAMtheIAMandGitHub 63daa0f121 Update README.md
Update Readme with accurate info regarding v1.2.0
2016-11-06 03:56:56 -07:00
IAMtheIAMandGitHub 50885d5c7c Update README.md 2016-11-05 16:51:16 -07:00
IAMtheIAMandGitHub 4d68818ec5 Update README.md
Update features
2016-11-05 14:00:32 -07:00
IAMtheIAMandGitHub 6fb20dd509 Update README.md
Added info about obfuscating file size and folder structure (two very important features that should be known!)
2016-11-05 13:54:39 -07:00
Sebastian Stenzel 2bb87dfa96 Merge branch 'release/1.2.0' into develop
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/keychain/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-09-19 15:12:24 +02:00
Sebastian Stenzel 3e374a927c Merge branch 'release/1.2.0'
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-09-19 15:10:43 +02:00
Sebastian Stenzel 84ac6d88f5 added new localization files to unit test [ci skip] 2016-09-15 23:55:37 +02:00
Sebastian Stenzel 72f6ee6477 updated localizations 2016-09-15 23:52:23 +02:00
Sebastian Stenzel a3cfcb1131 Reject opening files when former filesize header is != -1 2016-09-15 23:26:13 +02:00
Sebastian Stenzel d7d8d21ba4 Show warning when trying to migrate a masterkey with invalid version mac 2016-09-15 22:15:21 +02:00
Sebastian Stenzel ef0425e2b1 fixes coverity issue 147409 2016-09-15 14:15:33 +02:00
Sebastian Stenzel df1fd6d0b3 fixed coverity issue 72979 2016-09-15 14:15:25 +02:00
Sebastian Stenzel 2fa04d7b7c increased version to 1.3.0-SNAPSHOT
[ci skip]
2016-09-15 13:35:22 +02:00
Sebastian Stenzel a15acd64c8 set version to 1.2.0 2016-09-15 13:33:37 +02:00
Sebastian Stenzel 5b18eff01a increased cryptolib version to 1.0.2
[ci skip]
2016-09-15 13:28:20 +02:00
Sebastian Stenzel 47133c6f31 fixed change pw function leaving invalid JSON file if length gets shorter due to different encoding or pretty printing etc 2016-09-14 17:22:26 +02:00
Sebastian Stenzel 09ba4f5129 changed to jni lib version 1.0.0 2016-09-13 20:17:30 +02:00
Sebastian Stenzel 20d4047bed changed to cryptolib version 1.0.1 (which includes sources) [ci skip] 2016-09-12 23:16:17 +02:00
Sebastian Stenzel 56b71ef7d9 depends on relase version of cryptolib 1.0.0 2016-09-12 21:28:21 +02:00
Sebastian Stenzel 091e62057d Injecting CryptorProvider into UpgradeStrategies 2016-09-12 13:56:47 +02:00
Sebastian Stenzel 824bd9ea64 just added a comment [ci skip] 2016-09-08 18:41:36 +02:00
Sebastian Stenzel 697a791593 updated travis config 2016-09-08 18:34:28 +02:00
Sebastian Stenzel 7462a887b3 updated travis config 2016-09-08 18:30:11 +02:00
Sebastian Stenzel 3535e83d7d updated travis config 2016-09-08 18:20:57 +02:00
Sebastian Stenzel cf0b4accb3 Merge branch 'feature/external-keychain' into develop 2016-09-04 16:21:52 +02:00
Sebastian Stenzel a63bcfbaa2 relaxed "vault not empty" check 2016-09-04 16:04:16 +02:00
Sebastian Stenzel 5c4bf2a207 support home-relative paths for cryptomator.keychainPath 2016-09-04 12:27:23 +02:00
Sebastian Stenzel c1611a12ed implemented Windows keychain 2016-09-03 23:04:53 +02:00
Markus Kreusch 0983120712 Removed Syso logging 2016-09-02 19:21:54 +02:00
Sebastian Stenzel ce12af8495 Added save password functionality to UI 2016-09-02 15:49:09 +02:00
Sebastian Stenzel dc117c8415 oracle-java8-unlimited-jce-policy apparently no longer needed (already installed) 2016-08-31 20:12:49 +02:00
Sebastian Stenzel 06e526a961 Merge branch 'develop' into feature/external-keychain
# Conflicts:
#	main/pom.xml
2016-08-31 19:45:15 +02:00
Sebastian StenzelandGitHub 2e343a951f Feature/travis container builds (#334)
improved build dependency caching + force updates of snapshots to bypass said cache
2016-08-31 19:39:55 +02:00
Sebastian Stenzel 141ffcf656 Merge branch 'feature/native-functions' into feature/external-keychain 2016-08-31 10:41:51 +02:00
Tobias Hagemann d61e5c5a08 added "delete passphrase" method to keychain access 2016-08-31 01:08:58 +02:00
Tobias Hagemann 6a15fa132a app launches as foreground app on mac 2016-08-30 22:41:01 +02:00
Sebastian Stenzel 902b29ee0a Merge branch 'develop' into feature/external-keychain
# Conflicts:
#	main/pom.xml
#	main/ui/src/main/java/org/cryptomator/ui/CryptomatorModule.java
2016-08-30 19:22:45 +02:00
Sebastian Stenzel 995bba616f cache maven dir 2016-08-30 19:15:26 +02:00
Sebastian Stenzel f39b7b047f Merge branch 'feature/vaultVersion5' into develop 2016-08-30 19:14:28 +02:00
Sebastian Stenzel 72e52df4e0 implemented keychain access on OS X 2016-08-30 19:12:20 +02:00
Sebastian Stenzel 8018e9485e Merge branch 'feature/native-functions' into feature/external-keychain 2016-08-30 19:05:25 +02:00
Sebastian Stenzel e0ae50378f externalized JNI bindings 2016-08-30 17:19:45 +02:00
Markus Kreusch a9c2b0fc57 fixes #332 2016-08-29 21:08:58 +02:00
Sebastian Stenzel dc58ba434a Make Cryptomator a foreground app when restoring from status bar icon 2016-08-29 20:14:48 +02:00
Sebastian Stenzel 34af306309 defined keychain access interfaces 2016-08-29 17:16:56 +02:00
Sebastian Stenzel 21d70b5ae4 moved from coveralls to codecov 2016-08-26 12:52:44 +02:00
Sebastian Stenzel e90880ac9a speedboost 3000 2016-08-24 17:27:36 +02:00
Sebastian Stenzel 66faa13f40 unlock version 5 vaults 2016-08-23 21:35:13 +02:00
Sebastian Stenzel 8a4a29b4d1 added version 4 to 5 migrator 2016-08-23 21:15:52 +02:00
Sebastian Stenzel 8c8db84a4a refactored migration (using cryptolib) 2016-08-23 21:15:40 +02:00
Sebastian StenzelandGitHub a499a3c80b Merge pull request #324 from oparoz/patch-1
Add that the solution works with Open Source clouds
2016-08-19 19:25:43 +02:00
Olivier ParozandGitHub 6a3ccf2b48 Add that the solution works with WebDAV clouds
I think it would be nice to promote other Open Source solutions which use standards such as WebDAV and work well with Cryptomator.
2016-08-19 19:07:39 +02:00
Tobias Hagemann fcfcffe9cb updated tray icons for OS X [ci skip] 2016-08-19 16:56:04 +02:00
Sebastian Stenzel 363ed4ac4b Accept paths beginning with "~" in cryptomator.settingsPath JVM arg.
[ci skip]
2016-08-17 18:52:08 +02:00
Tobias Hagemann 1f73a08e09 added confirmation checkbox to upgrade screen [ci skip] 2016-08-17 18:11:27 +02:00
Sebastian Stenzel fe0a34907f Simplified settings/log file path handling. Removed support for %appdata%. Use ~/AppData/Roaming instead! 2016-08-17 15:59:36 +02:00
Sebastian Stenzel 461b11700f added new upgrade log path setting to build script [ci skip] 2016-08-16 19:15:23 +02:00
Sebastian Stenzel 24bfbb59a4 fixes #310 2016-08-16 19:07:05 +02:00
Sebastian Stenzel 4476558e9c fixes #321 2016-08-16 12:33:15 +02:00
Sebastian Stenzel 560171832c Merge branch 'release/1.1.4'
Fixes #308, fixes #319, fixes #318, fixes #317, fixes #311, fixes #267

# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-08-14 15:12:05 +02:00
Sebastian Stenzel 6e93d40e51 changed version to 1.1.4 2016-08-14 15:06:16 +02:00
Sebastian Stenzel 79b819bca6 Merge branch 'release/1.1.4' into develop 2016-08-14 15:04:44 +02:00
Sebastian Stenzel a18c406cf0 fixed ConflictResolver 2016-08-14 14:56:44 +02:00
Sebastian Stenzel 6730a83cac fixes coverity issue 141842 2016-08-14 14:45:38 +02:00
Sebastian Stenzel 3b3ebd2196 fixes coverity issue 141838 2016-08-14 14:39:05 +02:00
Sebastian Stenzel 505b6542c7 fixes coverity issue 141844 2016-08-14 14:30:48 +02:00
Sebastian Stenzel 31368f0cba fixes coverity issue 141848 2016-08-14 14:28:52 +02:00
Sebastian Stenzel 5b5dd756b1 fixes coverity issue 141858 2016-08-14 14:27:48 +02:00
Sebastian Stenzel f6ebbb23d1 fixes coverity issue 141860 2016-08-14 14:16:59 +02:00
Sebastian Stenzel 3f0373b08f removed xdg-utils dependencies, using gvfs-open instead of xdg-open. 2016-08-14 13:57:52 +02:00
Sebastian Stenzel 4c3c60060d Graceful unmounting on Windows and improved error handling of deferred closables. 2016-08-14 13:55:51 +02:00
Markus Kreusch 28f275c22d Requests on parent folders of valid vault urls no longer get delayed 2016-08-12 15:11:54 +02:00
Markus Kreusch 24df3c3809 GvfsMounters now use correct protocol. 2016-08-12 14:11:49 +02:00
Markus Kreusch 034a667e07 Fixed problem with sync conflict resolver. Issue #311 2016-08-11 11:19:12 +02:00
Markus Kreusch 008e3e3b05 Continue mounting also if command fails with error code. Issue #267 2016-08-11 09:39:38 +02:00
Markus Kreusch 94a5bf7596 Continue mounting if reg.exe command fails. Issue #267 2016-08-10 13:57:23 +02:00
Markus Kreusch e8db836eff Workaround for Issue #317 2016-08-10 13:53:04 +02:00
Markus Kreusch 429b26f3d8 Added delay for requests on invalid vault ids. Issue #319 2016-08-10 13:44:26 +02:00
Markus Kreusch 3ae8327300 Added unique id to vaults / webdav urls.
Issue #319, Issue #308
2016-08-10 13:43:46 +02:00
Markus Kreusch df7e9a0af1 Preventing post requests. Issue #319 2016-08-09 20:02:06 +02:00
Sebastian Stenzel 93d3eca0ab Yet another header to prevent browsers from guessing mime types. Kudos to @LukasReschke 2016-08-09 17:42:24 +02:00
Sebastian Stenzel 7753d1f0e7 If GET request is made by a browser, the file in question is downloaded instead of being executed. Issue #318 2016-08-09 17:35:17 +02:00
Sebastian Stenzel d7c6c24932 updated tavis config 2016-08-01 10:21:10 +02:00
Sebastian Stenzel 1a75f23081 Merge branch 'feature/mount-method-settings' into develop 2016-08-01 10:17:44 +02:00
Sebastian Stenzel f071efe1b9 allow user to specify whether to use dav:// or webdav:// scheme for Linux GVFS mounts. Fixes #307 2016-07-25 10:08:21 +02:00
Sebastian StenzelandGitHub a8ad335aed Update README.md
[ci skip]
2016-07-18 12:18:47 +02:00
Markus Kreusch 7022a80c95 Improved error handling
* Created AsyncTaskService to build async UI operations which always log
uncaught exceptions
* Changed all executor service invocations in the UI to invocations of
AsyncTaskService
* Improved error handling in some other places, especially
try-with-resources
* Unlocking read/write locks in NioFile when opening of a channel fails
2016-07-14 13:58:17 +02:00
Sebastian Stenzel 9a2f602d6c fixes #270 2016-07-13 12:37:40 +02:00
Sebastian Stenzel c78a4aa241 updated travis config [ci skip] 2016-07-11 22:14:35 +02:00
Tobias Hagemann 975ce4d973 Merge branch 'release/1.1.3'
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-07-11 21:16:23 +02:00
Tobias Hagemann 1e6ff0d969 set version to 1.1.3 2016-07-11 21:14:35 +02:00
Sebastian Stenzel 69e133d561 Improved migration from vault version 3 to 4. 2016-07-11 18:07:55 +02:00
Sebastian Stenzel 20e55eddf8 Merge branch 'develop' 2016-07-09 13:25:54 +02:00
Sebastian Stenzel 0fdcdc816a fixed unit test 2016-07-09 13:25:24 +02:00
Sebastian Stenzel b7506d97a9 Merge branch 'hotfix/1.1.2' 2016-07-09 13:25:03 +02:00
Sebastian Stenzel 4ad7481dc7 fixed unit test 2016-07-09 11:44:53 +02:00
Sebastian Stenzel bc815405d2 merged from hotfix/1.1.2 [ci skip] 2016-07-09 11:32:02 +02:00
Sebastian Stenzel 9c06e762c3 fixes #304 2016-07-09 11:28:36 +02:00
Sebastian Stenzel 1ac87dd32f fixed NPE [ci skip] 2016-07-08 15:52:00 +02:00
Sebastian Stenzel e0ce7ce2ec Merge branch 'release/1.1.1'
# Conflicts:
#	main/ant-kit/pom.xml
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-charsets/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/jacoco-report/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-07-08 11:59:39 +02:00
Sebastian Stenzel 3d951a9d7b set version to 1.1.1 2016-07-07 14:48:49 +02:00
Sebastian Stenzel cec3d984b0 Merge branch 'develop' into release/1.1.1 2016-07-07 14:39:20 +02:00
Sebastian Stenzel 392e474cfa Update tr.txt (POEditor.com) 2016-07-07 14:28:52 +02:00
Sebastian Stenzel 41fb0d51a4 Update es.txt (POEditor.com) 2016-07-07 14:28:51 +02:00
Sebastian Stenzel aa9fef2967 Update sk.txt (POEditor.com) 2016-07-07 14:28:49 +02:00
Sebastian Stenzel adc9c02564 Update ru.txt (POEditor.com) 2016-07-07 14:28:48 +02:00
Sebastian Stenzel ace64117a2 Update kr.txt (POEditor.com) 2016-07-07 14:28:46 +02:00
Sebastian Stenzel fb4db2506b Update it.txt (POEditor.com) 2016-07-07 14:28:45 +02:00
Sebastian Stenzel 1076d971ae Update hu.txt (POEditor.com) 2016-07-07 14:28:43 +02:00
Sebastian Stenzel eed1b1cff0 Update de.txt (POEditor.com) 2016-07-07 14:28:42 +02:00
Sebastian Stenzel f5cb82e21e Update fr.txt (POEditor.com) 2016-07-07 14:28:40 +02:00
Sebastian Stenzel 67661f114b Update nl.txt (POEditor.com) 2016-07-07 14:28:39 +02:00
Sebastian Stenzel 8a3e09764a only remove .cryptomator extension for vault version 3 2016-07-07 14:25:55 +02:00
Sebastian Stenzel eb3cfd6e6a updated placeholders [ci skip] 2016-07-06 16:25:31 +02:00
Sebastian Stenzel 4d1727d0e9 Merge branch 'develop' into release/1.1.1 2016-07-06 16:09:32 +02:00
Sebastian Stenzel a51d853d1c adjusted number format regex [ci skip] 2016-07-06 16:09:14 +02:00
Sebastian Stenzel d0039466f7 test technical correctness of localization files 2016-07-06 16:07:07 +02:00
Sebastian Stenzel 5c959989a2 Fixed Coverity defect 131711 2016-07-05 23:18:18 +02:00
Sebastian Stenzel 6283d2df3d Merge branch 'feature/vault-version-4' into develop 2016-07-03 17:41:46 +02:00
Sebastian Stenzel a9e0dfdaf8 redesigned upgrade view 2016-07-03 17:38:46 +02:00
Sebastian Stenzel 45ca7e9e47 migration from vault version 3 to 4 2016-07-03 16:16:23 +02:00
Sebastian Stenzel 034b5c2718 updated localizations
[ci skip]
2016-07-01 11:14:49 +02:00
Sebastian Stenzel e188649c79 adjusted test to vault version 4 2016-06-30 22:18:43 +02:00
Sebastian Stenzel 1468c6ec90 improved vault upgrading, preparation for migration to vault version 4 2016-06-30 22:09:45 +02:00
Sebastian Stenzel 07ba4eb537 Using 0 prefix instead of _ suffix to mark directories 2016-06-30 18:02:13 +02:00
Sebastian Stenzel 414bbef1a7 updated key generation 2016-06-10 14:04:55 +02:00
Sebastian Stenzel e2b94ff6ef updated jacoco dependency 2016-06-08 19:11:56 +02:00
Sebastian Stenzel 41f8a9faca add "allow" response header field 2016-06-08 19:06:06 +02:00
Tobias Hagemann 1d9252e974 updated description of file chooser's extension filter [ci skip] 2016-06-07 01:07:54 +02:00
Sebastian Stenzel 80780eef3c Merge pull request #280 from aeris/fix-l10n-fr
Enhanced fr translation
[ci skip]
2016-05-30 14:27:00 +02:00
Aeris 87ff33956b Enhanced fr translation 2016-05-30 13:45:40 +02:00
Sebastian Stenzel 1804b98f05 trigger coverity scans for only release branches [ci skip] 2016-05-25 15:47:19 +02:00
Sebastian Stenzel 847c6813cc started development of 1.2.0 [ci skip] 2016-05-25 15:37:07 +02:00
Sebastian Stenzel 1dde5ff6e7 release 1.1.0 2016-05-25 15:17:40 +02:00
Sebastian Stenzel 76c9a19428 unset and set default buttons to make sure VK_ENTER triggers it 2016-05-25 12:29:49 +02:00
Sebastian Stenzel 25ee0519e1 some minor fixes
- reset password field contents when changing a vault
- hide "change password" option for uninitialized or missing vaults
2016-05-25 12:12:01 +02:00
Sebastian Stenzel c184089c35 oopsy daisy, wie das duftet... [ci skip] 2016-05-24 11:36:46 +02:00
Sebastian Stenzel d2bcc47857 Merge branch 'delete-confirmation'
fixes #228
2016-05-24 11:35:17 +02:00
Sebastian Stenzel 34629a69ea Using ControlsFX's BSD-licensed assets for dialogs, rather than OpenJDK's GPL licensed ones.
Adjusted dialog styles for Linux and Windows.
[ci skip]
2016-05-24 11:32:27 +02:00
Sebastian Stenzel 92c87f7b84 changed dialog L&F on OS X 2016-05-23 19:31:18 +02:00
Sebastian Stenzel 0dd96635ac code cleanup [ci skip] 2016-05-23 13:24:53 +02:00
Sebastian Stenzel 048c44a6e4 Update README.md 2016-05-23 12:36:58 +02:00
Sebastian Stenzel 06910ad1f4 fixes #229 2016-05-23 12:11:45 +02:00
Sebastian Stenzel 02a0f3acc6 fixed invariant FolderChildrenTests 2016-05-23 11:18:24 +02:00
Sebastian Stenzel 851f9240b7 updated link to MAC warning FAQ 2016-05-23 11:02:56 +02:00
Sebastian Stenzel 99fce8d0b7 automatically resolve conflicts for directory files, that contain the same directory ID 2016-05-23 11:02:44 +02:00
Sebastian Stenzel bf05c59c3b Transparent conflict detection for long file names 2016-05-22 15:16:32 +02:00
Sebastian Stenzel 3dcebb1e1f fixed minor copy/paste error 2016-05-22 13:32:16 +02:00
Sebastian Stenzel fe3efdf610 Merge pull request #269 from jncharon/master
fixes #56
2016-05-21 14:07:15 +02:00
jncharon 5f4ae46f82 Replaced the MouseListner by a MouseAdapter 2016-05-20 21:30:33 +02:00
jncharon deef325319 Implementation of github issue #56 2016-05-20 19:29:53 +02:00
jncharon fbe00a8fe3 Merge remote-tracking branch 'refs/remotes/cryptomator/master' 2016-05-16 14:20:55 +02:00
Sebastian Stenzel dc87dade43 Merge pull request #259 from jncharon/issue-228-fixed
Fixes #228.
Still need to check license of icons, will discuss this with @MuscleRumble, who has a lot of icons that we bought the license for. If necessary we will change them.
2016-05-16 12:53:53 +02:00
Jean-Noël Charon ba1625b5ad Merge pull request #2 from overheadhunter/issue-228-fixed
Reverted commit c0f4a2b, added .idea/ to .gitignore
2016-05-16 12:14:38 +02:00
Sebastian Stenzel f6b126415e added IntelliJ files to .gitignore 2016-05-16 10:00:39 +02:00
Sebastian Stenzel 9147e1c08b Revert "Fucking .idea files I could not remove from the vcs"
This reverts commit c0f4a2b0d3.
2016-05-16 09:57:10 +02:00
Sebastian Stenzel 6c18103662 Remove files with non-decryptable names from dir listings 2016-05-13 18:59:06 +02:00
Sebastian Stenzel 6fc343ea12 more fault-tolerant behaviour when mapping of long filenames couldn't be found. 2016-05-13 14:10:37 +02:00
Sebastian Stenzel d304d66cdd Updated localizations [ci skip] 2016-05-12 19:23:24 +02:00
Sebastian Stenzel 2ce9143b85 Merge branch 'conflict-detection' 2016-05-12 19:14:48 +02:00
Sebastian Stenzel 1c54e4f4ad in the unlikely event of an alternative name already being used, choose a new random conflict id. 2016-05-12 16:13:03 +02:00
Sebastian Stenzel 9fd6f2ecae transparently show sync conflicts (fixes #98) 2016-05-12 16:08:52 +02:00
Sebastian Stenzel 0d9f8eefc0 Using pattern based filename filtering
This is a preparation for finding valid encrypted names inside filenames that include additional characters
2016-05-12 11:51:14 +02:00
Sebastian Stenzel 40a1530f19 repeated commit 86000ac 2016-05-10 14:52:30 +02:00
Sebastian Stenzel 0477a0a2e3 Merge branch 'patches-1.0.x'
# Conflicts:
#	main/filesystem-charsets/pom.xml
2016-05-10 14:49:20 +02:00
Sebastian Stenzel b77d4b5ae2 fixes #264 2016-05-10 14:33:21 +02:00
Sebastian Stenzel 7b6c5318c5 fixes #263 2016-05-10 14:31:55 +02:00
Sebastian Stenzel 6006d65ce0 new ant kit using a custom launcher binary due to #265 2016-05-10 14:26:06 +02:00
jncharon 2b01b76926 Merge remote-tracking branch 'refs/remotes/cryptomator/master' 2016-05-08 17:52:14 +02:00
Sebastian Stenzel dcea9e21f0 added module to code coverage report 2016-05-07 15:00:20 +02:00
Sebastian Stenzel 78645ecdf6 fixes #264 2016-05-07 14:40:44 +02:00
Sebastian Stenzel 91646dd93d Merge branch 'password-strength'
Added password strength meter by Jean-Noël Charon, closing issue #198
2016-05-06 18:59:26 +02:00
jncharon fca146e939 Merge remote-tracking branch 'remotes/origin/master' into issue-228-fixed 2016-05-05 21:22:28 +02:00
jncharon 62aa3ccc7f Merge remote-tracking branch 'refs/remotes/cryptomator/master' into issue-228-fixed 2016-05-05 21:12:53 +02:00
jncharon c0f4a2b0d3 Fucking .idea files I could not remove from the vcs 2016-05-05 21:11:57 +02:00
Tobias Hagemann 68ee89af98 updated bot welcome asset [ci skip] 2016-05-03 19:12:21 +02:00
Sebastian Stenzel ad2c9116b9 Release 1.0.4 2016-05-03 16:50:18 +02:00
Sebastian Stenzel 8e24745b3e Merge branch 'master' into patches-1.0.x 2016-05-03 16:46:18 +02:00
Sebastian Stenzel 08f664e3df Throttle calls to Settings.save() 2016-05-03 16:44:22 +02:00
Tobias Hagemann b6d1d1dc22 updated linux app icon [ci skip] 2016-05-03 16:07:30 +02:00
Sebastian Stenzel a0ef02b95c fixes #237 2016-05-03 13:17:45 +02:00
Sebastian Stenzel a6cefe67c4 setting default port to 42427 [ci skip] 2016-05-03 10:48:24 +02:00
Sebastian Stenzel be2b63ab2a support for UTF-8 localization files 2016-05-02 22:28:49 +02:00
Sebastian Stenzel 78f11b4a5e added korean localization [ci skip] 2016-05-02 16:01:28 +02:00
Sebastian Stenzel 0f20c7c3c9 fixes #209 2016-05-02 12:36:31 +02:00
Sebastian Stenzel d4235174f7 imported localizations from POEditor fixes #231 and #234 (ci skip) 2016-05-02 11:37:40 +02:00
Sebastian Stenzel f16be84aa3 restored bash-based webdav mounting for OS X before 10.10 (issue #211 - to be tested) 2016-05-02 11:11:42 +02:00
Sebastian Stenzel 833f2d8566 fixed travis test coverage configuration 2016-04-27 01:18:37 +02:00
Sebastian Stenzel c02a63878e new method to calculate test coverage (across modules) 2016-04-27 01:14:41 +02:00
jncharon 6deb30307e Merge remote-tracking branch 'cryptomator/master' 2016-04-24 13:47:37 +02:00
jncharon 7357829741 Fix in the background color of the dialog boxes 2016-04-23 23:42:28 +02:00
jncharon 4bd04150c1 Implementation of github issue 228 2016-04-23 23:37:56 +02:00
Sebastian Stenzel ac9fe28967 Merge branch 'master' into patches-1.0.x
Release 1.0.3d
2016-04-22 10:55:03 +02:00
Sebastian Stenzel 515755d84a updated antkit to support deb and rpm packages [ci skip] 2016-04-22 10:53:51 +02:00
Sebastian Stenzel cf35772c18 Merge pull request #239 from jncharon/master
Fix in the change password screen
2016-04-21 09:11:23 +02:00
jncharon b0fd226c4c Fix of the strength bar position (row) in the fxml 2016-04-20 22:32:30 +02:00
jncharon 0d188d1c0c Merge remote-tracking branch 'cryptomator/master' 2016-04-16 15:27:01 +02:00
Sebastian Stenzel c6016ec7b2 using constructor-injection, organized imports, code autoformatting [ci skip] 2016-04-16 14:10:32 +02:00
Sebastian Stenzel e8719a1f9b Merge pull request #232 from jncharon/master
Fixes #198, #157
2016-04-16 09:53:14 +02:00
jncharon 27baf78029 More refactoring following Sebastian comments 2016-04-16 00:12:59 +02:00
jncharon bf5ce9a3a5 New password strength implementation based on zxcvbn4j 2016-04-15 22:52:57 +02:00
Sebastian Stenzel fef19fe6b3 Merge branch 'master' into patches-1.0.x 2016-04-14 22:39:56 +02:00
Sebastian Stenzel 5f56dacc4e adjusted travis configuration [ci skip] 2016-04-14 22:39:19 +02:00
Sebastian Stenzel aa249dabb5 technical release 1.0.3c 2016-04-14 22:28:12 +02:00
Sebastian Stenzel 06a5bed6e3 Merge branch 'master' into patches-1.0.x 2016-04-14 22:27:15 +02:00
Sebastian Stenzel 02f1ffc6bf updated antkit creation (tarball no longer contains a base directory) 2016-04-14 22:26:36 +02:00
jncharon bcfe040784 Merge remote-tracking branch 'cryptomator/master' 2016-04-13 18:22:16 +02:00
Sebastian Stenzel de9af9e303 fixed funny detail label in vault list, if vault is not located inside home directory 2016-04-13 15:26:27 +02:00
jncharon d9b88ad1b7 Merge remote-tracking branch 'refs/remotes/cryptomator/master' 2016-04-12 21:53:44 +02:00
jncharon e66e5b1d96 Added the password strength indicator in the change password window 2016-04-12 21:27:31 +02:00
jncharon 588166dce9 Added the password strength indicator in the initialize window 2016-04-12 21:00:41 +02:00
Sebastian Stenzel e2bc71a0bc added spanish translation template [ci skip] 2016-04-11 14:17:33 +02:00
Sebastian Stenzel e528f6827c Added translation button [ci skip] 2016-04-11 14:02:11 +02:00
Sebastian Stenzel 2882ae8ef8 Update localization_de.properties (POEditor.com) 2016-04-11 13:46:51 +02:00
Sebastian Stenzel e37f7cea1a Merge pull request #227 from jncharon/master
French translation
2016-04-11 10:55:26 +02:00
jncharon 9b4ee10155 Adjustments to the french translation 2016-04-10 15:53:53 +02:00
jncharon c9d970955c French translaction 2016-04-10 15:10:47 +02:00
Sebastian Stenzel 9e0afd36c4 Merge branch 'master' into patches-1.0.x [ci skip] 2016-04-10 02:42:25 +02:00
Sebastian Stenzel 0e523599a3 add execution phase 2016-04-10 02:41:51 +02:00
Sebastian Stenzel 1df6589dd7 make sure, .tar.gz is built on travis 2016-04-10 02:36:10 +02:00
Sebastian Stenzel fb60c97fd3 Merge branch 'master' into patches-1.0.x 2016-04-10 02:19:52 +02:00
Sebastian Stenzel 90cd149be8 Update .travis.yml 2016-04-10 02:19:01 +02:00
Sebastian Stenzel 89c04ad83b test release 1.0.3b 2016-04-10 02:07:52 +02:00
Sebastian Stenzel f2d383a211 Merge branch 'master' into patches-1.0.x 2016-04-10 01:56:13 +02:00
Sebastian Stenzel 73fde5d020 null-safe status indicators 2016-04-10 01:54:44 +02:00
Sebastian Stenzel 5c0857e98e build ant-kit on tag/release [ci skip] 2016-04-10 01:53:44 +02:00
Sebastian Stenzel 3e87b9c0c6 oracle jdk8 + jce on trusty 2016-04-10 00:28:11 +02:00
Sebastian Stenzel a1d0b6b1d3 trying to build with openjdk8 on trusty 2016-04-10 00:22:56 +02:00
Tobias Hagemann b0d4b2e403 fixed support mail link in code of conduct [ci skip] 2016-04-06 00:04:36 +02:00
Tobias Hagemann 6996d36ea2 added issue template, contribution guide, code of conduct [ci skip] 2016-04-05 12:28:36 +02:00
Sebastian Stenzel f77ba908da Patch 1.0.3 2016-03-25 16:43:58 +01:00
Sebastian Stenzel 9890789c51 Merge branch 'master' into patches-1.0.x
# Conflicts:
#	main/commons-test/pom.xml
#	main/commons/pom.xml
#	main/filesystem-api/pom.xml
#	main/filesystem-crypto-integration-tests/pom.xml
#	main/filesystem-crypto/pom.xml
#	main/filesystem-inmemory/pom.xml
#	main/filesystem-invariants-tests/pom.xml
#	main/filesystem-nameshortening/pom.xml
#	main/filesystem-nio/pom.xml
#	main/filesystem-stats/pom.xml
#	main/frontend-api/pom.xml
#	main/frontend-webdav/pom.xml
#	main/pom.xml
#	main/uber-jar/pom.xml
#	main/ui/pom.xml
2016-03-25 16:42:44 +01:00
Sebastian Stenzel a385f2eaef fixes #174 2016-03-25 16:41:30 +01:00
Sebastian Stenzel 553cb5ee3d Migration of vault bundles ending on ".cryptomator" to normal directories. 2016-03-24 22:51:40 +01:00
Markus Kreusch d0dc8819f4 No longer using TrayIcon on linux systems
* Reason: TrayIcon not supported well on linux and caused problems
* Renamed TrayIconUtil to ExitUtil
* fixes #177
2016-03-24 14:20:10 +01:00
Sebastian Stenzel 221deeda25 removed .cryptomator directory extension when creating new vaults 2016-03-22 21:36:26 +01:00
Sebastian Stenzel 86000ac454 removed test dependencies from main project 2016-03-22 13:04:46 +01:00
Sebastian Stenzel d026afec35 adjusted snapshot version [ci skip] 2016-03-21 16:49:58 +01:00
1087 changed files with 79348 additions and 34346 deletions
+6
View File
@@ -0,0 +1,6 @@
commit_message: '[ci skip]'
files:
- source: /src/main/resources/i18n/strings.properties
translation: /src/main/resources/i18n/strings_%two_letters_code%.properties
escape_quotes: 0
escape_special_characters: 0
+76
View File
@@ -0,0 +1,76 @@
# Contributor Covenant Code of Conduct
## Our Pledge
In the interest of fostering an open and welcoming environment, we as
contributors and maintainers pledge to making participation in our project and
our community a harassment-free experience for everyone, regardless of age, body
size, disability, ethnicity, sex characteristics, gender identity and expression,
level of experience, education, socio-economic status, nationality, personal
appearance, race, religion, or sexual identity and orientation.
## Our Standards
Examples of behavior that contributes to creating a positive environment
include:
* Using welcoming and inclusive language
* Being respectful of differing viewpoints and experiences
* Gracefully accepting constructive criticism
* Focusing on what is best for the community
* Showing empathy towards other community members
Examples of unacceptable behavior by participants include:
* The use of sexual language or imagery and unwelcome sexual attention or
advances
* Trolling, insulting/derogatory comments, and personal or political attacks
* Public or private harassment
* Publishing others' private information, such as a physical or electronic
address, without explicit permission
* Other conduct which could reasonably be considered inappropriate in a
professional setting
## Our Responsibilities
Project maintainers are responsible for clarifying the standards of acceptable
behavior and are expected to take appropriate and fair corrective action in
response to any instances of unacceptable behavior.
Project maintainers have the right and responsibility to remove, edit, or
reject comments, commits, code, wiki edits, issues, and other contributions
that are not aligned to this Code of Conduct, or to ban temporarily or
permanently any contributor for other behaviors that they deem inappropriate,
threatening, offensive, or harmful.
## Scope
This Code of Conduct applies within all project spaces, and it also applies when
an individual is representing the project or its community in public spaces.
Examples of representing a project or community include using an official
project e-mail address, posting via an official social media account, or acting
as an appointed representative at an online or offline event. Representation of
a project may be further defined and clarified by project maintainers.
## Enforcement
Instances of abusive, harassing, or otherwise unacceptable behavior may be
reported by contacting the project team at support@cryptomator.org. All
complaints will be reviewed and investigated and will result in a response that
is deemed necessary and appropriate to the circumstances. The project team is
obligated to maintain confidentiality with regard to the reporter of an incident.
Further details of specific enforcement policies may be posted separately.
Project maintainers who do not follow or enforce the Code of Conduct in good
faith may face temporary or permanent repercussions as determined by other
members of the project's leadership.
## Attribution
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html
[homepage]: https://www.contributor-covenant.org
For answers to common questions about this code of conduct, see
https://www.contributor-covenant.org/faq
+35
View File
@@ -0,0 +1,35 @@
# Contributing to Cryptomator
## Did you find a bug?
- Ensure you're running the latest version of Cryptomator.
- Ensure the bug is related to the desktop version of Cryptomator. Bugs concerning the Cryptomator iOS and Android app can be reported on the [Cryptomator for iOS issues list](https://github.com/cryptomator/ios/issues) and [Cryptomator for Android issues list](https://github.com/cryptomator/android/issues) respectively.
- Ensure the bug was not [already reported](https://github.com/cryptomator/cryptomator/issues). You can also check out our [FAQ](https://community.cryptomator.org/c/kb/faq).
- If you're unable to find an open issue addressing the problem, [submit a new one](https://github.com/cryptomator/cryptomator/issues/new/choose).
## Did you write a patch that fixes a bug?
- Open a new pull request with the patch.
- Ensure the PR description clearly describes the problem and solution. Include the relevant issue number if applicable.
## Do you intend to add a new feature or change an existing one?
- Suggest your change by [submitting a new issue](https://github.com/cryptomator/cryptomator/issues/new/choose) and start writing code.
## Do you intend to add a new translation or change an existing one?
Translations are not managed directly in this repository. Instead, we use [Crowdin](https://translate.cryptomator.org/), which automatically synchronizes translations with this repository. If you want to help us with translations, please visit our translation project on Crowdin.
## Use of Generative AI
AI tools may assist your work, but every contribution must be fully understood, reviewed, and tested by you. Only submit changes you can clearly explain and justify. Unverified or low-quality AI output that wastes our time and resources will be closed without further review.
## Code of Conduct
Help us keep Cryptomator open and inclusive. Please read and follow our [Code of Conduct](https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md).
## Above all, thank you for your contributions
Thank you for taking the time to contribute to the project! :+1:
Cryptomator Team
+8
View File
@@ -0,0 +1,8 @@
# These are supported funding model platforms
github: [cryptomator] # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
patreon: # Replace with a single Patreon username
open_collective: # Replace with a single Open Collective username
ko_fi: # Replace with a single Ko-fi username
tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
custom: https://cryptomator.org/sponsors/
+100
View File
@@ -0,0 +1,100 @@
name: Bug Report
description: Create a report to help us improve
type: "Bug"
body:
- type: input
id: summary
attributes:
label: Summary
placeholder: Please summarize your problem.
validations:
required: true
- type: checkboxes
id: terms
attributes:
label: Please agree to the following
options:
- label: I have searched [existing issues](https://github.com/cryptomator/cryptomator/issues?q=) for duplicates
required: true
- label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md)
required: true
- type: textarea
id: software-versions
attributes:
label: What software is involved?
description: |
Examples:
- Operating System: Windows 10
- Cryptomator: 1.5.16
- OneDrive: 23.226
- LibreOffice: 7.1.4
value: |
- Operating System:
- Cryptomator:
- …
validations:
required: true
- type: dropdown
id: volume-type
attributes:
label: Volume Type
description: What volume type is selected under Settings → Virtual Drive?
options:
- WinFsp
- WinFsp (Local Drive)
- FUSE-T
- macFUSE
- FUSE
- WebDAV (Windows Explorer)
- WebDAV (AppleScript)
- WebDAV (gio)
- WebDAV (HTTP Address)
- Dokany (1.5)
validations:
required: false
- type: textarea
id: reproduction-steps
attributes:
label: Steps to Reproduce
value: |
1. [First Step]
2. [Second Step]
3. …
validations:
required: true
- type: textarea
id: expected-behaviour
attributes:
label: Expected Behavior
placeholder: What you expect to happen.
validations:
required: true
- type: textarea
id: actual-behaviour
attributes:
label: Actual Behavior
placeholder: What actually happens.
validations:
required: true
- type: dropdown
id: reproducibility
attributes:
label: Reproducibility
description: How often does the described behaviour occur?
options:
- Always
- Intermittent
- Only once
validations:
required: true
- type: textarea
id: logs
attributes:
label: Relevant Log Output
description: Please copy and paste any relevant log output. This will be automatically formatted into code, so no need for backticks.
render: shell
- type: textarea
id: further-info
attributes:
label: Anything else?
description: Links? References? Screenshots? Configurations? Any data that might be necessary to reproduce the issue?
+8
View File
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Help & Support
url: https://community.cryptomator.org/
about: You will find answers in our community forum
- name: User Manual
url: https://docs.cryptomator.org/
about: Read the Cryptomator documentation here
+37
View File
@@ -0,0 +1,37 @@
name: Feature Request
description: Suggest an idea for this project
type: "Feature"
body:
- type: input
id: summary
attributes:
label: Summary
placeholder: Please summarize your feature request.
validations:
required: true
- type: checkboxes
id: terms
attributes:
label: Please agree to the following
options:
- label: I have searched [existing issues](https://github.com/cryptomator/cryptomator/issues?q=) for duplicates
required: true
- label: I agree to follow this project's [Code of Conduct](https://github.com/cryptomator/cryptomator/blob/develop/.github/CODE_OF_CONDUCT.md)
required: true
- type: textarea
id: motivation
attributes:
label: Motivation
description: Who requires this feature? What problem does the user face? How would this feature solve the problem?
validations:
required: true
- type: textarea
id: alternatives
attributes:
label: Considered Alternatives
description: What current alternatives or workarounds have you considered? Is there a different way to solve the same problem?
- type: textarea
id: context
attributes:
label: Anything else?
description: Any context, suggestions, screenshots, or concepts you want to share?
+26
View File
@@ -0,0 +1,26 @@
# Security Policy
## Reporting a Vulnerability
We take security seriously at Cryptomator. We appreciate your efforts to responsibly disclose your findings, and will make every effort to acknowledge your contributions.
To report a security vulnerability, please use the [GitHub Security Advisory feature](https://github.com/cryptomator/cryptomator/security/advisories). This feature allows you to privately discuss, fix, and publish information about security vulnerabilities.
If you prefer to report the vulnerability via email, please send an email to security@cryptomator.org.
PGP key fingerprint: `3647 9903 B23A E0A5 9359  9A3E 23B5 DBEF 94D4 D81D` ([public key](https://gist.github.com/cryptobot/864300b6b44ae2d2a15abedfe14bd040))
## Expectations
When reporting a vulnerability, please provide us with a detailed report that includes:
- A description of the vulnerability
- Steps to reproduce the vulnerability
- Possible impact of the vulnerability
- Any additional information that may be helpful
We ask that you do not publicly disclose the vulnerability until we have had a chance to address it.
## Thank You
We appreciate your help in keeping Cryptomator secure. Thank you for your contributions to the security of our project.
+18
View File
@@ -0,0 +1,18 @@
# Support for Cryptomator
For development-related topics, GitHub is the right place.
For _everything else_, please visit our official [Cryptomator Community](https://community.cryptomator.org) (we are there, too :wink:). Amongst others, you will find:
- [Knowledge Base](https://community.cryptomator.org/c/kb)
- Installation manuals
- Usage guides
- FAQ
- [Help with problems](https://community.cryptomator.org/c/help)
- Assistance with the setup
- Known issues and workarounds
- Discussions about the apps
- [Development discussions](https://community.cryptomator.org/c/development)
- General questions
- Discussions regarding our design decisions
- Our roadmap
@@ -0,0 +1,76 @@
name: 'Windows Code Signing'
description: 'Sign files on Windows with the Azure Trusted Signing'
inputs:
base-dir:
description: 'Absolute path to the base directory to search for files'
required: true
recursive:
description: 'Whether to search recursively in subdirectories'
required: false
default: 'false'
file-extensions:
description: 'List of file extensions to sign, separated by comma'
required: true
default: 'exe,dll,ps1'
description:
description: 'Signature description'
required: true
default: 'Cryptomator'
url:
description: 'Signature URL'
required: false
default: 'https://cryptomator.org'
append-signature:
description: 'Whether to append the signature to existing signatures'
required: false
default: 'false'
tenant-id:
description: 'Azure Tenant ID'
required: true
client-id:
description: 'Azure Client ID'
required: true
client-secret:
description: 'Azure Client Secret'
required: true
runs:
using: 'composite'
steps:
- name: Generate, mask, and output the input secrets
id: set-secrets
run: |
echo "::add-mask::${{ inputs.tenant-id }}"
echo "::add-mask::${{ inputs.client-id }}"
echo "::add-mask::${{ inputs.client-secret }}"
echo "tenant-id=${{ inputs.tenant-id }}" >> "$GITHUB_OUTPUT"
echo "client-id=${{ inputs.client-id }}" >> "$GITHUB_OUTPUT"
echo "client-secret=${{ inputs.client-secret }}" >> "$GITHUB_OUTPUT"
shell: bash
- name: Sign DLLs with Azure Trusted Signing
uses: azure/trusted-signing-action@fc390cf8ed0f14e248a542af1d838388a47c7a7c # v0.5.10
with:
files-folder: ${{ inputs.base-dir }}
files-folder-filter: ${{ inputs.file-extensions }}
files-folder-recurse: ${{ inputs.recursive }}
append-signature: ${{ inputs.append-signature }}
description: ${{ inputs.description }}
description-url: ${{ inputs.url }}
azure-tenant-id: ${{ steps.set-secrets.outputs.tenant-id }}
azure-client-id: ${{ steps.set-secrets.outputs.client-id }}
azure-client-secret: ${{ steps.set-secrets.outputs.client-secret }}
trusted-signing-account-name: cryptomatorSigning
certificate-profile-name: production
endpoint: https://weu.codesigning.azure.net/
timestamp-rfc3161: http://timestamp.acs.microsoft.com
timestamp-digest: SHA256
exclude-environment-credential: false
exclude-workload-identity-credential: true
exclude-managed-identity-credential: true
exclude-shared-token-cache-credential: true
exclude-visual-studio-credential: true
exclude-visual-studio-code-credential: true
exclude-azure-cli-credential: true
exclude-azure-powershell-credential: true
exclude-azure-developer-cli-credential: true
exclude-interactive-browser-credential: true
+56
View File
@@ -0,0 +1,56 @@
version: 2
updates:
- package-ecosystem: "maven"
directory: "/"
schedule:
interval: "weekly"
day: "monday"
time: "06:00"
timezone: "Etc/UTC"
ignore:
- dependency-name: "org.cryptomator:integrations-api"
versions: ["2.0.0-alpha1"]
- dependency-name: "jakarta.inject:jakarta.inject-api"
versions: ["2.0.1.MR"]
- dependency-name: "org.openjfx:*"
update-types: ["version-update:semver-major"]
groups:
java-test-dependencies:
patterns:
- "org.junit.jupiter:*"
- "org.mockito:*"
- "org.hamcrest:*"
- "com.google.jimfs:jimfs"
maven-build-plugins:
patterns:
- "org.apache.maven.plugins:*"
- "org.jacoco:jacoco-maven-plugin"
- "org.owasp:dependency-check-maven"
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
- "org.codehaus.mojo:license-maven-plugin"
javafx:
patterns:
- "org.openjfx:*"
java-production-dependencies:
patterns:
- "*"
exclude-patterns:
- "org.openjfx:*"
- "org.apache.maven.plugins:*"
- "org.jacoco:jacoco-maven-plugin"
- "org.owasp:dependency-check-maven"
- "me.fabriciorby:maven-surefire-junit5-tree-reporter"
- "org.codehaus.mojo:license-maven-plugin"
- "org.junit.jupiter:*"
- "org.mockito:*"
- "org.hamcrest:*"
- "com.google.jimfs:jimfs"
- package-ecosystem: "github-actions"
directory: "/" # even for `.github/workflows`
schedule:
interval: "monthly"
groups:
github-actions:
patterns:
- "*"
+29
View File
@@ -0,0 +1,29 @@
# .github/release.yml
# see https://docs.github.com/en/repositories/releasing-projects-on-github/automatically-generated-release-notes#configuring-automatically-generated-release-notes
changelog:
exclude:
authors:
- cryptobot
- dependabot
- github-actions
categories:
- title: What's New 🎉
labels:
- type:feature-request
- type:enhancement
- title: Bugfixes 🐛
labels:
- type:security-issue
- type:bug
- type:minor-bug
- title: Other Changes 📎
labels:
- "*"
exclude:
labels:
- type:feature-request
- type:enhancement
- type:security-issue
- type:bug
- type:minor-bug
+260
View File
@@ -0,0 +1,260 @@
name: Build AppImage
on:
release:
types: [published]
workflow_dispatch:
inputs:
version:
description: 'Version'
required: false
push:
branches-ignore:
- 'dependabot/**'
paths:
- '.github/workflows/appimage.yml'
- 'dist/linux/appimage/**'
- 'dist/linux/common/**'
- 'dist/linux/resources/**'
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: '25.0.1+8.0.LTS'
jobs:
get-version:
uses: ./.github/workflows/get-version.yml
with:
version: ${{ inputs.version }} #okay if not defined
build:
name: Build AppImage
runs-on: ${{ matrix.os }}
needs: [get-version]
strategy:
fail-fast: false
matrix:
include:
- os: ubuntu-latest
appimage-suffix: x86_64
openjfx-url: 'https://download2.gluonhq.com/openjfx/25/openjfx-25_linux-x64_bin-jmods.zip'
openjfx-sha: '96e520f48610d8ffb94ca30face1f11ffe8a977ddc1c4ff80b1a9e9f048bd94e'
- os: ubuntu-24.04-arm
appimage-suffix: aarch64
openjfx-url: 'https://download2.gluonhq.com/openjfx/25/openjfx-25_linux-aarch64_bin-jmods.zip'
openjfx-sha: '9ad4ca7b769ca4ee6419f1e99143dd6ff812f8be4fddb46a7d7cacbeea148af4'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
check-latest: true
cache: 'maven'
- name: Download OpenJFX jmods
id: download-jmods
run: |
curl -L ${{ matrix.openjfx-url }} -o openjfx-jmods.zip
echo "${{ matrix.openjfx-sha }} openjfx-jmods.zip" | shasum -a256 --check
mkdir -p openjfx-jmods
unzip -j openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
- name: Ensure major jfx version in pom and in jmods is the same
run: |
JMOD_VERSION=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
JMOD_VERSION=${JMOD_VERSION#*@}
JMOD_VERSION=${JMOD_VERSION%%.*}
POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
POM_JFX_VERSION=${POM_JFX_VERSION#*@}
POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
if [ $POM_JFX_VERSION -ne $JMOD_VERSION ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != amd64 jmod version (${JMOD_VERSION})"
exit 1
fi
- name: Set version
run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
- name: Run maven
run: mvn -B clean package -Plinux -DskipTests
- name: Patch target dir
run: |
cp LICENSE.txt target
cp target/cryptomator-*.jar target/mods
- name: Run jlink with help option
id: jep-493-check
run: |
JMOD_PATHS="openjfx-jmods"
if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
fi
echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
- name: Run jlink
#Remark: no compression is applied for improved build compression later (here appimage)
run: >
${JAVA_HOME}/bin/jlink
--verbose
--output runtime
--module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler
--strip-native-commands
--no-header-files
--no-man-pages
--strip-debug
--compress zip-0
- name: Run jpackage
run: >
${JAVA_HOME}/bin/jpackage
--verbose
--type app-image
--runtime-image runtime
--input target/libs
--module-path target/mods
--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
--dest appdir
--name Cryptomator
--vendor "Skymatic GmbH"
--copyright "(C) 2016 - 2025 Skymatic GmbH"
--app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
--java-options "--enable-preview"
--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator"
--java-options "-Xss5m"
--java-options "-Xmx256m"
--java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
--java-options "-Dfile.encoding=\"utf-8\""
--java-options "-Djava.net.useSystemProxies=true"
--java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\""
--java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\""
--java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\""
--java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\""
--java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\""
--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/.local/share/Cryptomator/mnt\""
--java-options "-Dcryptomator.showTrayIcon=true"
--java-options "-Dcryptomator.integrationsLinux.trayIconsDir=\"@{appdir}/usr/share/icons/hicolor/symbolic/apps\""
--java-options "-Dcryptomator.buildNumber=\"appimage-${{ needs.get-version.outputs.revNum }}\""
--java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\""
--java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log"
--resource-dir dist/linux/resources
- name: Patch Cryptomator.AppDir
run: |
mv appdir/Cryptomator Cryptomator.AppDir
cp -r dist/linux/appimage/resources/AppDir/* Cryptomator.AppDir/
cp dist/linux/common/org.cryptomator.Cryptomator256.png Cryptomator.AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png
cp dist/linux/common/org.cryptomator.Cryptomator512.png Cryptomator.AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png
cp dist/linux/common/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg
cp dist/linux/common/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg
cp dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg
cp dist/linux/common/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-symbolic.svg
cp dist/linux/common/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked-symbolic.svg
cp dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml
cp dist/linux/common/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop
cp dist/linux/common/application-vnd.cryptomator.vault.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.vault.xml
ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg
ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon
ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/org.cryptomator.Cryptomator.desktop
ln -s org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml
ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun
- name: Download AppImageKit
run: |
curl -L https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${{ matrix.appimage-suffix }}.AppImage -o appimagetool.AppImage
chmod +x appimagetool.AppImage
./appimagetool.AppImage --appimage-extract
- name: Prepare GPG-Agent for signing with key 615D449FE6E6A235
run: |
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --dry-run --sign README.md
env:
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- name: Build AppImage
run: >
./squashfs-root/AppRun Cryptomator.AppDir cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.appimage-suffix }}.AppImage
-u "gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${{ matrix.appimage-suffix }}.AppImage.zsync"
--sign --sign-key=615D449FE6E6A235
- name: Create detached GPG signatures
run: |
gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a cryptomator-*.AppImage
gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a cryptomator-*.AppImage.zsync
- name: Upload artifacts
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
with:
name: appimage-${{ matrix.appimage-suffix }}
path: |
cryptomator-*.AppImage
cryptomator-*.AppImage.zsync
cryptomator-*.asc
if-no-files-found: error
- name: Publish AppImage on GitHub Releases
if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
with:
fail_on_unmatched_files: true
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
files: |
cryptomator-*.AppImage
cryptomator-*.zsync
cryptomator-*.asc
create-aur-bin-pr:
name: Create PR for aur-bin repo
needs: [build, get-version]
runs-on: ubuntu-latest
if: github.event_name == 'release' && needs.get-version.outputs.versionType == 'stable'
steps:
- name: Download AppImages
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
with:
path: downloads/
merge-multiple: true
- name: Compute sha256 hash of AppImages
id: checksums
run: |
X64_SHA256=$(sha256sum downloads/cryptomator-*-x86_64.AppImage | cut -d ' ' -f1)
echo "x64-sha256sum=${X64_SHA256}" >> "$GITHUB_OUTPUT"
AARCH64_SHA256=$(sha256sum downloads/cryptomator-*-aarch64.AppImage | cut -d ' ' -f1)
echo "aarch64-sha256sum=${AARCH64_SHA256}" >> "$GITHUB_OUTPUT"
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
repository: 'cryptomator/aur-bin'
token: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get -y install makepkg pacman-package-manager
- name: Checkout release branch
run: |
git checkout -b release/${{ needs.get-version.outputs.semVerStr }}
- name: Update build file
run: |
sed -i -e 's|^pkgver=.*$|pkgver=${{ needs.get-version.outputs.semVerStr }}|' PKGBUILD
sed -i -e 's|^pkgrel=.*$|pkgrel=1|' PKGBUILD
sed -i -e "s|^sha256sums_x86_64=.*$|sha256sums_x86_64=('${{ steps.checksums.outputs.x64-sha256sum }}'|" PKGBUILD
sed -i -e "s|^sha256sums_aarch64=.*$|sha256sums_aarch64=('${{ steps.checksums.outputs.aarch64-sha256sum}}'|" PKGBUILD
makepkg --printsrcinfo > .SRCINFO
- name: Commit and push
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
git config push.autoSetupRemote true
git stage .
git commit -m "Prepare release ${{needs.get-version.outputs.semVerStr}}"
git push
- name: Create pull request
id: create-pr
run: |
printf "> [!IMPORTANT]\n> Todos:\n> - [ ] Update build instructions\n> - [ ] Check for JDK update\n> - [ ] Check for JFX update" > pr_body.md
URL=$(gh pr create --title "Release ${{ needs.get-version.outputs.semVerStr }}" --body-file pr_body.md)
echo "PR_URL=$URL" >> "$GITHUB_OUTPUT"
env:
GH_TOKEN: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
- name: Slack Notification
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: 'Cryptobot'
SLACK_ICON: false
SLACK_ICON_EMOJI: ':bot:'
SLACK_CHANNEL: 'cryptomator-desktop'
SLACK_TITLE: "AUR-bin release PR for ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} created."
SLACK_MESSAGE: "See <${{ steps.create-pr.outputs.PR_URL }}|PR> on how to proceed."
SLACK_FOOTER: false
MSG_MINIMAL: true
+95
View File
@@ -0,0 +1,95 @@
name: Create PR for AUR
on:
release:
types: [published]
workflow_dispatch:
inputs:
tag:
description: 'Release tag'
required: true
jobs:
get-version:
uses: ./.github/workflows/get-version.yml
with:
version: ${{ inputs.tag }}
tarball:
name: Determines tarball url and compute checksum
runs-on: ubuntu-latest
needs: [get-version]
if: github.event_name == 'workflow_dispatch' || needs.get-version.outputs.versionType == 'stable'
env:
INPUT_TAG: ${{ inputs.tag }}
outputs:
url: ${{ steps.url.outputs.url}}
sha256: ${{ steps.sha256.outputs.sha256}}
steps:
- name: Determine tarball url
id: url
run: |
URL="";
if [[ -n "${INPUT_TAG}" ]]; then
URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${INPUT_TAG}.tar.gz"
else
URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${{ github.event.release.tag_name }}.tar.gz"
fi
echo "url=${URL}" >> "$GITHUB_OUTPUT"
- name: Download source tarball and compute checksum
id: sha256
run: |
curl --silent --fail-with-body -L -H "Accept: application/vnd.github+json" ${{ steps.url.outputs.url }} --output cryptomator.tar.gz
TARBALL_SHA256=$(sha256sum cryptomator.tar.gz | cut -d ' ' -f1)
echo "sha256=${TARBALL_SHA256}" >> "$GITHUB_OUTPUT"
aur:
name: Create PR for AUR
runs-on: ubuntu-latest
needs: [tarball, get-version]
env:
AUR_PR_URL: tbd
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
repository: 'cryptomator/aur'
token: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
- name: Install dependencies
run: |
sudo apt-get update
sudo apt-get install makepkg pacman-package-manager
- name: Checkout release branch
run: |
git checkout -b release/${{ needs.get-version.outputs.semVerStr }}
- name: Update build file
run: |
sed -i -e 's|^pkgver=.*$|pkgver=${{ needs.get-version.outputs.semVerStr }}|' PKGBUILD
sed -i -e 's|^pkgrel=.*$|pkgrel=1|' PKGBUILD
sed -i -e "s|^sha256sums=.*$|sha256sums=('${{ needs.tarball.outputs.sha256 }}'|" PKGBUILD
makepkg --printsrcinfo > .SRCINFO
- name: Commit and push
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
git config push.autoSetupRemote true
git stage .
git commit -m "Prepare release ${{needs.get-version.outputs.semVerStr}}"
git push
- name: Create pull request
run: |
printf "> [!IMPORTANT]\n> Todos:\n> - [ ] Update build instructions\n> - [ ] Check for JDK update\n> - [ ] Check for JFX update" > pr_body.md
PR_URL=$(gh pr create --title "Release ${{ needs.get-version.outputs.semVerStr }}" --body-file pr_body.md)
echo "AUR_PR_URL=$PR_URL" >> "$GITHUB_ENV"
env:
GH_TOKEN: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
- name: Slack Notification
if: github.event_name == 'release'
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: 'Cryptobot'
SLACK_ICON: false
SLACK_ICON_EMOJI: ':bot:'
SLACK_CHANNEL: 'cryptomator-desktop'
SLACK_TITLE: "AUR release PR created for ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} created."
SLACK_MESSAGE: "See <${{ env.AUR_PR_URL }}|PR> on how to proceed."
SLACK_FOOTER: false
MSG_MINIMAL: true
+100
View File
@@ -0,0 +1,100 @@
name: AntiVirus Whitelisting
on:
workflow_call:
inputs:
url:
description: "Url to the file to upload"
required: true
type: string
avast:
description: "Upload to Avast"
required: false
type: boolean
default: true
kaspersky:
description: "Upload to Kaspersky"
required: false
type: boolean
default: true
workflow_dispatch:
inputs:
url:
description: "Url to the file to upload"
required: true
type: string
avast:
description: "Upload to Avast"
required: false
type: boolean
default: false
kaspersky:
description: "Upload to Kaspersky"
required: false
type: boolean
default: false
jobs:
download-file:
name: Downloads the file into the VM
runs-on: ubuntu-latest
outputs:
fileName: ${{ steps.extractName.outputs.fileName}}
env:
INPUT_URL: ${{ inputs.url }}
steps:
- name: Extract file name
id: extractName
run: |
url="${INPUT_URL}"
echo "fileName=${url##*/}" >> $GITHUB_OUTPUT
- name: Download file
run: curl "${INPUT_URL}" -L -o "${{steps.extractName.outputs.fileName}}" --fail-with-body
- name: Upload artifact
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
with:
name: ${{ steps.extractName.outputs.fileName }}
path: ${{ steps.extractName.outputs.fileName }}
if-no-files-found: error
allowlist-kaspersky:
name: Anti Virus Allowlisting Kaspersky
runs-on: ubuntu-latest
needs: download-file
if: inputs.kaspersky
steps:
- name: Download artifact
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
with:
name: ${{ needs.download-file.outputs.fileName }}
path: upload
- name: Upload to Kaspersky
uses: SamKirkland/FTP-Deploy-Action@a51268f67f6605236975928ae28b0f7e9971d50a # v4.6.3
with:
protocol: ftps
server: allowlist.kaspersky-labs.com
port: 990
username: ${{ secrets.ALLOWLIST_KASPERSKY_USERNAME }}
password: ${{ secrets.ALLOWLIST_KASPERSKY_PASSWORD }}
local-dir: ./upload/
allowlist-avast:
name: Anti Virus Allowlisting Avast
runs-on: ubuntu-latest
needs: download-file
if: inputs.avast
steps:
- name: Download artifact
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
with:
name: ${{ needs.download-file.outputs.fileName }}
path: upload
- name: Upload to Avast
uses: wlixcc/SFTP-Deploy-Action@a5ccb9c6211a94cc59404f0fdb2a9936a6dfee64 # v1.2.6
with:
server: whitelisting.avast.com
port: 22
username: ${{ secrets.ALLOWLIST_AVAST_USERNAME }}
password: ${{ secrets.ALLOWLIST_AVAST_PASSWORD }}
ssh_private_key: ''
sftp_only: true
local_path: './upload/*'
remote_path: '/data'
+86
View File
@@ -0,0 +1,86 @@
name: Build
on:
push:
paths:
- '.github/workflows/build.yml'
- 'pom.xml'
- 'src/**'
pull_request_target:
types: [labeled]
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: 25
defaults:
run:
shell: bash
jobs:
test:
name: Compile and Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
cache: 'maven'
- name: Cache SonarCloud packages
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ~/.sonar/cache
key: ${{ runner.os }}-sonar
restore-keys: ${{ runner.os }}-sonar
- name: Build and Test
run: >
xvfb-run
mvn -B verify
jacoco:report
org.sonarsource.scanner.maven:sonar-maven-plugin:sonar
-Pcoverage
-Dsonar.projectKey=cryptomator_cryptomator
-Dsonar.organization=cryptomator
-Dsonar.host.url=https://sonarcloud.io
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} # Needed to get PR information, if any
SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
- name: Draft a release
if: startsWith(github.ref, 'refs/tags/')
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
with:
draft: true
discussion_category_name: releases
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
generate_release_notes: true
body: |-
> [!NOTE]
> 🚧 Work in Progress 🚧
>
> Please be patient, the [builds are still running](https://github.com/cryptomator/cryptomator/actions). Binary packages can be found here in a few moments.
<!--REPLACE with auto-generated release notes (see below)
### What's New 🎉
### Bugfixes 🐛
### Other Changes 📎
END REPLACE-->
Feel free to also read our [CHANGELOG.md](https://github.com/cryptomator/cryptomator/blob/develop/CHANGELOG.md).
---
<!-- Don't forget to include the
💾 SHA-256 checksums of release artifacts:
```
```
-->
> [!TIP]
> You can verify the GPG signature of all assets using our public key: [`5811 7AFA 1F85 B3EE C154 677D 615D 449F E6E6 A235`](https://gist.github.com/cryptobot/211111cf092037490275f39d408f461a).
<!-- Auto-Generated Release Notes: -->
+83
View File
@@ -0,0 +1,83 @@
name: Check JDK for non-major updates
on:
schedule:
- cron: '0 0 1 * *' # run once a month at the first day of month
workflow_dispatch:
env:
JDK_VERSION: '25.0.1+8.0.LTS'
JDK_VENDOR: temurin
RUNTIME_VERSION_HELPER: >
public class Test {
public static void main(String[] args) {
System.out.println(Runtime.version());
}
}
jobs:
check-version:
name: Checkout latest jdk version
runs-on: ubuntu-latest
env:
JDK_MAJOR_VERSION: 'toBeFilled'
steps:
- name: Determine current major version
run: echo 'JDK_MAJOR_VERSION=${{ env.JDK_VERSION }}'.substring(0,2) >> "$env:GITHUB_ENV"
shell: pwsh
- name: Checkout latest JDK ${{ env.JDK_MAJOR_VERSION }}
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
java-version: ${{ env.JDK_MAJOR_VERSION}}
distribution: ${{ env.JDK_VENDOR }}
check-latest: true
- name: Determine if update is available
id: determine
shell: pwsh
run: |
$latestVersion = 0,0,0,0 #INTERIM, UPDATE, PATCH and BUILD
$currentVersion = 0,0,0,0
# Get the latest JDK runtime version
"${env:RUNTIME_VERSION_HELPER}" | Set-Content -Path "GetRuntimeVersion.java"
$latestVersionString = & java GetRuntimeVersion.java
$runtimeVersionAndBuild = $latestVersionString.Split('+')
if($runtimeVersionAndBuild.Length -eq 2) {
$latestVersion[3]=$runtimeVersionAndBuild[1];
}
$tmp=$runtimeVersionAndBuild[0].Split('.')
for($i=0;$i -lt $latestVersion.Length; $i++) {
$latestVersion[$i]=$tmp[$i+1];
}
# Get the current JDK version
$runtimeVersionAndBuild = '${{ env.JDK_VERSION}}'.Split('+')
if($runtimeVersionAndBuild.Length -eq 2) {
$currentVersion[3]=$runtimeVersionAndBuild[1];
}
$tmp=$runtimeVersionAndBuild[0].Split('.')
for($i=0;$i -lt $currentVersion.Length; $i++) {
$currentVersion[$i]=$tmp[$i+1];
}
# compare
for($i=0; $i -lt $currentVersion.Length ; $i++) {
if($latestVersion[$i] -gt $currentVersion[$i]){
echo 'UPDATE_AVAILABLE=true' >> "$env:GITHUB_OUTPUT"
echo "LATEST_JDK_VERSION='${latestVersionString}'" >> "$env:GITHUB_OUTPUT"
return 0;
}
}
- name: Notify
if: steps.determine.outputs.UPDATE_AVAILABLE == 'true'
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: 'Cryptobot'
SLACK_ICON: false
SLACK_ICON_EMOJI: ':bot:'
SLACK_CHANNEL: 'cryptomator-desktop'
SLACK_TITLE: "JDK update available"
SLACK_MESSAGE: "Cryptomator-CI JDK can be upgraded to ${{ steps.determine.outputs.LATEST_JDK_VERSION }}. Check the Nextcloud collective for instructions."
SLACK_FOOTER: false
MSG_MINIMAL: true
+167
View File
@@ -0,0 +1,167 @@
name: Build Debian Package
on:
workflow_dispatch:
inputs:
semver:
description: 'SemVer String (e.g. 1.7.0-beta1)'
ppaver:
description: 'Base PPA Version String (e.g. 1.6.16+1.7.0~beta1) without -0ppa1'
dput:
description: 'Upload to PPA'
required: true
default: false
type: boolean
push:
branches-ignore:
- 'dependabot/**'
paths:
- '.github/workflows/debian.yml'
- 'dist/linux/debian/**'
- 'dist/linux/common/**'
- 'dist/linux/resources/**'
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: '25.0.1+8.0.LTS'
DEB_BUILD_DEPENDS: 'debhelper (>=10), openjdk-25-jdk (>= 25+36), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1'
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/25/openjfx-25_linux-x64_bin-jmods.zip'
OPENJFX_JMODS_AMD64_HASH: '96e520f48610d8ffb94ca30face1f11ffe8a977ddc1c4ff80b1a9e9f048bd94e'
OPENJFX_JMODS_AARCH64: 'https://download2.gluonhq.com/openjfx/25/openjfx-25_linux-aarch64_bin-jmods.zip'
OPENJFX_JMODS_AARCH64_HASH: '9ad4ca7b769ca4ee6419f1e99143dd6ff812f8be4fddb46a7d7cacbeea148af4'
jobs:
get-version:
uses: ./.github/workflows/get-version.yml
with:
version: ${{ inputs.semver }} #okay if not defined
build:
name: Build Debian Package
runs-on: ubuntu-22.04
needs: [get-version]
env:
INPUT_PPAVER: ${{ inputs.ppaver }}
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- id: deb-version
name: Determine deb-version
run: |
if [ -n "${INPUT_PPAVER}" ]; then
echo "debVersion=${INPUT_PPAVER}" >> "$GITHUB_OUTPUT"
else
echo "debVersion=${{needs.get-version.outputs.semVerStr}}" >> "$GITHUB_OUTPUT"
fi
- name: Install build tools
run: |
sudo apt-get update
sudo apt-get install devscripts dput
sudo apt-get satisfy "${DEB_BUILD_DEPENDS}"
env:
DEB_BUILD_DEPENDS: ${{ env.DEB_BUILD_DEPENDS }}
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
check-latest: true
cache: 'maven'
- name: Run maven
run: mvn -B clean package -Plinux -DskipTests
- name: Download OpenJFX jmods
id: download-jmods
run: |
curl -L ${{ env.OPENJFX_JMODS_AMD64 }} -o openjfx-amd64.zip
echo "${{ env.OPENJFX_JMODS_AMD64_HASH }} openjfx-amd64.zip" | shasum -a256 --check
mkdir -p jmods/amd64
unzip -j openjfx-amd64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/amd64
curl -L ${{ env.OPENJFX_JMODS_AARCH64 }} -o openjfx-aarch64.zip
echo "${{ env.OPENJFX_JMODS_AARCH64_HASH }} openjfx-aarch64.zip" | shasum -a256 --check
mkdir -p jmods/aarch64
unzip -j openjfx-aarch64.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d jmods/aarch64
- name: Ensure major jfx version in pom and in jmods is the same
run: |
JMOD_VERSION_AMD64=$(jmod describe jmods/amd64/javafx.base.jmod | head -1)
JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64#*@}
JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64%%.*}
JMOD_VERSION_AARCH64=$(jmod describe jmods/aarch64/javafx.base.jmod | head -1)
JMOD_VERSION_AARCH64=${JMOD_VERSION_AARCH64#*@}
JMOD_VERSION_AARCH64=${JMOD_VERSION_AARCH64%%.*}
POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
POM_JFX_VERSION=${POM_JFX_VERSION#*@}
POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
if [ $POM_JFX_VERSION -ne $JMOD_VERSION_AMD64 ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != amd64 jmod version (${JMOD_VERSION_AMD64})"
exit 1
fi
if [ $POM_JFX_VERSION -ne $JMOD_VERSION_AARCH64 ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != aarch64 jmod version (${JMOD_VERSION_AARCH64})"
exit 1
fi
- name: Create orig.tar.gz with common/ libs/ mods/ jmods/
run: |
mkdir pkgdir
cp -r target/libs pkgdir
cp -r target/mods pkgdir
cp -r jmods pkgdir
cp -r dist/linux/common/ pkgdir
cp target/cryptomator-*.jar pkgdir/mods
tar -cJf cryptomator_${{ steps.deb-version.outputs.debVersion }}.orig.tar.xz -C pkgdir .
- name: Patch and rename pkgdir
run: |
cp -r dist/linux/debian/ pkgdir
export RFC2822_TIMESTAMP=`date --rfc-2822`
export DISABLE_UPDATE_CHECK=${{ inputs.dput }}
envsubst '${SEMVER_STR} ${VERSION_NUM} ${REVISION_NUM} ${DISABLE_UPDATE_CHECK}' < dist/linux/debian/rules > pkgdir/debian/rules
envsubst '${PPA_VERSION} ${RFC2822_TIMESTAMP}' < dist/linux/debian/changelog > pkgdir/debian/changelog
find . -name "*.jar" >> pkgdir/debian/source/include-binaries
mv pkgdir cryptomator_${{ steps.deb-version.outputs.debVersion }}
env:
SEMVER_STR: ${{ needs.get-version.outputs.semVerStr }}
VERSION_NUM: ${{ needs.get-version.outputs.semVerNum }}
REVISION_NUM: ${{ needs.get-version.outputs.revNum }}
PPA_VERSION: ${{ steps.deb-version.outputs.debVersion }}-0ppa1
- name: Prepare GPG-Agent for signing with key 615D449FE6E6A235
run: |
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --dry-run --sign README.md
env:
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- name: debuild
run: |
(sleep 8m; gpg --batch --quiet --pinentry-mode loopback -u 615D449FE6E6A235 --dry-run --sign README.md) &
debuild -S -sa -d
debuild -b -sa -d
env:
DEBSIGN_PROGRAM: gpg --batch --pinentry-mode loopback
DEBSIGN_KEYID: 615D449FE6E6A235
working-directory: cryptomator_${{ steps.deb-version.outputs.debVersion }}
- name: Create detached GPG signatures
run: |
gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a cryptomator_*_amd64.deb
- name: Upload artifacts
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
with:
name: linux-deb-package
path: |
cryptomator_*.dsc
cryptomator_*.orig.tar.xz
cryptomator_*.debian.tar.xz
cryptomator_*_source.buildinfo
cryptomator_*_source.changes
cryptomator_*_amd64.deb
cryptomator_*.asc
- name: Publish on PPA
if: inputs.dput && inputs.ppaver != ''
run: dput ppa:sebastian-stenzel/cryptomator-beta cryptomator_*_source.changes
# If ref is a tag, also upload to GitHub Releases:
- name: Publish Debian package on GitHub Releases
if: startsWith(github.ref, 'refs/tags/') && inputs.dput
env:
GITHUB_TOKEN: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
run: |
artifacts=$(ls | grep cryptomator*.deb)
gh release upload ${{ github.ref_name }} $artifacts
+19
View File
@@ -0,0 +1,19 @@
name: OWASP Maven Dependency Check
on:
schedule:
- cron: '0 8 * * 0'
workflow_dispatch:
jobs:
check-dependencies:
uses: skymatic/workflows/.github/workflows/run-dependency-check.yml@1074588008ae3326a2221ea451783280518f0366 # v3.0.1
with:
runner-os: 'ubuntu-latest'
java-distribution: 'temurin'
java-version: 25
secrets:
nvd-api-key: ${{ secrets.NVD_API_KEY }}
ossindex-username: ${{ secrets.OSSINDEX_USERNAME }}
ossindex-token: ${{ secrets.OSSINDEX_API_TOKEN }}
slack-webhook-url: ${{ secrets.SLACK_WEBHOOK_URL }}
+63
View File
@@ -0,0 +1,63 @@
name: Report Download Stats
on:
schedule:
- cron: '0/15 * * * *' # run every 15 min - don't forget to adjust the "interval" in the json sent to the metrics endpoint
jobs:
report-download-stats:
runs-on: ubuntu-latest
steps:
- name: Get download count of latest releases
id: get-stats
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
script: |
const query = `query($owner:String!, $name:String!) {
repository(owner:$owner, name:$name){
releases(first: 10, orderBy: {field: CREATED_AT, direction: DESC}) {
nodes {
isPrerelease
tagName
releaseAssets(first: 20) {
nodes {
name
downloadCount
}
}
}
}
}
}`;
const variables = {
owner: context.repo.owner,
name: context.repo.repo
}
return await github.graphql(query, variables)
- name: Transform Results
id: transform-stats
run: |
TIME=$(($(date +%s) / $INTERVAL * $INTERVAL))
echo ${JSON_DATA} | jq --arg TIME "$TIME" --arg INTERVAL "$INTERVAL" -c '.repository.releases.nodes[] | select(.isPrerelease == false) | .tagName as $tagName | .releaseAssets.nodes[] | {filename: .name, downloads: .downloadCount, release: $tagName, time: ($TIME|tonumber), interval: ($INTERVAL|tonumber)}' > input.json
jq -c 'select(.filename|endswith("-x86_64.AppImage")) | {name: "github.releases.downloads", tags: ["file=AppImage", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json
jq -c 'select(.filename|endswith("_amd64.deb")) | {name: "github.releases.downloads", tags: ["file=deb", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json
jq -c 'select(.filename|endswith("-x64.msi")) | {name: "github.releases.downloads", tags: ["file=msi", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json
jq -c 'select(.filename|endswith("-x64.exe")) | {name: "github.releases.downloads", tags: ["file=exe", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json
jq -c 'select(.filename|endswith("-arm64.dmg")) | {name: "github.releases.downloads", tags: ["file=dmg", "version=\(.release)", "arch=arm64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json
jq -c 'select(.filename|endswith(".dmg")) | select(.filename|endswith("-arm64.dmg")|not) | {name: "github.releases.downloads", tags: ["file=dmg", "version=\(.release)", "arch=amd64"], value: .downloads, interval: .interval, time: .time}' input.json >> output.json
RESULT=$(jq -s -c "." output.json)
echo "result=${RESULT}" >> $GITHUB_OUTPUT
env:
INTERVAL: 900
JSON_DATA: ${{ steps.get-stats.outputs.result }}
- name: Upload Results
uses: fjogeleit/http-request-action@c0b95d02a088b47c1f2f4db04fd8af8bd19eee54 # v1.16.6
with:
url: 'https://graphite-us-central1.grafana.net/metrics'
method: 'POST'
contentType: 'application/json'
bearerToken: ${{ secrets.GRAFANA_GRAPHITE_TOKEN }}
data: ${{ steps.transform-stats.outputs.result }}
continue-on-error: true # currently there seems to be a problem with the metrics endpoint, failing every now and then
+66
View File
@@ -0,0 +1,66 @@
name: Update Error Database
on:
discussion:
types: [created, edited, deleted, category_changed, answered, unanswered]
discussion_comment:
types: [created, edited, deleted]
jobs:
update-error-db:
runs-on: ubuntu-latest
if: github.event.discussion.category.name == 'Errors'
steps:
- name: Query Discussion Data
if: github.event_name == 'discussion_comment' || github.event_name == 'discussion' && github.event.action != 'deleted'
id: query-data
uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
with:
script: |
const query = `query ($owner: String!, $name: String!, $discussionNumber: Int!) {
repository(owner: $owner, name: $name) {
discussion(number: $discussionNumber) {
id
upvoteCount
title
url
answer {
url
upvoteCount
}
comments {
totalCount
}
}
}
}`;
const variables = {
owner: context.repo.owner,
name: context.repo.repo,
discussionNumber: context.payload.discussion.number
}
return await github.graphql(query, variables)
- name: Get Gist
id: get-gist
uses: andymckay/get-gist-action@cf3bc8164af24126f7e5979eb6d3dc0c12309bd1 # not_tagged
with:
gistURL: https://gist.github.com/cryptobot/accba9fb9555e7192271b85606f97230
- name: Merge Error Code Data
run: |
jq -c '.' ${{ steps.get-gist.outputs.file }} > original.json
if [ ! -z "$DISCUSSION" ]
then
echo $DISCUSSION | jq -c '.repository.discussion | .comments = .comments.totalCount | {(.id|tostring) : .}' > new.json
jq -s '.[0] * .[1]' original.json new.json > merged.json
else
cat original.json | jq 'del(.[] | select(.url=="https://github.com/cryptomator/cryptomator/discussions/${{ github.event.discussion.number }}"))' > merged.json
fi
env:
DISCUSSION: ${{ steps.query-data.outputs.result }}
- name: Patch Gist
uses: exuanbo/actions-deploy-gist@47697fceaeea2006a90594ee24eb9cd0a1121ef8 # v1.1.4
with:
token: ${{ secrets.CRYPTOBOT_GIST_TOKEN }}
gist_id: accba9fb9555e7192271b85606f97230
gist_file_name: errorcodes.json
file_path: merged.json
+85
View File
@@ -0,0 +1,85 @@
name: Create PR for flathub
on:
release:
types: [published]
workflow_dispatch:
inputs:
tag:
description: 'Release tag'
required: true
jobs:
get-version:
uses: ./.github/workflows/get-version.yml
with:
version: ${{ inputs.tag }}
tarball:
name: Determines tarball url and compute checksum
runs-on: ubuntu-latest
needs: [get-version]
if: github.event_name == 'workflow_dispatch' || needs.get-version.outputs.versionType == 'stable'
outputs:
url: ${{ steps.url.outputs.url}}
sha512: ${{ steps.sha512.outputs.sha512}}
steps:
- name: Determine tarball url
id: url
run: |
URL="https://github.com/cryptomator/cryptomator/archive/refs/tags/${TAG}.tar.gz"
echo "url=${URL}" >> "$GITHUB_OUTPUT"
env:
TAG: ${{ inputs.tag || github.event.release.tag_name}}
- name: Download source tarball and compute checksum
id: sha512
run: |
curl --silent --fail-with-body -L -H "Accept: application/vnd.github+json" ${{ steps.url.outputs.url }} --output cryptomator.tar.gz
TARBALL_SHA512=$(sha512sum cryptomator.tar.gz | cut -d ' ' -f1)
echo "sha512=${TARBALL_SHA512}" >> "$GITHUB_OUTPUT"
flathub:
name: Create PR for flathub
runs-on: ubuntu-latest
needs: [tarball, get-version]
env:
FLATHUB_PR_URL: tbd
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
repository: 'flathub/org.cryptomator.Cryptomator'
token: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
- name: Checkout release branch
run: |
git checkout -b release/${{ needs.get-version.outputs.semVerStr }}
- name: Update build file
run: |
sed -i -e 's/VERSION: [0-9]\+\.[0-9]\+\.[0-9]\+.*/VERSION: ${{ needs.get-version.outputs.semVerStr }}/g' org.cryptomator.Cryptomator.yaml
sed -i -e 's/sha512: [0-9A-Za-z_\+-]\{128\} #CRYPTOMATOR/sha512: ${{ needs.tarball.outputs.sha512 }} #CRYPTOMATOR/g' org.cryptomator.Cryptomator.yaml
sed -i -e 's;url: https://github.com/cryptomator/cryptomator/archive/refs/tags/[^[:blank:]]\+;url: ${{ needs.tarball.outputs.url }};g' org.cryptomator.Cryptomator.yaml
- name: Commit and push
run: |
git config user.name "${{ github.actor }}"
git config user.email "${{ github.actor_id }}+${{ github.actor }}@users.noreply.github.com"
git config push.autoSetupRemote true
git stage .
git commit -m "Prepare release ${{needs.get-version.outputs.semVerStr}}"
git push
- name: Create pull request
run: |
printf "> [!IMPORTANT]\n> Todos:\n> - [ ] Update maven dependencies\n> - [ ] Check for JDK update\n> - [ ] Check for JFX update" > pr_body.md
PR_URL=$(gh pr create --title "Release ${{ needs.get-version.outputs.semVerStr }}" --body-file pr_body.md)
echo "FLATHUB_PR_URL=$PR_URL" >> "$GITHUB_ENV"
env:
GH_TOKEN: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
- name: Slack Notification
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
if: github.event_name == 'release'
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: 'Cryptobot'
SLACK_ICON: false
SLACK_ICON_EMOJI: ':bot:'
SLACK_CHANNEL: 'cryptomator-desktop'
SLACK_TITLE: "Flathub release PR created for ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} created."
SLACK_MESSAGE: "See <${{ env.FLATHUB_PR_URL }}|PR> on how to proceed.>."
SLACK_FOOTER: false
MSG_MINIMAL: true
+78
View File
@@ -0,0 +1,78 @@
name: Parse and Validate a version string or tag
on:
workflow_call:
inputs:
version:
description: "A specific version to use"
required: false
type: string
outputs:
semVerStr:
description: "The full version string."
value: ${{ jobs.determine-version.outputs.semVerStr}}
semVerNum:
description: "The numerical part of the version string"
value: ${{ jobs.determine-version.outputs.semVerNum}}
revNum:
description: "The revision number"
value: ${{ jobs.determine-version.outputs.revNum}}
versionType:
description: "Type of the version. Values are [stable, alpha, beta, rc, unknown]"
value: ${{ jobs.determine-version.outputs.type }}
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: 25
jobs:
determine-version:
name: 'Determines the version following semver'
runs-on: ubuntu-latest
outputs:
semVerNum: ${{ steps.versions.outputs.semVerNum }}
semVerStr: ${{ steps.versions.outputs.semVerStr }}
revNum: ${{ steps.versions.outputs.revNum }}
type: ${{ steps.versions.outputs.type}}
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
with:
fetch-depth: 0
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
cache: 'maven'
- id: versions
name: Get version information
run: |
if [[ $GITHUB_REF =~ refs/tags/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
SEM_VER_STR=${GITHUB_REF##*/}
elif [[ "${VERSION_STRING}" =~ [0-9]+\.[0-9]+\.[0-9]+.* ]]; then
SEM_VER_STR="${VERSION_STRING}"
else
SEM_VER_STR=`mvn help:evaluate -Dexpression=project.version -q -DforceStdout`
fi
SEM_VER_NUM=`echo ${SEM_VER_STR} | sed -E 's/([0-9]+\.[0-9]+\.[0-9]+).*/\1/'`
REVCOUNT=`git rev-list --count HEAD`
TYPE="unknown"
if [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then
TYPE="stable"
elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-alpha[1-9]+$ ]]; then
TYPE="alpha"
elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-beta[1-9]+$ ]]; then
TYPE="beta"
elif [[ $SEM_VER_STR =~ [0-9]+\.[0-9]+\.[0-9]+-rc[1-9]$ ]]; then
TYPE="rc"
fi
echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT
echo "semVerNum=${SEM_VER_NUM}" >> $GITHUB_OUTPUT
echo "revNum=${REVCOUNT}" >> $GITHUB_OUTPUT
echo "type=${TYPE}" >> $GITHUB_OUTPUT
env:
VERSION_STRING: ${{ inputs.version }}
- name: Validate Version
uses: skymatic/semver-validation-action@7a6ae1c9e121540d11c9c7e4e667c83d583aa153 # v3.0.0
with:
version: ${{ steps.versions.outputs.semVerStr }}
+301
View File
@@ -0,0 +1,301 @@
name: Build macOS .dmg for x64
#######################################
# STOP! DO NOT EDIT THIS FILE!
#
# It is a copy of mac-dmg.yml with tiny adjustements (mainly lines 42 to 47)
# It was made necessary, since Github does not offer free macos intel runners for macos 15 and above.
#
#######################################
on:
release:
types: [published]
workflow_dispatch:
inputs:
version:
description: 'Version'
required: false
notarize:
description: 'Notarize'
required: true
default: false
type: boolean
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: '25.0.1+8.0.LTS'
jobs:
get-version:
uses: ./.github/workflows/get-version.yml
with:
version: ${{ inputs.version }}
build-arm:
name: Build Cryptomator.app for ${{ matrix.output-suffix }}
runs-on: ${{ matrix.os }}
needs: [get-version]
strategy:
fail-fast: false
matrix:
include:
- os: macos-15-large
architecture: x64
output-suffix: x64
fuse-lib: macFUSE
openjfx-url: 'https://download2.gluonhq.com/openjfx/25/openjfx-25_osx-x64_bin-jmods.zip'
openjfx-sha: '0eba73fb28a24c845175d16fa2f8c081c936ce6de1be9b79eb6119fa32e53d52'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
architecture: ${{ matrix.architecture }}
check-latest: true
cache: 'maven'
- name: Download OpenJFX jmods
id: download-jmods
run: |
curl -L ${{ matrix.openjfx-url }} -o openjfx-jmods.zip
echo "${{ matrix.openjfx-sha }} *openjfx-jmods.zip" | shasum -a256 --check
mkdir -p openjfx-jmods/
unzip -jo openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
- name: Ensure major jfx version in pom and in jmods is the same
run: |
JMOD_VERSION=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
JMOD_VERSION=${JMOD_VERSION#*@}
JMOD_VERSION=${JMOD_VERSION%%.*}
POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
POM_JFX_VERSION=${POM_JFX_VERSION#*@}
POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
if [ "${POM_JFX_VERSION}" -ne "${JMOD_VERSION}" ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != jmod version (${JMOD_VERSION})"
exit 1
fi
- name: Set version
run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
- name: Run maven
run: mvn -B clean package -Pmac -DskipTests
- name: Patch target dir
run: |
cp LICENSE.txt target
cp target/cryptomator-*.jar target/mods
- name: Run jlink with help option
id: jep-493-check
run: |
JMOD_PATHS="openjfx-jmods"
if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
fi
echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
- name: Run jlink
#Remark: no compression is applied for improved build compression later (here dmg)
run: >
${JAVA_HOME}/bin/jlink
--verbose
--output runtime
--module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
--strip-native-commands
--no-header-files
--no-man-pages
--strip-debug
--compress zip-0
- name: Run jpackage
run: >
${JAVA_HOME}/bin/jpackage
--verbose
--type app-image
--runtime-image runtime
--input target/libs
--module-path target/mods
--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
--dest appdir
--name Cryptomator
--vendor "Skymatic GmbH"
--copyright "(C) 2016 - 2025 Skymatic GmbH"
--app-version "${{ needs.get-version.outputs.semVerNum }}"
--java-options "--enable-preview"
--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac"
--java-options "-Xss5m"
--java-options "-Xmx256m"
--java-options "-Dfile.encoding=\"utf-8\""
--java-options "-Djava.net.useSystemProxies=true"
--java-options "-Dapple.awt.enableTemplateImages=true"
--java-options "-Dsun.java2d.metal=true"
--java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
--java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/Cryptomator\""
--java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/Cryptomator/Plugins\""
--java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/Cryptomator/settings.json\""
--java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/Cryptomator/key.p12\""
--java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/Cryptomator/ipc.socket\""
--java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"Cryptomator\""
--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Library/Application Support/Cryptomator/mnt\""
--java-options "-Dcryptomator.showTrayIcon=true"
--java-options "-Dcryptomator.updateMechanism=org.cryptomator.macos.update.DmgUpdateMechanism"
--java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\""
--mac-package-identifier org.cryptomator
--resource-dir dist/mac/resources
- name: Patch Cryptomator.app
run: |
mv appdir/Cryptomator.app Cryptomator.app
mv dist/mac/resources/Cryptomator-Vault.icns Cryptomator.app/Contents/Resources/
sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist
sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist
echo -n "$PROVISIONING_PROFILE_BASE64" | base64 --decode --output Cryptomator.app/Contents/embedded.provisionprofile
env:
VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
REVISION_NO: ${{ needs.get-version.outputs.revNum }}
PROVISIONING_PROFILE_BASE64: ${{ secrets.MACOS_PROVISIONING_PROFILE_BASE64 }}
- name: Build and install DockTilePlugin
env:
DERIVED_DATA_PATH: dist/mac/DockTilePlugin/build
run: |
xcodebuild -project dist/mac/DockTilePlugin/DockTilePlugin.xcodeproj \
-scheme DockTilePlugin \
-configuration Release \
-destination "platform=macOS,arch=x86_64" \
-derivedDataPath ${DERIVED_DATA_PATH} \
-quiet \
clean build
mkdir -p Cryptomator.app/Contents/PlugIns
cp -R ${DERIVED_DATA_PATH}/Build/Products/Release/Cryptomator.docktileplugin Cryptomator.app/Contents/PlugIns/
rm -rf ${DERIVED_DATA_PATH}
- name: Generate license for dmg
run: >
mvn -B license:add-third-party
-Dlicense.thirdPartyFilename=license.rtf
-Dlicense.outputDirectory=dist/mac/dmg/resources
-Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl
-Dlicense.includedScopes=compile
-Dlicense.excludedGroups=^org\.cryptomator
-Dlicense.failOnMissing=true
-Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
- name: Install codesign certificate
run: |
# create variables
CERTIFICATE_PATH=$RUNNER_TEMP/codesign.p12
KEYCHAIN_PATH=$RUNNER_TEMP/codesign.keychain-db
# import certificate and provisioning profile from secrets
echo -n "$CODESIGN_P12_BASE64" | base64 --decode --output $CERTIFICATE_PATH
# create temporary keychain
security create-keychain -p "$CODESIGN_TMP_KEYCHAIN_PW" $KEYCHAIN_PATH
security set-keychain-settings -lut 900 $KEYCHAIN_PATH
security unlock-keychain -p "$CODESIGN_TMP_KEYCHAIN_PW" $KEYCHAIN_PATH
# import certificate to keychain
security import $CERTIFICATE_PATH -P "$CODESIGN_P12_PW" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
env:
CODESIGN_P12_BASE64: ${{ secrets.MACOS_CODESIGN_P12_BASE64 }}
CODESIGN_P12_PW: ${{ secrets.MACOS_CODESIGN_P12_PW }}
CODESIGN_TMP_KEYCHAIN_PW: ${{ secrets.MACOS_CODESIGN_TMP_KEYCHAIN_PW }}
- name: Codesign
run: |
echo "Codesigning jdk files..."
find Cryptomator.app/Contents/runtime/Contents/Home/lib/ -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
find Cryptomator.app/Contents/runtime/Contents/Home/lib/ \( -name 'jspawnhelper' -o -name 'pauseengine' -o -name 'simengine' \) -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \;
echo "Codesigning jar contents..."
find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
for JAR_PATH in `find Cryptomator.app -name "*.jar"`; do
if [[ `unzip -l ${JAR_PATH} | grep '.dylib\|.jnilib'` ]]; then
JAR_FILENAME=$(basename ${JAR_PATH})
OUTPUT_PATH=${JAR_PATH%.*}
echo "Codesigning libs in ${JAR_FILENAME}..."
unzip -q ${JAR_PATH} -d ${OUTPUT_PATH}
find ${OUTPUT_PATH} -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
find ${OUTPUT_PATH} -name '*.jnilib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
rm ${JAR_PATH}
pushd ${OUTPUT_PATH} > /dev/null
zip -qr ../${JAR_FILENAME} *
popd > /dev/null
rm -r ${OUTPUT_PATH}
fi
done
echo "Codesigning Cryptomator.app..."
sed -i '' "s|###APP_IDENTIFIER_PREFIX###|${TEAM_IDENTIFIER}.|g" dist/mac/Cryptomator.entitlements
sed -i '' "s|###TEAM_IDENTIFIER###|${TEAM_IDENTIFIER}|g" dist/mac/Cryptomator.entitlements
codesign --force --deep --entitlements dist/mac/Cryptomator.entitlements -o runtime -s ${CODESIGN_IDENTITY} Cryptomator.app
env:
CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
TEAM_IDENTIFIER: ${{ secrets.MACOS_TEAM_IDENTIFIER }}
- name: Prepare .dmg contents
run: |
mkdir dmg
mv Cryptomator.app dmg
cp dist/mac/dmg/resources/${{ matrix.fuse-lib }}.webloc dmg
ls -l dmg
- name: Install create-dmg
run: |
brew install create-dmg
create-dmg --help
- name: Create .dmg
run: >
create-dmg
--volname Cryptomator
--volicon "dist/mac/dmg/resources/Cryptomator-Volume.icns"
--background "dist/mac/dmg/resources/Cryptomator-${{ matrix.fuse-lib }}-background.tiff"
--window-pos 400 100
--window-size 640 694
--icon-size 128
--icon "Cryptomator.app" 128 245
--hide-extension "Cryptomator.app"
--icon "${{ matrix.fuse-lib }}.webloc" 320 501
--hide-extension "${{ matrix.fuse-lib }}.webloc"
--app-drop-link 512 245
--eula "dist/mac/dmg/resources/license.rtf"
--icon ".background" 128 758
--icon ".VolumeIcon.icns" 512 758
Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg
env:
VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
- name: Codesign .dmg
run: |
codesign -s ${CODESIGN_IDENTITY} --timestamp Cryptomator-*.dmg
env:
CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
- name: Notarize .dmg
if: startsWith(github.ref, 'refs/tags/') || inputs.notarize
uses: cocoalibs/xcode-notarization-action@5cf433d494b6fa26504b574c591f4dd120388846 # v1.0.3
with:
app-path: 'Cryptomator-*.dmg'
apple-id: ${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}
password: ${{ secrets.MACOS_NOTARIZATION_PW }}
team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
xcode-path: '/Applications/Xcode_16.app'
- name: Add possible alpha/beta tags to installer name
run: mv Cryptomator-*.dmg Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg
- name: Create detached GPG signature with key 615D449FE6E6A235
run: |
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a Cryptomator-*.dmg
env:
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- name: Clean up codesign certificate
if: ${{ always() }}
run: security delete-keychain $RUNNER_TEMP/codesign.keychain-db
continue-on-error: true
- name: Upload artifacts
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
with:
name: dmg-${{ matrix.output-suffix }}
path: |
Cryptomator-*.dmg
Cryptomator-*.asc
if-no-files-found: error
- name: Publish dmg on GitHub Releases
if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
with:
fail_on_unmatched_files: true
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
files: |
Cryptomator-*.dmg
Cryptomator-*.asc
+300
View File
@@ -0,0 +1,300 @@
name: Build macOS .dmg for arm64
on:
release:
types: [published]
workflow_dispatch:
inputs:
version:
description: 'Version'
required: false
notarize:
description: 'Notarize'
required: true
default: false
type: boolean
push:
branches-ignore:
- 'dependabot/**'
paths:
- '.github/workflows/mac-dmg.yml'
- 'dist/mac/**'
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: '25.0.1+8.0.LTS'
jobs:
get-version:
uses: ./.github/workflows/get-version.yml
with:
version: ${{ inputs.version }}
build:
name: Build Cryptomator.app for ${{ matrix.output-suffix }}
runs-on: ${{ matrix.os }}
needs: [get-version]
strategy:
fail-fast: false
matrix:
include:
- os: macos-15
architecture: aarch64
output-suffix: arm64
fuse-lib: FUSE-T
openjfx-url: 'https://download2.gluonhq.com/openjfx/25/openjfx-25_osx-aarch64_bin-jmods.zip'
openjfx-sha: '13f8c0513c40c95881479fbcf0465a29a60217393fb0656f5e4eab78a9442fba'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
architecture: ${{ matrix.architecture }}
check-latest: true
cache: 'maven'
- name: Download OpenJFX jmods
id: download-jmods
run: |
curl -L ${{ matrix.openjfx-url }} -o openjfx-jmods.zip
echo "${{ matrix.openjfx-sha }} *openjfx-jmods.zip" | shasum -a256 --check
mkdir -p openjfx-jmods/
unzip -jo openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
- name: Ensure major jfx version in pom and in jmods is the same
run: |
JMOD_VERSION=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
JMOD_VERSION=${JMOD_VERSION#*@}
JMOD_VERSION=${JMOD_VERSION%%.*}
POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
POM_JFX_VERSION=${POM_JFX_VERSION#*@}
POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
if [ "${POM_JFX_VERSION}" -ne "${JMOD_VERSION}" ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != jmod version (${JMOD_VERSION})"
exit 1
fi
- name: Set version
run : mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
- name: Run maven
run: mvn -B clean package -Pmac -DskipTests
- name: Patch target dir
run: |
cp LICENSE.txt target
cp target/cryptomator-*.jar target/mods
- name: Run jlink with help option
id: jep-493-check
run: |
JMOD_PATHS="openjfx-jmods"
if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
fi
echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
- name: Run jlink
#Remark: no compression is applied for improved build compression later (here dmg)
run: >
${JAVA_HOME}/bin/jlink
--verbose
--output runtime
--module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
--strip-native-commands
--no-header-files
--no-man-pages
--strip-debug
--compress zip-0
- name: Run jpackage
run: >
${JAVA_HOME}/bin/jpackage
--verbose
--type app-image
--runtime-image runtime
--input target/libs
--module-path target/mods
--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
--dest appdir
--name Cryptomator
--vendor "Skymatic GmbH"
--copyright "(C) 2016 - 2025 Skymatic GmbH"
--app-version "${{ needs.get-version.outputs.semVerNum }}"
--java-options "--enable-preview"
--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac"
--java-options "-Xss5m"
--java-options "-Xmx256m"
--java-options "-Dfile.encoding=\"utf-8\""
--java-options "-Djava.net.useSystemProxies=true"
--java-options "-Dapple.awt.enableTemplateImages=true"
--java-options "-Dsun.java2d.metal=true"
--java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
--java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/Cryptomator\""
--java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/Cryptomator/Plugins\""
--java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/Cryptomator/settings.json\""
--java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/Cryptomator/key.p12\""
--java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/Cryptomator/ipc.socket\""
--java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"Cryptomator\""
--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Library/Application Support/Cryptomator/mnt\""
--java-options "-Dcryptomator.showTrayIcon=true"
--java-options "-Dcryptomator.updateMechanism=org.cryptomator.macos.update.DmgUpdateMechanism"
--java-options "-Dcryptomator.buildNumber=\"dmg-${{ needs.get-version.outputs.revNum }}\""
--java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log"
--mac-package-identifier org.cryptomator
--resource-dir dist/mac/resources
- name: Patch Cryptomator.app
run: |
mv appdir/Cryptomator.app Cryptomator.app
mv dist/mac/resources/Cryptomator-Vault.icns Cryptomator.app/Contents/Resources/
sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" Cryptomator.app/Contents/Info.plist
sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" Cryptomator.app/Contents/Info.plist
echo -n "$PROVISIONING_PROFILE_BASE64" | base64 --decode --output Cryptomator.app/Contents/embedded.provisionprofile
env:
VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
REVISION_NO: ${{ needs.get-version.outputs.revNum }}
PROVISIONING_PROFILE_BASE64: ${{ secrets.MACOS_PROVISIONING_PROFILE_BASE64 }}
- name: Build and install DockTilePlugin
env:
DERIVED_DATA_PATH: dist/mac/DockTilePlugin/build
run: |
xcodebuild -project dist/mac/DockTilePlugin/DockTilePlugin.xcodeproj \
-scheme DockTilePlugin \
-configuration Release \
-destination "platform=macOS,arch=arm64" \
-derivedDataPath ${DERIVED_DATA_PATH} \
-quiet \
clean build
mkdir -p Cryptomator.app/Contents/PlugIns
cp -R ${DERIVED_DATA_PATH}/Build/Products/Release/Cryptomator.docktileplugin Cryptomator.app/Contents/PlugIns/
rm -rf ${DERIVED_DATA_PATH}
- name: Generate license for dmg
run: >
mvn -B license:add-third-party
-Dlicense.thirdPartyFilename=license.rtf
-Dlicense.outputDirectory=dist/mac/dmg/resources
-Dlicense.fileTemplate=dist/mac/dmg/resources/licenseTemplate.ftl
-Dlicense.includedScopes=compile
-Dlicense.excludedGroups=^org\.cryptomator
-Dlicense.failOnMissing=true
-Dlicense.licenseMergesUrl=file://${{ github.workspace }}/license/merges
- name: Install codesign certificate
run: |
# create variables
CERTIFICATE_PATH=$RUNNER_TEMP/codesign.p12
KEYCHAIN_PATH=$RUNNER_TEMP/codesign.keychain-db
# import certificate and provisioning profile from secrets
echo -n "$CODESIGN_P12_BASE64" | base64 --decode --output $CERTIFICATE_PATH
# create temporary keychain
security create-keychain -p "$CODESIGN_TMP_KEYCHAIN_PW" $KEYCHAIN_PATH
security set-keychain-settings -lut 900 $KEYCHAIN_PATH
security unlock-keychain -p "$CODESIGN_TMP_KEYCHAIN_PW" $KEYCHAIN_PATH
# import certificate to keychain
security import $CERTIFICATE_PATH -P "$CODESIGN_P12_PW" -A -t cert -f pkcs12 -k $KEYCHAIN_PATH
security list-keychain -d user -s $KEYCHAIN_PATH
env:
CODESIGN_P12_BASE64: ${{ secrets.MACOS_CODESIGN_P12_BASE64 }}
CODESIGN_P12_PW: ${{ secrets.MACOS_CODESIGN_P12_PW }}
CODESIGN_TMP_KEYCHAIN_PW: ${{ secrets.MACOS_CODESIGN_TMP_KEYCHAIN_PW }}
- name: Codesign
run: |
echo "Codesigning jdk files..."
find Cryptomator.app/Contents/runtime/Contents/Home/lib/ -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
find Cryptomator.app/Contents/runtime/Contents/Home/lib/ \( -name 'jspawnhelper' -o -name 'pauseengine' -o -name 'simengine' \) -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \;
echo "Codesigning jar contents..."
find Cryptomator.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
for JAR_PATH in `find Cryptomator.app -name "*.jar"`; do
if [[ `unzip -l ${JAR_PATH} | grep '.dylib\|.jnilib'` ]]; then
JAR_FILENAME=$(basename ${JAR_PATH})
OUTPUT_PATH=${JAR_PATH%.*}
echo "Codesigning libs in ${JAR_FILENAME}..."
unzip -q ${JAR_PATH} -d ${OUTPUT_PATH}
find ${OUTPUT_PATH} -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
find ${OUTPUT_PATH} -name '*.jnilib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
rm ${JAR_PATH}
pushd ${OUTPUT_PATH} > /dev/null
zip -qr ../${JAR_FILENAME} *
popd > /dev/null
rm -r ${OUTPUT_PATH}
fi
done
echo "Codesigning Cryptomator.app..."
sed -i '' "s|###APP_IDENTIFIER_PREFIX###|${TEAM_IDENTIFIER}.|g" dist/mac/Cryptomator.entitlements
sed -i '' "s|###TEAM_IDENTIFIER###|${TEAM_IDENTIFIER}|g" dist/mac/Cryptomator.entitlements
codesign --force --deep --entitlements dist/mac/Cryptomator.entitlements -o runtime -s ${CODESIGN_IDENTITY} Cryptomator.app
env:
CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
TEAM_IDENTIFIER: ${{ secrets.MACOS_TEAM_IDENTIFIER }}
- name: Prepare .dmg contents
run: |
mkdir dmg
mv Cryptomator.app dmg
cp dist/mac/dmg/resources/${{ matrix.fuse-lib }}.webloc dmg
ls -l dmg
- name: Install create-dmg
run: |
brew install create-dmg
create-dmg --help
- name: Create .dmg
run: >
create-dmg
--volname Cryptomator
--volicon "dist/mac/dmg/resources/Cryptomator-Volume.icns"
--background "dist/mac/dmg/resources/Cryptomator-${{ matrix.fuse-lib }}-background.tiff"
--window-pos 400 100
--window-size 640 694
--icon-size 128
--icon "Cryptomator.app" 128 245
--hide-extension "Cryptomator.app"
--icon "${{ matrix.fuse-lib }}.webloc" 320 501
--hide-extension "${{ matrix.fuse-lib }}.webloc"
--app-drop-link 512 245
--eula "dist/mac/dmg/resources/license.rtf"
--icon ".background" 128 758
--icon ".VolumeIcon.icns" 512 758
Cryptomator-${VERSION_NO}-${{ matrix.output-suffix }}.dmg dmg
env:
VERSION_NO: ${{ needs.get-version.outputs.semVerNum }}
- name: Codesign .dmg
run: |
codesign -s ${CODESIGN_IDENTITY} --timestamp Cryptomator-*.dmg
env:
CODESIGN_IDENTITY: ${{ secrets.MACOS_CODESIGN_IDENTITY }}
- name: Notarize .dmg
if: startsWith(github.ref, 'refs/tags/') || inputs.notarize
uses: cocoalibs/xcode-notarization-action@5cf433d494b6fa26504b574c591f4dd120388846 # v1.0.3
with:
app-path: 'Cryptomator-*.dmg'
apple-id: ${{ secrets.MACOS_NOTARIZATION_APPLE_ID }}
password: ${{ secrets.MACOS_NOTARIZATION_PW }}
team-id: ${{ secrets.MACOS_NOTARIZATION_TEAM_ID }}
xcode-path: '/Applications/Xcode_16.app'
- name: Add possible alpha/beta tags to installer name
run: mv Cryptomator-*.dmg Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.output-suffix }}.dmg
- name: Create detached GPG signature with key 615D449FE6E6A235
run: |
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a Cryptomator-*.dmg
env:
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- name: Clean up codesign certificate
if: ${{ always() }}
run: security delete-keychain $RUNNER_TEMP/codesign.keychain-db
continue-on-error: true
- name: Upload artifacts
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
with:
name: dmg-${{ matrix.output-suffix }}
path: |
Cryptomator-*.dmg
Cryptomator-*.asc
if-no-files-found: error
- name: Publish dmg on GitHub Releases
if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
with:
fail_on_unmatched_files: true
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
files: |
Cryptomator-*.dmg
Cryptomator-*.asc
+22
View File
@@ -0,0 +1,22 @@
# Configuration for close-stale-issues - https://github.com/marketplace/actions/close-stale-issues
name: 'Close awaiting response issues'
on:
schedule:
- cron: '00 09 * * *'
jobs:
no-response:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
with:
days-before-stale: 14
days-before-close: 0
days-before-pr-close: -1
stale-issue-label: 'state:stale'
close-issue-message: "This issue has been automatically closed because there has been no response to our request for more information from the original author. With only the information that is currently in the issue, we don't have enough information to take action. Please reach out if you have or find the answers we need so that we can investigate further."
only-labels: 'state:awaiting-response'
+39
View File
@@ -0,0 +1,39 @@
name: Post Release Publish Tasks
on:
release:
types: [published]
jobs:
get-version:
runs-on: ubuntu-latest
steps:
- name: Download source tarball
run: |
curl -L -H "Accept: application/vnd.github+json" https://github.com/cryptomator/cryptomator/archive/refs/tags/${{ github.event.release.tag_name }}.tar.gz --output cryptomator-${{ github.event.release.tag_name }}.tar.gz
- name: Sign source tarball with key 615D449FE6E6A235
run: |
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a cryptomator-*.tar.gz
env:
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- name: Publish asc on GitHub Releases
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
with:
fail_on_unmatched_files: true
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
files: |
cryptomator-*.tar.gz.asc
- name: Slack Notification
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: 'Cryptobot'
SLACK_ICON: false
SLACK_ICON_EMOJI: ':bot:'
SLACK_CHANNEL: 'cryptomator-desktop'
SLACK_TITLE: "Release ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} published."
SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/debian.yml|build deb Package>."
SLACK_FOOTER: false
MSG_MINIMAL: true
+26
View File
@@ -0,0 +1,26 @@
name: Pull Request
on:
pull_request:
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: 25
defaults:
run:
shell: bash
jobs:
test:
name: Compile and Test
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
cache: 'maven'
- name: Build and Test
run: xvfb-run mvn -B clean install jacoco:report -Pcoverage
+65
View File
@@ -0,0 +1,65 @@
name: Release Check
on:
push:
branches:
- 'release/**'
- 'hotfix/**'
defaults:
run:
shell: bash
env:
JAVA_DIST: 'temurin'
JAVA_VERSION: 25
jobs:
check-preconditions:
name: Validate commits pushed to release/hotfix branch to fulfill release requirements
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ env.JAVA_DIST }}
java-version: ${{ env.JAVA_VERSION }}
cache: 'maven'
- id: validate-pom-version
name: Validate POM version
run: |
if [[ $GITHUB_REF =~ refs/heads/(hotfix|release)/[0-9]+\.[0-9]+\.[0-9]+.* ]]; then
SEM_VER_STR=${GITHUB_REF##*/}
else
echo "Failed to parse version"
exit 1
fi
if [[ ${SEM_VER_STR} == `mvn help:evaluate -Dexpression=project.version -q -DforceStdout` ]]; then
echo "semVerStr=${SEM_VER_STR}" >> $GITHUB_OUTPUT
else
echo "Version not set in POM"
exit 1
fi
- name: Validate release in org.cryptomator.Cryptomator.metainfo.xml file
run: |
if ! grep -q "<release date=\".*\" version=\"${{ steps.validate-pom-version.outputs.semVerStr }}\">" dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml; then
echo "Release not set in dist/linux/common/org.cryptomator.Cryptomator.metainfo.xml"
exit 1
fi
- name: Cache NVD DB
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
with:
path: ~/.m2/repository/org/owasp/dependency-check-data/
key: dependency-check-${{ github.run_id }}
restore-keys: |
dependency-check
env:
SEGMENT_DOWNLOAD_TIMEOUT_MINS: 5
- name: Run org.owasp:dependency-check plugin
id: dependency-check
continue-on-error: true
run: mvn -B verify -Pdependency-check -DskipTests
env:
NVD_API_KEY: ${{ secrets.NVD_API_KEY }}
+24
View File
@@ -0,0 +1,24 @@
# Configuration for close-stale-issues - https://github.com/marketplace/actions/close-stale-issues
name: 'Close stale issues'
on:
schedule:
- cron: '00 09 * * *'
jobs:
stale:
runs-on: ubuntu-latest
permissions:
issues: write
pull-requests: write
steps:
- uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
with:
days-before-stale: 365
days-before-close: 90
exempt-issue-labels: 'type:security-issue,type:feature-request,type:enhancement,type:upstream-bug,state:awaiting-response,state:blocked,state:confirmed'
exempt-all-milestones: true
stale-issue-label: 'state:stale'
stale-pr-label: 'state:stale'
stale-issue-message: 'This issue has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
stale-pr-message: 'This PR has been automatically marked as stale because it has not had recent activity. It will be closed if no further activity occurs. Thank you for your contributions.'
+485
View File
@@ -0,0 +1,485 @@
name: Build Windows Installer
on:
release:
types: [published]
workflow_dispatch:
inputs:
version:
description: 'Version'
required: false
sign:
description: 'Sign binaries'
required: false
type: boolean
default: false
push:
branches-ignore:
- 'dependabot/**'
paths:
- '.github/workflows/win-exe.yml'
- 'dist/win/**'
env:
OPENJFX_JMODS_AMD64: 'https://download2.gluonhq.com/openjfx/25/openjfx-25_windows-x64_bin-jmods.zip'
OPENJFX_JMODS_AMD64_HASH: 'c8eb9fd039b00e0020cf6c3db8ed7876bf3ee4d27860aa697a247b83b8296ae7'
WINFSP_MSI: 'https://github.com/winfsp/winfsp/releases/download/v2.1/winfsp-2.1.25156.msi'
WINFSP_MSI_HASH: '073a70e00f77423e34bed98b86e600def93393ba5822204fac57a29324db9f7a'
WINFSP_UNINSTALLER: 'https://github.com/cryptomator/winfsp-uninstaller/releases/latest/download/winfsp-uninstaller.exe'
defaults:
run:
shell: bash
jobs:
get-version:
uses: ./.github/workflows/get-version.yml
with:
version: ${{ inputs.version }}
build-msi:
name: Build .msi Installer
runs-on: ${{ matrix.os }}
needs: [ get-version ]
strategy:
matrix:
include:
- arch: x64
os: windows-latest
java-dist: 'zulu' #cannot use temurin, see https://github.com/cryptomator/cryptomator/issues/3824#issuecomment-2829827427
java-version: '25.0.1+8'
java-package: 'jdk'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ matrix.java-dist }}
java-version: ${{ matrix.java-version }}
java-package: ${{ matrix.java-package }}
check-latest: true
cache: 'maven'
- name: Install wix and extensions
run: |
dotnet tool install --global wix --version 6.0.0
wix.exe extension add WixToolset.UI.wixext/6.0.0 --global
wix.exe extension add WixToolset.Util.wixext/6.0.0 --global
- name: Download and extract JavaFX jmods from Gluon
if: matrix.arch == 'x64'
#In the last step we move all jmods files a dir level up because jmods are placed inside a directory in the zip
run: |
curl --output openjfx-jmods.zip -L "${{ env.OPENJFX_JMODS_AMD64 }}"
if(!(Get-FileHash -Path openjfx-jmods.zip -Algorithm SHA256).Hash.ToLower().equals("${{ env.OPENJFX_JMODS_AMD64_HASH }}")) {
throw "Wrong checksum of JMOD archive downloaded from ${{ env.OPENJFX_JMODS_AMD64 }}.";
}
Expand-Archive -Path openjfx-jmods.zip -DestinationPath openjfx-jmods
Get-ChildItem -Path openjfx-jmods -Recurse -Filter "*.jmod" | ForEach-Object { Move-Item -Path $_ -Destination $_.Directory.Parent}
shell: pwsh
- name: Ensure major jfx version in pom and in jmods is the same
if: matrix.arch == 'x64'
run: |
JMOD_VERSION_AMD64=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64#*@}
JMOD_VERSION_AMD64=${JMOD_VERSION_AMD64%%.*}
POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
POM_JFX_VERSION=${POM_JFX_VERSION#*@}
POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
if [ $POM_JFX_VERSION -ne $JMOD_VERSION_AMD64 ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != amd64 jmod version (${JMOD_VERSION_AMD64})"
exit 1
fi
- name: Set version
run: mvn versions:set -DnewVersion=${{ needs.get-version.outputs.semVerStr }}
- name: Run maven
run: mvn -B clean package -Pwin -DskipTests
- name: Patch target dir
run: |
cp LICENSE.txt target
cp target/cryptomator-*.jar target/mods
- name: Run jlink with help option
id: jep-493-check
run: |
JMOD_PATHS="openjfx-jmods"
if ! $(${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"); then
JMOD_PATHS="${JAVA_HOME}/jmods;${JMOD_PATHS}"
fi
echo "jmod_paths=${JMOD_PATHS}" >> "$GITHUB_OUTPUT"
- name: Run jlink
# Remark: no compression is applied for improved build compression later (here msi)
run: >
${JAVA_HOME}/bin/jlink
--verbose
--output runtime
--module-path "${{ steps.jep-493-check.outputs.jmod_paths }}"
--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.crypto.mscapi,jdk.unsupported,jdk.accessibility,jdk.management.jfr,java.compiler
--strip-native-commands
--no-header-files
--no-man-pages
--strip-debug
--compress zip-0
- name: Run jpackage
run: >
${JAVA_HOME}/bin/jpackage
--verbose
--type app-image
--runtime-image runtime
--input target/libs
--module-path target/mods
--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator
--dest appdir
--name Cryptomator
--vendor "Skymatic GmbH"
--copyright "(C) 2016 - 2025 Skymatic GmbH"
--app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum }}"
--java-options "--enable-preview"
--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.win,org.cryptomator.integrations.win"
--java-options "-Xss5m"
--java-options "-Xmx256m"
--java-options "-Dcryptomator.appVersion=\"${{ needs.get-version.outputs.semVerStr }}\""
--java-options "-Dfile.encoding=\"utf-8\""
--java-options "-Djava.net.useSystemProxies=true"
--java-options "-Dcryptomator.logDir=\"@{localappdata}/Cryptomator\""
--java-options "-Dcryptomator.pluginDir=\"@{appdata}/Cryptomator/Plugins\""
--java-options "-Dcryptomator.settingsPath=\"@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json\""
--java-options "-Dcryptomator.p12Path=\"@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12\""
--java-options "-Dcryptomator.ipcSocketPath=\"@{localappdata}/Cryptomator/ipc.socket\""
--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Cryptomator\""
--java-options "-Dcryptomator.loopbackAlias=\"cryptomator-vault\""
--java-options "-Dcryptomator.showTrayIcon=true"
--java-options "-Dcryptomator.buildNumber=\"msi-${{ needs.get-version.outputs.revNum }}\""
--java-options "-Dcryptomator.integrationsWin.autoStartShellLinkName=\"Cryptomator\""
--java-options "-Dcryptomator.integrationsWin.keychainPaths=\"@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json\""
--java-options "-Dcryptomator.integrationsWin.windowsHelloKeychainPaths=\"@{appdata}/Cryptomator/windowsHelloKeychain.json\""
--java-options "-Dcryptomator.disableUpdateCheck=false"
--java-options "-XX:ErrorFile=C:/cryptomator/cryptomator_crash.log"
--resource-dir dist/win/resources
--icon dist/win/resources/Cryptomator.ico
--add-launcher "Cryptomator (Debug)=dist/win/debug-launcher.properties"
- name: Patch Application Directory
run: |
cp dist/win/contrib/* appdir/Cryptomator
- name: Fix permissions
run: |
attrib -r appdir/Cryptomator/Cryptomator.exe
attrib -r "appdir/Cryptomator/Cryptomator (Debug).exe"
shell: pwsh
- name: Extract jars with DLLs for Codesigning
shell: pwsh
run: |
Add-Type -AssemblyName "System.io.compression.filesystem"
$jarFolder = Resolve-Path ".\appdir\Cryptomator\app\mods"
$jarExtractDir = New-Item -Path ".\appdir\jar-extract" -ItemType Directory
#for all jars inspect
Get-ChildItem -Path $jarFolder -Filter "*.jar" | ForEach-Object {
$jar = [Io.compression.zipfile]::OpenRead($_.FullName)
if (@($jar.Entries | Where-Object {$_.Name.ToString().EndsWith(".dll")} | Select-Object -First 1).Count -gt 0) {
#jars containing dlls extract
Set-Location $jarExtractDir
Expand-Archive -Path $_.FullName
}
$jar.Dispose()
}
- name: Extract wixhelper.dll for Codesigning #see https://github.com/cryptomator/cryptomator/issues/3130
shell: pwsh
run: |
New-Item -Path appdir/jpackage-jmod -ItemType Directory
& $env:JAVA_HOME\bin\jmod.exe extract --dir jpackage-jmod "${env:JAVA_HOME}\jmods\jdk.jpackage.jmod"
Get-ChildItem -Recurse -Path "jpackage-jmod" -File wixhelper.dll | Select-Object -Last 1 | Copy-Item -Destination "appdir"
- name: Sign DLLs with Azure Trusted Signing
if: inputs.sign || github.event_name == 'release'
uses: ./.github/actions/win-sign-action
with:
base-dir: ${{ github.workspace }}\appdir
recursive: true
append-signature: true
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Sign DLLs with Actalis CodeSigner
if: inputs.sign || github.event_name == 'release'
uses: skymatic/workflows/.github/actions/win-sign-action@1074588008ae3326a2221ea451783280518f0366 # no specific version
with:
base-dir: 'appdir'
file-extensions: 'dll,exe,ps1'
recursive: true
sign-description: 'Cryptomator'
sign-url: 'https://cryptomator.org'
username: ${{ secrets.WIN_CODESIGN_USERNAME }}
password: ${{ secrets.WIN_CODESIGN_PW }}
- name: Replace DLLs inside jars with signed ones
shell: pwsh
run: |
$jarExtractDir = Resolve-Path ".\appdir\jar-extract"
$jarFolder = Resolve-Path ".\appdir\Cryptomator\app\mods"
Get-ChildItem -Path $jarExtractDir | ForEach-Object {
$jarName = $_.Name
$jarFile = "${jarFolder}\${jarName}.jar"
Set-Location $_
Get-ChildItem -Path $_ -Recurse -File "*.dll" | ForEach-Object {
# update jar with signed dll
jar --file="$jarFile" --update $(Resolve-Path -Relative -Path $_)
}
}
- name: Generate license for MSI
run: >
mvn -B license:add-third-party
"-Dlicense.thirdPartyFilename=license.rtf"
"-Dlicense.outputDirectory=dist/win/resources"
"-Dlicense.fileTemplate=dist/win/resources/licenseTemplate.ftl"
"-Dlicense.includedScopes=compile"
"-Dlicense.excludedGroups=^org\.cryptomator"
"-Dlicense.failOnMissing=true"
"-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
shell: pwsh
- name: Create MSI
run: >
${JAVA_HOME}/bin/jpackage
--verbose
--type msi
--win-upgrade-uuid bda45523-42b1-4cae-9354-a45475ed4775
--app-image appdir/Cryptomator
--dest installer
--name Cryptomator
--vendor "Skymatic GmbH"
--copyright "(C) 2016 - 2025 Skymatic GmbH"
--app-version "${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum}}"
--win-menu
--win-dir-chooser
--win-shortcut-prompt
--win-update-url "https:\\cryptomator.org\downloads"
--win-menu-group Cryptomator
--resource-dir dist/win/resources
--license-file dist/win/resources/license.rtf
--file-associations dist/win/resources/FAvaultFile.properties
env:
JP_WIXWIZARD_RESOURCES: ${{ github.workspace }}/dist/win/resources # requires abs path, used in resources/main.wxs
JP_WIXHELPER_DIR: ${{ github.workspace }}\appdir
- name: Sign MSI with Azure Trusted Signing
if: inputs.sign || github.event_name == 'release'
uses: ./.github/actions/win-sign-action
with:
base-dir: ${{ github.workspace }}\installer
file-extensions: msi
description: 'Cryptomator Installer'
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Add possible alpha/beta tags and architecture to installer name
run: mv installer/Cryptomator-*.msi Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.arch }}.msi
- name: Create detached GPG signature with key 615D449FE6E6A235
run: |
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a Cryptomator-*.msi
env:
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- name: Upload artifacts
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
with:
name: msi-${{ matrix.arch }}
path: |
Cryptomator-*.msi
Cryptomator-*.asc
if-no-files-found: error
build-exe:
name: Build .exe installer
runs-on: ${{ matrix.os }}
needs: [ get-version, build-msi ]
strategy:
matrix:
include:
- arch: x64
os: windows-latest
executable-suffix: x64
java-dist: 'zulu'
java-version: '24.0.1+9'
java-package: 'jdk'
steps:
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
- name: Install wix and extensions
run: |
dotnet tool install --global wix --version 6.0.0
wix.exe extension add WixToolset.BootstrapperApplications.wixext/6.0.0 --global
wix.exe extension add WixToolset.Util.wixext/6.0.0 --global
- name: Download .msi
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
with:
name: msi-${{ matrix.arch }}
path: dist/win/bundle/resources
- name: Strip version info from msi file name
run: mv dist/win/bundle/resources/Cryptomator*.msi dist/win/bundle/resources/Cryptomator.msi
- name: Setup Java
uses: actions/setup-java@f2beeb24e141e01a676f977032f5a29d81c9e27e # v5.1.0
with:
distribution: ${{ matrix.java-dist }}
java-version: ${{ matrix.java-version }}
java-package: ${{ matrix.java-package }}
check-latest: true
cache: 'maven'
- name: Generate license for exe
run: >
mvn -B license:add-third-party
"-Dlicense.thirdPartyFilename=license.rtf"
"-Dlicense.fileTemplate=dist/win/bundle/resources/licenseTemplate.ftl"
"-Dlicense.outputDirectory=dist/win/bundle/resources"
"-Dlicense.includedScopes=compile"
"-Dlicense.excludedGroups=^org\.cryptomator"
"-Dlicense.failOnMissing=true"
"-Dlicense.licenseMergesUrl=file:///${{ github.workspace }}/license/merges"
shell: pwsh
- name: Download WinFsp
run: |
curl --output $env:WINFSP_PATH -L ${{ env.WINFSP_MSI }}
$computedHash = (Get-FileHash -Path $env:WINFSP_PATH -Algorithm SHA256).Hash.ToLower()
if ($computedHash -ne "${{ env.WINFSP_MSI_HASH }}") {
throw "Checksum mismatch for $env:WINFSP_PATH (expected ${{ env.WINFSP_MSI_HASH }}, got $computedHash)."
}
env:
WINFSP_PATH: 'dist/win/bundle/resources/winfsp.msi'
shell: pwsh
- name: Download Legacy-WinFsp uninstaller
run: |
curl --output dist/win/bundle/resources/winfsp-uninstaller.exe -L ${{ env.WINFSP_UNINSTALLER }}
shell: pwsh
- name: Create Wix Burn bundle
working-directory: dist/win
run: >
wix build
-define BundleName="Cryptomator"
-define BundleVersion="${{ needs.get-version.outputs.semVerNum }}.${{ needs.get-version.outputs.revNum}}"
-define BundleVendor="Skymatic GmbH"
-define BundleCopyright="(C) 2016 - 2025 Skymatic GmbH"
-define AboutUrl="https://cryptomator.org"
-define HelpUrl="https://cryptomator.org/contact"
-define UpdateUrl="https://cryptomator.org/downloads/"
-ext "WixToolset.Util.wixext"
-ext "WixToolset.BootstrapperApplications.wixext"
./bundle/bundleWithWinfsp.wxs
-out "../../installer/unsigned/Cryptomator-Installer.exe"
- name: Detach burn engine in preparation to sign
run: >
wix burn detach installer/unsigned/Cryptomator-Installer.exe -engine tmp/engine.exe
- name: Sign WiX burn engine with Azure Trusted Signing
if: inputs.sign || github.event_name == 'release'
uses: ./.github/actions/win-sign-action
with:
base-dir: ${{ github.workspace }}\tmp
file-extensions: exe
append-signature: true
description: 'Cryptomator Bundle Installer'
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Sign burn engine with Actalis CodeSigner
if: inputs.sign || github.event_name == 'release'
uses: skymatic/workflows/.github/actions/win-sign-action@1074588008ae3326a2221ea451783280518f0366 # no specific version
with:
base-dir: 'tmp'
file-extensions: 'exe'
sign-description: 'Cryptomator Bundle Installer'
sign-url: 'https://cryptomator.org'
username: ${{ secrets.WIN_CODESIGN_USERNAME }}
password: ${{ secrets.WIN_CODESIGN_PW }}
- name: Reattach signed burn engine to installer
run: >
wix burn reattach installer/unsigned/Cryptomator-Installer.exe -engine tmp/engine.exe -o installer/Cryptomator-Installer.exe
- name: Sign EXE installer with Azure Trusted Signing
if: inputs.sign || github.event_name == 'release'
uses: ./.github/actions/win-sign-action
with:
base-dir: ${{ github.workspace }}\installer
file-extensions: exe
append-signature: true
description: 'Cryptomator Bundle Installer'
tenant-id: ${{ secrets.AZURE_TENANT_ID }}
client-id: ${{ secrets.AZURE_CLIENT_ID }}
client-secret: ${{ secrets.AZURE_CLIENT_SECRET }}
- name: Sign installer with Actalis CodeSigner
if: inputs.sign || github.event_name == 'release'
uses: skymatic/workflows/.github/actions/win-sign-action@1074588008ae3326a2221ea451783280518f0366 # no specific version
with:
base-dir: 'installer'
file-extensions: 'exe'
sign-description: 'Cryptomator Bundle Installer'
sign-url: 'https://cryptomator.org'
username: ${{ secrets.WIN_CODESIGN_USERNAME }}
password: ${{ secrets.WIN_CODESIGN_PW }}
- name: Add possible alpha/beta tags to installer name
run: mv installer/Cryptomator-Installer.exe Cryptomator-${{ needs.get-version.outputs.semVerStr }}-${{ matrix.executable-suffix }}.exe
- name: Create detached GPG signature with key 615D449FE6E6A235
run: |
echo "${GPG_PRIVATE_KEY}" | gpg --batch --quiet --import
echo "${GPG_PASSPHRASE}" | gpg --batch --quiet --passphrase-fd 0 --pinentry-mode loopback -u 615D449FE6E6A235 --detach-sign -a Cryptomator-*.exe
env:
GPG_PRIVATE_KEY: ${{ secrets.RELEASES_GPG_PRIVATE_KEY }}
GPG_PASSPHRASE: ${{ secrets.RELEASES_GPG_PASSPHRASE }}
- name: Upload artifacts
uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
with:
name: exe-${{ matrix.executable-suffix }}
path: |
Cryptomator-*.exe
Cryptomator-*.asc
if-no-files-found: error
publish:
name: Publish installers to the github release
if: startsWith(github.ref, 'refs/tags/') && github.event.action == 'published'
runs-on: ubuntu-latest
needs: [ build-msi, build-exe ]
outputs:
download-url-msi-x64: ${{ fromJSON(steps.publish.outputs.assets)[0].browser_download_url }}
download-url-exe-x64: ${{ fromJSON(steps.publish.outputs.assets)[2].browser_download_url }}
steps:
- name: Download installers
uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
with:
merge-multiple: true
- name: Publish installers on GitHub Releases
id: publish
uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
with:
fail_on_unmatched_files: true
token: ${{ secrets.CRYPTOBOT_RELEASE_TOKEN }}
# do not change ordering of filelist, required for correct job output
files: |
*x64.msi
*x64.exe
*.asc
allowlist-msi-x64:
uses: ./.github/workflows/av-whitelist.yml
needs: [ publish ]
with:
url: ${{ needs.publish.outputs.download-url-msi-x64 }}
secrets: inherit
allowlist-exe-x64:
uses: ./.github/workflows/av-whitelist.yml
needs: [ publish, allowlist-msi-x64 ]
with:
url: ${{ needs.publish.outputs.download-url-exe-x64 }}
secrets: inherit
notify-winget:
name: Notify for winget-release
if: needs.get-version.outputs.versionType == 'stable'
needs: [publish, get-version]
runs-on: ubuntu-latest
steps:
- name: Slack Notification
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2.3.3
env:
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
SLACK_USERNAME: 'Cryptobot'
SLACK_ICON: false
SLACK_ICON_EMOJI: ':bot:'
SLACK_CHANNEL: 'cryptomator-desktop'
SLACK_TITLE: "MSI packages of ${{ github.event.repository.name }} ${{ github.event.release.tag_name }} published."
SLACK_MESSAGE: "Ready to <https://github.com/${{ github.repository }}/actions/workflows/winget.yml| release them to winget>."
SLACK_FOOTER: false
MSG_MINIMAL: true
+27
View File
@@ -0,0 +1,27 @@
name: Publish MSI to winget-pkgs
on:
workflow_dispatch:
inputs:
tag:
description: 'Release tag'
required: true
jobs:
winget:
name: Publish winget package
runs-on: windows-latest
steps:
- name: Sync winget-pkgs fork
run: |
gh repo sync cryptomator/winget-pkgs -b master --force
env:
GH_TOKEN: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
- name: Submit package
uses: vedantmgoyal2009/winget-releaser@19e706d4c9121098010096f9c495a70a7518b30f # no_specific_version
with:
identifier: Cryptomator.Cryptomator
version: ${{ inputs.tag }}
release-tag: ${{ inputs.tag }}
installers-regex: '-x64\.msi$'
token: ${{ secrets.CRYPTOBOT_PR_TOKEN }}
+5 -5
View File
@@ -5,9 +5,9 @@
*.war
*.ear
# Eclipse Settings Files #
.settings
.project
.classpath
# Maven #
target/
test-output/
pom.xml.versionsBackup
# Java Crash Logs
hs_err_pid*.log
+13
View File
@@ -0,0 +1,13 @@
# see https://intellij-support.jetbrains.com/hc/en-us/articles/206544839-How-to-manage-projects-under-Version-Control-Systems
# Default ignored files
/shelf/
/workspace.xml
/usage.statistics.xml
/dictionaries/
# generated from Maven
/jarRepositories.xml
/modules.xml
/*.iml
/libraries/*.xml
Generated
+1
View File
@@ -0,0 +1 @@
Cryptomator
+79
View File
@@ -0,0 +1,79 @@
<component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173">
<option name="OTHER_INDENT_OPTIONS">
<value>
<option name="USE_TAB_CHARACTER" value="true" />
</value>
</option>
<option name="LINE_SEPARATOR" value="&#10;" />
<option name="RIGHT_MARGIN" value="220" />
<option name="FORMATTER_TAGS_ENABLED" value="true" />
<JavaCodeStyleSettings>
<option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="999" />
<option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="10" />
<option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
<value />
</option>
<option name="IMPORT_LAYOUT_TABLE">
<value>
<package name="" withSubpackages="true" static="false" />
<emptyLine />
<package name="javax" withSubpackages="true" static="false" />
<package name="javafx" withSubpackages="true" static="false" />
<package name="java" withSubpackages="true" static="false" />
<emptyLine />
<package name="" withSubpackages="true" static="true" />
</value>
</option>
<option name="JD_ALIGN_PARAM_COMMENTS" value="false" />
<option name="JD_ALIGN_EXCEPTION_COMMENTS" value="false" />
</JavaCodeStyleSettings>
<Properties>
<option name="KEEP_BLANK_LINES" value="true" />
</Properties>
<XML>
<option name="XML_ATTRIBUTE_WRAP" value="0" />
</XML>
<codeStyleSettings language="CSS">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="Groovy">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="HTML">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="JAVA">
<option name="KEEP_LINE_BREAKS" value="false" />
<option name="BLANK_LINES_AFTER_CLASS_HEADER" value="1" />
<option name="BINARY_OPERATION_SIGN_ON_NEXT_LINE" value="true" />
<option name="KEEP_SIMPLE_METHODS_IN_ONE_LINE" value="true" />
<option name="KEEP_SIMPLE_LAMBDAS_IN_ONE_LINE" value="true" />
<option name="KEEP_SIMPLE_CLASSES_IN_ONE_LINE" value="true" />
<option name="IF_BRACE_FORCE" value="3" />
<option name="ENUM_CONSTANTS_WRAP" value="2" />
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
<arrangement>
<rules />
</arrangement>
</codeStyleSettings>
<codeStyleSettings language="JSON">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
<codeStyleSettings language="XML">
<indentOptions>
<option name="USE_TAB_CHARACTER" value="true" />
</indentOptions>
</codeStyleSettings>
</code_scheme>
</component>
+5
View File
@@ -0,0 +1,5 @@
<component name="ProjectCodeStyleConfiguration">
<state>
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
</state>
</component>
+53
View File
@@ -0,0 +1,53 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="CompilerConfiguration">
<annotationProcessing>
<profile name="Maven default annotation processors profile" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
</profile>
<profile name="Annotation profile for Cryptomator Desktop App" enabled="true">
<sourceOutputDir name="target/generated-sources/annotations" />
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" />
<option name="dagger.fastInit" value="enabled" />
<option name="dagger.formatGeneratedSource" value="enabled" />
<processorPath useClasspath="false">
<entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-compiler/2.57.2/dagger-compiler-2.57.2.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger/2.57.2/dagger-2.57.2.jar" />
<entry name="$MAVEN_REPOSITORY$/jakarta/inject/jakarta.inject-api/2.0.1/jakarta.inject-api-2.0.1.jar" />
<entry name="$MAVEN_REPOSITORY$/org/jspecify/jspecify/1.0.0/jspecify-1.0.0.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/dagger/dagger-spi/2.57.2/dagger-spi-2.57.2.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/code/findbugs/jsr305/3.0.2/jsr305-3.0.2.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/devtools/ksp/symbol-processing-api/2.1.21-2.0.2/symbol-processing-api-2.1.21-2.0.2.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/googlejavaformat/google-java-format/1.5/google-java-format-1.5.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/errorprone/javac-shaded/9-dev-r4023-3/javac-shaded-9-dev-r4023-3.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/guava/failureaccess/1.0.2/failureaccess-1.0.2.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/guava/guava/33.0.0-jre/guava-33.0.0-jre.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/guava/listenablefuture/9999.0-empty-to-avoid-conflict-with-guava/listenablefuture-9999.0-empty-to-avoid-conflict-with-guava.jar" />
<entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-qual/3.41.0/checker-qual-3.41.0.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/errorprone/error_prone_annotations/2.23.0/error_prone_annotations-2.23.0.jar" />
<entry name="$MAVEN_REPOSITORY$/com/google/j2objc/j2objc-annotations/2.8/j2objc-annotations-2.8.jar" />
<entry name="$MAVEN_REPOSITORY$/com/squareup/javapoet/1.13.0/javapoet-1.13.0.jar" />
<entry name="$MAVEN_REPOSITORY$/com/squareup/kotlinpoet/1.11.0/kotlinpoet-1.11.0.jar" />
<entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk8/1.6.10/kotlin-stdlib-jdk8-1.6.10.jar" />
<entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib-jdk7/1.6.10/kotlin-stdlib-jdk7-1.6.10.jar" />
<entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-reflect/1.6.10/kotlin-reflect-1.6.10.jar" />
<entry name="$MAVEN_REPOSITORY$/javax/inject/javax.inject/1/javax.inject-1.jar" />
<entry name="$MAVEN_REPOSITORY$/net/ltgt/gradle/incap/incap/0.2/incap-0.2.jar" />
<entry name="$MAVEN_REPOSITORY$/org/checkerframework/checker-compat-qual/2.5.3/checker-compat-qual-2.5.3.jar" />
<entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-metadata-jvm/2.1.21/kotlin-metadata-jvm-2.1.21.jar" />
<entry name="$MAVEN_REPOSITORY$/org/jetbrains/kotlin/kotlin-stdlib/2.1.21/kotlin-stdlib-2.1.21.jar" />
<entry name="$MAVEN_REPOSITORY$/org/jetbrains/annotations/13.0/annotations-13.0.jar" />
</processorPath>
<module name="cryptomator" />
</profile>
</annotationProcessing>
</component>
<component name="JavacSettings">
<option name="ADDITIONAL_OPTIONS_OVERRIDE">
<module name="cryptomator" options="-Adagger.fastInit=enabled -Adagger.formatGeneratedSource=enabled" />
</option>
</component>
</project>
+15
View File
@@ -0,0 +1,15 @@
<component name="ProjectDictionaryState">
<dictionary name="dict_de">
<words>
<w>tresorinhalt</w>
<w>tresorkonfigurationsdatei</w>
<w>tresorlaufwerk</w>
<w>tresorliste</w>
<w>tresorname</w>
<w>tresoroptionen</w>
<w>tresorstatistik</w>
<w>ungespeicherten</w>
<w>ungespeicherter</w>
</words>
</dictionary>
</component>
+106
View File
@@ -0,0 +1,106 @@
<component name="ProjectDictionaryState">
<dictionary name="dict_project">
<words>
<w>addvault</w>
<w>addvaultwizard</w>
<w>adoptopenjdk</w>
<w>affero</w>
<w>aquafx</w>
<w>autolock</w>
<w>autolocked</w>
<w>autolocking</w>
<w>baos</w>
<w>bkup</w>
<w>buildkit</w>
<w>changepassword</w>
<w>checkerframework</w>
<w>crit</w>
<w>crowdin</w>
<w>cryptofs</w>
<w>cryptomator</w>
<w>cryptomator's</w>
<w>cryptor</w>
<w>csprng</w>
<w>dcryptomator</w>
<w>dfuse</w>
<w>dirid</w>
<w>djdk</w>
<w>dokany</w>
<w>dragboard</w>
<w>easybind</w>
<w>encr</w>
<w>errorprone</w>
<w>failureaccess</w>
<w>fbidis</w>
<w>fldinst</w>
<w>fldrslt</w>
<w>fontawesomefx</w>
<w>gdrive</w>
<w>gvfs</w>
<w>hmmss</w>
<w>httpcomponents</w>
<w>httpcore</w>
<w>iclouddrive</w>
<w>jensd</w>
<w>jffi</w>
<w>keyloading</w>
<w>kibs</w>
<w>listcell</w>
<w>listenablefuture</w>
<w>lopp</w>
<w>mainwindow</w>
<w>masterkey</w>
<w>masterkeyfile</w>
<w>mibs</w>
<w>mountpath</w>
<w>mpc's</w>
<w>needsmigration</w>
<w>noncommercially</w>
<w>noël</w>
<w>nulab</w>
<w>oatomic</w>
<w>oauto</w>
<w>objectgraph</w>
<w>odefault</w>
<w>ogid</w>
<w>onoappledouble</w>
<w>ordonly</w>
<w>ouid</w>
<w>ovolname</w>
<w>passthrough</w>
<w>patreon</w>
<w>pcloud</w>
<w>probot</w>
<w>recoverykey</w>
<w>relicensing</w>
<w>removevault</w>
<w>revealer</w>
<w>serceman</w>
<w>setolabs</w>
<w>skymatic</w>
<w>socio</w>
<w>spof</w>
<w>stenzel</w>
<w>styleclass</w>
<w>sublicenses</w>
<w>sublicensing</w>
<w>systemkeychain</w>
<w>tada</w>
<w>tidelift</w>
<w>tmpmountpoint</w>
<w>tobiasdiez</w>
<w>toggler</w>
<w>traymenu</w>
<w>unknownerror</w>
<w>unlockable</w>
<w>vaultconfig</w>
<w>vaultlist</w>
<w>vaultname</w>
<w>vaultoptions</w>
<w>wrongfilealert</w>
<w>xattr</w>
<w>zillmann</w>
<w>zxcvbn</w>
</words>
</dictionary>
</component>
+8
View File
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="Encoding" defaultCharsetForPropertiesFiles="UTF-8">
<file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
<file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
<file url="PROJECT" charset="UTF-8" />
</component>
</project>
+1
View File
@@ -0,0 +1 @@
<svg width="1110" height="942" viewBox="0 0 1108.12 940.2" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg"><path d="m552.69 0c-169.1 0-262.45 143.46-262.45 283.52h524.9c0-140.06-105.33-283.52-262.45-283.52z" fill="#cfcfcf"/><path d="m552.69 53.2c-137.37 0-213.21 116.54-213.21 230.32l213.21 24.18 213.21-24.18c0-113.78-85.57-230.32-213.21-230.32z" fill="#585e62"/><path d="m89.8 739.52a20 20 0 0 1 -2.23-39.88 42.8 42.8 0 1 0 -42.22-21.82 20 20 0 0 1 -35 19.31 82.79 82.79 0 1 1 81.76 42.26 21.78 21.78 0 0 1 -2.31.13z" fill="#585e62"/><rect fill="#cfcfcf" height="144.19" rx="49.42" transform="matrix(.8902923 .45538953 -.45538953 .8902923 261.57 -5.69)" width="104.68" x="90.27" y="467.98"/><path d="m149.47 401.27h62.8a0 0 0 0 1 0 0v94.55a31.4 31.4 0 0 1 -31.4 31.4 31.4 31.4 0 0 1 -31.4-31.4v-94.55a0 0 0 0 1 0 0z" fill="#585e62" transform="matrix(.8902923 .45538953 -.45538953 .8902923 231.23 -31.44)"/><circle cx="222.59" cy="387.53" fill="#cfcfcf" r="75.05"/><path d="m258.09 321.8a75.09 75.09 0 0 0 -91.23 14.64 75.06 75.06 0 0 1 51.58 126.06 75.06 75.06 0 0 0 39.65-140.7z" fill="#b1b1b1"/><path d="m1018.31 739.52a22.09 22.09 0 0 1 -2.28-.13 82.8 82.8 0 1 1 81.77-42.26 20 20 0 1 1 -35-19.31 42.8 42.8 0 1 0 -42.23 21.82 20 20 0 0 1 -2.23 39.88z" fill="#585e62"/><rect fill="#cfcfcf" height="144.19" rx="49.42" transform="matrix(-.8902923 .45538953 -.45538953 -.8902923 2071.05 581.27)" width="104.68" x="913.18" y="467.98"/><path d="m927.25 401.27a31.4 31.4 0 0 1 31.4 31.4v94.55a0 0 0 0 1 0 0h-62.8a0 0 0 0 1 0 0v-94.55a31.4 31.4 0 0 1 31.4-31.4z" fill="#585e62" transform="matrix(-.8902923 .45538953 -.45538953 -.8902923 1964.18 455.35)"/><circle cx="885.53" cy="387.53" fill="#cfcfcf" r="75.05"/><path d="m850 321.8a75.08 75.08 0 0 1 91.22 14.64 75.06 75.06 0 0 0 -51.54 126.06 75.05 75.05 0 0 1 -39.68-140.7z" fill="#b1b1b1"/><path d="m248.78 940.2c-36.67 0-67-39.85-75.51-99.15-4.56-31.83-2.26-65.19 6.48-94 9.41-31 25.51-53.59 45.32-63.72a51.72 51.72 0 0 1 23.69-5.84h103.52v262.71z" fill="#585e62"/><path d="m351.43 940.2c-21.26 0-38.85-39.85-43.78-99.15-2.64-31.83-1.31-65.19 3.76-94 5.45-31 14.78-53.59 26.27-63.72 4.39-3.87 9-5.84 13.73-5.84s9.34 2 13.75 5.8l49.7 43.83c17.37 15.32 23.39 64 20.23 102-2.43 29.28-10 52.18-20.19 61.28l-49.69 43.82c-4.44 3.99-9.08 5.98-13.78 5.98z" fill="#585e62"/><path d="m360.57 699 49.65 43.79c11.18 9.9 17.78 47.45 14.78 83.91-2 24.27-7.83 41.95-14.77 48.13l-49.65 43.79c-18.58 16.38-37.79-19.43-42.83-80.07s6-123.1 24.58-139.51c6.15-5.42 12.5-5.04 18.24-.04z" fill="#35393b"/><path d="m850.73 940.2c36.66 0 67-39.85 75.51-99.15 4.56-31.83 2.26-65.19-6.48-94-9.41-31-25.51-53.59-45.32-63.72a51.72 51.72 0 0 0 -23.69-5.84h-103.53v262.71z" fill="#585e62"/><path d="m748.08 940.2c21.26 0 38.85-39.85 43.78-99.15 2.64-31.83 1.31-65.19-3.76-94-5.45-31-14.79-53.59-26.27-63.72-4.4-3.87-9-5.84-13.73-5.84s-9.34 2-13.76 5.8l-49.69 43.83c-17.38 15.32-23.39 64-20.23 102 2.43 29.28 10 52.18 20.19 61.28l49.68 43.82c4.45 3.99 9.09 5.98 13.79 5.98z" fill="#585e62"/><path d="m738.94 699-49.65 43.79c-11.19 9.86-17.8 47.41-14.77 83.87 2 24.27 7.83 41.95 14.77 48.13l49.65 43.79c18.61 16.41 37.78-19.43 42.82-80.07s-6-123.1-24.58-139.51c-6.18-5.38-12.5-5-18.24 0z" fill="#35393b"/><path d="m848.63 451.38a83.62 83.62 0 0 1 -.56-45.6c14.74-53.13 5.06-111.78 5.06-111.78-185.07-57.77-300.13-.48-300.13-.48s-114.79-57.64-300-.45c0 0-9.86 58.64 4.72 111.83a83.69 83.69 0 0 1 -.69 45.59c-5.14 17.57-10.72 44.5-10.77 78.8-.37 249 306 326.08 306 326.08s306.58-76.15 306.95-325.16c0-34.3-5.49-61.21-10.58-78.83z" fill="#cfcfcf"/><path d="m552.34 808.87c-50.72-15.87-261.7-93.25-261.42-279.51 0-29.65 4.89-52.42 9-66.31a128.3 128.3 0 0 0 .91-70c-6.2-22.58-6.9-47.13-6.17-65.29 40.48-10.23 80.2-15.37 118.41-15.32 75.66.12 119.86 21 120.3 21.17l20.39 10.23 19.24-10.32c.11 0 44.36-20.75 120-20.64 38.21.06 77.91 5.32 118.37 15.68.67 18.14-.1 42.71-6.37 65.27a128.33 128.33 0 0 0 .69 70c4 13.91 8.82 36.69 8.77 66.35-.28 187.06-211.26 263.09-262.12 278.69z" fill="#49b04a"/><path d="m610.15 478.76a57.46 57.46 0 1 0 -70.15 55.92l-32.29 135.47 44.67 12.85 44.71-12.71-31.84-135.57a57.46 57.46 0 0 0 44.9-55.96z" fill="#35393b"/><g fill="#49b04a"><path d="m454.94 131.08a60.64 60.64 0 0 0 -60.64 60.64h121.28a60.64 60.64 0 0 0 -60.64-60.64z"/><path d="m642.38 131.08a60.64 60.64 0 0 0 -60.64 60.64h121.26a60.64 60.64 0 0 0 -60.62-60.64z"/><circle cx="483.23" cy="229.43" r="11.52"/><circle cx="528.52" cy="229.43" r="11.52"/><circle cx="573.8" cy="229.43" r="11.52"/><circle cx="619.09" cy="229.43" r="11.52"/></g></svg>

After

Width:  |  Height:  |  Size: 4.5 KiB

+8
View File
@@ -0,0 +1,8 @@
<component name="InspectionProjectProfileManager">
<profile version="1.0">
<option name="myName" value="Project Default" />
<inspection_tool class="Deprecation" enabled="true" level="WARNING" enabled_by_default="true" editorAttributes="DEPRECATED_ATTRIBUTES" />
<inspection_tool class="MarkedForRemoval" enabled="true" level="WARNING" enabled_by_default="true" editorAttributes="MARKED_FOR_REMOVAL_ATTRIBUTES" />
<inspection_tool class="RedundantScheduledForRemovalAnnotation" enabled="true" level="WARNING" enabled_by_default="true" editorAttributes="MARKED_FOR_REMOVAL_ATTRIBUTES" />
</profile>
</component>
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="MavenProjectsManager">
<option name="originalFiles">
<list>
<option value="$PROJECT_DIR$/pom.xml" />
</list>
</option>
</component>
<component name="ProjectRootManager" version="2" languageLevel="JDK_25" project-jdk-name="25" project-jdk-type="JavaSDK">
<output url="file://$PROJECT_DIR$/out" />
</component>
</project>
+10
View File
@@ -0,0 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Cryptomator Linux" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
<module name="cryptomator" />
<option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator/mnt&quot; -Dcryptomator.showTrayIcon=true -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator,javafx.graphics" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
+10
View File
@@ -0,0 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Cryptomator Linux Dev" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
<module name="cryptomator" />
<option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{userhome}/.config/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/.config/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/.config/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/logs&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/.local/share/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dfuse.experimental=&quot;true&quot; -Xss20m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator,javafx.graphics" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
+10
View File
@@ -0,0 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Cryptomator Windows" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
<module name="cryptomator" />
<option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator/settings.json;@{userhome}/AppData/Roaming/Cryptomator/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator/keychain.json;@{userhome}/AppData/Roaming/Cryptomator/keychain.json&quot; -Dcryptomator.integrationsWin.windowsHelloKeychainPaths=&quot;@{appdata}/Cryptomator/windowsHelloKeychain.json;@{userhome}/AppData/Roaming/Cryptomator/windowsHelloKeychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator/key.p12;@{userhome}/AppData/Roaming/Cryptomator/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win,javafx.graphics" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
+10
View File
@@ -0,0 +1,10 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Cryptomator Windows Dev" type="Application" factoryName="Application">
<option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
<module name="cryptomator" />
<option name="VM_PARAMETERS" value="-Dcryptomator.settingsPath=&quot;@{appdata}/Cryptomator-Dev/settings.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/settings.json&quot; -Dcryptomator.ipcSocketPath=&quot;@{localappdata}/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{localappdata}/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{appdata}/Cryptomator-Dev/Plugins&quot; -Dcryptomator.integrationsWin.keychainPaths=&quot;@{appdata}/Cryptomator-Dev/keychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/keychain.json&quot; -Dcryptomator.integrationsWin.windowsHelloKeychainPaths=&quot;@{appdata}/Cryptomator-Dev/windowsHelloKeychain.json;@{userhome}/AppData/Roaming/Cryptomator-Dev/windowsHelloKeychain.json&quot; -Dcryptomator.p12Path=&quot;@{appdata}/Cryptomator-Dev/key.p12;@{userhome}/AppData/Roaming/Cryptomator-Dev/key.p12&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator-Dev&quot; -Dcryptomator.showTrayIcon=true -Xss2m -Xmx512m --enable-preview --enable-native-access=org.cryptomator.jfuse.win,org.cryptomator.integrations.win,javafx.graphics" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
+13
View File
@@ -0,0 +1,13 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Cryptomator macOS" type="Application" factoryName="Application">
<envs>
<env name="LD_LIBRARY_PATH" value="/usr/local/lib" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
<module name="cryptomator" />
<option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Cryptomator&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Dcryptomator.updateMechanism=org.cryptomator.macos.update.DmgUpdateMechanism -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac,javafx.graphics" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
+13
View File
@@ -0,0 +1,13 @@
<component name="ProjectRunConfigurationManager">
<configuration default="false" name="Cryptomator macOS Dev" type="Application" factoryName="Application">
<envs>
<env name="LD_LIBRARY_PATH" value="/usr/local/lib" />
</envs>
<option name="MAIN_CLASS_NAME" value="org.cryptomator.launcher.Cryptomator" />
<module name="cryptomator" />
<option name="VM_PARAMETERS" value="-Dapple.awt.enableTemplateImages=true -Dcryptomator.settingsPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/settings.json&quot; -Dcryptomator.p12Path=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/key.p12&quot; -Dcryptomator.ipcSocketPath=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/ipc.socket&quot; -Dcryptomator.logDir=&quot;@{userhome}/Library/Logs/Cryptomator-Dev&quot; -Dcryptomator.pluginDir=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/Plugins&quot; -Dcryptomator.mountPointsDir=&quot;@{userhome}/Library/Application Support/Cryptomator-Dev/mnt&quot; -Dcryptomator.showTrayIcon=true -Dcryptomator.integrationsMac.keychainServiceName=Cryptomator -Xss2m -Xmx512m -ea --enable-preview --enable-native-access=org.cryptomator.jfuse.mac,javafx.graphics" />
<method v="2">
<option name="Make" enabled="true" />
</method>
</configuration>
</component>
Generated
+6
View File
@@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
-49
View File
@@ -1,49 +0,0 @@
language: java
jdk:
- oraclejdk8
env:
global:
- secure: "Lgj042RD0X3rB8VZVZLWP1GetLhjd3PqI5JbJMlzgHJpDI6RkFIBLN9SWAGmkLPCehIp2zA5tu9+UVy0NNMxm9xz6SyjMCaxS28/fnYEXaNmwwDSF6O6gLUbdxyzoYIFPYOPmFxpzhebqnNIsxaM29oZpgRgUGqosCczQxiB+Ng=" #coveralls
- secure: "IfYURwZaDWuBDvyn47n0k1Zod/IQw1FF+CS5nnV08Q+NfC3vGGJMwV8m59XnbfwnWGxwvCaAbk4qP6s6+ijgZNKkvgfFMo3rfTok5zt43bIqgaFOANYV+OC/1c59gYD6ZUxhW5iNgMgU3qdsRtJuwSmfkVv/jKyLGfAbS4kN8BA=" #coverity
before_install: "curl -L --cookie 'oraclelicense=accept-securebackup-cookie;' http://download.oracle.com/otn-pub/java/jce/8/jce_policy-8.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d `jdk_switcher home oraclejdk8`/jre/lib/security && rm /tmp/policy.zip"
script: mvn -fmain/pom.xml clean test
after_success: mvn -fmain/pom.xml clean test jacoco:report coveralls:report
notifications:
webhooks:
urls:
- https://webhooks.gitter.im/e/7d429ab35361726e26f2
on_success: change
on_failure: always
on_start: false
slack:
rooms:
secure: "lngJ/HEAFBbD5AdiO9avMqptKpZHdmEwOzS9FabZjkdFh7yAYueTk5RniPUvShjsKtThYm7cJ8AtDMDwc07NvPrzbMBRtUJGwuDT+7c7YFALGFJ1NYi+emkC9x1oafvmPgEYSE+tMKzNcwrHi3ytGgKdIotsKwaF35QNXYA9aMs="
on_success: change
on_failure: always
before_deploy: mvn -fmain/pom.xml -Puber-jar clean package -DskipTests
addons:
coverity_scan:
project:
name: "cryptomator/cryptomator"
notification_email: sebastian.stenzel@cryptomator.org
build_command: "mvn -fmain/pom.xml clean test -DskipTests"
branch_pattern: coverity_scan
deploy:
provider: releases
prerelease: false
api_key:
secure: "ZjE1j93v3qbPIe2YbmhS319aCbMdLQw0HuymmluTurxXsZtn9D4t2+eTr99vBVxGRuB5lzzGezPR5zjk5W7iHF7xhwrawXrFzr2rPJWzWFt0aM+Ry2njU1ROTGGXGTbv4anWeBlgMxLEInTAy/9ytOGNJlec83yc0THpOY2wxnk="
file: main/uber-jar/target/Cryptomator-$TRAVIS_TAG.jar
skip_cleanup: true
on:
repo: cryptomator/cryptomator
tags: true
+22
View File
@@ -0,0 +1,22 @@
# Changelog
All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
The changelog starts with version 1.19.0.
Changes to prior versions can be found on the [Github release page](https://github.com/cryptomator/cryptomator/releases).
## [Unreleased](https://github.com/cryptomator/cryptomator/compare/1.18.0...HEAD)
### Added
* Self-Update Mechanism ([#3948](https://github.com/cryptomator/cryptomator/pull/3948))
* Implemented `.dmg` update mechanism
* Implemented Flatpak update mechanism
* App notifications ([#4069](https://github.com/cryptomator/cryptomator/pull/4069))
* Mark files in-use for Hub vaults ([#4078](https://github.com/cryptomator/cryptomator/pull/4078))
* Accessibility labels for GUI elements ([#4064](https://github.com/cryptomator/cryptomator/issues/4064), [#4066](https://github.com/cryptomator/cryptomator/pull/4066), [#4055](https://github.com/cryptomator/cryptomator/issues/4055))
### Changed
* Built using JDK 25 ([#4031](https://github.com/cryptomator/cryptomator/issues/4031))
* Modernized Template for GitHub Releases
+674
View File
@@ -0,0 +1,674 @@
GNU GENERAL PUBLIC LICENSE
Version 3, 29 June 2007
Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
Preamble
The GNU General Public License is a free, copyleft license for
software and other kinds of works.
The licenses for most software and other practical works are designed
to take away your freedom to share and change the works. By contrast,
the GNU General Public License is intended to guarantee your freedom to
share and change all versions of a program--to make sure it remains free
software for all its users. We, the Free Software Foundation, use the
GNU General Public License for most of our software; it applies also to
any other work released this way by its authors. You can apply it to
your programs, too.
When we speak of free software, we are referring to freedom, not
price. Our General Public Licenses are designed to make sure that you
have the freedom to distribute copies of free software (and charge for
them if you wish), that you receive source code or can get it if you
want it, that you can change the software or use pieces of it in new
free programs, and that you know you can do these things.
To protect your rights, we need to prevent others from denying you
these rights or asking you to surrender the rights. Therefore, you have
certain responsibilities if you distribute copies of the software, or if
you modify it: responsibilities to respect the freedom of others.
For example, if you distribute copies of such a program, whether
gratis or for a fee, you must pass on to the recipients the same
freedoms that you received. You must make sure that they, too, receive
or can get the source code. And you must show them these terms so they
know their rights.
Developers that use the GNU GPL protect your rights with two steps:
(1) assert copyright on the software, and (2) offer you this License
giving you legal permission to copy, distribute and/or modify it.
For the developers' and authors' protection, the GPL clearly explains
that there is no warranty for this free software. For both users' and
authors' sake, the GPL requires that modified versions be marked as
changed, so that their problems will not be attributed erroneously to
authors of previous versions.
Some devices are designed to deny users access to install or run
modified versions of the software inside them, although the manufacturer
can do so. This is fundamentally incompatible with the aim of
protecting users' freedom to change the software. The systematic
pattern of such abuse occurs in the area of products for individuals to
use, which is precisely where it is most unacceptable. Therefore, we
have designed this version of the GPL to prohibit the practice for those
products. If such problems arise substantially in other domains, we
stand ready to extend this provision to those domains in future versions
of the GPL, as needed to protect the freedom of users.
Finally, every program is threatened constantly by software patents.
States should not allow patents to restrict development and use of
software on general-purpose computers, but in those that do, we wish to
avoid the special danger that patents applied to a free program could
make it effectively proprietary. To prevent this, the GPL assures that
patents cannot be used to render the program non-free.
The precise terms and conditions for copying, distribution and
modification follow.
TERMS AND CONDITIONS
0. Definitions.
"This License" refers to version 3 of the GNU General Public License.
"Copyright" also means copyright-like laws that apply to other kinds of
works, such as semiconductor masks.
"The Program" refers to any copyrightable work licensed under this
License. Each licensee is addressed as "you". "Licensees" and
"recipients" may be individuals or organizations.
To "modify" a work means to copy from or adapt all or part of the work
in a fashion requiring copyright permission, other than the making of an
exact copy. The resulting work is called a "modified version" of the
earlier work or a work "based on" the earlier work.
A "covered work" means either the unmodified Program or a work based
on the Program.
To "propagate" a work means to do anything with it that, without
permission, would make you directly or secondarily liable for
infringement under applicable copyright law, except executing it on a
computer or modifying a private copy. Propagation includes copying,
distribution (with or without modification), making available to the
public, and in some countries other activities as well.
To "convey" a work means any kind of propagation that enables other
parties to make or receive copies. Mere interaction with a user through
a computer network, with no transfer of a copy, is not conveying.
An interactive user interface displays "Appropriate Legal Notices"
to the extent that it includes a convenient and prominently visible
feature that (1) displays an appropriate copyright notice, and (2)
tells the user that there is no warranty for the work (except to the
extent that warranties are provided), that licensees may convey the
work under this License, and how to view a copy of this License. If
the interface presents a list of user commands or options, such as a
menu, a prominent item in the list meets this criterion.
1. Source Code.
The "source code" for a work means the preferred form of the work
for making modifications to it. "Object code" means any non-source
form of a work.
A "Standard Interface" means an interface that either is an official
standard defined by a recognized standards body, or, in the case of
interfaces specified for a particular programming language, one that
is widely used among developers working in that language.
The "System Libraries" of an executable work include anything, other
than the work as a whole, that (a) is included in the normal form of
packaging a Major Component, but which is not part of that Major
Component, and (b) serves only to enable use of the work with that
Major Component, or to implement a Standard Interface for which an
implementation is available to the public in source code form. A
"Major Component", in this context, means a major essential component
(kernel, window system, and so on) of the specific operating system
(if any) on which the executable work runs, or a compiler used to
produce the work, or an object code interpreter used to run it.
The "Corresponding Source" for a work in object code form means all
the source code needed to generate, install, and (for an executable
work) run the object code and to modify the work, including scripts to
control those activities. However, it does not include the work's
System Libraries, or general-purpose tools or generally available free
programs which are used unmodified in performing those activities but
which are not part of the work. For example, Corresponding Source
includes interface definition files associated with source files for
the work, and the source code for shared libraries and dynamically
linked subprograms that the work is specifically designed to require,
such as by intimate data communication or control flow between those
subprograms and other parts of the work.
The Corresponding Source need not include anything that users
can regenerate automatically from other parts of the Corresponding
Source.
The Corresponding Source for a work in source code form is that
same work.
2. Basic Permissions.
All rights granted under this License are granted for the term of
copyright on the Program, and are irrevocable provided the stated
conditions are met. This License explicitly affirms your unlimited
permission to run the unmodified Program. The output from running a
covered work is covered by this License only if the output, given its
content, constitutes a covered work. This License acknowledges your
rights of fair use or other equivalent, as provided by copyright law.
You may make, run and propagate covered works that you do not
convey, without conditions so long as your license otherwise remains
in force. You may convey covered works to others for the sole purpose
of having them make modifications exclusively for you, or provide you
with facilities for running those works, provided that you comply with
the terms of this License in conveying all material for which you do
not control copyright. Those thus making or running the covered works
for you must do so exclusively on your behalf, under your direction
and control, on terms that prohibit them from making any copies of
your copyrighted material outside their relationship with you.
Conveying under any other circumstances is permitted solely under
the conditions stated below. Sublicensing is not allowed; section 10
makes it unnecessary.
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
No covered work shall be deemed part of an effective technological
measure under any applicable law fulfilling obligations under article
11 of the WIPO copyright treaty adopted on 20 December 1996, or
similar laws prohibiting or restricting circumvention of such
measures.
When you convey a covered work, you waive any legal power to forbid
circumvention of technological measures to the extent such circumvention
is effected by exercising rights under this License with respect to
the covered work, and you disclaim any intention to limit operation or
modification of the work as a means of enforcing, against the work's
users, your or third parties' legal rights to forbid circumvention of
technological measures.
4. Conveying Verbatim Copies.
You may convey verbatim copies of the Program's source code as you
receive it, in any medium, provided that you conspicuously and
appropriately publish on each copy an appropriate copyright notice;
keep intact all notices stating that this License and any
non-permissive terms added in accord with section 7 apply to the code;
keep intact all notices of the absence of any warranty; and give all
recipients a copy of this License along with the Program.
You may charge any price or no price for each copy that you convey,
and you may offer support or warranty protection for a fee.
5. Conveying Modified Source Versions.
You may convey a work based on the Program, or the modifications to
produce it from the Program, in the form of source code under the
terms of section 4, provided that you also meet all of these conditions:
a) The work must carry prominent notices stating that you modified
it, and giving a relevant date.
b) The work must carry prominent notices stating that it is
released under this License and any conditions added under section
7. This requirement modifies the requirement in section 4 to
"keep intact all notices".
c) You must license the entire work, as a whole, under this
License to anyone who comes into possession of a copy. This
License will therefore apply, along with any applicable section 7
additional terms, to the whole of the work, and all its parts,
regardless of how they are packaged. This License gives no
permission to license the work in any other way, but it does not
invalidate such permission if you have separately received it.
d) If the work has interactive user interfaces, each must display
Appropriate Legal Notices; however, if the Program has interactive
interfaces that do not display Appropriate Legal Notices, your
work need not make them do so.
A compilation of a covered work with other separate and independent
works, which are not by their nature extensions of the covered work,
and which are not combined with it such as to form a larger program,
in or on a volume of a storage or distribution medium, is called an
"aggregate" if the compilation and its resulting copyright are not
used to limit the access or legal rights of the compilation's users
beyond what the individual works permit. Inclusion of a covered work
in an aggregate does not cause this License to apply to the other
parts of the aggregate.
6. Conveying Non-Source Forms.
You may convey a covered work in object code form under the terms
of sections 4 and 5, provided that you also convey the
machine-readable Corresponding Source under the terms of this License,
in one of these ways:
a) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by the
Corresponding Source fixed on a durable physical medium
customarily used for software interchange.
b) Convey the object code in, or embodied in, a physical product
(including a physical distribution medium), accompanied by a
written offer, valid for at least three years and valid for as
long as you offer spare parts or customer support for that product
model, to give anyone who possesses the object code either (1) a
copy of the Corresponding Source for all the software in the
product that is covered by this License, on a durable physical
medium customarily used for software interchange, for a price no
more than your reasonable cost of physically performing this
conveying of source, or (2) access to copy the
Corresponding Source from a network server at no charge.
c) Convey individual copies of the object code with a copy of the
written offer to provide the Corresponding Source. This
alternative is allowed only occasionally and noncommercially, and
only if you received the object code with such an offer, in accord
with subsection 6b.
d) Convey the object code by offering access from a designated
place (gratis or for a charge), and offer equivalent access to the
Corresponding Source in the same way through the same place at no
further charge. You need not require recipients to copy the
Corresponding Source along with the object code. If the place to
copy the object code is a network server, the Corresponding Source
may be on a different server (operated by you or a third party)
that supports equivalent copying facilities, provided you maintain
clear directions next to the object code saying where to find the
Corresponding Source. Regardless of what server hosts the
Corresponding Source, you remain obligated to ensure that it is
available for as long as needed to satisfy these requirements.
e) Convey the object code using peer-to-peer transmission, provided
you inform other peers where the object code and Corresponding
Source of the work are being offered to the general public at no
charge under subsection 6d.
A separable portion of the object code, whose source code is excluded
from the Corresponding Source as a System Library, need not be
included in conveying the object code work.
A "User Product" is either (1) a "consumer product", which means any
tangible personal property which is normally used for personal, family,
or household purposes, or (2) anything designed or sold for incorporation
into a dwelling. In determining whether a product is a consumer product,
doubtful cases shall be resolved in favor of coverage. For a particular
product received by a particular user, "normally used" refers to a
typical or common use of that class of product, regardless of the status
of the particular user or of the way in which the particular user
actually uses, or expects or is expected to use, the product. A product
is a consumer product regardless of whether the product has substantial
commercial, industrial or non-consumer uses, unless such uses represent
the only significant mode of use of the product.
"Installation Information" for a User Product means any methods,
procedures, authorization keys, or other information required to install
and execute modified versions of a covered work in that User Product from
a modified version of its Corresponding Source. The information must
suffice to ensure that the continued functioning of the modified object
code is in no case prevented or interfered with solely because
modification has been made.
If you convey an object code work under this section in, or with, or
specifically for use in, a User Product, and the conveying occurs as
part of a transaction in which the right of possession and use of the
User Product is transferred to the recipient in perpetuity or for a
fixed term (regardless of how the transaction is characterized), the
Corresponding Source conveyed under this section must be accompanied
by the Installation Information. But this requirement does not apply
if neither you nor any third party retains the ability to install
modified object code on the User Product (for example, the work has
been installed in ROM).
The requirement to provide Installation Information does not include a
requirement to continue to provide support service, warranty, or updates
for a work that has been modified or installed by the recipient, or for
the User Product in which it has been modified or installed. Access to a
network may be denied when the modification itself materially and
adversely affects the operation of the network or violates the rules and
protocols for communication across the network.
Corresponding Source conveyed, and Installation Information provided,
in accord with this section must be in a format that is publicly
documented (and with an implementation available to the public in
source code form), and must require no special password or key for
unpacking, reading or copying.
7. Additional Terms.
"Additional permissions" are terms that supplement the terms of this
License by making exceptions from one or more of its conditions.
Additional permissions that are applicable to the entire Program shall
be treated as though they were included in this License, to the extent
that they are valid under applicable law. If additional permissions
apply only to part of the Program, that part may be used separately
under those permissions, but the entire Program remains governed by
this License without regard to the additional permissions.
When you convey a copy of a covered work, you may at your option
remove any additional permissions from that copy, or from any part of
it. (Additional permissions may be written to require their own
removal in certain cases when you modify the work.) You may place
additional permissions on material, added by you to a covered work,
for which you have or can give appropriate copyright permission.
Notwithstanding any other provision of this License, for material you
add to a covered work, you may (if authorized by the copyright holders of
that material) supplement the terms of this License with terms:
a) Disclaiming warranty or limiting liability differently from the
terms of sections 15 and 16 of this License; or
b) Requiring preservation of specified reasonable legal notices or
author attributions in that material or in the Appropriate Legal
Notices displayed by works containing it; or
c) Prohibiting misrepresentation of the origin of that material, or
requiring that modified versions of such material be marked in
reasonable ways as different from the original version; or
d) Limiting the use for publicity purposes of names of licensors or
authors of the material; or
e) Declining to grant rights under trademark law for use of some
trade names, trademarks, or service marks; or
f) Requiring indemnification of licensors and authors of that
material by anyone who conveys the material (or modified versions of
it) with contractual assumptions of liability to the recipient, for
any liability that these contractual assumptions directly impose on
those licensors and authors.
All other non-permissive additional terms are considered "further
restrictions" within the meaning of section 10. If the Program as you
received it, or any part of it, contains a notice stating that it is
governed by this License along with a term that is a further
restriction, you may remove that term. If a license document contains
a further restriction but permits relicensing or conveying under this
License, you may add to a covered work material governed by the terms
of that license document, provided that the further restriction does
not survive such relicensing or conveying.
If you add terms to a covered work in accord with this section, you
must place, in the relevant source files, a statement of the
additional terms that apply to those files, or a notice indicating
where to find the applicable terms.
Additional terms, permissive or non-permissive, may be stated in the
form of a separately written license, or stated as exceptions;
the above requirements apply either way.
8. Termination.
You may not propagate or modify a covered work except as expressly
provided under this License. Any attempt otherwise to propagate or
modify it is void, and will automatically terminate your rights under
this License (including any patent licenses granted under the third
paragraph of section 11).
However, if you cease all violation of this License, then your
license from a particular copyright holder is reinstated (a)
provisionally, unless and until the copyright holder explicitly and
finally terminates your license, and (b) permanently, if the copyright
holder fails to notify you of the violation by some reasonable means
prior to 60 days after the cessation.
Moreover, your license from a particular copyright holder is
reinstated permanently if the copyright holder notifies you of the
violation by some reasonable means, this is the first time you have
received notice of violation of this License (for any work) from that
copyright holder, and you cure the violation prior to 30 days after
your receipt of the notice.
Termination of your rights under this section does not terminate the
licenses of parties who have received copies or rights from you under
this License. If your rights have been terminated and not permanently
reinstated, you do not qualify to receive new licenses for the same
material under section 10.
9. Acceptance Not Required for Having Copies.
You are not required to accept this License in order to receive or
run a copy of the Program. Ancillary propagation of a covered work
occurring solely as a consequence of using peer-to-peer transmission
to receive a copy likewise does not require acceptance. However,
nothing other than this License grants you permission to propagate or
modify any covered work. These actions infringe copyright if you do
not accept this License. Therefore, by modifying or propagating a
covered work, you indicate your acceptance of this License to do so.
10. Automatic Licensing of Downstream Recipients.
Each time you convey a covered work, the recipient automatically
receives a license from the original licensors, to run, modify and
propagate that work, subject to this License. You are not responsible
for enforcing compliance by third parties with this License.
An "entity transaction" is a transaction transferring control of an
organization, or substantially all assets of one, or subdividing an
organization, or merging organizations. If propagation of a covered
work results from an entity transaction, each party to that
transaction who receives a copy of the work also receives whatever
licenses to the work the party's predecessor in interest had or could
give under the previous paragraph, plus a right to possession of the
Corresponding Source of the work from the predecessor in interest, if
the predecessor has it or can get it with reasonable efforts.
You may not impose any further restrictions on the exercise of the
rights granted or affirmed under this License. For example, you may
not impose a license fee, royalty, or other charge for exercise of
rights granted under this License, and you may not initiate litigation
(including a cross-claim or counterclaim in a lawsuit) alleging that
any patent claim is infringed by making, using, selling, offering for
sale, or importing the Program or any portion of it.
11. Patents.
A "contributor" is a copyright holder who authorizes use under this
License of the Program or a work on which the Program is based. The
work thus licensed is called the contributor's "contributor version".
A contributor's "essential patent claims" are all patent claims
owned or controlled by the contributor, whether already acquired or
hereafter acquired, that would be infringed by some manner, permitted
by this License, of making, using, or selling its contributor version,
but do not include claims that would be infringed only as a
consequence of further modification of the contributor version. For
purposes of this definition, "control" includes the right to grant
patent sublicenses in a manner consistent with the requirements of
this License.
Each contributor grants you a non-exclusive, worldwide, royalty-free
patent license under the contributor's essential patent claims, to
make, use, sell, offer for sale, import and otherwise run, modify and
propagate the contents of its contributor version.
In the following three paragraphs, a "patent license" is any express
agreement or commitment, however denominated, not to enforce a patent
(such as an express permission to practice a patent or covenant not to
sue for patent infringement). To "grant" such a patent license to a
party means to make such an agreement or commitment not to enforce a
patent against the party.
If you convey a covered work, knowingly relying on a patent license,
and the Corresponding Source of the work is not available for anyone
to copy, free of charge and under the terms of this License, through a
publicly available network server or other readily accessible means,
then you must either (1) cause the Corresponding Source to be so
available, or (2) arrange to deprive yourself of the benefit of the
patent license for this particular work, or (3) arrange, in a manner
consistent with the requirements of this License, to extend the patent
license to downstream recipients. "Knowingly relying" means you have
actual knowledge that, but for the patent license, your conveying the
covered work in a country, or your recipient's use of the covered work
in a country, would infringe one or more identifiable patents in that
country that you have reason to believe are valid.
If, pursuant to or in connection with a single transaction or
arrangement, you convey, or propagate by procuring conveyance of, a
covered work, and grant a patent license to some of the parties
receiving the covered work authorizing them to use, propagate, modify
or convey a specific copy of the covered work, then the patent license
you grant is automatically extended to all recipients of the covered
work and works based on it.
A patent license is "discriminatory" if it does not include within
the scope of its coverage, prohibits the exercise of, or is
conditioned on the non-exercise of one or more of the rights that are
specifically granted under this License. You may not convey a covered
work if you are a party to an arrangement with a third party that is
in the business of distributing software, under which you make payment
to the third party based on the extent of your activity of conveying
the work, and under which the third party grants, to any of the
parties who would receive the covered work from you, a discriminatory
patent license (a) in connection with copies of the covered work
conveyed by you (or copies made from those copies), or (b) primarily
for and in connection with specific products or compilations that
contain the covered work, unless you entered into that arrangement,
or that patent license was granted, prior to 28 March 2007.
Nothing in this License shall be construed as excluding or limiting
any implied license or other defenses to infringement that may
otherwise be available to you under applicable patent law.
12. No Surrender of Others' Freedom.
If conditions are imposed on you (whether by court order, agreement or
otherwise) that contradict the conditions of this License, they do not
excuse you from the conditions of this License. If you cannot convey a
covered work so as to satisfy simultaneously your obligations under this
License and any other pertinent obligations, then as a consequence you may
not convey it at all. For example, if you agree to terms that obligate you
to collect a royalty for further conveying from those to whom you convey
the Program, the only way you could satisfy both those terms and this
License would be to refrain entirely from conveying the Program.
13. Use with the GNU Affero General Public License.
Notwithstanding any other provision of this License, you have
permission to link or combine any covered work with a work licensed
under version 3 of the GNU Affero General Public License into a single
combined work, and to convey the resulting work. The terms of this
License will continue to apply to the part which is the covered work,
but the special requirements of the GNU Affero General Public License,
section 13, concerning interaction through a network will apply to the
combination as such.
14. Revised Versions of this License.
The Free Software Foundation may publish revised and/or new versions of
the GNU General Public License from time to time. Such new versions will
be similar in spirit to the present version, but may differ in detail to
address new problems or concerns.
Each version is given a distinguishing version number. If the
Program specifies that a certain numbered version of the GNU General
Public License "or any later version" applies to it, you have the
option of following the terms and conditions either of that numbered
version or of any later version published by the Free Software
Foundation. If the Program does not specify a version number of the
GNU General Public License, you may choose any version ever published
by the Free Software Foundation.
If the Program specifies that a proxy can decide which future
versions of the GNU General Public License can be used, that proxy's
public statement of acceptance of a version permanently authorizes you
to choose that version for the Program.
Later license versions may give you additional or different
permissions. However, no additional obligations are imposed on any
author or copyright holder as a result of your choosing to follow a
later version.
15. Disclaimer of Warranty.
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
16. Limitation of Liability.
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
SUCH DAMAGES.
17. Interpretation of Sections 15 and 16.
If the disclaimer of warranty and limitation of liability provided
above cannot be given local legal effect according to their terms,
reviewing courts shall apply local law that most closely approximates
an absolute waiver of all civil liability in connection with the
Program, unless a warranty or assumption of liability accompanies a
copy of the Program in return for a fee.
END OF TERMS AND CONDITIONS
How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
free software which everyone can redistribute and change under these terms.
To do so, attach the following notices to the program. It is safest
to attach them to the start of each source file to most effectively
state the exclusion of warranty; and each file should have at least
the "copyright" line and a pointer to where the full notice is found.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 3 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
Also add information on how to contact you by electronic and paper mail.
If the program does terminal interaction, make it output a short
notice like this when it starts in an interactive mode:
<program> Copyright (C) <year> <name of author>
This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
This is free software, and you are welcome to redistribute it
under certain conditions; type `show c' for details.
The hypothetical commands `show w' and `show c' should show the appropriate
parts of the General Public License. Of course, your program's commands
might be different; for a GUI interface, you would use an "about box".
You should also get your employer (if you work as a programmer) or school,
if any, to sign a "copyright disclaimer" for the program, if necessary.
For more information on this, and how to apply and follow the GNU GPL, see
<http://www.gnu.org/licenses/>.
The GNU General Public License does not permit incorporating your program
into proprietary programs. If your program is a subroutine library, you
may consider it more useful to permit linking proprietary applications with
the library. If this is what you want to do, use the GNU Lesser General
Public License instead of this License. But first, please read
<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-202
View File
@@ -1,202 +0,0 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
1. Definitions.
"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-27
View File
@@ -1,27 +0,0 @@
Copyright (c) [year], [fullname]
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
* Neither the name of [project] nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-23
View File
@@ -1,23 +0,0 @@
Copyright (c) [year], [fullname]
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
* Redistributions of source code must retain the above copyright notice, this
list of conditions and the following disclaimer.
* Redistributions in binary form must reproduce the above copyright notice,
this list of conditions and the following disclaimer in the documentation
and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-21
View File
@@ -1,21 +0,0 @@
The MIT License (MIT)
Copyright (c) <year> <copyright holders>
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
THE SOFTWARE.
-115
View File
@@ -1,115 +0,0 @@
# CRYPTOMATOR
Copyright (c) 2014, Sebastian Stenzel
Cryptomator is licensed under the MIT license. The details can be found in the accompanying license file.
## Third party softwares
Cryptomator uses third party libraries and fonts that may be licensed under different licenses.
### AquaFX
The ProgressIndicator in ui/src/main/resource/css/mac_theme.css contains code from the AquaFX project.
Copyright 2013 Claudine Zillmann (http://aquafx-project.com/)
Licensed under the accompanying BSD license file.
### Apache Commons Collections
Copyright 2001-2013 The Apache Software Foundation
This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
### Apache Commons Codec
Copyright 2002-2013 The Apache Software Foundation
This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
src/test/org/apache/commons/codec/language/DoubleMetaphoneTest.java contains test data
from http://aspell.net/test/orig/batch0.tab. Copyright (C) 2002 Kevin Atkinson (kevina@gnu.org)
### Apache Commons IO
Copyright 2002-2012 The Apache Software Foundation
This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
### Apache Commons Lang
Copyright 2001-2011 The Apache Software Foundation
This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
This product includes software from the Spring Framework,
under the Apache License 2.0 (see: StringUtils.containsWhitespace())
### ControlsFX
Copyright (c) 2013, ControlsFX
Licensed under the accompanying BSD license file.
### Dagger 2
Copyright 2014 Google, Inc.
Copyright 2012 Square, Inc.
Licensed under the Apache License, Version 2.0
### EasyBind
Copyright (c) 2014, TomasMikula
Licensed under the accompanying BSD simplified license.
### Apache Jakarta HttpClient
Copyright 1999-2007 The Apache Software Foundation
This product includes software developed by The Apache Software Foundation (http://www.apache.org/).
### Apache Log4j
Copyright 1999-2012 Apache Software Foundation
This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
ResolverUtil.java Copyright 2005-2006 Tim Fennell
### Ionicons
Copyright (c) 2016 Drifty (http://drifty.com/)
ionicons.ttf Licensed under the accompanying MIT license
### Jackrabbit WebDAV Library
Copyright 2004-2014 The Apache Software Foundation
This product includes software developed at The Apache Software Foundation (http://www.apache.org/).
Based on source code originally developed by Day Software (http://www.day.com/).
### Jackson
Jackson is a high-performance, Free/Open Source JSON processing library.
It was originally written by Tatu Saloranta (tatu.saloranta@iki.fi), and has
been in development since 2007.
It is currently developed by a community of developers, as well as supported
commercially by FasterXML.com.
**Licensing:** Jackson core and extension components may licensed under different licenses.
To find the details that apply to this artifact see the accompanying Apache 2.0 license file.
For more information, including possible other licensing options, contact
FasterXML.com (http://fasterxml.com).
**Credits:** A list of contributors may be found from CREDITS file, which is included
in some artifacts (usually source distributions); but is always available
from the source code management (SCM) system project uses.
### Jetty
Copyright (c) 1995-2014 Mort Bay Consulting Pty. Ltd.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
and Apache License v2.0 which accompanies this distribution.
The UnixCrypt.java code implements the one way cryptography used by
Unix systems for simple password protection. Copyright 1996 Aki Yoshida,
modified April 2001 by Iris Van den Broeke, Daniel Deville.
Permission to use, copy, modify and distribute UnixCrypt
for non-commercial or commercial purposes and without fee is
granted provided that the copyright notice appears in all copies.
### JUnit
Copyright (c) 2000-2006, www.hamcrest.org
Licensed under the accompanying BSD license file.
+78 -25
View File
@@ -1,44 +1,97 @@
Cryptomator
====================
[![cryptomator](cryptomator.png)](https://cryptomator.org/)
[![Build Status](https://travis-ci.org/cryptomator/cryptomator.svg?branch=master)](https://travis-ci.org/cryptomator/cryptomator)
[![Join the chat at https://gitter.im/cryptomator/cryptomator](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/cryptomator/cryptomator?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
[![Build](https://github.com/cryptomator/cryptomator/workflows/Build/badge.svg)](https://github.com/cryptomator/cryptomator/actions/workflows/build.yml?query=branch%3Adevelop)
[![Known Vulnerabilities](https://snyk.io/test/github/cryptomator/cryptomator/badge.svg)](https://snyk.io/test/github/cryptomator/cryptomator)
[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=cryptomator_cryptomator&metric=alert_status)](https://sonarcloud.io/dashboard?id=cryptomator_cryptomator)
[![Mastodon](https://img.shields.io/mastodon/follow/176112?domain=mastodon.online&style=flat)](https://mastodon.online/@cryptomator)
[![Crowdin](https://badges.crowdin.net/cryptomator/localized.svg)](https://translate.cryptomator.org/)
[![Latest Release](https://img.shields.io/github/release/cryptomator/cryptomator.svg)](https://github.com/cryptomator/cryptomator/releases/latest)
[![Community](https://img.shields.io/badge/help-Community-orange.svg)](https://community.cryptomator.org)
Multiplatform transparent client-side encryption of your files in the cloud.
## Supporting Cryptomator
If you want to take a look at the current beta version, go ahead and get your copy of cryptomator on [Cryptomator.org](https://cryptomator.org) or clone and build Cryptomator using Maven (instructions below).
Cryptomator is provided free of charge as an open-source project despite the high development effort and is therefore dependent on donations. If you are also interested in further development, we offer you the opportunity to support us:
- [One-time or recurring donation via Cryptomator's website.](https://cryptomator.org/#donate)
- [Become a sponsor via Cryptomator's sponsors website.](https://cryptomator.org/sponsors/)
### Gold Sponsors
Become our Gold Sponsor and showcase your brand to a targeted audience! Please contact us if you are interested.
### Silver Sponsors
<table>
<tbody>
<tr>
<td><a href="https://www.gee-whiz.de/"><img src="https://cryptomator.org/img/sponsors/geewhiz.svg" alt="gee-whiz" height="56"></a></td>
<td><a href="https://www.route4me.com/"><img src="https://cryptomator.org/img/sponsors/route4me.svg" alt="Route4Me" height="56"></a></td>
</tr>
</tbody>
</table>
### Special Shoutout
Continuous integration hosting for ARM64 builds is provided by [MacStadium](https://www.macstadium.com/company/opensource).
<a href="https://www.macstadium.com/company/opensource"><img src="https://uploads-ssl.webflow.com/5ac3c046c82724970fc60918/5c019d917bba312af7553b49_MacStadium-developerlogo.png" alt="MacStadium" height="100"></a>
---
## Introduction
Cryptomator offers multi-platform transparent client-side encryption of your files in the cloud.
Download native binaries of Cryptomator on [cryptomator.org](https://cryptomator.org/) or clone and build Cryptomator using Maven (instructions below).
## Features
- Totally transparent: Just work on the encrypted volume, as if it was an USB flash drive
- Works with Dropbox, OneDrive (Skydrive), Google Drive and any other cloud storage, that syncs with a local directory.
- In fact it works with any directory. You can use it to encrypt as many folders as you like
- Works with Dropbox, Google Drive, OneDrive, MEGA, pCloud, ownCloud, Nextcloud and any other cloud storage service which synchronizes with a local directory
- Open Source means: No backdoors, control is better than trust
- Client-side: No accounts, no data shared with any online service
- Totally transparent: Just work on the virtual drive as if it were a USB flash drive
- AES encryption with 256-bit key length
- Client-side. No accounts, no data shared with any online service
- Filenames get encrypted too
- No need to provide credentials for any 3rd party service
- Open Source means: No backdoors. Control is better than trust
- Use as many encrypted folders in your Dropbox as you want. Each having individual passwords
- No commercial interest, no government agency, no wasted taxpayers' money ;-)
- File names get encrypted
- Folder structure gets obfuscated
- Use as many vaults in your Dropbox as you want, each having individual passwords
- More than Five thousand commits for the security of your data!! :tada:
### Privacy
- 256 bit keys (unlimited strength policy bundled with native binaries - 128-bit elsewhere)
- 256-bit keys (unlimited strength policy bundled with native binaries)
- Scrypt key derivation
- Cryptographically secure random numbers for salts, IVs and the master key of course
- Sensitive data is swiped from the heap asap
- Cryptographically secure random numbers for salts, IVs and the masterkey of course
- Sensitive data is wiped from the heap asap
- Lightweight: [Complexity kills security](https://www.schneier.com/essays/archives/1999/11/a_plea_for_simplicit.html)
### Consistency
- HMAC over file contents to recognize changed ciphertext before decryption
- I/O operations are transactional and atomic, if the file systems support it
- Each file contains all information needed for decryption (except for the key of course). No common metadata means no [SPOF](http://en.wikipedia.org/wiki/Single_point_of_failure)
- Authenticated encryption is used for file content to recognize changed ciphertext before decryption
- I/O operations are transactional and atomic, if the filesystems support it
- Each file contains all information needed for decryption (except for the key of course), no common metadata means no [SPOF](http://en.wikipedia.org/wiki/Single_point_of_failure)
### Security Architecture
For more information on the security details visit [cryptomator.org](https://docs.cryptomator.org/security/architecture/).
## Building
#### Dependencies
* Java 8 + JCE unlimited strength policy files (needed for 256-bit keys)
### Dependencies
* JDK 24 (e.g. temurin, zulu)
* Maven 3
* Optional: OS-dependent build tools for native packaging (See [Windows](https://github.com/cryptomator/cryptomator-win), [OS X](https://github.com/cryptomator/cryptomator-osx), [Debian](https://github.com/cryptomator/cryptomator-deb))
### Run Maven
```
mvn clean install
# or mvn clean install -Pwin
# or mvn clean install -Pmac
# or mvn clean install -Plinux
```
This will build all the jars and bundle them together with their OS-specific dependencies under `target`. This can now be used to build native packages.
## License
Distributed under the MIT X Consortium license. See the LICENSE file for more info.
This project is dual-licensed under the GPLv3 for FOSS projects as well as a commercial license for independent software vendors and resellers. If you want to modify this application under different conditions, feel free to contact our support team.
BIN
View File
Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

+6
View File
@@ -0,0 +1,6 @@
# downloaded/created during build
openjfx-jmods.zip
*.jmod
Cryptomator.AppDir
*.AppImage
*.AppImage.zsync
Vendored Executable
+139
View File
@@ -0,0 +1,139 @@
#!/bin/bash
set -e
cd $(dirname $0)
REVISION_NO=`git rev-list --count HEAD`
# check preconditions
if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/path/to/jdk ./build.sh"; exit 1; fi
command -v mvn >/dev/null 2>&1 || { echo >&2 "mvn not found."; exit 1; }
command -v curl >/dev/null 2>&1 || { echo >&2 "curl not found."; exit 1; }
command -v unzip >/dev/null 2>&1 || { echo >&2 "unzip not found."; exit 1; }
VERSION=$(mvn -f ../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout)
SEMVER_STR=${VERSION}
CPU_ARCH=$(uname -m)
if [[ ! "${CPU_ARCH}" =~ x86_64|aarch64 ]]; then echo "Platform ${CPU_ARCH} not supported"; exit 1; fi
mvn -f ../../../pom.xml versions:set -DnewVersion=${SEMVER_STR}
# compile
mvn -B -f ../../../pom.xml clean package -Plinux -DskipTests
cp ../../../LICENSE.txt ../../../target
cp ../../../target/cryptomator-*.jar ../../../target/mods
JAVAFX_VERSION=25
JAVAFX_ARCH="x64"
JAVAFX_JMODS_SHA256='96e520f48610d8ffb94ca30face1f11ffe8a977ddc1c4ff80b1a9e9f048bd94e'
if [ "${CPU_ARCH}" = "aarch64" ]; then
JAVAFX_ARCH="aarch64"
JAVAFX_JMODS_SHA256='951c52481af0ec5885b06f1ebaa8a10da7e8ea23c5e1ef3e2f6f11fa1b3a7ce1'
fi
# download javaFX jmods
JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_linux-${JAVAFX_ARCH}_bin-jmods.zip"
curl -L ${JAVAFX_JMODS_URL} -o openjfx-jmods.zip
echo "${JAVAFX_JMODS_SHA256} openjfx-jmods.zip" | shasum -a256 --check
mkdir -p openjfx-jmods
unzip -o -j openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
JMOD_VERSION=$(jmod describe ./openjfx-jmods/javafx.base.jmod | head -1)
JMOD_VERSION=${JMOD_VERSION#*@}
JMOD_VERSION=${JMOD_VERSION%%.*}
POM_JFX_VERSION=$(mvn help:evaluate "-Dexpression=javafx.version" -q -DforceStdout -B -f ../../../pom.xml)
POM_JFX_VERSION=${POM_JFX_VERSION#*@}
POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
if [ $POM_JFX_VERSION -ne $JMOD_VERSION ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != amd64 jmod version (${JMOD_VERSION})"
exit 1
fi
# create runtime
## check for JEP 493
JMOD_PATHS="openjfx-jmods"
if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
fi
## create runtime image
${JAVA_HOME}/bin/jlink \
--verbose \
--output runtime \
--module-path "${JMOD_PATHS}" \
--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler \
--strip-native-commands \
--no-header-files \
--no-man-pages \
--strip-debug \
--compress zip-0
# create app dir
${JAVA_HOME}/bin/jpackage \
--verbose \
--type app-image \
--runtime-image runtime \
--input ../../../target/libs \
--module-path ../../../target/mods \
--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator \
--dest appdir \
--name Cryptomator \
--vendor "Skymatic GmbH" \
--java-options "--enable-preview" \
--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
--copyright "(C) 2016 - 2025 Skymatic GmbH" \
--java-options "-Xss5m" \
--java-options "-Xmx256m" \
--app-version "${VERSION}.${REVISION_NO}" \
--java-options "-Dfile.encoding=\"utf-8\"" \
--java-options "-Djava.net.useSystemProxies=true" \
--java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\"" \
--java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\"" \
--java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\"" \
--java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" \
--java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\"" \
--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/.local/share/Cryptomator/mnt\"" \
--java-options "-Dcryptomator.showTrayIcon=true" \
--java-options "-Dcryptomator.integrationsLinux.trayIconsDir=\"@{appdir}/usr/share/icons/hicolor/symbolic/apps\"" \
--java-options "-Dcryptomator.buildNumber=\"appimage-${REVISION_NO}\"" \
--java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\"" \
--java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log" \
--resource-dir ../resources
# transform AppDir
mv appdir/Cryptomator Cryptomator.AppDir
cp -r resources/AppDir/* Cryptomator.AppDir/
envsubst '${REVISION_NO}' < resources/AppDir/bin/cryptomator.sh > Cryptomator.AppDir/bin/cryptomator.sh
cp ../common/org.cryptomator.Cryptomator256.png Cryptomator.AppDir/usr/share/icons/hicolor/256x256/apps/org.cryptomator.Cryptomator.png
cp ../common/org.cryptomator.Cryptomator512.png Cryptomator.AppDir/usr/share/icons/hicolor/512x512/apps/org.cryptomator.Cryptomator.png
cp ../common/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg
cp ../common/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg
cp ../common/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg
cp ../common/org.cryptomator.Cryptomator.tray.svg Cryptomator.AppDir/usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-symbolic.svg
cp ../common/org.cryptomator.Cryptomator.tray-unlocked.svg Cryptomator.AppDir/usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked-symbolic.svg
cp ../common/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/usr/share/applications/org.cryptomator.Cryptomator.desktop
cp ../common/org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.metainfo.xml
cp ../common/application-vnd.cryptomator.vault.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.vault.xml
cp ../common/application-vnd.cryptomator.encrypted.xml Cryptomator.AppDir/usr/share/mime/packages/application-vnd.cryptomator.encrypted.xml
ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/org.cryptomator.Cryptomator.svg
ln -s usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.svg Cryptomator.AppDir/.DirIcon
ln -s usr/share/applications/org.cryptomator.Cryptomator.desktop Cryptomator.AppDir/org.cryptomator.Cryptomator.desktop
ln -s org.cryptomator.Cryptomator.metainfo.xml Cryptomator.AppDir/usr/share/metainfo/org.cryptomator.Cryptomator.appdata.xml
ln -s bin/cryptomator.sh Cryptomator.AppDir/AppRun
# load AppImageTool
curl -L https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${CPU_ARCH}.AppImage -o /tmp/appimagetool.AppImage
chmod +x /tmp/appimagetool.AppImage
# create AppImage
/tmp/appimagetool.AppImage \
Cryptomator.AppDir \
cryptomator-${SEMVER_STR}-${CPU_ARCH}.AppImage \
-u "gh-releases-zsync|cryptomator|cryptomator|latest|cryptomator-*-${CPU_ARCH}.AppImage.zsync"
echo ""
echo "Done. AppImage successfully created: cryptomator-${SEMVER_STR}-${CPU_ARCH}.AppImage"
echo ""
echo >&2 "To clean up, run: rm -rf Cryptomator.AppDir appdir runtime squashfs-root openjfx-jmods; rm /tmp/appimagetool.AppImage openjfx-jmods.zip"
echo ""
+22
View File
@@ -0,0 +1,22 @@
#!/bin/sh
cd $(dirname $0)
# determine GTK version
GTK2_PRESENT=1 # initially false
GTK3_PRESENT=0 # initially true
if command -v dpkg &> /dev/null; then # do stuff for debian based things
GTK2_PRESENT=`dpkg -l libgtk* | grep -e '\^ii' | grep -e 'libgtk2-*' &> /dev/null; echo $?`
GTK3_PRESENT=`dpkg -l libgtk* | grep -e '\^ii' | grep -e 'libgtk-3-*' &> /dev/null; echo $?`
elif command -v rpm &> /dev/null; then # do stuff for rpm based things (including yum/dnf)
GTK2_PRESENT=`rpm -qa | grep -e '\^gtk2-[0-9][0-9]*' &> /dev/null; echo $?`
GTK3_PRESENT=`rpm -qa | grep -e '\^gtk3-[0-9][0-9]*' &> /dev/null; echo $?`
elif command -v pacman &> /dev/null; then # don't forget arch
GTK2_PRESENT=`pacman -Qi gtk2 &> /dev/null; echo $?`
GTK3_PRESENT=`pacman -Qi gtk3 &> /dev/null; echo $?`
fi
if [ "$GTK2_PRESENT" -eq 0 ] && [ "$GTK3_PRESENT" -ne 0 ]; then
bin/Cryptomator-gtk2 $@
else
bin/Cryptomator $@
fi
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/vnd.cryptomator.encrypted">
<comment>Cryptomator Encrypted Data</comment>
<glob pattern="*.c9r"/>
<glob pattern="*.c9s"/>
<glob pattern="*.c9u"/>
</mime-type>
</mime-info>
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
<mime-type type="application/vnd.cryptomator.vault">
<comment>Cryptomator Vault Metadata</comment>
<glob pattern="*.cryptomator"/>
</mime-type>
</mime-info>
+11
View File
@@ -0,0 +1,11 @@
[Desktop Entry]
Name=Cryptomator
Comment=Cloud Storage Encryption Utility
Exec=cryptomator %F
Icon=org.cryptomator.Cryptomator
Terminal=false
Type=Application
Categories=Utility;Security;FileTools;
StartupNotify=true
StartupWMClass=org.cryptomator.launcher.Cryptomator$MainApp
MimeType=application/vnd.cryptomator.encrypted;application/vnd.cryptomator.vault;
@@ -0,0 +1,219 @@
<?xml version="1.0" encoding="UTF-8"?>
<component type="desktop-application">
<id>org.cryptomator.Cryptomator</id>
<metadata_license>FSFAP</metadata_license>
<project_license>GPL-3.0-or-later</project_license>
<name>Cryptomator</name>
<summary>Encryption for your cloud made easy</summary>
<keywords>
<keyword>encryption</keyword>
<keyword>security</keyword>
<keyword>privacy</keyword>
</keywords>
<description>
<p>
Cryptomator provides easy-to-use, transparent, client-side encryption for your cloud.
It protects your documents from unauthorized access and prying eyes, while you will still be able to view and edit your documents locally.
By not requiring any registration or account and performing all encryption locally, it gives you back control over your data and ensures your privacy.
Cryptomator is offered for all major platforms (including Android and iOS).
</p>
<p>
Cryptomator encrypts file contents and names using the widespread industry standard AES.
Your passphrase is protected against brute forcing attempts using scrypt.
Additionally, directory structures get obfuscated.
For more info about the Cryptomator encryption scheme, check out the online documentation.
</p>
<p>
Cryptomator is a free and open-source software licensed under the GPLv3.
This allows anyone to check our code.
Thus, it is impossible to introduce backdoors for third parties or to hide vulnerabilities, so you do not need to trust Cryptomator.
Also, vendor lock-ins are impossible.
Even if we decided to stop development: The source code is already cloned by hundreds of other developers and development can be picked up by others.
</p>
</description>
<categories>
<category>Office</category>
<category>Security</category>
<category>FileTools</category>
</categories>
<launchable type="desktop-id">org.cryptomator.Cryptomator.desktop</launchable>
<provides>
<binary>cryptomator</binary>
<mediatype>application/vnd.cryptomator.vault</mediatype>
<mediatype>application/vnd.cryptomator.encrypted</mediatype>
</provides>
<screenshots>
<screenshot type="default">
<caption>Encrypts your data, protects your privacy</caption>
<image>https://static.cryptomator.org/desktop/flathubScreenshots/MainWindowUnlockDialog_light.png</image>
</screenshot>
<screenshot>
<caption>Dark theme available</caption>
<image>https://static.cryptomator.org/desktop/flathubScreenshots/MainWindowUnlocked_dark.png</image>
</screenshot>
<screenshot>
<caption>Easy to use - work on encrypted files as if they were not</caption>
<image>https://static.cryptomator.org/desktop/flathubScreenshots/MainWindowUnlocked_light.png</image>
</screenshot>
</screenshots>
<branding>
<color type="primary" scheme_preference="light">#EBF5EB</color>
<color type="primary" scheme_preference="dark">#2F4858</color>
</branding>
<url type="homepage">https://cryptomator.org/</url>
<url type="bugtracker">https://github.com/cryptomator/cryptomator/issues/</url>
<url type="donation">https://cryptomator.org/donate</url>
<url type="faq">https://community.cryptomator.org/c/kb/faq</url>
<url type="help">https://docs.cryptomator.org/</url>
<url type="translate">https://translate.cryptomator.org</url>
<developer id="de.skymatic">
<name>Skymatic GmbH</name>
</developer>
<content_rating type="oars-1.1">
<content_attribute id="social-info">mild</content_attribute> <!-- update checker connects to https://api.cryptomator.org/updates/latestVersion.json -->
</content_rating>
<releases>
<release date="2025-11-12" version="1.18.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.18.0</url>
</release>
<release date="2025-07-08" version="1.17.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.17.1</url>
</release>
<release date="2025-06-24" version="1.17.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.17.0</url>
</release>
<release date="2025-05-15" version="1.16.2">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.16.2</url>
</release>
<release date="2025-04-30" version="1.16.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.16.1</url>
</release>
<release date="2025-04-29" version="1.16.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.16.0</url>
</release>
<release date="2025-04-09" version="1.15.3">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.3</url>
</release>
<release date="2025-04-04" version="1.15.2">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.2</url>
</release>
<release date="2025-02-05" version="1.15.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.1</url>
</release>
<release date="2025-02-03" version="1.15.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.15.0</url>
</release>
<release date="2024-11-19" version="1.14.2">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.14.2</url>
</release>
<release date="2024-09-17" version="1.14.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.14.0</url>
</release>
<release date="2024-06-26" version="1.13.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.13.0</url>
</release>
<release date="2024-03-27" version="1.12.4">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.12.4</url>
</release>
<release date="2024-02-27" version="1.12.3">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.12.3</url>
</release>
<release date="2024-02-09" version="1.12.2">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.12.2</url>
</release>
<release date="2024-02-07" version="1.12.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.12.1</url>
</release>
<release date="2024-02-06" version="1.12.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.12.0</url>
</release>
<release date="2023-12-05" version="1.11.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.11.1</url>
</release>
<release date="2023-11-08" version="1.11.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.11.0</url>
</release>
<release date="2023-09-20" version="1.10.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.10.1</url>
</release>
<release date="2023-09-11" version="1.10.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.10.0</url>
</release>
<release date="2023-08-11" version="1.9.4">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.9.4</url>
</release>
<release date="2023-08-07" version="1.9.3">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.9.3</url>
</release>
<release date="2023-07-24" version="1.9.2">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.9.2</url>
</release>
<release date="2023-06-07" version="1.9.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.9.1</url>
</release>
<release date="2023-05-30" version="1.9.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.9.0</url>
</release>
<release date="2023-04-25" version="1.8.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.8.0</url>
</release>
<release date="2023-04-07" version="1.7.5">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.7.5</url>
</release>
<release date="2023-04-05" version="1.7.4">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.7.4</url>
</release>
<release date="2023-03-15" version="1.7.3">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.7.3</url>
</release>
<release date="2023-03-07" version="1.7.2">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.7.2</url>
</release>
<release date="2023-03-03" version="1.7.1">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.7.1</url>
</release>
<release date="2023-03-01" version="1.7.0">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.7.0</url>
</release>
<release date="2022-12-14" version="1.6.17">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.17</url>
</release>
<release date="2022-12-06" version="1.6.16">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.16</url>
</release>
<release date="2022-10-06" version="1.6.15">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.15</url>
</release>
<release date="2022-08-31" version="1.6.14">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.14</url>
</release>
<release date="2022-07-27" version="1.6.12">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.12</url>
</release>
<release date="2022-07-26" version="1.6.11">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.11</url>
</release>
<release date="2022-05-03" version="1.6.10">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.10</url>
</release>
<release date="2022-04-27" version="1.6.9">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.9</url>
</release>
<release date="2022-03-30" version="1.6.8">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.8</url>
</release>
<release date="2021-12-16" version="1.6.5">
<url type="details">https://github.com/cryptomator/cryptomator/releases/1.6.5</url>
</release>
</releases>
</component>
+1
View File
@@ -0,0 +1 @@
<svg width="1110" height="1110" viewBox="0 0 1108.12 940.2" preserveAspectRatio="xMidYMid meet" xmlns="http://www.w3.org/2000/svg"><path d="m552.69 0c-169.1 0-262.45 143.46-262.45 283.52h524.9c0-140.06-105.33-283.52-262.45-283.52z" fill="#cfcfcf"/><path d="m552.69 53.2c-137.37 0-213.21 116.54-213.21 230.32l213.21 24.18 213.21-24.18c0-113.78-85.57-230.32-213.21-230.32z" fill="#585e62"/><path d="m89.8 739.52a20 20 0 0 1 -2.23-39.88 42.8 42.8 0 1 0 -42.22-21.82 20 20 0 0 1 -35 19.31 82.79 82.79 0 1 1 81.76 42.26 21.78 21.78 0 0 1 -2.31.13z" fill="#585e62"/><rect fill="#cfcfcf" height="144.19" rx="49.42" transform="matrix(.8902923 .45538953 -.45538953 .8902923 261.57 -5.69)" width="104.68" x="90.27" y="467.98"/><path d="m149.47 401.27h62.8a0 0 0 0 1 0 0v94.55a31.4 31.4 0 0 1 -31.4 31.4 31.4 31.4 0 0 1 -31.4-31.4v-94.55a0 0 0 0 1 0 0z" fill="#585e62" transform="matrix(.8902923 .45538953 -.45538953 .8902923 231.23 -31.44)"/><circle cx="222.59" cy="387.53" fill="#cfcfcf" r="75.05"/><path d="m258.09 321.8a75.09 75.09 0 0 0 -91.23 14.64 75.06 75.06 0 0 1 51.58 126.06 75.06 75.06 0 0 0 39.65-140.7z" fill="#b1b1b1"/><path d="m1018.31 739.52a22.09 22.09 0 0 1 -2.28-.13 82.8 82.8 0 1 1 81.77-42.26 20 20 0 1 1 -35-19.31 42.8 42.8 0 1 0 -42.23 21.82 20 20 0 0 1 -2.23 39.88z" fill="#585e62"/><rect fill="#cfcfcf" height="144.19" rx="49.42" transform="matrix(-.8902923 .45538953 -.45538953 -.8902923 2071.05 581.27)" width="104.68" x="913.18" y="467.98"/><path d="m927.25 401.27a31.4 31.4 0 0 1 31.4 31.4v94.55a0 0 0 0 1 0 0h-62.8a0 0 0 0 1 0 0v-94.55a31.4 31.4 0 0 1 31.4-31.4z" fill="#585e62" transform="matrix(-.8902923 .45538953 -.45538953 -.8902923 1964.18 455.35)"/><circle cx="885.53" cy="387.53" fill="#cfcfcf" r="75.05"/><path d="m850 321.8a75.08 75.08 0 0 1 91.22 14.64 75.06 75.06 0 0 0 -51.54 126.06 75.05 75.05 0 0 1 -39.68-140.7z" fill="#b1b1b1"/><path d="m248.78 940.2c-36.67 0-67-39.85-75.51-99.15-4.56-31.83-2.26-65.19 6.48-94 9.41-31 25.51-53.59 45.32-63.72a51.72 51.72 0 0 1 23.69-5.84h103.52v262.71z" fill="#585e62"/><path d="m351.43 940.2c-21.26 0-38.85-39.85-43.78-99.15-2.64-31.83-1.31-65.19 3.76-94 5.45-31 14.78-53.59 26.27-63.72 4.39-3.87 9-5.84 13.73-5.84s9.34 2 13.75 5.8l49.7 43.83c17.37 15.32 23.39 64 20.23 102-2.43 29.28-10 52.18-20.19 61.28l-49.69 43.82c-4.44 3.99-9.08 5.98-13.78 5.98z" fill="#585e62"/><path d="m360.57 699 49.65 43.79c11.18 9.9 17.78 47.45 14.78 83.91-2 24.27-7.83 41.95-14.77 48.13l-49.65 43.79c-18.58 16.38-37.79-19.43-42.83-80.07s6-123.1 24.58-139.51c6.15-5.42 12.5-5.04 18.24-.04z" fill="#35393b"/><path d="m850.73 940.2c36.66 0 67-39.85 75.51-99.15 4.56-31.83 2.26-65.19-6.48-94-9.41-31-25.51-53.59-45.32-63.72a51.72 51.72 0 0 0 -23.69-5.84h-103.53v262.71z" fill="#585e62"/><path d="m748.08 940.2c21.26 0 38.85-39.85 43.78-99.15 2.64-31.83 1.31-65.19-3.76-94-5.45-31-14.79-53.59-26.27-63.72-4.4-3.87-9-5.84-13.73-5.84s-9.34 2-13.76 5.8l-49.69 43.83c-17.38 15.32-23.39 64-20.23 102 2.43 29.28 10 52.18 20.19 61.28l49.68 43.82c4.45 3.99 9.09 5.98 13.79 5.98z" fill="#585e62"/><path d="m738.94 699-49.65 43.79c-11.19 9.86-17.8 47.41-14.77 83.87 2 24.27 7.83 41.95 14.77 48.13l49.65 43.79c18.61 16.41 37.78-19.43 42.82-80.07s-6-123.1-24.58-139.51c-6.18-5.38-12.5-5-18.24 0z" fill="#35393b"/><path d="m848.63 451.38a83.62 83.62 0 0 1 -.56-45.6c14.74-53.13 5.06-111.78 5.06-111.78-185.07-57.77-300.13-.48-300.13-.48s-114.79-57.64-300-.45c0 0-9.86 58.64 4.72 111.83a83.69 83.69 0 0 1 -.69 45.59c-5.14 17.57-10.72 44.5-10.77 78.8-.37 249 306 326.08 306 326.08s306.58-76.15 306.95-325.16c0-34.3-5.49-61.21-10.58-78.83z" fill="#cfcfcf"/><path d="m552.34 808.87c-50.72-15.87-261.7-93.25-261.42-279.51 0-29.65 4.89-52.42 9-66.31a128.3 128.3 0 0 0 .91-70c-6.2-22.58-6.9-47.13-6.17-65.29 40.48-10.23 80.2-15.37 118.41-15.32 75.66.12 119.86 21 120.3 21.17l20.39 10.23 19.24-10.32c.11 0 44.36-20.75 120-20.64 38.21.06 77.91 5.32 118.37 15.68.67 18.14-.1 42.71-6.37 65.27a128.33 128.33 0 0 0 .69 70c4 13.91 8.82 36.69 8.77 66.35-.28 187.06-211.26 263.09-262.12 278.69z" fill="#49b04a"/><path d="m610.15 478.76a57.46 57.46 0 1 0 -70.15 55.92l-32.29 135.47 44.67 12.85 44.71-12.71-31.84-135.57a57.46 57.46 0 0 0 44.9-55.96z" fill="#35393b"/><g fill="#49b04a"><path d="m454.94 131.08a60.64 60.64 0 0 0 -60.64 60.64h121.28a60.64 60.64 0 0 0 -60.64-60.64z"/><path d="m642.38 131.08a60.64 60.64 0 0 0 -60.64 60.64h121.26a60.64 60.64 0 0 0 -60.62-60.64z"/><circle cx="483.23" cy="229.43" r="11.52"/><circle cx="528.52" cy="229.43" r="11.52"/><circle cx="573.8" cy="229.43" r="11.52"/><circle cx="619.09" cy="229.43" r="11.52"/></g></svg>

After

Width:  |  Height:  |  Size: 4.5 KiB

@@ -0,0 +1,16 @@
<svg height="16" viewBox="0 0 42 42" width="16" xmlns="http://www.w3.org/2000/svg">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text {
color:#222222;
}
.ColorScheme-Highlight {
color:#49B04A;
}
</style>
</defs>
<g fill-rule="evenodd">
<path d="m15.591 35.824c-.019.009-.936.775-1.458 1.208a.418.418 0 0 1 -.627-.111 9.322 9.322 0 0 1 -.3-5.974 15.843 15.843 0 0 0 2.894 2.043c.051 1.03-.161 2.644-.509 2.834zm6.409-6.824h-2l.5-5a2 2 0 1 1 1 0zm-14.544-3.241.744-1.366a1.579 1.579 0 0 0 -.019-1.557l.653-1.2c.2.014-.03-.113.165-.14.051-.217-.051-.336 0-.5a3.269 3.269 0 0 0 0-1.5 7.151 7.151 0 0 1 0-3 2.366 2.366 0 0 0 -2.378 1.448 2.409 2.409 0 0 0 .229 2.661l-.7 1.278a1.779 1.779 0 0 0 -1.317.891l-.741 1.372a1.577 1.577 0 0 0 -.019 1.487 3.028 3.028 0 0 0 -2.746 1.525 2.648 2.648 0 0 0 .044 2.631.748.748 0 0 0 .981.266.656.656 0 0 0 .284-.92 1.37 1.37 0 0 1 -.023-1.361 1.6 1.6 0 0 1 2.079-.63 1.408 1.408 0 0 1 .672 1.95 1.546 1.546 0 0 1 -1.2.78.688.688 0 0 0 -.636.749.707.707 0 0 0 .717.6.789.789 0 0 0 .082 0 2.989 2.989 0 0 0 2.322-1.513 2.669 2.669 0 0 0 -.377-3.084 1.767 1.767 0 0 0 1.184-.867zm13.544-10.759a13.013 13.013 0 0 1 5-1 21.6 21.6 0 0 1 4.5.5 9.312 9.312 0 0 0 -9.5-8.5c-5.794 0-9.176 4-9.5 8.5a21.858 21.858 0 0 1 4.5-.5 12.819 12.819 0 0 1 5 1zm3.5-5c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm-7 0c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm14.473 6a8.067 8.067 0 0 0 -8.08 8v2.141a3.891 3.891 0 0 0 -2.893 3.734v5.125a23.166 23.166 0 0 1 -4.174-1.623 7.857 7.857 0 0 1 -.027.878 3.263 3.263 0 0 1 -.729 2.074l-1.794 1.483a.379.379 0 0 1 -.276.188h-4c-1.324 0-2.346-1.336-2.653-3.343a7.058 7.058 0 0 1 .234-3.18 3.477 3.477 0 0 1 1.636-2.157 1.868 1.868 0 0 1 .783-.32h1.5a8.035 8.035 0 0 1 -1.5-5 11.1 11.1 0 0 1 .5-3 2.519 2.519 0 0 0 0-1.5 13.272 13.272 0 0 1 -.5-3.5c6.687-1.936 11 0 11 0s4.319-1.955 11 0" class="ColorScheme-Text" fill="currentColor"/>
<path d="m39 28h-10v-4a3.13 3.13 0 0 1 3-3 3.087 3.087 0 0 1 3 3v1a1.034 1.034 0 0 0 1 1h1a1.034 1.034 0 0 0 1-1v-1a6 6 0 0 0 -12 0v4h-1a2.073 2.073 0 0 0 -2 2v6a2.073 2.073 0 0 0 2 2h14a2.073 2.073 0 0 0 2-2v-6a2.073 2.073 0 0 0 -2-2zm-5.391 5.94a1.609 1.609 0 0 1 -3.217 0v-1.876a1.609 1.609 0 0 1 3.217 0z" class="ColorScheme-Highlight" fill="currentColor"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.3 KiB

+10
View File
@@ -0,0 +1,10 @@
<svg height="16" viewBox="0 0 42 42" width="16" xmlns="http://www.w3.org/2000/svg">
<defs>
<style id="current-color-scheme" type="text/css">
.ColorScheme-Text {
color:#222222;
}
</style>
</defs>
<path d="m32.66 29.319a1.432 1.432 0 0 0 -.66-.319h-1.5a8.125 8.125 0 0 0 1.5-5 11.027 11.027 0 0 0 -.5-3 2.519 2.519 0 0 1 0-1.5 12.987 12.987 0 0 0 .5-3.5c-6.681-1.955-11 0-11 0s-4.313-1.936-11 0a13.272 13.272 0 0 0 .5 3.5 2.519 2.519 0 0 1 0 1.5 11.1 11.1 0 0 0 -.5 3 8.035 8.035 0 0 0 1.5 5h-1.5a1.868 1.868 0 0 0 -.783.319 3.477 3.477 0 0 0 -1.636 2.157 7.058 7.058 0 0 0 -.234 3.18c.307 2.008 1.329 3.344 2.653 3.344h4a.379.379 0 0 0 .277-.187l1.793-1.483a3.263 3.263 0 0 0 .729-2.074 7.857 7.857 0 0 0 .027-.878 23.166 23.166 0 0 0 4.174 1.622 24.4 24.4 0 0 0 4.051-1.614 7.848 7.848 0 0 0 .027.869 3.263 3.263 0 0 0 .729 2.074l1.793 1.484a.61.61 0 0 0 .4.187h4c1.324 0 2.223-1.336 2.529-3.343a7.057 7.057 0 0 0 -.234-3.18 3.477 3.477 0 0 0 -1.635-2.158zm-17.069 6.5c-.019.009-.936.775-1.458 1.208a.418.418 0 0 1 -.627-.111 9.322 9.322 0 0 1 -.3-5.974 15.843 15.843 0 0 0 2.894 2.048c.051 1.03-.161 2.644-.509 2.834zm6.409-6.819h-2l.5-5a2 2 0 1 1 1 0zm6.38 7.921a.418.418 0 0 1 -.627.111c-.522-.433-1.439-1.2-1.458-1.208-.348-.189-.56-1.8-.505-2.828a15.84 15.84 0 0 0 2.9-2.037 9.322 9.322 0 0 1 -.31 5.962zm-20.924-11.162.744-1.366a1.579 1.579 0 0 0 -.019-1.557l.653-1.2c.2.014-.03-.113.165-.14.051-.217-.051-.336 0-.5a3.269 3.269 0 0 0 0-1.5 7.151 7.151 0 0 1 0-3 2.366 2.366 0 0 0 -2.378 1.448 2.409 2.409 0 0 0 .229 2.661l-.7 1.278a1.779 1.779 0 0 0 -1.317.891l-.741 1.372a1.577 1.577 0 0 0 -.019 1.487 3.028 3.028 0 0 0 -2.746 1.525 2.648 2.648 0 0 0 .044 2.631.748.748 0 0 0 .981.266.656.656 0 0 0 .284-.92 1.37 1.37 0 0 1 -.023-1.361 1.6 1.6 0 0 1 2.079-.63 1.408 1.408 0 0 1 .672 1.95 1.546 1.546 0 0 1 -1.2.78.688.688 0 0 0 -.636.749.707.707 0 0 0 .717.6.789.789 0 0 0 .082 0 2.989 2.989 0 0 0 2.322-1.513 2.669 2.669 0 0 0 -.377-3.084 1.767 1.767 0 0 0 1.184-.867zm33.217 1.2a3.021 3.021 0 0 0 -2.658-1.525 1.574 1.574 0 0 0 -.107-1.283l-.745-1.367a1.779 1.779 0 0 0 -1.317-.891l-.7-1.278a2.409 2.409 0 0 0 .229-2.661 2.283 2.283 0 0 0 -2.375-1.454 7.039 7.039 0 0 1 0 3 3.272 3.272 0 0 0 0 1.5c.047.152-.047.3 0 .5.227.04-.069.156.165.14l.653 1.2a1.579 1.579 0 0 0 -.019 1.557l.745 1.367a1.753 1.753 0 0 0 1.045.832 2.66 2.66 0 0 0 -.238 2.916 2.989 2.989 0 0 0 2.326 1.509.79.79 0 0 0 .082 0 .707.707 0 0 0 .717-.6.688.688 0 0 0 -.636-.749 1.546 1.546 0 0 1 -1.2-.78 1.408 1.408 0 0 1 .672-1.95 1.628 1.628 0 0 1 1.179-.089 1.512 1.512 0 0 1 .9.719 1.37 1.37 0 0 1 -.023 1.361.656.656 0 0 0 .284.92.748.748 0 0 0 .981-.266 2.648 2.648 0 0 0 .04-2.633zm-19.673-11.959a13.013 13.013 0 0 1 5-1 21.6 21.6 0 0 1 4.5.5 9.312 9.312 0 0 0 -9.5-8.5c-5.794 0-9.176 4-9.5 8.5a21.858 21.858 0 0 1 4.5-.5 12.819 12.819 0 0 1 5 1zm3.5-5c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2zm-7 0c1.209 0 2.5.866 2.5 2h-5c0-1.134 1.291-2 2.5-2z" fill-rule="evenodd" class="ColorScheme-Text" fill="currentColor"/>
</svg>

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 23 KiB

+5
View File
@@ -0,0 +1,5 @@
cryptomator (${PPA_VERSION}) jammy; urgency=low
* Full changelog can be found on https://github.com/cryptomator/cryptomator/releases
-- Cryptobot <releases@cryptomator.org> ${RFC2822_TIMESTAMP}
+1
View File
@@ -0,0 +1 @@
10
+23
View File
@@ -0,0 +1,23 @@
Source: cryptomator
Maintainer: Cryptobot <releases@cryptomator.org>
Section: utils
Priority: optional
Build-Depends: debhelper (>=10), openjdk-25-jdk (>= 25+36), libgtk-3-0 (>= 3.20.0), libxxf86vm1, libgl1
Standards-Version: 4.5.0
Homepage: https://cryptomator.org
Vcs-Git: https://github.com/cryptomator/cryptomator.git
Vcs-browser: https://github.com/cryptomator/cryptomator
Package: cryptomator
Architecture: any
Section: utils
Priority: optional
Depends: ${shlibs:Depends}, ${misc:Depends}, fuse3, libgtk-3-0 (>= 3.20.0)
Recommends: gvfs-backends, gvfs-fuse, gnome-keyring
XB-AppName: Cryptomator
XB-Category: Utility;Security;FileTools;
Homepage: https://cryptomator.org
Description: Multi-platform client-side encryption of your cloud files.
Cryptomator provides free client-side AES encryption for your cloud files.
Create encrypted vaults, which get mounted as virtual volumes. Whatever
you save on one of these volumes will end up encrypted inside your vault.
+39
View File
@@ -0,0 +1,39 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: cryptomator
Upstream-Contact: Cryptomator <info@cryptomator.org>
Source: https://cryptomator.org
Files: *
Copyright: 2016-2025 Skymatic GmbH
License: GPL-3+
Files: debian/org.cryptomator.Cryptomator.appdata.xml
Copyright: 2016-2025 Skymatic GmbH
License: FSFAP
License: GPL-3+
This program is free software: you can redistribute it
and/or modify it under the terms of the GNU General Public
License as published by the Free Software Foundation, either
version 3 of the License, or (at your option) any later
version.
.
This program is distributed in the hope that it will be
useful, but WITHOUT ANY WARRANTY; without even the implied
warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
PURPOSE. See the GNU General Public License for more
details.
.
You should have received a copy of the GNU General Public
License along with this program. If not, see
<https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 3 can be found in the file
`/usr/share/common-licenses/GPL-3'.
License: FSFAP
Copying and distribution of this file, with or without modification, are
permitted in any medium without royalty provided the copyright notice and
this notice are preserved. This file is offered as-is, without any
warranty.
+10
View File
@@ -0,0 +1,10 @@
cryptomator usr/lib
common/org.cryptomator.Cryptomator.desktop usr/share/applications
common/org.cryptomator.Cryptomator.svg usr/share/icons/hicolor/scalable/apps
common/org.cryptomator.Cryptomator.tray.svg usr/share/icons/hicolor/scalable/apps
common/org.cryptomator.Cryptomator.tray-unlocked.svg usr/share/icons/hicolor/scalable/apps
common/org.cryptomator.Cryptomator256.png usr/share/icons/hicolor/256x256/apps
common/org.cryptomator.Cryptomator512.png usr/share/icons/hicolor/512x512/apps
common/org.cryptomator.Cryptomator.metainfo.xml usr/share/metainfo
common/application-vnd.cryptomator.vault.xml usr/share/mime/packages
common/application-vnd.cryptomator.encrypted.xml usr/share/mime/packages
+3
View File
@@ -0,0 +1,3 @@
usr/lib/cryptomator/bin/cryptomator usr/bin/cryptomator
usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray.svg usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-symbolic.svg
usr/share/icons/hicolor/scalable/apps/org.cryptomator.Cryptomator.tray-unlocked.svg usr/share/icons/hicolor/symbolic/apps/org.cryptomator.Cryptomator.tray-unlocked-symbolic.svg
+45
View File
@@ -0,0 +1,45 @@
#!/bin/sh
# postinst script for Cryptomator
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <postinst> `configure' <most-recently-configured-version>
# * <old-postinst> `abort-upgrade' <new version>
# * <conflictor's-postinst> `abort-remove' `in-favour' <package>
# <new-version>
# * <postinst> `abort-remove'
# * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
# <failed-install-package> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
configure)
echo Adding shortcut to the menu
if [ ! -d "/usr/share/desktop-directories" ]; then
mkdir -p /usr/share/desktop-directories
fi
xdg-desktop-menu install --novendor /usr/share/applications/org.cryptomator.Cryptomator.desktop
xdg-mime install /usr/share/mime/packages/application-vnd.cryptomator.vault.xml
xdg-mime install /usr/share/mime/packages/application-vnd.cryptomator.encrypted.xml
;;
abort-upgrade|abort-remove|abort-deconfigure)
;;
*)
echo "postinst called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
+43
View File
@@ -0,0 +1,43 @@
#!/bin/sh
# prerm script for Cryptomator
#
# see: dh_installdeb(1)
set -e
# summary of how this script can be called:
# * <prerm> `remove'
# * <old-prerm> `upgrade' <new-version>
# * <new-prerm> `failed-upgrade' <old-version>
# * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
# * <deconfigured's-prerm> `deconfigure' `in-favour'
# <package-being-installed> <version> `removing'
# <conflicting-package> <version>
# for details, see http://www.debian.org/doc/debian-policy/ or
# the debian-policy package
case "$1" in
remove|upgrade|deconfigure)
echo Removing shortcut
xdg-desktop-menu uninstall --novendor /usr/share/applications/org.cryptomator.Cryptomator.desktop
xdg-mime uninstall /usr/share/mime/packages/application-vnd.cryptomator.vault.xml
xdg-mime uninstall /usr/share/mime/packages/application-vnd.cryptomator.encrypted.xml
;;
failed-upgrade)
;;
*)
echo "prerm called with unknown argument \`$1'" >&2
exit 1
;;
esac
# dh_installdeb will replace this with shell code automatically
# generated by other debhelper scripts.
#DEBHELPER#
exit 0
Vendored Executable
+69
View File
@@ -0,0 +1,69 @@
#!/usr/bin/make -f
# -*- makefile -*-
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
DEB_BUILD_ARCH ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
ifeq ($(DEB_BUILD_ARCH),amd64)
JAVA_HOME = /usr/lib/jvm/java-25-openjdk-amd64
JMODS_PATH = jmods/amd64:${JAVA_HOME}/jmods
else ifeq ($(DEB_BUILD_ARCH),arm64)
JAVA_HOME = /usr/lib/jvm/java-25-openjdk-arm64
JMODS_PATH = jmods/aarch64:${JAVA_HOME}/jmods
endif
%:
dh $@
override_dh_auto_clean:
rm -rf runtime
rm -rf cryptomator
rm -rf debian/cryptomator
rm -rf resources
override_dh_auto_build:
mkdir resources
ln -s ../common/org.cryptomator.Cryptomator512.png resources/cryptomator.png
# Remark: no compression is applied for improved build compression later (here deb)
$(JAVA_HOME)/bin/jlink \
--output runtime \
--module-path "${JMODS_PATH}" \
--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,jdk.net,java.compiler \
--strip-native-commands \
--no-header-files \
--no-man-pages \
--strip-debug \
--compress zip-0
$(JAVA_HOME)/bin/jpackage \
--type app-image \
--runtime-image runtime \
--input libs \
--module-path mods \
--module org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator \
--dest . \
--name cryptomator \
--vendor "Skymatic GmbH" \
--java-options "--enable-preview" \
--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.linux.amd64,org.cryptomator.jfuse.linux.aarch64,org.purejava.appindicator" \
--copyright "(C) 2016 - 2025 Skymatic GmbH" \
--java-options "-Xss5m" \
--java-options "-Xmx256m" \
--java-options "-Dfile.encoding=\"utf-8\"" \
--java-options "-Djava.net.useSystemProxies=true" \
--java-options "-Dcryptomator.logDir=\"@{userhome}/.local/share/Cryptomator/logs\"" \
--java-options "-Dcryptomator.pluginDir=\"@{userhome}/.local/share/Cryptomator/plugins\"" \
--java-options "-Dcryptomator.settingsPath=\"@{userhome}/.config/Cryptomator/settings.json:@{userhome}/.Cryptomator/settings.json\"" \
--java-options "-Dcryptomator.p12Path=\"@{userhome}/.config/Cryptomator/key.p12\"" \
--java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/.config/Cryptomator/ipc.socket\"" \
--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/.local/share/Cryptomator/mnt\"" \
--java-options "-Dcryptomator.showTrayIcon=true" \
--java-options "-Dcryptomator.integrationsLinux.trayIconsDir=\"/usr/share/icons/hicolor/symbolic/apps\"" \
--java-options "-Dcryptomator.buildNumber=\"deb-${REVISION_NUM}\"" \
--java-options "-Dcryptomator.appVersion=\"${SEMVER_STR}\"" \
--java-options "-Dcryptomator.disableUpdateCheck=\"${DISABLE_UPDATE_CHECK}\"" \
--java-options "-Dcryptomator.integrationsLinux.autoStartCmd=\"cryptomator\"" \
--java-options "-Dcryptomator.networking.truststore.p12Path=\"/etc/cryptomator/certs.p12\"" \
--app-version "${VERSION_NUM}.${REVISION_NUM}" \
--resource-dir resources \
--verbose
+1
View File
@@ -0,0 +1 @@
3.0 (quilt)
+2
View File
@@ -0,0 +1,2 @@
common/org.cryptomator.Cryptomator256.png
common/org.cryptomator.Cryptomator512.png
Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

+2
View File
@@ -0,0 +1,2 @@
embedded.provisionprofile
xcuserdata/
+22
View File
@@ -0,0 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>com.apple.application-identifier</key>
<string>###APP_IDENTIFIER_PREFIX###org.cryptomator</string>
<key>com.apple.developer.team-identifier</key>
<string>###TEAM_IDENTIFIER###</string>
<key>com.apple.security.cs.allow-jit</key>
<true/>
<key>com.apple.security.cs.allow-unsigned-executable-memory</key>
<true/>
<key>com.apple.security.cs.disable-executable-page-protection</key>
<true/>
<key>com.apple.security.cs.disable-library-validation</key>
<true/>
<key>keychain-access-groups</key>
<array>
<string>###APP_IDENTIFIER_PREFIX###org.cryptomator</string>
</array>
</dict>
</plist>
+19
View File
@@ -0,0 +1,19 @@
//
// CryptomatorDockTilePlugin.swift
// Integrations
//
// Created by Tobias Hagemann on 22.09.25.
// Copyright © 2025 Cryptomator. All rights reserved.
//
import AppKit
class CryptomatorDockTilePlugin: NSObject, NSDockTilePlugIn {
func setDockTile(_ dockTile: NSDockTile?) {
guard let dockTile = dockTile, let image = Bundle(for: Self.self).image(forResource: "Cryptomator") else {
return
}
dockTile.contentView = NSImageView(image: image)
dockTile.display()
}
}
@@ -0,0 +1,314 @@
// !$*UTF8*$!
{
archiveVersion = 1;
classes = {
};
objectVersion = 77;
objects = {
/* Begin PBXBuildFile section */
74E08DE12E8584DE007E665C /* CryptomatorDockTilePlugin.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74E08DE02E85847E007E665C /* CryptomatorDockTilePlugin.swift */; };
74E08DED2E858532007E665C /* Cryptomator.icns in Resources */ = {isa = PBXBuildFile; fileRef = 74E08DEC2E858532007E665C /* Cryptomator.icns */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
74E08DD92E858467007E665C /* Cryptomator.docktileplugin */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = Cryptomator.docktileplugin; sourceTree = BUILT_PRODUCTS_DIR; };
74E08DE02E85847E007E665C /* CryptomatorDockTilePlugin.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CryptomatorDockTilePlugin.swift; sourceTree = "<group>"; };
74E08DEC2E858532007E665C /* Cryptomator.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = Cryptomator.icns; path = ../resources/Cryptomator.icns; sourceTree = SOURCE_ROOT; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
74E08DD62E858467007E665C /* Frameworks */ = {
isa = PBXFrameworksBuildPhase;
buildActionMask = 2147483647;
files = (
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXFrameworksBuildPhase section */
/* Begin PBXGroup section */
74E08DD02E858467007E665C = {
isa = PBXGroup;
children = (
74E08DE02E85847E007E665C /* CryptomatorDockTilePlugin.swift */,
74E08DEC2E858532007E665C /* Cryptomator.icns */,
74E08DDA2E858467007E665C /* Products */,
);
sourceTree = "<group>";
};
74E08DDA2E858467007E665C /* Products */ = {
isa = PBXGroup;
children = (
74E08DD92E858467007E665C /* Cryptomator.docktileplugin */,
);
name = Products;
sourceTree = "<group>";
};
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
74E08DD82E858467007E665C /* DockTilePlugin */ = {
isa = PBXNativeTarget;
buildConfigurationList = 74E08DDD2E858467007E665C /* Build configuration list for PBXNativeTarget "DockTilePlugin" */;
buildPhases = (
74E08DD52E858467007E665C /* Sources */,
74E08DD62E858467007E665C /* Frameworks */,
74E08DD72E858467007E665C /* Resources */,
);
buildRules = (
);
dependencies = (
);
name = DockTilePlugin;
packageProductDependencies = (
);
productName = DockTilePlugin;
productReference = 74E08DD92E858467007E665C /* Cryptomator.docktileplugin */;
productType = "com.apple.product-type.bundle";
};
/* End PBXNativeTarget section */
/* Begin PBXProject section */
74E08DD12E858467007E665C /* Project object */ = {
isa = PBXProject;
attributes = {
BuildIndependentTargetsInParallel = 1;
LastUpgradeCheck = 2600;
ORGANIZATIONNAME = Cryptomator;
TargetAttributes = {
74E08DD82E858467007E665C = {
CreatedOnToolsVersion = 26.0.1;
};
};
};
buildConfigurationList = 74E08DD42E858467007E665C /* Build configuration list for PBXProject "DockTilePlugin" */;
developmentRegion = en;
hasScannedForEncodings = 0;
knownRegions = (
en,
Base,
);
mainGroup = 74E08DD02E858467007E665C;
minimizedProjectReferenceProxies = 1;
preferredProjectObjectVersion = 77;
productRefGroup = 74E08DDA2E858467007E665C /* Products */;
projectDirPath = "";
projectRoot = "";
targets = (
74E08DD82E858467007E665C /* DockTilePlugin */,
);
};
/* End PBXProject section */
/* Begin PBXResourcesBuildPhase section */
74E08DD72E858467007E665C /* Resources */ = {
isa = PBXResourcesBuildPhase;
buildActionMask = 2147483647;
files = (
74E08DED2E858532007E665C /* Cryptomator.icns in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXResourcesBuildPhase section */
/* Begin PBXSourcesBuildPhase section */
74E08DD52E858467007E665C /* Sources */ = {
isa = PBXSourcesBuildPhase;
buildActionMask = 2147483647;
files = (
74E08DE12E8584DE007E665C /* CryptomatorDockTilePlugin.swift in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
/* End PBXSourcesBuildPhase section */
/* Begin XCBuildConfiguration section */
74E08DDB2E858467007E665C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = YZQJQUHA3L;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_DYNAMIC_NO_PIC = NO;
GCC_NO_COMMON_BLOCKS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
GCC_PREPROCESSOR_DEFINITIONS = (
"DEBUG=1",
"$(inherited)",
);
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 11.5;
MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE;
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = macosx;
SWIFT_VERSION = 5.0;
};
name = Debug;
};
74E08DDC2E858467007E665C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
ASSETCATALOG_COMPILER_GENERATE_SWIFT_ASSET_SYMBOL_EXTENSIONS = YES;
CLANG_ANALYZER_NONNULL = YES;
CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE;
CLANG_CXX_LANGUAGE_STANDARD = "gnu++20";
CLANG_ENABLE_MODULES = YES;
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_ENABLE_OBJC_WEAK = YES;
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
CLANG_WARN_DOCUMENTATION_COMMENTS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE;
CLANG_WARN_UNREACHABLE_CODE = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = YZQJQUHA3L;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
GCC_C_LANGUAGE_STANDARD = gnu17;
GCC_NO_COMMON_BLOCKS = YES;
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
GCC_WARN_UNDECLARED_SELECTOR = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
GCC_WARN_UNUSED_FUNCTION = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
LOCALIZATION_PREFERS_STRING_CATALOGS = YES;
MACOSX_DEPLOYMENT_TARGET = 11.5;
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = macosx;
SWIFT_VERSION = 5.0;
};
name = Release;
};
74E08DDE2E858467007E665C /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Cryptomator. All rights reserved.";
INFOPLIST_KEY_NSPrincipalClass = CryptomatorDockTilePlugin;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.DockTilePlugin;
PRODUCT_NAME = Cryptomator;
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
WRAPPER_EXTENSION = docktileplugin;
};
name = Debug;
};
74E08DDF2E858467007E665C /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
CODE_SIGN_STYLE = Manual;
COMBINE_HIDPI_IMAGES = YES;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = "";
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_KEY_NSHumanReadableCopyright = "Copyright © 2025 Cryptomator. All rights reserved.";
INFOPLIST_KEY_NSPrincipalClass = CryptomatorDockTilePlugin;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Bundles";
MARKETING_VERSION = 1.0;
PRODUCT_BUNDLE_IDENTIFIER = org.cryptomator.DockTilePlugin;
PRODUCT_NAME = Cryptomator;
PROVISIONING_PROFILE_SPECIFIER = "";
SKIP_INSTALL = YES;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_EMIT_LOC_STRINGS = YES;
WRAPPER_EXTENSION = docktileplugin;
};
name = Release;
};
/* End XCBuildConfiguration section */
/* Begin XCConfigurationList section */
74E08DD42E858467007E665C /* Build configuration list for PBXProject "DockTilePlugin" */ = {
isa = XCConfigurationList;
buildConfigurations = (
74E08DDB2E858467007E665C /* Debug */,
74E08DDC2E858467007E665C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
74E08DDD2E858467007E665C /* Build configuration list for PBXNativeTarget "DockTilePlugin" */ = {
isa = XCConfigurationList;
buildConfigurations = (
74E08DDE2E858467007E665C /* Debug */,
74E08DDF2E858467007E665C /* Release */,
);
defaultConfigurationIsVisible = 0;
defaultConfigurationName = Release;
};
/* End XCConfigurationList section */
};
rootObject = 74E08DD12E858467007E665C /* Project object */;
}
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Workspace
version = "1.0">
<FileRef
location = "self:">
</FileRef>
</Workspace>
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "2600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
buildImplicitDependencies = "YES"
buildArchitectures = "Automatic">
<BuildActionEntries>
<BuildActionEntry
buildForTesting = "YES"
buildForRunning = "YES"
buildForProfiling = "YES"
buildForArchiving = "YES"
buildForAnalyzing = "YES">
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "74E08DD82E858467007E665C"
BuildableName = "Cryptomator.docktileplugin"
BlueprintName = "DockTilePlugin"
ReferencedContainer = "container:DockTilePlugin.xcodeproj">
</BuildableReference>
</BuildActionEntry>
</BuildActionEntries>
</BuildAction>
<TestAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
shouldUseLaunchSchemeArgsEnv = "YES"
shouldAutocreateTestPlan = "YES">
</TestAction>
<LaunchAction
buildConfiguration = "Debug"
selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
launchStyle = "0"
useCustomWorkingDirectory = "NO"
ignoresPersistentStateOnLaunch = "NO"
debugDocumentVersioning = "YES"
debugServiceExtension = "internal"
allowLocationSimulation = "YES">
</LaunchAction>
<ProfileAction
buildConfiguration = "Release"
shouldUseLaunchSchemeArgsEnv = "YES"
savedToolIdentifier = ""
useCustomWorkingDirectory = "NO"
debugDocumentVersioning = "YES">
<MacroExpansion>
<BuildableReference
BuildableIdentifier = "primary"
BlueprintIdentifier = "74E08DD82E858467007E665C"
BuildableName = "Cryptomator.docktileplugin"
BlueprintName = "DockTilePlugin"
ReferencedContainer = "container:DockTilePlugin.xcodeproj">
</BuildableReference>
</MacroExpansion>
</ProfileAction>
<AnalyzeAction
buildConfiguration = "Debug">
</AnalyzeAction>
<ArchiveAction
buildConfiguration = "Release"
revealArchiveInOrganizer = "YES">
</ArchiveAction>
</Scheme>
+9
View File
@@ -0,0 +1,9 @@
# downloaded/created during build
Cryptomator.app/
runtime/
dmg/
*.dmg
license.rtf
openjfx-jmods.zip
*.jmod
Cryptomator.entitlements
Vendored Executable
+210
View File
@@ -0,0 +1,210 @@
#!/bin/bash
# parse options
usage() { echo "Usage: $0 [-s <codesign-identity>] [-t <team-identifier>]" 1>&2; exit 1; }
while getopts ":s:t:" o; do
case "${o}" in
s)
CODESIGN_IDENTITY=${OPTARG}
;;
t)
TEAM_IDENTIFIER=${OPTARG}
;;
*)
usage
;;
esac
done
shift "$((OPTIND-1))"
# prepare working dir
cd $(dirname $0)
rm -rf runtime dmg *.app *.dmg
# set variables
APP_NAME="Cryptomator"
VENDOR="Skymatic GmbH"
COPYRIGHT_YEARS="2016 - 2025"
PACKAGE_IDENTIFIER="org.cryptomator"
MAIN_JAR_GLOB="cryptomator-*.jar"
MODULE_AND_MAIN_CLASS="org.cryptomator.desktop/org.cryptomator.launcher.Cryptomator"
REVISION_NO=`git rev-list --count HEAD`
VERSION_NO=`mvn -f../../../pom.xml help:evaluate -Dexpression=project.version -q -DforceStdout | sed -rn 's/.*([0-9]+\.[0-9]+\.[0-9]+).*/\1/p'`
FUSE_LIB="FUSE-T"
JAVAFX_VERSION=25
JAVAFX_ARCH="undefined"
JAVAFX_JMODS_SHA256="undefined"
if [ "$(machine)" = "arm64e" ]; then
JAVAFX_ARCH="aarch64"
JAVAFX_JMODS_SHA256="13f8c0513c40c95881479fbcf0465a29a60217393fb0656f5e4eab78a9442fba"
else
JAVAFX_ARCH="x64"
JAVAFX_JMODS_SHA256="0eba73fb28a24c845175d16fa2f8c081c936ce6de1be9b79eb6119fa32e53d52"
fi
JAVAFX_JMODS_URL="https://download2.gluonhq.com/openjfx/${JAVAFX_VERSION}/openjfx-${JAVAFX_VERSION}_osx-${JAVAFX_ARCH}_bin-jmods.zip"
# check preconditions
if [ -z "${JAVA_HOME}" ]; then echo "JAVA_HOME not set. Run using JAVA_HOME=/path/to/jdk ./build.sh"; exit 1; fi
command -v mvn >/dev/null 2>&1 || { echo >&2 "mvn not found. Fix by 'brew install maven'."; exit 1; }
command -v create-dmg >/dev/null 2>&1 || { echo >&2 "create-dmg not found. Fix by 'brew install create-dmg'."; exit 1; }
if [ -n "${CODESIGN_IDENTITY}" ]; then
command -v codesign >/dev/null 2>&1 || { echo >&2 "codesign not found. Fix by 'xcode-select --install'."; exit 1; }
if [[ ! `security find-identity -v -p codesigning | grep -w "${CODESIGN_IDENTITY}"` ]]; then echo "Given codesign identity is invalid."; exit 1; fi
fi
# download and check jmods
curl -L ${JAVAFX_JMODS_URL} -o openjfx-jmods.zip
echo "${JAVAFX_JMODS_SHA256} openjfx-jmods.zip" | shasum -a256 --check
mkdir -p openjfx-jmods/
unzip -jo openjfx-jmods.zip \*/javafx.base.jmod \*/javafx.controls.jmod \*/javafx.fxml.jmod \*/javafx.graphics.jmod -d openjfx-jmods
JMOD_VERSION=$(jmod describe openjfx-jmods/javafx.base.jmod | head -1)
JMOD_VERSION=${JMOD_VERSION#*@}
JMOD_VERSION=${JMOD_VERSION%%.*}
POM_JFX_VERSION=$(mvn -f../../../pom.xml help:evaluate "-Dexpression=javafx.version" -q -DforceStdout)
POM_JFX_VERSION=${POM_JFX_VERSION#*@}
POM_JFX_VERSION=${POM_JFX_VERSION%%.*}
if [ "${POM_JFX_VERSION}" -ne "${JMOD_VERSION}" ]; then
>&2 echo "Major JavaFX version in pom.xml (${POM_JFX_VERSION}) != jmod version (${JMOD_VERSION})"
exit 1
fi
# compile
mvn -B -f../../../pom.xml clean package -DskipTests -Pmac
cp ../../../LICENSE.txt ../../../target
cp ../../../target/${MAIN_JAR_GLOB} ../../../target/mods
# create runtime
## check for JEP 493
JMOD_PATHS="openjfx-jmods"
if ! ${JAVA_HOME}/bin/jlink --help | grep -q "Linking from run-time image enabled"; then
JMOD_PATHS="${JAVA_HOME}/jmods:${JMOD_PATHS}"
fi
## create custom runtime
${JAVA_HOME}/bin/jlink \
--output runtime \
--module-path "${JMOD_PATHS}" \
--add-modules java.base,java.desktop,java.instrument,java.logging,java.naming,java.net.http,java.scripting,java.sql,java.xml,javafx.base,javafx.graphics,javafx.controls,javafx.fxml,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.unsupported,jdk.security.auth,jdk.accessibility,jdk.management.jfr,java.compiler \
--strip-native-commands \
--no-header-files \
--no-man-pages \
--strip-debug \
--compress zip-0
# create app dir
${JAVA_HOME}/bin/jpackage \
--verbose \
--type app-image \
--runtime-image runtime \
--input ../../../target/libs \
--module-path ../../../target/mods \
--module ${MODULE_AND_MAIN_CLASS} \
--dest . \
--name ${APP_NAME} \
--vendor "${VENDOR}" \
--copyright "(C) ${COPYRIGHT_YEARS} ${VENDOR}" \
--app-version "${VERSION_NO}" \
--java-options "--enable-preview" \
--java-options "--enable-native-access=javafx.graphics,org.cryptomator.jfuse.mac" \
--java-options "-Xss5m" \
--java-options "-Xmx256m" \
--java-options "-Dfile.encoding=\"utf-8\"" \
--java-options "-Djava.net.useSystemProxies=true" \
--java-options "-Dapple.awt.enableTemplateImages=true" \
--java-options "-Dsun.java2d.metal=true" \
--java-options "-Dcryptomator.appVersion=\"${VERSION_NO}\"" \
--java-options "-Dcryptomator.logDir=\"@{userhome}/Library/Logs/${APP_NAME}\"" \
--java-options "-XX:ErrorFile=/cryptomator/cryptomator_crash.log" \
--java-options "-Dcryptomator.pluginDir=\"@{userhome}/Library/Application Support/${APP_NAME}/Plugins\"" \
--java-options "-Dcryptomator.settingsPath=\"@{userhome}/Library/Application Support/${APP_NAME}/settings.json\"" \
--java-options "-Dcryptomator.ipcSocketPath=\"@{userhome}/Library/Application Support/${APP_NAME}/ipc.socket\"" \
--java-options "-Dcryptomator.p12Path=\"@{userhome}/Library/Application Support/${APP_NAME}/key.p12\"" \
--java-options "-Dcryptomator.integrationsMac.keychainServiceName=\"${APP_NAME}\"" \
--java-options "-Dcryptomator.mountPointsDir=\"@{userhome}/Library/Application Support${APP_NAME}/mnt\"" \
--java-options "-Dcryptomator.showTrayIcon=true" \
--java-options "-Dcryptomator.updateMechanism=org.cryptomator.macos.update.DmgUpdateMechanism" \
--java-options "-Dcryptomator.buildNumber=\"dmg-${REVISION_NO}\"" \
--mac-package-identifier ${PACKAGE_IDENTIFIER} \
--resource-dir ../resources
# transform app dir
cp ../resources/${APP_NAME}-Vault.icns ${APP_NAME}.app/Contents/Resources/
sed -i '' "s|###BUNDLE_SHORT_VERSION_STRING###|${VERSION_NO}|g" ${APP_NAME}.app/Contents/Info.plist
sed -i '' "s|###BUNDLE_VERSION###|${REVISION_NO}|g" ${APP_NAME}.app/Contents/Info.plist
cp ../embedded.provisionprofile ${APP_NAME}.app/Contents/
# build and install dock tile plugin
echo "Building and installing Cryptomator.docktileplugin..."
DERIVED_DATA_PATH=../DockTilePlugin/build
xcodebuild -project ../DockTilePlugin/DockTilePlugin.xcodeproj \
-scheme DockTilePlugin \
-configuration Release \
-derivedDataPath ${DERIVED_DATA_PATH} \
-quiet \
clean build
mkdir -p ${APP_NAME}.app/Contents/PlugIns
cp -R ${DERIVED_DATA_PATH}/Build/Products/Release/Cryptomator.docktileplugin ${APP_NAME}.app/Contents/PlugIns/
rm -rf ${DERIVED_DATA_PATH}
# generate license
mvn -B -f../../../pom.xml license:add-third-party \
-Dlicense.thirdPartyFilename=license.rtf \
-Dlicense.outputDirectory=dist/mac/dmg/resources \
-Dlicense.fileTemplate=resources/licenseTemplate.ftl \
-Dlicense.includedScopes=compile \
-Dlicense.excludedGroups=^org\.cryptomator \
-Dlicense.failOnMissing=true \
-Dlicense.licenseMergesUrl=file://$(pwd)/../../../license/merges
# codesign
if [ -n "${CODESIGN_IDENTITY}" ] && [ -n "${TEAM_IDENTIFIER}" ]; then
echo "Codesigning jdk files..."
find ${APP_NAME}.app/Contents/runtime/Contents/Home/lib/ -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
find ${APP_NAME}.app/Contents/runtime/Contents/Home/lib/ -name 'jspawnhelper' -exec codesign --force -o runtime -s ${CODESIGN_IDENTITY} {} \;
echo "Codesigning jar contents..."
find ${APP_NAME}.app/Contents/runtime/Contents/MacOS -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
for JAR_PATH in `find ${APP_NAME}.app -name "*.jar"`; do
if [[ `unzip -l ${JAR_PATH} | grep '.dylib\|.jnilib'` ]]; then
JAR_FILENAME=$(basename ${JAR_PATH})
OUTPUT_PATH=${JAR_PATH%.*}
echo "Codesigning libs in ${JAR_FILENAME}..."
unzip -q ${JAR_PATH} -d ${OUTPUT_PATH}
find ${OUTPUT_PATH} -name '*.dylib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
find ${OUTPUT_PATH} -name '*.jnilib' -exec codesign --force -s ${CODESIGN_IDENTITY} {} \;
rm ${JAR_PATH}
pushd ${OUTPUT_PATH} > /dev/null
zip -qr ../${JAR_FILENAME} *
popd > /dev/null
rm -r ${OUTPUT_PATH}
fi
done
echo "Codesigning ${APP_NAME}.app..."
cp ../${APP_NAME}.entitlements .
sed -i '' "s|###APP_IDENTIFIER_PREFIX###|${TEAM_IDENTIFIER}.|g" ${APP_NAME}.entitlements
sed -i '' "s|###TEAM_IDENTIFIER###|${TEAM_IDENTIFIER}|g" ${APP_NAME}.entitlements
codesign --force --deep --entitlements ${APP_NAME}.entitlements -o runtime -s ${CODESIGN_IDENTITY} ${APP_NAME}.app
fi
# prepare dmg contents
mkdir dmg
mv ${APP_NAME}.app dmg
cp resources/${FUSE_LIB}.webloc dmg
# create dmg
create-dmg \
--volname ${APP_NAME} \
--volicon "resources/${APP_NAME}-Volume.icns" \
--background "resources/${APP_NAME}-${FUSE_LIB}-background.tiff" \
--window-pos 400 100 \
--window-size 640 694 \
--icon-size 128 \
--icon "${APP_NAME}.app" 128 245 \
--hide-extension "${APP_NAME}.app" \
--icon "${FUSE_LIB}.webloc" 320 501 \
--hide-extension "${FUSE_LIB}.webloc" \
--app-drop-link 512 245 \
--eula "resources/license.rtf" \
--icon ".background" 128 758 \
--icon ".VolumeIcon.icns" 512 758 \
${APP_NAME}-${VERSION_NO}.dmg dmg

Some files were not shown because too many files have changed in this diff Show More