commit fcf72cf9a57892e2732e52fb996cf941fa41db66 Author: Arthur K. Date: Sun Jan 12 17:12:34 2025 +0300 init: first somewhat working version diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..05b4b4b --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - package-ecosystem: "gradle" + directory: "/" + schedule: + interval: "weekly" + rebase-strategy: "disabled" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..dfc0643 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +*.iml +.DS_Store +.classpath +.cxx +.externalNativeBuild +.gradle +.kotlin +.project +.settings/ +/.idea +/app/build +/app/libs +/app/src/main/assets +/app/src/main/jniLibs +/build +/captures +/kls_database.db +local.properties diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..50fe86f --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "external/openconnect"] + path = external/openconnect + url = https://gitlab.com/wzrayyy/openconnect diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f288702 --- /dev/null +++ b/LICENSE @@ -0,0 +1,674 @@ + GNU GENERAL PUBLIC LICENSE + Version 3, 29 June 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 General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of +this License. + + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +state the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 . + +Also add information on how to contact you by electronic and paper mail. + + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: + + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. diff --git a/README.md b/README.md new file mode 100644 index 0000000..0eda53f --- /dev/null +++ b/README.md @@ -0,0 +1,20 @@ +# OpenConnect for Android + +This version is still **UNDER DEVELOPMENT**. Check [the official repository](https://gitlab.com/openconnect/ics-openconnect) for the legacy (but working on latest Android) version. + + +## Building + +```sh +# clone the repo with submodules +git clone --recurse-submodules https://github.com/wzrayyy/openconnect-android +cd openconnect-android +# make external dependencies (curl and openconnect) +make -C external +# build apk +./gradlew assembleDebug +# copy the apk to the current folder +find -name '*.apk' | head -1 | xargs -I{} cp {} OpenConnect.apk +# install +adb install OpenConnect.apk +``` diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..08fd352 --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,67 @@ +plugins { + alias(libs.plugins.android.application) + alias(libs.plugins.kotlin.android) + alias(libs.plugins.kotlin.compose) + alias(libs.plugins.google.ksp) + alias(libs.plugins.google.dagger.hilt) + + alias(libs.plugins.kotlin.serialization) +} + +android { + namespace = "com.wzray.openconnect" + compileSdk = 35 + + defaultConfig { + applicationId = "com.wzray.openconnect" + minSdk = 23 + targetSdk = 35 + versionCode = 1 + versionName = "0.1.0-alpha" + } + + buildTypes { release { isMinifyEnabled = false } } + buildFeatures { compose = true } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlin { + jvmToolchain(17) + } +} + +dependencies { + implementation(fileTree(mapOf("dir" to "libs", "include" to listOf("*.jar")))) + + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.material3.adaptive.navigation.suite) + implementation(libs.androidx.compose.material.iconsExtended) + implementation(libs.androidx.core.ktx) + implementation(libs.androidx.lifecycle.runtime.ktx) + implementation(libs.androidx.material3) + implementation(libs.androidx.navigation.compose) + implementation(libs.androidx.room.ktx) + implementation(libs.androidx.ui) + implementation(libs.androidx.ui.graphics) + implementation(libs.androidx.ui.tooling.preview) + implementation(libs.compose.preference) + implementation(platform(libs.androidx.compose.bom)) + implementation(libs.androidx.datastore.preferences) + ksp(libs.androidx.room.compiler) + + implementation(libs.google.dagger.hilt) + implementation(libs.androidx.hilt.navigation.compose) + ksp(libs.google.dagger.hilt.compiler) + + implementation(libs.compose.destinations.core) + implementation(libs.compose.destinations.bottomSheet) + ksp(libs.compose.destinations.ksp) + + implementation(libs.kotlinx.serialization.json) + + implementation(libs.androidx.core.splashscreen) + + debugImplementation(libs.androidx.ui.tooling) + debugImplementation(libs.androidx.ui.test.manifest) +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..5c81d84 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/wzray/openconnect/Application.kt b/app/src/main/java/com/wzray/openconnect/Application.kt new file mode 100644 index 0000000..2b8beab --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/Application.kt @@ -0,0 +1,54 @@ +package com.wzray.openconnect + +import android.util.Log +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.PreferenceDataStoreFactory +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.preferencesDataStoreFile +import androidx.room.Room +import com.wzray.openconnect.core.data.Database +import com.wzray.openconnect.tunnel.VpnManager +import dagger.hilt.android.HiltAndroidApp +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import java.lang.ref.WeakReference + +@HiltAndroidApp +class Application : android.app.Application() { + private lateinit var prefDataStore: DataStore + private lateinit var db: Database + private val coroutineScope = CoroutineScope(Job() + Dispatchers.Main.immediate) + private var vpnManager: VpnManager = VpnManager(this) + + override fun onCreate() { + super.onCreate() + prefDataStore = PreferenceDataStoreFactory.create { + applicationContext.preferencesDataStoreFile("settings") + } + db = Room.databaseBuilder(this, Database::class.java, "database.db").build() + Log.i(TAG, "Starting application...") + } + + companion object { + private const val TAG = "OpenConnect/Application" + + private lateinit var thisWeakRef: WeakReference + fun get() = thisWeakRef.get()!! + + val prefDataStore + get() = get().prefDataStore + val db: Database + get() = get().db + val coroutineScope + get() = get().coroutineScope + val vpnManager + get() = get().vpnManager + } + + init { + thisWeakRef = WeakReference(this) + System.loadLibrary("openconnect") + System.loadLibrary("stoken") + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/MainActivity.kt b/app/src/main/java/com/wzray/openconnect/MainActivity.kt new file mode 100644 index 0000000..47643c0 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/MainActivity.kt @@ -0,0 +1,33 @@ +package com.wzray.openconnect + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.activity.enableEdgeToEdge +import androidx.activity.result.contract.ActivityResultContracts +import com.wzray.openconnect.ui.OpenConnectApp +import dagger.hilt.android.AndroidEntryPoint +import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen + +@AndroidEntryPoint +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + Application.vpnManager.activityResultLauncher = + registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { + Application.vpnManager.activityCallback?.invoke(it) + } + + installSplashScreen() + enableEdgeToEdge() + setContent { + OpenConnectApp() + } + } + + override fun onDestroy() { + super.onDestroy() + Application.vpnManager.activityResultLauncher = null + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/core/data/Database.kt b/app/src/main/java/com/wzray/openconnect/core/data/Database.kt new file mode 100644 index 0000000..0fe5b0b --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/core/data/Database.kt @@ -0,0 +1,17 @@ +package com.wzray.openconnect.core.data + +import androidx.room.Database +import androidx.room.RoomDatabase +import com.wzray.openconnect.core.data.dao.ConnectionsDao +import com.wzray.openconnect.core.data.model.Connection + +@Database( + entities = [ + Connection::class, + ], + version = 1, + exportSchema = false +) +abstract class Database : RoomDatabase() { + abstract fun connectionsDao(): ConnectionsDao +} diff --git a/app/src/main/java/com/wzray/openconnect/core/data/dao/ConnectionsDao.kt b/app/src/main/java/com/wzray/openconnect/core/data/dao/ConnectionsDao.kt new file mode 100644 index 0000000..9b42fae --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/core/data/dao/ConnectionsDao.kt @@ -0,0 +1,31 @@ +package com.wzray.openconnect.core.data.dao + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Update +import com.wzray.openconnect.core.data.model.Connection +import kotlinx.coroutines.flow.Flow + + +@Dao +abstract class ConnectionsDao { + @Query("SELECT COUNT(*) FROM connections") + abstract fun count(): Flow + + @Query("SELECT * FROM connections WHERE name = :name") + abstract fun connection(name: String): Flow + + @Query("SELECT * FROM connections") + abstract fun getAll(): Flow> + + @Delete + abstract fun delete(connection: Connection): Int + + @Insert + abstract suspend fun insert(connection: Connection) + + @Update + abstract suspend fun update(connection: Connection) +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/core/data/model/Connection.kt b/app/src/main/java/com/wzray/openconnect/core/data/model/Connection.kt new file mode 100644 index 0000000..b410395 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/core/data/model/Connection.kt @@ -0,0 +1,33 @@ +package com.wzray.openconnect.core.data.model + +import androidx.room.Entity +import androidx.room.Index +import androidx.room.PrimaryKey +import kotlinx.serialization.Serializable +import java.util.UUID + +enum class Protocols(name: String) { + ANYCONNECT("anyconnect") +} + +@Entity( + tableName = "connections", + indices = [ + Index("uuid", unique = true) + ] +) +@Serializable +data class Connection( + val name: String, + val url: String, + val username: String, + val password: String, + + val protocol: Protocols = Protocols.ANYCONNECT, + val xmlPost: Boolean = true, + val pfs: Boolean = false, + val useDTLS: Boolean = true, + val reportedOs: String = "android", + val mtu: Int = 1280, + @PrimaryKey val uuid: String = UUID.randomUUID().toString(), +) \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/core/viewmodels/ConnectionEditorViewModel.kt b/app/src/main/java/com/wzray/openconnect/core/viewmodels/ConnectionEditorViewModel.kt new file mode 100644 index 0000000..49fc796 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/core/viewmodels/ConnectionEditorViewModel.kt @@ -0,0 +1,43 @@ +package com.wzray.openconnect.core.viewmodels + +import androidx.compose.runtime.MutableState +import androidx.lifecycle.ViewModel +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.ViewModelProvider.* +import androidx.lifecycle.viewModelScope +import com.wzray.openconnect.Application +import com.wzray.openconnect.core.data.model.Connection +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import javax.inject.Inject + +class ConnectionEditorViewModel (c: Connection) : ViewModel() { + private val dao = Application.db.connectionsDao() + + private val connectionFlow = MutableStateFlow(c) + val connection = connectionFlow.asStateFlow() + + + fun updateConnection(c: Connection) { + viewModelScope.launch { + connectionFlow.update { c } + withContext(Dispatchers.IO) { + dao.update(c) + } + } + } +// companion object { +// fun provideFactory( +// connection: Connection +// ): Factory = object : Factory { +// @Suppress("UNCHECKED_CAST") +// override fun create(modelClass: Class): T { +// return ConnectionEditorViewModel(connection) as T +// } +// } +// } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/core/viewmodels/HomeViewModel.kt b/app/src/main/java/com/wzray/openconnect/core/viewmodels/HomeViewModel.kt new file mode 100644 index 0000000..b7578ed --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/core/viewmodels/HomeViewModel.kt @@ -0,0 +1,120 @@ +package com.wzray.openconnect.core.viewmodels + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import com.wzray.openconnect.Application +import com.wzray.openconnect.core.data.model.Connection +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import javax.inject.Inject + +sealed interface HomeUiState { + val connections: List + + data class ConnectionList( + override val connections: List + ) : HomeUiState + + data class SelectionList( + override val connections: List, + val selectedConnections: List + ) : HomeUiState +} + +private data class ViewModelState( + val connections: List? = null, + val selectedConnections: List? = null +) { + fun toUiState() = if (selectedConnections == null) + HomeUiState.ConnectionList(connections ?: listOf()) + else + HomeUiState.SelectionList(connections ?: listOf(), selectedConnections) +} + +@HiltViewModel +class HomeViewModel @Inject constructor() : ViewModel() { + private var vmState = MutableStateFlow(ViewModelState()) + var uiState: StateFlow = vmState.map { it.toUiState() } + .stateIn(viewModelScope, SharingStarted.Eagerly, vmState.value.toUiState()) + + private val dao = Application.db.connectionsDao() + + init { + viewModelScope.launch { + dao.getAll().collect { c -> + vmState.update { + it.copy(connections = c) + } + } + } + } + + fun connect(connection: Connection) { + Application.vpnManager.establish(connection) + } + + fun openSettings(connection: Connection) { + + } + + fun toggleSelection(connection: Connection) { + if (vmState.value.selectedConnections == null) + vmState.update { + it.copy(selectedConnections = listOf()) + } + if (!vmState.value.selectedConnections?.contains(connection)!!) + vmState.update { + it.copy(selectedConnections = it.selectedConnections?.plus(connection)) + } + else + vmState.update { + it.copy(selectedConnections = it.selectedConnections?.minus(connection)) + } + + if (vmState.value.selectedConnections?.isEmpty()!!) + vmState.update { + it.copy(selectedConnections = null) + } + + } + + fun deleteSelected() { + viewModelScope.launch { + withContext(Dispatchers.IO) { + val db = Application.db + val dao = db.connectionsDao() + + vmState.value.selectedConnections?.forEach { e -> + dao.delete(e) + } + vmState.update { it.copy(selectedConnections = null) } + } + } + } + + fun selectAll() = viewModelScope.launch { + vmState.value.connections?.forEach { c -> + if (!vmState.value.selectedConnections?.contains(c)!!) + vmState.update { + it.copy(selectedConnections = it.selectedConnections?.plus(c)) + } + } + } + + fun copySelected() { + Log.e(TAG, "Copy selected is not yet implemented.") + } + + companion object { + private const val TAG = "OpenConnect/HomeViewModel" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/core/viewmodels/LogViewModel.kt b/app/src/main/java/com/wzray/openconnect/core/viewmodels/LogViewModel.kt new file mode 100644 index 0000000..d86cf0c --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/core/viewmodels/LogViewModel.kt @@ -0,0 +1,107 @@ +package com.wzray.openconnect.core.viewmodels + +import android.util.Log +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import dagger.hilt.android.lifecycle.HiltViewModel +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.Job +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.flow.asStateFlow +import kotlinx.coroutines.flow.update +import kotlinx.coroutines.isActive +import kotlinx.coroutines.launch +import kotlinx.coroutines.withContext +import java.io.BufferedReader +import java.io.IOException +import java.io.InputStreamReader +import java.nio.charset.StandardCharsets +import java.util.LinkedList +import javax.inject.Inject + +enum class LogLevel(val shortName: Char, val fullName: String) { + VERBOSE('V', "Verbose"), + DEBUG('D', "Debug"), + INFO('I', "Info"), + WARN('W', "Warn"), + ERROR('E', "Error"), + FATAL('F', "Fatal") +} + +data class UIState( + val isPaused: Boolean = false, + val logLevel: LogLevel = LogLevel.ERROR, + val logList: List = listOf() // TODO: proper structure for log lines +) + +@HiltViewModel +class LogViewModel @Inject constructor() : ViewModel() { + private var logCollectorJob: Job + private val backlog = LinkedList() + private var mutableUiState = MutableStateFlow(UIState()) + val uiState = mutableUiState.asStateFlow() + + init { + logCollectorJob = viewModelScope.launch { + collectLogs() + } + } + + fun pauseLog() { + mutableUiState.update { + it.copy(isPaused = !mutableUiState.value.isPaused, logList = it.logList + backlog) + } + backlog.clear() + } + + fun clearLog() { + mutableUiState.update { + it.copy(logList = listOf()) + } + backlog.clear() + } + + fun setLogLevel(logLevel: LogLevel) { + logCollectorJob.cancel() + backlog.clear() + mutableUiState.update { + it.copy(logLevel = logLevel, logList = listOf()) + } + logCollectorJob = viewModelScope.launch { + collectLogs() + } + } + + private suspend fun collectLogs() = withContext(Dispatchers.IO) { + val builder = ProcessBuilder( + "logcat", "-b", "all", "*:${uiState.value.logLevel.shortName}" + ) + builder.environment()["LC_ALL"] = "C" + var process: Process? = null + try { + process = try { + builder.start() + } catch (e: IOException) { + Log.e(TAG, Log.getStackTraceString(e)) + return@withContext + } + + val stdout = + BufferedReader(InputStreamReader(process!!.inputStream, StandardCharsets.UTF_8)) + + while (isActive) { + val line = stdout.readLine() ?: break + if (uiState.value.isPaused) backlog.add(line) + else mutableUiState.update { + it.copy(logList = it.logList + line) + } + } + } finally { + process?.destroy() + } + } + + companion object { + private const val TAG = "OpenConnect/LogViewModel" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/tunnel/NormalizedIP.kt b/app/src/main/java/com/wzray/openconnect/tunnel/NormalizedIP.kt new file mode 100644 index 0000000..bffebc7 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/tunnel/NormalizedIP.kt @@ -0,0 +1,40 @@ +package com.wzray.openconnect.tunnel + +import java.util.Locale + +// TODO: single interface, v4 and v6 versions + +@Suppress("MemberVisibilityCanBePrivate", "unused") +data class NormalizedIP(val ip: String, val cidr: Int) { + constructor(ip: String, mask: String) : this( + ip, + if(mask.contains(".")) maskToCidr(mask) else mask.toInt() + ) + + constructor(addrWithNetMask: String) : this( + addrWithNetMask.split("/")[0], + addrWithNetMask.split("/")[1], + ) + + override fun toString(): String { + return String.format(Locale.ROOT, "%s/%d", ip, cidr) + } + + companion object { + fun maskToCidr(mask: String) = 32 - ((ipToInt(mask).inv()).countOneBits()) + + fun cidrToMask(cidr: Int) = intToIp(((1 shl cidr) - 1) shl (32 - cidr)) + + fun ipToInt(ip: String) = ip.split(".").map { it.toInt() }.reversed() + .reduceIndexed { idx, acc, it -> acc + (it shl (idx * 8)) } + + fun intToIp(ip: Int) = String.format( + Locale.ROOT, "%d.%d.%d.%d", + ip and (0xff shl 24) shr 24, + ip and (0xff shl 16) shr 16, + ip and (0xff shl 8) shr 8, + ip and 0xff + ) + } +} + diff --git a/app/src/main/java/com/wzray/openconnect/tunnel/OpenConnect.kt b/app/src/main/java/com/wzray/openconnect/tunnel/OpenConnect.kt new file mode 100644 index 0000000..6887f95 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/tunnel/OpenConnect.kt @@ -0,0 +1,121 @@ +package com.wzray.openconnect.tunnel + +import android.util.Log +import com.wzray.openconnect.core.data.model.Connection +import org.infradead.libopenconnect.LibOpenConnect +import java.io.IOException + +class OpenConnect(private val connection: Connection) : Runnable { + private val vpnService: VpnService = VpnService() + private lateinit var backend: Backend + + private fun createBackend() { + backend = Backend() + + backend.setProtocol(connection.protocol.name) + backend.setXMLPost(connection.xmlPost) + backend.setPFS(connection.pfs) + if (!connection.useDTLS) + backend.disableDTLS() + backend.setReportedOS(connection.reportedOs) + + backend.setMobileInfo( + "1.0", + connection.reportedOs, + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" + ) + + val retVal = backend.parseURL(connection.url) + Log.e(TAG, "call to oc.parseURL: $retVal") + if (retVal != 0) + throw Exception("Invalid url") + } + + override fun run() { + createBackend() + + var retVal = backend.obtainCookie() + Log.e(TAG, "obtainCookie ret: $retVal") + + retVal = backend.makeCSTPConnection() + Log.e(TAG, "makeCSTPConnection ret: $retVal") + + val b = vpnService.getBuilder() + b.setSession(connection.name) + val ip = backend.ipInfo + + Log.e(TAG, "call to svc.getBuilder()") + + val normalizedIP = NormalizedIP(ip.addr, ip.netmask) + b.addAddress(ip.addr, normalizedIP.cidr) + b.setMtu(1280) + b.addRoute("0.0.0.0", 0) + b.addDnsServer("1.1.1.1") + + val pfd = b.establish() + Log.e(TAG, "call to b.establish(): ${pfd != null}") + + backend.setupTunFD(pfd!!.fd) + Log.e(TAG, "call to oc.setupTunFD(${pfd.fd})") + + while (true) + if (backend.mainloop(300, LibOpenConnect.RECONNECT_INTERVAL_MIN) < 0) + break + + try { + pfd.close() + } catch (_: IOException) { + } + } + + fun cancel() { + backend.cancel() + } + + inner class Backend : LibOpenConnect() { + override fun onProcessAuthForm(authForm: AuthForm): Int { + val opt = authForm.opts[0] + + Log.d(TAG, "Auth form ${authForm.message}") + when (opt.type) { + OC_FORM_OPT_TEXT -> opt.value = connection.username + OC_FORM_OPT_PASSWORD -> opt.value = connection.password + else -> Log.e(TAG, "FAIL AUTH FORM ${authForm.message}") + } + return 0 + } + + override fun onProgress(level: Int, msg: String?) { + if (msg == null) return + + Log.println( + when (level) { + PRG_ERR -> Log.ERROR + PRG_INFO -> Log.INFO + PRG_DEBUG -> Log.DEBUG + else -> Log.VERBOSE + }, TAG, msg + ) + } + + override fun onProtectSocket(fd: Int) { + val x = vpnService.protect(fd) + Log.d(TAG, "onProtectSocket, result: $x, fd: $fd") + } + } + + class VpnService : android.net.VpnService() { + fun getBuilder(): android.net.VpnService.Builder { + return Builder() + } + + override fun onRevoke() { + super.onRevoke() + } + } + + companion object { + private const val TAG = "OpenConnect/Backend" + } +} + diff --git a/app/src/main/java/com/wzray/openconnect/tunnel/VpnManager.kt b/app/src/main/java/com/wzray/openconnect/tunnel/VpnManager.kt new file mode 100644 index 0000000..a52a58c --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/tunnel/VpnManager.kt @@ -0,0 +1,61 @@ +package com.wzray.openconnect.tunnel + +import android.content.Context +import android.content.Intent +import android.net.VpnService +import android.util.Log +import androidx.activity.result.ActivityResult +import androidx.activity.result.ActivityResultLauncher +import com.wzray.openconnect.core.data.model.Connection +import com.wzray.openconnect.util.applicationScope +import kotlinx.coroutines.flow.MutableStateFlow +import kotlinx.coroutines.launch + +class VpnManager(private val context: Context) { + var activityCallback: ((ActivityResult) -> Unit)? = null + private set + + var activityResultLauncher: ActivityResultLauncher? = null + + private var openConnect: OpenConnect? = null + private var openConnectThread: Thread? = null + + fun disconnect() = applicationScope.launch { + openConnect?.cancel() + openConnectThread?.join(1000) + } + + val isConnected: Boolean + get() = openConnect != null || openConnectThread != null + + fun establish(connection: Connection) { + if (isConnected) + disconnect() + + openConnect = OpenConnect(connection) + openConnectThread = Thread(openConnect) + + activityCallback = { + openConnectThread?.start() + } + + val intent = VpnService.prepare(context) + if (intent != null) { + Log.d(TAG, "VPN permission not granted, requesting") + try { + activityResultLauncher!!.launch(intent) + } catch (e: Exception) { // we want to have control over what gets thrown + throw Exception("Missing VPN permission") + } + } else + openConnectThread?.start() + } + + fun reconnect(name: String) { + TODO("Not yet implemented") + } + + companion object { + private const val TAG = "OpenConnect/VpnManager" + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/Navigation.kt b/app/src/main/java/com/wzray/openconnect/ui/Navigation.kt new file mode 100644 index 0000000..adbbc83 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/Navigation.kt @@ -0,0 +1,15 @@ +package com.wzray.openconnect.ui + +import com.ramcosta.composedestinations.annotation.NavGraph +import com.ramcosta.composedestinations.annotation.NavHostGraph +import com.ramcosta.composedestinations.annotation.RootGraph +import com.wzray.openconnect.ui.theme.Fade + +@NavGraph +annotation class ConnectionEditorGraph + +@NavHostGraph( + route = "main", + defaultTransitions = Fade::class +) +annotation class MainGraph \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/OpenConnectApp.kt b/app/src/main/java/com/wzray/openconnect/ui/OpenConnectApp.kt new file mode 100644 index 0000000..97f6b5f --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/OpenConnectApp.kt @@ -0,0 +1,149 @@ +package com.wzray.openconnect.ui + +import android.util.Log +import androidx.annotation.StringRes +import androidx.compose.foundation.layout.ExperimentalLayoutApi +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.WindowInsets +import androidx.compose.foundation.layout.asPaddingValues +import androidx.compose.foundation.layout.navigationBars +import androidx.compose.foundation.layout.systemBars +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.automirrored.filled.Article +import androidx.compose.material.icons.automirrored.outlined.Article +import androidx.compose.material.icons.filled.Home +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material.icons.outlined.Home +import androidx.compose.material.icons.outlined.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.ScaffoldDefaults +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.remember +import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.res.stringResource +import androidx.navigation.NavController +import androidx.navigation.NavHostController +import androidx.navigation.compose.rememberNavController +import com.ramcosta.composedestinations.DestinationsNavHost +import com.ramcosta.composedestinations.annotation.Destination +import com.ramcosta.composedestinations.annotation.RootGraph +import com.ramcosta.composedestinations.generated.NavGraphs +import com.ramcosta.composedestinations.generated.destinations.HomeRouteDestination +import com.ramcosta.composedestinations.generated.destinations.LogRouteDestination +import com.ramcosta.composedestinations.generated.destinations.SettingsScreenDestination +import com.ramcosta.composedestinations.navigation.DestinationsNavigator +import com.ramcosta.composedestinations.navigation.dependency +import com.ramcosta.composedestinations.spec.DirectionDestinationSpec +import com.ramcosta.composedestinations.utils.currentDestinationAsState +import com.ramcosta.composedestinations.utils.rememberDestinationsNavigator +import com.ramcosta.composedestinations.utils.startDestination +import com.wzray.openconnect.R +import com.wzray.openconnect.ui.theme.OpenConnectTheme + +enum class NavDestinations( + @StringRes val title: Int, + val route: DirectionDestinationSpec, + val icon: ImageVector, + val iconSelected: ImageVector +) { + LOGS( + title = R.string.logs, + route = LogRouteDestination, + icon = Icons.AutoMirrored.Outlined.Article, + iconSelected = Icons.AutoMirrored.Filled.Article + ), + HOME( + title = R.string.home, + route = HomeRouteDestination, + icon = Icons.Outlined.Home, + iconSelected = Icons.Filled.Home + ), + SETTINGS( + title = R.string.settings, + route = SettingsScreenDestination, + icon = Icons.Outlined.Settings, + iconSelected = Icons.Filled.Settings + ), +} + +@Composable +private fun BottomBar( + navController: NavHostController +) { + val navigator = navController.rememberDestinationsNavigator() + + val currentRoute = + navController.currentDestinationAsState().value ?: NavGraphs.root.startDestination + + NavigationBar { + NavDestinations.entries.forEach { destination -> + val isSelected = currentRoute == destination.route + NavigationBarItem( + selected = isSelected, + onClick = { + navigator.navigate(destination.route) { + popUpTo(NavDestinations.HOME.route) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + }, + icon = { + Icon( + if (isSelected) destination.iconSelected else destination.icon, + null + ) + }, + label = { Text(stringResource(destination.title)) }, + ) + } + } +} + +class RootDestinationsNavigator(value: DestinationsNavigator) : DestinationsNavigator by value + +// This is *really* the only way to have pretty animations with bottom navbar... +@Destination( + start = true +) +@Composable +fun MainGraphNavHost( + rootNavController: NavController +) { + val navController = rememberNavController() + Scaffold( + bottomBar = { + BottomBar(navController) + }, + ) { padding -> + // compensate for Scaffold's smartness + val bottomOffset = WindowInsets.systemBars.asPaddingValues().calculateBottomPadding() + val outerPadding = PaddingValues(bottom = padding.calculateBottomPadding() - bottomOffset) + DestinationsNavHost( + navGraph = NavGraphs.main, + navController = navController, + dependenciesContainerBuilder = { + dependency(RootDestinationsNavigator(rootNavController.rememberDestinationsNavigator())) + dependency(outerPadding) + } + ) + } +} + + +@Composable +fun OpenConnectApp() { + val navHostController = rememberNavController() + + OpenConnectTheme { + DestinationsNavHost( + navGraph = NavGraphs.root, + navController = navHostController, + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/components/CheckboxText.kt b/app/src/main/java/com/wzray/openconnect/ui/components/CheckboxText.kt new file mode 100644 index 0000000..8e1373b --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/components/CheckboxText.kt @@ -0,0 +1,43 @@ +package com.wzray.openconnect.ui.components + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.width +import androidx.compose.material3.Checkbox +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.wzray.openconnect.ui.theme.OpenConnectTheme + +@Composable +fun CheckboxText( + text: String, + checked: Boolean, +) { + Row( + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.SpaceBetween, + modifier = Modifier.fillMaxWidth() + ) { + Text(text) + Spacer(Modifier.width(36.dp)) + Checkbox(checked, null) + } +} + +@Preview(showBackground = true) +@Composable +private fun UiPreview() { + val enabled by remember { mutableStateOf(true) } + OpenConnectTheme { + CheckboxText("Preview", enabled) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/components/ConnectionElement.kt b/app/src/main/java/com/wzray/openconnect/ui/components/ConnectionElement.kt new file mode 100644 index 0000000..8fcc60c --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/components/ConnectionElement.kt @@ -0,0 +1,90 @@ +package com.wzray.openconnect.ui.components + +import android.content.res.Configuration +import androidx.compose.foundation.ExperimentalFoundationApi +import androidx.compose.foundation.clickable +import androidx.compose.foundation.combinedClickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Settings +import androidx.compose.material3.Icon +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import com.wzray.openconnect.ui.theme.OpenConnectTheme +import me.zhanghai.compose.preference.CheckboxPreference +import me.zhanghai.compose.preference.ProvidePreferenceLocals +import me.zhanghai.compose.preference.TwoTargetIconButtonPreference +import me.zhanghai.compose.preference.rememberPreferenceState + +// TwoTargetIconButtonPreference specialization for connection list +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun ConnectionElement( + onClick: () -> Unit, + onLongClick: () -> Unit, + onSettingsClick: () -> Unit, + connectionName: String +) { + TwoTargetIconButtonPreference( + title = { Text(connectionName) }, + modifier = Modifier.combinedClickable(onClick = onClick, onLongClick = onLongClick), + onIconButtonClick = onSettingsClick, + iconButtonIcon = { + Icon(imageVector = Icons.Filled.Settings, contentDescription = "Settings") + }, + ) +} + +@OptIn(ExperimentalFoundationApi::class) +@Composable +fun ConnectionElementSelected( + onChangeCallback: () -> Unit, + isEnabled: Boolean, + connectionName: String +) { + CheckboxPreference( + value = isEnabled, + title = { Text(connectionName) }, + onValueChange = { + onChangeCallback.invoke() + } + ) +} + +@Preview(showBackground = true) +@Composable +private fun ConnectionElementPreview() { + OpenConnectTheme { + Surface { + Column { + ConnectionElement({}, {}, {}, "Menu element") + ConnectionElementSelected({}, false, "Not selected element") + ConnectionElementSelected({}, true, "Example selected") + } + } + } +} + +@Preview(showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +private fun ConnectionElementPreviewDark() { + OpenConnectTheme { + Surface { + Column { + ConnectionElement({}, {}, {}, "Menu element") + ConnectionElementSelected({}, false, "Not selected element") + ConnectionElementSelected({}, true, "Selected element") + } + } + } +} diff --git a/app/src/main/java/com/wzray/openconnect/ui/components/RadioButtonText.kt b/app/src/main/java/com/wzray/openconnect/ui/components/RadioButtonText.kt new file mode 100644 index 0000000..76ddc7e --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/components/RadioButtonText.kt @@ -0,0 +1,33 @@ +package com.wzray.openconnect.ui.components + +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.selection.selectable +import androidx.compose.material3.Text +import androidx.compose.material3.RadioButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp + + +@Composable +fun RadioButtonText(text: String, isSelected: Boolean, onClick: () -> Unit) { + Row( + modifier = Modifier + .fillMaxWidth() + .selectable(selected = isSelected, onClick = { + onClick.invoke() + }) + .padding(horizontal = 16.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + RadioButton(selected = isSelected, onClick = { + onClick.invoke() + }) + Text( + text = text, modifier = Modifier.padding(start = 16.dp) + ) + } +} diff --git a/app/src/main/java/com/wzray/openconnect/ui/components/SimpleIconButton.kt b/app/src/main/java/com/wzray/openconnect/ui/components/SimpleIconButton.kt new file mode 100644 index 0000000..027a705 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/components/SimpleIconButton.kt @@ -0,0 +1,25 @@ +package com.wzray.openconnect.ui.components + +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.vector.ImageVector + +@Composable +fun SimpleIconButton( + onClick: () -> Unit, + icon: ImageVector, + contentDescription: String?, + modifier: Modifier = Modifier +) { + IconButton( + onClick = onClick, + modifier = modifier + ) { + Icon( + imageVector = icon, + contentDescription = contentDescription + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/components/SimpleTextButton.kt b/app/src/main/java/com/wzray/openconnect/ui/components/SimpleTextButton.kt new file mode 100644 index 0000000..df6d209 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/components/SimpleTextButton.kt @@ -0,0 +1,13 @@ +package com.wzray.openconnect.ui.components + +import androidx.compose.material3.Text +import androidx.compose.material3.TextButton +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier + +@Composable +fun SimpleTextButton(onClick: () -> Unit, text: String, modifier: Modifier = Modifier) { + TextButton(onClick = onClick, modifier = modifier) { + Text(text = text) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/components/SingleSelectDialog.kt b/app/src/main/java/com/wzray/openconnect/ui/components/SingleSelectDialog.kt new file mode 100644 index 0000000..88d183e --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/components/SingleSelectDialog.kt @@ -0,0 +1,69 @@ +package com.wzray.openconnect.ui.components + +import androidx.compose.foundation.layout.Arrangement +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.layout.requiredWidth +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.shape.RoundedCornerShape +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.unit.dp +import androidx.compose.ui.window.Dialog + +@Composable +fun SingleSelectDialog( + title: String, + submitButtonText: String, + dismissButtonText: String, + options: Map, + defaultSelected: T, + onSubmitButtonClick: (T) -> Unit, + onDismissRequest: () -> Unit, +) { + var selectedOption by remember { mutableStateOf(defaultSelected) } + + Dialog(onDismissRequest = onDismissRequest) { + Surface( + modifier = Modifier.requiredWidth(300.dp), shape = RoundedCornerShape(24.dp) + ) { + Column(modifier = Modifier.padding(12.dp)) { + Text( + text = title, + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding(top = 8.dp, start = 8.dp, bottom = 12.dp) + ) + LazyColumn { + options.forEach { + item { + RadioButtonText( + text = it.value, isSelected = (it.key == selectedOption) + ) { + selectedOption = it.key + } + } + } + } + Row( + horizontalArrangement = Arrangement.Absolute.Right, + modifier = Modifier.fillMaxWidth().padding(top = 4.dp) + ) { + SimpleTextButton(onDismissRequest, dismissButtonText) + SimpleTextButton({ + onSubmitButtonClick.invoke(selectedOption) + onDismissRequest.invoke() + }, submitButtonText) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/SettingsScreen.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/SettingsScreen.kt new file mode 100644 index 0000000..b145466 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/SettingsScreen.kt @@ -0,0 +1,80 @@ +package com.wzray.openconnect.ui.screens + +import android.os.Build +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.outlined.DarkMode +import androidx.compose.material.icons.outlined.FormatPaint +import androidx.compose.material.icons.outlined.LightMode +import androidx.compose.material.icons.outlined.Palette +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import com.ramcosta.composedestinations.annotation.Destination +import com.wzray.openconnect.R +import com.wzray.openconnect.ui.MainGraph +import com.wzray.openconnect.util.Settings +import com.wzray.openconnect.util.UiMode +import com.wzray.openconnect.util.toFormalCase +import me.zhanghai.compose.preference.ListPreference +import me.zhanghai.compose.preference.PreferenceCategory +import me.zhanghai.compose.preference.SwitchPreference + +@Destination +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun SettingsScreen(outerPadding: PaddingValues) { + Scaffold( + modifier = Modifier.padding(outerPadding), + topBar = { TopAppBar(title = { Text(stringResource(R.string.settings)) }) } + + ) { padding -> + Column(modifier = Modifier.padding(padding)) { + val uiModeToString = UiMode.entries.associateBy { it.toString().toFormalCase() } + val uiMode by Settings.uiMode.asState() + val dynamicColors by Settings.useDynamicColor.asState() + + PreferenceCategory( + title = { Text(stringResource(R.string.look_and_feel)) } + ) + + ListPreference( + value = uiMode.toString().toFormalCase(), + onValueChange = { + Settings.uiMode.set( + uiModeToString[it] + ) + }, + values = uiModeToString.keys.toList(), + title = { Text(stringResource(R.string.app_theme)) }, + summary = { Text(stringResource(R.string.app_theme_summary)) }, + icon = { + Icon( + when (uiMode) { + UiMode.DARK -> Icons.Outlined.DarkMode + UiMode.LIGHT -> Icons.Outlined.LightMode + UiMode.AUTO -> Icons.Outlined.FormatPaint + }, null + ) + }, + ) + + SwitchPreference( + value = dynamicColors && (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S), + onValueChange = { Settings.useDynamicColor.set(it) }, + icon = { Icon(Icons.Outlined.Palette, null) }, + title = { Text(stringResource(R.string.use_dynamic_colors)) }, + summary = { Text(stringResource(R.string.use_dynamic_colors_summary)) }, + enabled = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/connection_editor/ConnectionEditorScreen.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/connection_editor/ConnectionEditorScreen.kt new file mode 100644 index 0000000..3c94c42 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/connection_editor/ConnectionEditorScreen.kt @@ -0,0 +1,127 @@ +package com.wzray.openconnect.ui.screens.connection_editor + +import androidx.annotation.StringRes +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.LazyListScope +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.remember +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.hilt.navigation.compose.hiltViewModel +import com.ramcosta.composedestinations.annotation.Destination +import com.wzray.openconnect.R +import com.wzray.openconnect.core.data.model.Connection +import com.wzray.openconnect.core.viewmodels.ConnectionEditorViewModel +import com.wzray.openconnect.ui.ConnectionEditorGraph +import com.wzray.openconnect.ui.theme.SlideEnd +import me.zhanghai.compose.preference.ListPreference +import me.zhanghai.compose.preference.PreferenceCategory +import me.zhanghai.compose.preference.TextFieldPreference +import me.zhanghai.compose.preference.preferenceCategory +import me.zhanghai.compose.preference.textFieldPreference + +//private val protocolToString = mapOf( +// Protocols.ANYCONNECT to R.string.home +//) + +private fun LazyListScope.textFieldPreference( + key: String, + @StringRes title: Int, + value: String, + onValueChange: (String) -> Unit, + modifier: Modifier = Modifier +) { + item(key = key, contentType = "TextFieldPreference") { + TextFieldPreference( + value = value, + summary = { Text(value) }, + title = { Text(stringResource(title)) }, + onValueChange = onValueChange, + textToValue = { it }, + modifier = modifier + ) + } +} + +private fun LazyListScope.passwordTextFieldPreference( + key: String, + @StringRes title: Int, + value: String, + onValueChange: (String) -> Unit, + modifier: Modifier = Modifier +) { + item(key = key, contentType = "TextFieldPreference") { + TextFieldPreference( + value = value, + summary = { Text("•".repeat(value.length)) }, + title = { Text(stringResource(title)) }, + onValueChange = onValueChange, + textToValue = { it }, + modifier = modifier + ) + } +} + +@Destination(start = true, style = SlideEnd::class) +@Composable +fun ConnectionEditorScreen( + initialConnection: Connection, +) { + val viewModel = remember { ConnectionEditorViewModel(initialConnection) } + val connection by viewModel.connection.collectAsState() + + Scaffold { padding -> + LazyColumn(modifier = Modifier.padding(padding)) { + preferenceCategory( + key = "cat_server", + title = { Text(stringResource(R.string.server)) }) + + textFieldPreference( + key = "connection_name", + value = connection.name, + title = R.string.profile_name, + onValueChange = { + viewModel.updateConnection(connection.copy(name = it)) + }, + ) + + textFieldPreference( + key = "server_address", + value = connection.url, + title = R.string.server_address, + onValueChange = { + viewModel.updateConnection(connection.copy(url = it)) + } + ) + + preferenceCategory( + key = "cat_auth", + title = { Text(stringResource(R.string.authentication)) }) + + textFieldPreference( + key = "username", + value = connection.username, + title = R.string.username, + onValueChange = { + viewModel.updateConnection(connection.copy(username = it)) + }, + ) + + passwordTextFieldPreference( + key = "password", + value = connection.password, + title = R.string.password, + onValueChange = { + viewModel.updateConnection(connection.copy(password = it)) + }, + ) + } + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/home/Components.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/home/Components.kt new file mode 100644 index 0000000..ce18f5a --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/home/Components.kt @@ -0,0 +1,23 @@ +package com.wzray.openconnect.ui.screens.home + +import androidx.compose.foundation.layout.RowScope +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import com.ramcosta.composedestinations.annotation.NavGraph +import com.ramcosta.composedestinations.annotation.NavHostGraph +import com.ramcosta.composedestinations.annotation.RootGraph +import com.wzray.openconnect.R + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun HomeTopBar( + modifier: Modifier = Modifier, + title: @Composable () -> Unit = { Text(stringResource(R.string.app_name)) }, + actions: @Composable (RowScope.() -> Unit) = {} +) { + TopAppBar(title = title, modifier = modifier, actions = actions) +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeRoute.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeRoute.kt new file mode 100644 index 0000000..df6b147 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeRoute.kt @@ -0,0 +1,43 @@ +package com.wzray.openconnect.ui.screens.home + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import com.ramcosta.composedestinations.annotation.Destination +import com.wzray.openconnect.core.viewmodels.HomeUiState +import com.wzray.openconnect.core.viewmodels.HomeViewModel +import androidx.hilt.navigation.compose.hiltViewModel +import com.wzray.openconnect.ui.MainGraph +import com.wzray.openconnect.ui.RootDestinationsNavigator + +@Destination( + start = true, +) +@Composable +fun HomeRoute( + viewModel: HomeViewModel = hiltViewModel(), + outerPadding: PaddingValues, + navigator: RootDestinationsNavigator +) { + val uiState by viewModel.uiState.collectAsState() + when (uiState) { + is HomeUiState.ConnectionList -> + HomeScreen( + { viewModel.connect(it) }, + { viewModel.toggleSelection(it) }, + viewModel.uiState, + outerPadding, + navigator + ) + + is HomeUiState.SelectionList -> HomeScreenSelection( + onChangeState = { viewModel.toggleSelection(it) }, + onDeleteClick = { viewModel.deleteSelected() }, + onSelectAllClick = { viewModel.selectAll() }, + onCopyClick = { viewModel.copySelected() }, + uiStateFlow = viewModel.uiState, + paddingValues = outerPadding + ) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeScreenSelection.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeScreenSelection.kt new file mode 100644 index 0000000..bc848ed --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeScreenSelection.kt @@ -0,0 +1,93 @@ +package com.wzray.openconnect.ui.screens.home + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ContentCopy +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.SelectAll +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.pluralStringResource +import com.wzray.openconnect.R +import com.wzray.openconnect.core.data.model.Connection +import com.wzray.openconnect.ui.components.ConnectionElementSelected +import com.wzray.openconnect.core.viewmodels.HomeUiState +import kotlinx.coroutines.flow.StateFlow + +@Composable +fun SelectionTopBar( + count: Int, + onDeleteClick: () -> Unit, + onSelectAllClick: () -> Unit, + onCopyClick: () -> Unit, + modifier: Modifier = Modifier, + title: @Composable () -> Unit = { + Text( + pluralStringResource( + R.plurals.selection_top_bar_count_selected, + count, + count + ) + ) + } +) { + HomeTopBar(modifier, title) { + if (count == 1) + IconButton(onClick = onCopyClick) { + Icon(imageVector = Icons.Filled.ContentCopy, "Duplicate") + } + + IconButton(onClick = onSelectAllClick) { + Icon(imageVector = Icons.Filled.SelectAll, "Select all") + } + + IconButton(onClick = onDeleteClick) { + Icon(imageVector = Icons.Filled.Delete, "Select all") + } + } +} + +@Composable +fun HomeScreenSelection( + onChangeState: (Connection) -> Unit, + onDeleteClick: () -> Unit, + onSelectAllClick: () -> Unit, + onCopyClick: () -> Unit, + uiStateFlow: StateFlow, + paddingValues: PaddingValues, +) { + val uiState by uiStateFlow.collectAsState() + + Scaffold( + topBar = { SelectionTopBar( + (uiState as HomeUiState.SelectionList).selectedConnections.count(), + onDeleteClick = onDeleteClick, + onSelectAllClick = onSelectAllClick, + onCopyClick = onCopyClick, + ) }, + modifier = Modifier.padding(paddingValues), + ) { padding -> + Box(modifier = Modifier.padding(top = padding.calculateTopPadding())) { + LazyColumn { + items(uiState.connections) { + ConnectionElementSelected( + onChangeCallback = { onChangeState(it) }, + isEnabled = (uiState as HomeUiState.SelectionList) + .selectedConnections.contains(it), + connectionName = it.name + ) + } + } + } + } +} diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeScreens.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeScreens.kt new file mode 100644 index 0000000..0e34f27 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/home/HomeScreens.kt @@ -0,0 +1,96 @@ +package com.wzray.openconnect.ui.screens.home + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.filled.Stop +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.hapticfeedback.HapticFeedbackType +import androidx.compose.ui.platform.LocalHapticFeedback +import com.ramcosta.composedestinations.generated.destinations.ConnectionEditorScreenDestination +import com.ramcosta.composedestinations.navigation.DestinationsNavigator +import com.wzray.openconnect.Application +import com.wzray.openconnect.core.data.model.Connection +import com.wzray.openconnect.ui.components.ConnectionElement +import com.wzray.openconnect.util.applicationScope +import com.wzray.openconnect.core.viewmodels.HomeUiState +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.launch + +@Composable +fun MultiUseFab() { // TODO: you don't have to tell me that this is bad + val vpnManager = Application.vpnManager + + if (vpnManager.isConnected) + FloatingActionButton( + onClick = { vpnManager.disconnect() }, + containerColor = MaterialTheme.colorScheme.secondaryContainer, + contentColor = MaterialTheme.colorScheme.secondary + ) { + Icon(Icons.Filled.Stop, "Stop the VPN") + } + else + FloatingActionButton( + onClick = { + Application.applicationScope.launch { + val dao = Application.db.connectionsDao() + dao.insert(Connection("New connection", "", "", "")) + } + }, + containerColor = MaterialTheme.colorScheme.secondaryContainer, + contentColor = MaterialTheme.colorScheme.secondary + ) { + Icon(Icons.Filled.Add, "Add a new connection") + } +} + +@Composable +fun HomeScreen( + onConnectionClick: (Connection) -> Unit, + onLongClick: (Connection) -> Unit, + uiStateFlow: StateFlow, + paddingValues: PaddingValues, + navigator: DestinationsNavigator, +) { + val uiState by uiStateFlow.collectAsState() + + Scaffold( + topBar = { HomeTopBar() }, + modifier = Modifier.padding(paddingValues), + floatingActionButton = { + Column(horizontalAlignment = Alignment.CenterHorizontally) { + MultiUseFab() + } + } + ) { padding -> + val haptics = LocalHapticFeedback.current + Box(modifier = Modifier.padding(top = padding.calculateTopPadding())) { + LazyColumn { + items(uiState.connections) { + ConnectionElement( + onClick = { onConnectionClick(it) }, + onLongClick = { + haptics.performHapticFeedback(HapticFeedbackType.LongPress) + onLongClick(it) + }, + onSettingsClick = { navigator.navigate(ConnectionEditorScreenDestination(it)) }, + connectionName = it.name + ) + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/logs/LogRoute.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/logs/LogRoute.kt new file mode 100644 index 0000000..4624d7f --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/logs/LogRoute.kt @@ -0,0 +1,30 @@ +package com.wzray.openconnect.ui.screens.logs + +import android.widget.Toast +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext +import androidx.hilt.navigation.compose.hiltViewModel +import com.ramcosta.composedestinations.annotation.Destination +import com.wzray.openconnect.ui.MainGraph +import com.wzray.openconnect.core.viewmodels.LogViewModel + +@Destination +@Composable +fun LogRoute( + viewModel: LogViewModel = hiltViewModel(), + outerPadding: PaddingValues, +) { + val ctx = LocalContext.current // TODO: remove this + val makeToast: (String) -> Unit = { + Toast.makeText(ctx, it, Toast.LENGTH_SHORT).show() + } + LogScreen( // TODO: remove dependency on UIState and provide all values individually + onPauseClick = { viewModel.pauseLog() }, + onShareClick = { makeToast("onShareClick") }, + onSetLogLevel = { viewModel.setLogLevel(it) }, + onClearClick = { viewModel.clearLog() }, + uiStateFlow = viewModel.uiState, + padding = outerPadding + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/screens/logs/LogScreen.kt b/app/src/main/java/com/wzray/openconnect/ui/screens/logs/LogScreen.kt new file mode 100644 index 0000000..75f945b --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/screens/logs/LogScreen.kt @@ -0,0 +1,173 @@ +package com.wzray.openconnect.ui.screens.logs + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.Row +import androidx.compose.foundation.layout.fillMaxHeight +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.rememberScrollState +import androidx.compose.foundation.text.selection.SelectionContainer +import androidx.compose.foundation.verticalScroll +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.filled.MoreVert +import androidx.compose.material.icons.filled.Pause +import androidx.compose.material.icons.filled.PlayArrow +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect +import androidx.compose.runtime.MutableState +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.unit.dp +import androidx.compose.ui.unit.sp +import com.wzray.openconnect.R +import com.wzray.openconnect.ui.components.CheckboxText +import com.wzray.openconnect.ui.components.SimpleIconButton +import com.wzray.openconnect.ui.components.SingleSelectDialog +import com.wzray.openconnect.util.Settings +import com.wzray.openconnect.core.viewmodels.LogLevel +import com.wzray.openconnect.core.viewmodels.UIState +import kotlinx.coroutines.flow.StateFlow + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun TopBar( + onPauseClick: () -> Unit, + onShareClick: () -> Unit, + onClearClick: () -> Unit, + isPaused: Boolean, + dialogState: MutableState, + + ) { + var isMenuExpanded by remember { mutableStateOf(false) } + val followLogs by Settings.followLogs.asState() + var isDialogOpen by dialogState + + TopAppBar( + title = { Text(stringResource(R.string.logs)) }, + actions = { + SimpleIconButton( + onClick = onPauseClick, + icon = if (isPaused) Icons.Filled.PlayArrow else Icons.Filled.Pause, + contentDescription = stringResource(R.string.pause_logs) + ) + SimpleIconButton( + onClick = onClearClick, + icon = Icons.Filled.Delete, + contentDescription = stringResource(R.string.clear_logs) + ) + Box { + SimpleIconButton( + onClick = { isMenuExpanded = !isMenuExpanded }, + icon = Icons.Filled.MoreVert, + contentDescription = stringResource(R.string.more_options) + ) + DropdownMenu( + expanded = isMenuExpanded, + onDismissRequest = { isMenuExpanded = false } + ) { + DropdownMenuItem( + text = { + CheckboxText( + stringResource(R.string.follow_logs), + followLogs + ) + }, + onClick = { Settings.followLogs.set(!followLogs); isMenuExpanded = false } + ) + DropdownMenuItem( + text = { Text(stringResource(R.string.log_level)) }, + onClick = { isMenuExpanded = false; isDialogOpen = true } + ) + DropdownMenuItem( + text = { Text(stringResource(R.string.export_logs)) }, + onClick = onShareClick + ) + } + } + }, + ) +} + +@Composable +fun LogScreen( + onPauseClick: () -> Unit, + onShareClick: () -> Unit, + onSetLogLevel: (LogLevel) -> Unit, + onClearClick: () -> Unit, + uiStateFlow: StateFlow, + padding: PaddingValues +) { + val uiState by uiStateFlow.collectAsState() + val dialogState = remember { mutableStateOf(false) } + + Scaffold( + topBar = { + TopBar( + onPauseClick = onPauseClick, + onShareClick = onShareClick, + onClearClick = onClearClick, + isPaused = uiState.isPaused, + dialogState = dialogState, + ) + }, + modifier = Modifier.padding(padding) + ) { innerPadding -> + val followLogs by Settings.followLogs.asState() + var isDialogOpen by dialogState + val scrollState = rememberScrollState() + + if (isDialogOpen) + SingleSelectDialog( + title = stringResource(R.string.log_level), + submitButtonText = stringResource(R.string.submit), + dismissButtonText = stringResource(R.string.cancel), + options = LogLevel.entries.associateWith { it.fullName }, + defaultSelected = uiState.logLevel, + onSubmitButtonClick = onSetLogLevel, + onDismissRequest = { isDialogOpen = false }, + ) + + SelectionContainer( + modifier = Modifier.padding(innerPadding) + ) { + if (followLogs) LaunchedEffect(uiState.logList.size) { + if (uiState.logList.isNotEmpty()) scrollState.scrollTo(scrollState.maxValue) + } + + Column( + modifier = Modifier + .verticalScroll(scrollState) + .fillMaxWidth() + .fillMaxHeight() + .padding(horizontal = 8.dp) + ) { + uiState.logList.toList().forEach { + Row { + Text( + text = it, + fontFamily = FontFamily.Monospace, + fontSize = 14.sp, + lineHeight = 20.sp, + modifier = Modifier.padding(bottom = 12.dp) + ) + } + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/theme/Animations.kt b/app/src/main/java/com/wzray/openconnect/ui/theme/Animations.kt new file mode 100644 index 0000000..91fcc5f --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/theme/Animations.kt @@ -0,0 +1,59 @@ +package com.wzray.openconnect.ui.theme + +import androidx.compose.animation.AnimatedContentTransitionScope +import androidx.compose.animation.EnterTransition +import androidx.compose.animation.ExitTransition +import androidx.compose.animation.core.tween +import androidx.compose.animation.fadeIn +import androidx.compose.animation.fadeOut +import androidx.compose.animation.slideInHorizontally +import androidx.compose.animation.slideOutHorizontally +import androidx.navigation.NavBackStackEntry +import com.ramcosta.composedestinations.animations.NavHostAnimatedDestinationStyle +import com.ramcosta.composedestinations.spec.DestinationStyle + +object SlideEnd : DestinationStyle.Animated() { + private const val DURATION = 200 + + override val enterTransition: + AnimatedContentTransitionScope.() -> EnterTransition? = { + slideInHorizontally( + initialOffsetX = { 1000 }, animationSpec = tween(DURATION) + ) + } + override val exitTransition: + AnimatedContentTransitionScope.() -> ExitTransition? = { + slideOutHorizontally( + targetOffsetX = { -1000 }, animationSpec = tween(DURATION) + ) + } + override val popEnterTransition: + AnimatedContentTransitionScope.() -> EnterTransition? = { + slideInHorizontally( + initialOffsetX = { -1000 }, animationSpec = tween(DURATION) + ) + } + override val popExitTransition: + AnimatedContentTransitionScope.() -> ExitTransition? = { + slideOutHorizontally( + targetOffsetX = { 1000 }, animationSpec = tween(DURATION) + ) + } +} + +object Fade : NavHostAnimatedDestinationStyle() { + private const val DURATION = 175 + + override val enterTransition: + AnimatedContentTransitionScope.() -> EnterTransition = { + fadeIn( + initialAlpha = 0f, animationSpec = tween(DURATION) + ) + } + override val exitTransition: + AnimatedContentTransitionScope.() -> ExitTransition = { + fadeOut( + targetAlpha = 0f, animationSpec = tween(DURATION) + ) + } +} diff --git a/app/src/main/java/com/wzray/openconnect/ui/theme/Color.kt b/app/src/main/java/com/wzray/openconnect/ui/theme/Color.kt new file mode 100644 index 0000000..736b07c --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package com.wzray.openconnect.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/theme/Theme.kt b/app/src/main/java/com/wzray/openconnect/ui/theme/Theme.kt new file mode 100644 index 0000000..e76827f --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package com.wzray.openconnect.ui.theme + +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.platform.LocalContext +import com.wzray.openconnect.util.Settings +import com.wzray.openconnect.util.UiMode +import me.zhanghai.compose.preference.ProvidePreferenceLocals + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40, + + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), +) + +@Composable +fun OpenConnectTheme( + content: @Composable () -> Unit +) { + val dynamicColor by Settings.useDynamicColor.asState() + val uiMode by Settings.uiMode.asState() + + val darkTheme = when (uiMode) { + UiMode.AUTO -> isSystemInDarkTheme() + UiMode.DARK -> true + UiMode.LIGHT -> false + } + + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = { + ProvidePreferenceLocals { + content() + } + } + ) +} \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/ui/theme/Type.kt b/app/src/main/java/com/wzray/openconnect/ui/theme/Type.kt new file mode 100644 index 0000000..a7b153d --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package com.wzray.openconnect.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/java/com/wzray/openconnect/util/Extensions.kt b/app/src/main/java/com/wzray/openconnect/util/Extensions.kt new file mode 100644 index 0000000..ab5b929 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/util/Extensions.kt @@ -0,0 +1,10 @@ +package com.wzray.openconnect.util + +import com.wzray.openconnect.Application +import kotlinx.coroutines.CoroutineScope + +fun String.toFormalCase() = this.lowercase().replaceFirstChar { it.uppercaseChar() } + +val Any.applicationScope: CoroutineScope + get() = Application.coroutineScope + diff --git a/app/src/main/java/com/wzray/openconnect/util/Settings.kt b/app/src/main/java/com/wzray/openconnect/util/Settings.kt new file mode 100644 index 0000000..b12e034 --- /dev/null +++ b/app/src/main/java/com/wzray/openconnect/util/Settings.kt @@ -0,0 +1,74 @@ +package com.wzray.openconnect.util + +import androidx.compose.runtime.Composable +import androidx.compose.runtime.State +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.remember +import androidx.datastore.core.DataStore +import androidx.datastore.preferences.core.Preferences +import androidx.datastore.preferences.core.booleanPreferencesKey +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import com.wzray.openconnect.Application +import com.wzray.openconnect.core.viewmodels.LogLevel +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.launch + +abstract class PreferenceFieldBase( + private val dataStore: DataStore, + private val key: Preferences.Key, + protected open val default: ValueType, +) { + abstract fun toStorage(v: ValueType): StorageType + abstract fun fromStorage(v: StorageType?): ValueType? + + @Composable + fun asState(): State = + remember { dataStore.data.map { fromStorage(it[key]) ?: default } }.collectAsState(default) + + fun set(value: ValueType?) = applicationScope.launch { + dataStore.edit { if (value != null) it[key] = toStorage(value) else it.remove(key) } + } +} + + +class PreferenceField( + dataStore: DataStore, + key: Preferences.Key, + default: T, +) : PreferenceFieldBase(dataStore, key, default) { + override fun toStorage(v: T): T = v + override fun fromStorage(v: T?): T? = v +} + + +class EnumPreferenceField>( + dataStore: DataStore, + key: Preferences.Key, + default: E, +) : PreferenceFieldBase(dataStore, key, default) { + override fun toStorage(v: E): String = v.name + override fun fromStorage(v: String?): E? = + v?.let { default::class.java.enumConstants!!.firstOrNull { it.name == v } } +} + +enum class UiMode { + AUTO, DARK, LIGHT +} + +object Settings { + private val dataStore = Application.prefDataStore + + private val KEY_FOLLOW_LOGS = booleanPreferencesKey("follow_logs") + private val KEY_LAST_CONNECTION = stringPreferencesKey("last_connection") + private val KEY_UI_MODE = stringPreferencesKey("ui_mode") + private val KEY_LOG_LEVEL = stringPreferencesKey("log_level") + private val KEY_USE_DYNAMIC_COLOR = booleanPreferencesKey("use_dynamic_color") + + + val followLogs = PreferenceField(dataStore, KEY_FOLLOW_LOGS, true) + val lastConnection = PreferenceField(dataStore, KEY_LAST_CONNECTION, "") + val uiMode = EnumPreferenceField(dataStore, KEY_UI_MODE, UiMode.AUTO) + val logLevel = EnumPreferenceField(dataStore, KEY_LOG_LEVEL, LogLevel.INFO) + val useDynamicColor = PreferenceField(dataStore, KEY_USE_DYNAMIC_COLOR, true) +} \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..345888d --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..d248861 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png new file mode 100644 index 0000000..8c5bf00 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..60abada Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..4cff1a2 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..b71df2f Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png new file mode 100644 index 0000000..11c72b2 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..ceb7e60 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..04013bb Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_banner.png b/app/src/main/res/mipmap-xhdpi/ic_banner.png new file mode 100644 index 0000000..f9941a0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_banner.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..e8efe01 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png new file mode 100644 index 0000000..0f79019 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..84c861c Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..94c51c1 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_banner.png b/app/src/main/res/mipmap-xxhdpi/ic_banner.png new file mode 100644 index 0000000..dc7fd3d Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_banner.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..78fe5cf Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..e598be5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..eeef211 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..764a7fa Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_banner.png b/app/src/main/res/mipmap-xxxhdpi/ic_banner.png new file mode 100644 index 0000000..44e1327 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_banner.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..4084efb Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png new file mode 100644 index 0000000..9ad66cf Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png new file mode 100644 index 0000000..0697458 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png new file mode 100644 index 0000000..0761405 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..ae9fb07 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,34 @@ + + OpenConnect + Logs + Pause logs + Share logs + More options + Clear logs + Follow logs + Log level + Export logs + Submit + Dismiss + Cancel + Dark mode + Theme + Enable dynamic colors + Settings + Home + Use Material You colorscheme + Choose between Auto, Light, or Dark mode. + + Server + Authentication + Advanced + Profile name + VPN Protocol + Username + Password + Server address + + %d selected + %d selected + + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..b5779d2 --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,4 @@ + + +