mirrors/cryptomator
1
0
Fork 0
mirror of https://github.com/cryptomator/cryptomator.git synced 2026-08-15 19:56:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,570 Commits 31 Branches 215 Tags
2ndfactor
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Ralph Plawetzki c54a603078 Merge branch 'develop' into 2ndfactor 2025-01-11 17:59:54 +01:00
Ralph Plawetzki be59097a53 Merge branch 'develop' into 2ndfactor 2024-12-14 07:37:30 +01:00
Ralph Plawetzki ccc4842839 Use widened integrations-api 2024-12-02 08:16:28 +01:00
Ralph Plawetzki d95625faa1 Revert "Add CheckBox to enable Touch ID per vault" 
This reverts commit cfa3093dd0.
 2024-12-02 08:12:03 +01:00
Ralph Plawetzki c5bfdf32a9 Revert "Save Touch ID setting per vault" 
This reverts commit 10bce1fb06.
 2024-12-02 08:12:03 +01:00
Ralph Plawetzki 0598681a23 Revert "Decide on Touch ID setting whether user needs" 
This reverts commit 2194360c8a.
 2024-12-02 08:12:03 +01:00
Ralph Plawetzki 3b8bff0d47 Revert "loadPassphraseForAuthenticatedUser is not needed to" 
This reverts commit 2378227756.
 2024-12-02 08:12:02 +01:00
Ralph Plawetzki 55051072cb Revert "Actually save preference on checkbox change" 
This reverts commit 62827b69cc.
 2024-12-02 08:12:02 +01:00
Ralph Plawetzki 6cb409eeaf Revert "Grab new API" 
This reverts commit 9516928529.
 2024-12-02 08:12:02 +01:00
Ralph Plawetzki b38a350c48 Revert "Remove log statement used for testing" 
This reverts commit 14ba852351.
 2024-12-02 08:12:02 +01:00
Ralph Plawetzki 0e5857015a Revert "Change existing keychain entry" 
This reverts commit 9cc863ae79.
 2024-12-02 08:12:02 +01:00
Ralph Plawetzki 9e9aa20692 Revert "Disable feature for other platforms than Mac" 
This reverts commit d8b798ff0f.
 2024-12-02 08:12:01 +01:00
Ralph Plawetzki ad49ca2cb4 Revert "Generalize naming" 
This reverts commit 953aee560f.
 2024-12-02 08:12:01 +01:00
Ralph Plawetzki ba84da71f3 Revert "Code cleanups following coderabbitai recommendations" 
This reverts commit af3779ba2e.
 2024-12-02 08:12:01 +01:00
Ralph Plawetzki 5c34f59d09 Revert "Don't use SNAPSHOTS" 
This reverts commit 175ed500a2.
 2024-12-02 08:12:01 +01:00
Ralph Plawetzki 7499867665 Revert "Use overloaded method storePassword instead of a new one" 
This reverts commit aa34ad52e6.
 2024-12-02 08:12:00 +01:00
Ralph Plawetzki 7b293b8082 Revert "New, widened integrations-api" 
This reverts commit 2f1b5109d6.
 2024-12-02 08:12:00 +01:00
Ralph Plawetzki 46e8a13555 Revert "Improve thread handling" 
This reverts commit c8075dbc19.
 2024-12-02 08:11:01 +01:00
Ralph Plawetzki 63a3150ec3 Revert "Remove unneeded saving a keychain entry right after" 
This reverts commit e8126e68ce.
 2024-12-02 08:11:01 +01:00
Ralph Plawetzki 0a78987d30 Revert "Fix typo" 
This reverts commit 78675c9638.
 2024-12-02 08:11:00 +01:00
Ralph Plawetzki 929782c318 Revert "Fix doubled method due to merge error" 
This reverts commit b5dbfd3209.
 2024-12-02 08:11:00 +01:00
Ralph Plawetzki 97a0f9c435 Migrate keychain entries on Mac on provider change 2024-12-02 07:56:23 +01:00
Ralph Plawetzki f7e65f4eec Add cryptomator.integrationsWin.windowsHelloKeychainPaths to Environment 2024-11-30 14:39:56 +01:00
Ralph Plawetzki b3c56f3aab Add Windows Hello provider 2024-11-30 12:25:36 +01:00
Ralph Plawetzki b5dbfd3209 Fix doubled method due to merge error 2024-11-24 18:14:26 +01:00
Ralph Plawetzki 78675c9638 Fix typo 2024-11-24 15:02:06 +01:00
Ralph Plawetzki e8126e68ce Remove unneeded saving a keychain entry right after 
it was loaded
 2024-11-24 15:02:06 +01:00
Ralph Plawetzki c8075dbc19 Improve thread handling 2024-11-24 15:02:05 +01:00
Ralph Plawetzki 2f1b5109d6 New, widened integrations-api 2024-11-24 15:01:44 +01:00
Ralph Plawetzki aa34ad52e6 Use overloaded method storePassword instead of a new one 2024-11-24 15:00:54 +01:00
Ralph Plawetzki 175ed500a2 Don't use SNAPSHOTS 2024-11-24 14:57:16 +01:00
Ralph Plawetzki af3779ba2e Code cleanups following coderabbitai recommendations 2024-11-24 14:56:38 +01:00
Ralph Plawetzki 953aee560f Generalize naming 2024-11-24 14:56:38 +01:00
Ralph Plawetzki d8b798ff0f Disable feature for other platforms than Mac 2024-11-24 14:56:38 +01:00
Ralph Plawetzki 9cc863ae79 Change existing keychain entry 2024-11-24 14:56:38 +01:00
Ralph Plawetzki 14ba852351 Remove log statement used for testing 2024-11-24 14:56:37 +01:00
Ralph Plawetzki 9516928529 Grab new API 2024-11-24 14:56:30 +01:00
Ralph Plawetzki 62827b69cc Actually save preference on checkbox change 2024-11-24 14:48:32 +01:00
Ralph Plawetzki 2378227756 loadPassphraseForAuthenticatedUser is not needed to 
load as an authenticated user; loadPassphrase is
sufficient
 2024-11-24 14:48:32 +01:00
Ralph Plawetzki 2194360c8a Decide on Touch ID setting whether user needs 
to authenticate on loading and storing a passphrase
 2024-11-24 14:48:32 +01:00
Ralph Plawetzki 10bce1fb06 Save Touch ID setting per vault 2024-11-24 14:48:32 +01:00
Ralph Plawetzki cfa3093dd0 Add CheckBox to enable Touch ID per vault 2024-11-24 14:48:31 +01:00
Ralph PlawetzkiandGitHub 7a789d2eed Fixes #3501 (PR #3502) 2024-07-30 12:27:16 +02:00
Ralph Plawetzki 70e52b1a31 Fix typo 
Closes #3480
 2024-07-07 15:41:28 +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
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
Ralph Plawetzki 24a63c10d0 Build for aarch64 too 2023-09-30 14:54:15 +02: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
Ralph Plawetzki 9e25d0fcc0 Define property in a single line 2023-07-13 06:43:32 +02:00
Ralph Plawetzki 3fbc5e84e3 Define property in a single line 2023-07-12 19:16:04 +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
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
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
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
Ralph PlawetzkiandGitHub 58bb266085 Find native libraries on the system 2023-06-14 11:20:15 +02:00
Ralph Plawetzki c8ed30574a Introduce JVM property for the SVG image loading path 2023-06-14 06:02:03 +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
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
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
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
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
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
Ralph Plawetzki 948a62b482 Code improvements continued 
Discussion: https://github.com/cryptomator/integrations-linux/pull/18
 2023-05-06 09:18:47 +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
Ralph Plawetzki 6da107f4db Add AppindicatorTrayMenuController 2023-04-26 18:24:01 +02:00
Ralph PlawetzkiandGitHub 8139cb8c38 Add jdk.security.auth module to rules 2023-01-22 20:05:13 +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
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
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