diff --git a/.gitignore b/.gitignore
index d6616e1..dfaf03d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,7 +36,6 @@ key.properties
# Generated Files
*.g.dart
*.freezed.dart
-src/
# Devel Password
password.txt
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index 496acdb..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,675 +0,0 @@
-# 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
index 1299c71..09a1a9b 100644
--- a/README.md
+++ b/README.md
@@ -15,115 +15,97 @@ A simple and user-friendly Matrix client made with Flutter and the Matrix Dart S
## Progress
-- [ ] New logo
-- [ ] Make context menus appear as bottom sheets on mobile
-- [x] Move from the Dart SDK to the Gomuks SDK with Dart bindings: https://git.federated.nexus/Henry-Hiles/nexus/pulls/2
- - [ ] Allow using remote gomuks over websocket
-- [ ] Platform Support
- - [x] Linux
- - [x] Windows
- - [ ] MacOS
- - [ ] Android
- - [ ] iOS
- - [ ] Web (may not be possible)
-- [x] Login
- - [x] Username / password auth
- - [ ] OAuth / OIDC
- - [x] Improve initial sync experience
-- [x] Rooms / Spaces
- - [x] Displaying and choosing
- - [x] Reading, showing unread
- - [x] Mark as read button on rooms and spaces
- - [ ] Searching
- - [ ] Creating (Rooms, Spaces, and DMs)
- - [x] Joining
- - [ ] Parse vias
- - [x] Using a text/uri/link
- - [x] Plain text
- - [x] `matrix:` Uri
- - [x] Matrix.to link
- - [ ] From space
- - [ ] Exploring
- - [x] Leaving
- - [x] Subspaces
-- [x] Messages
- - [x] Encryption
- - [x] Restoring crypto identity from a recovery passphrase/key
- - [x] Sending
- - [x] Plain text
- - [x] HTML/Markdown
- - [x] Replies
- - [x] Choose ping on/off
- - [ ] Attachments
- - [ ] Commands with [MSC4391](https://github.com/matrix-org/matrix-spec-proposals/pull/4391)
- - [x] Mentions
- - [x] Users
- - [x] Rooms
- - [ ] Inline emoji picker (Putting this here since it'll be implemented the same way as mentions)
- - [ ] Custom emojis/stickers
- - [ ] GIFs using Gomuks' GIF proxies
- - [x] Recieving
- - [x] Plain text
- - [x] HTML
- - [x] Replies
- - [x] Viewing
- - [ ] Jump to original message
- - [x] In loaded timeline
- - [ ] Out of loaded timeline
- - [x] Edits
- - [x] Attachments
- - [x] Unencrypted
- - [ ] Encrypted
- - [x] Blurhashing
- - [ ] Downloading attachments
- - [x] Opening attachments in their own view
- - [ ] Polls: Waiting on https://github.com/SwanFlutter/dynamic_polls/issues/1
- - [x] Mentions
- - [x] Users
- - [x] Rooms
- - [ ] Plain text (not sure if I want to add this or not, I probably won't unless there's interest)
- - [x] Matrix URIs
- - [x] Matrix.to links
- - [ ] Do some fancy fetching to get nice names
- - [ ] Make clickable
- - [x] Custom emojis/stickers
- - [x] History loading
- - [x] Backwards
- - [ ] Forwards
- - [x] Editing
- - [x] Deleting
-- [ ] Reactions: Waiting on https://github.com/flyerhq/flutter_chat_ui/pull/838 or me doing a custom impl
-- [ ] Pins
- - [ ] Displaying
- - [ ] Creating
-- [ ] Threads
-- [ ] Profile popouts
-- [ ] Copy link to [room, space]
-- [ ] Reporting
- - [x] Events
- - [ ] Rooms
-- [ ] Notifications using UnifiedPush
-- [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
-- [ ] Invites
-- [ ] Settings
- - [ ] Light/Dark mode
- - [ ] SSD or CSD
- - [ ] Show media by default
- - [ ] Dynamic Theming
- - [ ] Devices
- - [ ] Viewing devices
- - [ ] Verifying devices
- - [ ] URL preview: Server / Client / None
- - [ ] Account changes
- - [ ] Display name
- - [ ] Profile picture
- - [ ] Timezone
- - [ ] Pronouns
- - [ ] Password
- - [ ] About
- - [x] Log Out
+- [ ] Move from the Dart SDK to the Rust SDK with Dart bindings: Waiting on https://github.com/fzyzcjy/flutter_rust_bridge/discussions/2967#discussioncomment-15522205.
+- [ ] Platform Support
+ - [x] Linux
+ - [x] Windows
+ - [ ] MacOS
+ - [ ] Android
+ - [ ] iOS
+ - [ ] Web (may not be possible)
+- [x] Login
+ - [x] Username / password auth
+ - [ ] OAuth / OIDC
+- [x] Rooms / Spaces
+ - [x] Displaying and choosing
+ - [x] Reading, showing unread
+ - [x] Mark as read button on rooms and spaces
+ - [ ] Searching
+ - [ ] Creating (Rooms, Spaces, and DMs)
+ - [x] Joining
+ - [x] Using alias/id/link
+ - [ ] From space
+ - [ ] Exploring
+ - [x] Leaving
+ - [x] Subspaces
+- [x] Messages
+ - [x] Encryption
+ - [ ] Restoring crypto identity from passphrase/key or verification
+ - [x] Sending
+ - [x] Plain text
+ - [x] HTML/Markdown
+ - [x] Replies
+ - [ ] Attachments
+ - [x] Mentions
+ - [x] Users
+ - [x] Rooms
+ - [ ] Custom emojis/stickers
+ - [ ] GIFs using Giphy
+ - [x] Recieving
+ - [x] Plain text
+ - [x] HTML
+ - [x] Replies
+ - [x] Viewing
+ - [ ] Jump to original message
+ - [x] Edits
+ - [x] Attachments
+ - [x] Blurhashing
+ - [ ] Downloading attachments
+ - [x] Opening attachments in their own view
+ - [ ] Polls: Waiting on https://github.com/SwanFlutter/dynamic_polls/issues/1
+ - [x] Mentions
+ - [x] Users
+ - [x] Rooms
+ - [ ] Plain text (not sure if I want to add this or not, I probably won't unless there's interest)
+ - [x] Matrix URIs
+ - [x] Matrix.to links
+ - [x] Custom emojis/stickers
+ - [x] History loading
+ - [x] Backwards
+ - [ ] Forwards
+ - [x] Editing
+ - [x] Deleting
+- [ ] Reactions: Waiting on https://github.com/flyerhq/flutter_chat_ui/pull/838 or me doing a custom impl
+- [ ] Pins
+ - [ ] Displaying
+ - [ ] Creating
+- [ ] Threads
+- [ ] Profile popouts
+- [x] Copy link to [room, space]
+- [x] Reporting
+- [ ] Notifications using UnifiedPush
+- [ ] Group calls using [MSC4195](https://github.com/matrix-org/matrix-spec-proposals/pull/4195)
+- [ ] Invites
+ - [ ] Viewing / accepting
+ - [ ] Spam filtering
+- [ ] Settings
+ - [ ] Light/Dark mode
+ - [ ] Show media by default
+ - [ ] Dynamic Theming
+ - [ ] Devices
+ - [ ] Viewing devices
+ - [ ] Verifying devices
+ - [ ] URL preview: Server / Client / None
+ - [ ] Account changes
+ - [ ] Display name
+ - [ ] Profile picture
+ - [ ] Timezone
+ - [ ] Pronouns
+ - [ ] Password
+ - [ ] About
+ - [x] Log Out
-## Build Instructions
+## Development
First, clone and open the repo:
@@ -136,14 +118,14 @@ cd nexus
#### Linux
-- With Nix: Either use direnv, or `nix flake develop`
-- Without Nix: Install Flutter, Go, Olm, Git, Clang, and GLibc.
+- With Nix: Either use direnv, or `nix flake develop`
+- Without Nix: Install Flutter, Rust, the libsecret dev package for your distro (must be in `PKG_CONFIG_PATH`), and sqlite (must be in `LD_LIBRARY_PATH`).
#### Windows / MacOS
-I don't really know. You will need Flutter, Git, Olm, Go, and Visual Studio tools, and otherwise I guess just keep installing stuff until there aren't any errors. I will look into this sometimeTM.
+I don't really know. You will need Flutter and Rust, and otherwise I guess just keep installing stuff until there aren't any errors.
-### Set up Flutter
+###
Get dependencies:
@@ -151,18 +133,6 @@ Get dependencies:
flutter pub get
```
-Get dependencies:
-
-```sh
-flutter pub get
-```
-
-Clone Gomuks and generate bindings:
-
-```sh
-scripts/generate.sh
-```
-
Build generated files, and watch for new changes:
```sh
@@ -177,4 +147,4 @@ flutter run
## Community
-Join the [Nexus Client Matrix Room](https://matrix.to/#/#nexus:federated.nexus) for questions or help with developing or using Nexus Client.
+Come chat in the [Federated Nexus Community](https://matrix.to/#/#space:federated.nexus) for questions or help with developing or using Nexus Client.
diff --git a/analysis_options.yaml b/analysis_options.yaml
index a8b1078..c2aaaa0 100644
--- a/analysis_options.yaml
+++ b/analysis_options.yaml
@@ -1,7 +1,6 @@
analyzer:
errors:
invalid_annotation_target: ignore
- avoid_print: ignore
exclude:
- "build/**"
- "**/*.g.dart"
diff --git a/assets/screenshotDark.png b/assets/screenshotDark.png
index ae75dc7..dec983f 100644
Binary files a/assets/screenshotDark.png and b/assets/screenshotDark.png differ
diff --git a/assets/screenshotLight.png b/assets/screenshotLight.png
index 0b2ce0d..003f6b4 100644
Binary files a/assets/screenshotLight.png and b/assets/screenshotLight.png differ
diff --git a/build.yaml b/build.yaml
deleted file mode 100644
index 5d6aeda..0000000
--- a/build.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-targets:
- $default:
- builders:
- json_serializable:
- options:
- field_rename: snake
diff --git a/flake.nix b/flake.nix
index de21b13..e425730 100644
--- a/flake.nix
+++ b/flake.nix
@@ -23,7 +23,6 @@
perSystem =
{
- lib,
pkgs,
system,
...
@@ -33,35 +32,42 @@
_module.args.pkgs = import nixpkgs {
inherit system;
config = {
- permittedInsecurePackages = [ "olm-3.2.16" ];
android_sdk.accept_license = true;
allowUnfree = true;
};
};
- devShells =
+ devShells.default =
let
+ # android = pkgs.callPackage ./nix/android.nix { };
+ in
+ pkgs.mkShell {
packages = with pkgs; [
- go
- olm
- git
+ # jdk17
+ cargo
+ rustc
+ openssl_3
+ pkg-config
+ (flutter.override { extraPkgConfigPackages = [ pkgs.libsecret ]; })
+ flutter_rust_bridge_codegen
+ # android.platform-tools
+ (pkgs.writeShellScriptBin "rustup" (builtins.readFile ./nix/fake-rustup.sh))
];
- env = {
- LIBCLANG_PATH = lib.makeLibraryPath [ pkgs.libclang ];
- LD_LIBRARY_PATH = "./build/native_assets/linux:${lib.makeLibraryPath [ pkgs.zlib ]}";
- CPATH = lib.makeSearchPath "include" [ pkgs.glibc.dev ];
- };
- in
- {
- default = pkgs.mkShell {
- inherit env;
- packages = packages ++ [
- pkgs.flutter
- ];
- };
+ env = rec {
+ LD_LIBRARY_PATH = "${
+ pkgs.lib.makeLibraryPath ([
+ pkgs.sqlite
+ ])
+ }:./build/linux/x64/debug/plugins/flutter_vodozemac:./build/linux/x64/debug/plugins/rust_lib_nexus";
- nix = pkgs.mkShell { inherit packages env; };
+ # ANDROID_HOME = "${android.androidsdk}/libexec/android-sdk";
+ # ANDROID_SDK_ROOT = ANDROID_HOME;
+ # JAVA_HOME = pkgs.jdk17;
+
+ # TOOLS = "${ANDROID_HOME}/build-tools/${"36.0.0"}";
+ # GRADLE_OPTS = "-Dorg.gradle.project.android.aapt2FromMavenOverride=${TOOLS}/aapt2";
+ };
};
};
};
diff --git a/flutter_rust_bridge.yaml b/flutter_rust_bridge.yaml
new file mode 100644
index 0000000..09dc36a
--- /dev/null
+++ b/flutter_rust_bridge.yaml
@@ -0,0 +1,3 @@
+rust_input: matrix-sdk
+rust_root: rust/
+dart_output: lib/src/rust
\ No newline at end of file
diff --git a/hook/build.dart b/hook/build.dart
deleted file mode 100644
index 4cb2f91..0000000
--- a/hook/build.dart
+++ /dev/null
@@ -1,54 +0,0 @@
-import "dart:io";
-import "package:hooks/hooks.dart";
-import "package:code_assets/code_assets.dart";
-
-Future main(List args) => build(args, (input, output) async {
- final buildDir = input.packageRoot.resolve("src/");
- if (await File(buildDir.resolve("lock").toFilePath()).exists()) return;
-
- final targetOS = input.config.code.targetOS;
- String libFileName;
- switch (targetOS) {
- case OS.linux:
- libFileName = "libgomuks.so";
- break;
- case OS.macOS:
- libFileName = "libgomuks.dylib";
- break;
- case OS.windows:
- libFileName = "libgomuks.dll";
- break;
- default:
- throw UnsupportedError("Unsupported OS: $targetOS");
- }
-
- final gomuksBuildDir = buildDir.resolve("gomuks/");
- final libFile = gomuksBuildDir.resolve(libFileName);
-
- print("Building Gomuks shared library $libFileName from source...");
- final result = await Process.run("go", [
- "build",
- "-o",
- libFile.path,
- "-buildmode=c-shared",
- ], workingDirectory: gomuksBuildDir.resolve("source/pkg/ffi/").toFilePath());
-
- if (result.exitCode != 0) {
- throw Exception("Failed to build Gomuks shared library\n${result.stderr}");
- }
-
- final generatedFile = "src/third_party/gomuks.g.dart";
- print("Adding $libFileName as asset...");
- output
- ..assets.code.add(
- CodeAsset(
- package: "nexus",
- name: generatedFile,
- linkMode: DynamicLoadingBundled(),
- file: libFile,
- ),
- )
- ..dependencies.add(libFile)
- ..dependencies.add(gomuksBuildDir);
- print("Done!");
-});
diff --git a/lib/controllers/account_data_controller.dart b/lib/controllers/account_data_controller.dart
deleted file mode 100644
index 125d7cf..0000000
--- a/lib/controllers/account_data_controller.dart
+++ /dev/null
@@ -1,16 +0,0 @@
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/models/account_data.dart";
-
-class AccountDataController extends Notifier> {
- @override
- IMap build() => const IMap.empty();
-
- void update(IMap newData) =>
- state = IMap({...state.unlock, ...newData.unlock});
-
- static final provider =
- NotifierProvider>(
- AccountDataController.new,
- );
-}
diff --git a/lib/controllers/avatar_controller.dart b/lib/controllers/avatar_controller.dart
new file mode 100644
index 0000000..1bb4c72
--- /dev/null
+++ b/lib/controllers/avatar_controller.dart
@@ -0,0 +1,17 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:matrix/matrix.dart";
+import "package:nexus/controllers/client_controller.dart";
+
+class AvatarController extends AsyncNotifier {
+ final String mxc;
+ AvatarController(this.mxc);
+ @override
+ Future build() async => Uri.parse(mxc).getThumbnailUri(
+ await ref.watch(ClientController.provider.future),
+ width: 24,
+ height: 24,
+ );
+
+ static final provider = AsyncNotifierProvider.family
+ .autoDispose(AvatarController.new);
+}
diff --git a/lib/controllers/client_controller.dart b/lib/controllers/client_controller.dart
index de6e909..9f69e8f 100644
--- a/lib/controllers/client_controller.dart
+++ b/lib/controllers/client_controller.dart
@@ -1,244 +1,106 @@
-import "dart:developer";
-import "dart:ffi";
-import "dart:isolate";
-import "package:collection/collection.dart";
-import "package:fast_immutable_collections/fast_immutable_collections.dart";
-import "package:ffi/ffi.dart";
+import "dart:convert";
+import "dart:io";
import "package:flutter/foundation.dart";
-import "package:nexus/controllers/account_data_controller.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-import "package:nexus/controllers/init_complete_controller.dart";
-import "package:nexus/controllers/rooms_controller.dart";
-import "package:nexus/controllers/space_edges_controller.dart";
-import "package:nexus/controllers/sync_status_controller.dart";
-import "package:nexus/controllers/top_level_spaces_controller.dart";
-import "package:nexus/helpers/extensions/gomuks_buffer.dart";
-import "package:nexus/models/client_state.dart";
-import "package:nexus/models/event.dart";
-import "package:nexus/models/paginate.dart";
-import "package:nexus/models/requests/get_event_request.dart";
-import "package:nexus/models/requests/get_related_events_request.dart";
-import "package:nexus/models/requests/get_room_state_request.dart";
-import "package:nexus/models/requests/join_room_request.dart";
-import "package:nexus/models/requests/login_request.dart";
-import "package:nexus/models/profile.dart";
-import "package:nexus/models/requests/paginate_request.dart";
-import "package:nexus/models/requests/redact_event_request.dart";
-import "package:nexus/models/requests/report_request.dart";
-import "package:nexus/models/requests/send_message_request.dart";
-import "package:nexus/models/room.dart";
-import "package:nexus/models/sync_data.dart";
-import "package:nexus/models/sync_status.dart";
-import "package:nexus/src/third_party/gomuks.g.dart";
+import "package:matrix/encryption.dart";
+import "package:nexus/controllers/database_controller.dart";
+import "package:vodozemac/vodozemac.dart" as vod;
+import "package:flutter_vodozemac/flutter_vodozemac.dart" as fl_vod;
+import "package:matrix/matrix.dart";
import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:nexus/controllers/secure_storage_controller.dart";
+import "package:nexus/models/session_backup.dart";
-class ClientController extends AsyncNotifier {
+class ClientController extends AsyncNotifier {
@override
- Future build() async {
- final handle = await Isolate.run(GomuksInit);
+ bool updateShouldNotify(
+ AsyncValue previous,
+ AsyncValue next,
+ ) =>
+ previous.hasValue != next.hasValue ||
+ previous.value?.accessToken != next.value?.accessToken;
+ static const sessionBackupKey = "sessionBackup";
- final callable =
- NativeCallable<
- Void Function(Pointer, Int64, GomuksOwnedBuffer)
- >.listener((
- Pointer command,
- int requestId,
- GomuksOwnedBuffer data,
- ) {
- try {
- final muksEventType = command.cast().toDartString();
- debugPrint("Handling $muksEventType...");
- final decodedMuksEvent = data.toJson();
-
- switch (muksEventType) {
- case "client_state":
- ref
- .watch(ClientStateController.provider.notifier)
- .set(ClientState.fromJson(decodedMuksEvent));
- break;
- case "sync_status":
- ref
- .watch(SyncStatusController.provider.notifier)
- .set(SyncStatus.fromJson(decodedMuksEvent));
- break;
- case "init_complete":
- ref.watch(InitCompleteController.provider.notifier).complete();
- break;
- case "sync_complete":
- final syncData = SyncData.fromJson(decodedMuksEvent);
- final roomProvider = RoomsController.provider;
- final accountDataProvider = AccountDataController.provider;
-
- if (syncData.clearState) {
- ref.invalidate(roomProvider);
- ref.invalidate(accountDataProvider);
- }
-
- ref
- .watch(roomProvider.notifier)
- .update(syncData.rooms, syncData.leftRooms);
- ref
- .watch(accountDataProvider.notifier)
- .update(syncData.accountData);
-
- if (syncData.topLevelSpaces != null) {
- ref
- .watch(TopLevelSpacesController.provider.notifier)
- .set(syncData.topLevelSpaces!);
- }
-
- if (syncData.spaceEdges != null) {
- ref
- .watch(SpaceEdgesController.provider.notifier)
- .set(syncData.spaceEdges!);
- }
-
- // ref
- // .watch(SyncStatusController.provider.notifier)
- // .set(SyncStatus.fromJson(decodedMuksEvent));
- break;
- default:
- debugPrint("Unhandled event: $muksEventType");
- }
- debugPrint("Finished handling $muksEventType...");
- } catch (error, stackTrace) {
- debugger();
- debugPrintStack(stackTrace: stackTrace, label: error.toString());
- }
- });
-
- ref.onDispose(() => GomuksDestroy(handle));
- ref.onDispose(callable.close);
-
- final errorCode = GomuksStart(handle, callable.nativeFunction);
-
- if (errorCode == 0) return handle;
- throw Exception("GomuksStart returned error code $errorCode");
- }
-
- Future _sendCommand(
- String command, [
- Map data = const {},
- ]) async {
- final bufferPointer = data.toGomuksBufferPtr();
- final handle = await future;
- final response = await Isolate.run(
- () => GomuksSubmitCommand(
- handle,
- command.toNativeUtf8().cast(),
- bufferPointer.ref,
+ @override
+ Future build() async {
+ if (!vod.isInitialized()) fl_vod.init();
+ final client = Client(
+ "nexus",
+ logLevel: kReleaseMode ? Level.warning : Level.verbose,
+ importantStateEvents: {"im.ponies.room_emotes"},
+ supportedLoginTypes: {AuthenticationTypes.password},
+ verificationMethods: {KeyVerificationMethod.emoji},
+ database: await MatrixSdkDatabase.init(
+ "nexus",
+ database: await ref.watch(DatabaseController.provider.future),
+ ),
+ nativeImplementations: NativeImplementationsIsolate(
+ compute,
+ vodozemacInit: fl_vod.init,
),
);
- calloc.free(bufferPointer);
+ final backupJson = await ref
+ .watch(SecureStorageController.provider.notifier)
+ .get(sessionBackupKey);
- final json = response.buf.toJson();
- if (json is String) throw json;
- return json;
+ if (backupJson != null) {
+ final backup = SessionBackup.fromJson(json.decode(backupJson));
+
+ await client.init(
+ waitForFirstSync: false,
+ newToken: backup.accessToken,
+ newHomeserver: backup.homeserver,
+ newUserID: backup.userID,
+ newDeviceID: backup.deviceID,
+ newDeviceName: backup.deviceName,
+ );
+ }
+
+ return client;
}
- Future redactEvent(RedactEventRequest report) =>
- _sendCommand("redact_event", report.toJson());
-
- Future sendMessage(SendMessageRequest request) =>
- _sendCommand("send_message", request.toJson());
-
- Future verify(String recoveryKey) async {
+ Future setHomeserver(Uri homeserverUrl) async {
+ final client = await future;
try {
- await _sendCommand("verify", {"recovery_key": recoveryKey});
+ await client.checkHomeserver(homeserverUrl);
return true;
- } catch (error) {
+ } catch (_) {
return false;
}
}
- Future joinRoom(JoinRoomRequest request) async {
- final response = await _sendCommand("join_room", request.toJson());
- return response["room_id"];
- }
-
- Future getAccessToken() async {
- final response = await _sendCommand("get_account_info", {});
- return response?["access_token"];
- }
-
- Future leaveRoom(Room room) async {
- if (room.metadata == null) return;
- await _sendCommand("leave_room", {"room_id": room.metadata!.id});
- }
-
- // (await _sendCommand("get_event_context", {
- // "room_id": request.roomId,
- // "event_id": r"$OqZT4NuTj0J1-771IOEEWRI4XdumRNu6ighlvO3K3gc",
- // }));
-
- Future> getRoomState(GetRoomStateRequest request) async {
- final response =
- (await _sendCommand("get_room_state", request.toJson())) as List;
- return response.map((event) => Event.fromJson(event)).toIList();
- }
-
- Future?> getRelatedEvents(
- GetRelatedEventsRequest request,
- ) async {
- final response =
- (await _sendCommand("get_related_events", request.toJson())) as List?;
- return response?.map((event) => Event.fromJson(event)).toIList();
- }
-
- Future getEvent(GetEventRequest request) async {
- final event = request.room.events.firstWhereOrNull(
- (event) => event.eventId == request.eventId,
- );
- if (event != null) return event;
-
- final json = await _sendCommand("get_event", request.toJson());
- return json == null ? null : Event.fromJson(json);
- }
-
- Future paginate(PaginateRequest request) async =>
- Paginate.fromJson(await _sendCommand("paginate", request.toJson()));
-
- Future getProfile(String userId) async =>
- Profile.fromJson(await _sendCommand("get_profile", {"user_id": userId}));
-
- Future reportEvent(ReportRequest report) =>
- _sendCommand("report_event", report.toJson());
-
- Future markRead(Room room) async {
- final event = room.events.firstWhereOrNull(
- (event) => event.rowId == room.timeline.last.eventRowId,
- );
- if (event == null || room.metadata == null) return;
-
- await _sendCommand("mark_read", {
- "room_id": room.metadata!.id,
- "receipt_type": "m.read",
- "event_id": event.eventId,
- });
- }
-
- Future login(LoginRequest login) async {
+ Future login(String username, String password) async {
+ final client = await future;
try {
- await _sendCommand("login", login.toJson());
+ final deviceName = "Nexus Client login on ${Platform.localHostname}";
+ final details = await MatrixApi(homeserver: client.homeserver).login(
+ LoginType.mLoginPassword,
+ initialDeviceDisplayName: deviceName,
+ identifier: AuthenticationUserIdentifier(user: username),
+ password: password,
+ );
+ await ref
+ .watch(SecureStorageController.provider.notifier)
+ .set(
+ sessionBackupKey,
+ json.encode(
+ SessionBackup(
+ accessToken: details.accessToken,
+ homeserver: client.homeserver!,
+ userID: details.userId,
+ deviceID: details.deviceId,
+ deviceName: deviceName,
+ ).toJson(),
+ ),
+ );
+ ref.invalidateSelf(asReload: true);
return true;
- } catch (error) {
+ } catch (_) {
return false;
}
}
- Future discoverHomeserver(Uri homeserver) async {
- try {
- final response = await _sendCommand("discover_homeserver", {
- "user_id": "@fakeuser:${homeserver.host}",
- });
- return response["m.homeserver"]?["base_url"];
- } catch (error) {
- return null;
- }
- }
-
- static final provider = AsyncNotifierProvider(
+ static final provider = AsyncNotifierProvider(
ClientController.new,
);
}
diff --git a/lib/controllers/client_state_controller.dart b/lib/controllers/client_state_controller.dart
deleted file mode 100644
index 998d4a1..0000000
--- a/lib/controllers/client_state_controller.dart
+++ /dev/null
@@ -1,15 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/models/client_state.dart";
-
-class ClientStateController extends Notifier {
- @override
- Null build() => null;
-
- void set(ClientState newState) {
- state = newState;
- }
-
- static final provider = NotifierProvider(
- ClientStateController.new,
- );
-}
diff --git a/lib/controllers/database_controller.dart b/lib/controllers/database_controller.dart
new file mode 100644
index 0000000..706560b
--- /dev/null
+++ b/lib/controllers/database_controller.dart
@@ -0,0 +1,18 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:path/path.dart";
+import "package:path_provider/path_provider.dart";
+import "package:sqflite_common_ffi/sqflite_ffi.dart";
+
+class DatabaseController extends AsyncNotifier {
+ @override
+ Future build() async {
+ databaseFactory = databaseFactoryFfi;
+ return databaseFactoryFfi.openDatabase(
+ join((await getApplicationSupportDirectory()).path, "database.db"),
+ );
+ }
+
+ static final provider = AsyncNotifierProvider(
+ DatabaseController.new,
+ );
+}
diff --git a/lib/controllers/event_controller.dart b/lib/controllers/event_controller.dart
deleted file mode 100644
index 4f72963..0000000
--- a/lib/controllers/event_controller.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/models/event.dart";
-import "package:nexus/models/requests/get_event_request.dart";
-
-class EventController extends AsyncNotifier {
- final GetEventRequest request;
- EventController(this.request);
-
- @override
- Future build() async {
- final client = ref.watch(ClientController.provider.notifier);
- return await client.getEvent(request).onError((_, _) => null);
- }
-
- static final provider = AsyncNotifierProvider.family
- .autoDispose(
- EventController.new,
- );
-}
diff --git a/lib/controllers/events_controller.dart b/lib/controllers/events_controller.dart
new file mode 100644
index 0000000..e7a192d
--- /dev/null
+++ b/lib/controllers/events_controller.dart
@@ -0,0 +1,18 @@
+import "package:flutter_riverpod/flutter_riverpod.dart";
+import "package:matrix/matrix.dart";
+
+class EventsController extends AsyncNotifier {
+ EventsController(this.room);
+ final Room room;
+
+ @override
+ Future build({String? from}) => room.getTimeline();
+
+ Future prev() async {
+ final timeline = await future;
+ await timeline.requestHistory();
+ }
+
+ static final provider = AsyncNotifierProvider.autoDispose
+ .family(EventsController.new);
+}
diff --git a/lib/controllers/header_controller.dart b/lib/controllers/header_controller.dart
deleted file mode 100644
index 295cf04..0000000
--- a/lib/controllers/header_controller.dart
+++ /dev/null
@@ -1,20 +0,0 @@
-import "package:flutter_riverpod/flutter_riverpod.dart";
-import "package:nexus/controllers/client_controller.dart";
-import "package:nexus/controllers/client_state_controller.dart";
-
-class HeaderController extends AsyncNotifier