diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 89ecef4de..d6a3de953 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,10 +7,10 @@ - - + + - + @@ -20,7 +20,7 @@ - + diff --git a/.travis.yml b/.travis.yml index b4dd8c8cd..41f912fa8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -16,7 +16,7 @@ addons: packages: - haveged install: -- curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/cryptobot/cf5fbd909c4782aaeeeb7c7f4a1a43da/raw/e60ee486e34ee0c79f89f947abe2c83b4290c6bb/settings.xml +# - curl -o $HOME/.m2/settings.xml https://gist.githubusercontent.com/cryptobot/cf5fbd909c4782aaeeeb7c7f4a1a43da/raw/e60ee486e34ee0c79f89f947abe2c83b4290c6bb/settings.xml - mvn -fmain/pom.xml clean install -DskipTests -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=WARN org.codehaus.mojo:versions-maven-plugin:help dependency:go-offline -Pcoverage,release # "clean install" needed until we can exclude artifacts currently in the reactor, see https://maven.apache.org/plugins/maven-dependency-plugin/go-offline-mojo.html#excludeReactor and https://issues.apache.org/jira/browse/MDEP-568 before_script: - | @@ -28,7 +28,7 @@ before_script: script: - mvn --update-snapshots -fmain/pom.xml clean test verify -Pcoverage after_success: -- curl -o ~/codacy-coverage-reporter.jar https://oss.sonatype.org/service/local/repositories/releases/content/com/codacy/codacy-coverage-reporter/6.0.7/codacy-coverage-reporter-6.0.7-assembly.jar +- curl -o ~/codacy-coverage-reporter.jar https://repo.maven.apache.org/maven2/com/codacy/codacy-coverage-reporter/7.1.0/codacy-coverage-reporter-7.1.0-assembly.jar - $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/commons/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/keychain/target/site/jacoco/jacoco.xml --partial - $JAVA_HOME/bin/java -jar ~/codacy-coverage-reporter.jar report -l Java -r main/ui/target/site/jacoco/jacoco.xml --partial diff --git a/3RD PARTY LICENSES/AGPLv3.txt b/3RD PARTY LICENSES/AGPLv3.txt deleted file mode 100644 index 2def0e883..000000000 --- a/3RD PARTY LICENSES/AGPLv3.txt +++ /dev/null @@ -1,661 +0,0 @@ - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are 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. - - 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. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - 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 Affero 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. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - 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 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 work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero 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 Affero 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 Affero 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 Affero 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. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - 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 AGPL, see -. \ No newline at end of file diff --git a/3RD PARTY LICENSES/Apache-2.0.txt b/3RD PARTY LICENSES/Apache-2.0.txt deleted file mode 100644 index d64569567..000000000 --- a/3RD PARTY LICENSES/Apache-2.0.txt +++ /dev/null @@ -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. diff --git a/3RD PARTY LICENSES/LGPLv2.1.txt b/3RD PARTY LICENSES/LGPLv2.1.txt deleted file mode 100644 index f166cc57b..000000000 --- a/3RD PARTY LICENSES/LGPLv2.1.txt +++ /dev/null @@ -1,502 +0,0 @@ - GNU LESSER GENERAL PUBLIC LICENSE - Version 2.1, February 1999 - - Copyright (C) 1991, 1999 Free Software Foundation, Inc. - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - -[This is the first released version of the Lesser GPL. It also counts - as the successor of the GNU Library Public License, version 2, hence - the version number 2.1.] - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -Licenses are intended to guarantee your freedom to share and change -free software--to make sure the software is free for all its users. - - This license, the Lesser General Public License, applies to some -specially designated software packages--typically libraries--of the -Free Software Foundation and other authors who decide to use it. You -can use it too, but we suggest you first think carefully about whether -this license or the ordinary General Public License is the better -strategy to use in any particular case, based on the explanations below. - - When we speak of free software, we are referring to freedom of use, -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 this service if you wish); that you receive source code or can get -it if you want it; that you can change the software and use pieces of -it in new free programs; and that you are informed that you can do -these things. - - To protect your rights, we need to make restrictions that forbid -distributors to deny you these rights or to ask you to surrender these -rights. These restrictions translate to certain responsibilities for -you if you distribute copies of the library or if you modify it. - - For example, if you distribute copies of the library, whether gratis -or for a fee, you must give the recipients all the rights that we gave -you. You must make sure that they, too, receive or can get the source -code. If you link other code with the library, you must provide -complete object files to the recipients, so that they can relink them -with the library after making changes to the library and recompiling -it. And you must show them these terms so they know their rights. - - We protect your rights with a two-step method: (1) we copyright the -library, and (2) we offer you this license, which gives you legal -permission to copy, distribute and/or modify the library. - - To protect each distributor, we want to make it very clear that -there is no warranty for the free library. Also, if the library is -modified by someone else and passed on, the recipients should know -that what they have is not the original version, so that the original -author's reputation will not be affected by problems that might be -introduced by others. - - Finally, software patents pose a constant threat to the existence of -any free program. We wish to make sure that a company cannot -effectively restrict the users of a free program by obtaining a -restrictive license from a patent holder. Therefore, we insist that -any patent license obtained for a version of the library must be -consistent with the full freedom of use specified in this license. - - Most GNU software, including some libraries, is covered by the -ordinary GNU General Public License. This license, the GNU Lesser -General Public License, applies to certain designated libraries, and -is quite different from the ordinary General Public License. We use -this license for certain libraries in order to permit linking those -libraries into non-free programs. - - When a program is linked with a library, whether statically or using -a shared library, the combination of the two is legally speaking a -combined work, a derivative of the original library. The ordinary -General Public License therefore permits such linking only if the -entire combination fits its criteria of freedom. The Lesser General -Public License permits more lax criteria for linking other code with -the library. - - We call this license the "Lesser" General Public License because it -does Less to protect the user's freedom than the ordinary General -Public License. It also provides other free software developers Less -of an advantage over competing non-free programs. These disadvantages -are the reason we use the ordinary General Public License for many -libraries. However, the Lesser license provides advantages in certain -special circumstances. - - For example, on rare occasions, there may be a special need to -encourage the widest possible use of a certain library, so that it becomes -a de-facto standard. To achieve this, non-free programs must be -allowed to use the library. A more frequent case is that a free -library does the same job as widely used non-free libraries. In this -case, there is little to gain by limiting the free library to free -software only, so we use the Lesser General Public License. - - In other cases, permission to use a particular library in non-free -programs enables a greater number of people to use a large body of -free software. For example, permission to use the GNU C Library in -non-free programs enables many more people to use the whole GNU -operating system, as well as its variant, the GNU/Linux operating -system. - - Although the Lesser General Public License is Less protective of the -users' freedom, it does ensure that the user of a program that is -linked with the Library has the freedom and the wherewithal to run -that program using a modified version of the Library. - - The precise terms and conditions for copying, distribution and -modification follow. Pay close attention to the difference between a -"work based on the library" and a "work that uses the library". The -former contains code derived from the library, whereas the latter must -be combined with the library in order to run. - - GNU LESSER GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License Agreement applies to any software library or other -program which contains a notice placed by the copyright holder or -other authorized party saying it may be distributed under the terms of -this Lesser General Public License (also called "this License"). -Each licensee is addressed as "you". - - A "library" means a collection of software functions and/or data -prepared so as to be conveniently linked with application programs -(which use some of those functions and data) to form executables. - - The "Library", below, refers to any such software library or work -which has been distributed under these terms. A "work based on the -Library" means either the Library or any derivative work under -copyright law: that is to say, a work containing the Library or a -portion of it, either verbatim or with modifications and/or translated -straightforwardly into another language. (Hereinafter, translation is -included without limitation in the term "modification".) - - "Source code" for a work means the preferred form of the work for -making modifications to it. For a library, complete source code means -all the source code for all modules it contains, plus any associated -interface definition files, plus the scripts used to control compilation -and installation of the library. - - Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running a program using the Library is not restricted, and output from -such a program is covered only if its contents constitute a work based -on the Library (independent of the use of the Library in a tool for -writing it). Whether that is true depends on what the Library does -and what the program that uses the Library does. - - 1. You may copy and distribute verbatim copies of the Library's -complete source code as you receive it, in any medium, provided that -you conspicuously and appropriately publish on each copy an -appropriate copyright notice and disclaimer of warranty; keep intact -all the notices that refer to this License and to the absence of any -warranty; and distribute a copy of this License along with the -Library. - - You may charge a fee for the physical act of transferring a copy, -and you may at your option offer warranty protection in exchange for a -fee. - - 2. You may modify your copy or copies of the Library or any portion -of it, thus forming a work based on the Library, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) The modified work must itself be a software library. - - b) You must cause the files modified to carry prominent notices - stating that you changed the files and the date of any change. - - c) You must cause the whole of the work to be licensed at no - charge to all third parties under the terms of this License. - - d) If a facility in the modified Library refers to a function or a - table of data to be supplied by an application program that uses - the facility, other than as an argument passed when the facility - is invoked, then you must make a good faith effort to ensure that, - in the event an application does not supply such function or - table, the facility still operates, and performs whatever part of - its purpose remains meaningful. - - (For example, a function in a library to compute square roots has - a purpose that is entirely well-defined independent of the - application. Therefore, Subsection 2d requires that any - application-supplied function or table used by this function must - be optional: if the application does not supply it, the square - root function must still compute square roots.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Library, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Library, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote -it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Library. - -In addition, mere aggregation of another work not based on the Library -with the Library (or with a work based on the Library) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may opt to apply the terms of the ordinary GNU General Public -License instead of this License to a given copy of the Library. To do -this, you must alter all the notices that refer to this License, so -that they refer to the ordinary GNU General Public License, version 2, -instead of to this License. (If a newer version than version 2 of the -ordinary GNU General Public License has appeared, then you can specify -that version instead if you wish.) Do not make any other change in -these notices. - - Once this change is made in a given copy, it is irreversible for -that copy, so the ordinary GNU General Public License applies to all -subsequent copies and derivative works made from that copy. - - This option is useful when you wish to copy part of the code of -the Library into a program that is not a library. - - 4. You may copy and distribute the Library (or a portion or -derivative of it, under Section 2) in object code or executable form -under the terms of Sections 1 and 2 above provided that you accompany -it with the complete corresponding machine-readable source code, which -must be distributed under the terms of Sections 1 and 2 above on a -medium customarily used for software interchange. - - If distribution of object code is made by offering access to copy -from a designated place, then offering equivalent access to copy the -source code from the same place satisfies the requirement to -distribute the source code, even though third parties are not -compelled to copy the source along with the object code. - - 5. A program that contains no derivative of any portion of the -Library, but is designed to work with the Library by being compiled or -linked with it, is called a "work that uses the Library". Such a -work, in isolation, is not a derivative work of the Library, and -therefore falls outside the scope of this License. - - However, linking a "work that uses the Library" with the Library -creates an executable that is a derivative of the Library (because it -contains portions of the Library), rather than a "work that uses the -library". The executable is therefore covered by this License. -Section 6 states terms for distribution of such executables. - - When a "work that uses the Library" uses material from a header file -that is part of the Library, the object code for the work may be a -derivative work of the Library even though the source code is not. -Whether this is true is especially significant if the work can be -linked without the Library, or if the work is itself a library. The -threshold for this to be true is not precisely defined by law. - - If such an object file uses only numerical parameters, data -structure layouts and accessors, and small macros and small inline -functions (ten lines or less in length), then the use of the object -file is unrestricted, regardless of whether it is legally a derivative -work. (Executables containing this object code plus portions of the -Library will still fall under Section 6.) - - Otherwise, if the work is a derivative of the Library, you may -distribute the object code for the work under the terms of Section 6. -Any executables containing that work also fall under Section 6, -whether or not they are linked directly with the Library itself. - - 6. As an exception to the Sections above, you may also combine or -link a "work that uses the Library" with the Library to produce a -work containing portions of the Library, and distribute that work -under terms of your choice, provided that the terms permit -modification of the work for the customer's own use and reverse -engineering for debugging such modifications. - - You must give prominent notice with each copy of the work that the -Library is used in it and that the Library and its use are covered by -this License. You must supply a copy of this License. If the work -during execution displays copyright notices, you must include the -copyright notice for the Library among them, as well as a reference -directing the user to the copy of this License. Also, you must do one -of these things: - - a) Accompany the work with the complete corresponding - machine-readable source code for the Library including whatever - changes were used in the work (which must be distributed under - Sections 1 and 2 above); and, if the work is an executable linked - with the Library, with the complete machine-readable "work that - uses the Library", as object code and/or source code, so that the - user can modify the Library and then relink to produce a modified - executable containing the modified Library. (It is understood - that the user who changes the contents of definitions files in the - Library will not necessarily be able to recompile the application - to use the modified definitions.) - - b) Use a suitable shared library mechanism for linking with the - Library. A suitable mechanism is one that (1) uses at run time a - copy of the library already present on the user's computer system, - rather than copying library functions into the executable, and (2) - will operate properly with a modified version of the library, if - the user installs one, as long as the modified version is - interface-compatible with the version that the work was made with. - - c) Accompany the work with a written offer, valid for at - least three years, to give the same user the materials - specified in Subsection 6a, above, for a charge no more - than the cost of performing this distribution. - - d) If distribution of the work is made by offering access to copy - from a designated place, offer equivalent access to copy the above - specified materials from the same place. - - e) Verify that the user has already received a copy of these - materials or that you have already sent this user a copy. - - For an executable, the required form of the "work that uses the -Library" must include any data and utility programs needed for -reproducing the executable from it. However, as a special exception, -the materials to be distributed need not include anything that is -normally distributed (in either source or binary form) with the major -components (compiler, kernel, and so on) of the operating system on -which the executable runs, unless that component itself accompanies -the executable. - - It may happen that this requirement contradicts the license -restrictions of other proprietary libraries that do not normally -accompany the operating system. Such a contradiction means you cannot -use both them and the Library together in an executable that you -distribute. - - 7. You may place library facilities that are a work based on the -Library side-by-side in a single library together with other library -facilities not covered by this License, and distribute such a combined -library, provided that the separate distribution of the work based on -the Library and of the other library facilities is otherwise -permitted, and provided that you do these two things: - - a) Accompany the combined library with a copy of the same work - based on the Library, uncombined with any other library - facilities. This must be distributed under the terms of the - Sections above. - - b) Give prominent notice with the combined library of the fact - that part of it is a work based on the Library, and explaining - where to find the accompanying uncombined form of the same work. - - 8. You may not copy, modify, sublicense, link with, or distribute -the Library except as expressly provided under this License. Any -attempt otherwise to copy, modify, sublicense, link with, or -distribute the Library is void, and will automatically terminate your -rights under this License. However, parties who have received copies, -or rights, from you under this License will not have their licenses -terminated so long as such parties remain in full compliance. - - 9. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Library or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Library (or any work based on the -Library), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Library or works based on it. - - 10. Each time you redistribute the Library (or any work based on the -Library), the recipient automatically receives a license from the -original licensor to copy, distribute, link with or modify the Library -subject to these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties with -this License. - - 11. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -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 -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Library at all. For example, if a patent -license would not permit royalty-free redistribution of the Library by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Library. - -If any portion of this section is held invalid or unenforceable under any -particular circumstance, the balance of the section is intended to apply, -and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 12. If the distribution and/or use of the Library is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Library under this License may add -an explicit geographical distribution limitation excluding those countries, -so that distribution is permitted only in or among countries not thus -excluded. In such case, this License incorporates the limitation as if -written in the body of this License. - - 13. The Free Software Foundation may publish revised and/or new -versions of the Lesser 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 Library -specifies a version number of this License which applies to it and -"any later version", you have the option of following the terms and -conditions either of that version or of any later version published by -the Free Software Foundation. If the Library does not specify a -license version number, you may choose any version ever published by -the Free Software Foundation. - - 14. If you wish to incorporate parts of the Library into other free -programs whose distribution conditions are incompatible with these, -write to the author to ask for permission. For software which is -copyrighted by the Free Software Foundation, write to the Free -Software Foundation; we sometimes make exceptions for this. Our -decision will be guided by the two goals of preserving the free status -of all derivatives of our free software and of promoting the sharing -and reuse of software generally. - - NO WARRANTY - - 15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO -WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW. -EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR -OTHER PARTIES PROVIDE THE LIBRARY "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 -LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME -THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN -WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY -AND/OR REDISTRIBUTE THE LIBRARY 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 -LIBRARY (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 LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF -SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Libraries - - If you develop a new library, and you want it to be of the greatest -possible use to the public, we recommend making it free software that -everyone can redistribute and change. You can do so by permitting -redistribution under these terms (or, alternatively, under the terms of the -ordinary General Public License). - - To apply these terms, attach the following notices to the library. It is -safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least the -"copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This library 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - -Also add information on how to contact you by electronic and paper mail. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the library, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the - library `Frob' (a library for tweaking knobs) written by James Random Hacker. - - , 1 April 1990 - Ty Coon, President of Vice - -That's all there is to it! \ No newline at end of file diff --git a/3RD PARTY LICENSES/MIT-X11.txt b/3RD PARTY LICENSES/MIT-X11.txt deleted file mode 100644 index 2bf24b9b9..000000000 --- a/3RD PARTY LICENSES/MIT-X11.txt +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) - -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. \ No newline at end of file diff --git a/3RD PARTY LICENSES/Modified BSD.txt b/3RD PARTY LICENSES/Modified BSD.txt deleted file mode 100644 index 1e47ac7c5..000000000 --- a/3RD PARTY LICENSES/Modified BSD.txt +++ /dev/null @@ -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. diff --git a/3RD PARTY LICENSES/Simplified BSD.txt b/3RD PARTY LICENSES/Simplified BSD.txt deleted file mode 100644 index 7312e394e..000000000 --- a/3RD PARTY LICENSES/Simplified BSD.txt +++ /dev/null @@ -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. diff --git a/3RD PARTY LICENSES/_NOTICE.md b/3RD PARTY LICENSES/_NOTICE.md deleted file mode 100644 index 6fc972f59..000000000 --- a/3RD PARTY LICENSES/_NOTICE.md +++ /dev/null @@ -1,88 +0,0 @@ -# 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 Claudine Zillmann (http://aquafx-project.com/) - -Licensed under the accompanying Modified BSD license file. - -## Apache Commons + Apache HttpComponents + Jackrabbit WebDAV Library -Copyright The Apache Software Foundation - -Licensed under the Apache License, Version 2.0 - -### Commons Codec - -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) - -### Commons Lang - -This product includes software from the Spring Framework, -under the Apache License 2.0 (see: StringUtils.containsWhitespace()) - -### Jackrabbit WebDAV Library - -Based on source code originally developed by -Day Software (http://www.day.com/). - -## CryptoLib + CryptoFS -Copyright 2016, 2017 Skymatic UG (haftungsbeschränkt) - -Licensed under the GNU Affero General Public License, Version 3 - -## 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 simplified BSD license. - - -## GSON + Guava -Copyright Google, Inc. - -Licensed under the Apache License, Version 2.0 - -## Jetty -Copyright 1995-2017 Mort Bay Consulting Pty Ltd. - -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. - -Licensed under the Apache License, Version 2.0 - - -## Logback -Copyright (C) 1999-2017, QOS.ch. All rights reserved. - -Licensed under the GNU Lesser General Public License, Version 2.1 - -## SIV-Mode -Copyright (c) Sebastian Stenzel - -Licensed under the MIT / X11 License - -## SLF4J -Copyright (c) 2004-2017 QOS.ch - -Licensed under the MIT / X11 License - - -# Other third party assets -Non-software work included in Cryptomator - -## Ionicons -Copyright (c) 2016 Drifty (http://drifty.com/) - -ionicons.ttf Licensed under the accompanying MIT license diff --git a/cryptomator.png b/cryptomator.png index 77b5b8b35..bfa5b7549 100644 Binary files a/cryptomator.png and b/cryptomator.png differ diff --git a/main/buildkit/pom.xml b/main/buildkit/pom.xml index 070e34c6a..b763fdd2c 100644 --- a/main/buildkit/pom.xml +++ b/main/buildkit/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-beta3 + 1.5.0 buildkit pom diff --git a/main/commons/pom.xml b/main/commons/pom.xml index 3c75ea10f..2e7e88a2a 100644 --- a/main/commons/pom.xml +++ b/main/commons/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-beta3 + 1.5.0 commons Cryptomator Commons diff --git a/main/commons/src/main/java/org/cryptomator/common/Constants.java b/main/commons/src/main/java/org/cryptomator/common/Constants.java new file mode 100644 index 000000000..432cd08e5 --- /dev/null +++ b/main/commons/src/main/java/org/cryptomator/common/Constants.java @@ -0,0 +1,7 @@ +package org.cryptomator.common; + +public interface Constants { + + String MASTERKEY_FILENAME = "masterkey.cryptomator"; + +} diff --git a/main/commons/src/main/java/org/cryptomator/common/Environment.java b/main/commons/src/main/java/org/cryptomator/common/Environment.java index 8dfb56ef2..890840b7d 100644 --- a/main/commons/src/main/java/org/cryptomator/common/Environment.java +++ b/main/commons/src/main/java/org/cryptomator/common/Environment.java @@ -39,6 +39,7 @@ public class Environment { LOG.debug("cryptomator.logDir: {}", System.getProperty("cryptomator.logDir")); LOG.debug("cryptomator.mountPointsDir: {}", System.getProperty("cryptomator.mountPointsDir")); LOG.debug("cryptomator.minPwLength: {}", System.getProperty("cryptomator.minPwLength")); + LOG.debug("cryptomator.buildNumber: {}", System.getProperty("cryptomator.buildNumber")); } public boolean useCustomLogbackConfig() { @@ -65,6 +66,10 @@ public class Environment { return getPath("cryptomator.mountPointsDir").map(this::replaceHomeDir); } + public Optional getBuildNumber() { + return Optional.ofNullable(System.getProperty("cryptomator.buildNumber")); + } + public int getMinPwLength() { return getInt("cryptomator.minPwLength", DEFAULT_MIN_PW_LENGTH); } @@ -82,8 +87,8 @@ public class Environment { String value = System.getProperty(propertyName); return Optional.ofNullable(value).map(Paths::get); } - // visible for testing + Stream getPaths(String propertyName) { Stream rawSettingsPaths = getRawList(propertyName, PATH_LIST_SEP); return rawSettingsPaths.filter(Predicate.not(Strings::isNullOrEmpty)).map(Paths::get).map(this::replaceHomeDir); @@ -107,5 +112,4 @@ public class Environment { return StreamSupport.stream(spliter, false); } } - } diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java index e9883dff4..6e35ffab2 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/Vault.java @@ -10,14 +10,10 @@ package org.cryptomator.common.vaults; import com.google.common.base.Strings; import javafx.beans.Observable; -import javafx.beans.binding.Binding; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; -import javafx.beans.binding.ObjectBinding; import javafx.beans.binding.StringBinding; import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleObjectProperty; -import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.LazyInitializer; import org.cryptomator.common.settings.VaultSettings; @@ -27,32 +23,27 @@ import org.cryptomator.cryptofs.CryptoFileSystemProperties.FileSystemFlags; import org.cryptomator.cryptofs.CryptoFileSystemProvider; import org.cryptomator.cryptolib.api.CryptoException; import org.cryptomator.cryptolib.api.InvalidPassphraseException; -import org.fxmisc.easybind.EasyBind; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; import javax.inject.Provider; import java.io.IOException; -import java.nio.file.FileAlreadyExistsException; -import java.nio.file.Files; import java.nio.file.NoSuchFileException; import java.nio.file.NotDirectoryException; import java.nio.file.Path; import java.nio.file.Paths; -import java.util.ArrayList; import java.util.EnumSet; -import java.util.List; import java.util.Objects; import java.util.Set; import java.util.concurrent.atomic.AtomicReference; -import java.util.function.Predicate; + +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; @PerVault public class Vault { - + private static final Logger LOG = LoggerFactory.getLogger(Vault.class); - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes private static final Path HOME_DIR = Paths.get(SystemUtils.USER_HOME); private final VaultSettings vaultSettings; @@ -66,8 +57,10 @@ public class Vault { private final BooleanBinding locked; private final BooleanBinding processing; private final BooleanBinding unlocked; + private final BooleanBinding missing; private final BooleanBinding needsMigration; - private final ObjectBinding accessPoint; + private final StringBinding accessPoint; + private final BooleanBinding accessPointPresent; private volatile Volume volume; @@ -84,8 +77,10 @@ public class Vault { this.locked = Bindings.createBooleanBinding(this::isLocked, state); this.processing = Bindings.createBooleanBinding(this::isProcessing, state); this.unlocked = Bindings.createBooleanBinding(this::isUnlocked, state); + this.missing = Bindings.createBooleanBinding(this::isMissing, state); this.needsMigration = Bindings.createBooleanBinding(this::isNeedsMigration, state); - this.accessPoint = Bindings.createObjectBinding(this::getAccessPoint, state); + this.accessPoint = Bindings.createStringBinding(this::getAccessPoint, state); + this.accessPointPresent = this.accessPoint.isNotEmpty(); } // ****************************************************************************** @@ -177,11 +172,19 @@ public class Vault { public boolean isUnlocked() { return state.get() == VaultState.UNLOCKED; } - + + public BooleanBinding missingProperty() { + return missing; + } + + public boolean isMissing() { + return state.get() == VaultState.MISSING; + } + public BooleanBinding needsMigrationProperty() { return needsMigration; } - + public boolean isNeedsMigration() { return state.get() == VaultState.NEEDS_MIGRATION; } @@ -195,19 +198,27 @@ public class Vault { return p.getFileName().toString(); } - public ObjectBinding accessPointProperty() { + public StringBinding accessPointProperty() { return accessPoint; } - public Path getAccessPoint() { + public String getAccessPoint() { if (state.get() == VaultState.UNLOCKED) { assert volume != null; - return volume.getMountPoint().orElse(Path.of("")); + return volume.getMountPoint().orElse(Path.of("")).toString(); } else { - return Path.of(""); + return ""; } } + public BooleanBinding accessPointPresentProperty() { + return accessPointPresent; + } + + public boolean isAccessPointPresent() { + return accessPointPresent.get(); + } + public StringBinding displayablePathProperty() { return displayablePath; } diff --git a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java index e950fd4e2..521ca4658 100644 --- a/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java +++ b/main/commons/src/main/java/org/cryptomator/common/vaults/VaultListManager.java @@ -25,11 +25,11 @@ import java.util.Collection; import java.util.Optional; import java.util.stream.Collectors; +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; + @Singleton public class VaultListManager { - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes - private final VaultComponent.Builder vaultComponentBuilder; private final ObservableList vaultList; diff --git a/main/keychain/pom.xml b/main/keychain/pom.xml index 7b8157808..ee87d5163 100644 --- a/main/keychain/pom.xml +++ b/main/keychain/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-beta3 + 1.5.0 keychain System Keychain Access diff --git a/main/launcher/pom.xml b/main/launcher/pom.xml index cddee8417..962160c6f 100644 --- a/main/launcher/pom.xml +++ b/main/launcher/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-beta3 + 1.5.0 launcher Cryptomator Launcher diff --git a/main/pom.xml b/main/pom.xml index a414c44e2..5d58a60ef 100644 --- a/main/pom.xml +++ b/main/pom.xml @@ -3,7 +3,7 @@ 4.0.0 org.cryptomator main - 1.5.0-beta3 + 1.5.0 pom Cryptomator @@ -24,26 +24,26 @@ UTF-8 - 1.9.3 + 1.9.5 2.2.2 - 1.2.2 - 1.1.12 + 1.2.3 + 1.1.13 1.0.10 - 14-ea+8 + 14 3.9 - 3.8.3 + 3.10.2 1.0.3 - 28.1-jre - 2.26 + 28.2-jre + 2.27 2.8.6 - 1.7.29 + 1.7.30 1.2.3 - 5.6.0 - 3.2.4 + 5.6.1 + 3.3.3 2.2 @@ -267,7 +267,7 @@ maven-dependency-plugin - 3.1.1 + 3.1.2 copy-libs @@ -281,9 +281,15 @@ + + org.codehaus.mojo + license-maven-plugin + 2.0.0 + org.apache.maven.plugins maven-jar-plugin + 3.2.0 diff --git a/main/ui/pom.xml b/main/ui/pom.xml index d79d8a017..2ced5b191 100644 --- a/main/ui/pom.xml +++ b/main/ui/pom.xml @@ -4,7 +4,7 @@ org.cryptomator main - 1.5.0-beta3 + 1.5.0 ui Cryptomator GUI @@ -88,4 +88,36 @@ test + + + + + org.codehaus.mojo + license-maven-plugin + + + add-third-party + + add-third-party + + generate-resources + + ${project.basedir}/src/main/resources/license + THIRD-PARTY.txt + compile + org\.cryptomator + + Apache License v2.0|Apache License, Version 2.0|The Apache Software License, Version 2.0|Apache 2.0|Apache Software License - Version 2.0 + MIT License|The MIT License (MIT)|The MIT License|MIT license + LGPL 2.1|LGPL, version 2.1|GNU Lesser/Library General Public License version 2|GNU Lesser General Public License Version 2.1 + GPLv2|GNU General Public License Version 2 + GPLv2+CE|CDDL + GPLv2 with classpath exception + + ${project.basedir}/src/license/template.ftl + + + + + + diff --git a/main/ui/src/license/THIRD-PARTY.properties b/main/ui/src/license/THIRD-PARTY.properties new file mode 100644 index 000000000..7af1b122f --- /dev/null +++ b/main/ui/src/license/THIRD-PARTY.properties @@ -0,0 +1 @@ +com.github.serceman--jnr-fuse--0.5.4=MIT License \ No newline at end of file diff --git a/main/ui/src/license/template.ftl b/main/ui/src/license/template.ftl new file mode 100644 index 000000000..5cf4a819e --- /dev/null +++ b/main/ui/src/license/template.ftl @@ -0,0 +1,35 @@ +<#function artifactFormat p> + <#if p.name?index_of('Unnamed') > -1> + <#return p.artifactId + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - " + (p.url!"no url defined") + ")"> + <#else> + <#return p.name + " (" + p.groupId + ":" + p.artifactId + ":" + p.version + " - " + (p.url!"no url defined") + ")"> + + +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/. + +Cryptomator uses ${dependencyMap?size} third-party dependencies under the following licenses: +<#list licenseMap as e> + <#assign license = e.getKey()/> + <#assign projects = e.getValue()/> + <#if projects?size > 0> + ${license}: + <#list projects as project> + - ${artifactFormat(project)} + + + + +Cryptomator uses other third-party assets under the following licenses: + SIL OFL 1.1 License: + - Font Awesome 5.12.0 (https://fontawesome.com/) diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultFailureExistingController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultFailureExistingController.java deleted file mode 100644 index 1bb9eef40..000000000 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultFailureExistingController.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.cryptomator.ui.addvaultwizard; - -import dagger.Lazy; -import javafx.beans.binding.Bindings; -import javafx.beans.binding.StringBinding; -import javafx.beans.property.ObjectProperty; -import javafx.fxml.FXML; -import javafx.scene.Scene; -import javafx.stage.Stage; -import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.common.FxmlFile; -import org.cryptomator.ui.common.FxmlScene; - -import javax.inject.Inject; -import java.nio.file.Path; - -@AddVaultWizardScoped -public class AddVaultFailureExistingController implements FxController { - - private final Stage window; - private final Lazy previousScene; - private final StringBinding vaultName; - - @Inject - AddVaultFailureExistingController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_EXISTING) Lazy previousScene, ObjectProperty pathOfFailedVault){ - this.window = window; - this.previousScene = previousScene; - this.vaultName = Bindings.createStringBinding(() -> pathOfFailedVault.get().getFileName().toString(),pathOfFailedVault); - } - - @FXML - public void close(){ - window.close(); - } - - @FXML - public void back(){ - window.setScene(previousScene.get()); - } - - // Getter & Setter - - public StringBinding vaultNameProperty(){ - return vaultName; - } - - public String getVaultName(){ - return vaultName.get(); - } - -} diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java index 4e5143d8c..08f499c92 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/AddVaultModule.java @@ -103,14 +103,7 @@ public abstract class AddVaultModule { static Scene provideChooseExistingVaultScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING.getRessourcePathString()); } - - @Provides - @FxmlScene(FxmlFile.ADDVAULT_EXISTING_ERROR) - @AddVaultWizardScoped - static Scene provideChooseExistingVaultErrorScene(@AddVaultWizardWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene(FxmlFile.ADDVAULT_EXISTING_ERROR.getRessourcePathString()); - } - + @Provides @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) @AddVaultWizardScoped @@ -158,11 +151,6 @@ public abstract class AddVaultModule { @FxControllerKey(ChooseExistingVaultController.class) abstract FxController bindChooseExistingVaultController(ChooseExistingVaultController controller); - @Binds - @IntoMap - @FxControllerKey(AddVaultFailureExistingController.class) - abstract FxController bindAddVaultFailureExistingController(AddVaultFailureExistingController controller); - @Binds @IntoMap @FxControllerKey(CreateNewVaultNameController.class) @@ -201,4 +189,5 @@ public abstract class AddVaultModule { @IntoMap @FxControllerKey(AddVaultSuccessController.class) abstract FxController bindAddVaultSuccessController(AddVaultSuccessController controller); + } diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java index 8bd11139a..3717a844f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ChooseExistingVaultController.java @@ -4,10 +4,13 @@ import dagger.Lazy; import javafx.beans.property.ObjectProperty; import javafx.fxml.FXML; import javafx.scene.Scene; +import javafx.scene.image.Image; import javafx.stage.FileChooser; import javafx.stage.Stage; +import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -15,7 +18,11 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import javax.inject.Inject; +import javax.inject.Named; import java.io.File; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; import java.nio.file.NoSuchFileException; import java.nio.file.Path; import java.util.ResourceBundle; @@ -28,24 +35,36 @@ public class ChooseExistingVaultController implements FxController { private final Stage window; private final Lazy welcomeScene; private final Lazy successScene; - private final Lazy errorScene; + private final ErrorComponent.Builder errorComponent; private final ObjectProperty vaultPath; private final ObjectProperty vault; private final VaultListManager vaultListManager; private final ResourceBundle resourceBundle; + private Image screenshot; + @Inject - ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, @FxmlScene(FxmlFile.ADDVAULT_EXISTING_ERROR) Lazy errorScene, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle) { + ChooseExistingVaultController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_WELCOME) Lazy welcomeScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ErrorComponent.Builder errorComponent, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, VaultListManager vaultListManager, ResourceBundle resourceBundle) { this.window = window; this.welcomeScene = welcomeScene; this.successScene = successScene; - this.errorScene = errorScene; + this.errorComponent = errorComponent; this.vaultPath = vaultPath; this.vault = vault; this.vaultListManager = vaultListManager; this.resourceBundle = resourceBundle; } + @FXML + public void initialize() { + final String resource = SystemUtils.IS_OS_MAC ? "/select-masterkey-mac.png" : "/select-masterkey-win.png"; + try (InputStream in = getClass().getResourceAsStream(resource)) { + this.screenshot = new Image(in); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + @FXML public void back() { window.setScene(welcomeScene.get()); @@ -65,9 +84,15 @@ public class ChooseExistingVaultController implements FxController { window.setScene(successScene.get()); } catch (NoSuchFileException e) { LOG.error("Failed to open existing vault.", e); - window.setScene(errorScene.get()); + errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); } } } + /* Getter */ + + public Image getScreenshot() { + return screenshot; + } + } diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java index e0c5f9bec..51b70f470 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultLocationController.java @@ -16,6 +16,7 @@ import javafx.scene.control.Toggle; import javafx.scene.control.ToggleGroup; import javafx.stage.DirectoryChooser; import javafx.stage.Stage; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -41,6 +42,7 @@ public class CreateNewVaultLocationController implements FxController { private final Stage window; private final Lazy chooseNameScene; private final Lazy choosePasswordScene; + private final ErrorComponent.Builder errorComponent; private final LocationPresets locationPresets; private final ObjectProperty vaultPath; private final StringProperty vaultName; @@ -59,10 +61,11 @@ public class CreateNewVaultLocationController implements FxController { public RadioButton customRadioButton; @Inject - CreateNewVaultLocationController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) Lazy chooseNameScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD) Lazy choosePasswordScene, LocationPresets locationPresets, ObjectProperty vaultPath, @Named("vaultName") StringProperty vaultName, ResourceBundle resourceBundle) { + CreateNewVaultLocationController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_NAME) Lazy chooseNameScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_PASSWORD) Lazy choosePasswordScene, ErrorComponent.Builder errorComponent, LocationPresets locationPresets, ObjectProperty vaultPath, @Named("vaultName") StringProperty vaultName, ResourceBundle resourceBundle) { this.window = window; this.chooseNameScene = chooseNameScene; this.choosePasswordScene = choosePasswordScene; + this.errorComponent = errorComponent; this.locationPresets = locationPresets; this.vaultPath = vaultPath; this.vaultName = vaultName; @@ -123,9 +126,8 @@ public class CreateNewVaultLocationController implements FxController { LOG.warn("Can not use already existing vault path {}", vaultPath.get()); warningText.set(resourceBundle.getString("addvaultwizard.new.fileAlreadyExists")); } catch (IOException e) { - LOG.warn("Can not create vault at path: {}", vaultPath.get()); - LOG.warn("Thrown Exception:", e); - warningText.set(resourceBundle.getString("addvaultwizard.new.ioException")); + LOG.error("Failed to create and delete directory at chosen vault path.", e); + errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java index 4ddf54c6a..2c2f3885a 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/CreateNewVaultPasswordController.java @@ -18,6 +18,7 @@ import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.cryptofs.CryptoFileSystemProperties; import org.cryptomator.cryptofs.CryptoFileSystemProvider; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -42,17 +43,18 @@ import java.util.ResourceBundle; import java.util.concurrent.ExecutorService; import static java.nio.charset.StandardCharsets.US_ASCII; +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; @AddVaultWizardScoped public class CreateNewVaultPasswordController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(CreateNewVaultPasswordController.class); - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes private final Stage window; private final Lazy chooseLocationScene; private final Lazy recoveryKeyScene; private final Lazy successScene; + private final ErrorComponent.Builder errorComponent; private final ExecutorService executor; private final RecoveryKeyFactory recoveryKeyFactory; private final StringProperty vaultNameProperty; @@ -72,11 +74,12 @@ public class CreateNewVaultPasswordController implements FxController { public Toggle skipRecoveryKey; @Inject - CreateNewVaultPasswordController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy chooseLocationScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY) Lazy recoveryKeyScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ExecutorService executor, RecoveryKeyFactory recoveryKeyFactory, @Named("vaultName") StringProperty vaultName, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, @Named("recoveryKey") StringProperty recoveryKey, VaultListManager vaultListManager, ResourceBundle resourceBundle, @Named("newPassword") ObjectProperty password, ReadmeGenerator readmeGenerator) { + CreateNewVaultPasswordController(@AddVaultWizardWindow Stage window, @FxmlScene(FxmlFile.ADDVAULT_NEW_LOCATION) Lazy chooseLocationScene, @FxmlScene(FxmlFile.ADDVAULT_NEW_RECOVERYKEY) Lazy recoveryKeyScene, @FxmlScene(FxmlFile.ADDVAULT_SUCCESS) Lazy successScene, ErrorComponent.Builder errorComponent, ExecutorService executor, RecoveryKeyFactory recoveryKeyFactory, @Named("vaultName") StringProperty vaultName, ObjectProperty vaultPath, @AddVaultWizardWindow ObjectProperty vault, @Named("recoveryKey") StringProperty recoveryKey, VaultListManager vaultListManager, ResourceBundle resourceBundle, @Named("newPassword") ObjectProperty password, ReadmeGenerator readmeGenerator) { this.window = window; this.chooseLocationScene = chooseLocationScene; this.recoveryKeyScene = recoveryKeyScene; this.successScene = successScene; + this.errorComponent = errorComponent; this.executor = executor; this.recoveryKeyFactory = recoveryKeyFactory; this.vaultNameProperty = vaultName; @@ -109,12 +112,10 @@ public class CreateNewVaultPasswordController implements FxController { try { Files.createDirectory(pathToVault); - } catch (FileAlreadyExistsException e) { - LOG.error("Vault dir already exists.", e); - window.setScene(chooseLocationScene.get()); } catch (IOException e) { - // TODO show generic error screen - LOG.error("", e); + LOG.error("Failed to create vault directory.", e); + errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); + return; } if (showRecoveryKey.equals(recoveryKeyChoice.getSelectedToggle())) { @@ -137,8 +138,8 @@ public class CreateNewVaultPasswordController implements FxController { recoveryKeyProperty.set(recoveryKey); window.setScene(recoveryKeyScene.get()); }).onError(IOException.class, e -> { - // TODO show generic error screen - LOG.error("", e); + LOG.error("Failed to initialize vault.", e); + errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); }).andFinally(() -> { processing.set(false); }).runOnce(executor); @@ -153,8 +154,8 @@ public class CreateNewVaultPasswordController implements FxController { initializationSucceeded(pathToVault); window.setScene(successScene.get()); }).onError(IOException.class, e -> { - // TODO show generic error screen - LOG.error("", e); + LOG.error("Failed to initialize vault.", e); + errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); }).andFinally(() -> { processing.set(false); }).runOnce(executor); diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java index b3b6a4b25..aa67862f3 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/LocationPresets.java @@ -13,7 +13,7 @@ import java.nio.file.Paths; public class LocationPresets { private static final String USER_HOME = System.getProperty("user.home"); - private static final String[] ICLOUDDRIVE_LOCATIONS = {"~/Library/Mobile Documents/iCloud~com~setolabs~Cryptomator/Documents"}; + private static final String[] ICLOUDDRIVE_LOCATIONS = {"~/Library/Mobile Documents/iCloud~com~setolabs~Cryptomator/Documents", "~/iCloudDrive/iCloud~com~setolabs~Cryptomator"}; private static final String[] DROPBOX_LOCATIONS = {"~/Dropbox"}; private static final String[] GDRIVE_LOCATIONS = {"~/Google Drive"}; private static final String[] ONEDRIVE_LOCATIONS = {"~/OneDrive"}; diff --git a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java index 19a5107e7..64c061d58 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java +++ b/main/ui/src/main/java/org/cryptomator/ui/addvaultwizard/ReadmeGenerator.java @@ -10,29 +10,45 @@ public class ReadmeGenerator { // specs: https://web.archive.org/web/20190708132914/http://www.kleinlercher.at/tools/Windows_Protocols/Word2007RTFSpec9.pdf private static final String RTF_HEADER = "{\\rtf1\\fbidis\\ansi\\uc0\\fs32\n"; private static final String RTF_FOOTER = "}"; - private static final String HELP_URL = "{\\field{\\*\\fldinst HYPERLINK \"http://docs.cryptoamtor.org/\"}{\\fldrslt docs.cryptoamtor.org}}"; + private static final String HEADING = "\\fs40\\qc %s"; + private static final String EMPTY_PAR = ""; + private static final String DONT_PAR = "\\b %s"; + private static final String IDENT_PAR = " %s"; + private static final String HELP_URL = "{\\field{\\*\\fldinst HYPERLINK \"http://docs.cryptomator.org/\"}{\\fldrslt http://docs.cryptomator.org}}"; private final ResourceBundle resourceBundle; @Inject - public ReadmeGenerator(ResourceBundle resourceBundle){ + public ReadmeGenerator(ResourceBundle resourceBundle) { this.resourceBundle = resourceBundle; } public String createVaultStorageLocationReadmeRtf() { return createDocument(List.of( // - resourceBundle.getString("addvault.new.readme.storageLocation.1"), // + String.format(HEADING, resourceBundle.getString("addvault.new.readme.storageLocation.1")), // resourceBundle.getString("addvault.new.readme.storageLocation.2"), // - resourceBundle.getString("addvault.new.readme.storageLocation.3"), // - String.format(resourceBundle.getString("addvault.new.readme.storageLocation.4"), HELP_URL) // + EMPTY_PAR, // + String.format(DONT_PAR, resourceBundle.getString("addvault.new.readme.storageLocation.3")), // + String.format(IDENT_PAR, resourceBundle.getString("addvault.new.readme.storageLocation.4")), // + String.format(IDENT_PAR, resourceBundle.getString("addvault.new.readme.storageLocation.5")), // + EMPTY_PAR, // + resourceBundle.getString("addvault.new.readme.storageLocation.6"), // + String.format(IDENT_PAR, resourceBundle.getString("addvault.new.readme.storageLocation.7")), // + String.format(IDENT_PAR, resourceBundle.getString("addvault.new.readme.storageLocation.8")), // + String.format(IDENT_PAR, resourceBundle.getString("addvault.new.readme.storageLocation.9")), // + EMPTY_PAR, // + String.format(resourceBundle.getString("addvault.new.readme.storageLocation.10"), HELP_URL) // )); } public String createVaultAccessLocationReadmeRtf() { return createDocument(List.of( // - resourceBundle.getString("addvault.new.readme.accessLocation.1"), // + String.format(HEADING,resourceBundle.getString("addvault.new.readme.accessLocation.1")), // resourceBundle.getString("addvault.new.readme.accessLocation.2"), // - resourceBundle.getString("addvault.new.readme.accessLocation.3") // + EMPTY_PAR, // + resourceBundle.getString("addvault.new.readme.accessLocation.3"), // + EMPTY_PAR, // + resourceBundle.getString("addvault.new.readme.accessLocation.4") )); } @@ -40,9 +56,9 @@ public class ReadmeGenerator { String createDocument(Iterable paragraphs) { StringBuilder sb = new StringBuilder(RTF_HEADER); for (String p : paragraphs) { - sb.append("\\par {\\sa80 "); + sb.append("{\\sa80 "); appendEscaped(sb, p); - sb.append("}\n"); + sb.append("}\\par \n"); } sb.append(RTF_FOOTER); return sb.toString(); diff --git a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java index d711f9069..ca15a5105 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/changepassword/ChangePasswordController.java @@ -14,6 +14,8 @@ import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; import org.cryptomator.cryptofs.CryptoFileSystemProvider; import org.cryptomator.cryptolib.api.InvalidPassphraseException; +import org.cryptomator.ui.common.Animations; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.controls.FontAwesome5IconView; import org.cryptomator.ui.controls.NiceSecurePasswordField; @@ -27,25 +29,28 @@ import javax.inject.Named; import java.io.IOException; import java.util.ResourceBundle; +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; + @ChangePasswordScoped public class ChangePasswordController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(ChangePasswordController.class); - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes private final Stage window; private final Vault vault; private final ObjectProperty newPassword; + private final ErrorComponent.Builder errorComponent; public NiceSecurePasswordField oldPasswordField; public CheckBox finalConfirmationCheckbox; public Button finishButton; @Inject - public ChangePasswordController(@ChangePasswordWindow Stage window, @ChangePasswordWindow Vault vault, @Named("newPassword") ObjectProperty newPassword) { + public ChangePasswordController(@ChangePasswordWindow Stage window, @ChangePasswordWindow Vault vault, @Named("newPassword") ObjectProperty newPassword, ErrorComponent.Builder errorComponent) { this.window = window; this.vault = vault; this.newPassword = newPassword; + this.errorComponent = errorComponent; } @FXML @@ -67,12 +72,12 @@ public class ChangePasswordController implements FxController { LOG.info("Successful changed password for {}", vault.getDisplayableName()); window.close(); } catch (IOException e) { - // TODO show generic error screen LOG.error("IO error occured during password change. Unable to perform operation.", e); - e.printStackTrace(); + errorComponent.cause(e).window(window).returnToScene(window.getScene()).build().showErrorScene(); } catch (InvalidPassphraseException e) { - // TODO shake - LOG.info("Wrong old password."); + Animations.createShakeWindowAnimation(window).play(); + oldPasswordField.selectAll(); + oldPasswordField.requestFocus(); } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java new file mode 100644 index 000000000..0ba4e4d47 --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorComponent.java @@ -0,0 +1,40 @@ +package org.cryptomator.ui.common; + +import dagger.BindsInstance; +import dagger.Subcomponent; +import javafx.scene.Scene; +import javafx.stage.Stage; + +import javax.annotation.Nullable; + +@Subcomponent(modules = {ErrorModule.class}) +public interface ErrorComponent { + + Stage window(); + + @FxmlScene(FxmlFile.ERROR) + Scene scene(); + + default void showErrorScene() { + Stage stage = window(); + stage.setScene(scene()); + stage.show(); + } + + @Subcomponent.Builder + interface Builder { + + @BindsInstance + Builder cause(Throwable cause); + + @BindsInstance + Builder window(Stage window); + + @BindsInstance + Builder returnToScene(@Nullable Scene previousScene); + + ErrorComponent build(); + + } + +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java new file mode 100644 index 000000000..52c3d4034 --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorController.java @@ -0,0 +1,45 @@ +package org.cryptomator.ui.common; + +import javafx.fxml.FXML; +import javafx.scene.Scene; +import javafx.stage.Stage; + +import javax.annotation.Nullable; +import javax.inject.Inject; +import javax.inject.Named; + +public class ErrorController implements FxController { + + private final String stackTrace; + private final Scene previousScene; + private final Stage window; + + @Inject + ErrorController(@Named("stackTrace") String stackTrace, @Nullable Scene previousScene, Stage window) { + this.stackTrace = stackTrace; + this.previousScene = previousScene; + this.window = window; + } + + @FXML + public void back() { + if (previousScene != null) { + window.setScene(previousScene); + } + } + + @FXML + public void close() { + window.close(); + } + + /* Getter/Setter */ + + public boolean isPreviousScenePresent() { + return previousScene != null; + } + + public String getStackTrace() { + return stackTrace; + } +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java new file mode 100644 index 000000000..9b272a585 --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/common/ErrorModule.java @@ -0,0 +1,45 @@ +package org.cryptomator.ui.common; + +import dagger.Binds; +import dagger.Module; +import dagger.Provides; +import dagger.multibindings.IntoMap; +import javafx.scene.Scene; + +import javax.inject.Named; +import javax.inject.Provider; +import java.io.ByteArrayOutputStream; +import java.io.PrintStream; +import java.nio.charset.StandardCharsets; +import java.util.Map; +import java.util.ResourceBundle; + +@Module +abstract class ErrorModule { + + @Provides + static FXMLLoaderFactory provideFxmlLoaderFactory(Map, Provider> factories, DefaultSceneFactory sceneFactory, ResourceBundle resourceBundle) { + return new FXMLLoaderFactory(factories, sceneFactory, resourceBundle); + } + + @Provides + @Named("stackTrace") + static String provideStackTrace(Throwable cause) { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + cause.printStackTrace(new PrintStream(baos)); + return baos.toString(StandardCharsets.UTF_8); + } + + @Binds + @IntoMap + @FxControllerKey(ErrorController.class) + abstract FxController bindErrorController(ErrorController controller); + + @Provides + @FxmlScene(FxmlFile.ERROR) + static Scene provideErrorScene(FXMLLoaderFactory fxmlLoaders) { + return fxmlLoaders.createScene(FxmlFile.ERROR.getRessourcePathString()); + } + + +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java b/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java index 1edcc633b..210655a5f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FXMLLoaderFactory.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.common; -import com.google.common.base.Splitter; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; import javafx.scene.Scene; @@ -9,7 +8,6 @@ import javax.inject.Provider; import java.io.IOException; import java.io.InputStream; import java.io.UncheckedIOException; -import java.util.List; import java.util.Map; import java.util.ResourceBundle; import java.util.function.Function; @@ -65,8 +63,9 @@ public class FXMLLoaderFactory { throw new UncheckedIOException("Failed to load " + fxmlResourceName, e); } Parent root = loader.getRoot(); - List addtionalStyleSheets = Splitter.on(',').omitEmptyStrings().splitToList(resourceBundle.getString("additionalStyleSheets")); - addtionalStyleSheets.forEach(styleSheet -> root.getStylesheets().add("/css/" + styleSheet)); + // TODO: discuss if we can remove language-specific stylesheets + // List addtionalStyleSheets = Splitter.on(',').omitEmptyStrings().splitToList(resourceBundle.getString("additionalStyleSheets")); + // addtionalStyleSheets.forEach(styleSheet -> root.getStylesheets().add("/css/" + styleSheet)); return sceneFactory.apply(root); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java index d4f87c60b..1daf5bc30 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxControllerKey.java @@ -14,7 +14,6 @@ import java.lang.annotation.Target; import static java.lang.annotation.ElementType.METHOD; import static java.lang.annotation.RetentionPolicy.RUNTIME; -// TODO rename after refactoring @Documented @Target(METHOD) @Retention(RUNTIME) diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java index 998bea98e..9798a9a0f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/FxmlFile.java @@ -1,19 +1,18 @@ package org.cryptomator.ui.common; public enum FxmlFile { - ADDVAULT_WELCOME("/fxml/addvault_welcome.fxml"), // ADDVAULT_EXISTING("/fxml/addvault_existing.fxml"), // - ADDVAULT_EXISTING_ERROR("/fxml/addvault_existing_error.fxml"), ADDVAULT_NEW_NAME("/fxml/addvault_new_name.fxml"), // ADDVAULT_NEW_LOCATION("/fxml/addvault_new_location.fxml"), // ADDVAULT_NEW_PASSWORD("/fxml/addvault_new_password.fxml"), // ADDVAULT_NEW_RECOVERYKEY("/fxml/addvault_new_recoverykey.fxml"), // ADDVAULT_SUCCESS("/fxml/addvault_success.fxml"), // + ADDVAULT_WELCOME("/fxml/addvault_welcome.fxml"), // CHANGEPASSWORD("/fxml/changepassword.fxml"), // + ERROR("/fxml/error.fxml"), // FORGET_PASSWORD("/fxml/forget_password.fxml"), // MAIN_WINDOW("/fxml/main_window.fxml"), // MIGRATION_CAPABILITY_ERROR("/fxml/migration_capability_error.fxml"), // - MIGRATION_GENERIC_ERROR("/fxml/migration_generic_error.fxml"), // MIGRATION_RUN("/fxml/migration_run.fxml"), // MIGRATION_START("/fxml/migration_start.fxml"), // MIGRATION_SUCCESS("/fxml/migration_success.fxml"), // @@ -25,7 +24,6 @@ public enum FxmlFile { RECOVERYKEY_SUCCESS("/fxml/recoverykey_success.fxml"), // REMOVE_VAULT("/fxml/remove_vault.fxml"), // UNLOCK("/fxml/unlock.fxml"), - UNLOCK_GENERIC_ERROR("/fxml/unlock_generic_error.fxml"), // UNLOCK_INVALID_MOUNT_POINT("/fxml/unlock_invalid_mount_point.fxml"), // UNLOCK_SUCCESS("/fxml/unlock_success.fxml"), // VAULT_OPTIONS("/fxml/vault_options.fxml"), // diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/StackTraceController.java b/main/ui/src/main/java/org/cryptomator/ui/common/StackTraceController.java deleted file mode 100644 index f83614dc1..000000000 --- a/main/ui/src/main/java/org/cryptomator/ui/common/StackTraceController.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.cryptomator.ui.common; - -import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.nio.charset.StandardCharsets; - -public class StackTraceController implements FxController { - - private final String stackTrace; - - public StackTraceController(Throwable cause) { - this.stackTrace = provideStackTrace(cause); - } - - private static String provideStackTrace(Throwable cause) { - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - cause.printStackTrace(new PrintStream(baos)); - return baos.toString(StandardCharsets.UTF_8); - } - - /* Getter/Setter */ - - public String getStackTrace() { - return stackTrace; - } - - -} diff --git a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java index 68e1fecb0..b215c0c36 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java +++ b/main/ui/src/main/java/org/cryptomator/ui/common/VaultService.java @@ -62,22 +62,12 @@ public class VaultService { if (!keychain.isPresent()) { LOG.debug("No system keychain found. Unable to auto unlock without saved passwords."); } else { - for (Vault vault : vaults) { - attemptAutoUnlock(vault, keychain.get()); - } + List> unlockTasks = vaults.stream().map(v -> createAutoUnlockTask(v, keychain.get())).collect(Collectors.toList()); + Task> runSequentiallyTask = new RunSequentiallyTask(unlockTasks); + executorService.execute(runSequentiallyTask); } } - /** - * Unlocks a vault in a background thread using a stored passphrase - * - * @param vault The vault to unlock - * @param keychainAccess The system keychain holding the passphrase for the vault - */ - public void attemptAutoUnlock(Vault vault, KeychainAccess keychainAccess) { - executorService.execute(createAutoUnlockTask(vault, keychainAccess)); - } - /** * Creates but doesn't start an auto-unlock task. * @@ -199,14 +189,14 @@ public class VaultService { } @Override - protected Collection call() throws Exception { + protected Collection call() throws ExecutionException, InterruptedException { Iterator> remainingTasks = startedTasks.iterator(); Collection completed = new ArrayList<>(); try { // wait for all tasks: while (remainingTasks.hasNext()) { - Vault lockedVault = remainingTasks.next().get(); - completed.add(lockedVault); + Vault done = remainingTasks.next().get(); + completed.add(done); } } catch (ExecutionException e) { // cancel all remaining: @@ -215,7 +205,30 @@ public class VaultService { } throw e; } - return List.copyOf(completed); + return completed; + } + } + + /** + * A task that runs a list of tasks in their given order + */ + private static class RunSequentiallyTask extends Task> { + + private final List> tasks; + + public RunSequentiallyTask(List> tasks) { + this.tasks = List.copyOf(tasks); + } + + @Override + protected List call() throws ExecutionException, InterruptedException { + List completed = new ArrayList<>(); + for (Task task : tasks) { + task.run(); + Vault done = task.get(); + completed.add(done); + } + return completed; } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java index 97d20ecdb..5ebe94068 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FontAwesome5Icon.java @@ -16,11 +16,14 @@ public enum FontAwesome5Icon { EXCLAMATION_TRIANGLE("\uF071"), // EYE("\uF06E"), // EYE_SLASH("\uF070"), // + FILE("\uF15B"), // FILE_IMPORT("\uF56F"), // FOLDER_OPEN("\uF07C"), // HAND_HOLDING_HEART("\uF4BE"), // HEART("\uF004"), // HDD("\uF0A0"), // + INFO("\uF129"), // + INFO_CIRCLE("\uF05A"), // KEY("\uF084"), // LINK("\uF0C1"), // LOCK("\uF023"), // @@ -29,6 +32,7 @@ public enum FontAwesome5Icon { PLUS("\uF067"), // PRINT("\uF02F"), // QUESTION("\uF128"), // + SEARCH("\uF002"), // SPINNER("\uF110"), // SYNC("\uF021"), // TIMES("\uF00D"), // diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java index 44f446f47..c99cc62ea 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedLabel.java @@ -12,7 +12,7 @@ public class FormattedLabel extends Label { private final StringProperty format = new SimpleStringProperty(""); private final ObjectProperty arg1 = new SimpleObjectProperty<>(); - // TODO: add arg2, arg3, ... on demand + // add arg2, arg3, ... on demand public FormattedLabel() { textProperty().bind(createStringBinding()); diff --git a/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedString.java b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedString.java new file mode 100644 index 000000000..d678a3d86 --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/controls/FormattedString.java @@ -0,0 +1,58 @@ +package org.cryptomator.ui.controls; + +import javafx.beans.binding.Bindings; +import javafx.beans.binding.StringBinding; +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.SimpleObjectProperty; +import javafx.beans.property.SimpleStringProperty; +import javafx.beans.property.StringProperty; + +public class FormattedString { + + private final StringProperty format = new SimpleStringProperty(""); + private final ObjectProperty arg1 = new SimpleObjectProperty<>(); + // add arg2, arg3, ... on demand + private final StringBinding value; + + public FormattedString() { + this.value = Bindings.createStringBinding(this::computeValue, format, arg1); + } + + protected String computeValue() { + return String.format(format.get(), arg1.get()); + } + + /* Observables */ + + public StringProperty formatProperty() { + return format; + } + + public String getFormat() { + return format.get(); + } + + public void setFormat(String format) { + this.format.set(format); + } + + public ObjectProperty arg1Property() { + return arg1; + } + + public Object getArg1() { + return arg1.get(); + } + + public void setArg1(Object arg1) { + this.arg1.set(arg1); + } + + public StringBinding valueProperty() { + return value; + } + + public String getValue() { + return value.get(); + } +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java index aca5650ea..289497647 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java +++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplication.java @@ -129,10 +129,6 @@ public class FxApplication extends Application { private void loadSelectedStyleSheet(UiTheme desiredTheme) { UiTheme theme = licenseHolder.isValidLicense() ? desiredTheme : UiTheme.LIGHT; switch (theme) { -// case CUSTOM: -// // TODO -// Application.setUserAgentStylesheet(getClass().getResource("/css/mac_theme.css").toString()); -// break; case DARK: Application.setUserAgentStylesheet(getClass().getResource("/css/dark_theme.css").toString()); macFunctions.map(MacFunctions::uiAppearance).ifPresent(JniException.ignore(MacApplicationUiAppearance::setToDarkAqua)); diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java index 5a12822b2..4fd18202d 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/FxApplicationModule.java @@ -14,6 +14,7 @@ import javafx.beans.property.SimpleObjectProperty; import javafx.scene.image.Image; import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.Vault; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.mainwindow.MainWindowComponent; import org.cryptomator.ui.preferences.PreferencesComponent; import org.cryptomator.ui.quit.QuitComponent; @@ -26,7 +27,7 @@ import java.io.UncheckedIOException; import java.util.Collections; import java.util.List; -@Module(includes = {UpdateCheckerModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, QuitComponent.class}) +@Module(includes = {UpdateCheckerModule.class}, subcomponents = {MainWindowComponent.class, PreferencesComponent.class, UnlockComponent.class, QuitComponent.class, ErrorComponent.class}) abstract class FxApplicationModule { @Provides diff --git a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java index 149834978..4a8515b42 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java +++ b/main/ui/src/main/java/org/cryptomator/ui/fxapp/UpdateChecker.java @@ -69,7 +69,6 @@ public class UpdateChecker { String latestVersion = updateCheckerService.getValue(); LOG.info("Current version: {}, lastest version: {}", currentVersion, latestVersion); - // TODO settings.lastVersionCheck = Instant.now() if (currentVersion == null || semVerComparator.compare(currentVersion, latestVersion) < 0) { // update is available latestVersionProperty.set(latestVersion); diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java index 7847940cc..3ab8d0de1 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java +++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLaunchEventHandler.java @@ -14,11 +14,12 @@ import java.nio.file.Path; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ExecutorService; +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; + @Singleton class AppLaunchEventHandler { private static final Logger LOG = LoggerFactory.getLogger(AppLaunchEventHandler.class); - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes private final BlockingQueue launchEventQueue; private final ExecutorService executorService; diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java index bb53e8768..b0eda0e86 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java +++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/AppLifecycleListener.java @@ -16,6 +16,7 @@ import javax.inject.Named; import javax.inject.Singleton; import java.awt.Desktop; import java.awt.EventQueue; +import java.awt.desktop.AboutEvent; import java.awt.desktop.QuitResponse; import java.util.EnumSet; import java.util.EventObject; @@ -47,6 +48,11 @@ public class AppLifecycleListener { Desktop.getDesktop().setPreferencesHandler(this::showPreferencesWindow); } + // register preferences shortcut + if (Desktop.getDesktop().isSupported(Desktop.Action.APP_ABOUT)) { + Desktop.getDesktop().setAboutHandler(this::showAboutWindow); + } + // register quit handler if (Desktop.getDesktop().isSupported(Desktop.Action.APP_QUIT_HANDLER)) { Desktop.getDesktop().setQuitHandler(this::handleQuitRequest); @@ -110,6 +116,10 @@ public class AppLifecycleListener { fxApplicationStarter.get(true).thenAccept(app -> app.showPreferencesWindow(SelectedPreferencesTab.ANY)); } + private void showAboutWindow(@SuppressWarnings("unused") AboutEvent aboutEvent) { + fxApplicationStarter.get(true).thenAccept(app -> app.showPreferencesWindow(SelectedPreferencesTab.ABOUT)); + } + private void forceUnmountRemainingVaults() { for (Vault vault : vaults) { if (vault.isUnlocked()) { diff --git a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java index 9b8d6e776..951db2b27 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/launcher/UiLauncherModule.java @@ -9,6 +9,7 @@ import org.cryptomator.ui.traymenu.TrayMenuComponent; import javax.inject.Named; import javax.inject.Singleton; +import java.util.Locale; import java.util.ResourceBundle; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java index 14d9350da..d7cd2023a 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowController.java @@ -6,6 +6,7 @@ import javafx.fxml.FXML; import javafx.scene.input.DragEvent; import javafx.scene.input.TransferMode; import javafx.scene.layout.StackPane; +import org.apache.commons.lang3.SystemUtils; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.wrongfilealert.WrongFileAlertComponent; @@ -20,11 +21,12 @@ import java.nio.file.Path; import java.util.Set; import java.util.stream.Collectors; +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; + @MainWindowScoped public class MainWindowController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(MainWindowController.class); - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes private final VaultListManager vaultListManager; private final WrongFileAlertComponent.Builder wrongFileAlert; @@ -45,6 +47,9 @@ public class MainWindowController implements FxController { root.setOnDragOver(this::handleDragEvent); root.setOnDragDropped(this::handleDragEvent); root.setOnDragExited(this::handleDragEvent); + if (SystemUtils.IS_OS_WINDOWS) { + root.getStyleClass().add("os-windows"); + } } private void handleDragEvent(DragEvent event) { diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java index 9a058ea85..5043fa485 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/MainWindowModule.java @@ -87,6 +87,11 @@ abstract class MainWindowModule { @IntoMap @FxControllerKey(VaultDetailController.class) abstract FxController bindVaultDetailController(VaultDetailController controller); + + @Binds + @IntoMap + @FxControllerKey(WelcomeController.class) + abstract FxController bindWelcomeController(WelcomeController controller); @Binds @IntoMap @@ -97,6 +102,11 @@ abstract class MainWindowModule { @IntoMap @FxControllerKey(VaultDetailUnlockedController.class) abstract FxController bindVaultDetailUnlockedController(VaultDetailUnlockedController controller); + + @Binds + @IntoMap + @FxControllerKey(VaultDetailMissingVaultController.class) + abstract FxController bindVaultDetailMissingVaultController(VaultDetailMissingVaultController controller); @Binds @IntoMap diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java new file mode 100644 index 000000000..8036cbb3c --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultDetailMissingVaultController.java @@ -0,0 +1,20 @@ +package org.cryptomator.ui.mainwindow; + +import javafx.beans.property.ObjectProperty; +import javafx.beans.property.ReadOnlyObjectProperty; +import org.cryptomator.common.vaults.Vault; +import org.cryptomator.ui.common.FxController; + +import javax.inject.Inject; + +@MainWindowScoped +public class VaultDetailMissingVaultController implements FxController { + + private final ReadOnlyObjectProperty vault; + + @Inject + public VaultDetailMissingVaultController(ObjectProperty vault) { + this.vault = vault; + } + +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java index 0da7063ce..167138e0f 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/VaultListController.java @@ -1,6 +1,5 @@ package org.cryptomator.ui.mainwindow; -import javafx.beans.Observable; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.beans.property.ObjectProperty; @@ -9,7 +8,6 @@ import javafx.collections.ListChangeListener; import javafx.collections.ObservableList; import javafx.fxml.FXML; import javafx.scene.control.ListView; -import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; import org.cryptomator.common.vaults.VaultListManager; import org.cryptomator.common.vaults.VaultState; @@ -21,7 +19,6 @@ import org.slf4j.LoggerFactory; import javax.inject.Inject; -//TODO: Add check if a vault in the list is invalid and add notification & controller @MainWindowScoped public class VaultListController implements FxController { @@ -63,6 +60,9 @@ public class VaultListController implements FxController { } private void selectedVaultDidChange(@SuppressWarnings("unused") ObservableValue observableValue, @SuppressWarnings("unused") Vault oldValue, Vault newValue) { + if (newValue == null) { + return; + } VaultState reportedState = newValue.getState(); switch (reportedState) { case LOCKED: diff --git a/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java new file mode 100644 index 000000000..2646c1a36 --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/mainwindow/WelcomeController.java @@ -0,0 +1,45 @@ +package org.cryptomator.ui.mainwindow; + +import javafx.application.Application; +import javafx.beans.binding.Bindings; +import javafx.beans.binding.BooleanBinding; +import javafx.collections.ObservableList; +import javafx.fxml.FXML; +import org.cryptomator.common.vaults.Vault; +import org.cryptomator.ui.common.FxController; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; + +@MainWindowScoped +public class WelcomeController implements FxController { + + private static final Logger LOG = LoggerFactory.getLogger(WelcomeController.class); + private static final String GETTING_STARTED_URI = "https://docs.cryptomator.org/en/1.5/desktop/getting-started/"; + + private final Application application; + private final BooleanBinding noVaultPresent; + + @Inject + public WelcomeController(Application application, ObservableList vaults) { + this.application = application; + this.noVaultPresent = Bindings.isEmpty(vaults); + } + + @FXML + public void visitGettingStartedGuide() { + LOG.trace("Opening {}", GETTING_STARTED_URI); + application.getHostServices().showDocument(GETTING_STARTED_URI); + } + + /* Getter/Setter */ + + public BooleanBinding noVaultPresentProperty() { + return noVaultPresent; + } + + public boolean isNoVaultPresent() { + return noVaultPresent.get(); + } +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationGenericErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationGenericErrorController.java deleted file mode 100644 index 3b6121c79..000000000 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationGenericErrorController.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.cryptomator.ui.migration; - -import dagger.Lazy; -import javafx.fxml.FXML; -import javafx.scene.Scene; -import javafx.stage.Stage; -import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.common.FxmlFile; -import org.cryptomator.ui.common.FxmlScene; - -import javax.inject.Inject; - -@MigrationScoped -public class MigrationGenericErrorController implements FxController { - - private final Stage window; - private final Lazy startScene; - - @Inject - MigrationGenericErrorController(@MigrationWindow Stage window, @FxmlScene(FxmlFile.MIGRATION_START) Lazy startScene) { - this.window = window; - this.startScene = startScene; - } - - @FXML - public void back() { - window.setScene(startScene.get()); - } -} diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java index 7404088e3..508777364 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationModule.java @@ -17,7 +17,6 @@ import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.StackTraceController; import org.cryptomator.ui.mainwindow.MainWindow; import javax.inject.Named; @@ -48,14 +47,7 @@ abstract class MigrationModule { stage.getIcons().addAll(windowIcons); return stage; } - - @Provides - @Named("genericErrorCause") - @MigrationScoped - static ObjectProperty provideGenericErrorCause() { - return new SimpleObjectProperty<>(); - } - + @Provides @Named("capabilityErrorCause") @MigrationScoped @@ -91,14 +83,6 @@ abstract class MigrationModule { return fxmlLoaders.createScene("/fxml/migration_capability_error.fxml"); } - @Provides - @FxmlScene(FxmlFile.MIGRATION_GENERIC_ERROR) - @MigrationScoped - static Scene provideMigrationGenericErrorScene(@MigrationWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/migration_generic_error.fxml"); - } - - // ------------------ @Binds @@ -120,17 +104,5 @@ abstract class MigrationModule { @IntoMap @FxControllerKey(MigrationCapabilityErrorController.class) abstract FxController bindMigrationCapabilityErrorController(MigrationCapabilityErrorController controller); - - @Binds - @IntoMap - @FxControllerKey(MigrationGenericErrorController.class) - abstract FxController bindMigrationGenericErrorController(MigrationGenericErrorController controller); - - @Provides - @IntoMap - @FxControllerKey(StackTraceController.class) - static FxController provideStackTraceController(@Named("genericErrorCause") ObjectProperty errorCause) { - return new StackTraceController(errorCause.get()); - } - + } diff --git a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java index 81c8f90f7..826fa6053 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/migration/MigrationRunController.java @@ -23,6 +23,7 @@ import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.keychain.KeychainAccess; import org.cryptomator.keychain.KeychainAccessException; import org.cryptomator.ui.common.Animations; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -40,11 +41,12 @@ import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; + @MigrationScoped public class MigrationRunController implements FxController { private static final Logger LOG = LoggerFactory.getLogger(MigrationRunController.class); - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes private static final long MIGRATION_PROGRESS_UPDATE_MILLIS = 50; private final Stage window; @@ -53,31 +55,29 @@ public class MigrationRunController implements FxController { private final ScheduledExecutorService scheduler; private final Optional keychainAccess; private final ObjectProperty missingCapability; - private final ObjectProperty errorCause; + private final ErrorComponent.Builder errorComponent; private final Lazy startScene; private final Lazy successScene; private final ObjectBinding migrateButtonContentDisplay; private final Lazy capabilityErrorScene; - private final Lazy genericErrorScene; private final BooleanProperty migrationButtonDisabled; private final DoubleProperty migrationProgress; private volatile double volatileMigrationProgress = -1.0; public NiceSecurePasswordField passwordField; @Inject - public MigrationRunController(@MigrationWindow Stage window, @MigrationWindow Vault vault, ExecutorService executor, ScheduledExecutorService scheduler, Optional keychainAccess, @Named("capabilityErrorCause") ObjectProperty missingCapability, @Named("genericErrorCause") ObjectProperty errorCause, @FxmlScene(FxmlFile.MIGRATION_START) Lazy startScene, @FxmlScene(FxmlFile.MIGRATION_SUCCESS) Lazy successScene, @FxmlScene(FxmlFile.MIGRATION_CAPABILITY_ERROR) Lazy capabilityErrorScene, @FxmlScene(FxmlFile.MIGRATION_GENERIC_ERROR) Lazy genericErrorScene) { + public MigrationRunController(@MigrationWindow Stage window, @MigrationWindow Vault vault, ExecutorService executor, ScheduledExecutorService scheduler, Optional keychainAccess, @Named("capabilityErrorCause") ObjectProperty missingCapability, @FxmlScene(FxmlFile.MIGRATION_START) Lazy startScene, @FxmlScene(FxmlFile.MIGRATION_SUCCESS) Lazy successScene, @FxmlScene(FxmlFile.MIGRATION_CAPABILITY_ERROR) Lazy capabilityErrorScene, ErrorComponent.Builder errorComponent) { this.window = window; this.vault = vault; this.executor = executor; this.scheduler = scheduler; this.keychainAccess = keychainAccess; this.missingCapability = missingCapability; - this.errorCause = errorCause; + this.errorComponent = errorComponent; this.startScene = startScene; this.successScene = successScene; this.migrateButtonContentDisplay = Bindings.createObjectBinding(this::getMigrateButtonContentDisplay, vault.stateProperty()); this.capabilityErrorScene = capabilityErrorScene; - this.genericErrorScene = genericErrorScene; this.migrationButtonDisabled = new SimpleBooleanProperty(); this.migrationProgress = new SimpleDoubleProperty(volatileMigrationProgress); } @@ -131,8 +131,7 @@ public class MigrationRunController implements FxController { }).onError(Exception.class, e -> { // including RuntimeExceptions LOG.error("Migration failed for technical reasons.", e); vault.setState(VaultState.NEEDS_MIGRATION); - errorCause.set(e); - window.setScene(genericErrorScene.get()); + errorComponent.cause(e).window(window).returnToScene(startScene.get()).build().showErrorScene(); }).andFinally(() -> { progressSyncTask.cancel(true); }).runOnce(executor); diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/AboutController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/AboutController.java new file mode 100644 index 000000000..758e0113b --- /dev/null +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/AboutController.java @@ -0,0 +1,49 @@ +package org.cryptomator.ui.preferences; + +import com.google.common.io.CharStreams; +import org.cryptomator.common.Environment; +import org.cryptomator.ui.common.FxController; +import org.cryptomator.ui.fxapp.UpdateChecker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +import javax.inject.Inject; +import java.io.IOException; +import java.io.InputStream; +import java.io.InputStreamReader; + +@PreferencesScoped +public class AboutController implements FxController { + + private static final Logger LOG = LoggerFactory.getLogger(AboutController.class); + + private final String thirdPartyLicenseText; + private final String applicationVersion; + + @Inject + AboutController(UpdateChecker updateChecker, Environment environment) { + this.thirdPartyLicenseText = loadThirdPartyLicenseFile(); + StringBuilder sb = new StringBuilder(updateChecker.currentVersionProperty().get()); + environment.getBuildNumber().ifPresent(s -> sb.append(" (").append(s).append(')')); + this.applicationVersion = sb.toString(); + } + + private static String loadThirdPartyLicenseFile() { + try (InputStream in = AboutController.class.getResourceAsStream("/license/THIRD-PARTY.txt")) { + return CharStreams.toString(new InputStreamReader(in)); + } catch (IOException | NullPointerException e) { + LOG.error("Failed to load /license/THIRD-PARTY.txt", e); + return ""; + } + } + + /* Getter */ + + public String getThirdPartyLicenseText() { + return thirdPartyLicenseText; + } + + public String getApplicationVersion() { + return applicationVersion; + } +} diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java index ae18dbd3f..85c8630b0 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/GeneralPreferencesController.java @@ -1,6 +1,7 @@ package org.cryptomator.ui.preferences; import javafx.application.Platform; +import javafx.beans.property.ObjectProperty; import javafx.beans.value.ObservableValue; import javafx.concurrent.Task; import javafx.fxml.FXML; @@ -31,6 +32,7 @@ public class GeneralPreferencesController implements FxController { private final Settings settings; private final boolean trayMenuSupported; private final Optional autoStartStrategy; + private final ObjectProperty selectedTabProperty; private final LicenseHolder licenseHolder; private final ExecutorService executor; public ChoiceBox themeChoiceBox; @@ -42,10 +44,11 @@ public class GeneralPreferencesController implements FxController { public RadioButton nodeOrientationRtl; @Inject - GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional autoStartStrategy, LicenseHolder licenseHolder, ExecutorService executor) { + GeneralPreferencesController(Settings settings, @Named("trayMenuSupported") boolean trayMenuSupported, Optional autoStartStrategy, ObjectProperty selectedTabProperty, LicenseHolder licenseHolder, ExecutorService executor) { this.settings = settings; this.trayMenuSupported = trayMenuSupported; this.autoStartStrategy = autoStartStrategy; + this.selectedTabProperty = selectedTabProperty; this.licenseHolder = licenseHolder; this.executor = executor; } @@ -103,6 +106,12 @@ public class GeneralPreferencesController implements FxController { return licenseHolder; } + + @FXML + public void showDonationTab() { + selectedTabProperty.set(SelectedPreferencesTab.DONATION_KEY); + } + /* Helper classes */ private static class UiThemeConverter extends StringConverter { diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java index 718f9d443..ea525cc90 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesController.java @@ -1,9 +1,7 @@ package org.cryptomator.ui.preferences; -import javafx.beans.Observable; import javafx.beans.binding.BooleanBinding; import javafx.beans.property.ObjectProperty; -import javafx.beans.value.ObservableValue; import javafx.fxml.FXML; import javafx.scene.control.Tab; import javafx.scene.control.TabPane; @@ -11,12 +9,16 @@ import javafx.stage.Stage; import javafx.stage.WindowEvent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.fxapp.UpdateChecker; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import javax.inject.Inject; @PreferencesScoped public class PreferencesController implements FxController { + private static final Logger LOG = LoggerFactory.getLogger(PreferencesController.class); + private final Stage window; private final ObjectProperty selectedTabProperty; private final BooleanBinding updateAvailable; @@ -25,6 +27,7 @@ public class PreferencesController implements FxController { public Tab volumeTab; public Tab updatesTab; public Tab donationKeyTab; + public Tab aboutTab; @Inject public PreferencesController(@PreferencesWindow Stage window, ObjectProperty selectedTabProperty, UpdateChecker updateChecker) { @@ -37,6 +40,7 @@ public class PreferencesController implements FxController { public void initialize() { window.setOnShowing(this::windowWillAppear); selectedTabProperty.addListener(observable -> this.selectChosenTab()); + tabPane.getSelectionModel().selectedItemProperty().addListener(observable -> this.selectedTabChanged()); } private void selectChosenTab() { @@ -54,12 +58,24 @@ public class PreferencesController implements FxController { return donationKeyTab; case GENERAL: return generalTab; + case ABOUT: + return aboutTab; case ANY: default: return updateAvailable.get() ? updatesTab : generalTab; } } + private void selectedTabChanged() { + Tab selectedTab = tabPane.getSelectionModel().getSelectedItem(); + try { + SelectedPreferencesTab selectedPreferencesTab = SelectedPreferencesTab.valueOf(selectedTab.getId()); + selectedTabProperty.set(selectedPreferencesTab); + } catch (IllegalArgumentException e) { + LOG.error("Unknown preferences tab id: {}", selectedTab.getId()); + } + } + private void windowWillAppear(@SuppressWarnings("unused") WindowEvent windowEvent) { selectChosenTab(); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java index 4a6051cbd..b9438e35c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/PreferencesModule.java @@ -83,4 +83,9 @@ abstract class PreferencesModule { @FxControllerKey(DonationKeyPreferencesController.class) abstract FxController bindDonationKeyPreferencesController(DonationKeyPreferencesController controller); + @Binds + @IntoMap + @FxControllerKey(AboutController.class) + abstract FxController bindAboutController(AboutController controller); + } diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/SelectedPreferencesTab.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/SelectedPreferencesTab.java index 74f305c6e..a76f2ac1c 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/SelectedPreferencesTab.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/SelectedPreferencesTab.java @@ -25,4 +25,9 @@ public enum SelectedPreferencesTab { * Show donation key tab */ DONATION_KEY, + + /** + * Show about tab + */ + ABOUT, } diff --git a/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java b/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java index 6433d1ea7..60edc4f12 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/preferences/UpdatesPreferencesController.java @@ -1,5 +1,6 @@ package org.cryptomator.ui.preferences; +import javafx.application.Application; import javafx.beans.binding.Bindings; import javafx.beans.binding.BooleanBinding; import javafx.beans.binding.ObjectBinding; @@ -16,6 +17,9 @@ import javax.inject.Inject; @PreferencesScoped public class UpdatesPreferencesController implements FxController { + private static final String DOWNLOADS_URI = "https://cryptomator.org/downloads"; + + private final Application application; private final Settings settings; private final UpdateChecker updateChecker; private final ObjectBinding checkForUpdatesButtonState; @@ -25,7 +29,8 @@ public class UpdatesPreferencesController implements FxController { public CheckBox checkForUpdatesCheckbox; @Inject - UpdatesPreferencesController(Settings settings, UpdateChecker updateChecker) { + UpdatesPreferencesController(Application application, Settings settings, UpdateChecker updateChecker) { + this.application = application; this.settings = settings; this.updateChecker = updateChecker; this.checkForUpdatesButtonState = Bindings.when(updateChecker.checkingForUpdatesProperty()).then(ContentDisplay.LEFT).otherwise(ContentDisplay.TEXT_ONLY); @@ -43,6 +48,11 @@ public class UpdatesPreferencesController implements FxController { updateChecker.checkForUpdatesNow(); } + @FXML + public void visitDownloadsPage() { + application.getHostServices().showDocument(DOWNLOADS_URI); + } + /* Observable Properties */ public ObjectBinding checkForUpdatesButtonStateProperty() { diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java index 19b32add2..40d3657ff 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyDisplayController.java @@ -38,13 +38,12 @@ public class RecoveryKeyDisplayController implements FxController { @FXML public void printRecoveryKey() { - // TODO localize - PrinterJob job = PrinterJob.createPrinterJob(); if (job != null && job.showPrintDialog(window)) { PageLayout pageLayout = job.getJobSettings().getPageLayout(); - - Text heading = new Text("Cryptomator Recovery Key\n" + vaultName + "\n"); + + String headingText = String.format(localization.getString("recoveryKey.printout.heading"), vaultName); + Text heading = new Text(headingText); heading.setFont(Font.font("serif", FontWeight.BOLD, 20)); heading.setFontSmoothingType(FontSmoothingType.LCD); diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java index 25374a7f2..c07bd3bd3 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyFactory.java @@ -12,10 +12,11 @@ import java.nio.file.Path; import java.util.Arrays; import java.util.Collection; +import static org.cryptomator.common.Constants.MASTERKEY_FILENAME; + @Singleton public class RecoveryKeyFactory { - private static final String MASTERKEY_FILENAME = "masterkey.cryptomator"; // TODO: deduplicate constant declared in multiple classes private static final byte[] PEPPER = new byte[0]; private final WordEncoder wordEncoder; diff --git a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java index 7bda40364..87d916492 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/recoverykey/RecoveryKeyResetPasswordController.java @@ -12,6 +12,7 @@ import javafx.stage.Stage; import org.cryptomator.common.vaults.Vault; import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.ui.common.Animations; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -36,9 +37,10 @@ public class RecoveryKeyResetPasswordController implements FxController { private final ObjectProperty newPassword; private final Lazy recoverScene; private final BooleanBinding invalidNewPassword; + private final ErrorComponent.Builder errorComponent; @Inject - public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword")ObjectProperty newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy recoverScene) { + public RecoveryKeyResetPasswordController(@RecoveryKeyWindow Stage window, @RecoveryKeyWindow Vault vault, RecoveryKeyFactory recoveryKeyFactory, ExecutorService executor, @RecoveryKeyWindow StringProperty recoveryKey, @Named("newPassword")ObjectProperty newPassword, @FxmlScene(FxmlFile.RECOVERYKEY_RECOVER) Lazy recoverScene, ErrorComponent.Builder errorComponent) { this.window = window; this.vault = vault; this.recoveryKeyFactory = recoveryKeyFactory; @@ -47,6 +49,7 @@ public class RecoveryKeyResetPasswordController implements FxController { this.newPassword = newPassword; this.recoverScene = recoverScene; this.invalidNewPassword = Bindings.createBooleanBinding(this::isInvalidNewPassword, newPassword); + this.errorComponent = errorComponent; } @FXML @@ -66,8 +69,8 @@ public class RecoveryKeyResetPasswordController implements FxController { window.close(); }); task.setOnFailed(event -> { - // TODO show generic error screen - LOG.error("Creation of recovery key failed.", task.getException()); + LOG.error("Resetting password failed.", task.getException()); + errorComponent.cause(task.getException()).window(window).returnToScene(recoverScene.get()).build().showErrorScene(); }); executor.submit(task); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java index ded374e8c..78c5cfe62 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/traymenu/TrayIconController.java @@ -32,8 +32,8 @@ public class TrayIconController { public void initializeTrayIcon() { macFunctions.map(MacFunctions::uiAppearance).ifPresent(uiAppearance -> uiAppearance.addListener(this::macInterfaceThemeChanged)); + trayIcon.setImageAutoSize(true); if (SystemUtils.IS_OS_WINDOWS) { - // TODO: test on windows: is this a double click? trayIcon.addActionListener(trayMenuController::showMainWindow); } diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java index 257f185f7..f06a03621 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockController.java @@ -19,6 +19,7 @@ import org.cryptomator.cryptolib.api.InvalidPassphraseException; import org.cryptomator.keychain.KeychainAccess; import org.cryptomator.keychain.KeychainAccessException; import org.cryptomator.ui.common.Animations; +import org.cryptomator.ui.common.ErrorComponent; import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; @@ -49,15 +50,14 @@ public class UnlockController implements FxController { private final VaultService vaultService; private final Lazy successScene; private final Lazy invalidMountPointScene; - private final Lazy genericErrorScene; - private final ObjectProperty genericErrorCause; + private final ErrorComponent.Builder errorComponent; private final ForgetPasswordComponent.Builder forgetPassword; private final BooleanProperty unlockButtonDisabled; public NiceSecurePasswordField passwordField; public CheckBox savePassword; @Inject - public UnlockController(@UnlockWindow Stage window, @UnlockWindow Vault vault, ExecutorService executor, Optional keychainAccess, VaultService vaultService, @FxmlScene(FxmlFile.UNLOCK_SUCCESS) Lazy successScene, @FxmlScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT) Lazy invalidMountPointScene, @FxmlScene(FxmlFile.UNLOCK_GENERIC_ERROR) Lazy genericErrorScene, @Named("genericErrorCause") ObjectProperty genericErrorCause, ForgetPasswordComponent.Builder forgetPassword) { + public UnlockController(@UnlockWindow Stage window, @UnlockWindow Vault vault, ExecutorService executor, Optional keychainAccess, VaultService vaultService, @FxmlScene(FxmlFile.UNLOCK_SUCCESS) Lazy successScene, @FxmlScene(FxmlFile.UNLOCK_INVALID_MOUNT_POINT) Lazy invalidMountPointScene, ErrorComponent.Builder errorComponent, ForgetPasswordComponent.Builder forgetPassword) { this.window = window; this.vault = vault; this.executor = executor; @@ -66,8 +66,7 @@ public class UnlockController implements FxController { this.vaultService = vaultService; this.successScene = successScene; this.invalidMountPointScene = invalidMountPointScene; - this.genericErrorScene = genericErrorScene; - this.genericErrorCause = genericErrorCause; + this.errorComponent = errorComponent; this.forgetPassword = forgetPassword; this.unlockButtonDisabled = new SimpleBooleanProperty(); } @@ -116,8 +115,7 @@ public class UnlockController implements FxController { window.setScene(invalidMountPointScene.get()); } else { LOG.error("Unlock failed for technical reasons.", task.getException()); - genericErrorCause.set(task.getException()); - window.setScene(genericErrorScene.get()); + errorComponent.cause(task.getException()).window(window).returnToScene(window.getScene()).build().showErrorScene(); } }); executor.execute(task); diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockGenericErrorController.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockGenericErrorController.java deleted file mode 100644 index faa357969..000000000 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockGenericErrorController.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.cryptomator.ui.unlock; - -import dagger.Lazy; -import javafx.fxml.FXML; -import javafx.scene.Scene; -import javafx.stage.Stage; -import org.cryptomator.ui.common.FxController; -import org.cryptomator.ui.common.FxmlFile; -import org.cryptomator.ui.common.FxmlScene; - -import javax.inject.Inject; - -@UnlockScoped -public class UnlockGenericErrorController implements FxController { - - private final Stage window; - private final Lazy unlockScene; - - @Inject - UnlockGenericErrorController(@UnlockWindow Stage window, @FxmlScene(FxmlFile.UNLOCK) Lazy unlockScene) { - this.window = window; - this.unlockScene = unlockScene; - } - - @FXML - public void back() { - window.setScene(unlockScene.get()); - } -} diff --git a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java index d06c9daed..8cca1c1cc 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/unlock/UnlockModule.java @@ -4,8 +4,6 @@ import dagger.Binds; import dagger.Module; import dagger.Provides; import dagger.multibindings.IntoMap; -import javafx.beans.property.ObjectProperty; -import javafx.beans.property.SimpleObjectProperty; import javafx.scene.Scene; import javafx.scene.image.Image; import javafx.stage.Modality; @@ -16,7 +14,6 @@ import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; -import org.cryptomator.ui.common.StackTraceController; import org.cryptomator.ui.forgetPassword.ForgetPasswordComponent; import javax.inject.Named; @@ -47,13 +44,6 @@ abstract class UnlockModule { return stage; } - @Provides - @Named("genericErrorCause") - @UnlockScoped - static ObjectProperty provideGenericErrorCause() { - return new SimpleObjectProperty<>(); - } - @Provides @FxmlScene(FxmlFile.UNLOCK) @UnlockScoped @@ -75,15 +65,6 @@ abstract class UnlockModule { return fxmlLoaders.createScene("/fxml/unlock_invalid_mount_point.fxml"); } - - @Provides - @FxmlScene(FxmlFile.UNLOCK_GENERIC_ERROR) - @UnlockScoped - static Scene provideGenericErrorScene(@UnlockWindow FXMLLoaderFactory fxmlLoaders) { - return fxmlLoaders.createScene("/fxml/unlock_generic_error.fxml"); - } - - // ------------------ @Binds @@ -101,17 +82,4 @@ abstract class UnlockModule { @FxControllerKey(UnlockInvalidMountPointController.class) abstract FxController bindUnlockInvalidMountPointController(UnlockInvalidMountPointController controller); - @Binds - @IntoMap - @FxControllerKey(UnlockGenericErrorController.class) - abstract FxController bindUnlockGenericErrorController(UnlockGenericErrorController controller); - - @Provides - @IntoMap - @FxControllerKey(StackTraceController.class) - static FxController provideStackTraceController(@Named("genericErrorCause") ObjectProperty errorCause) { - return new StackTraceController(errorCause.get()); - } - - } diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java index 7d2efcf26..6a11a9eba 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertController.java @@ -1,21 +1,56 @@ package org.cryptomator.ui.wrongfilealert; +import javafx.application.Application; +import javafx.fxml.FXML; +import javafx.scene.image.Image; import javafx.stage.Stage; +import org.apache.commons.lang3.SystemUtils; import org.cryptomator.ui.common.FxController; import javax.inject.Inject; +import java.io.IOException; +import java.io.InputStream; +import java.io.UncheckedIOException; @WrongFileAlertScoped public class WrongFileAlertController implements FxController { + private static final String DOCUMENTATION_URI = "https://docs.cryptomator.org/en/1.5/desktop/accessing-vaults/"; + + private final Application app; private final Stage window; + private Image screenshot; + @Inject - public WrongFileAlertController(@WrongFileAlertWindow Stage window) { + public WrongFileAlertController(@WrongFileAlertWindow Stage window, Application app) { this.window = window; + this.app = app; } + @FXML + public void initialize() { + final String resource = SystemUtils.IS_OS_MAC ? "/vault-volume-mac.png" : "/vault-volume-win.png"; + try (InputStream in = getClass().getResourceAsStream(resource)) { + this.screenshot = new Image(in); + } catch (IOException e) { + throw new UncheckedIOException(e); + } + } + + @FXML public void close() { window.close(); } + + @FXML + public void openDocumentation() { + app.getHostServices().showDocument(DOCUMENTATION_URI); + } + + /* Getter */ + + public Image getScreenshot() { + return screenshot; + } } diff --git a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java index 0f64a802e..7c64a079d 100644 --- a/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java +++ b/main/ui/src/main/java/org/cryptomator/ui/wrongfilealert/WrongFileAlertModule.java @@ -14,6 +14,7 @@ import org.cryptomator.ui.common.FxController; import org.cryptomator.ui.common.FxControllerKey; import org.cryptomator.ui.common.FxmlFile; import org.cryptomator.ui.common.FxmlScene; +import org.cryptomator.ui.mainwindow.MainWindow; import javax.inject.Named; import javax.inject.Provider; @@ -34,10 +35,11 @@ abstract class WrongFileAlertModule { @Provides @WrongFileAlertWindow @WrongFileAlertScoped - static Stage provideStage(ResourceBundle resourceBundle, @Named("windowIcons") List windowIcons) { + static Stage provideStage(@MainWindow Stage mainWindow, ResourceBundle resourceBundle, @Named("windowIcons") List windowIcons) { Stage stage = new Stage(); stage.setTitle(resourceBundle.getString("wrongFileAlert.title")); stage.setResizable(false); + stage.initOwner(mainWindow); stage.initModality(Modality.WINDOW_MODAL); stage.getIcons().addAll(windowIcons); return stage; diff --git a/main/ui/src/main/resources/bot.png b/main/ui/src/main/resources/bot.png index c02c60d7b..cdbecfa1a 100644 Binary files a/main/ui/src/main/resources/bot.png and b/main/ui/src/main/resources/bot.png differ diff --git a/main/ui/src/main/resources/bot@2x.png b/main/ui/src/main/resources/bot@2x.png index 6192beae5..de8f79ded 100644 Binary files a/main/ui/src/main/resources/bot@2x.png and b/main/ui/src/main/resources/bot@2x.png differ diff --git a/main/ui/src/main/resources/choose_existing_vault.png b/main/ui/src/main/resources/choose_existing_vault.png deleted file mode 100644 index 1447d33c5..000000000 Binary files a/main/ui/src/main/resources/choose_existing_vault.png and /dev/null differ diff --git a/main/ui/src/main/resources/css/dark_theme.css b/main/ui/src/main/resources/css/dark_theme.css index 4a31930f8..4a4e0c302 100644 --- a/main/ui/src/main/resources/css/dark_theme.css +++ b/main/ui/src/main/resources/css/dark_theme.css @@ -51,6 +51,7 @@ YELLOW_5: #F1C40F; MAIN_BG: GRAY_1; + MUTED_BG: GRAY_3; TEXT_FILL: GRAY_9; TEXT_FILL_HIGHLIGHTED: PRIMARY; TEXT_FILL_MUTED: GRAY_5; @@ -95,7 +96,7 @@ -fx-text-fill: TEXT_FILL; } -.label-secondary { +.label-muted { -fx-text-fill: TEXT_FILL_MUTED; } @@ -148,6 +149,12 @@ * * ******************************************************************************/ +/* windows needs an explicit border: */ +.main-window.os-windows { + -fx-border-color: TITLE_BG; + -fx-border-width: 1px; +} + .main-window .title { -fx-background-color: CONTROL_BORDER_NORMAL, TITLE_BG; -fx-background-insets: 0, 0 0 1px 0; @@ -374,9 +381,9 @@ -fx-background-color: PRIMARY; } -.badge-secondary { +.badge-muted { -fx-text-fill: white; - -fx-background-color: SECONDARY; + -fx-background-color: MUTED_BG; } /******************************************************************************* @@ -567,7 +574,11 @@ -fx-graphic-text-gap: 6px; } -.hyperlink.hyperlink-secondary { +.hyperlink.hyperlink-underline { + -fx-underline: true; +} + +.hyperlink.hyperlink-muted { -fx-text-fill: TEXT_FILL_MUTED; } diff --git a/main/ui/src/main/resources/css/light_theme.css b/main/ui/src/main/resources/css/light_theme.css index 64e4a527b..f020582ce 100644 --- a/main/ui/src/main/resources/css/light_theme.css +++ b/main/ui/src/main/resources/css/light_theme.css @@ -51,6 +51,7 @@ YELLOW_5: #F1C40F; MAIN_BG: GRAY_9; + MUTED_BG: GRAY_5; TEXT_FILL: GRAY_0; TEXT_FILL_HIGHLIGHTED: PRIMARY; TEXT_FILL_MUTED: GRAY_5; @@ -95,7 +96,7 @@ -fx-text-fill: TEXT_FILL; } -.label-secondary { +.label-muted { -fx-text-fill: TEXT_FILL_MUTED; } @@ -148,6 +149,12 @@ * * ******************************************************************************/ +/* windows needs an explicit border: */ +.main-window.os-windows { + -fx-border-color: TITLE_BG; + -fx-border-width: 1px; +} + .main-window .title { -fx-background-color: TITLE_BG; } @@ -373,9 +380,9 @@ -fx-background-color: PRIMARY; } -.badge-secondary { +.badge-muted { -fx-text-fill: white; - -fx-background-color: SECONDARY; + -fx-background-color: MUTED_BG; } /******************************************************************************* @@ -566,7 +573,11 @@ -fx-graphic-text-gap: 6px; } -.hyperlink.hyperlink-secondary { +.hyperlink.hyperlink-underline { + -fx-underline: true; +} + +.hyperlink.hyperlink-muted { -fx-text-fill: TEXT_FILL_MUTED; } diff --git a/main/ui/src/main/resources/fxml/addvault_existing.fxml b/main/ui/src/main/resources/fxml/addvault_existing.fxml index e9c64f88a..be780d03c 100644 --- a/main/ui/src/main/resources/fxml/addvault_existing.fxml +++ b/main/ui/src/main/resources/fxml/addvault_existing.fxml @@ -4,7 +4,6 @@ - @@ -13,18 +12,13 @@ fx:controller="org.cryptomator.ui.addvaultwizard.ChooseExistingVaultController" prefWidth="450" prefHeight="450" - spacing="12" + spacing="24" alignment="CENTER"> - - - - - - +