diff --git a/LICENSES/AGPL-3.0-or-later.txt b/LICENSES/AGPL-3.0-or-later.txt deleted file mode 100644 index 0c97efd..0000000 --- a/LICENSES/AGPL-3.0-or-later.txt +++ /dev/null @@ -1,235 +0,0 @@ -GNU AFFERO GENERAL PUBLIC LICENSE -Version 3, 19 November 2007 - -Copyright (C) 2007 Free Software Foundation, Inc. - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - - Preamble - -The GNU Affero General Public License is a free, copyleft license for software and other kinds of works, specifically designed to ensure cooperation with the community in the case of network server software. - -The licenses for most software and other practical works are designed to take away your freedom to share and change the works. By contrast, our General Public Licenses are intended to guarantee your freedom to share and change all versions of a program--to make sure it remains free software for all its users. - -When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for them if you wish), that you receive source code or can get it if you want it, that you can change the software or use pieces of it in new free programs, and that you know you can do these things. - -Developers that use our General Public Licenses protect your rights with two steps: (1) assert copyright on the software, and (2) offer you this License which gives you legal permission to copy, distribute and/or modify the software. - -A secondary benefit of defending all users' freedom is that improvements made in alternate versions of the program, if they receive widespread use, become available for other developers to incorporate. Many developers of free software are heartened and encouraged by the resulting cooperation. However, in the case of software used on network servers, this result may fail to come about. The GNU General Public License permits making a modified version and letting the public access it on a server without ever releasing its source code to the public. - -The GNU Affero General Public License is designed specifically to ensure that, in such cases, the modified source code becomes available to the community. It requires the operator of a network server to provide the source code of the modified version running there to the users of that server. Therefore, public use of a modified version, on a publicly accessible server, gives the public access to the source code of the modified version. - -An older license, called the Affero General Public License and published by Affero, was designed to accomplish similar goals. This is a different license, not a version of the Affero GPL, but Affero has released a new version of the Affero GPL which permits relicensing under this license. - -The precise terms and conditions for copying, distribution and modification follow. - - TERMS AND CONDITIONS - -0. Definitions. - -"This License" refers to version 3 of the GNU Affero General Public License. - -"Copyright" also means copyright-like laws that apply to other kinds of works, such as semiconductor masks. - -"The Program" refers to any copyrightable work licensed under this License. Each licensee is addressed as "you". "Licensees" and "recipients" may be individuals or organizations. - -To "modify" a work means to copy from or adapt all or part of the work in a fashion requiring copyright permission, other than the making of an exact copy. The resulting work is called a "modified version" of the earlier work or a work "based on" the earlier work. - -A "covered work" means either the unmodified Program or a work based on the Program. - -To "propagate" a work means to do anything with it that, without permission, would make you directly or secondarily liable for infringement under applicable copyright law, except executing it on a computer or modifying a private copy. Propagation includes copying, distribution (with or without modification), making available to the public, and in some countries other activities as well. - -To "convey" a work means any kind of propagation that enables other parties to make or receive copies. Mere interaction with a user through a computer network, with no transfer of a copy, is not conveying. - -An interactive user interface displays "Appropriate Legal Notices" to the extent that it includes a convenient and prominently visible feature that (1) displays an appropriate copyright notice, and (2) tells the user that there is no warranty for the work (except to the extent that warranties are provided), that licensees may convey the work under this License, and how to view a copy of this License. If the interface presents a list of user commands or options, such as a menu, a prominent item in the list meets this criterion. - -1. Source Code. -The "source code" for a work means the preferred form of the work for making modifications to it. "Object code" means any non-source form of a work. - -A "Standard Interface" means an interface that either is an official standard defined by a recognized standards body, or, in the case of interfaces specified for a particular programming language, one that is widely used among developers working in that language. - -The "System Libraries" of an executable work include anything, other than the work as a whole, that (a) is included in the normal form of packaging a Major Component, but which is not part of that Major Component, and (b) serves only to enable use of the work with that Major Component, or to implement a Standard Interface for which an implementation is available to the public in source code form. A "Major Component", in this context, means a major essential component (kernel, window system, and so on) of the specific operating system (if any) on which the executable work runs, or a compiler used to produce the work, or an object code interpreter used to run it. - -The "Corresponding Source" for a work in object code form means all the source code needed to generate, install, and (for an executable work) run the object code and to modify the work, including scripts to control those activities. However, it does not include the work's System Libraries, or general-purpose tools or generally available free programs which are used unmodified in performing those activities but which are not part of the work. For example, Corresponding Source includes interface definition files associated with source files for the work, and the source code for shared libraries and dynamically linked subprograms that the work is specifically designed to require, such as by intimate data communication or control flow between those -subprograms and other parts of the work. - -The Corresponding Source need not include anything that users can regenerate automatically from other parts of the Corresponding Source. - -The Corresponding Source for a work in source code form is that same work. - -2. Basic Permissions. -All rights granted under this License are granted for the term of copyright on the Program, and are irrevocable provided the stated conditions are met. This License explicitly affirms your unlimited permission to run the unmodified Program. The output from running a covered work is covered by this License only if the output, given its content, constitutes a covered work. This License acknowledges your rights of fair use or other equivalent, as provided by copyright law. - -You may make, run and propagate covered works that you do not convey, without conditions so long as your license otherwise remains in force. You may convey covered works to others for the sole purpose of having them make modifications exclusively for you, or provide you with facilities for running those works, provided that you comply with the terms of this License in conveying all material for which you do not control copyright. Those thus making or running the covered works for you must do so exclusively on your behalf, under your direction and control, on terms that prohibit them from making any copies of your copyrighted material outside their relationship with you. - -Conveying under any other circumstances is permitted solely under the conditions stated below. Sublicensing is not allowed; section 10 makes it unnecessary. - -3. Protecting Users' Legal Rights From Anti-Circumvention Law. -No covered work shall be deemed part of an effective technological measure under any applicable law fulfilling obligations under article 11 of the WIPO copyright treaty adopted on 20 December 1996, or similar laws prohibiting or restricting circumvention of such measures. - -When you convey a covered work, you waive any legal power to forbid circumvention of technological measures to the extent such circumvention is effected by exercising rights under this License with respect to the covered work, and you disclaim any intention to limit operation or modification of the work as a means of enforcing, against the work's users, your or third parties' legal rights to forbid circumvention of technological measures. - -4. Conveying Verbatim Copies. -You may convey verbatim copies of the Program's source code as you receive it, in any medium, provided that you conspicuously and appropriately publish on each copy an appropriate copyright notice; keep intact all notices stating that this License and any non-permissive terms added in accord with section 7 apply to the code; keep intact all notices of the absence of any warranty; and give all recipients a copy of this License along with the Program. - -You may charge any price or no price for each copy that you convey, and you may offer support or warranty protection for a fee. - -5. Conveying Modified Source Versions. -You may convey a work based on the Program, or the modifications to produce it from the Program, in the form of source code under the terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is released under this License and any conditions added under section 7. This requirement modifies the requirement in section 4 to "keep intact all notices". - - c) You must license the entire work, as a whole, under this License to anyone who comes into possession of a copy. This License will therefore apply, along with any applicable section 7 additional terms, to the whole of the work, and all its parts, regardless of how they are packaged. This License gives no permission to license the work in any other way, but it does not invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display Appropriate Legal Notices; however, if the Program has interactive interfaces that do not display Appropriate Legal Notices, your work need not make them do so. - -A compilation of a covered work with other separate and independent works, which are not by their nature extensions of the covered work, and which are not combined with it such as to form a larger program, in or on a volume of a storage or distribution medium, is called an "aggregate" if the compilation and its resulting copyright are not used to limit the access or legal rights of the compilation's users beyond what the individual works permit. Inclusion of a covered work in an aggregate does not cause this License to apply to the other parts of the aggregate. - -6. Conveying Non-Source Forms. -You may convey a covered work in object code form under the terms of sections 4 and 5, provided that you also convey the machine-readable Corresponding Source under the terms of this License, in one of these ways: - - a) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by the Corresponding Source fixed on a durable physical medium customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product (including a physical distribution medium), accompanied by a written offer, valid for at least three years and valid for as long as you offer spare parts or customer support for that product model, to give anyone who possesses the object code either (1) a copy of the Corresponding Source for all the software in the product that is covered by this License, on a durable physical medium customarily used for software interchange, for a price no more than your reasonable cost of physically performing this conveying of source, or (2) access to copy the Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the written offer to provide the Corresponding Source. This alternative is allowed only occasionally and noncommercially, and only if you received the object code with such an offer, in accord with subsection 6b. - - d) Convey the object code by offering access from a designated place (gratis or for a charge), and offer equivalent access to the Corresponding Source in the same way through the same place at no further charge. You need not require recipients to copy the Corresponding Source along with the object code. If the place to copy the object code is a network server, the Corresponding Source may be on a different server (operated by you or a third party) that supports equivalent copying facilities, provided you maintain clear directions next to the object code saying where to find the Corresponding Source. Regardless of what server hosts the Corresponding Source, you remain obligated to ensure that it is available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided you inform other peers where the object code and Corresponding Source of the work are being offered to the general public at no charge under subsection 6d. - -A separable portion of the object code, whose source code is excluded from the Corresponding Source as a System Library, need not be included in conveying the object code work. - -A "User Product" is either (1) a "consumer product", which means any tangible personal property which is normally used for personal, family, or household purposes, or (2) anything designed or sold for incorporation into a dwelling. In determining whether a product is a consumer product, doubtful cases shall be resolved in favor of coverage. For a particular product received by a particular user, "normally used" refers to a typical or common use of that class of product, regardless of the status of the particular user or of the way in which the particular user actually uses, or expects or is expected to use, the product. A product is a consumer product regardless of whether the product has substantial commercial, industrial or non-consumer uses, unless such uses represent the only significant mode of use of the product. - -"Installation Information" for a User Product means any methods, procedures, authorization keys, or other information required to install and execute modified versions of a covered work in that User Product from a modified version of its Corresponding Source. The information must suffice to ensure that the continued functioning of the modified object code is in no case prevented or interfered with solely because modification has been made. - -If you convey an object code work under this section in, or with, or specifically for use in, a User Product, and the conveying occurs as part of a transaction in which the right of possession and use of the User Product is transferred to the recipient in perpetuity or for a fixed term (regardless of how the transaction is characterized), the Corresponding Source conveyed under this section must be accompanied by the Installation Information. But this requirement does not apply if neither you nor any third party retains the ability to install modified object code on the User Product (for example, the work has been installed in ROM). - -The requirement to provide Installation Information does not include a requirement to continue to provide support service, warranty, or updates for a work that has been modified or installed by the recipient, or for the User Product in which it has been modified or installed. Access to a network may be denied when the modification itself materially and adversely affects the operation of the network or violates the rules and protocols for communication across the network. - -Corresponding Source conveyed, and Installation Information provided, in accord with this section must be in a format that is publicly documented (and with an implementation available to the public in source code form), and must require no special password or key for unpacking, reading or copying. - -7. Additional Terms. -"Additional permissions" are terms that supplement the terms of this License by making exceptions from one or more of its conditions. Additional permissions that are applicable to the entire Program shall be treated as though they were included in this License, to the extent that they are valid under applicable law. If additional permissions apply only to part of the Program, that part may be used separately under those permissions, but the entire Program remains governed by this License without regard to the additional permissions. - -When you convey a copy of a covered work, you may at your option remove any additional permissions from that copy, or from any part of it. (Additional permissions may be written to require their own removal in certain cases when you modify the work.) You may place additional permissions on material, added by you to a covered work, for which you have or can give appropriate copyright permission. - -Notwithstanding any other provision of this License, for material you add to a covered work, you may (if authorized by the copyright holders of that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or author attributions in that material or in the Appropriate Legal Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or requiring that modified versions of such material be marked in reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or authors of the material; or - - e) Declining to grant rights under trademark law for use of some trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that material by anyone who conveys the material (or modified versions of it) with contractual assumptions of liability to the recipient, for any liability that these contractual assumptions directly impose on those licensors and authors. - -All other non-permissive additional terms are considered "further restrictions" within the meaning of section 10. If the Program as you received it, or any part of it, contains a notice stating that it is governed by this License along with a term that is a further restriction, you may remove that term. If a license document contains a further restriction but permits relicensing or conveying under this License, you may add to a covered work material governed by the terms of that license document, provided that the further restriction does not survive such relicensing or conveying. - -If you add terms to a covered work in accord with this section, you must place, in the relevant source files, a statement of the additional terms that apply to those files, or a notice indicating where to find the applicable terms. - -Additional terms, permissive or non-permissive, may be stated in the form of a separately written license, or stated as exceptions; the above requirements apply either way. - -8. Termination. - -You may not propagate or modify a covered work except as expressly provided under this License. Any attempt otherwise to propagate or modify it is void, and will automatically terminate your rights under this License (including any patent licenses granted under the third paragraph of section 11). - -However, if you cease all violation of this License, then your license from a particular copyright holder is reinstated (a) provisionally, unless and until the copyright holder explicitly and finally terminates your license, and (b) permanently, if the copyright holder fails to notify you of the violation by some reasonable means prior to 60 days after the cessation. - -Moreover, your license from a particular copyright holder is reinstated permanently if the copyright holder notifies you of the violation by some reasonable means, this is the first time you have received notice of violation of this License (for any work) from that copyright holder, and you cure the violation prior to 30 days after your receipt of the notice. - -Termination of your rights under this section does not terminate the licenses of parties who have received copies or rights from you under this License. If your rights have been terminated and not permanently reinstated, you do not qualify to receive new licenses for the same material under section 10. - -9. Acceptance Not Required for Having Copies. - -You are not required to accept this License in order to receive or run a copy of the Program. Ancillary propagation of a covered work occurring solely as a consequence of using peer-to-peer transmission to receive a copy likewise does not require acceptance. However, nothing other than this License grants you permission to propagate or modify any covered work. These actions infringe copyright if you do not accept this License. Therefore, by modifying or propagating a covered work, you indicate your acceptance of this License to do so. - -10. Automatic Licensing of Downstream Recipients. - -Each time you convey a covered work, the recipient automatically receives a license from the original licensors, to run, modify and propagate that work, subject to this License. You are not responsible for enforcing compliance by third parties with this License. - -An "entity transaction" is a transaction transferring control of an organization, or substantially all assets of one, or subdividing an organization, or merging organizations. If propagation of a covered work results from an entity transaction, each party to that transaction who receives a copy of the work also receives whatever licenses to the work the party's predecessor in interest had or could give under the previous paragraph, plus a right to possession of the Corresponding Source of the work from the predecessor in interest, if the predecessor has it or can get it with reasonable efforts. - -You may not impose any further restrictions on the exercise of the rights granted or affirmed under this License. For example, you may not impose a license fee, royalty, or other charge for exercise of rights granted under this License, and you may not initiate litigation (including a cross-claim or counterclaim in a lawsuit) alleging that any patent claim is infringed by making, using, selling, offering for sale, or importing the Program or any portion of it. - -11. Patents. - -A "contributor" is a copyright holder who authorizes use under this License of the Program or a work on which the Program is based. The work thus licensed is called the contributor's "contributor version". - -A contributor's "essential patent claims" are all patent claims owned or controlled by the contributor, whether already acquired or hereafter acquired, that would be infringed by some manner, permitted by this License, of making, using, or selling its contributor version, but do not include claims that would be infringed only as a consequence of further modification of the contributor version. For purposes of this definition, "control" includes the right to grant patent sublicenses in a manner consistent with the requirements of this License. - -Each contributor grants you a non-exclusive, worldwide, royalty-free patent license under the contributor's essential patent claims, to make, use, sell, offer for sale, import and otherwise run, modify and propagate the contents of its contributor version. - -In the following three paragraphs, a "patent license" is any express agreement or commitment, however denominated, not to enforce a patent (such as an express permission to practice a patent or covenant not to sue for patent infringement). To "grant" such a patent license to a party means to make such an agreement or commitment not to enforce a patent against the party. - -If you convey a covered work, knowingly relying on a patent license, and the Corresponding Source of the work is not available for anyone to copy, free of charge and under the terms of this License, through a publicly available network server or other readily accessible means, then you must either (1) cause the Corresponding Source to be so available, or (2) arrange to deprive yourself of the benefit of the patent license for this particular work, or (3) arrange, in a manner consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have actual knowledge that, but for the patent license, your conveying the covered work in a country, or your recipient's use of the covered work in a country, would infringe one or more identifiable patents in that country that you have reason to believe are valid. - -If, pursuant to or in connection with a single transaction or arrangement, you convey, or propagate by procuring conveyance of, a covered work, and grant a patent license to some of the parties receiving the covered work authorizing them to use, propagate, modify or convey a specific copy of the covered work, then the patent license you grant is automatically extended to all recipients of the covered work and works based on it. - -A patent license is "discriminatory" if it does not include within the scope of its coverage, prohibits the exercise of, or is conditioned on the non-exercise of one or more of the rights that are specifically granted under this License. You may not convey a covered work if you are a party to an arrangement with a third party that is in the business of distributing software, under which you make payment to the third party based on the extent of your activity of conveying the work, and under which the third party grants, to any of the parties who would receive the covered work from you, a discriminatory patent license (a) in connection with copies of the covered work conveyed by you (or copies made from those copies), or (b) primarily for and in connection with specific products or compilations that contain the covered work, unless you entered into that arrangement, or that patent license was granted, prior to 28 March 2007. - -Nothing in this License shall be construed as excluding or limiting any implied license or other defenses to infringement that may otherwise be available to you under applicable patent law. - -12. No Surrender of Others' Freedom. - -If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot convey a covered work so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you to collect a royalty for further conveying from those to whom you convey the Program, the only way you could satisfy both those terms and this License would be to refrain entirely from conveying the Program. - -13. Remote Network Interaction; Use with the GNU General Public License. - -Notwithstanding any other provision of this License, if you modify the Program, your modified version must prominently offer all users interacting with it remotely through a computer network (if your version supports such interaction) an opportunity to receive the Corresponding Source of your version by providing access to the Corresponding Source from a network server at no charge, through some standard or customary means of facilitating copying of software. This Corresponding Source shall include the Corresponding Source for any work covered by version 3 of the GNU General Public License that is incorporated pursuant to the following paragraph. - -Notwithstanding any other provision of this License, you have permission to link or combine any covered work with a work licensed under version 3 of the GNU General Public License into a single combined work, and to convey the resulting work. The terms of this License will continue to apply to the part which is the covered work, but the work with which it is combined will remain governed by version 3 of the GNU General Public License. - -14. Revised Versions of this License. - -The Free Software Foundation may publish revised and/or new versions of the GNU Affero General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. - -Each version is given a distinguishing version number. If the Program specifies that a certain numbered version of the GNU Affero General Public License "or any later version" applies to it, you have the option of following the terms and conditions either of that numbered version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of the GNU Affero General Public License, you may choose any version ever published by the Free Software Foundation. - -If the Program specifies that a proxy can decide which future versions of the GNU Affero General Public License can be used, that proxy's public statement of acceptance of a version permanently authorizes you to choose that version for the Program. - -Later license versions may give you additional or different permissions. However, no additional obligations are imposed on any author or copyright holder as a result of your choosing to follow a later version. - -15. Disclaimer of Warranty. - -THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - -16. Limitation of Liability. - -IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. - -17. Interpretation of Sections 15 and 16. - -If the disclaimer of warranty and limitation of liability provided above cannot be given local legal effect according to their terms, reviewing courts shall apply local law that most closely approximates an absolute waiver of all civil liability in connection with the Program, unless a warranty or assumption of liability accompanies a copy of the Program in return for a fee. - -END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - -If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. - -To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version. - - This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - -If your software can interact with users remotely through a computer network, you should also make sure that it provides a way for users to get its source. For example, if your program is a web application, its interface could display a "Source" link that leads users to an archive of the code. There are many ways you could offer source, and different solutions will be better for different programs; see section 13 for the specific requirements. - -You should also get your employer (if you work as a programmer) or school, if any, to sign a "copyright disclaimer" for the program, if necessary. For more information on this, and how to apply and follow the GNU AGPL, see . diff --git a/LICENSES/GPL-2.0-only.txt b/LICENSES/GPL-2.0-only.txt deleted file mode 100644 index 17cb286..0000000 --- a/LICENSES/GPL-2.0-only.txt +++ /dev/null @@ -1,117 +0,0 @@ -GNU GENERAL PUBLIC LICENSE -Version 2, June 1991 - -Copyright (C) 1989, 1991 Free Software Foundation, Inc. -51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA - -Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - -Preamble - -The licenses for most software are designed to take away your freedom to share and change it. By contrast, the GNU General Public License is intended to guarantee your freedom to share and change free software--to make sure the software is free for all its users. This General Public License applies to most of the Free Software Foundation's software and to any other program whose authors commit to using it. (Some other Free Software Foundation software is covered by the GNU Lesser General Public License instead.) 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 this service 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 make restrictions that forbid anyone to deny you these rights or to ask you to surrender the rights. These restrictions translate to certain responsibilities for you if you distribute copies of the software, or if you modify it. - -For example, if you distribute copies of such a program, whether gratis or for a fee, you must give the recipients all the rights that you have. 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. - -We protect your rights with two steps: (1) copyright the software, and (2) offer you this license which gives you legal permission to copy, distribute and/or modify the software. - -Also, for each author's protection and ours, we want to make certain that everyone understands that there is no warranty for this free software. If the software is modified by someone else and passed on, we want its recipients to know that what they have is not the original, so that any problems introduced by others will not reflect on the original authors' reputations. - -Finally, any free program is threatened constantly by software patents. We wish to avoid the danger that redistributors of a free program will individually obtain patent licenses, in effect making the program proprietary. To prevent this, we have made it clear that any patent must be licensed for everyone's free use or not licensed at all. - -The precise terms and conditions for copying, distribution and modification follow. - -TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - -0. This License applies to any program or other work which contains a notice placed by the copyright holder saying it may be distributed under the terms of this General Public License. The "Program", below, refers to any such program or work, and a "work based on the Program" means either the Program or any derivative work under copyright law: that is to say, a work containing the Program or a portion of it, either verbatim or with modifications and/or translated into another language. (Hereinafter, translation is included without limitation in the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not covered by this License; they are outside its scope. The act of running the Program is not restricted, and the output from the Program is covered only if its contents constitute a work based on the Program (independent of having been made by running the Program). Whether that is true depends on what the Program does. - -1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the notices that refer to this License and to the absence of any warranty; and give any other recipients of the Program a copy of this License along with the Program. - -You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - -2. You may modify your copy or copies of the Program or any portion of it, thus forming a work based on the Program, and copy and distribute such modifications or work under the terms of Section 1 above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in whole or in part contains or is derived from the Program or any part thereof, to be licensed as a whole at no charge to all third parties under the terms of this License. - - c) If the modified program normally reads commands interactively when run, you must cause it, when started running for such interactive use in the most ordinary way, to print or display an announcement including an appropriate copyright notice and a notice that there is no warranty (or else, saying that you provide a warranty) and that users may redistribute the program under these conditions, and telling the user how to view a copy of this License. (Exception: if the Program itself is interactive but does not normally print such an announcement, your work based on the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If identifiable sections of that work are not derived from the Program, and can be reasonably considered independent and separate works in themselves, then this License, and its terms, do not apply to those sections when you distribute them as separate works. But when you distribute the same sections as part of a whole which is a work based on the Program, the distribution of the whole must be on the terms of this License, whose permissions for other licensees extend to the entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest your rights to work written entirely by you; rather, the intent is to exercise the right to control the distribution of derivative or collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program with the Program (or with a work based on the Program) on a volume of a storage or distribution medium does not bring the other work under the scope of this License. - -3. You may copy and distribute the Program (or a work based on it, under Section 2) in object code or executable form under the terms of Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable source code, which must be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three years, to give any third party, for a charge no more than your cost of physically performing source distribution, a complete machine-readable copy of the corresponding source code, to be distributed under the terms of Sections 1 and 2 above on a medium customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer to distribute corresponding source code. (This alternative is allowed only for noncommercial distribution and only if you received the program in object code or executable form with such an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for making modifications to it. For an executable work, complete source code means all the source code for all modules it contains, plus any associated interface definition files, plus the scripts used to control compilation and installation of the executable. However, as a special exception, the source code distributed need not include anything that is normally distributed (in either source or binary form) with the major components (compiler, kernel, and so on) of the operating system on which the executable runs, unless that component itself accompanies the executable. - -If distribution of executable or object code is made by offering access to copy from a designated place, then offering equivalent access to copy the source code from the same place counts as distribution of the source code, even though third parties are not compelled to copy the source along with the object code. - -4. You may not copy, modify, sublicense, or distribute the Program except as expressly provided under this License. Any attempt otherwise to copy, modify, sublicense or distribute the Program is void, and will automatically terminate your rights under this License. However, parties who have received copies, or rights, from you under this License will not have their licenses terminated so long as such parties remain in full compliance. - -5. You are not required to accept this License, since you have not signed it. However, nothing else grants you permission to modify or distribute the Program or its derivative works. These actions are prohibited by law if you do not accept this License. Therefore, by modifying or distributing the Program (or any work based on the Program), you indicate your acceptance of this License to do so, and all its terms and conditions for copying, distributing or modifying the Program or works based on it. - -6. Each time you redistribute the Program (or any work based on the Program), the recipient automatically receives a license from the original licensor to copy, distribute or modify the Program subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties to this License. - -7. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not excuse you from the conditions of this License. If you cannot distribute so as to satisfy simultaneously your obligations under this License and any other pertinent obligations, then as a consequence you may not distribute the Program at all. For example, if a patent license would not permit royalty-free redistribution of the Program by all those who receive copies directly or indirectly through you, then the only way you could satisfy both it and this License would be to refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under any particular circumstance, the balance of the section is intended to apply and the section as a whole is intended to apply in other circumstances. - -It is not the purpose of this section to induce you to infringe any patents or other property right claims or to contest validity of any such claims; this section has the sole purpose of protecting the integrity of the free software distribution system, which is implemented by public license practices. Many people have made generous contributions to the wide range of software distributed through that system in reliance on consistent application of that system; it is up to the author/donor to decide if he or she is willing to distribute software through any other system and a licensee cannot impose that choice. - -This section is intended to make thoroughly clear what is believed to be a consequence of the rest of this License. - -8. If the distribution and/or use of the Program is restricted in certain countries either by patents or by copyrighted interfaces, the original copyright holder who places the Program under this License may add an explicit geographical distribution limitation excluding those countries, so that distribution is permitted only in or among countries not thus excluded. In such case, this License incorporates the limitation as if written in the body of this License. - -9. The Free Software Foundation may publish revised and/or new versions of the 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 a version number of this License which applies to it and "any later version", you have the option of following the terms and conditions either of that version or of any later version published by the Free Software Foundation. If the Program does not specify a version number of this License, you may choose any version ever published by the Free Software Foundation. - -10. If you wish to incorporate parts of the Program into other free programs whose distribution conditions are different, write to the author to ask for permission. For software which is copyrighted by the Free Software Foundation, write to the Free Software Foundation; we sometimes make exceptions for this. Our decision will be guided by the two goals of preserving the free status of all derivatives of our free software and of promoting the sharing and reuse of software generally. - -NO WARRANTY - -11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. - -12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR REDISTRIBUTE THE 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. - -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 convey the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. - - one line to give the program's name and an idea of what it does. Copyright (C) yyyy name of author - - This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 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, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author Gnomovision 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, the commands you use may be called something other than `show w' and `show c'; they could even be mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your school, if any, to sign a "copyright disclaimer" for the program, if necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program `Gnomovision' (which makes passes at compilers) written by James Hacker. - -signature of Ty Coon, 1 April 1989 Ty Coon, President of Vice diff --git a/app/build.gradle b/app/build.gradle index 90e1578..55fd1eb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,9 +13,9 @@ import com.github.spotbugs.snom.Effort import com.github.spotbugs.snom.SpotBugsTask plugins { - id "org.jetbrains.kotlin.plugin.compose" version "2.2.20" + id "org.jetbrains.kotlin.plugin.compose" version "2.2.0" id "org.jetbrains.kotlin.kapt" - id 'com.google.devtools.ksp' version '2.2.20-2.0.3' + id 'com.google.devtools.ksp' version '2.2.0-2.0.2' } apply plugin: 'com.android.application' @@ -28,22 +28,22 @@ apply plugin: "org.jlleitschuh.gradle.ktlint" apply plugin: 'kotlinx-serialization' android { - compileSdkVersion 35 + compileSdk 35 - namespace = 'com.nextcloud.talk' + namespace 'com.nextcloud.talk' defaultConfig { minSdkVersion 26 targetSdkVersion 35 - testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" // mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable) // xx .xxx .xx .xx - versionCode 230000005 - versionName "23.0.0 Alpha 05" + versionCode 210020090 + versionName "21.2.0" flavorDimensions "default" - renderscriptTargetApi = 19 + renderscriptTargetApi 19 renderscriptSupportModeEnabled true productFlavors { @@ -65,7 +65,7 @@ android { } // Enabling multidex support. - multiDexEnabled = true + multiDexEnabled true vectorDrawables.useSupportLibrary = true @@ -82,11 +82,6 @@ android { } } - sourceSets { - // Adds exported schema location as test app assets. - getByName("androidTest").assets.srcDir("$projectDir/schemas") - } - testInstrumentationRunnerArgument "TEST_SERVER_URL", "${NC_TEST_SERVER_BASEURL}" testInstrumentationRunnerArgument "TEST_SERVER_USERNAME", "${NC_TEST_SERVER_USERNAME}" testInstrumentationRunnerArgument "TEST_SERVER_PASSWORD", "${NC_TEST_SERVER_PASSWORD}" @@ -100,7 +95,6 @@ android { unitTests.all { useJUnitPlatform() } - unitTests.returnDefaultValues = true } buildTypes { @@ -135,7 +129,7 @@ android { } buildFeatures { - viewBinding = true + viewBinding true buildConfig = true compose = true } @@ -145,10 +139,10 @@ android { } lint { - abortOnError = false + abortOnError false disable 'MissingTranslation','PrivateResource' - htmlOutput = layout.buildDirectory.file("reports/lint/lint.html").get().asFile - htmlReport = true + htmlOutput file("$project.buildDir/reports/lint/lint.html") + htmlReport true } } kapt { @@ -156,23 +150,23 @@ kapt { } ext { - androidxCameraVersion = "1.5.0" + androidxCameraVersion = "1.4.2" coilKtVersion = "2.7.0" - daggerVersion = "2.57.1" - emojiVersion = "1.6.0" + daggerVersion = "2.56.2" + emojiVersion = "1.5.0" fidoVersion = "4.1.0-patch2" - lifecycleVersion = '2.9.4' + lifecycleVersion = '2.9.1' okhttpVersion = "4.12.0" markwonVersion = "4.6.2" materialDialogsVersion = "3.3.0" parcelerVersion = "1.1.13" prismVersion = "2.0.0" retrofit2Version = "3.0.0" - roomVersion = "2.8.0" - workVersion = "2.10.4" - espressoVersion = "3.7.0" + roomVersion = "2.7.2" + workVersion = "2.10.2" + espressoVersion = "3.6.1" androidxTestVersion = "1.5.0" - media3_version = "1.8.0" + media3_version = "1.7.1" coroutines_version = "1.10.2" mockitoKotlinVersion = "6.0.0" } @@ -185,24 +179,22 @@ configurations.configureEach { } dependencies { - implementation "androidx.room:room-testing-android:${roomVersion}" - implementation 'androidx.compose.foundation:foundation-layout:1.9.1' spotbugsPlugins 'com.h3xstream.findsecbugs:findsecbugs-plugin:1.14.0' - spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.14' + spotbugsPlugins 'com.mebigfatguy.fb-contrib:fb-contrib:7.6.11' detektPlugins("io.gitlab.arturbosch.detekt:detekt-formatting:1.23.8") - implementation("androidx.compose.runtime:runtime:1.9.1") + implementation("androidx.compose.runtime:runtime:1.8.3") implementation 'androidx.preference:preference-ktx:1.2.1' implementation 'androidx.datastore:datastore-core:1.1.7' implementation 'androidx.datastore:datastore-preferences:1.1.7' - implementation 'androidx.test.ext:junit-ktx:1.3.0' + implementation 'androidx.test.ext:junit-ktx:1.2.1' implementation fileTree(include: ['*'], dir: 'libs') implementation "org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0" implementation 'androidx.appcompat:appcompat:1.7.1' - implementation 'com.google.android.material:material:1.13.0' + implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.constraintlayout:constraintlayout:2.2.1' implementation "com.vanniktech:emoji-google:0.21.0" implementation "androidx.emoji2:emoji2:${emojiVersion}" @@ -218,7 +210,6 @@ dependencies { exclude group: 'org.ogce', module: 'xpp3' // Android comes with its own XmlPullParser }) implementation 'org.conscrypt:conscrypt-android:2.5.3' - implementation "com.github.nextcloud-deps:qrcodescanner:0.1.2.4" // "com.github.blikoon:QRCodeScanner:0.1.2" implementation "androidx.camera:camera-core:${androidxCameraVersion}" implementation "androidx.camera:camera-camera2:${androidxCameraVersion}" @@ -245,7 +236,7 @@ dependencies { implementation "com.squareup.okhttp3:logging-interceptor:${okhttpVersion}" implementation 'com.bluelinelabs:logansquare:1.3.7' - implementation 'com.fasterxml.jackson.core:jackson-core:2.20.0' + implementation 'com.fasterxml.jackson.core:jackson-core:2.19.1' kapt 'com.bluelinelabs:logansquare-compiler:1.3.7' implementation "com.squareup.retrofit2:retrofit:${retrofit2Version}" @@ -260,7 +251,7 @@ dependencies { compileOnly 'javax.annotation:javax.annotation-api:1.3.2' implementation 'org.greenrobot:eventbus:3.3.1' - implementation 'net.zetetic:sqlcipher-android:4.10.0' + implementation 'net.zetetic:sqlcipher-android:4.9.0' implementation "androidx.room:room-runtime:${roomVersion}" implementation "androidx.room:room-rxjava2:${roomVersion}" @@ -270,7 +261,7 @@ dependencies { implementation "org.parceler:parceler-api:$parcelerVersion" implementation 'com.github.ddB0515.FlexibleAdapter:flexible-adapter:5.1.1' implementation 'com.github.ddB0515.FlexibleAdapter:flexible-adapter-ui:5.1.1' - implementation 'org.apache.commons:commons-lang3:3.18.0' + implementation 'org.apache.commons:commons-lang3:3.17.0' implementation 'com.github.wooplr:Spotlight:1.3' implementation 'com.google.code.findbugs:jsr305:3.0.2' implementation 'com.github.nextcloud-deps:ChatKit:0.4.2' @@ -289,7 +280,7 @@ dependencies { implementation "com.afollestad.material-dialogs:bottomsheets:${materialDialogsVersion}" implementation "com.afollestad.material-dialogs:lifecycle:${materialDialogsVersion}" - implementation 'com.google.code.gson:gson:2.13.2' + implementation 'com.google.code.gson:gson:2.13.1' implementation "androidx.media3:media3-exoplayer:$media3_version" implementation "androidx.media3:media3-ui:$media3_version" @@ -312,14 +303,14 @@ dependencies { implementation 'androidx.core:core-ktx:1.16.0' implementation 'androidx.activity:activity-ktx:1.10.1' - implementation 'com.github.nextcloud.android-common:ui:0.28.0' + implementation 'com.github.nextcloud.android-common:ui:0.27.0' implementation 'com.github.nextcloud-deps:android-talk-webrtc:132.6834.0' - gplayImplementation 'com.google.android.gms:play-services-base:18.8.0' - gplayImplementation "com.google.firebase:firebase-messaging:25.0.0" + gplayImplementation 'com.google.android.gms:play-services-base:18.6.0' + gplayImplementation "com.google.firebase:firebase-messaging:24.1.2" //compose - implementation(platform("androidx.compose:compose-bom:2025.09.00")) + implementation(platform("androidx.compose:compose-bom:2025.06.01")) implementation("androidx.compose.ui:ui") implementation 'androidx.compose.material3:material3:1.3.2' implementation("androidx.compose.ui:ui-tooling-preview") @@ -327,19 +318,18 @@ dependencies { debugImplementation("androidx.compose.ui:ui-tooling") //tests - testRuntimeOnly 'org.junit.platform:junit-platform-launcher:1.13.4' - androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.9.1") + androidTestImplementation("androidx.compose.ui:ui-test-junit4:1.8.3") debugImplementation("androidx.compose.ui:ui-test-manifest") testImplementation 'junit:junit:4.13.2' - testImplementation 'org.mockito:mockito-core:5.19.0' + testImplementation 'org.mockito:mockito-core:5.18.0' testImplementation 'androidx.arch.core:core-testing:2.2.0' - androidTestImplementation "androidx.test:core:1.7.0" + androidTestImplementation "androidx.test:core:1.6.1" androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.10.2" - androidTestImplementation 'androidx.test:core-ktx:1.7.0' - androidTestImplementation 'org.mockito:mockito-android:5.19.0' + androidTestImplementation 'androidx.test:core-ktx:1.6.1' + androidTestImplementation 'org.mockito:mockito-android:5.18.0' androidTestImplementation "androidx.work:work-testing:${workVersion}" // Espresso core androidTestImplementation ("androidx.test.espresso:espresso-core:$espressoVersion", { @@ -353,15 +343,11 @@ dependencies { androidTestImplementation('com.android.support.test.espresso:espresso-intents:3.0.2') - androidTestImplementation(platform("androidx.compose:compose-bom:2025.09.00")) + androidTestImplementation(platform("androidx.compose:compose-bom:2025.06.01")) testImplementation "org.mockito.kotlin:mockito-kotlin:$mockitoKotlinVersion" testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$coroutines_version" - testImplementation 'org.junit.vintage:junit-vintage-engine:5.13.4' // DO NOT REMOVE - testImplementation "androidx.room:room-testing:${roomVersion}" - testImplementation("com.squareup.okhttp3:mockwebserver:$okhttpVersion") - testImplementation("com.google.dagger:hilt-android-testing:2.57.1") - testImplementation("org.robolectric:robolectric:4.16") + testImplementation 'org.junit.vintage:junit-vintage-engine:5.13.3' } tasks.register('installGitHooks', Copy) { @@ -385,14 +371,14 @@ tasks.withType(SpotBugsTask).configureEach { task -> dependsOn "compile${variantNameCap}Sources" excludeFilter = file("${project.rootDir}/spotbugs-filter.xml") - classes = fileTree(layout.buildDirectory.get().asFile.toString()+"/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/") + classes = fileTree("$project.buildDir/intermediates/javac/${variantName}/compile${variantNameCap}JavaWithJavac/classes/") reports { xml { required = true } html { required = true - outputLocation = layout.buildDirectory.file("reports/spotbugs/spotbugs.html") + outputLocation = file("$project.buildDir/reports/spotbugs/spotbugs.html") stylesheet = 'fancy.xsl' } } diff --git a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/10.json b/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/10.json index 84c3039..cdff3df 100644 --- a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/10.json +++ b/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/10.json @@ -1,146 +1,709 @@ { - "formatVersion": 1, - "database": { - "version": 10, - "identityHash": "1b2dab0ea495c45c9c9ee6e64ba74039", - "entities": [ - { - "tableName": "User", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `username` TEXT, `baseUrl` TEXT, `token` TEXT, `displayName` TEXT, `pushConfigurationState` TEXT, `capabilities` TEXT, `serverVersion` TEXT DEFAULT '', `clientCertificate` TEXT, `externalSignalingServer` TEXT, `current` INTEGER NOT NULL, `scheduledForDeletion` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "userId", - "columnName": "userId", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "username", - "columnName": "username", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "baseUrl", - "columnName": "baseUrl", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "pushConfigurationState", - "columnName": "pushConfigurationState", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "capabilities", - "columnName": "capabilities", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "serverVersion", - "columnName": "serverVersion", - "affinity": "TEXT", - "notNull": false, - "defaultValue": "''" - }, - { - "fieldPath": "clientCertificate", - "columnName": "clientCertificate", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "externalSignalingServer", - "columnName": "externalSignalingServer", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "current", - "columnName": "current", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "scheduledForDeletion", - "columnName": "scheduledForDeletion", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [], - "foreignKeys": [] - }, - { - "tableName": "ArbitraryStorage", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountIdentifier` INTEGER NOT NULL, `key` TEXT NOT NULL, `object` TEXT, `value` TEXT, PRIMARY KEY(`accountIdentifier`, `key`))", - "fields": [ - { - "fieldPath": "accountIdentifier", - "columnName": "accountIdentifier", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "key", - "columnName": "key", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "storageObject", - "columnName": "object", - "affinity": "TEXT", - "notNull": false - }, - { - "fieldPath": "value", - "columnName": "value", - "affinity": "TEXT", - "notNull": false - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "accountIdentifier", - "key" - ] - }, - "indices": [], - "foreignKeys": [] - } + "formatVersion": 1, + "database": { + "version": 10, + "identityHash": "c07a2543aa583e08e7b3208f44fcc7ac", + "entities": [ + { + "tableName": "User", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `username` TEXT, `baseUrl` TEXT, `token` TEXT, `displayName` TEXT, `pushConfigurationState` TEXT, `capabilities` TEXT, `serverVersion` TEXT DEFAULT '', `clientCertificate` TEXT, `externalSignalingServer` TEXT, `current` INTEGER NOT NULL, `scheduledForDeletion` INTEGER NOT NULL)", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "userId", + "columnName": "userId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "username", + "columnName": "username", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "baseUrl", + "columnName": "baseUrl", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "token", + "columnName": "token", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "displayName", + "columnName": "displayName", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "pushConfigurationState", + "columnName": "pushConfigurationState", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "capabilities", + "columnName": "capabilities", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "serverVersion", + "columnName": "serverVersion", + "affinity": "TEXT", + "notNull": false, + "defaultValue": "''" + }, + { + "fieldPath": "clientCertificate", + "columnName": "clientCertificate", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "externalSignalingServer", + "columnName": "externalSignalingServer", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "current", + "columnName": "current", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "scheduledForDeletion", + "columnName": "scheduledForDeletion", + "affinity": "INTEGER", + "notNull": true + } ], - "views": [], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '1b2dab0ea495c45c9c9ee6e64ba74039')" + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "ArbitraryStorage", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountIdentifier` INTEGER NOT NULL, `key` TEXT NOT NULL, `object` TEXT, `value` TEXT, PRIMARY KEY(`accountIdentifier`, `key`))", + "fields": [ + { + "fieldPath": "accountIdentifier", + "columnName": "accountIdentifier", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "key", + "columnName": "key", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "storageObject", + "columnName": "object", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "value", + "columnName": "value", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "accountIdentifier", + "key" + ] + }, + "indices": [], + "foreignKeys": [] + }, + { + "tableName": "Conversations", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT, `name` TEXT, `displayName` TEXT, `description` TEXT, `type` TEXT, `lastPing` INTEGER NOT NULL, `participantType` TEXT, `hasPassword` INTEGER NOT NULL, `sessionId` TEXT, `actorId` TEXT, `actorType` TEXT, `isFavorite` INTEGER NOT NULL, `lastActivity` INTEGER NOT NULL, `unreadMessages` INTEGER NOT NULL, `unreadMention` INTEGER NOT NULL, `lastMessageJson` TEXT, `objectType` TEXT, `notificationLevel` TEXT, `readOnly` TEXT, `lobbyState` TEXT, `lobbyTimer` INTEGER, `lastReadMessage` INTEGER NOT NULL, `lastCommonReadMessage` INTEGER NOT NULL, `hasCall` INTEGER NOT NULL, `callFlag` INTEGER NOT NULL, `canStartCall` INTEGER NOT NULL, `canLeaveConversation` INTEGER, `canDeleteConversation` INTEGER, `unreadMentionDirect` INTEGER, `notificationCalls` INTEGER, `permissions` INTEGER NOT NULL, `messageExpiration` INTEGER NOT NULL, `status` TEXT, `statusIcon` TEXT, `statusMessage` TEXT, `statusClearAt` INTEGER, `callRecording` INTEGER NOT NULL, `avatarVersion` TEXT, `isCustomAvatar` INTEGER, `callStartTime` INTEGER, `recordingConsent` INTEGER NOT NULL, `remoteServer` TEXT, `remoteToken` TEXT, PRIMARY KEY(`internalId`), FOREIGN KEY(`accountId`) REFERENCES `User`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", + "fields": [ + { + "fieldPath": "internalId", + "columnName": "internalId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "accountId", + "columnName": "accountId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "token", + "columnName": "token", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "name", + "columnName": "name", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "displayName", + "columnName": "displayName", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "description", + "columnName": "description", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "type", + "columnName": "type", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lastPing", + "columnName": "lastPing", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "participantType", + "columnName": "participantType", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "hasPassword", + "columnName": "hasPassword", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "sessionId", + "columnName": "sessionId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "actorId", + "columnName": "actorId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "actorType", + "columnName": "actorType", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "favorite", + "columnName": "isFavorite", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastActivity", + "columnName": "lastActivity", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "unreadMessages", + "columnName": "unreadMessages", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "unreadMention", + "columnName": "unreadMention", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastMessageJson", + "columnName": "lastMessageJson", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "objectType", + "columnName": "objectType", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "notificationLevel", + "columnName": "notificationLevel", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "conversationReadOnlyState", + "columnName": "readOnly", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lobbyState", + "columnName": "lobbyState", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lobbyTimer", + "columnName": "lobbyTimer", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lastReadMessage", + "columnName": "lastReadMessage", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "lastCommonReadMessage", + "columnName": "lastCommonReadMessage", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "hasCall", + "columnName": "hasCall", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "callFlag", + "columnName": "callFlag", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "canStartCall", + "columnName": "canStartCall", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "canLeaveConversation", + "columnName": "canLeaveConversation", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "canDeleteConversation", + "columnName": "canDeleteConversation", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "unreadMentionDirect", + "columnName": "unreadMentionDirect", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "notificationCalls", + "columnName": "notificationCalls", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "permissions", + "columnName": "permissions", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "messageExpiration", + "columnName": "messageExpiration", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "status", + "columnName": "status", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "statusIcon", + "columnName": "statusIcon", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "statusMessage", + "columnName": "statusMessage", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "statusClearAt", + "columnName": "statusClearAt", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "callRecording", + "columnName": "callRecording", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "avatarVersion", + "columnName": "avatarVersion", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "hasCustomAvatar", + "columnName": "isCustomAvatar", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "callStartTime", + "columnName": "callStartTime", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "recordingConsentRequired", + "columnName": "recordingConsent", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "remoteServer", + "columnName": "remoteServer", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "remoteToken", + "columnName": "remoteToken", + "affinity": "TEXT", + "notNull": false + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "internalId" + ] + }, + "indices": [ + { + "name": "index_Conversations_accountId", + "unique": false, + "columnNames": [ + "accountId" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_Conversations_accountId` ON `${TABLE_NAME}` (`accountId`)" + } + ], + "foreignKeys": [ + { + "table": "User", + "onDelete": "CASCADE", + "onUpdate": "CASCADE", + "columns": [ + "accountId" + ], + "referencedColumns": [ + "id" + ] + } ] - } + }, + { + "tableName": "ChatMessages", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER, `token` TEXT, `id` INTEGER NOT NULL, `internalConversationId` TEXT, `actorType` TEXT, `actorId` TEXT, `actorDisplayName` TEXT, `timestamp` INTEGER NOT NULL, `systemMessage` TEXT, `messageType` TEXT, `isReplyable` INTEGER NOT NULL, `message` TEXT, `messageParameters` TEXT, `expirationTimestamp` INTEGER NOT NULL, `parent` INTEGER, `reactions` TEXT, `reactionsSelf` TEXT, `markdown` INTEGER, `lastEditActorType` TEXT, `lastEditActorId` TEXT, `lastEditActorDisplayName` TEXT, `lastEditTimestamp` INTEGER, `deleted` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", + "fields": [ + { + "fieldPath": "internalId", + "columnName": "internalId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "accountId", + "columnName": "accountId", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "token", + "columnName": "token", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "internalConversationId", + "columnName": "internalConversationId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "actorType", + "columnName": "actorType", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "actorId", + "columnName": "actorId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "actorDisplayName", + "columnName": "actorDisplayName", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "timestamp", + "columnName": "timestamp", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "systemMessageType", + "columnName": "systemMessage", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "messageType", + "columnName": "messageType", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "replyable", + "columnName": "isReplyable", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "message", + "columnName": "message", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "messageParameters", + "columnName": "messageParameters", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "expirationTimestamp", + "columnName": "expirationTimestamp", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "parentMessageId", + "columnName": "parent", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "reactions", + "columnName": "reactions", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "reactionsSelf", + "columnName": "reactionsSelf", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "renderMarkdown", + "columnName": "markdown", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "lastEditActorType", + "columnName": "lastEditActorType", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lastEditActorId", + "columnName": "lastEditActorId", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lastEditActorDisplayName", + "columnName": "lastEditActorDisplayName", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "lastEditTimestamp", + "columnName": "lastEditTimestamp", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "deleted", + "columnName": "deleted", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": false, + "columnNames": [ + "internalId" + ] + }, + "indices": [ + { + "name": "index_ChatMessages_internalId", + "unique": true, + "columnNames": [ + "internalId" + ], + "orders": [], + "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ChatMessages_internalId` ON `${TABLE_NAME}` (`internalId`)" + }, + { + "name": "index_ChatMessages_internalConversationId", + "unique": false, + "columnNames": [ + "internalConversationId" + ], + "orders": [], + "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatMessages_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" + } + ], + "foreignKeys": [ + { + "table": "Conversations", + "onDelete": "CASCADE", + "onUpdate": "CASCADE", + "columns": [ + "internalConversationId" + ], + "referencedColumns": [ + "internalId" + ] + } + ] + }, + { + "tableName": "ChatBlocks", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalConversationId` TEXT NOT NULL, `accountId` INTEGER, `token` TEXT, `oldestMessageId` INTEGER NOT NULL, `newestMessageId` INTEGER NOT NULL, `hasHistory` INTEGER NOT NULL, FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", + "fields": [ + { + "fieldPath": "id", + "columnName": "id", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "internalConversationId", + "columnName": "internalConversationId", + "affinity": "TEXT", + "notNull": true + }, + { + "fieldPath": "accountId", + "columnName": "accountId", + "affinity": "INTEGER", + "notNull": false + }, + { + "fieldPath": "token", + "columnName": "token", + "affinity": "TEXT", + "notNull": false + }, + { + "fieldPath": "oldestMessageId", + "columnName": "oldestMessageId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "newestMessageId", + "columnName": "newestMessageId", + "affinity": "INTEGER", + "notNull": true + }, + { + "fieldPath": "hasHistory", + "columnName": "hasHistory", + "affinity": "INTEGER", + "notNull": true + } + ], + "primaryKey": { + "autoGenerate": true, + "columnNames": [ + "id" + ] + }, + "indices": [], + "foreignKeys": [ + { + "table": "Conversations", + "onDelete": "CASCADE", + "onUpdate": "CASCADE", + "columns": [ + "internalConversationId" + ], + "referencedColumns": [ + "internalId" + ] + } + ] + } + ], + "views": [], + "setupQueries": [ + "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c07a2543aa583e08e7b3208f44fcc7ac')" + ] + } } \ No newline at end of file diff --git a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/18.json b/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/18.json deleted file mode 100644 index 391c430..0000000 --- a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/18.json +++ /dev/null @@ -1,746 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 18, - "identityHash": "c5e3716925065d7419fb23efabf6691f", - "entities": [ - { - "tableName": "User", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `username` TEXT, `baseUrl` TEXT, `token` TEXT, `displayName` TEXT, `pushConfigurationState` TEXT, `capabilities` TEXT, `serverVersion` TEXT DEFAULT '', `clientCertificate` TEXT, `externalSignalingServer` TEXT, `current` INTEGER NOT NULL, `scheduledForDeletion` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "userId", - "columnName": "userId", - "affinity": "TEXT" - }, - { - "fieldPath": "username", - "columnName": "username", - "affinity": "TEXT" - }, - { - "fieldPath": "baseUrl", - "columnName": "baseUrl", - "affinity": "TEXT" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT" - }, - { - "fieldPath": "pushConfigurationState", - "columnName": "pushConfigurationState", - "affinity": "TEXT" - }, - { - "fieldPath": "capabilities", - "columnName": "capabilities", - "affinity": "TEXT" - }, - { - "fieldPath": "serverVersion", - "columnName": "serverVersion", - "affinity": "TEXT", - "defaultValue": "''" - }, - { - "fieldPath": "clientCertificate", - "columnName": "clientCertificate", - "affinity": "TEXT" - }, - { - "fieldPath": "externalSignalingServer", - "columnName": "externalSignalingServer", - "affinity": "TEXT" - }, - { - "fieldPath": "current", - "columnName": "current", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "scheduledForDeletion", - "columnName": "scheduledForDeletion", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - } - }, - { - "tableName": "ArbitraryStorage", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountIdentifier` INTEGER NOT NULL, `key` TEXT NOT NULL, `object` TEXT, `value` TEXT, PRIMARY KEY(`accountIdentifier`, `key`))", - "fields": [ - { - "fieldPath": "accountIdentifier", - "columnName": "accountIdentifier", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "key", - "columnName": "key", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "storageObject", - "columnName": "object", - "affinity": "TEXT" - }, - { - "fieldPath": "value", - "columnName": "value", - "affinity": "TEXT" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "accountIdentifier", - "key" - ] - } - }, - { - "tableName": "Conversations", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `displayName` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `avatarVersion` TEXT NOT NULL, `callFlag` INTEGER NOT NULL, `callRecording` INTEGER NOT NULL, `callStartTime` INTEGER NOT NULL, `canDeleteConversation` INTEGER NOT NULL, `canLeaveConversation` INTEGER NOT NULL, `canStartCall` INTEGER NOT NULL, `description` TEXT NOT NULL, `hasCall` INTEGER NOT NULL, `hasPassword` INTEGER NOT NULL, `isCustomAvatar` INTEGER NOT NULL, `isFavorite` INTEGER NOT NULL, `lastActivity` INTEGER NOT NULL, `lastCommonReadMessage` INTEGER NOT NULL, `lastMessage` TEXT, `lastPing` INTEGER NOT NULL, `lastReadMessage` INTEGER NOT NULL, `lobbyState` TEXT NOT NULL, `lobbyTimer` INTEGER NOT NULL, `messageExpiration` INTEGER NOT NULL, `name` TEXT NOT NULL, `notificationCalls` INTEGER NOT NULL, `notificationLevel` TEXT NOT NULL, `objectType` TEXT NOT NULL, `objectId` TEXT NOT NULL, `participantType` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `readOnly` TEXT NOT NULL, `recordingConsent` INTEGER NOT NULL, `remoteServer` TEXT, `remoteToken` TEXT, `sessionId` TEXT NOT NULL, `status` TEXT, `statusClearAt` INTEGER, `statusIcon` TEXT, `statusMessage` TEXT, `type` TEXT NOT NULL, `unreadMention` INTEGER NOT NULL, `unreadMentionDirect` INTEGER NOT NULL, `unreadMessages` INTEGER NOT NULL, `hasArchived` INTEGER NOT NULL, `hasSensitive` INTEGER NOT NULL, `hasImportant` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`accountId`) REFERENCES `User`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "avatarVersion", - "columnName": "avatarVersion", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "callFlag", - "columnName": "callFlag", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callRecording", - "columnName": "callRecording", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callStartTime", - "columnName": "callStartTime", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canDeleteConversation", - "columnName": "canDeleteConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canLeaveConversation", - "columnName": "canLeaveConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canStartCall", - "columnName": "canStartCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "description", - "columnName": "description", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "hasCall", - "columnName": "hasCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasPassword", - "columnName": "hasPassword", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasCustomAvatar", - "columnName": "isCustomAvatar", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "favorite", - "columnName": "isFavorite", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastActivity", - "columnName": "lastActivity", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastCommonReadMessage", - "columnName": "lastCommonReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastMessage", - "columnName": "lastMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "lastPing", - "columnName": "lastPing", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastReadMessage", - "columnName": "lastReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lobbyState", - "columnName": "lobbyState", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "lobbyTimer", - "columnName": "lobbyTimer", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "messageExpiration", - "columnName": "messageExpiration", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "notificationCalls", - "columnName": "notificationCalls", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "notificationLevel", - "columnName": "notificationLevel", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectType", - "columnName": "objectType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectId", - "columnName": "objectId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "participantType", - "columnName": "participantType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "permissions", - "columnName": "permissions", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "conversationReadOnlyState", - "columnName": "readOnly", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "recordingConsentRequired", - "columnName": "recordingConsent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "remoteServer", - "columnName": "remoteServer", - "affinity": "TEXT" - }, - { - "fieldPath": "remoteToken", - "columnName": "remoteToken", - "affinity": "TEXT" - }, - { - "fieldPath": "sessionId", - "columnName": "sessionId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "status", - "columnName": "status", - "affinity": "TEXT" - }, - { - "fieldPath": "statusClearAt", - "columnName": "statusClearAt", - "affinity": "INTEGER" - }, - { - "fieldPath": "statusIcon", - "columnName": "statusIcon", - "affinity": "TEXT" - }, - { - "fieldPath": "statusMessage", - "columnName": "statusMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "unreadMention", - "columnName": "unreadMention", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMentionDirect", - "columnName": "unreadMentionDirect", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMessages", - "columnName": "unreadMessages", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasArchived", - "columnName": "hasArchived", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasSensitive", - "columnName": "hasSensitive", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasImportant", - "columnName": "hasImportant", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_Conversations_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Conversations_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "User", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "accountId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "ChatMessages", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `id` INTEGER NOT NULL, `internalConversationId` TEXT NOT NULL, `threadId` INTEGER, `isThread` INTEGER NOT NULL, `actorDisplayName` TEXT NOT NULL, `message` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `deleted` INTEGER NOT NULL, `expirationTimestamp` INTEGER NOT NULL, `isReplyable` INTEGER NOT NULL, `isTemporary` INTEGER NOT NULL, `lastEditActorDisplayName` TEXT, `lastEditActorId` TEXT, `lastEditActorType` TEXT, `lastEditTimestamp` INTEGER, `markdown` INTEGER, `messageParameters` TEXT, `messageType` TEXT NOT NULL, `parent` INTEGER, `reactions` TEXT, `reactionsSelf` TEXT, `referenceId` TEXT, `sendStatus` TEXT, `silent` INTEGER NOT NULL, `systemMessage` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "isThread", - "columnName": "isThread", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "actorDisplayName", - "columnName": "actorDisplayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "message", - "columnName": "message", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "deleted", - "columnName": "deleted", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "expirationTimestamp", - "columnName": "expirationTimestamp", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "replyable", - "columnName": "isReplyable", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isTemporary", - "columnName": "isTemporary", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastEditActorDisplayName", - "columnName": "lastEditActorDisplayName", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorId", - "columnName": "lastEditActorId", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorType", - "columnName": "lastEditActorType", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditTimestamp", - "columnName": "lastEditTimestamp", - "affinity": "INTEGER" - }, - { - "fieldPath": "renderMarkdown", - "columnName": "markdown", - "affinity": "INTEGER" - }, - { - "fieldPath": "messageParameters", - "columnName": "messageParameters", - "affinity": "TEXT" - }, - { - "fieldPath": "messageType", - "columnName": "messageType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "parentMessageId", - "columnName": "parent", - "affinity": "INTEGER" - }, - { - "fieldPath": "reactions", - "columnName": "reactions", - "affinity": "TEXT" - }, - { - "fieldPath": "reactionsSelf", - "columnName": "reactionsSelf", - "affinity": "TEXT" - }, - { - "fieldPath": "referenceId", - "columnName": "referenceId", - "affinity": "TEXT" - }, - { - "fieldPath": "sendStatus", - "columnName": "sendStatus", - "affinity": "TEXT" - }, - { - "fieldPath": "silent", - "columnName": "silent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "systemMessageType", - "columnName": "systemMessage", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "timestamp", - "columnName": "timestamp", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_ChatMessages_internalId", - "unique": true, - "columnNames": [ - "internalId" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ChatMessages_internalId` ON `${TABLE_NAME}` (`internalId`)" - }, - { - "name": "index_ChatMessages_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatMessages_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - }, - { - "tableName": "ChatBlocks", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalConversationId` TEXT NOT NULL, `accountId` INTEGER, `token` TEXT, `threadId` INTEGER, `oldestMessageId` INTEGER NOT NULL, `newestMessageId` INTEGER NOT NULL, `hasHistory` INTEGER NOT NULL, FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "oldestMessageId", - "columnName": "oldestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "newestMessageId", - "columnName": "newestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasHistory", - "columnName": "hasHistory", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_ChatBlocks_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatBlocks_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - } - ], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c5e3716925065d7419fb23efabf6691f')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/19.json b/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/19.json deleted file mode 100644 index c11f384..0000000 --- a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/19.json +++ /dev/null @@ -1,746 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 19, - "identityHash": "c5e3716925065d7419fb23efabf6691f", - "entities": [ - { - "tableName": "User", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `username` TEXT, `baseUrl` TEXT, `token` TEXT, `displayName` TEXT, `pushConfigurationState` TEXT, `capabilities` TEXT, `serverVersion` TEXT DEFAULT '', `clientCertificate` TEXT, `externalSignalingServer` TEXT, `current` INTEGER NOT NULL, `scheduledForDeletion` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "userId", - "columnName": "userId", - "affinity": "TEXT" - }, - { - "fieldPath": "username", - "columnName": "username", - "affinity": "TEXT" - }, - { - "fieldPath": "baseUrl", - "columnName": "baseUrl", - "affinity": "TEXT" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT" - }, - { - "fieldPath": "pushConfigurationState", - "columnName": "pushConfigurationState", - "affinity": "TEXT" - }, - { - "fieldPath": "capabilities", - "columnName": "capabilities", - "affinity": "TEXT" - }, - { - "fieldPath": "serverVersion", - "columnName": "serverVersion", - "affinity": "TEXT", - "defaultValue": "''" - }, - { - "fieldPath": "clientCertificate", - "columnName": "clientCertificate", - "affinity": "TEXT" - }, - { - "fieldPath": "externalSignalingServer", - "columnName": "externalSignalingServer", - "affinity": "TEXT" - }, - { - "fieldPath": "current", - "columnName": "current", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "scheduledForDeletion", - "columnName": "scheduledForDeletion", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - } - }, - { - "tableName": "ArbitraryStorage", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountIdentifier` INTEGER NOT NULL, `key` TEXT NOT NULL, `object` TEXT, `value` TEXT, PRIMARY KEY(`accountIdentifier`, `key`))", - "fields": [ - { - "fieldPath": "accountIdentifier", - "columnName": "accountIdentifier", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "key", - "columnName": "key", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "storageObject", - "columnName": "object", - "affinity": "TEXT" - }, - { - "fieldPath": "value", - "columnName": "value", - "affinity": "TEXT" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "accountIdentifier", - "key" - ] - } - }, - { - "tableName": "Conversations", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `displayName` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `avatarVersion` TEXT NOT NULL, `callFlag` INTEGER NOT NULL, `callRecording` INTEGER NOT NULL, `callStartTime` INTEGER NOT NULL, `canDeleteConversation` INTEGER NOT NULL, `canLeaveConversation` INTEGER NOT NULL, `canStartCall` INTEGER NOT NULL, `description` TEXT NOT NULL, `hasCall` INTEGER NOT NULL, `hasPassword` INTEGER NOT NULL, `isCustomAvatar` INTEGER NOT NULL, `isFavorite` INTEGER NOT NULL, `lastActivity` INTEGER NOT NULL, `lastCommonReadMessage` INTEGER NOT NULL, `lastMessage` TEXT, `lastPing` INTEGER NOT NULL, `lastReadMessage` INTEGER NOT NULL, `lobbyState` TEXT NOT NULL, `lobbyTimer` INTEGER NOT NULL, `messageExpiration` INTEGER NOT NULL, `name` TEXT NOT NULL, `notificationCalls` INTEGER NOT NULL, `notificationLevel` TEXT NOT NULL, `objectType` TEXT NOT NULL, `objectId` TEXT NOT NULL, `participantType` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `readOnly` TEXT NOT NULL, `recordingConsent` INTEGER NOT NULL, `remoteServer` TEXT, `remoteToken` TEXT, `sessionId` TEXT NOT NULL, `status` TEXT, `statusClearAt` INTEGER, `statusIcon` TEXT, `statusMessage` TEXT, `type` TEXT NOT NULL, `unreadMention` INTEGER NOT NULL, `unreadMentionDirect` INTEGER NOT NULL, `unreadMessages` INTEGER NOT NULL, `hasArchived` INTEGER NOT NULL, `hasSensitive` INTEGER NOT NULL, `hasImportant` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`accountId`) REFERENCES `User`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "avatarVersion", - "columnName": "avatarVersion", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "callFlag", - "columnName": "callFlag", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callRecording", - "columnName": "callRecording", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callStartTime", - "columnName": "callStartTime", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canDeleteConversation", - "columnName": "canDeleteConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canLeaveConversation", - "columnName": "canLeaveConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canStartCall", - "columnName": "canStartCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "description", - "columnName": "description", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "hasCall", - "columnName": "hasCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasPassword", - "columnName": "hasPassword", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasCustomAvatar", - "columnName": "isCustomAvatar", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "favorite", - "columnName": "isFavorite", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastActivity", - "columnName": "lastActivity", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastCommonReadMessage", - "columnName": "lastCommonReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastMessage", - "columnName": "lastMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "lastPing", - "columnName": "lastPing", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastReadMessage", - "columnName": "lastReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lobbyState", - "columnName": "lobbyState", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "lobbyTimer", - "columnName": "lobbyTimer", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "messageExpiration", - "columnName": "messageExpiration", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "notificationCalls", - "columnName": "notificationCalls", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "notificationLevel", - "columnName": "notificationLevel", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectType", - "columnName": "objectType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectId", - "columnName": "objectId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "participantType", - "columnName": "participantType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "permissions", - "columnName": "permissions", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "conversationReadOnlyState", - "columnName": "readOnly", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "recordingConsentRequired", - "columnName": "recordingConsent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "remoteServer", - "columnName": "remoteServer", - "affinity": "TEXT" - }, - { - "fieldPath": "remoteToken", - "columnName": "remoteToken", - "affinity": "TEXT" - }, - { - "fieldPath": "sessionId", - "columnName": "sessionId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "status", - "columnName": "status", - "affinity": "TEXT" - }, - { - "fieldPath": "statusClearAt", - "columnName": "statusClearAt", - "affinity": "INTEGER" - }, - { - "fieldPath": "statusIcon", - "columnName": "statusIcon", - "affinity": "TEXT" - }, - { - "fieldPath": "statusMessage", - "columnName": "statusMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "unreadMention", - "columnName": "unreadMention", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMentionDirect", - "columnName": "unreadMentionDirect", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMessages", - "columnName": "unreadMessages", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasArchived", - "columnName": "hasArchived", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasSensitive", - "columnName": "hasSensitive", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasImportant", - "columnName": "hasImportant", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_Conversations_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Conversations_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "User", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "accountId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "ChatMessages", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `id` INTEGER NOT NULL, `internalConversationId` TEXT NOT NULL, `threadId` INTEGER, `isThread` INTEGER NOT NULL, `actorDisplayName` TEXT NOT NULL, `message` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `deleted` INTEGER NOT NULL, `expirationTimestamp` INTEGER NOT NULL, `isReplyable` INTEGER NOT NULL, `isTemporary` INTEGER NOT NULL, `lastEditActorDisplayName` TEXT, `lastEditActorId` TEXT, `lastEditActorType` TEXT, `lastEditTimestamp` INTEGER, `markdown` INTEGER, `messageParameters` TEXT, `messageType` TEXT NOT NULL, `parent` INTEGER, `reactions` TEXT, `reactionsSelf` TEXT, `referenceId` TEXT, `sendStatus` TEXT, `silent` INTEGER NOT NULL, `systemMessage` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "isThread", - "columnName": "isThread", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "actorDisplayName", - "columnName": "actorDisplayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "message", - "columnName": "message", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "deleted", - "columnName": "deleted", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "expirationTimestamp", - "columnName": "expirationTimestamp", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "replyable", - "columnName": "isReplyable", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isTemporary", - "columnName": "isTemporary", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastEditActorDisplayName", - "columnName": "lastEditActorDisplayName", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorId", - "columnName": "lastEditActorId", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorType", - "columnName": "lastEditActorType", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditTimestamp", - "columnName": "lastEditTimestamp", - "affinity": "INTEGER" - }, - { - "fieldPath": "renderMarkdown", - "columnName": "markdown", - "affinity": "INTEGER" - }, - { - "fieldPath": "messageParameters", - "columnName": "messageParameters", - "affinity": "TEXT" - }, - { - "fieldPath": "messageType", - "columnName": "messageType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "parentMessageId", - "columnName": "parent", - "affinity": "INTEGER" - }, - { - "fieldPath": "reactions", - "columnName": "reactions", - "affinity": "TEXT" - }, - { - "fieldPath": "reactionsSelf", - "columnName": "reactionsSelf", - "affinity": "TEXT" - }, - { - "fieldPath": "referenceId", - "columnName": "referenceId", - "affinity": "TEXT" - }, - { - "fieldPath": "sendStatus", - "columnName": "sendStatus", - "affinity": "TEXT" - }, - { - "fieldPath": "silent", - "columnName": "silent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "systemMessageType", - "columnName": "systemMessage", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "timestamp", - "columnName": "timestamp", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_ChatMessages_internalId", - "unique": true, - "columnNames": [ - "internalId" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ChatMessages_internalId` ON `${TABLE_NAME}` (`internalId`)" - }, - { - "name": "index_ChatMessages_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatMessages_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - }, - { - "tableName": "ChatBlocks", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalConversationId` TEXT NOT NULL, `accountId` INTEGER, `token` TEXT, `threadId` INTEGER, `oldestMessageId` INTEGER NOT NULL, `newestMessageId` INTEGER NOT NULL, `hasHistory` INTEGER NOT NULL, FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "oldestMessageId", - "columnName": "oldestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "newestMessageId", - "columnName": "newestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasHistory", - "columnName": "hasHistory", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_ChatBlocks_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatBlocks_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - } - ], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, 'c5e3716925065d7419fb23efabf6691f')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/20.json b/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/20.json deleted file mode 100644 index 68198eb..0000000 --- a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/20.json +++ /dev/null @@ -1,751 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 20, - "identityHash": "7330dad871a0b42e36931ffe8c7d4bcf", - "entities": [ - { - "tableName": "User", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `username` TEXT, `baseUrl` TEXT, `token` TEXT, `displayName` TEXT, `pushConfigurationState` TEXT, `capabilities` TEXT, `serverVersion` TEXT DEFAULT '', `clientCertificate` TEXT, `externalSignalingServer` TEXT, `current` INTEGER NOT NULL, `scheduledForDeletion` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "userId", - "columnName": "userId", - "affinity": "TEXT" - }, - { - "fieldPath": "username", - "columnName": "username", - "affinity": "TEXT" - }, - { - "fieldPath": "baseUrl", - "columnName": "baseUrl", - "affinity": "TEXT" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT" - }, - { - "fieldPath": "pushConfigurationState", - "columnName": "pushConfigurationState", - "affinity": "TEXT" - }, - { - "fieldPath": "capabilities", - "columnName": "capabilities", - "affinity": "TEXT" - }, - { - "fieldPath": "serverVersion", - "columnName": "serverVersion", - "affinity": "TEXT", - "defaultValue": "''" - }, - { - "fieldPath": "clientCertificate", - "columnName": "clientCertificate", - "affinity": "TEXT" - }, - { - "fieldPath": "externalSignalingServer", - "columnName": "externalSignalingServer", - "affinity": "TEXT" - }, - { - "fieldPath": "current", - "columnName": "current", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "scheduledForDeletion", - "columnName": "scheduledForDeletion", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - } - }, - { - "tableName": "ArbitraryStorage", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountIdentifier` INTEGER NOT NULL, `key` TEXT NOT NULL, `object` TEXT, `value` TEXT, PRIMARY KEY(`accountIdentifier`, `key`))", - "fields": [ - { - "fieldPath": "accountIdentifier", - "columnName": "accountIdentifier", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "key", - "columnName": "key", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "storageObject", - "columnName": "object", - "affinity": "TEXT" - }, - { - "fieldPath": "value", - "columnName": "value", - "affinity": "TEXT" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "accountIdentifier", - "key" - ] - } - }, - { - "tableName": "Conversations", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `displayName` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `avatarVersion` TEXT NOT NULL, `callFlag` INTEGER NOT NULL, `callRecording` INTEGER NOT NULL, `callStartTime` INTEGER NOT NULL, `canDeleteConversation` INTEGER NOT NULL, `canLeaveConversation` INTEGER NOT NULL, `canStartCall` INTEGER NOT NULL, `description` TEXT NOT NULL, `hasCall` INTEGER NOT NULL, `hasPassword` INTEGER NOT NULL, `isCustomAvatar` INTEGER NOT NULL, `isFavorite` INTEGER NOT NULL, `lastActivity` INTEGER NOT NULL, `lastCommonReadMessage` INTEGER NOT NULL, `lastMessage` TEXT, `lastPing` INTEGER NOT NULL, `lastReadMessage` INTEGER NOT NULL, `lobbyState` TEXT NOT NULL, `lobbyTimer` INTEGER NOT NULL, `messageExpiration` INTEGER NOT NULL, `name` TEXT NOT NULL, `notificationCalls` INTEGER NOT NULL, `notificationLevel` TEXT NOT NULL, `objectType` TEXT NOT NULL, `objectId` TEXT NOT NULL, `participantType` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `readOnly` TEXT NOT NULL, `recordingConsent` INTEGER NOT NULL, `remoteServer` TEXT, `remoteToken` TEXT, `sessionId` TEXT NOT NULL, `status` TEXT, `statusClearAt` INTEGER, `statusIcon` TEXT, `statusMessage` TEXT, `type` TEXT NOT NULL, `unreadMention` INTEGER NOT NULL, `unreadMentionDirect` INTEGER NOT NULL, `unreadMessages` INTEGER NOT NULL, `hasArchived` INTEGER NOT NULL, `hasSensitive` INTEGER NOT NULL, `hasImportant` INTEGER NOT NULL, `messageDraft` TEXT, PRIMARY KEY(`internalId`), FOREIGN KEY(`accountId`) REFERENCES `User`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "avatarVersion", - "columnName": "avatarVersion", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "callFlag", - "columnName": "callFlag", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callRecording", - "columnName": "callRecording", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callStartTime", - "columnName": "callStartTime", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canDeleteConversation", - "columnName": "canDeleteConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canLeaveConversation", - "columnName": "canLeaveConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canStartCall", - "columnName": "canStartCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "description", - "columnName": "description", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "hasCall", - "columnName": "hasCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasPassword", - "columnName": "hasPassword", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasCustomAvatar", - "columnName": "isCustomAvatar", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "favorite", - "columnName": "isFavorite", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastActivity", - "columnName": "lastActivity", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastCommonReadMessage", - "columnName": "lastCommonReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastMessage", - "columnName": "lastMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "lastPing", - "columnName": "lastPing", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastReadMessage", - "columnName": "lastReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lobbyState", - "columnName": "lobbyState", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "lobbyTimer", - "columnName": "lobbyTimer", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "messageExpiration", - "columnName": "messageExpiration", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "notificationCalls", - "columnName": "notificationCalls", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "notificationLevel", - "columnName": "notificationLevel", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectType", - "columnName": "objectType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectId", - "columnName": "objectId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "participantType", - "columnName": "participantType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "permissions", - "columnName": "permissions", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "conversationReadOnlyState", - "columnName": "readOnly", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "recordingConsentRequired", - "columnName": "recordingConsent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "remoteServer", - "columnName": "remoteServer", - "affinity": "TEXT" - }, - { - "fieldPath": "remoteToken", - "columnName": "remoteToken", - "affinity": "TEXT" - }, - { - "fieldPath": "sessionId", - "columnName": "sessionId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "status", - "columnName": "status", - "affinity": "TEXT" - }, - { - "fieldPath": "statusClearAt", - "columnName": "statusClearAt", - "affinity": "INTEGER" - }, - { - "fieldPath": "statusIcon", - "columnName": "statusIcon", - "affinity": "TEXT" - }, - { - "fieldPath": "statusMessage", - "columnName": "statusMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "unreadMention", - "columnName": "unreadMention", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMentionDirect", - "columnName": "unreadMentionDirect", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMessages", - "columnName": "unreadMessages", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasArchived", - "columnName": "hasArchived", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasSensitive", - "columnName": "hasSensitive", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasImportant", - "columnName": "hasImportant", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "messageDraft", - "columnName": "messageDraft", - "affinity": "TEXT" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_Conversations_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Conversations_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "User", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "accountId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "ChatMessages", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `id` INTEGER NOT NULL, `internalConversationId` TEXT NOT NULL, `threadId` INTEGER, `isThread` INTEGER NOT NULL, `actorDisplayName` TEXT NOT NULL, `message` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `deleted` INTEGER NOT NULL, `expirationTimestamp` INTEGER NOT NULL, `isReplyable` INTEGER NOT NULL, `isTemporary` INTEGER NOT NULL, `lastEditActorDisplayName` TEXT, `lastEditActorId` TEXT, `lastEditActorType` TEXT, `lastEditTimestamp` INTEGER, `markdown` INTEGER, `messageParameters` TEXT, `messageType` TEXT NOT NULL, `parent` INTEGER, `reactions` TEXT, `reactionsSelf` TEXT, `referenceId` TEXT, `sendStatus` TEXT, `silent` INTEGER NOT NULL, `systemMessage` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "isThread", - "columnName": "isThread", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "actorDisplayName", - "columnName": "actorDisplayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "message", - "columnName": "message", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "deleted", - "columnName": "deleted", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "expirationTimestamp", - "columnName": "expirationTimestamp", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "replyable", - "columnName": "isReplyable", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isTemporary", - "columnName": "isTemporary", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastEditActorDisplayName", - "columnName": "lastEditActorDisplayName", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorId", - "columnName": "lastEditActorId", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorType", - "columnName": "lastEditActorType", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditTimestamp", - "columnName": "lastEditTimestamp", - "affinity": "INTEGER" - }, - { - "fieldPath": "renderMarkdown", - "columnName": "markdown", - "affinity": "INTEGER" - }, - { - "fieldPath": "messageParameters", - "columnName": "messageParameters", - "affinity": "TEXT" - }, - { - "fieldPath": "messageType", - "columnName": "messageType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "parentMessageId", - "columnName": "parent", - "affinity": "INTEGER" - }, - { - "fieldPath": "reactions", - "columnName": "reactions", - "affinity": "TEXT" - }, - { - "fieldPath": "reactionsSelf", - "columnName": "reactionsSelf", - "affinity": "TEXT" - }, - { - "fieldPath": "referenceId", - "columnName": "referenceId", - "affinity": "TEXT" - }, - { - "fieldPath": "sendStatus", - "columnName": "sendStatus", - "affinity": "TEXT" - }, - { - "fieldPath": "silent", - "columnName": "silent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "systemMessageType", - "columnName": "systemMessage", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "timestamp", - "columnName": "timestamp", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_ChatMessages_internalId", - "unique": true, - "columnNames": [ - "internalId" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ChatMessages_internalId` ON `${TABLE_NAME}` (`internalId`)" - }, - { - "name": "index_ChatMessages_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatMessages_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - }, - { - "tableName": "ChatBlocks", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalConversationId` TEXT NOT NULL, `accountId` INTEGER, `token` TEXT, `threadId` INTEGER, `oldestMessageId` INTEGER NOT NULL, `newestMessageId` INTEGER NOT NULL, `hasHistory` INTEGER NOT NULL, FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "oldestMessageId", - "columnName": "oldestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "newestMessageId", - "columnName": "newestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasHistory", - "columnName": "hasHistory", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_ChatBlocks_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatBlocks_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - } - ], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '7330dad871a0b42e36931ffe8c7d4bcf')" - ] - } -} \ No newline at end of file diff --git a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/21.json b/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/21.json deleted file mode 100644 index ebd9449..0000000 --- a/app/schemas/com.nextcloud.talk.data.source.local.TalkDatabase/21.json +++ /dev/null @@ -1,761 +0,0 @@ -{ - "formatVersion": 1, - "database": { - "version": 21, - "identityHash": "8077a29304b3d28882e4b37fb10d0081", - "entities": [ - { - "tableName": "User", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `userId` TEXT, `username` TEXT, `baseUrl` TEXT, `token` TEXT, `displayName` TEXT, `pushConfigurationState` TEXT, `capabilities` TEXT, `serverVersion` TEXT DEFAULT '', `clientCertificate` TEXT, `externalSignalingServer` TEXT, `current` INTEGER NOT NULL, `scheduledForDeletion` INTEGER NOT NULL)", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "userId", - "columnName": "userId", - "affinity": "TEXT" - }, - { - "fieldPath": "username", - "columnName": "username", - "affinity": "TEXT" - }, - { - "fieldPath": "baseUrl", - "columnName": "baseUrl", - "affinity": "TEXT" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT" - }, - { - "fieldPath": "pushConfigurationState", - "columnName": "pushConfigurationState", - "affinity": "TEXT" - }, - { - "fieldPath": "capabilities", - "columnName": "capabilities", - "affinity": "TEXT" - }, - { - "fieldPath": "serverVersion", - "columnName": "serverVersion", - "affinity": "TEXT", - "defaultValue": "''" - }, - { - "fieldPath": "clientCertificate", - "columnName": "clientCertificate", - "affinity": "TEXT" - }, - { - "fieldPath": "externalSignalingServer", - "columnName": "externalSignalingServer", - "affinity": "TEXT" - }, - { - "fieldPath": "current", - "columnName": "current", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "scheduledForDeletion", - "columnName": "scheduledForDeletion", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - } - }, - { - "tableName": "ArbitraryStorage", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`accountIdentifier` INTEGER NOT NULL, `key` TEXT NOT NULL, `object` TEXT, `value` TEXT, PRIMARY KEY(`accountIdentifier`, `key`))", - "fields": [ - { - "fieldPath": "accountIdentifier", - "columnName": "accountIdentifier", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "key", - "columnName": "key", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "storageObject", - "columnName": "object", - "affinity": "TEXT" - }, - { - "fieldPath": "value", - "columnName": "value", - "affinity": "TEXT" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "accountIdentifier", - "key" - ] - } - }, - { - "tableName": "Conversations", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `displayName` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `avatarVersion` TEXT NOT NULL, `callFlag` INTEGER NOT NULL, `callRecording` INTEGER NOT NULL, `callStartTime` INTEGER NOT NULL, `canDeleteConversation` INTEGER NOT NULL, `canLeaveConversation` INTEGER NOT NULL, `canStartCall` INTEGER NOT NULL, `description` TEXT NOT NULL, `hasCall` INTEGER NOT NULL, `hasPassword` INTEGER NOT NULL, `isCustomAvatar` INTEGER NOT NULL, `isFavorite` INTEGER NOT NULL, `lastActivity` INTEGER NOT NULL, `lastCommonReadMessage` INTEGER NOT NULL, `lastMessage` TEXT, `lastPing` INTEGER NOT NULL, `lastReadMessage` INTEGER NOT NULL, `lobbyState` TEXT NOT NULL, `lobbyTimer` INTEGER NOT NULL, `messageExpiration` INTEGER NOT NULL, `name` TEXT NOT NULL, `notificationCalls` INTEGER NOT NULL, `notificationLevel` TEXT NOT NULL, `objectType` TEXT NOT NULL, `objectId` TEXT NOT NULL, `participantType` TEXT NOT NULL, `permissions` INTEGER NOT NULL, `readOnly` TEXT NOT NULL, `recordingConsent` INTEGER NOT NULL, `remoteServer` TEXT, `remoteToken` TEXT, `sessionId` TEXT NOT NULL, `status` TEXT, `statusClearAt` INTEGER, `statusIcon` TEXT, `statusMessage` TEXT, `type` TEXT NOT NULL, `unreadMention` INTEGER NOT NULL, `unreadMentionDirect` INTEGER NOT NULL, `unreadMessages` INTEGER NOT NULL, `hasArchived` INTEGER NOT NULL, `hasSensitive` INTEGER NOT NULL, `hasImportant` INTEGER NOT NULL, `messageDraft` TEXT, PRIMARY KEY(`internalId`), FOREIGN KEY(`accountId`) REFERENCES `User`(`id`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "displayName", - "columnName": "displayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "avatarVersion", - "columnName": "avatarVersion", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "callFlag", - "columnName": "callFlag", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callRecording", - "columnName": "callRecording", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "callStartTime", - "columnName": "callStartTime", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canDeleteConversation", - "columnName": "canDeleteConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canLeaveConversation", - "columnName": "canLeaveConversation", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "canStartCall", - "columnName": "canStartCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "description", - "columnName": "description", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "hasCall", - "columnName": "hasCall", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasPassword", - "columnName": "hasPassword", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasCustomAvatar", - "columnName": "isCustomAvatar", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "favorite", - "columnName": "isFavorite", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastActivity", - "columnName": "lastActivity", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastCommonReadMessage", - "columnName": "lastCommonReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastMessage", - "columnName": "lastMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "lastPing", - "columnName": "lastPing", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastReadMessage", - "columnName": "lastReadMessage", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lobbyState", - "columnName": "lobbyState", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "lobbyTimer", - "columnName": "lobbyTimer", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "messageExpiration", - "columnName": "messageExpiration", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "name", - "columnName": "name", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "notificationCalls", - "columnName": "notificationCalls", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "notificationLevel", - "columnName": "notificationLevel", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectType", - "columnName": "objectType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "objectId", - "columnName": "objectId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "participantType", - "columnName": "participantType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "permissions", - "columnName": "permissions", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "conversationReadOnlyState", - "columnName": "readOnly", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "recordingConsentRequired", - "columnName": "recordingConsent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "remoteServer", - "columnName": "remoteServer", - "affinity": "TEXT" - }, - { - "fieldPath": "remoteToken", - "columnName": "remoteToken", - "affinity": "TEXT" - }, - { - "fieldPath": "sessionId", - "columnName": "sessionId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "status", - "columnName": "status", - "affinity": "TEXT" - }, - { - "fieldPath": "statusClearAt", - "columnName": "statusClearAt", - "affinity": "INTEGER" - }, - { - "fieldPath": "statusIcon", - "columnName": "statusIcon", - "affinity": "TEXT" - }, - { - "fieldPath": "statusMessage", - "columnName": "statusMessage", - "affinity": "TEXT" - }, - { - "fieldPath": "type", - "columnName": "type", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "unreadMention", - "columnName": "unreadMention", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMentionDirect", - "columnName": "unreadMentionDirect", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "unreadMessages", - "columnName": "unreadMessages", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasArchived", - "columnName": "hasArchived", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasSensitive", - "columnName": "hasSensitive", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasImportant", - "columnName": "hasImportant", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "messageDraft", - "columnName": "messageDraft", - "affinity": "TEXT" - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_Conversations_accountId", - "unique": false, - "columnNames": [ - "accountId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_Conversations_accountId` ON `${TABLE_NAME}` (`accountId`)" - } - ], - "foreignKeys": [ - { - "table": "User", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "accountId" - ], - "referencedColumns": [ - "id" - ] - } - ] - }, - { - "tableName": "ChatMessages", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`internalId` TEXT NOT NULL, `accountId` INTEGER NOT NULL, `token` TEXT NOT NULL, `id` INTEGER NOT NULL, `internalConversationId` TEXT NOT NULL, `threadId` INTEGER, `isThread` INTEGER NOT NULL, `actorDisplayName` TEXT NOT NULL, `message` TEXT NOT NULL, `actorId` TEXT NOT NULL, `actorType` TEXT NOT NULL, `deleted` INTEGER NOT NULL, `expirationTimestamp` INTEGER NOT NULL, `isReplyable` INTEGER NOT NULL, `isTemporary` INTEGER NOT NULL, `lastEditActorDisplayName` TEXT, `lastEditActorId` TEXT, `lastEditActorType` TEXT, `lastEditTimestamp` INTEGER, `markdown` INTEGER, `messageParameters` TEXT, `messageType` TEXT NOT NULL, `parent` INTEGER, `reactions` TEXT, `reactionsSelf` TEXT, `referenceId` TEXT, `sendStatus` TEXT, `silent` INTEGER NOT NULL, `systemMessage` TEXT NOT NULL, `threadTitle` TEXT, `threadReplies` INTEGER, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`internalId`), FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "internalId", - "columnName": "internalId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "isThread", - "columnName": "isThread", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "actorDisplayName", - "columnName": "actorDisplayName", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "message", - "columnName": "message", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorId", - "columnName": "actorId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "actorType", - "columnName": "actorType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "deleted", - "columnName": "deleted", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "expirationTimestamp", - "columnName": "expirationTimestamp", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "replyable", - "columnName": "isReplyable", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "isTemporary", - "columnName": "isTemporary", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "lastEditActorDisplayName", - "columnName": "lastEditActorDisplayName", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorId", - "columnName": "lastEditActorId", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditActorType", - "columnName": "lastEditActorType", - "affinity": "TEXT" - }, - { - "fieldPath": "lastEditTimestamp", - "columnName": "lastEditTimestamp", - "affinity": "INTEGER" - }, - { - "fieldPath": "renderMarkdown", - "columnName": "markdown", - "affinity": "INTEGER" - }, - { - "fieldPath": "messageParameters", - "columnName": "messageParameters", - "affinity": "TEXT" - }, - { - "fieldPath": "messageType", - "columnName": "messageType", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "parentMessageId", - "columnName": "parent", - "affinity": "INTEGER" - }, - { - "fieldPath": "reactions", - "columnName": "reactions", - "affinity": "TEXT" - }, - { - "fieldPath": "reactionsSelf", - "columnName": "reactionsSelf", - "affinity": "TEXT" - }, - { - "fieldPath": "referenceId", - "columnName": "referenceId", - "affinity": "TEXT" - }, - { - "fieldPath": "sendStatus", - "columnName": "sendStatus", - "affinity": "TEXT" - }, - { - "fieldPath": "silent", - "columnName": "silent", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "systemMessageType", - "columnName": "systemMessage", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "threadTitle", - "columnName": "threadTitle", - "affinity": "TEXT" - }, - { - "fieldPath": "threadReplies", - "columnName": "threadReplies", - "affinity": "INTEGER" - }, - { - "fieldPath": "timestamp", - "columnName": "timestamp", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": false, - "columnNames": [ - "internalId" - ] - }, - "indices": [ - { - "name": "index_ChatMessages_internalId", - "unique": true, - "columnNames": [ - "internalId" - ], - "orders": [], - "createSql": "CREATE UNIQUE INDEX IF NOT EXISTS `index_ChatMessages_internalId` ON `${TABLE_NAME}` (`internalId`)" - }, - { - "name": "index_ChatMessages_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatMessages_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - }, - { - "tableName": "ChatBlocks", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, `internalConversationId` TEXT NOT NULL, `accountId` INTEGER, `token` TEXT, `threadId` INTEGER, `oldestMessageId` INTEGER NOT NULL, `newestMessageId` INTEGER NOT NULL, `hasHistory` INTEGER NOT NULL, FOREIGN KEY(`internalConversationId`) REFERENCES `Conversations`(`internalId`) ON UPDATE CASCADE ON DELETE CASCADE )", - "fields": [ - { - "fieldPath": "id", - "columnName": "id", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "internalConversationId", - "columnName": "internalConversationId", - "affinity": "TEXT", - "notNull": true - }, - { - "fieldPath": "accountId", - "columnName": "accountId", - "affinity": "INTEGER" - }, - { - "fieldPath": "token", - "columnName": "token", - "affinity": "TEXT" - }, - { - "fieldPath": "threadId", - "columnName": "threadId", - "affinity": "INTEGER" - }, - { - "fieldPath": "oldestMessageId", - "columnName": "oldestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "newestMessageId", - "columnName": "newestMessageId", - "affinity": "INTEGER", - "notNull": true - }, - { - "fieldPath": "hasHistory", - "columnName": "hasHistory", - "affinity": "INTEGER", - "notNull": true - } - ], - "primaryKey": { - "autoGenerate": true, - "columnNames": [ - "id" - ] - }, - "indices": [ - { - "name": "index_ChatBlocks_internalConversationId", - "unique": false, - "columnNames": [ - "internalConversationId" - ], - "orders": [], - "createSql": "CREATE INDEX IF NOT EXISTS `index_ChatBlocks_internalConversationId` ON `${TABLE_NAME}` (`internalConversationId`)" - } - ], - "foreignKeys": [ - { - "table": "Conversations", - "onDelete": "CASCADE", - "onUpdate": "CASCADE", - "columns": [ - "internalConversationId" - ], - "referencedColumns": [ - "internalId" - ] - } - ] - } - ], - "setupQueries": [ - "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '8077a29304b3d28882e4b37fb10d0081')" - ] - } -} \ No newline at end of file diff --git a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt index 01067b1..6c87b61 100644 --- a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt +++ b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatBlocksDaoTest.kt @@ -25,9 +25,6 @@ import org.junit.Assert.assertEquals import org.junit.Before import org.junit.Test import org.junit.runner.RunWith -import java.lang.Boolean -import kotlin.Long -import kotlin.String @RunWith(AndroidJUnit4::class) class ChatBlocksDaoTest { @@ -52,83 +49,13 @@ class ChatBlocksDaoTest { @After fun closeDb() = db.close() - @Test - fun testGetChatBlocksContainingMessageId() = - runTest { - val user = createUserEntity("account1", "Account 1") - usersDao.saveUser(user) - val account1 = usersDao.getUserWithUserId("account1").blockingGet() - - conversationsDao.upsertConversations( - accountId = user.id, - listOf( - createConversationEntity( - accountId = account1.id, - "abc", - roomName = "Conversation One" - ), - createConversationEntity( - accountId = account1.id, - "def", - roomName = "Conversation Two" - ) - ) - ) - - val conversation1 = conversationsDao.getConversationsForUser(account1.id).first()[0] - - val chatBlock1 = ChatBlockEntity( - internalConversationId = conversation1.internalId, - accountId = conversation1.accountId, - token = conversation1.token, - threadId = 123, - oldestMessageId = 50, - newestMessageId = 60, - hasHistory = true - ) - - val chatBlock2 = ChatBlockEntity( - internalConversationId = conversation1.internalId, - accountId = conversation1.accountId, - token = conversation1.token, - threadId = 123, - oldestMessageId = 10, - newestMessageId = 20, - hasHistory = true - ) - - val chatBlock3 = ChatBlockEntity( - internalConversationId = conversation1.internalId, - accountId = conversation1.accountId, - token = conversation1.token, - threadId = null, - oldestMessageId = 50, - newestMessageId = 60, - hasHistory = true - ) - - chatBlocksDao.upsertChatBlock(chatBlock1) - chatBlocksDao.upsertChatBlock(chatBlock2) - chatBlocksDao.upsertChatBlock(chatBlock3) - - val chatBlocksOfThread = chatBlocksDao.getChatBlocksContainingMessageId( - internalConversationId = conversation1.internalId, - threadId = 123, - messageId = 55 - ) - - assertEquals(1, chatBlocksOfThread.first().size) - } - @Test fun testGetConnectedChatBlocks() = runTest { - val user = createUserEntity("account1", "Account 1") - usersDao.saveUser(user) + usersDao.saveUser(createUserEntity("account1", "Account 1")) val account1 = usersDao.getUserWithUserId("account1").blockingGet() conversationsDao.upsertConversations( - account1.id, listOf( createConversationEntity( accountId = account1.id, @@ -150,7 +77,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation1.internalId, accountId = conversation1.accountId, token = conversation1.token, - threadId = null, oldestMessageId = 50, newestMessageId = 60, hasHistory = true @@ -160,7 +86,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation1.internalId, accountId = conversation1.accountId, token = conversation1.token, - threadId = null, oldestMessageId = 10, newestMessageId = 20, hasHistory = true @@ -170,7 +95,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation1.internalId, accountId = conversation1.accountId, token = conversation1.token, - threadId = null, oldestMessageId = 45, newestMessageId = 55, hasHistory = true @@ -180,7 +104,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation1.internalId, accountId = conversation1.accountId, token = conversation1.token, - threadId = null, oldestMessageId = 52, newestMessageId = 58, hasHistory = true @@ -190,7 +113,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation1.internalId, accountId = conversation1.accountId, token = conversation1.token, - threadId = null, oldestMessageId = 1, newestMessageId = 99, hasHistory = true @@ -200,7 +122,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation1.internalId, accountId = conversation1.accountId, token = conversation1.token, - threadId = null, oldestMessageId = 59, newestMessageId = 70, hasHistory = true @@ -210,7 +131,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation1.internalId, accountId = conversation1.accountId, token = conversation1.token, - threadId = null, oldestMessageId = 80, newestMessageId = 90, hasHistory = true @@ -220,7 +140,6 @@ class ChatBlocksDaoTest { internalConversationId = conversation2.internalId, accountId = conversation2.accountId, token = conversation2.token, - threadId = null, oldestMessageId = 53, newestMessageId = 57, hasHistory = true @@ -237,94 +156,14 @@ class ChatBlocksDaoTest { chatBlocksDao.upsertChatBlock(chatBlockWithinButOtherConversation) val results = chatBlocksDao.getConnectedChatBlocks( - internalConversationId = conversation1.internalId, - threadId = null, - oldestMessageId = searchedChatBlock.oldestMessageId, - newestMessageId = searchedChatBlock.newestMessageId + conversation1.internalId, + searchedChatBlock.oldestMessageId, + searchedChatBlock.newestMessageId ) assertEquals(5, results.first().size) } - @Test - fun testGetConnectedChatBlocksWithThreadsScenario() = - runTest { - val user = createUserEntity("account1", "Account 1") - usersDao.saveUser(user) - val account1 = usersDao.getUserWithUserId("account1").blockingGet() - - conversationsDao.upsertConversations( - account1.id, - listOf( - createConversationEntity( - accountId = account1.id, - "abc", - roomName = "Conversation One" - ), - createConversationEntity( - accountId = account1.id, - "def", - roomName = "Conversation Two" - ) - ) - ) - - val conversation1 = conversationsDao.getConversationsForUser(account1.id).first()[0] - - val searchedChatBlock = ChatBlockEntity( - internalConversationId = conversation1.internalId, - accountId = conversation1.accountId, - token = conversation1.token, - threadId = 123, - oldestMessageId = 50, - newestMessageId = 60, - hasHistory = true - ) - - val chatBlockOverlap1 = ChatBlockEntity( - internalConversationId = conversation1.internalId, - accountId = conversation1.accountId, - token = conversation1.token, - threadId = null, - oldestMessageId = 45, - newestMessageId = 55, - hasHistory = true - ) - - val chatBlockOverlap2 = ChatBlockEntity( - internalConversationId = conversation1.internalId, - accountId = conversation1.accountId, - token = conversation1.token, - threadId = 123, - oldestMessageId = 59, - newestMessageId = 70, - hasHistory = true - ) - - chatBlocksDao.upsertChatBlock(searchedChatBlock) - - chatBlocksDao.upsertChatBlock(chatBlockOverlap1) - chatBlocksDao.upsertChatBlock(chatBlockOverlap2) - - val resultsForThreadIdNull = chatBlocksDao.getConnectedChatBlocks( - internalConversationId = conversation1.internalId, - threadId = null, - oldestMessageId = searchedChatBlock.oldestMessageId, - newestMessageId = searchedChatBlock.newestMessageId - ) - - assertEquals(1, resultsForThreadIdNull.first().size) - - val resultsForThreadId123 = chatBlocksDao.getConnectedChatBlocks( - internalConversationId = conversation1.internalId, - threadId = 123, - oldestMessageId = searchedChatBlock.oldestMessageId, - newestMessageId = searchedChatBlock.newestMessageId - ) - - assertEquals(2, resultsForThreadId123.first().size) - } - private fun createUserEntity(userId: String, userName: String) = UserEntity( userId = userId, @@ -337,8 +176,8 @@ class ChatBlocksDaoTest { serverVersion = null, clientCertificate = null, externalSignalingServer = null, - current = Boolean.FALSE, - scheduledForDeletion = Boolean.FALSE + current = java.lang.Boolean.FALSE, + scheduledForDeletion = java.lang.Boolean.FALSE ) private fun createConversationEntity(accountId: Long, token: String, roomName: String) = diff --git a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt index 6bcce26..a6f8386 100644 --- a/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt +++ b/app/src/androidTest/java/com/nextcloud/talk/data/database/dao/ChatMessagesDaoTest.kt @@ -66,7 +66,6 @@ class ChatMessagesDaoTest { // Problem: lets say we want to update the conv list -> We don#t know the primary keys! // with account@token that would be easier! conversationsDao.upsertConversations( - account1.id, listOf( createConversationEntity( accountId = account1.id, @@ -141,11 +140,7 @@ class ChatMessagesDaoTest { assertEquals("are", conv1chatMessage3.message) val chatMessagesConv1Since = - chatMessagesDao.getMessagesForConversationSince( - conversation1.internalId, - conv1chatMessage3.id, - null - ) + chatMessagesDao.getMessagesForConversationSince(conversation1.internalId, conv1chatMessage3.id) assertEquals(3, chatMessagesConv1Since.first().size) assertEquals("are", chatMessagesConv1Since.first()[0].message) assertEquals("some", chatMessagesConv1Since.first()[1].message) @@ -155,8 +150,7 @@ class ChatMessagesDaoTest { chatMessagesDao.getMessagesForConversationBeforeAndEqual( conversation1.internalId, conv1chatMessage3.id, - 3, - null + 3 ) assertEquals(3, chatMessagesConv1To.first().size) assertEquals("hello", chatMessagesConv1To.first()[2].message) diff --git a/app/src/androidTest/java/com/nextcloud/talk/data/database/migrations/MigrationsTest.kt b/app/src/androidTest/java/com/nextcloud/talk/data/database/migrations/MigrationsTest.kt deleted file mode 100644 index 978bab2..0000000 --- a/app/src/androidTest/java/com/nextcloud/talk/data/database/migrations/MigrationsTest.kt +++ /dev/null @@ -1,114 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.data.database.migrations - -import androidx.room.Room -import androidx.room.testing.MigrationTestHelper -import androidx.test.ext.junit.runners.AndroidJUnit4 -import androidx.test.platform.app.InstrumentationRegistry -import com.nextcloud.talk.data.source.local.Migrations -import com.nextcloud.talk.data.source.local.TalkDatabase -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import java.io.IOException - -@RunWith(AndroidJUnit4::class) -class MigrationsTest { - companion object { - private const val TEST_DB = "migration-test" - private const val INIT_VERSION = 10 // last version before update to offline first - private val TAG = MigrationsTest::class.java.simpleName - } - - @get:Rule - val helper: MigrationTestHelper = MigrationTestHelper( - InstrumentationRegistry.getInstrumentation(), - TalkDatabase::class.java - ) - - @Test - @Throws(IOException::class) - @Suppress("SpreadOperator") - fun migrateAll() { - helper.createDatabase(TEST_DB, INIT_VERSION).apply { - close() - } - - Room.databaseBuilder( - InstrumentationRegistry.getInstrumentation().targetContext, - TalkDatabase::class.java, - TEST_DB - ).addMigrations(*TalkDatabase.MIGRATIONS).build().apply { - openHelper.writableDatabase.close() - } - } - - @Test - @Throws(IOException::class) - fun migrate10To11() { - helper.createDatabase(TEST_DB, 10).apply { - close() - } - helper.runMigrationsAndValidate(TEST_DB, 11, true, Migrations.MIGRATION_10_11) - } - - @Test - @Throws(IOException::class) - fun migrate11To12() { - helper.createDatabase(TEST_DB, 11).apply { - close() - } - helper.runMigrationsAndValidate(TEST_DB, 12, true, Migrations.MIGRATION_11_12) - } - - @Test - @Throws(IOException::class) - fun migrate12To13() { - helper.createDatabase(TEST_DB, 12).apply { - close() - } - helper.runMigrationsAndValidate(TEST_DB, 13, true, Migrations.MIGRATION_12_13) - } - - @Test - @Throws(IOException::class) - fun migrate13To14() { - helper.createDatabase(TEST_DB, 13).apply { - close() - } - helper.runMigrationsAndValidate(TEST_DB, 14, true, Migrations.MIGRATION_13_14) - } - - @Test - @Throws(IOException::class) - fun migrate14To15() { - helper.createDatabase(TEST_DB, 14).apply { - close() - } - helper.runMigrationsAndValidate(TEST_DB, 15, true, Migrations.MIGRATION_14_15) - } - - @Test - @Throws(IOException::class) - fun migrate15To16() { - helper.createDatabase(TEST_DB, 15).apply { - close() - } - helper.runMigrationsAndValidate(TEST_DB, 16, true, Migrations.MIGRATION_15_16) - } - - @Test - @Throws(IOException::class) - fun migrate17To19() { - helper.createDatabase(TEST_DB, 17).apply { - close() - } - helper.runMigrationsAndValidate(TEST_DB, 19, true, Migrations.MIGRATION_17_19) - } -} diff --git a/app/src/androidTest/java/com/nextcloud/talk/utils/ColorGeneratorTest.kt b/app/src/androidTest/java/com/nextcloud/talk/utils/ColorGeneratorTest.kt deleted file mode 100644 index 97f6f4c..0000000 --- a/app/src/androidTest/java/com/nextcloud/talk/utils/ColorGeneratorTest.kt +++ /dev/null @@ -1,68 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2022 Nextcloud GmbH and Nextcloud contributors - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.utils - -import android.graphics.Color -import org.junit.Assert -import org.junit.Test - -class ColorGeneratorTest { - - @Test - fun testUsernameToColor() { - usernameToColorHexHelper("", "#0082c9") - usernameToColorHexHelper(",", "#1e78c1") - usernameToColorHexHelper(".", "#c98879") - usernameToColorHexHelper("admin", "#d09e6d") - usernameToColorHexHelper("123e4567-e89b-12d3-a456-426614174000", "#bc5c91") - usernameToColorHexHelper("Akeel Robertson", "#9750a4") - usernameToColorHexHelper("Brayden Truong", "#d09e6d") - usernameToColorHexHelper("Daphne Roy", "#9750a4") - usernameToColorHexHelper("Ellena Wright Frederic Conway", "#c37285") - usernameToColorHexHelper("Gianluca Hills", "#d6b461") - usernameToColorHexHelper("Haseeb Stephens", "#d6b461") - usernameToColorHexHelper("Idris Mac", "#9750a4") - usernameToColorHexHelper("Kristi Fisher", "#0082c9") - usernameToColorHexHelper("Lillian Wall", "#bc5c91") - usernameToColorHexHelper("Lorelai Taylor", "#ddcb55") - usernameToColorHexHelper("Madina Knight", "#9750a4") - usernameToColorHexHelper("Meeting", "#c98879") - usernameToColorHexHelper("Private Circle", "#c37285") - usernameToColorHexHelper("Rae Hope", "#795aab") - usernameToColorHexHelper("Santiago Singleton", "#bc5c91") - usernameToColorHexHelper("Sid Combs", "#d09e6d") - usernameToColorHexHelper("TestCircle", "#499aa2") - usernameToColorHexHelper("Tom Mörtel", "#248eb5") - usernameToColorHexHelper("Vivienne Jacobs", "#1e78c1") - usernameToColorHexHelper("Zaki Cortes", "#6ea68f") - usernameToColorHexHelper("a user", "#5b64b3") - usernameToColorHexHelper("admin@cloud.example.com", "#9750a4") - usernameToColorHexHelper("another user", "#ddcb55") - usernameToColorHexHelper("asd", "#248eb5") - usernameToColorHexHelper("bar", "#0082c9") - usernameToColorHexHelper("foo", "#d09e6d") - usernameToColorHexHelper("wasd", "#b6469d") - usernameToColorHexHelper("مرحبا بالعالم", "#c98879") - usernameToColorHexHelper("🙈", "#b6469d") - } - - private fun usernameToColorHexHelper(username: String, expectedHexColor: String) { - val userColorInt = ColorGenerator.usernameToColor(username) // returns Int - val userHexColor = intToHex(userColorInt) - - Assert.assertEquals(expectedHexColor.lowercase(), userHexColor.lowercase()) - } - - private fun intToHex(colorInt: Int): String { - val r = Color.red(colorInt) - val g = Color.green(colorInt) - val b = Color.blue(colorInt) - return String.format("#%02x%02x%02x", r, g, b) - } -} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 384b7c1..b823553 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -258,10 +258,6 @@ android:name=".lock.LockedActivity" android:theme="@style/AppTheme" /> - - diff --git a/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt b/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt index d3a12a0..abbade3 100644 --- a/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/ServerSelectionActivity.kt @@ -8,7 +8,6 @@ */ package com.nextcloud.talk.account -import android.Manifest import android.accounts.Account import android.annotation.SuppressLint import android.content.Intent @@ -22,13 +21,8 @@ import android.view.View import android.view.inputmethod.EditorInfo import android.widget.TextView import androidx.activity.OnBackPressedCallback -import androidx.activity.result.contract.ActivityResultContracts import androidx.core.net.toUri -import androidx.core.os.bundleOf import autodagger.AutoInjector -import com.blikoon.qrcodescanner.QrCodeActivity -import com.github.dhaval2404.imagepicker.util.PermissionUtil -import com.google.android.material.snackbar.Snackbar import com.nextcloud.talk.R import com.nextcloud.talk.activities.BaseActivity import com.nextcloud.talk.api.NcApi @@ -53,7 +47,6 @@ import io.reactivex.schedulers.Schedulers import java.security.cert.CertificateException import javax.inject.Inject -@Suppress("TooManyFunctions") @AutoInjector(NextcloudTalkApplication::class) class ServerSelectionActivity : BaseActivity() { @@ -127,8 +120,6 @@ class ServerSelectionActivity : BaseActivity() { } binding.certTextView.setOnClickListener { onCertClick() } - binding.scanQr.setOnClickListener { onScan() } - if (ApplicationWideMessageHolder.getInstance().messageType != null) { if (ApplicationWideMessageHolder.getInstance().messageType == ApplicationWideMessageHolder.MessageType.SERVER_WITHOUT_TALK @@ -399,52 +390,6 @@ class ServerSelectionActivity : BaseActivity() { } } - private val requestCameraPermissionLauncher = - registerForActivityResult(ActivityResultContracts.RequestPermission()) { isGranted: Boolean -> - if (isGranted) { - // Permission was granted - startQRScanner() - } - } - - fun onScan() { - if (PermissionUtil.isPermissionGranted(this, Manifest.permission.CAMERA)) { - startQRScanner() - } else { - requestCameraPermissionLauncher.launch(Manifest.permission.CAMERA) - } - } - - private fun startQRScanner() { - val intent = Intent(this, QrCodeActivity::class.java) - qrScanResultLauncher.launch(intent) - } - - private val qrScanResultLauncher = - registerForActivityResult(ActivityResultContracts.StartActivityForResult()) { result -> - if (result.resultCode == RESULT_OK) { - val data = result.data - - if (data == null) { - return@registerForActivityResult - } - - val resultData = data.getStringExtra(QR_URI) - - if (resultData == null || !resultData.startsWith("nc")) { - Snackbar.make(binding.root, getString(R.string.qr_code_error), Snackbar.LENGTH_SHORT).show() - return@registerForActivityResult - } - - val intent = Intent(this, WebViewLoginActivity::class.java) - val bundle = bundleOf().apply { - putString(BundleKeys.KEY_FROM_QR, resultData) - } - intent.putExtras(bundle) - startActivity(intent) - } - } - public override fun onDestroy() { super.onDestroy() dispose() @@ -463,6 +408,5 @@ class ServerSelectionActivity : BaseActivity() { companion object { private val TAG = ServerSelectionActivity::class.java.simpleName const val MIN_SERVER_MAJOR_VERSION = 13 - private const val QR_URI = "com.blikoon.qrcodescanner.got_qr_scan_relult" } } diff --git a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt index 0d52529..38a6c2a 100644 --- a/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/account/WebViewLoginActivity.kt @@ -1,7 +1,9 @@ /* * Nextcloud Talk - Android Client * - * SPDX-FileCopyrightText: 2025 Your Name + * SPDX-FileCopyrightText: 2023 Marcel Hibbe + * SPDX-FileCopyrightText: 2022 Andy Scherzinger + * SPDX-FileCopyrightText: 2017 Mario Danic * SPDX-License-Identifier: GPL-3.0-or-later */ package com.nextcloud.talk.account @@ -61,7 +63,6 @@ import java.security.cert.X509Certificate import java.util.Locale import javax.inject.Inject -@Suppress("ReturnCount", "LongMethod") @AutoInjector(NextcloudTalkApplication::class) class WebViewLoginActivity : BaseActivity() { @@ -114,9 +115,10 @@ class WebViewLoginActivity : BaseActivity() { setContentView(binding.root) actionBar?.hide() initSystemBars() - assembledPrefix = resources!!.getString(R.string.nc_talk_login_scheme) + PROTOCOL_SUFFIX + "login/" + onBackPressedDispatcher.addCallback(this, onBackPressedCallback) handleIntent() + setupWebView() } private fun handleIntent() { @@ -131,18 +133,11 @@ class WebViewLoginActivity : BaseActivity() { if (extras.containsKey(BundleKeys.KEY_PASSWORD)) { password = extras.getString(BundleKeys.KEY_PASSWORD) } - - if (extras.containsKey(BundleKeys.KEY_FROM_QR)) { - extras.getString(BundleKeys.KEY_FROM_QR)?.let { - parseAndLoginFromWebView(it) - } - } else { - setupWebView() - } } @SuppressLint("SetJavaScriptEnabled") private fun setupWebView() { + assembledPrefix = resources!!.getString(R.string.nc_talk_login_scheme) + PROTOCOL_SUFFIX + "login/" binding.webview.settings.allowFileAccess = false binding.webview.settings.allowFileAccessFromFileURLs = false binding.webview.settings.javaScriptEnabled = true @@ -294,18 +289,22 @@ class WebViewLoginActivity : BaseActivity() { } @SuppressLint("DiscouragedPrivateApi") - @Suppress("Detekt.TooGenericExceptionCaught", "WebViewClientOnReceivedSslError") + @Suppress("Detekt.TooGenericExceptionCaught") override fun onReceivedSslError(view: WebView, handler: SslErrorHandler, error: SslError) { try { val sslCertificate = error.certificate val f: Field = sslCertificate.javaClass.getDeclaredField("mX509Certificate") f.isAccessible = true val cert = f[sslCertificate] as X509Certificate - try { - trustManager.checkServerTrusted(arrayOf(cert), "generic") - handler.proceed() - } catch (exception: CertificateException) { - eventBus.post(CertificateEvent(cert, trustManager, handler)) + if (cert == null) { + handler.cancel() + } else { + try { + trustManager.checkServerTrusted(arrayOf(cert), "generic") + handler.proceed() + } catch (exception: CertificateException) { + eventBus.post(CertificateEvent(cert, trustManager, handler)) + } } } catch (exception: Exception) { handler.cancel() @@ -333,16 +332,12 @@ class WebViewLoginActivity : BaseActivity() { dispose() cookieManager.cookieStore.removeAll() - if (userManager.checkIfUserIsScheduledForDeletion(loginData.username!!, loginData.serverUrl!!) - .blockingGet() - ) { + if (userManager.checkIfUserIsScheduledForDeletion(loginData.username!!, baseUrl!!).blockingGet()) { Log.e(TAG, "Tried to add already existing user who is scheduled for deletion.") Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show() // however the user is not yet deleted, just start AccountRemovalWorker again to make sure to delete it. startAccountRemovalWorkerAndRestartApp() - } else if (userManager.checkIfUserExists(loginData.username!!, loginData.serverUrl!!) - .blockingGet() - ) { + } else if (userManager.checkIfUserExists(loginData.username!!, baseUrl!!).blockingGet()) { if (reauthorizeAccount) { updateUserAndRestartApp(loginData) } else { @@ -352,9 +347,6 @@ class WebViewLoginActivity : BaseActivity() { } else { startAccountVerification(loginData) } - } else { - Log.e(TAG, "Login Data was null") - restartApp() } } @@ -364,9 +356,9 @@ class WebViewLoginActivity : BaseActivity() { bundle.putString(KEY_TOKEN, loginData.token) bundle.putString(KEY_BASE_URL, loginData.serverUrl) var protocol = "" - if (loginData.serverUrl!!.startsWith("http://")) { + if (baseUrl!!.startsWith("http://")) { protocol = "http://" - } else if (loginData.serverUrl!!.startsWith("https://")) { + } else if (baseUrl!!.startsWith("https://")) { protocol = "https://" } if (!TextUtils.isEmpty(protocol)) { @@ -424,17 +416,17 @@ class WebViewLoginActivity : BaseActivity() { return null } for (value in values) { - if (value.startsWith("user$LOGIN_URL_DATA_KEY_VALUE_SEPARATOR")) { + if (value.startsWith("user" + LOGIN_URL_DATA_KEY_VALUE_SEPARATOR)) { loginData.username = URLDecoder.decode( - value.substring(("user$LOGIN_URL_DATA_KEY_VALUE_SEPARATOR").length) + value.substring(("user" + LOGIN_URL_DATA_KEY_VALUE_SEPARATOR).length) ) - } else if (value.startsWith("password$LOGIN_URL_DATA_KEY_VALUE_SEPARATOR")) { + } else if (value.startsWith("password" + LOGIN_URL_DATA_KEY_VALUE_SEPARATOR)) { loginData.token = URLDecoder.decode( - value.substring(("password$LOGIN_URL_DATA_KEY_VALUE_SEPARATOR").length) + value.substring(("password" + LOGIN_URL_DATA_KEY_VALUE_SEPARATOR).length) ) - } else if (value.startsWith("server$LOGIN_URL_DATA_KEY_VALUE_SEPARATOR")) { + } else if (value.startsWith("server" + LOGIN_URL_DATA_KEY_VALUE_SEPARATOR)) { loginData.serverUrl = URLDecoder.decode( - value.substring(("server$LOGIN_URL_DATA_KEY_VALUE_SEPARATOR").length) + value.substring(("server" + LOGIN_URL_DATA_KEY_VALUE_SEPARATOR).length) ) } else { return null diff --git a/app/src/main/java/com/nextcloud/talk/account/data/LoginRepository.kt b/app/src/main/java/com/nextcloud/talk/account/data/LoginRepository.kt deleted file mode 100644 index d2ddf88..0000000 --- a/app/src/main/java/com/nextcloud/talk/account/data/LoginRepository.kt +++ /dev/null @@ -1,161 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.account.data - -import android.os.Bundle -import android.text.TextUtils -import android.util.Log -import com.nextcloud.talk.account.data.io.LocalLoginDataSource -import com.nextcloud.talk.account.data.model.LoginCompletion -import com.nextcloud.talk.account.data.model.LoginResponse -import com.nextcloud.talk.account.data.network.NetworkLoginDataSource -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_BASE_URL -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ORIGINAL_PROTOCOL -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_TOKEN -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_USERNAME -import kotlinx.coroutines.Dispatchers -import kotlinx.coroutines.delay -import kotlinx.coroutines.withContext -import java.net.URLDecoder - -@Suppress("TooManyFunctions", "ReturnCount") -class LoginRepository(val network: NetworkLoginDataSource, val local: LocalLoginDataSource) { - - companion object { - val TAG: String = LoginRepository::class.java.simpleName - private const val INTERVAL = 250L - private const val HTTP_OK = 200 - private const val USER_KEY = "user:" - private const val SERVER_KEY = "server:" - private const val PASS_KEY = "password:" - private const val PREFIX = "nc://login/" - private const val MAX_ARGS = 3 - } - - private var shouldReauthorizeUser = false - private var shouldLoop = true - - suspend fun pollLogin(response: LoginResponse): LoginCompletion? = - withContext(Dispatchers.IO) { - while (shouldLoop) { - val loginData = network.performLoginFlowV2(response) - if (loginData == null) { - break - } - - if (loginData.status == HTTP_OK) { - return@withContext loginData - } - - delay(INTERVAL) // No response yet, retry - } - return@withContext null - } - - /** - * Entry point for QR scanner - * - */ - fun startLoginFlowFromQR(dataString: String, reAuth: Boolean = false): LoginCompletion? { - shouldReauthorizeUser = reAuth - - if (!dataString.startsWith(PREFIX)) { - Log.e(TAG, "Invalid login URL detected") - return null - } - - val data = dataString.removePrefix(PREFIX) - val values = data.split('&') - - if (values.size !in 1..MAX_ARGS) { - Log.e(TAG, "Illegal number of login URL elements detected: ${values.size}") - return null - } - - var server = "" - var loginName = "" - var appPassword = "" - values.forEach { value -> - when { - value.startsWith(USER_KEY) -> { - loginName = URLDecoder.decode(value.removePrefix(USER_KEY), "UTF-8") - } - - value.startsWith(PASS_KEY) -> { - appPassword = URLDecoder.decode(value.removePrefix(PASS_KEY), "UTF-8") - } - - value.startsWith(SERVER_KEY) -> { - server = URLDecoder.decode(value.removePrefix(SERVER_KEY), "UTF-8") - } - } - } - - return if (server.isNotEmpty() && loginName.isNotEmpty() && appPassword.isNotEmpty()) { - LoginCompletion(HTTP_OK, server, loginName, appPassword) - } else { - null - } - } - - /** - * Entry point to the login process - */ - suspend fun startLoginFlow(baseUrl: String, reAuth: Boolean = false): LoginResponse? = - withContext(Dispatchers.IO) { - shouldReauthorizeUser = reAuth - val response = network.anonymouslyPostLoginRequest(baseUrl) - return@withContext response - } - - /** - * Ends normal login process by canceling the polling - */ - fun cancelLoginFlow() { - shouldLoop = false - } - - /** - * Returns bundle if user is not scheduled for deletion or doesn't already exist, null otherwise - */ - fun parseAndLogin(loginData: LoginCompletion): Bundle? { - if (local.checkIfUserIsScheduledForDeletion(loginData)) { - // however the user is not yet deleted, just start AccountRemovalWorker again to make sure to delete it. - local.startAccountRemovalWorker() - return null - } else if (local.checkIfUserExists(loginData)) { - if (shouldReauthorizeUser) { - local.updateUser(loginData) - } else { - Log.w(TAG, "Tried to add an account that account already exists. Skipped user creation.") - } - - return null - } else { - return startAccountVerification(loginData) - } - } - - private fun startAccountVerification(loginData: LoginCompletion): Bundle { - val bundle = Bundle() - bundle.putString(KEY_USERNAME, loginData.loginName) - bundle.putString(KEY_TOKEN, loginData.appPassword) - bundle.putString(KEY_BASE_URL, loginData.server) - var protocol = "" - if (loginData.server.startsWith("http://")) { - protocol = "http://" - } else if (loginData.server.startsWith("https://")) { - protocol = "https://" - } - if (!TextUtils.isEmpty(protocol)) { - bundle.putString(KEY_ORIGINAL_PROTOCOL, protocol) - } - - return bundle - } -} diff --git a/app/src/main/java/com/nextcloud/talk/account/data/io/LocalLoginDataSource.kt b/app/src/main/java/com/nextcloud/talk/account/data/io/LocalLoginDataSource.kt deleted file mode 100644 index c7672e7..0000000 --- a/app/src/main/java/com/nextcloud/talk/account/data/io/LocalLoginDataSource.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.account.data.io - -import android.content.Context -import androidx.lifecycle.LiveData -import androidx.work.OneTimeWorkRequest -import androidx.work.WorkInfo -import androidx.work.WorkManager -import com.nextcloud.talk.account.data.model.LoginCompletion -import com.nextcloud.talk.jobs.AccountRemovalWorker -import com.nextcloud.talk.users.UserManager -import com.nextcloud.talk.utils.preferences.AppPreferences - -// local datasource for communicating with room through account manager -// crucial for making sure the login process interacts with the db as expected. -class LocalLoginDataSource(val userManager: UserManager, val appPreferences: AppPreferences, val context: Context) { - - fun updateUser(loginData: LoginCompletion) { - val currentUser = userManager.currentUser.blockingGet() - if (currentUser != null) { - currentUser.clientCertificate = appPreferences.temporaryClientCertAlias - currentUser.token = loginData.appPassword - userManager.updateOrCreateUser(currentUser) - } - } - - fun startAccountRemovalWorker(): LiveData { - val accountRemovalWork = OneTimeWorkRequest.Builder(AccountRemovalWorker::class.java).build() - WorkManager.getInstance(context).enqueue(accountRemovalWork) - - return WorkManager.getInstance(context).getWorkInfoByIdLiveData(accountRemovalWork.id) - } - - fun checkIfUserIsScheduledForDeletion(data: LoginCompletion): Boolean = - userManager.checkIfUserIsScheduledForDeletion(data.loginName, data.server).blockingGet() - - fun checkIfUserExists(data: LoginCompletion): Boolean = - userManager.checkIfUserExists(data.loginName, data.server).blockingGet() -} diff --git a/app/src/main/java/com/nextcloud/talk/account/data/model/LoginResponseModels.kt b/app/src/main/java/com/nextcloud/talk/account/data/model/LoginResponseModels.kt deleted file mode 100644 index 346a5ff..0000000 --- a/app/src/main/java/com/nextcloud/talk/account/data/model/LoginResponseModels.kt +++ /dev/null @@ -1,12 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.account.data.model - -data class LoginResponse(val token: String, val pollUrl: String, val loginUrl: String) - -data class LoginCompletion(val status: Int, val server: String, val loginName: String, val appPassword: String) diff --git a/app/src/main/java/com/nextcloud/talk/account/data/network/NetworkLoginDataSource.kt b/app/src/main/java/com/nextcloud/talk/account/data/network/NetworkLoginDataSource.kt deleted file mode 100644 index aadd601..0000000 --- a/app/src/main/java/com/nextcloud/talk/account/data/network/NetworkLoginDataSource.kt +++ /dev/null @@ -1,122 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.account.data.network - -import android.util.Log -import com.google.gson.JsonObject -import com.google.gson.JsonParser -import com.nextcloud.talk.account.data.model.LoginCompletion -import com.nextcloud.talk.account.data.model.LoginResponse -import okhttp3.FormBody -import okhttp3.OkHttpClient -import okhttp3.Request -import okhttp3.RequestBody -import java.io.IOException -import javax.net.ssl.SSLHandshakeException - -// This class handles the network and polling logic in isolation, which makes it easier to test -// Login and Authentication is critical, thus it needs to be working properly. -class NetworkLoginDataSource(val okHttpClient: OkHttpClient) { - - companion object { - val TAG: String = NetworkLoginDataSource::class.java.simpleName - } - - fun anonymouslyPostLoginRequest(baseUrl: String): LoginResponse? { - val url = "$baseUrl/index.php/login/v2" - var result: LoginResponse? = null - runCatching { - val response = getResponseOfAnonymouslyPostLoginRequest(url) - val jsonObject: JsonObject = JsonParser.parseString(response).asJsonObject - val loginUrl: String = getLoginUrl(jsonObject) - val token = jsonObject.getAsJsonObject("poll").get("token").asString - val pollUrl = jsonObject.getAsJsonObject("poll").get("endpoint").asString - result = LoginResponse(token, pollUrl, loginUrl) - }.getOrElse { e -> - when (e) { - is SSLHandshakeException, - is NullPointerException, - is IOException -> { - Log.e(TAG, "Error caught at anonymouslyPostLoginRequest: $e") - } - - else -> throw e - } - } - - return result - } - - private fun getResponseOfAnonymouslyPostLoginRequest(url: String): String? { - val request = Request.Builder() - .url(url) - .post(FormBody.Builder().build()) - .addHeader("Clear-Site-Data", "cookies") - .build() - - okHttpClient.newCall(request).execute().use { response -> - if (!response.isSuccessful) { - throw IOException("Unexpected code $response") - } - return response.body?.string() - } - } - - private fun getLoginUrl(response: JsonObject): String { - var result: String? = response.get("login").asString - if (result == null) { - result = "" - } - - return result - } - - fun performLoginFlowV2(response: LoginResponse): LoginCompletion? { - val requestBody: RequestBody = FormBody.Builder() - .add("token", response.token) - .build() - - val request = Request.Builder() - .url(response.pollUrl) - .post(requestBody) - .build() - - var result: LoginCompletion? = null - runCatching { - okHttpClient.newCall(request).execute() - .use { response -> - val status: Int = response.code - val responseBody = response.body?.string() - - result = if (response.isSuccessful && responseBody?.isNotEmpty() == true) { - val jsonObject = JsonParser.parseString(responseBody).asJsonObject - val server: String = jsonObject.get("server").asString - val loginName: String = jsonObject.get("loginName").asString - val appPassword: String = jsonObject.get("appPassword").asString - - LoginCompletion(status, server, loginName, appPassword) - } else { - LoginCompletion(status, "", "", "") - } - } - }.getOrElse { e -> - when (e) { - is NullPointerException, - is SSLHandshakeException, - is IllegalStateException, - is IOException -> { - Log.e(TAG, "Error caught at performLoginFlowV2: $e") - } - - else -> throw e - } - } - - return result - } -} diff --git a/app/src/main/java/com/nextcloud/talk/account/viewmodels/BrowserLoginActivityViewModel.kt b/app/src/main/java/com/nextcloud/talk/account/viewmodels/BrowserLoginActivityViewModel.kt deleted file mode 100644 index b76b27c..0000000 --- a/app/src/main/java/com/nextcloud/talk/account/viewmodels/BrowserLoginActivityViewModel.kt +++ /dev/null @@ -1,92 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Your Name - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.account.viewmodels - -import android.os.Bundle -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.nextcloud.talk.account.data.LoginRepository -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.launch -import javax.inject.Inject - -class BrowserLoginActivityViewModel @Inject constructor(val repository: LoginRepository) : ViewModel() { - - companion object { - private val TAG = BrowserLoginActivityViewModel::class.java.simpleName - } - - sealed class InitialLoginViewState { - data object None : InitialLoginViewState() - data class InitialLoginRequestSuccess(val loginUrl: String) : InitialLoginViewState() - data object InitialLoginRequestError : InitialLoginViewState() - } - - private val _initialLoginRequestState = MutableStateFlow(InitialLoginViewState.None) - val initialLoginRequestState: StateFlow = _initialLoginRequestState - - sealed class PostLoginViewState { - data object None : PostLoginViewState() - data object PostLoginRestartApp : PostLoginViewState() - data object PostLoginError : PostLoginViewState() - data class PostLoginContinue(val data: Bundle) : PostLoginViewState() - } - - private val _postLoginState = MutableStateFlow(PostLoginViewState.None) - val postLoginState: StateFlow = _postLoginState - - fun loginNormally(baseUrl: String, reAuth: Boolean = false) { - viewModelScope.launch { - val response = repository.startLoginFlow(baseUrl, reAuth) - - if (response == null) { - _initialLoginRequestState.value = InitialLoginViewState.InitialLoginRequestError - return@launch - } - - _initialLoginRequestState.value = - InitialLoginViewState.InitialLoginRequestSuccess(response.loginUrl) - - val loginCompletionResponse = repository.pollLogin(response) - - if (loginCompletionResponse == null) { - _postLoginState.value = PostLoginViewState.PostLoginError - return@launch - } - - val bundle = repository.parseAndLogin(loginCompletionResponse) - if (bundle == null) { - _postLoginState.value = PostLoginViewState.PostLoginRestartApp - return@launch - } - - _postLoginState.value = PostLoginViewState.PostLoginContinue(bundle) - } - } - - fun loginWithQR(dataString: String, reAuth: Boolean = false) { - viewModelScope.launch { - val loginCompletionResponse = repository.startLoginFlowFromQR(dataString, reAuth) - if (loginCompletionResponse == null) { - _postLoginState.value = PostLoginViewState.PostLoginError - return@launch - } - - val bundle = repository.parseAndLogin(loginCompletionResponse) - if (bundle == null) { - _postLoginState.value = PostLoginViewState.PostLoginRestartApp - return@launch - } - - _postLoginState.value = PostLoginViewState.PostLoginContinue(bundle) - } - } - - fun cancelLogin() = repository.cancelLoginFlow() -} diff --git a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt index 0b203e3..c85ad6f 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/BaseActivity.kt @@ -17,6 +17,7 @@ import android.text.TextUtils import android.util.Log import android.view.View import android.view.ViewGroup +import android.view.WindowInsets import android.view.WindowManager import android.view.inputmethod.EditorInfo import android.webkit.SslErrorHandler @@ -24,8 +25,6 @@ import android.widget.EditText import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import autodagger.AutoInjector import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.nextcloud.talk.R @@ -120,23 +119,18 @@ open class BaseActivity : AppCompatActivity() { * May be aligned with android-common lib in the future: .../ui/util/extensions/AppCompatActivityExtensions.kt */ fun initSystemBars() { - val decorView = window.decorView - decorView.setOnApplyWindowInsetsListener { view, insets -> + window.decorView.setOnApplyWindowInsetsListener { view, insets -> if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { - val systemBars = insets.getInsets( - WindowInsetsCompat.Type.systemBars() or - WindowInsetsCompat.Type.displayCutout() - ) + val statusBarHeight = insets.getInsets(WindowInsets.Type.statusBars()).top + view.setPadding(0, statusBarHeight, 0, 0) val color = ResourcesCompat.getColor(resources, R.color.bg_default, context.theme) view.setBackgroundColor(color) - view.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) } else { colorizeStatusBar() colorizeNavigationBar() } insets } - ViewCompat.requestApplyInsets(decorView) } open fun colorizeStatusBar() { diff --git a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt index 4d5d3f7..c5af596 100644 --- a/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/activities/MainActivity.kt @@ -10,6 +10,7 @@ package com.nextcloud.talk.activities import android.app.KeyguardManager +import android.content.Context import android.content.Intent import android.os.Bundle import android.provider.ContactsContract @@ -92,7 +93,7 @@ class MainActivity : } fun lockScreenIfConditionsApply() { - val keyguardManager = getSystemService(KEYGUARD_SERVICE) as KeyguardManager + val keyguardManager = getSystemService(Context.KEYGUARD_SERVICE) as KeyguardManager if (keyguardManager.isKeyguardSecure && appPreferences.isScreenLocked) { if (!SecurityUtils.checkIfWeAreAuthenticated(appPreferences.screenLockTimeout)) { val lockIntent = Intent(context, LockedActivity::class.java) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt index 745070b..a51124b 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ConversationItem.kt @@ -22,7 +22,6 @@ import android.view.View import android.widget.RelativeLayout import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat -import coil.dispose import com.nextcloud.talk.R import com.nextcloud.talk.adapters.items.ConversationItem.ConversationItemViewHolder import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication @@ -183,9 +182,7 @@ class ConversationItem( } private fun showAvatar(holder: ConversationItemViewHolder) { - holder.binding.dialogAvatar.dispose() holder.binding.dialogAvatar.visibility = View.VISIBLE - var shouldLoadAvatar = shouldLoadAvatar(holder) if (ConversationEnums.ConversationType.ROOM_SYSTEM == model.type) { holder.binding.dialogAvatar.loadSystemAvatar() diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt index 5de0e72..0fd5b3c 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/MentionAutocompleteItem.kt @@ -221,10 +221,6 @@ class MentionAutocompleteItem( if (statusMessage.isNullOrEmpty()) { holder.binding.conversationInfoStatusMessage.setText(R.string.dnd) } - } else if (status != null && status == StatusType.BUSY.string) { - if (statusMessage.isNullOrEmpty()) { - holder.binding.conversationInfoStatusMessage.setText(R.string.busy) - } } else if (status != null && status == StatusType.AWAY.string) { if (statusMessage.isNullOrEmpty()) { holder.binding.conversationInfoStatusMessage.setText(R.string.away) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt b/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt index 251ec8d..c71a596 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/items/ParticipantItem.kt @@ -276,10 +276,6 @@ class ParticipantItem( if (model.statusMessage == null || model.statusMessage!!.isEmpty()) { holder.binding.conversationInfoStatusMessage.setText(R.string.dnd) } - } else if (model.status != null && model.status == StatusType.BUSY.string) { - if (model.statusMessage == null || model.statusMessage!!.isEmpty()) { - holder.binding.conversationInfoStatusMessage.setText(R.string.busy) - } } else if (model.status != null && model.status == StatusType.AWAY.string) { if (model.statusMessage == null || model.statusMessage!!.isEmpty()) { holder.binding.conversationInfoStatusMessage.setText(R.string.away) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/AdjustableMessageHolderInterface.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/AdjustableMessageHolderInterface.kt index 8ce5187..12bbd1e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/AdjustableMessageHolderInterface.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/AdjustableMessageHolderInterface.kt @@ -22,21 +22,21 @@ interface AdjustableMessageHolderInterface { val binding: ViewBinding - fun adjustIfNoteToSelf(currentConversation: ConversationModel?) { + fun adjustIfNoteToSelf(viewHolder: AdjustableMessageHolderInterface, currentConversation: ConversationModel?) { if (currentConversation?.type == ConversationType.NOTE_TO_SELF) { - when (this.binding.javaClass) { + when (viewHolder.binding.javaClass) { ItemCustomOutcomingTextMessageBinding::class.java -> - (this.binding as ItemCustomOutcomingTextMessageBinding).bubble + (viewHolder.binding as ItemCustomOutcomingTextMessageBinding).bubble ItemCustomOutcomingDeckCardMessageBinding::class.java -> - (this.binding as ItemCustomOutcomingDeckCardMessageBinding).bubble + (viewHolder.binding as ItemCustomOutcomingDeckCardMessageBinding).bubble ItemCustomOutcomingLinkPreviewMessageBinding::class.java -> - (this.binding as ItemCustomOutcomingLinkPreviewMessageBinding).bubble + (viewHolder.binding as ItemCustomOutcomingLinkPreviewMessageBinding).bubble ItemCustomOutcomingPollMessageBinding::class.java -> - (this.binding as ItemCustomOutcomingPollMessageBinding).bubble + (viewHolder.binding as ItemCustomOutcomingPollMessageBinding).bubble ItemCustomOutcomingVoiceMessageBinding::class.java -> - (this.binding as ItemCustomOutcomingVoiceMessageBinding).bubble + (viewHolder.binding as ItemCustomOutcomingVoiceMessageBinding).bubble ItemCustomOutcomingLocationMessageBinding::class.java -> - (this.binding as ItemCustomOutcomingLocationMessageBinding).bubble + (viewHolder.binding as ItemCustomOutcomingLocationMessageBinding).bubble else -> null }?.let { RelativeLayout.LayoutParams(binding.root.layoutParams).apply { diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt index c419f7b..262ca69 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/CommonMessageInterface.kt @@ -12,5 +12,4 @@ interface CommonMessageInterface { fun onLongClickReactions(chatMessage: ChatMessage) fun onClickReaction(chatMessage: ChatMessage, emoji: String) fun onOpenMessageActionsDialog(chatMessage: ChatMessage) - fun openThread(chatMessage: ChatMessage) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt index 5bef49b..503a7b5 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingDeckCardViewHolder.kt @@ -182,7 +182,7 @@ class IncomingDeckCardViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeIncomingMessageBubble(bubble, message.isGrouped, message.isDeleted) } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -229,18 +229,10 @@ class IncomingDeckCardViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeParentMessage( parentChatMessage, message, - binding.messageQuote.quotedChatMessageView + binding.messageQuote.quoteColoredView ) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt index 250b34e..b199317 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLinkPreviewMessageViewHolder.kt @@ -110,19 +110,6 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : itemView.setTag(R.string.replyable_message_view_tag, message.replyable) - val chatActivity = commonMessageInterface as ChatActivity - val showThreadButton = chatActivity.conversationThreadId == null && message.isThread - if (showThreadButton) { - binding.reactions.threadButton.visibility = View.VISIBLE - binding.reactions.threadButton.setContent { - ThreadButtonComposable( - onButtonClick = { openThread(message) } - ) - } - } else { - binding.reactions.threadButton.visibility = View.GONE - } - Reaction().showReactions( message, ::clickOnReaction, @@ -142,10 +129,6 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - private fun openThread(chatMessage: ChatMessage) { - commonMessageInterface.openThread(chatMessage) - } - private fun setAvatarAndAuthorOnMessageItem(message: ChatMessage) { val actorName = message.actorDisplayName if (!actorName.isNullOrBlank()) { @@ -174,7 +157,7 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeIncomingMessageBubble(bubble, message.isGrouped, message.isDeleted) } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -221,18 +204,10 @@ class IncomingLinkPreviewMessageViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeParentMessage( parentChatMessage, message, - binding.messageQuote.quotedChatMessageView + binding.messageQuote.quoteColoredView ) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt index f03c095..3983098 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingLocationMessageViewHolder.kt @@ -142,7 +142,7 @@ class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeIncomingMessageBubble(bubble, message.isGrouped, message.isDeleted) } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -189,18 +189,10 @@ class IncomingLocationMessageViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeParentMessage( parentChatMessage, message, - binding.messageQuote.quotedChatMessageView + binding.messageQuote.quoteColoredView ) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt index 83a06e3..60d0785 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPollMessageViewHolder.kt @@ -81,15 +81,6 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : setPollPreview(message) - val chatActivity = commonMessageInterface as ChatActivity - Thread().showThreadPreview( - chatActivity, - message, - threadBinding = binding.threadTitleWrapper, - reactionsBinding = binding.reactions, - openThread = { openThread(message) } - ) - Reaction().showReactions( message, ::clickOnReaction, @@ -109,10 +100,6 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - private fun openThread(chatMessage: ChatMessage) { - commonMessageInterface.openThread(chatMessage) - } - private fun setPollPreview(message: ChatMessage) { var pollId: String? = null var pollName: String? = null @@ -177,7 +164,7 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeIncomingMessageBubble(bubble, message.isGrouped, message.isDeleted) } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -224,17 +211,9 @@ class IncomingPollMessageViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeParentMessage( parentChatMessage, message, - binding.messageQuote.quotedChatMessageView + binding.messageQuote.quoteColoredView ) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java index 7c13d01..572bd9e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingPreviewMessageViewHolder.java @@ -17,7 +17,6 @@ import android.widget.ProgressBar; import com.google.android.material.card.MaterialCardView; import com.nextcloud.talk.R; import com.nextcloud.talk.databinding.ItemCustomIncomingPreviewMessageBinding; -import com.nextcloud.talk.databinding.ItemThreadTitleBinding; import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding; import com.nextcloud.talk.chat.data.model.ChatMessage; import com.nextcloud.talk.utils.TextMatchers; @@ -139,7 +138,4 @@ public class IncomingPreviewMessageViewHolder extends PreviewMessageViewHolder { @Override public ReactionsInsideMessageBinding getReactionsBinding(){ return binding.reactions; } - - @Override - public ItemThreadTitleBinding getThreadsBinding(){ return binding.threadTitleWrapper; } } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt index ae3f691..4d1b7fc 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingTextMessageViewHolder.kt @@ -146,9 +146,6 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : } binding.messageText.setTextSize(TypedValue.COMPLEX_UNIT_PX, textSize) binding.messageText.text = processedMessageText - // just for debugging: - // binding.messageText.text = - // SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")") } else { binding.messageText.visibility = View.GONE binding.checkboxContainer.visibility = View.VISIBLE @@ -162,35 +159,16 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : binding.messageTime.text = dateUtils.getLocalTimeStringFromTimestamp(message.timestamp) } viewThemeUtils.platform.colorTextView(binding.messageTime, ColorRole.ON_SURFACE_VARIANT) - // parent message handling - val chatActivity = commonMessageInterface as ChatActivity - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - processParentMessage(message) - View.VISIBLE - } else { - View.GONE - } - - binding.messageQuote.quotedChatMessageView.setOnLongClickListener { l: View? -> - commonMessageInterface.onOpenMessageActionsDialog(message) - true + if (!message.isDeleted && message.parentMessageId != null) { + processParentMessage(message) + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE + } else { + binding.messageQuote.quotedChatMessageView.visibility = View.GONE } itemView.setTag(R.string.replyable_message_view_tag, message.replyable) - Thread().showThreadPreview( - chatActivity, - message, - threadBinding = binding.threadTitleWrapper, - reactionsBinding = binding.reactions, - openThread = { openThread(message) } - ) - Reaction().showReactions( message, ::clickOnReaction, @@ -313,10 +291,6 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - private fun openThread(chatMessage: ChatMessage) { - commonMessageInterface.openThread(chatMessage) - } - private fun setAvatarAndAuthorOnMessageItem(message: ChatMessage) { val actorName = message.actorDisplayName if (!actorName.isNullOrBlank()) { @@ -395,7 +369,7 @@ class IncomingTextMessageViewHolder(itemView: View, payload: Any) : viewThemeUtils.talk.themeParentMessage( parentChatMessage, message, - binding.messageQuote.quotedChatMessageView, + binding.messageQuote.quoteColoredView, R.color.high_emphasis_text ) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt index 97d01f6..89a0a2e 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/IncomingVoiceMessageViewHolder.kt @@ -304,7 +304,7 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : ) } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -351,20 +351,10 @@ class IncomingVoiceMessageViewHolder(incomingView: View, payload: Any) : viewThemeUtils.talk.themeParentMessage( parentChatMessage, message, - binding.messageQuote.quotedChatMessageView + binding.messageQuote.quoteColoredView ) binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE - - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt index acfad29..bd6384f 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/LinkPreview.kt @@ -10,10 +10,8 @@ import android.content.Context import android.content.Intent import android.util.Log import android.view.View -import androidx.core.content.ContextCompat import androidx.core.net.toUri import coil.load -import com.nextcloud.talk.R import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.databinding.ReferenceInsideMessageBinding @@ -76,18 +74,12 @@ class LinkPreview { } val referenceThumbUrl = reference.openGraphObject?.thumb - var backgroundId = R.drawable.link_text_background if (!referenceThumbUrl.isNullOrEmpty()) { binding.referenceThumbImage.visibility = View.VISIBLE binding.referenceThumbImage.load(referenceThumbUrl) } else { - backgroundId = R.drawable.link_text_no_preview_background binding.referenceThumbImage.visibility = View.GONE } - binding.referenceMetadataContainer.background = ContextCompat.getDrawable( - binding.referenceMetadataContainer.context, - backgroundId - ) binding.referenceWrapper.setOnClickListener { val browserIntent = Intent(Intent.ACTION_VIEW, referenceLink!!.toUri()) @@ -103,6 +95,7 @@ class LinkPreview { binding.referenceDescription.visibility = View.GONE binding.referenceLink.visibility = View.GONE binding.referenceThumbImage.visibility = View.GONE + binding.referenceIndentedSideBar.visibility = View.GONE } override fun onComplete() { diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingDeckCardViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingDeckCardViewHolder.kt index e4433f3..2aec3b1 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingDeckCardViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingDeckCardViewHolder.kt @@ -170,7 +170,7 @@ class OutcomingDeckCardViewHolder(outcomingView: View) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -217,18 +217,10 @@ class OutcomingDeckCardViewHolder(outcomingView: View) : viewThemeUtils.talk.themeParentMessage( parentChatMessage, message, - binding.messageQuote.quotedChatMessageView + binding.messageQuote.quoteColoredView ) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt index fcf78cf..8d553da 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLinkPreviewMessageViewHolder.kt @@ -127,19 +127,6 @@ class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) : itemView.setTag(R.string.replyable_message_view_tag, message.replyable) - val chatActivity = commonMessageInterface as ChatActivity - val showThreadButton = chatActivity.conversationThreadId == null && message.isThread - if (showThreadButton) { - binding.reactions.threadButton.visibility = View.VISIBLE - binding.reactions.threadButton.setContent { - ThreadButtonComposable( - onButtonClick = { openThread(message) } - ) - } - } else { - binding.reactions.threadButton.visibility = View.GONE - } - Reaction().showReactions( message, ::clickOnReaction, @@ -159,11 +146,7 @@ class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - private fun openThread(chatMessage: ChatMessage) { - commonMessageInterface.openThread(chatMessage) - } - - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -205,21 +188,9 @@ class OutcomingLinkPreviewMessageViewHolder(outcomingView: View, payload: Any) : ) viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage) viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor) - viewThemeUtils.talk.themeParentMessage( - parentChatMessage, - message, - binding.messageQuote.quotedChatMessageView - ) + viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt index 6c91605..d0d38c8 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingLocationMessageViewHolder.kt @@ -196,7 +196,7 @@ class OutcomingLocationMessageViewHolder(incomingView: View) : }) } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -238,21 +238,9 @@ class OutcomingLocationMessageViewHolder(incomingView: View) : ) viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage) viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor) - viewThemeUtils.talk.themeParentMessage( - parentChatMessage, - message, - binding.messageQuote.quotedChatMessageView - ) + viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt index ac952cd..450f36a 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPollMessageViewHolder.kt @@ -39,10 +39,9 @@ import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : - MessageHolders.OutcomingTextMessageViewHolder(outcomingView, payload), - AdjustableMessageHolderInterface { + MessageHolders.OutcomingTextMessageViewHolder(outcomingView, payload) { - override val binding: ItemCustomOutcomingPollMessageBinding = ItemCustomOutcomingPollMessageBinding.bind(itemView) + private val binding: ItemCustomOutcomingPollMessageBinding = ItemCustomOutcomingPollMessageBinding.bind(itemView) @Inject lateinit var context: Context @@ -104,15 +103,6 @@ class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : setPollPreview(message) - val chatActivity = commonMessageInterface as ChatActivity - Thread().showThreadPreview( - chatActivity, - message, - threadBinding = binding.threadTitleWrapper, - reactionsBinding = binding.reactions, - openThread = { openThread(message) } - ) - Reaction().showReactions( message, ::clickOnReaction, @@ -132,10 +122,6 @@ class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - private fun openThread(chatMessage: ChatMessage) { - commonMessageInterface.openThread(chatMessage) - } - private fun setPollPreview(message: ChatMessage) { var pollId: String? = null var pollName: String? = null @@ -172,7 +158,7 @@ class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : } } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -214,21 +200,9 @@ class OutcomingPollMessageViewHolder(outcomingView: View, payload: Any) : ) viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage) viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor) - viewThemeUtils.talk.themeParentMessage( - parentChatMessage, - message, - binding.messageQuote.quotedChatMessageView - ) + viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java index 17b1c55..eb7d544 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingPreviewMessageViewHolder.java @@ -16,7 +16,6 @@ import android.widget.ProgressBar; import com.google.android.material.card.MaterialCardView; import com.nextcloud.talk.R; import com.nextcloud.talk.databinding.ItemCustomOutcomingPreviewMessageBinding; -import com.nextcloud.talk.databinding.ItemThreadTitleBinding; import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding; import com.nextcloud.talk.chat.data.model.ChatMessage; import com.nextcloud.talk.utils.TextMatchers; @@ -134,9 +133,6 @@ public class OutcomingPreviewMessageViewHolder extends PreviewMessageViewHolder @Override public ReactionsInsideMessageBinding getReactionsBinding() { return binding.reactions; } - @Override - public ItemThreadTitleBinding getThreadsBinding(){ return binding.threadTitleWrapper; } - @NonNull @Override public EmojiTextView getMessageCaption() { return binding.messageCaption; } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt index 755d32a..669ecfc 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingTextMessageViewHolder.kt @@ -160,9 +160,6 @@ class OutcomingTextMessageViewHolder(itemView: View) : binding.messageTime.layoutParams = layoutParams viewThemeUtils.platform.colorTextView(binding.messageText, ColorRole.ON_SURFACE_VARIANT) binding.messageText.text = processedMessageText - // just for debugging: - // binding.messageText.text = - // SpannableStringBuilder(processedMessageText).append(" (" + message.jsonMessageId + ")") } else { binding.messageText.visibility = View.GONE binding.checkboxContainer.visibility = View.VISIBLE @@ -177,23 +174,12 @@ class OutcomingTextMessageViewHolder(itemView: View) : } viewThemeUtils.platform.colorTextView(binding.messageTime, ColorRole.ON_SURFACE_VARIANT) setBubbleOnChatMessage(message) - // parent message handling - val chatActivity = commonMessageInterface as ChatActivity - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - processParentMessage(message) - View.VISIBLE - } else { - View.GONE - } - - binding.messageQuote.quotedChatMessageView.setOnLongClickListener { l: View? -> - commonMessageInterface.onOpenMessageActionsDialog(message) - true + if (!message.isDeleted && message.parentMessageId != null) { + processParentMessage(message) + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE + } else { + binding.messageQuote.quotedChatMessageView.visibility = View.GONE } binding.checkMark.visibility = View.INVISIBLE @@ -209,6 +195,8 @@ class OutcomingTextMessageViewHolder(itemView: View) : updateStatus(R.drawable.ic_check, context.resources?.getString(R.string.nc_message_sent)) } + val chatActivity = commonMessageInterface as ChatActivity + chatActivity.lifecycleScope.launch { if (message.isTemporary && !networkMonitor.isOnline.value) { updateStatus( @@ -220,14 +208,6 @@ class OutcomingTextMessageViewHolder(itemView: View) : itemView.setTag(R.string.replyable_message_view_tag, message.replyable) - Thread().showThreadPreview( - chatActivity, - message, - threadBinding = binding.threadTitleWrapper, - reactionsBinding = binding.reactions, - openThread = { openThread(message) } - ) - Reaction().showReactions( message, ::clickOnReaction, @@ -365,10 +345,6 @@ class OutcomingTextMessageViewHolder(itemView: View) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - private fun openThread(chatMessage: ChatMessage) { - commonMessageInterface.openThread(chatMessage) - } - @Suppress("Detekt.TooGenericExceptionCaught") private fun processParentMessage(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { @@ -413,11 +389,7 @@ class OutcomingTextMessageViewHolder(itemView: View) : viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage) viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor) - viewThemeUtils.talk.themeParentMessage( - parentChatMessage, - message, - binding.messageQuote.quotedChatMessageView - ) + viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView) binding.messageQuote.quotedChatMessageView.setOnClickListener { chatActivity.jumpToQuotedMessage(parentChatMessage) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt index 09ef5c0..184c096 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/OutcomingVoiceMessageViewHolder.kt @@ -307,7 +307,7 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) : binding.progressBar.visibility = View.VISIBLE } - @Suppress("Detekt.TooGenericExceptionCaught", "Detekt.LongMethod") + @Suppress("Detekt.TooGenericExceptionCaught") private fun setParentMessageDataOnMessageItem(message: ChatMessage) { if (message.parentMessageId != null && !message.isDeleted) { CoroutineScope(Dispatchers.Main).launch { @@ -349,21 +349,9 @@ class OutcomingVoiceMessageViewHolder(outcomingView: View) : ) viewThemeUtils.talk.colorOutgoingQuoteText(binding.messageQuote.quotedMessage) viewThemeUtils.talk.colorOutgoingQuoteAuthorText(binding.messageQuote.quotedMessageAuthor) - viewThemeUtils.talk.themeParentMessage( - parentChatMessage, - message, - binding.messageQuote.quotedChatMessageView - ) + viewThemeUtils.talk.colorOutgoingQuoteBackground(binding.messageQuote.quoteColoredView) - binding.messageQuote.quotedChatMessageView.visibility = - if (!message.isDeleted && - message.parentMessageId != null && - message.parentMessageId != chatActivity.conversationThreadId - ) { - View.VISIBLE - } else { - View.GONE - } + binding.messageQuote.quotedChatMessageView.visibility = View.VISIBLE } catch (e: Exception) { Log.d(TAG, "Error when processing parent message in view holder", e) } diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt index 9449526..605ac20 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/PreviewMessageViewHolder.kt @@ -28,10 +28,8 @@ import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedApplication -import com.nextcloud.talk.chat.ChatActivity import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.databinding.ItemThreadTitleBinding import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding import com.nextcloud.talk.extensions.loadChangelogBotAvatar import com.nextcloud.talk.extensions.loadFederatedUserAvatar @@ -80,7 +78,6 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) : var okHttpClient: OkHttpClient? = null open var progressBar: ProgressBar? = null open var reactionsBinding: ReactionsInsideMessageBinding? = null - open var threadsBinding: ItemThreadTitleBinding? = null var fileViewerUtils: FileViewerUtils? = null var clickView: View? = null @@ -153,16 +150,6 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) : messageText.text = "" } itemView.setTag(R.string.replyable_message_view_tag, message.replyable) - - val chatActivity = commonMessageInterface as ChatActivity - Thread().showThreadPreview( - chatActivity, - message, - threadBinding = threadsBinding!!, - reactionsBinding = reactionsBinding!!, - openThread = { openThread(message) } - ) - val paddingSide = DisplayUtils.convertDpToPixel(HORIZONTAL_REACTION_PADDING, context!!).toInt() Reaction().showReactions( message, @@ -216,10 +203,6 @@ abstract class PreviewMessageViewHolder(itemView: View?, payload: Any?) : commonMessageInterface.onClickReaction(chatMessage, emoji) } - private fun openThread(chatMessage: ChatMessage) { - commonMessageInterface.openThread(chatMessage) - } - override fun getPayloadForImageLoader(message: ChatMessage?): Any? { if (message!!.selectedIndividualHashMap!!.containsKey(KEY_CONTACT_NAME)) { previewContainer.visibility = View.GONE diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt index 883642d..baf82d2 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/SystemMessageViewHolder.kt @@ -14,7 +14,6 @@ import android.text.SpannableString import android.text.TextPaint import android.text.method.LinkMovementMethod import android.text.style.ClickableSpan -import android.util.TypedValue import android.view.View import android.view.ViewGroup import androidx.core.content.ContextCompat @@ -77,10 +76,6 @@ class SystemMessageViewHolder(itemView: View) : R.drawable.shape_grouped_incoming_message ) ViewCompat.setBackground(background, bubbleDrawable) - binding.messageText.setTextSize( - TypedValue.COMPLEX_UNIT_PX, - resources.getDimension(R.dimen.chat_system_message_text_size) - ) var messageString: Spannable = SpannableString(message.text) if (message.messageParameters != null && message.messageParameters!!.size > 0) { for (key in message.messageParameters!!.keys) { @@ -94,13 +89,7 @@ class SystemMessageViewHolder(itemView: View) : } else { individualMap["name"] } - messageString = - DisplayUtils.searchAndColor( - messageString, - searchText!!, - mentionColor, - resources.getDimensionPixelSize(R.dimen.chat_system_message_text_size) - ) + messageString = DisplayUtils.searchAndColor(messageString, searchText!!, mentionColor) if (individualMap["link"] != null) { val displayName = individualMap["name"] ?: "" val link = (user.baseUrl + individualMap["link"]) diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java b/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java index a51dde4..3d76091 100644 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java +++ b/app/src/main/java/com/nextcloud/talk/adapters/messages/TalkMessagesListAdapter.java @@ -39,19 +39,19 @@ public class TalkMessagesListAdapter extends MessagesListAda holderInstance.assignCommonMessageInterface(chatActivity); } else if (holder instanceof OutcomingTextMessageViewHolder holderInstance) { holderInstance.assignCommonMessageInterface(chatActivity); - holderInstance.adjustIfNoteToSelf(chatActivity.getCurrentConversation()); + holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation()); } else if (holder instanceof IncomingLocationMessageViewHolder holderInstance) { holderInstance.assignCommonMessageInterface(chatActivity); } else if (holder instanceof OutcomingLocationMessageViewHolder holderInstance) { holderInstance.assignCommonMessageInterface(chatActivity); - holderInstance.adjustIfNoteToSelf(chatActivity.getCurrentConversation()); + holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation()); } else if (holder instanceof IncomingLinkPreviewMessageViewHolder holderInstance) { holderInstance.assignCommonMessageInterface(chatActivity); } else if (holder instanceof OutcomingLinkPreviewMessageViewHolder holderInstance) { holderInstance.assignCommonMessageInterface(chatActivity); - holderInstance.adjustIfNoteToSelf(chatActivity.getCurrentConversation()); + holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation()); } else if (holder instanceof IncomingVoiceMessageViewHolder holderInstance) { holderInstance.assignVoiceMessageInterface(chatActivity); @@ -59,7 +59,7 @@ public class TalkMessagesListAdapter extends MessagesListAda } else if (holder instanceof OutcomingVoiceMessageViewHolder holderInstance) { holderInstance.assignVoiceMessageInterface(chatActivity); holderInstance.assignCommonMessageInterface(chatActivity); - holderInstance.adjustIfNoteToSelf(chatActivity.getCurrentConversation()); + holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation()); } else if (holder instanceof PreviewMessageViewHolder holderInstance) { holderInstance.assignPreviewMessageInterface(chatActivity); @@ -72,13 +72,7 @@ public class TalkMessagesListAdapter extends MessagesListAda holderInstance.assignCommonMessageInterface(chatActivity); } else if (holder instanceof OutcomingDeckCardViewHolder holderInstance) { holderInstance.assignCommonMessageInterface(chatActivity); - holderInstance.adjustIfNoteToSelf(chatActivity.getCurrentConversation()); - - } else if (holder instanceof IncomingPollMessageViewHolder holderInstance) { - holderInstance.assignCommonMessageInterface(chatActivity); - } else if (holder instanceof OutcomingPollMessageViewHolder holderInstance) { - holderInstance.assignCommonMessageInterface(chatActivity); - holderInstance.adjustIfNoteToSelf(chatActivity.getCurrentConversation()); + holderInstance.adjustIfNoteToSelf(holderInstance, chatActivity.getCurrentConversation()); } super.onBindViewHolder(holder, position); diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/Thread.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/Thread.kt deleted file mode 100644 index f2f6820..0000000 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/Thread.kt +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2022 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.adapters.messages - -import android.view.View -import com.nextcloud.talk.R -import com.nextcloud.talk.chat.ChatActivity -import com.nextcloud.talk.databinding.ReactionsInsideMessageBinding -import com.nextcloud.talk.chat.data.model.ChatMessage -import com.nextcloud.talk.databinding.ItemThreadTitleBinding - -class Thread { - - fun showThreadPreview( - chatActivity: ChatActivity, - message: ChatMessage, - threadBinding: ItemThreadTitleBinding, - reactionsBinding: ReactionsInsideMessageBinding, - openThread: (message: ChatMessage) -> Unit - ) { - val isFirstMessageOfThreadInNormalChat = chatActivity.conversationThreadId == null && message.isThread - if (isFirstMessageOfThreadInNormalChat) { - threadBinding.threadTitleLayout.visibility = View.VISIBLE - - threadBinding.threadTitleLayout.findViewById(R.id.threadTitle).text = - message.threadTitle - - reactionsBinding.threadButton.visibility = View.VISIBLE - - reactionsBinding.threadButton.setContent { - ThreadButtonComposable( - message.threadReplies ?: 0, - onButtonClick = { openThread(message) } - ) - } - } else { - threadBinding.threadTitleLayout.visibility = View.GONE - reactionsBinding.threadButton.visibility = View.GONE - } - } -} diff --git a/app/src/main/java/com/nextcloud/talk/adapters/messages/ThreadButton.kt b/app/src/main/java/com/nextcloud/talk/adapters/messages/ThreadButton.kt deleted file mode 100644 index 22481bd..0000000 --- a/app/src/main/java/com/nextcloud/talk/adapters/messages/ThreadButton.kt +++ /dev/null @@ -1,88 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.adapters.messages - -import androidx.compose.foundation.BorderStroke -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.Icon -import androidx.compose.material3.OutlinedButton -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Modifier -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.res.pluralStringResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.nextcloud.talk.R - -@Composable -fun ThreadButtonComposable(replyAmount: Int = 0, onButtonClick: () -> Unit = {}) { - val replyAmountText = if (replyAmount == 0) { - stringResource(R.string.thread_reply) - } else { - pluralStringResource( - R.plurals.thread_replies, - replyAmount, - replyAmount - ) - } - - OutlinedButton( - onClick = onButtonClick, - modifier = Modifier - .padding(8.dp) - .height(24.dp), - shape = RoundedCornerShape(9.dp), - border = BorderStroke(1.dp, colorResource(R.color.grey_600)), - contentPadding = PaddingValues(0.dp), - colors = ButtonDefaults.outlinedButtonColors( - containerColor = Color.Transparent, - contentColor = colorResource(R.color.grey_600) - ) - ) { - Icon( - painter = painterResource(R.drawable.ic_reply), - contentDescription = stringResource(R.string.open_thread), - modifier = Modifier - .size(20.dp) - .padding(start = 5.dp, end = 2.dp), - tint = colorResource(R.color.grey_600) - ) - Text( - text = replyAmountText, - modifier = Modifier - .padding(end = 5.dp) - ) - } -} - -@Preview -@Composable -fun ThreadButtonPreviewMultipleReplies() { - ThreadButtonComposable(2) -} - -@Preview -@Composable -fun ThreadButtonPreviewOneReply() { - ThreadButtonComposable(1) -} - -@Preview -@Composable -fun ThreadButtonPreviewZeroReplies() { - ThreadButtonComposable(0) -} diff --git a/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt b/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt index 4211aa2..a2e58dc 100644 --- a/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt +++ b/app/src/main/java/com/nextcloud/talk/api/NcApiCoroutines.kt @@ -19,8 +19,6 @@ import com.nextcloud.talk.models.json.participants.TalkBan import com.nextcloud.talk.models.json.participants.TalkBanOverall import com.nextcloud.talk.models.json.profile.ProfileOverall import com.nextcloud.talk.models.json.testNotification.TestNotificationOverall -import com.nextcloud.talk.models.json.threads.ThreadOverall -import com.nextcloud.talk.models.json.threads.ThreadsOverall import com.nextcloud.talk.models.json.userAbsence.UserAbsenceOverall import okhttp3.MultipartBody import okhttp3.RequestBody @@ -148,8 +146,7 @@ interface NcApiCoroutines { @Field("actorDisplayName") actorDisplayName: String, @Field("replyTo") replyTo: Int, @Field("silent") sendWithoutNotification: Boolean, - @Field("referenceId") referenceId: String, - @Field("threadTitle") threadTitle: String? + @Field("referenceId") referenceId: String ): ChatOverallSingleMessage @FormUrlEncoded @@ -288,22 +285,4 @@ interface NcApiCoroutines { @DELETE suspend fun unbindRoom(@Header("Authorization") authorization: String, @Url url: String): GenericOverall - - @GET - suspend fun getThreads( - @Header("Authorization") authorization: String, - @Url url: String, - @Query("limit") limit: Int? - ): ThreadsOverall - - @GET - suspend fun getThread(@Header("Authorization") authorization: String, @Url url: String): ThreadOverall - - @FormUrlEncoded - @POST - suspend fun setThreadNotificationLevel( - @Header("Authorization") authorization: String, - @Url url: String, - @Field("level") level: Int - ): ThreadOverall } diff --git a/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt b/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt index ddf9859..e8617bf 100644 --- a/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt +++ b/app/src/main/java/com/nextcloud/talk/call/components/ParticipantTile.kt @@ -50,7 +50,7 @@ fun ParticipantTile( modifier: Modifier = Modifier, isVoiceOnlyCall: Boolean ) { - val colorInt = ColorGenerator.usernameToColor(participantUiState.nick) + val colorInt = ColorGenerator.shared.usernameToColor(participantUiState.nick) BoxWithConstraints( modifier = modifier diff --git a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt index 6477727..f018524 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/ChatActivity.kt @@ -24,14 +24,12 @@ import android.content.pm.PackageManager import android.content.res.AssetFileDescriptor import android.database.Cursor import android.graphics.drawable.Drawable -import android.location.LocationManager import android.net.Uri import android.os.Build import android.os.Bundle import android.os.Handler import android.provider.ContactsContract import android.provider.MediaStore -import android.provider.Settings import android.text.SpannableStringBuilder import android.text.TextUtils import android.util.Log @@ -40,7 +38,6 @@ import android.view.Menu import android.view.MenuItem import android.view.View import android.view.ViewGroup -import android.view.WindowManager import android.view.animation.AccelerateDecelerateInterpolator import android.widget.AbsListView import android.widget.FrameLayout @@ -59,12 +56,7 @@ import androidx.activity.result.contract.ActivityResultContracts.PickVisualMedia import androidx.appcompat.app.AlertDialog import androidx.appcompat.view.ContextThemeWrapper import androidx.cardview.widget.CardView -import androidx.compose.material3.MaterialTheme -import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.setValue -import androidx.compose.ui.platform.ComposeView -import androidx.coordinatorlayout.widget.CoordinatorLayout import androidx.core.content.FileProvider import androidx.core.content.PermissionChecker import androidx.core.content.PermissionChecker.PERMISSION_GRANTED @@ -156,13 +148,11 @@ import com.nextcloud.talk.models.json.chat.ReadStatus import com.nextcloud.talk.models.json.conversations.ConversationEnums import com.nextcloud.talk.models.json.participants.Participant import com.nextcloud.talk.models.json.signaling.settings.SignalingSettingsOverall -import com.nextcloud.talk.models.json.threads.ThreadInfo import com.nextcloud.talk.polls.ui.PollCreateDialogFragment import com.nextcloud.talk.remotefilebrowser.activities.RemoteFileBrowserActivity import com.nextcloud.talk.shareditems.activities.SharedItemsActivity import com.nextcloud.talk.signaling.SignalingMessageReceiver import com.nextcloud.talk.signaling.SignalingMessageSender -import com.nextcloud.talk.threadsoverview.ThreadsOverviewActivity import com.nextcloud.talk.translate.ui.TranslateActivity import com.nextcloud.talk.ui.PlaybackSpeed import com.nextcloud.talk.ui.PlaybackSpeedControl @@ -207,7 +197,6 @@ import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_RECORDING_STATE import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_START_CALL_AFTER_ROOM_SWITCH import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_SWITCH_TO_ROOM -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_THREAD_ID import com.nextcloud.talk.utils.permissions.PlatformPermissionUtil import com.nextcloud.talk.utils.rx.DisposableSet import com.nextcloud.talk.utils.singletons.ApplicationWideCurrentRoomHolder @@ -246,7 +235,6 @@ import java.util.Locale import java.util.concurrent.ExecutionException import javax.inject.Inject import kotlin.math.roundToInt -import androidx.core.content.ContextCompat @Suppress("TooManyFunctions") @AutoInjector(NextcloudTalkApplication::class) @@ -291,9 +279,6 @@ class ChatActivity : private var chatMenu: Menu? = null - private var overflowMenuHostView: ComposeView? = null - private var isThreadMenuExpanded by mutableStateOf(false) - private val startSelectContactForResult = registerForActivityResult( ActivityResultContracts .StartActivityForResult() @@ -365,8 +350,6 @@ class ChatActivity : var sessionIdAfterRoomJoined: String? = null lateinit var roomToken: String - var conversationThreadId: Long? = null - var conversationThreadInfo: ThreadInfo? = null var conversationUser: User? = null lateinit var spreedCapabilities: SpreedCapability var chatApiVersion: Int = 1 @@ -408,14 +391,8 @@ class ChatActivity : private val onBackPressedCallback = object : OnBackPressedCallback(true) { override fun handleOnBackPressed() { - if (isChatThread()) { - isEnabled = false - onBackPressedDispatcher.onBackPressed() - } else { - val intent = Intent(this@ChatActivity, ConversationsListActivity::class.java) - intent.putExtras(Bundle()) - startActivity(intent) - } + val intent = Intent(this@ChatActivity, ConversationsListActivity::class.java) + startActivity(intent) } } @@ -484,20 +461,18 @@ class ChatActivity : setContentView(binding.root) if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { - ViewCompat.setOnApplyWindowInsetsListener(binding.chatContainer) { view, insets -> - val systemBarInsets = insets.getInsets( - WindowInsetsCompat.Type.systemBars() or - WindowInsetsCompat.Type.displayCutout() - ) + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.chat_container)) { view, insets -> + val statusBarInsets = insets.getInsets(WindowInsetsCompat.Type.statusBars()) + val navBarInsets = insets.getInsets(WindowInsetsCompat.Type.navigationBars()) val imeInsets = insets.getInsets(WindowInsetsCompat.Type.ime()) val isKeyboardVisible = insets.isVisible(WindowInsetsCompat.Type.ime()) - val bottomPadding = if (isKeyboardVisible) imeInsets.bottom else systemBarInsets.bottom + val bottomPadding = if (isKeyboardVisible) imeInsets.bottom else navBarInsets.bottom view.setPadding( - systemBarInsets.left, - systemBarInsets.top, - systemBarInsets.right, + view.paddingLeft, + statusBarInsets.top, + view.paddingRight, bottomPadding ) WindowInsetsCompat.CONSUMED @@ -519,20 +494,9 @@ class ChatActivity : chatViewModel.initData( credentials!!, urlForChatting, - roomToken, - conversationThreadId + roomToken ) - conversationThreadId?.let { - val threadUrl = ApiUtils.getUrlForThread( - version = 1, - baseUrl = conversationUser!!.baseUrl, - token = roomToken, - threadId = it.toInt() - ) - chatViewModel.getThread(credentials, threadUrl) - } - messageInputFragment = getMessageInputFragment() messageInputViewModel = ViewModelProvider(this, viewModelFactory)[MessageInputViewModel::class.java] messageInputViewModel.setData(chatViewModel.getChatRepository()) @@ -557,7 +521,6 @@ class ChatActivity : return MessageInputFragment().apply { arguments = Bundle().apply { putString(CONVERSATION_INTERNAL_ID, internalId) - putString(BundleKeys.KEY_SHARED_TEXT, sharedText) } } } @@ -586,12 +549,6 @@ class ChatActivity : roomToken = extras?.getString(KEY_ROOM_TOKEN).orEmpty() - conversationThreadId = if (extras?.containsKey(KEY_THREAD_ID) == true) { - extras.getLong(KEY_THREAD_ID) - } else { - null - } - sharedText = extras?.getString(BundleKeys.KEY_SHARED_TEXT).orEmpty() Log.d(TAG, " roomToken = $roomToken") @@ -714,8 +671,7 @@ class ChatActivity : joinRoomWithPassword() if (conversationUser?.userId != "?" && - hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.MENTION_FLAG) && - !isChatThread() + hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.MENTION_FLAG) ) { binding.chatToolbar.setOnClickListener { _ -> showConversationInfoScreen() } } @@ -981,7 +937,6 @@ class ChatActivity : var chatMessageList = triple.third chatMessageList = handleSystemMessages(chatMessageList) - chatMessageList = handleThreadMessages(chatMessageList) if (chatMessageList.isEmpty()) { return@onEach } @@ -1152,11 +1107,6 @@ class ChatActivity : chatViewModel.getVoiceRecordingInProgress.observe(this) { voiceRecordingInProgress -> VibrationUtils.vibrateShort(context) - if (voiceRecordingInProgress) { - window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - } else { - window.clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON) - } binding.voiceRecordingLock.visibility = if ( voiceRecordingInProgress && chatViewModel.getVoiceRecordingLocked.value != true @@ -1183,7 +1133,6 @@ class ChatActivity : chatMenu?.removeItem(R.id.conversation_event) } - is ChatViewModel.UnbindRoomUiState.Error -> { Snackbar.make( binding.root, @@ -1191,8 +1140,7 @@ class ChatActivity : Snackbar.LENGTH_LONG ).show() } - - else -> {} + else -> { } } } @@ -1286,25 +1234,6 @@ class ChatActivity : } } } - - this.lifecycleScope.launch { - chatViewModel.threadRetrieveState.collect { uiState -> - when (uiState) { - ChatViewModel.ThreadRetrieveUiState.None -> { - } - - is ChatViewModel.ThreadRetrieveUiState.Error -> { - Log.e(TAG, "Error when retrieving thread", uiState.exception) - Snackbar.make(binding.root, R.string.nc_common_error_sorry, Snackbar.LENGTH_LONG).show() - } - - is ChatViewModel.ThreadRetrieveUiState.Success -> { - conversationThreadInfo = uiState.thread - invalidateOptionsMenu() - } - } - } - } } private fun removeUnreadMessagesMarker() { @@ -1574,7 +1503,6 @@ class ChatActivity : } while (true && pos >= 0) } - @Suppress("LongMethod") private fun initMessageHolders(): MessageHolders { val messageHolders = MessageHolders() val profileBottomSheet = ProfileBottomSheet(ncApi, conversationUser!!, viewThemeUtils) @@ -2343,26 +2271,11 @@ class ChatActivity : BuildConfig.APPLICATION_ID, File(file.absolutePath) ) - uploadFile( - fileUri = shareUri.toString(), - isVoiceMessage = false, - caption = "", - roomToken = roomToken, - replyToMessageId = getReplyToMessageId(), - displayName = currentConversation?.displayName ?: "" - ) + uploadFile(shareUri.toString(), false) } cursor?.close() } - fun getReplyToMessageId(): Int { - var replyMessageId = messageInputViewModel.getReplyChatMessage.value?.id?.toInt() - if (replyMessageId == null || replyMessageId == 0) { - replyMessageId = conversationThreadInfo?.thread?.id ?: 0 - } - return replyMessageId - } - @Throws(IllegalStateException::class) private fun onPickCameraResult(intent: Intent?) { try { @@ -2534,27 +2447,35 @@ class ChatActivity : private fun uploadFiles(files: MutableList, caption: String = "") { for (i in 0 until files.size) { if (i == files.size - 1) { - uploadFile( - fileUri = files[i], - isVoiceMessage = false, - caption = caption, - roomToken = roomToken, - replyToMessageId = getReplyToMessageId(), - displayName = currentConversation?.displayName!! - ) + uploadFile(files[i], false, caption) } else { - uploadFile( - fileUri = files[i], - isVoiceMessage = false, - caption = "", - roomToken = roomToken, - replyToMessageId = getReplyToMessageId(), - displayName = currentConversation?.displayName!! - ) + uploadFile(files[i], false) } } } + private fun uploadFile(fileUri: String, isVoiceMessage: Boolean, caption: String = "", token: String = "") { + var metaData = "" + var room = "" + + if (!participantPermissions.hasChatPermission()) { + Log.w(TAG, "uploading file(s) is forbidden because of missing attendee permissions") + return + } + + if (isVoiceMessage) { + metaData = VOICE_MESSAGE_META_DATA + } + + if (caption != "") { + metaData = "{\"caption\":\"$caption\"}" + } + + if (token == "") room = roomToken else room = token + + chatViewModel.uploadFile(fileUri, room, currentConversation?.displayName!!, metaData) + } + fun showGalleryPicker() { pickMultipleMedia.launch(PickVisualMediaRequest(PickVisualMedia.ImageAndVideo)) } @@ -2595,67 +2516,10 @@ class ChatActivity : fun showShareLocationScreen() { Log.d(TAG, "showShareLocationScreen") - val locationManager = getSystemService(LOCATION_SERVICE) as LocationManager - val isGpsEnabled = locationManager.isProviderEnabled(LocationManager.GPS_PROVIDER) - - if (!isGpsEnabled) { - showLocationServicesDisabledDialog() - } else if (!permissionUtil.isLocationPermissionGranted()) { - showLocationPermissionDeniedDialog() - } - - if (permissionUtil.isLocationPermissionGranted() && isGpsEnabled) { - val intent = Intent(this, LocationPickerActivity::class.java) - intent.putExtra(KEY_ROOM_TOKEN, roomToken) - intent.putExtra(BundleKeys.KEY_CHAT_API_VERSION, chatApiVersion) - startActivity(intent) - } - } - - private fun showLocationServicesDisabledDialog() { - val title = resources.getString(R.string.location_services_disabled) - val explanation = resources.getString(R.string.location_services_disabled_msg) - val positive = resources.getString(R.string.nc_permissions_settings) - val cancel = resources.getString(R.string.nc_cancel) - val dialogBuilder = MaterialAlertDialogBuilder(this) - .setTitle(title) - .setMessage(explanation) - .setPositiveButton(positive) { _, _ -> - val intent = Intent(Settings.ACTION_LOCATION_SOURCE_SETTINGS) - startActivity(intent) - } - .setNegativeButton(cancel, null) - - viewThemeUtils.dialog.colorMaterialAlertDialogBackground(this, dialogBuilder) - val dialog = dialogBuilder.show() - viewThemeUtils.platform.colorTextButtons( - dialog.getButton(AlertDialog.BUTTON_POSITIVE), - dialog.getButton(AlertDialog.BUTTON_NEGATIVE) - ) - } - - private fun showLocationPermissionDeniedDialog() { - val title = resources.getString(R.string.location_permission_denied) - val explanation = resources.getString(R.string.location_permission_denied_msg) - val positive = resources.getString(R.string.nc_permissions_settings) - val cancel = resources.getString(R.string.nc_cancel) - val dialogBuilder = MaterialAlertDialogBuilder(this) - .setTitle(title) - .setMessage(explanation) - .setPositiveButton(positive) { _, _ -> - val intent = Intent(Settings.ACTION_APPLICATION_DETAILS_SETTINGS).apply { - data = Uri.fromParts("package", packageName, null) - } - startActivity(intent) - } - .setNegativeButton(cancel, null) - - viewThemeUtils.dialog.colorMaterialAlertDialogBackground(this, dialogBuilder) - val dialog = dialogBuilder.show() - viewThemeUtils.platform.colorTextButtons( - dialog.getButton(AlertDialog.BUTTON_POSITIVE), - dialog.getButton(AlertDialog.BUTTON_NEGATIVE) - ) + val intent = Intent(this, LocationPickerActivity::class.java) + intent.putExtra(KEY_ROOM_TOKEN, roomToken) + intent.putExtra(BundleKeys.KEY_CHAT_API_VERSION, chatApiVersion) + startActivity(intent) } private fun showConversationInfoScreen() { @@ -2723,7 +2587,6 @@ class ChatActivity : if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) { mentionAutocomplete?.dismissPopup() } - adapter = null } private fun isActivityNotChangingConfigurations(): Boolean = !isChangingConfigurations @@ -2737,9 +2600,7 @@ class ChatActivity : viewThemeUtils.platform.colorTextView(title, ColorRole.ON_SURFACE) title.text = - if (isChatThread()) { - conversationThreadInfo?.thread?.title - } else if (currentConversation?.displayName != null) { + if (currentConversation?.displayName != null) { try { EmojiCompat.get().process(currentConversation?.displayName as CharSequence).toString() } catch (e: java.lang.IllegalStateException) { @@ -2750,16 +2611,7 @@ class ChatActivity : "" } - if (isChatThread()) { - val replyAmount = conversationThreadInfo?.thread?.numReplies ?: 0 - val repliesAmountTitle = resources.getQuantityString( - R.plurals.thread_replies, - replyAmount, - replyAmount - ) - - statusMessageViewContents(repliesAmountTitle) - } else if (currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) { + if (currentConversation?.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL) { var statusMessage = "" if (currentConversation?.statusIcon != null) { statusMessage += currentConversation?.statusIcon @@ -3249,21 +3101,11 @@ class ChatActivity : } val searchItem = menu.findItem(R.id.conversation_search) + searchItem.isVisible = CapabilitiesUtil.isUnifiedSearchAvailable(spreedCapabilities) && - currentConversation!!.remoteServer.isNullOrEmpty() && - !isChatThread() + currentConversation!!.remoteServer.isNullOrEmpty() - val sharedItemsItem = menu.findItem(R.id.shared_items) - sharedItemsItem.isVisible = !isChatThread() - - val conversationInfoItem = menu.findItem(R.id.conversation_info) - conversationInfoItem.isVisible = !isChatThread() - - val showThreadsItem = menu.findItem(R.id.show_threads) - showThreadsItem.isVisible = !isChatThread() && - hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.THREADS) - - if (CapabilitiesUtil.isAbleToCall(spreedCapabilities) && !isChatThread()) { + if (CapabilitiesUtil.isAbleToCall(spreedCapabilities)) { conversationVoiceCallMenuItem = menu.findItem(R.id.conversation_voice_call) conversationVideoMenuItem = menu.findItem(R.id.conversation_video_call) @@ -3294,24 +3136,10 @@ class ChatActivity : menu.removeItem(R.id.conversation_video_call) menu.removeItem(R.id.conversation_voice_call) } - - handleThreadNotificationIcon(menu.findItem(R.id.thread_notifications)) } return true } - private fun handleThreadNotificationIcon(threadNotificationItem: MenuItem) { - threadNotificationItem.isVisible = isChatThread() && - hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.THREADS) - - val threadNotificationIcon = when (conversationThreadInfo?.attendee?.notificationLevel) { - 1 -> R.drawable.outline_notifications_active_24 - 3 -> R.drawable.ic_baseline_notifications_off_24 - else -> R.drawable.baseline_notifications_24 - } - threadNotificationItem.icon = ContextCompat.getDrawable(context, threadNotificationIcon) - } - override fun onOptionsItemSelected(item: MenuItem): Boolean = when (item.itemId) { R.id.conversation_video_call -> { @@ -3341,105 +3169,15 @@ class ChatActivity : R.id.conversation_event -> { val anchorView = findViewById(R.id.conversation_event) - showConversationEventMenu(anchorView) - true - } - - R.id.show_threads -> { - openThreadsOverview() - true - } - - R.id.thread_notifications -> { - showThreadNotificationMenu() + showPopupWindow(anchorView) true } else -> super.onOptionsItemSelected(item) } - @Suppress("Detekt.LongMethod") - private fun showThreadNotificationMenu() { - fun setThreadNotificationLevel(level: Int) { - val threadNotificationUrl = ApiUtils.getUrlForThreadNotificationLevel( - version = 1, - baseUrl = conversationUser!!.baseUrl, - token = roomToken, - threadId = conversationThreadId!!.toInt() - ) - chatViewModel.setThreadNotificationLevel(credentials!!, threadNotificationUrl, level) - } - - if (overflowMenuHostView == null) { - val threadNotificationsAnchor: View? = findViewById(R.id.thread_notifications) - - val colorScheme = viewThemeUtils.getColorScheme(this) - - overflowMenuHostView = ComposeView(this).apply { - setContent { - MaterialTheme( - colorScheme = colorScheme - ) { - val items = listOf( - MenuItemData( - title = context.resources.getString(R.string.notifications_default), - subtitle = context.resources.getString( - R.string.notifications_default_description - ), - icon = R.drawable.baseline_notifications_24, - onClick = { - setThreadNotificationLevel(0) - } - ), - MenuItemData( - title = context.resources.getString(R.string.notification_all_messages), - subtitle = null, - icon = R.drawable.outline_notifications_active_24, - onClick = { - setThreadNotificationLevel(1) - } - ), - MenuItemData( - title = context.resources.getString(R.string.notification_mention_only), - subtitle = null, - icon = R.drawable.baseline_notifications_24, - onClick = { - setThreadNotificationLevel(2) - } - ), - MenuItemData( - title = context.resources.getString(R.string.notification_off), - subtitle = null, - icon = R.drawable.ic_baseline_notifications_off_24, - onClick = { - setThreadNotificationLevel(3) - } - ) - ) - - OverflowMenu( - anchor = threadNotificationsAnchor, - expanded = isThreadMenuExpanded, - items = items, - onDismiss = { isThreadMenuExpanded = false } - ) - } - } - } - - addContentView( - overflowMenuHostView, - CoordinatorLayout.LayoutParams( - CoordinatorLayout.LayoutParams.MATCH_PARENT, - CoordinatorLayout.LayoutParams.MATCH_PARENT - ) - ) - } - isThreadMenuExpanded = true - } - @SuppressLint("InflateParams") - private fun showConversationEventMenu(anchorView: View) { + private fun showPopupWindow(anchorView: View) { val popupView = layoutInflater.inflate(R.layout.item_event_schedule, null) val subtitleTextView = popupView.findViewById(R.id.meetingTime) @@ -3628,7 +3366,7 @@ class ChatActivity : } private fun handleSystemMessages(chatMessageList: List): List { - val chatMessageMap = chatMessageList.associateBy { it.id }.toMutableMap() + val chatMessageMap = chatMessageList.map { it.id to it }.toMap().toMutableMap() val chatMessageIterator = chatMessageMap.iterator() while (chatMessageIterator.hasNext()) { @@ -3637,8 +3375,7 @@ class ChatActivity : if (isInfoMessageAboutDeletion(currentMessage) || isReactionsMessage(currentMessage) || isPollVotedMessage(currentMessage) || - isEditMessage(currentMessage) || - isThreadCreatedMessage(currentMessage) + isEditMessage(currentMessage) ) { chatMessageIterator.remove() } @@ -3647,56 +3384,29 @@ class ChatActivity : } private fun handleExpandableSystemMessages(chatMessageList: List): List { - val chatMessageMap = chatMessageList.associateBy { it.id }.toMutableMap() + val chatMessageMap = chatMessageList.map { it.id to it }.toMap().toMutableMap() val chatMessageIterator = chatMessageMap.iterator() - while (chatMessageIterator.hasNext()) { val currentMessage = chatMessageIterator.next() - chatMessageMap[currentMessage.value.previousMessageId.toString()]?.let { previousMessage -> - if (isSystemMessage(currentMessage.value) && - previousMessage.systemMessageType == currentMessage.value.systemMessageType && - isSameDayMessages(previousMessage, currentMessage.value) - ) { - groupSystemMessages(previousMessage, currentMessage.value) + + val previousMessage = chatMessageMap[currentMessage.value.previousMessageId.toString()] + if (isSystemMessage(currentMessage.value) && + previousMessage?.systemMessageType == currentMessage.value.systemMessageType + ) { + previousMessage?.expandableParent = true + currentMessage.value.expandableParent = false + + if (currentMessage.value.lastItemOfExpandableGroup == 0) { + currentMessage.value.lastItemOfExpandableGroup = currentMessage.value.jsonMessageId } + + previousMessage?.lastItemOfExpandableGroup = currentMessage.value.lastItemOfExpandableGroup + previousMessage?.expandableChildrenAmount = currentMessage.value.expandableChildrenAmount + 1 } } return chatMessageMap.values.toList() } - private fun groupSystemMessages(previousMessage: ChatMessage, currentMessage: ChatMessage) { - previousMessage.expandableParent = true - currentMessage.expandableParent = false - - if (currentMessage.lastItemOfExpandableGroup == 0) { - currentMessage.lastItemOfExpandableGroup = currentMessage.jsonMessageId - } - - previousMessage.lastItemOfExpandableGroup = currentMessage.lastItemOfExpandableGroup - previousMessage.expandableChildrenAmount = currentMessage.expandableChildrenAmount + 1 - } - - private fun handleThreadMessages(chatMessageList: List): List { - fun isThreadChildMessage(currentMessage: MutableMap.MutableEntry): Boolean = - currentMessage.value.isThread && - currentMessage.value.threadId?.toInt() != currentMessage.value.jsonMessageId - - val chatMessageMap = chatMessageList.associateBy { it.id }.toMutableMap() - - if (conversationThreadId == null) { - val chatMessageIterator = chatMessageMap.iterator() - while (chatMessageIterator.hasNext()) { - val currentMessage = chatMessageIterator.next() - - if (isThreadChildMessage(currentMessage)) { - chatMessageIterator.remove() - } - } - } - - return chatMessageMap.values.toList() - } - private fun isInfoMessageAboutDeletion(currentMessage: MutableMap.MutableEntry): Boolean = currentMessage.value.parentMessageId != null && currentMessage.value.systemMessageType == ChatMessage @@ -3707,9 +3417,6 @@ class ChatActivity : currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION_DELETED || currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.REACTION_REVOKED - private fun isThreadCreatedMessage(currentMessage: MutableMap.MutableEntry): Boolean = - currentMessage.value.systemMessageType == ChatMessage.SystemMessageType.THREAD_CREATED - private fun isEditMessage(currentMessage: MutableMap.MutableEntry): Boolean = currentMessage.value.parentMessageId != null && currentMessage.value.systemMessageType == ChatMessage @@ -3782,10 +3489,6 @@ class ChatActivity : } } - override fun openThread(chatMessage: ChatMessage) { - openThread(chatMessage.jsonMessageId.toLong()) - } - override fun onLongClickReactions(chatMessage: ChatMessage) { ShowReactionsDialog( this, @@ -4058,14 +3761,7 @@ class ChatActivity : val type = message.getCalculateMessageType() when (type) { ChatMessage.MessageType.VOICE_MESSAGE -> { - uploadFile( - shareUri.toString(), - true, - roomToken = roomToken, - caption = "", - replyToMessageId = getReplyToMessageId(), - displayName = currentConversation?.displayName ?: "" - ) + uploadFile(shareUri.toString(), true, token = roomToken) showSnackBar(roomToken) } @@ -4074,26 +3770,12 @@ class ChatActivity : if (null != shareUri) { try { context.contentResolver.openInputStream(shareUri)?.close() - uploadFile( - fileUri = shareUri.toString(), - isVoiceMessage = false, - caption = caption!!, - roomToken = roomToken, - replyToMessageId = getReplyToMessageId(), - displayName = currentConversation?.displayName ?: "" - ) + uploadFile(shareUri.toString(), false, caption!!, roomToken) showSnackBar(roomToken) - } catch (e: Exception) { - Log.w(TAG, "File corresponding to the uri does not exist $shareUri", e) + } catch (e: java.lang.Exception) { + Log.w(TAG, "File corresponding to the uri does not exist $shareUri") downloadFileToCache(message, false) { - uploadFile( - fileUri = shareUri.toString(), - isVoiceMessage = false, - caption = caption!!, - roomToken = roomToken, - replyToMessageId = getReplyToMessageId(), - displayName = currentConversation?.displayName ?: "" - ) + uploadFile(shareUri.toString(), false, caption!!, roomToken) showSnackBar(roomToken) } } @@ -4415,10 +4097,6 @@ class ChatActivity : pollVoteDialog.show(supportFragmentManager, TAG) } - fun createThread() { - messageInputViewModel.startThreadCreation() - } - fun jumpToQuotedMessage(parentMessage: ChatMessage) { var foundMessage = false for (position in 0 until (adapter!!.items.size)) { @@ -4435,34 +4113,6 @@ class ChatActivity : } } - private fun isChatThread(): Boolean = conversationThreadId != null && conversationThreadId!! > 0 - - fun openThread(messageId: Long) { - val bundle = Bundle() - bundle.putString(KEY_ROOM_TOKEN, roomToken) - bundle.putLong(KEY_THREAD_ID, messageId) - val chatIntent = Intent(context, ChatActivity::class.java) - chatIntent.putExtras(bundle) - startActivity(chatIntent) - } - - fun openThreadsOverview() { - val threadsUrl = ApiUtils.getUrlForRecentThreads( - version = 1, - baseUrl = conversationUser!!.baseUrl, - token = roomToken - ) - - val bundle = Bundle() - bundle.putString(KEY_ROOM_TOKEN, roomToken) - bundle.putString(ThreadsOverviewActivity.KEY_APPBAR_TITLE, getString(R.string.recent_threads)) - bundle.putString(ThreadsOverviewActivity.KEY_THREADS_SOURCE_URL, threadsUrl) - - val threadsOverviewIntent = Intent(context, ThreadsOverviewActivity::class.java) - threadsOverviewIntent.putExtras(bundle) - startActivity(threadsOverviewIntent) - } - override fun joinAudioCall() { startACall(true, false) } @@ -4508,37 +4158,6 @@ class ChatActivity : ) } - fun uploadFile( - fileUri: String, - isVoiceMessage: Boolean, - caption: String = "", - roomToken: String = "", - replyToMessageId: Int? = null, - displayName: String - ) { - chatViewModel.uploadFile( - fileUri, - isVoiceMessage, - caption, - roomToken, - replyToMessageId, - displayName - ) - cancelReply() - } - - fun cancelReply() { - messageInputViewModel.reply(null) - chatViewModel.messageDraft.quotedMessageText = null - chatViewModel.messageDraft.quotedDisplayName = null - chatViewModel.messageDraft.quotedImageUrl = null - chatViewModel.messageDraft.quotedJsonId = null - } - - fun cancelCreateThread() { - chatViewModel.clearThreadTitle() - } - companion object { val TAG = ChatActivity::class.simpleName private const val CONTENT_TYPE_CALL_STARTED: Byte = 1 @@ -4558,6 +4177,7 @@ class ChatActivity : private const val REQUEST_RECORD_AUDIO_PERMISSION = 222 private const val REQUEST_READ_CONTACT_PERMISSION = 234 private const val REQUEST_CAMERA_PERMISSION = 223 + private const val VOICE_MESSAGE_META_DATA = "{\"messageType\":\"voice-message\"}" private const val FILE_DATE_PATTERN = "yyyy-MM-dd HH-mm-ss" private const val VIDEO_SUFFIX = ".mp4" private const val FULLY_OPAQUE_INT: Int = 255 diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt index 3225d13..6273696 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputFragment.kt @@ -35,6 +35,7 @@ import android.widget.LinearLayout import android.widget.PopupMenu import android.widget.RelativeLayout import android.widget.SeekBar +import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.content.res.AppCompatResources import androidx.appcompat.view.ContextThemeWrapper import androidx.core.content.ContextCompat @@ -60,7 +61,6 @@ import com.nextcloud.talk.application.NextcloudTalkApplication.Companion.sharedA import com.nextcloud.talk.callbacks.MentionAutocompleteCallback import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.chat.viewmodels.ChatViewModel -import com.nextcloud.talk.chat.viewmodels.MessageInputViewModel import com.nextcloud.talk.data.network.NetworkMonitor import com.nextcloud.talk.databinding.FragmentMessageInputBinding import com.nextcloud.talk.jobs.UploadAndShareFilesWorker @@ -75,28 +75,45 @@ import com.nextcloud.talk.users.UserManager import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.CapabilitiesUtil import com.nextcloud.talk.utils.CharPolicy -import com.nextcloud.talk.utils.EmojiTextInputEditText import com.nextcloud.talk.utils.ImageEmojiEditText import com.nextcloud.talk.utils.SpreedFeatures -import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import com.nextcloud.talk.utils.message.MessageUtils import com.nextcloud.talk.utils.text.Spans import com.otaliastudios.autocomplete.Autocomplete +import com.stfalcon.chatkit.commons.models.IMessage import com.vanniktech.emoji.EmojiPopup -import kotlinx.coroutines.CoroutineScope -import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.collect import kotlinx.coroutines.flow.onEach import kotlinx.coroutines.launch -import kotlinx.coroutines.withContext import java.util.Objects import javax.inject.Inject -@Suppress("LongParameterList", "TooManyFunctions", "LargeClass", "LongMethod") +@Suppress("LongParameterList", "TooManyFunctions") @AutoInjector(NextcloudTalkApplication::class) class MessageInputFragment : Fragment() { + companion object { + fun newInstance() = MessageInputFragment() + private val TAG: String = MessageInputFragment::class.java.simpleName + private const val TYPING_DURATION_TO_SEND_NEXT_TYPING_MESSAGE = 10000L + private const val TYPING_INTERVAL_TO_SEND_NEXT_TYPING_MESSAGE = 1000L + private const val TYPING_STARTED_SIGNALING_MESSAGE_TYPE = "startedTyping" + private const val TYPING_STOPPED_SIGNALING_MESSAGE_TYPE = "stoppedTyping" + const val VOICE_MESSAGE_META_DATA = "{\"messageType\":\"voice-message\"}" + private const val QUOTED_MESSAGE_IMAGE_MAX_HEIGHT = 96f + private const val MENTION_AUTO_COMPLETE_ELEVATION = 6f + private const val MINIMUM_VOICE_RECORD_DURATION: Int = 1000 + private const val ANIMATION_DURATION: Long = 750 + private const val VOICE_RECORD_CANCEL_SLIDER_X: Int = -150 + private const val VOICE_RECORD_LOCK_THRESHOLD: Float = 100f + private const val INCREMENT = 8f + private const val CURSOR_KEY = "_cursor" + private const val CONNECTION_ESTABLISHED_ANIM_DURATION: Long = 3000 + private const val FULLY_OPAQUE: Float = 1.0f + private const val FULLY_TRANSPARENT: Float = 0.0f + } + @Inject lateinit var viewThemeUtils: ViewThemeUtils @@ -127,12 +144,6 @@ class MessageInputFragment : Fragment() { super.onCreate(savedInstanceState) sharedApplication!!.componentApplication.inject(this) conversationInternalId = arguments?.getString(ChatActivity.CONVERSATION_INTERNAL_ID).orEmpty() - chatActivity = requireActivity() as ChatActivity - val sharedText = arguments?.getString(BundleKeys.KEY_SHARED_TEXT).orEmpty() - if (sharedText.isNotEmpty()) { - chatActivity.chatViewModel.messageDraft.messageText = sharedText - chatActivity.chatViewModel.saveMessageDraft() - } if (conversationInternalId.isEmpty()) { Log.e(TAG, "internalId for conversation passed to MessageInputFragment is empty") } @@ -140,75 +151,45 @@ class MessageInputFragment : Fragment() { override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { binding = FragmentMessageInputBinding.inflate(inflater) + chatActivity = requireActivity() as ChatActivity themeMessageInputView() initMessageInputView() initSmileyKeyboardToggler() setupMentionAutocomplete() initVoiceRecordButton() - initThreadHandling() restoreState() return binding.root } + override fun onPause() { + super.onPause() + saveState() + } + override fun onDestroyView() { super.onDestroyView() if (mentionAutocomplete != null && mentionAutocomplete!!.isPopupShowing) { mentionAutocomplete?.dismissPopup() } clearEditUI() + cancelReply() } override fun onViewCreated(view: View, savedInstanceState: Bundle?) { super.onViewCreated(view, savedInstanceState) initObservers() - - binding.fragmentCreateThreadView.createThreadView.findViewById( - R.id - .createThreadInput - ).doAfterTextChanged { text -> - val threadTitle = text.toString() - chatActivity.chatViewModel.messageDraft.threadTitle = threadTitle - } } private fun initObservers() { Log.d(TAG, "LifeCyclerOwner is: ${viewLifecycleOwner.lifecycle}") chatActivity.messageInputViewModel.getReplyChatMessage.observe(viewLifecycleOwner) { message -> - message?.let { - chatActivity.chatViewModel.messageDraft.quotedMessageText = message.text - chatActivity.chatViewModel.messageDraft.quotedDisplayName = message.actorDisplayName - chatActivity.chatViewModel.messageDraft.quotedImageUrl = message.imageUrl - chatActivity.chatViewModel.messageDraft.quotedJsonId = message.jsonMessageId - replyToMessage( - message.text, - message.actorDisplayName, - message.imageUrl - ) - } ?: clearReplyUi() + message?.let { replyToMessage(message) } } chatActivity.messageInputViewModel.getEditChatMessage.observe(viewLifecycleOwner) { message -> message?.let { setEditUI(it as ChatMessage) } } - chatActivity.messageInputViewModel.createThreadViewState.observe(viewLifecycleOwner) { state -> - when (state) { - is MessageInputViewModel.CreateThreadStartState -> - binding.fragmentCreateThreadView.createThreadView.visibility = View.GONE - - is MessageInputViewModel.CreateThreadEditState -> { - binding.fragmentCreateThreadView.createThreadView.visibility = View.VISIBLE - binding.fragmentCreateThreadView.createThreadView - .findViewById(R.id.createThreadInput)?.setText( - chatActivity.chatViewModel.messageDraft.threadTitle - ) - } - - else -> {} - } - initVoiceRecordButton() - } - chatActivity.chatViewModel.leaveRoomViewState.observe(viewLifecycleOwner) { state -> when (state) { is ChatViewModel.LeaveRoomSuccessState -> sendStopTypingMessage() @@ -318,29 +299,33 @@ class MessageInputFragment : Fragment() { } private fun restoreState() { - CoroutineScope(Dispatchers.IO).launch { - chatActivity.chatViewModel.updateMessageDraft() + if (binding.fragmentMessageInputView.inputEditText.text.isEmpty()) { + requireContext().getSharedPreferences(chatActivity.localClassName, AppCompatActivity.MODE_PRIVATE).apply { + val text = getString(chatActivity.roomToken, "") + val cursor = getInt(chatActivity.roomToken + CURSOR_KEY, 0) + binding.fragmentMessageInputView.messageInput.setText(text) + binding.fragmentMessageInputView.messageInput.setSelection(cursor) + } + } + } - withContext(Dispatchers.Main) { - val draft = chatActivity.chatViewModel.messageDraft - binding.fragmentMessageInputView.messageInput.setText(draft.messageText) - binding.fragmentMessageInputView.messageInput.setSelection(draft.messageCursor) + private fun saveState() { + val text = binding.fragmentMessageInputView.messageInput.text.toString() + val cursor = binding.fragmentMessageInputView.messageInput.selectionStart + val previous = requireContext().getSharedPreferences( + chatActivity.localClassName, + AppCompatActivity + .MODE_PRIVATE + ).getString(chatActivity.roomToken, "null") - if (draft.threadTitle?.isNotEmpty() == true) { - chatActivity.messageInputViewModel.startThreadCreation() - } - - if (draft.messageText != "") { - binding.fragmentMessageInputView.messageInput.requestFocus() - } - - if (isInReplyState()) { - replyToMessage( - chatActivity.chatViewModel.messageDraft.quotedMessageText, - chatActivity.chatViewModel.messageDraft.quotedDisplayName, - chatActivity.chatViewModel.messageDraft.quotedImageUrl - ) - } + if (text != previous) { + requireContext().getSharedPreferences( + chatActivity.localClassName, + AppCompatActivity.MODE_PRIVATE + ).edit().apply { + putString(chatActivity.roomToken, text) + putInt(chatActivity.roomToken + CURSOR_KEY, cursor) + apply() } } } @@ -403,11 +388,7 @@ class MessageInputFragment : Fragment() { } override fun afterTextChanged(s: Editable) { - val cursor = binding.fragmentMessageInputView.messageInput.selectionStart - val text = binding.fragmentMessageInputView.messageInput.text.toString() - chatActivity.chatViewModel.messageDraft.messageCursor = cursor - chatActivity.chatViewModel.messageDraft.messageText = text - handleButtonsVisibility() + // unused atm } }) @@ -415,14 +396,11 @@ class MessageInputFragment : Fragment() { // See: https://developer.android.com/guide/topics/text/image-keyboard (binding.fragmentMessageInputView.inputEditText as ImageEmojiEditText).onCommitContentListener = { - chatActivity.chatViewModel.uploadFile( - fileUri = it.toString(), - isVoiceMessage = false, - caption = "", - roomToken = chatActivity.roomToken, - replyToMessageId = chatActivity.getReplyToMessageId(), - displayName = chatActivity.currentConversation?.displayName!! - ) + uploadFile(it.toString(), false) + } + + if (chatActivity.sharedText.isNotEmpty()) { + binding.fragmentMessageInputView.inputEditText?.setText(chatActivity.sharedText) } binding.fragmentMessageInputView.setAttachmentsListener { @@ -461,9 +439,6 @@ class MessageInputFragment : Fragment() { binding.fragmentEditView.clearEdit.setOnClickListener { clearEditUI() } - binding.fragmentCreateThreadView.abortCreateThread.setOnClickListener { - cancelCreateThread() - } if (CapabilitiesUtil.hasSpreedFeatureCapability(chatActivity.spreedCapabilities, SpreedFeatures.SILENT_SEND)) { binding.fragmentMessageInputView.button?.setOnLongClickListener { @@ -491,10 +466,6 @@ class MessageInputFragment : Fragment() { binding.fragmentCallStarted.callStartedSecondaryText.visibility = if (collapsed) View.VISIBLE else View.GONE setDropDown(collapsed) } - - binding.fragmentMessageInputView.findViewById(R.id.cancelReplyButton)?.setOnClickListener { - cancelReply() - } } private fun setDropDown(collapsed: Boolean) { @@ -509,7 +480,32 @@ class MessageInputFragment : Fragment() { @Suppress("ClickableViewAccessibility", "CyclomaticComplexMethod", "LongMethod") private fun initVoiceRecordButton() { - handleButtonsVisibility() + if (binding.fragmentMessageInputView.messageInput.text.isNullOrBlank()) { + binding.fragmentMessageInputView.messageSendButton.visibility = View.GONE + binding.fragmentMessageInputView.recordAudioButton.visibility = View.VISIBLE + } else { + binding.fragmentMessageInputView.messageSendButton.visibility = View.VISIBLE + binding.fragmentMessageInputView.recordAudioButton.visibility = View.GONE + } + binding.fragmentMessageInputView.inputEditText.doAfterTextChanged { + binding.fragmentMessageInputView.recordAudioButton.visibility = + if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() && + chatActivity.messageInputViewModel.getEditChatMessage.value == null + ) { + View.VISIBLE + } else { + View.GONE + } + + binding.fragmentMessageInputView.messageSendButton.visibility = + if (binding.fragmentMessageInputView.inputEditText.text.isEmpty() || + binding.fragmentEditView.editMessageView.isVisible + ) { + View.GONE + } else { + View.VISIBLE + } + } var prevDx = 0f var voiceRecordStartTime = 0L @@ -572,9 +568,9 @@ class MessageInputFragment : Fragment() { return@setOnTouchListener false } else { chatActivity.chatViewModel.stopAndSendAudioRecording( - roomToken = chatActivity.roomToken, - replyToMessageId = chatActivity.getReplyToMessageId(), - displayName = chatActivity.currentConversation!!.displayName + chatActivity.roomToken, + chatActivity.currentConversation!!.displayName, + VOICE_MESSAGE_META_DATA ) } resetSlider() @@ -619,67 +615,7 @@ class MessageInputFragment : Fragment() { } } } - v?.onTouchEvent(event) != false - } - } - - private fun initThreadHandling() { - binding.fragmentMessageInputView.submitThreadButton.setOnClickListener { - submitMessage(false) - } - - binding.fragmentCreateThreadView.createThreadInput.doAfterTextChanged { - handleButtonsVisibility() - } - } - - private fun handleButtonsVisibility() { - fun View.setVisible(isVisible: Boolean) { - visibility = if (isVisible) View.VISIBLE else View.GONE - } - - val isEditModeActive = binding.fragmentEditView.editMessageView.isVisible - val isThreadCreateModeActive = binding.fragmentCreateThreadView.createThreadView.isVisible - val inputContainsText = binding.fragmentMessageInputView.messageInput.text.isNotEmpty() - val threadTitleContainsText = binding.fragmentCreateThreadView.createThreadInput.text?.isNotEmpty() ?: false - - binding.fragmentMessageInputView.apply { - when { - isEditModeActive -> { - messageSendButton.setVisible(false) - recordAudioButton.setVisible(false) - submitThreadButton.setVisible(false) - attachmentButton.setVisible(true) - } - - isThreadCreateModeActive -> { - messageSendButton.setVisible(false) - recordAudioButton.setVisible(false) - attachmentButton.setVisible(false) - submitThreadButton.setVisible(true) - if (inputContainsText && threadTitleContainsText) { - submitThreadButton.isEnabled = true - submitThreadButton.alpha = FULLY_OPAQUE - } else { - submitThreadButton.isEnabled = false - submitThreadButton.alpha = OPACITY_DISABLED - } - } - - inputContainsText -> { - recordAudioButton.setVisible(false) - submitThreadButton.setVisible(false) - messageSendButton.setVisible(true) - attachmentButton.setVisible(true) - } - - else -> { - messageSendButton.setVisible(false) - submitThreadButton.setVisible(false) - recordAudioButton.setVisible(true) - attachmentButton.setVisible(true) - } - } + v?.onTouchEvent(event) ?: true } } @@ -781,45 +717,52 @@ class MessageInputFragment : Fragment() { } } - private fun replyToMessage(quotedMessageText: String?, quotedActorDisplayName: String?, quotedImageUrl: String?) { + private fun replyToMessage(message: IMessage?) { Log.d(TAG, "Reply") - val view = binding.fragmentMessageInputView - view.findViewById(R.id.cancelReplyButton)?.visibility = - View.VISIBLE + val chatMessage = message as ChatMessage? + chatMessage?.let { + val view = binding.fragmentMessageInputView + view.findViewById(R.id.attachmentButton)?.visibility = + View.GONE + view.findViewById(R.id.cancelReplyButton)?.visibility = + View.VISIBLE - val quotedMessage = view.findViewById(R.id.quotedMessage) + val quotedMessage = view.findViewById(R.id.quotedMessage) - quotedMessage?.maxLines = 2 - quotedMessage?.ellipsize = TextUtils.TruncateAt.END - quotedMessage?.text = quotedMessageText - view.findViewById(R.id.quotedMessageAuthor)?.text = - quotedActorDisplayName ?: requireContext().getText(R.string.nc_nick_guest) + quotedMessage?.maxLines = 2 + quotedMessage?.ellipsize = TextUtils.TruncateAt.END + quotedMessage?.text = it.text + view.findViewById(R.id.quotedMessageAuthor)?.text = + it.actorDisplayName ?: requireContext().getText(R.string.nc_nick_guest) - chatActivity.conversationUser?.let { - val quotedMessageImage = view.findViewById(R.id.quotedMessageImage) - quotedImageUrl?.let { previewImageUrl -> - quotedMessageImage?.visibility = View.VISIBLE + chatActivity.conversationUser?.let { + val quotedMessageImage = view.findViewById(R.id.quotedMessageImage) + chatMessage.imageUrl?.let { previewImageUrl -> + quotedMessageImage?.visibility = View.VISIBLE - val px = TypedValue.applyDimension( - TypedValue.COMPLEX_UNIT_DIP, - QUOTED_MESSAGE_IMAGE_MAX_HEIGHT, - resources.displayMetrics - ) + val px = TypedValue.applyDimension( + TypedValue.COMPLEX_UNIT_DIP, + QUOTED_MESSAGE_IMAGE_MAX_HEIGHT, + resources.displayMetrics + ) - quotedMessageImage?.maxHeight = px.toInt() - val layoutParams = quotedMessageImage?.layoutParams as FlexboxLayout.LayoutParams - layoutParams.flexGrow = 0f - quotedMessageImage.layoutParams = layoutParams - quotedMessageImage.load(previewImageUrl) { - addHeader("Authorization", chatActivity.credentials!!) + quotedMessageImage?.maxHeight = px.toInt() + val layoutParams = quotedMessageImage?.layoutParams as FlexboxLayout.LayoutParams + layoutParams.flexGrow = 0f + quotedMessageImage.layoutParams = layoutParams + quotedMessageImage.load(previewImageUrl) { + addHeader("Authorization", chatActivity.credentials!!) + } + } ?: run { + view.findViewById(R.id.quotedMessageImage)?.visibility = View.GONE } - } ?: run { - view.findViewById(R.id.quotedMessageImage)?.visibility = View.GONE } - } - val quotedChatMessageView = view.findViewById(R.id.quotedChatMessageView) - quotedChatMessageView?.visibility = View.VISIBLE + val quotedChatMessageView = + view.findViewById(R.id.quotedChatMessageView) + quotedChatMessageView?.tag = message?.jsonMessageId + quotedChatMessageView?.visibility = View.VISIBLE + } } fun updateOwnTypingStatus(typedText: CharSequence) { @@ -886,34 +829,58 @@ class MessageInputFragment : Fragment() { private fun isTypingStatusEnabled(): Boolean = !CapabilitiesUtil.isTypingStatusPrivate(chatActivity.conversationUser!!) + private fun uploadFile(fileUri: String, isVoiceMessage: Boolean, caption: String = "", token: String = "") { + var metaData = "" + val room: String + + if (!chatActivity.participantPermissions.hasChatPermission()) { + Log.w(ChatActivity.TAG, "uploading file(s) is forbidden because of missing attendee permissions") + return + } + + if (isVoiceMessage) { + metaData = VOICE_MESSAGE_META_DATA + } + + if (caption != "") { + metaData = "{\"caption\":\"$caption\"}" + } + + if (token == "") room = chatActivity.roomToken else room = token + + chatActivity.chatViewModel.uploadFile(fileUri, room, chatActivity.currentConversation!!.displayName, metaData) + } + private fun submitMessage(sendWithoutNotification: Boolean) { if (binding.fragmentMessageInputView.inputEditText != null) { val editable = binding.fragmentMessageInputView.inputEditText!!.editableText replaceMentionChipSpans(editable) binding.fragmentMessageInputView.inputEditText?.setText("") sendStopTypingMessage() + val replyMessageId = binding.fragmentMessageInputView + .findViewById(R.id.quotedChatMessageView)?.tag as Int? ?: 0 + sendMessage( editable.toString(), + replyMessageId, sendWithoutNotification ) cancelReply() - cancelCreateThread() } } - private fun sendMessage(message: String, sendWithoutNotification: Boolean) { + private fun sendMessage(message: String, replyTo: Int?, sendWithoutNotification: Boolean) { chatActivity.messageInputViewModel.sendChatMessage( - credentials = chatActivity.conversationUser!!.getCredentials(), - url = ApiUtils.getUrlForChat( + chatActivity.conversationUser!!.getCredentials(), + ApiUtils.getUrlForChat( chatActivity.chatApiVersion, chatActivity.conversationUser!!.baseUrl!!, chatActivity.roomToken ), - message = message, - displayName = chatActivity.conversationUser!!.displayName ?: "", - replyTo = chatActivity.getReplyToMessageId(), - sendWithoutNotification = sendWithoutNotification, - threadTitle = chatActivity.chatViewModel.messageDraft.threadTitle + message, + chatActivity.conversationUser!!.displayName ?: "", + replyTo ?: 0, + sendWithoutNotification ) } @@ -997,7 +964,6 @@ class MessageInputFragment : Fragment() { binding.fragmentMessageInputView.inputEditText.setSelection(end) binding.fragmentMessageInputView.messageSendButton.visibility = View.GONE binding.fragmentMessageInputView.recordAudioButton.visibility = View.GONE - binding.fragmentMessageInputView.submitThreadButton.visibility = View.GONE binding.fragmentMessageInputView.editMessageButton.visibility = View.VISIBLE binding.fragmentEditView.editMessageView.visibility = View.VISIBLE binding.fragmentMessageInputView.attachmentButton.visibility = View.GONE @@ -1009,12 +975,15 @@ class MessageInputFragment : Fragment() { binding.fragmentEditView.editMessageView.visibility = View.GONE binding.fragmentMessageInputView.attachmentButton.visibility = View.VISIBLE chatActivity.messageInputViewModel.edit(null) - handleButtonsVisibility() } private fun themeMessageInputView() { binding.fragmentMessageInputView.button?.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) } + binding.fragmentMessageInputView.findViewById(R.id.cancelReplyButton)?.setOnClickListener { + cancelReply() + } + binding.fragmentMessageInputView.findViewById(R.id.cancelReplyButton)?.let { viewThemeUtils.platform .themeImageButton(it) @@ -1052,9 +1021,6 @@ class MessageInputFragment : Fragment() { binding.fragmentEditView.clearEdit.let { viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) } - binding.fragmentCreateThreadView.abortCreateThread.let { - viewThemeUtils.platform.colorImageView(it, ColorRole.PRIMARY) - } binding.fragmentCallStarted.callStartedBackground.apply { viewThemeUtils.talk.themeOutgoingMessageBubble(this, grouped = true, false) @@ -1071,56 +1037,14 @@ class MessageInputFragment : Fragment() { binding.fragmentCallStarted.callStartedCloseBtn.apply { viewThemeUtils.platform.colorImageView(this, ColorRole.PRIMARY) } - - binding.fragmentMessageInputView.submitThreadButton.apply { - viewThemeUtils.platform.colorImageView(this, ColorRole.SECONDARY) - } - - binding.fragmentCreateThreadView.createThreadInput.apply { - viewThemeUtils.platform.colorEditText(this) - } - } - - private fun cancelCreateThread() { - chatActivity.cancelCreateThread() - chatActivity.messageInputViewModel.stopThreadCreation() - binding.fragmentCreateThreadView.createThreadView.visibility = View.GONE } private fun cancelReply() { - chatActivity.cancelReply() - clearReplyUi() - } - - private fun clearReplyUi() { - val quote = binding.fragmentMessageInputView.findViewById(R.id.quotedChatMessageView) + val quote = binding.fragmentMessageInputView + .findViewById(R.id.quotedChatMessageView) quote.visibility = View.GONE + quote.tag = null binding.fragmentMessageInputView.findViewById(R.id.attachmentButton)?.visibility = View.VISIBLE - } - - private fun isInReplyState(): Boolean { - val jsonId = chatActivity.chatViewModel.messageDraft.quotedJsonId - return jsonId != null - } - - companion object { - fun newInstance() = MessageInputFragment() - private val TAG: String = MessageInputFragment::class.java.simpleName - private const val TYPING_DURATION_TO_SEND_NEXT_TYPING_MESSAGE = 10000L - private const val TYPING_INTERVAL_TO_SEND_NEXT_TYPING_MESSAGE = 1000L - private const val TYPING_STARTED_SIGNALING_MESSAGE_TYPE = "startedTyping" - private const val TYPING_STOPPED_SIGNALING_MESSAGE_TYPE = "stoppedTyping" - private const val QUOTED_MESSAGE_IMAGE_MAX_HEIGHT = 96f - private const val MENTION_AUTO_COMPLETE_ELEVATION = 6f - private const val MINIMUM_VOICE_RECORD_DURATION: Int = 1000 - private const val ANIMATION_DURATION: Long = 750 - private const val VOICE_RECORD_CANCEL_SLIDER_X: Int = -150 - private const val VOICE_RECORD_LOCK_THRESHOLD: Float = 100f - private const val INCREMENT = 8f - private const val CURSOR_KEY = "_cursor" - private const val CONNECTION_ESTABLISHED_ANIM_DURATION: Long = 3000 - private const val FULLY_OPAQUE: Float = 1.0f - private const val FULLY_TRANSPARENT: Float = 0.0f - private const val OPACITY_DISABLED = 0.7f + chatActivity.messageInputViewModel.reply(null) } } diff --git a/app/src/main/java/com/nextcloud/talk/chat/MessageInputVoiceRecordingFragment.kt b/app/src/main/java/com/nextcloud/talk/chat/MessageInputVoiceRecordingFragment.kt index 98f529f..945622e 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/MessageInputVoiceRecordingFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/MessageInputVoiceRecordingFragment.kt @@ -114,9 +114,9 @@ class MessageInputVoiceRecordingFragment : Fragment() { binding.sendVoiceRecording.setOnClickListener { chatActivity.chatViewModel.stopAndSendAudioRecording( - roomToken = chatActivity.roomToken, - replyToMessageId = chatActivity.getReplyToMessageId(), - displayName = chatActivity.currentConversation!!.displayName + chatActivity.roomToken, + chatActivity.currentConversation!!.displayName, + MessageInputFragment.VOICE_MESSAGE_META_DATA ) clear() } diff --git a/app/src/main/java/com/nextcloud/talk/chat/OverflowMenu.kt b/app/src/main/java/com/nextcloud/talk/chat/OverflowMenu.kt deleted file mode 100644 index fc403f6..0000000 --- a/app/src/main/java/com/nextcloud/talk/chat/OverflowMenu.kt +++ /dev/null @@ -1,160 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.chat - -import android.view.View -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.interaction.MutableInteractionSource -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.IntrinsicSize -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.runtime.remember -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.shadow -import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.painterResource -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.IntOffset -import androidx.compose.ui.unit.dp -import androidx.compose.ui.window.Popup -import com.nextcloud.talk.R - -data class MenuItemData(val title: String, val subtitle: String? = null, val icon: Int? = null, val onClick: () -> Unit) - -@Composable -fun OverflowMenu(anchor: View?, expanded: Boolean, items: List, onDismiss: () -> Unit) { - if (!expanded) return - - val rect = anchor?.boundsInWindow() - val xOffset = rect?.left ?: 0 - val yOffset = rect?.bottom ?: 0 - - Popup( - onDismissRequest = onDismiss, - offset = IntOffset(xOffset, yOffset) - ) { - Column( - modifier = Modifier - .width(IntrinsicSize.Max) - .background( - color = colorResource(id = R.color.bg_default), - shape = RoundedCornerShape(1.dp) - ) - .shadow( - elevation = 1.dp, - shape = RoundedCornerShape(1.dp), - clip = false - ) - ) { - items.forEach { item -> - DynamicMenuItem( - item.copy( - onClick = { - item.onClick() - onDismiss() - } - ) - ) - } - } - } -} - -@Composable -fun DynamicMenuItem(item: MenuItemData) { - Row( - verticalAlignment = Alignment.CenterVertically, - modifier = Modifier - .fillMaxWidth() - .clickable( - onClick = item.onClick, - interactionSource = remember { MutableInteractionSource() } - ) - .padding(horizontal = 12.dp, vertical = 12.dp) - ) { - item.icon?.let { icon -> - Icon( - painter = painterResource(icon), - contentDescription = null, - tint = MaterialTheme.colorScheme.onSurface - ) - Spacer(Modifier.width(8.dp)) - } - - Column { - Text(item.title, color = MaterialTheme.colorScheme.onSurface) - item.subtitle?.let { - Text( - it, - style = MaterialTheme.typography.bodySmall, - color = MaterialTheme.colorScheme.onSurfaceVariant - ) - } - } - } -} - -private fun View.boundsInWindow(): android.graphics.Rect { - val location = IntArray(2) - getLocationOnScreen(location) - return android.graphics.Rect( - location[0], - location[1], - location[0] + width, - location[1] + height - ) -} - -@Preview -@Composable -fun OverflowMenuPreview() { - val items = listOf( - MenuItemData( - title = "first item title", - subtitle = "first item subtitle", - icon = R.drawable.baseline_notifications_24, - onClick = {} - ), - MenuItemData( - title = "second item title", - subtitle = null, - icon = R.drawable.outline_notifications_active_24, - onClick = {} - ), - MenuItemData( - title = "third item title", - subtitle = null, - icon = R.drawable.baseline_notifications_24, - onClick = {} - ), - MenuItemData( - title = "fourth item title", - subtitle = null, - icon = R.drawable.baseline_notifications_24, - onClick = {} - ) - ) - - OverflowMenu( - anchor = null, - expanded = true, - items = items, - onDismiss = { } - ) -} diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt index e8dadd3..0205985 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/ChatMessageRepository.kt @@ -44,7 +44,7 @@ interface ChatMessageRepository : LifecycleAwareManager { val removeMessageFlow: Flow - fun initData(credentials: String, urlForChatting: String, roomToken: String, threadId: Long?) + fun initData(credentials: String, urlForChatting: String, roomToken: String) fun updateConversation(conversationModel: ConversationModel) @@ -76,8 +76,6 @@ interface ChatMessageRepository : LifecycleAwareManager { */ suspend fun getMessage(messageId: Long, bundle: Bundle): Flow - suspend fun getNumberOfThreadReplies(threadId: Long): Int - @Suppress("LongParameterList") suspend fun sendChatMessage( credentials: String, @@ -86,8 +84,7 @@ interface ChatMessageRepository : LifecycleAwareManager { displayName: String, replyTo: Int, sendWithoutNotification: Boolean, - referenceId: String, - threadTitle: String? + referenceId: String ): Flow> @Suppress("LongParameterList") diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt b/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt index 9fc6d36..a72657d 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/model/ChatMessage.kt @@ -45,14 +45,6 @@ data class ChatMessage( var token: String? = null, - var threadId: Long? = null, - - var isThread: Boolean = false, - - var threadTitle: String? = null, - - var threadReplies: Int? = 0, - // guests or users var actorType: String? = null, @@ -432,8 +424,7 @@ data class ChatMessage( AVATAR_REMOVED, FEDERATED_USER_ADDED, FEDERATED_USER_REMOVED, - PHONE_ADDED, - THREAD_CREATED + PHONE_ADDED } companion object { diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt index 637cf5d..7276f44 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/ChatNetworkDataSource.kt @@ -59,8 +59,7 @@ interface ChatNetworkDataSource { displayName: String, replyTo: Int, sendWithoutNotification: Boolean, - referenceId: String, - threadTitle: String? + referenceId: String ): ChatOverallSingleMessage fun pullChatMessages(credentials: String, url: String, fieldMap: HashMap): Observable> diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt index c5bcd51..f37ba12 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/OfflineFirstChatRepository.kt @@ -119,13 +119,11 @@ class OfflineFirstChatRepository @Inject constructor( private lateinit var conversationModel: ConversationModel private lateinit var credentials: String private lateinit var urlForChatting: String - private var threadId: Long? = null - override fun initData(credentials: String, urlForChatting: String, roomToken: String, threadId: Long?) { + override fun initData(credentials: String, urlForChatting: String, roomToken: String) { internalConversationId = currentUser.id.toString() + "@" + roomToken this.credentials = credentials this.urlForChatting = urlForChatting - this.threadId = threadId } override fun updateConversation(conversationModel: ConversationModel) { @@ -145,7 +143,7 @@ class OfflineFirstChatRepository @Inject constructor( Log.d(TAG, "conversationModel.internalId: " + conversationModel.internalId) Log.d(TAG, "conversationModel.lastReadMessage:" + conversationModel.lastReadMessage) - var newestMessageIdFromDb = chatBlocksDao.getNewestMessageIdFromChatBlocks(internalConversationId, threadId) + var newestMessageIdFromDb = chatDao.getNewestMessageId(internalConversationId) Log.d(TAG, "newestMessageIdFromDb: $newestMessageIdFromDb") val weAlreadyHaveSomeOfflineMessages = newestMessageIdFromDb > 0 @@ -191,7 +189,7 @@ class OfflineFirstChatRepository @Inject constructor( Log.e(TAG, "initial loading of messages failed") } - newestMessageIdFromDb = chatBlocksDao.getNewestMessageIdFromChatBlocks(internalConversationId, threadId) + newestMessageIdFromDb = chatDao.getNewestMessageId(internalConversationId) Log.d(TAG, "newestMessageIdFromDb after sync: $newestMessageIdFromDb") } @@ -205,9 +203,9 @@ class OfflineFirstChatRepository @Inject constructor( val limit = getCappedMessagesAmountOfChatBlock(newestMessageIdFromDb) val list = getMessagesBeforeAndEqual( - messageId = newestMessageIdFromDb, - internalConversationId = internalConversationId, - messageLimit = limit + newestMessageIdFromDb, + internalConversationId, + limit ) if (list.isNotEmpty()) { handleNewAndTempMessages( @@ -236,8 +234,7 @@ class OfflineFirstChatRepository @Inject constructor( val amountBetween = chatDao.getCountBetweenMessageIds( internalConversationId, messageId, - chatBlock.oldestMessageId, - threadId + chatBlock.oldestMessageId ) Log.d(TAG, "amount of messages between newestMessageId and oldest message of same ChatBlock:$amountBetween") @@ -287,7 +284,7 @@ class OfflineFirstChatRepository @Inject constructor( ) withNetworkParams.putSerializable(BundleKeys.KEY_FIELD_MAP, fieldMap) - val loadFromServer = hasToLoadPreviousMessagesFromServer(beforeMessageId, DEFAULT_MESSAGES_LIMIT) + val loadFromServer = hasToLoadPreviousMessagesFromServer(beforeMessageId) if (loadFromServer) { Log.d(TAG, "Starting online request for loadMoreMessages") @@ -349,10 +346,7 @@ class OfflineFirstChatRepository @Inject constructor( updateUiForLastCommonRead() - val newestMessage = chatBlocksDao.getNewestMessageIdFromChatBlocks( - internalConversationId, - threadId - ).toInt() + val newestMessage = chatDao.getNewestMessageId(internalConversationId).toInt() // update field map vars for next cycle fieldMap = getFieldMap( @@ -415,7 +409,7 @@ class OfflineFirstChatRepository @Inject constructor( _messageFlow.emit(triple) } - private suspend fun hasToLoadPreviousMessagesFromServer(beforeMessageId: Long, amountToCheck: Int): Boolean { + private suspend fun hasToLoadPreviousMessagesFromServer(beforeMessageId: Long): Boolean { val loadFromServer: Boolean val blockForMessage = getBlockOfMessage(beforeMessageId.toInt()) @@ -427,25 +421,26 @@ class OfflineFirstChatRepository @Inject constructor( Log.d(TAG, "The last chatBlock is reached so we won't request server for older messages") loadFromServer = false } else { + // we know that beforeMessageId and blockForMessage.oldestMessageId are in the same block. + // As we want the last DEFAULT_MESSAGES_LIMIT entries before beforeMessageId, we calculate if these + // messages are DEFAULT_MESSAGES_LIMIT entries apart from each other + val amountBetween = chatDao.getCountBetweenMessageIds( internalConversationId, beforeMessageId, - blockForMessage.oldestMessageId, - threadId + blockForMessage.oldestMessageId ) - loadFromServer = amountBetween < amountToCheck + loadFromServer = amountBetween < DEFAULT_MESSAGES_LIMIT Log.d( TAG, "Amount between messageId " + beforeMessageId + " and " + blockForMessage.oldestMessageId + - " is: " + amountBetween + " and $amountToCheck were needed, so 'loadFromServer' is " + - loadFromServer + " is: " + amountBetween + " so 'loadFromServer' is " + loadFromServer ) } return loadFromServer } - @Suppress("LongParameterList") private fun getFieldMap( lookIntoFuture: Boolean, timeout: Int, @@ -466,23 +461,17 @@ class OfflineFirstChatRepository @Inject constructor( fieldMap["lastCommonReadId"] = it } - threadId?.let { fieldMap["threadId"] = it.toInt() } - fieldMap["timeout"] = timeout fieldMap["limit"] = limit - fieldMap["lookIntoFuture"] = if (lookIntoFuture) 1 else 0 fieldMap["setReadMarker"] = if (setReadMarker) 1 else 0 return fieldMap } - override suspend fun getNumberOfThreadReplies(threadId: Long): Int = - chatDao.getNumberOfThreadReplies(internalConversationId, threadId) - override suspend fun getMessage(messageId: Long, bundle: Bundle): Flow { Log.d(TAG, "Get message with id $messageId") - val loadFromServer = hasToLoadPreviousMessagesFromServer(messageId, 1) + val loadFromServer = hasToLoadPreviousMessagesFromServer(messageId) if (loadFromServer) { val fieldMap = getFieldMap( @@ -498,10 +487,8 @@ class OfflineFirstChatRepository @Inject constructor( Log.d(TAG, "Starting online request for single message (e.g. a reply)") sync(bundle) } - return chatDao.getChatMessageForConversation( - internalConversationId, - messageId - ).map(ChatMessageEntity::asModel) + return chatDao.getChatMessageForConversation(internalConversationId, messageId) + .map(ChatMessageEntity::asModel) } @Suppress("UNCHECKED_CAST", "MagicNumber", "Detekt.TooGenericExceptionCaught") @@ -665,12 +652,11 @@ class OfflineFirstChatRepository @Inject constructor( internalConversationId = internalConversationId, accountId = conversationModel.accountId, token = conversationModel.token, - threadId = threadId, oldestMessageId = oldestMessageIdForNewChatBlock, newestMessageId = newestMessageIdForNewChatBlock, hasHistory = hasHistory ) - chatBlocksDao.upsertChatBlock(newChatBlock) // crash when no conversation thread exists! + chatBlocksDao.upsertChatBlock(newChatBlock) updateBlocks(newChatBlock) return chatMessagesFromSyncToProcess @@ -727,11 +713,7 @@ class OfflineFirstChatRepository @Inject constructor( var blockContainingQueriedMessage: ChatBlockEntity? = null if (queriedMessageId != null) { val blocksContainingQueriedMessage = - chatBlocksDao.getChatBlocksContainingMessageId( - internalConversationId = internalConversationId, - threadId = threadId, - messageId = queriedMessageId.toLong() - ) + chatBlocksDao.getChatBlocksContainingMessageId(internalConversationId, queriedMessageId.toLong()) val chatBlocks = blocksContainingQueriedMessage.first() if (chatBlocks.size > 1) { @@ -750,10 +732,9 @@ class OfflineFirstChatRepository @Inject constructor( private suspend fun updateBlocks(chatBlock: ChatBlockEntity): ChatBlockEntity? { val connectedChatBlocks = chatBlocksDao.getConnectedChatBlocks( - internalConversationId = internalConversationId, - threadId = threadId, - oldestMessageId = chatBlock.oldestMessageId, - newestMessageId = chatBlock.newestMessageId + internalConversationId, + chatBlock.oldestMessageId, + chatBlock.newestMessageId ).first() return if (connectedChatBlocks.size == 1) { @@ -780,7 +761,6 @@ class OfflineFirstChatRepository @Inject constructor( internalConversationId = internalConversationId, accountId = conversationModel.accountId, token = conversationModel.token, - threadId = threadId, oldestMessageId = oldestIdFromDbChatBlocks, newestMessageId = newestIdFromDbChatBlocks, hasHistory = hasHistory @@ -804,8 +784,7 @@ class OfflineFirstChatRepository @Inject constructor( chatDao.getMessagesForConversationBeforeAndEqual( internalConversationId, messageId, - messageLimit, - threadId + messageLimit ).map { it.map(ChatMessageEntity::asModel) }.first() @@ -819,8 +798,7 @@ class OfflineFirstChatRepository @Inject constructor( chatDao.getMessagesForConversationBefore( internalConversationId, messageId, - messageLimit, - threadId + messageLimit ).map { it.map(ChatMessageEntity::asModel) }.first() @@ -860,8 +838,7 @@ class OfflineFirstChatRepository @Inject constructor( displayName: String, replyTo: Int, sendWithoutNotification: Boolean, - referenceId: String, - threadTitle: String? + referenceId: String ): Flow> { if (!networkMonitor.isOnline.value) { return flow { @@ -877,16 +854,14 @@ class OfflineFirstChatRepository @Inject constructor( displayName, replyTo, sendWithoutNotification, - referenceId, - threadTitle + referenceId ) val chatMessageModel = response.ocs?.data?.asModel() val sentMessage = chatDao.getTempMessageForConversation( internalConversationId, - referenceId, - threadId + referenceId ).firstOrNull() sentMessage?.let { @@ -902,8 +877,7 @@ class OfflineFirstChatRepository @Inject constructor( val failedMessage = chatDao.getTempMessageForConversation( internalConversationId, - referenceId, - threadId + referenceId ).firstOrNull() failedMessage?.let { it.sendStatus = SendStatus.FAILED @@ -926,11 +900,7 @@ class OfflineFirstChatRepository @Inject constructor( sendWithoutNotification: Boolean, referenceId: String ): Flow> { - val messageToResend = chatDao.getTempMessageForConversation( - internalConversationId, - referenceId, - threadId - ).firstOrNull() + val messageToResend = chatDao.getTempMessageForConversation(internalConversationId, referenceId).firstOrNull() return if (messageToResend != null) { messageToResend.sendStatus = SendStatus.PENDING chatDao.updateChatMessage(messageToResend) @@ -939,14 +909,13 @@ class OfflineFirstChatRepository @Inject constructor( _updateMessageFlow.emit(messageToResendModel) sendChatMessage( - credentials = credentials, - url = url, - message = message, - displayName = displayName, - replyTo = replyTo, - sendWithoutNotification = sendWithoutNotification, - referenceId = referenceId, - threadTitle = null + credentials, + url, + message, + displayName, + replyTo, + sendWithoutNotification, + referenceId ) } else { flow { @@ -980,7 +949,8 @@ class OfflineFirstChatRepository @Inject constructor( try { val messageToEdit = chatDao.getChatMessageForConversation( internalConversationId, - message.jsonMessageId.toLong() + message.jsonMessageId + .toLong() ).first() messageToEdit.message = editedMessageText chatDao.upsertChatMessage(messageToEdit) @@ -994,7 +964,7 @@ class OfflineFirstChatRepository @Inject constructor( } override suspend fun sendUnsentChatMessages(credentials: String, url: String) { - val tempMessages = chatDao.getTempUnsentMessagesForConversation(internalConversationId, threadId).first() + val tempMessages = chatDao.getTempUnsentMessagesForConversation(internalConversationId).first() tempMessages.sortedBy { it.internalId }.onEach { sendChatMessage( credentials, @@ -1003,8 +973,7 @@ class OfflineFirstChatRepository @Inject constructor( it.actorDisplayName, it.parentMessageId?.toIntOrZero() ?: 0, it.silent, - it.referenceId.orEmpty(), - null + it.referenceId.orEmpty() ).collect { result -> if (result.isSuccess) { Log.d(TAG, "Sent temp message") @@ -1073,7 +1042,6 @@ class OfflineFirstChatRepository @Inject constructor( internalId = "$internalConversationId@_temp_$currentTimeMillies", internalConversationId = internalConversationId, id = currentTimeWithoutYear.toLong(), - threadId = threadId, message = message, deleted = false, token = conversationModel.token, diff --git a/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt b/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt index 057472f..e5edaee 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/data/network/RetrofitChatNetwork.kt @@ -144,8 +144,7 @@ class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines: displayName: String, replyTo: Int, sendWithoutNotification: Boolean, - referenceId: String, - threadTitle: String? + referenceId: String ): ChatOverallSingleMessage = ncApiCoroutines.sendChatMessage( credentials, @@ -154,8 +153,7 @@ class RetrofitChatNetwork(private val ncApi: NcApi, private val ncApiCoroutines: displayName, replyTo, sendWithoutNotification, - referenceId, - threadTitle + referenceId ) override fun pullChatMessages( diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt index 7b8f6dc..67fd96b 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/ChatViewModel.kt @@ -17,8 +17,6 @@ import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel import androidx.lifecycle.viewModelScope -import com.google.gson.Gson -import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager import com.nextcloud.talk.chat.data.ChatMessageRepository import com.nextcloud.talk.chat.data.io.AudioFocusRequestManager import com.nextcloud.talk.chat.data.io.MediaPlayerManager @@ -26,11 +24,9 @@ import com.nextcloud.talk.chat.data.io.MediaRecorderManager import com.nextcloud.talk.chat.data.model.ChatMessage import com.nextcloud.talk.chat.data.network.ChatNetworkDataSource import com.nextcloud.talk.conversationlist.data.OfflineConversationsRepository -import com.nextcloud.talk.conversationlist.viewmodels.ConversationsListViewModel.Companion.FOLLOWED_THREADS_EXIST import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.extensions.toIntOrZero import com.nextcloud.talk.jobs.UploadAndShareFilesWorker -import com.nextcloud.talk.models.MessageDraft import com.nextcloud.talk.models.domain.ConversationModel import com.nextcloud.talk.models.domain.ReactionAddedModel import com.nextcloud.talk.models.domain.ReactionDeletedModel @@ -41,13 +37,9 @@ import com.nextcloud.talk.models.json.conversations.RoomOverall import com.nextcloud.talk.models.json.generic.GenericOverall import com.nextcloud.talk.models.json.opengraph.Reference import com.nextcloud.talk.models.json.reminder.Reminder -import com.nextcloud.talk.models.json.threads.ThreadInfo import com.nextcloud.talk.models.json.userAbsence.UserAbsenceData import com.nextcloud.talk.repositories.reactions.ReactionsRepository -import com.nextcloud.talk.threadsoverview.data.ThreadsRepository import com.nextcloud.talk.ui.PlaybackSpeed -import com.nextcloud.talk.utils.ParticipantPermissions -import com.nextcloud.talk.utils.UserIdUtils import com.nextcloud.talk.utils.bundle.BundleKeys import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import com.nextcloud.talk.utils.preferences.AppPreferences @@ -59,8 +51,6 @@ import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.MutableSharedFlow -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.first import kotlinx.coroutines.flow.flow @@ -75,7 +65,6 @@ class ChatViewModel @Inject constructor( private val appPreferences: AppPreferences, private val chatNetworkDataSource: ChatNetworkDataSource, private val chatRepository: ChatMessageRepository, - private val threadsRepository: ThreadsRepository, private val conversationRepository: OfflineConversationsRepository, private val reactionsRepository: ReactionsRepository, private val mediaRecorderManager: MediaRecorderManager, @@ -84,9 +73,6 @@ class ChatViewModel @Inject constructor( ) : ViewModel(), DefaultLifecycleObserver { - @Inject - lateinit var arbitraryStorageManager: ArbitraryStorageManager - enum class LifeCycleFlag { PAUSED, RESUMED, @@ -98,9 +84,6 @@ class ChatViewModel @Inject constructor( val disposableSet = mutableSetOf() var mediaPlayerDuration = mediaPlayerManager.mediaPlayerDuration val mediaPlayerPosition = mediaPlayerManager.mediaPlayerPosition - var chatRoomToken: String = "" - var messageDraft: MessageDraft = MessageDraft() - lateinit var participantPermissions: ParticipantPermissions fun getChatRepository(): ChatMessageRepository = chatRepository @@ -120,8 +103,6 @@ class ChatViewModel @Inject constructor( mediaRecorderManager.handleOnPause() chatRepository.handleOnPause() mediaPlayerManager.handleOnPause() - - saveMessageDraft() } override fun onStop(owner: LifecycleOwner) { @@ -175,9 +156,6 @@ class ChatViewModel @Inject constructor( val getContextChatMessages: LiveData> get() = _getContextChatMessages - private val _threadRetrieveState = MutableStateFlow(ThreadRetrieveUiState.None) - val threadRetrieveState: StateFlow = _threadRetrieveState - val getOpenGraph: LiveData get() = _getOpenGraph private val _getOpenGraph: MutableLiveData = MutableLiveData() @@ -292,9 +270,8 @@ class ChatViewModel @Inject constructor( val reactionDeletedViewState: LiveData get() = _reactionDeletedViewState - fun initData(credentials: String, urlForChatting: String, roomToken: String, threadId: Long?) { - chatRepository.initData(credentials, urlForChatting, roomToken, threadId) - chatRoomToken = roomToken + fun initData(credentials: String, urlForChatting: String, roomToken: String) { + chatRepository.initData(credentials, urlForChatting, roomToken) } fun updateConversation(currentConversation: ConversationModel) { @@ -316,10 +293,6 @@ class ChatViewModel @Inject constructor( } else { _getCapabilitiesViewState.value = GetCapabilitiesUpdateState(user.capabilities!!.spreedCapability!!) } - participantPermissions = ParticipantPermissions( - user.capabilities!!.spreedCapability!!, - conversationModel - ) } else { chatNetworkDataSource.getCapabilities(user, token) .subscribeOn(Schedulers.io()) @@ -335,10 +308,6 @@ class ChatViewModel @Inject constructor( } else { _getCapabilitiesViewState.value = GetCapabilitiesUpdateState(spreedCapabilities) } - participantPermissions = ParticipantPermissions( - spreedCapabilities, - conversationModel - ) } override fun onError(e: Throwable) { @@ -453,45 +422,6 @@ class ChatViewModel @Inject constructor( }) } - @Suppress("Detekt.TooGenericExceptionCaught") - fun getThread(credentials: String, url: String) { - viewModelScope.launch { - try { - val thread = threadsRepository.getThread(credentials, url) - _threadRetrieveState.value = ThreadRetrieveUiState.Success(thread.ocs?.data) - } catch (exception: Exception) { - _threadRetrieveState.value = ThreadRetrieveUiState.Error(exception) - } - } - } - - @Suppress("Detekt.TooGenericExceptionCaught", "MagicNumber") - fun setThreadNotificationLevel(credentials: String, url: String, level: Int) { - fun updateFollowedThreadsIndicator(notificationLevel: Int?) { - when (notificationLevel) { - 1, 2 -> { - val accountId = UserIdUtils.getIdForUser(userProvider.currentUser.blockingGet()) - arbitraryStorageManager.storeStorageSetting( - accountId, - FOLLOWED_THREADS_EXIST, - true.toString(), - "" - ) - } - } - } - - viewModelScope.launch { - try { - val thread = threadsRepository.setThreadNotificationLevel(credentials, url, level) - updateFollowedThreadsIndicator(thread.ocs?.data?.attendee?.notificationLevel) - _threadRetrieveState.value = ThreadRetrieveUiState.Success(thread.ocs?.data) - } catch (exception: Exception) { - _threadRetrieveState.value = ThreadRetrieveUiState.Error(exception) - } - } - } - fun loadMessages(withCredentials: String, withUrl: String) { val bundle = Bundle() bundle.putString(BundleKeys.KEY_CHAT_URL, withUrl) @@ -703,20 +633,13 @@ class ChatViewModel @Inject constructor( } } - fun stopAndSendAudioRecording(roomToken: String = "", replyToMessageId: Int? = null, displayName: String) { + fun stopAndSendAudioRecording(room: String, displayName: String, metaData: String) { stopAudioRecording() if (mediaRecorderManager.mediaRecorderState != MediaRecorderManager.MediaRecorderState.ERROR) { val uri = Uri.fromFile(File(mediaRecorderManager.currentVoiceRecordFile)) Log.d(TAG, "File uploaded") - uploadFile( - fileUri = uri.toString(), - isVoiceMessage = true, - caption = "", - roomToken = roomToken, - replyToMessageId = replyToMessageId, - displayName = displayName - ) + uploadFile(uri.toString(), room, displayName, metaData) } } @@ -729,38 +652,7 @@ class ChatViewModel @Inject constructor( fun getCurrentVoiceRecordFile(): String = mediaRecorderManager.currentVoiceRecordFile - fun uploadFile( - fileUri: String, - isVoiceMessage: Boolean, - caption: String = "", - roomToken: String = "", - replyToMessageId: Int? = null, - displayName: String - ) { - val metaDataMap = mutableMapOf() - var room = "" - - if (!participantPermissions.hasChatPermission()) { - Log.w(TAG, "uploading file(s) is forbidden because of missing attendee permissions") - return - } - - if (replyToMessageId != 0) { - metaDataMap["replyTo"] = replyToMessageId.toString() - } - - if (isVoiceMessage) { - metaDataMap["messageType"] = "voice-message" - } - - if (caption != "") { - metaDataMap["caption"] = caption - } - - val metaData = Gson().toJson(metaDataMap) - - room = if (roomToken == "") chatRoomToken else roomToken - + fun uploadFile(fileUri: String, room: String, displayName: String, metaData: String) { try { require(fileUri.isNotEmpty()) UploadAndShareFilesWorker.upload( @@ -807,8 +699,6 @@ class ChatViewModel @Inject constructor( emit(message.first()) } - suspend fun getNumberOfThreadReplies(threadId: Long): Int = chatRepository.getNumberOfThreadReplies(threadId) - fun setPlayBack(speed: PlaybackSpeed) { mediaPlayerManager.setPlayBackSpeed(speed) CoroutineScope(Dispatchers.Default).launch { @@ -964,28 +854,6 @@ class ChatViewModel @Inject constructor( } } - suspend fun updateMessageDraft() { - val model = conversationRepository.getLocallyStoredConversation(chatRoomToken) - model?.messageDraft?.let { - messageDraft = it - } - } - - fun saveMessageDraft() { - CoroutineScope(Dispatchers.IO).launch { - val model = conversationRepository.getLocallyStoredConversation(chatRoomToken) - model?.let { - it.messageDraft = messageDraft - conversationRepository.updateConversation(it) - } - } - } - - fun clearThreadTitle() { - messageDraft.threadTitle = "" - saveMessageDraft() - } - companion object { private val TAG = ChatViewModel::class.simpleName const val JOIN_ROOM_RETRY_COUNT: Long = 3 @@ -1003,10 +871,4 @@ class ChatViewModel @Inject constructor( data class Success(val statusCode: Int) : UnbindRoomUiState() data class Error(val message: String) : UnbindRoomUiState() } - - sealed class ThreadRetrieveUiState { - data object None : ThreadRetrieveUiState() - data class Success(val thread: ThreadInfo?) : ThreadRetrieveUiState() - data class Error(val exception: Exception) : ThreadRetrieveUiState() - } } diff --git a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt index bc7e609..7c081b9 100644 --- a/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/chat/viewmodels/MessageInputViewModel.kt @@ -90,19 +90,11 @@ class MessageInputViewModel @Inject constructor( val getEditChatMessage: LiveData get() = _getEditChatMessage - private val _getReplyChatMessage: MutableLiveData = MutableLiveData() - val getReplyChatMessage: LiveData + private val _getReplyChatMessage: MutableLiveData = MutableLiveData() + val getReplyChatMessage: LiveData get() = _getReplyChatMessage - object CreateThreadStartState : ViewState - class CreateThreadEditState : ViewState - - private val _createThreadViewState: MutableLiveData = MutableLiveData(CreateThreadStartState) - val createThreadViewState: LiveData - get() = _createThreadViewState - sealed interface ViewState - object SendChatMessageStartState : ViewState class SendChatMessageSuccessState(val message: CharSequence) : ViewState class SendChatMessageErrorState(val message: CharSequence) : ViewState @@ -133,8 +125,7 @@ class MessageInputViewModel @Inject constructor( message: String, displayName: String, replyTo: Int, - sendWithoutNotification: Boolean, - threadTitle: String? + sendWithoutNotification: Boolean ) { val referenceId = SendMessageUtils().generateReferenceId() Log.d(TAG, "Random SHA-256 Hash: $referenceId") @@ -165,8 +156,7 @@ class MessageInputViewModel @Inject constructor( displayName, replyTo, sendWithoutNotification, - referenceId, - threadTitle + referenceId ).collect { result -> if (result.isSuccess) { Log.d(TAG, "received ref id: " + (result.getOrNull()?.referenceId ?: "none")) @@ -213,7 +203,7 @@ class MessageInputViewModel @Inject constructor( } } - fun reply(message: ChatMessage?) { + fun reply(message: IMessage?) { _getReplyChatMessage.postValue(message) } @@ -266,14 +256,6 @@ class MessageInputViewModel @Inject constructor( _callStartedFlow.postValue(Pair(recent, show)) } - fun startThreadCreation() { - _createThreadViewState.postValue(CreateThreadEditState()) - } - - fun stopThreadCreation() { - _createThreadViewState.postValue(CreateThreadStartState) - } - companion object { private val TAG = MessageInputViewModel::class.java.simpleName } diff --git a/app/src/main/java/com/nextcloud/talk/components/StandardAppBar.kt b/app/src/main/java/com/nextcloud/talk/components/StandardAppBar.kt index fefe97b..fa64173 100644 --- a/app/src/main/java/com/nextcloud/talk/components/StandardAppBar.kt +++ b/app/src/main/java/com/nextcloud/talk/components/StandardAppBar.kt @@ -51,29 +51,27 @@ fun StandardAppBar(title: String, menuItems: List Unit>>?) { } }, actions = { - if (!menuItems.isNullOrEmpty()) { - Box { - IconButton(onClick = { expanded = true }) { - Icon( - imageVector = Icons.Default.MoreVert, - contentDescription = stringResource(R.string.nc_common_more_options) - ) - } + Box { + IconButton(onClick = { expanded = true }) { + Icon( + imageVector = Icons.Default.MoreVert, + contentDescription = stringResource(R.string.nc_common_more_options) + ) + } - DropdownMenu( - expanded = expanded, - onDismissRequest = { expanded = false }, - modifier = Modifier.background(color = colorResource(id = R.color.bg_default)) - ) { - menuItems?.forEach { (label, action) -> - DropdownMenuItem( - text = { Text(label) }, - onClick = { - action() - expanded = false - } - ) - } + DropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false }, + modifier = Modifier.background(color = colorResource(id = R.color.bg_default)) + ) { + menuItems?.forEach { (label, action) -> + DropdownMenuItem( + text = { Text(label) }, + onClick = { + action() + expanded = false + } + ) } } } diff --git a/app/src/main/java/com/nextcloud/talk/contacts/ContactsScreen.kt b/app/src/main/java/com/nextcloud/talk/contacts/ContactsScreen.kt index 478e0f0..f6a2807 100644 --- a/app/src/main/java/com/nextcloud/talk/contacts/ContactsScreen.kt +++ b/app/src/main/java/com/nextcloud/talk/contacts/ContactsScreen.kt @@ -10,7 +10,6 @@ package com.nextcloud.talk.contacts import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.displayCutoutPadding import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.material3.Scaffold @@ -36,8 +35,7 @@ fun ContactsScreen(contactsViewModel: ContactsViewModel, uiState: ContactsUiStat Scaffold( modifier = Modifier - .statusBarsPadding() - .displayCutoutPadding(), + .statusBarsPadding(), topBar = { if (isSearchActive) { ContactsSearchAppBar( @@ -66,8 +64,8 @@ fun ContactsScreen(contactsViewModel: ContactsViewModel, uiState: ContactsUiStat content = { paddingValues -> Column( Modifier + .padding(0.dp, paddingValues.calculateTopPadding(), 0.dp, 0.dp) .background(colorResource(id = R.color.bg_default)) - .padding(0.dp, paddingValues.calculateTopPadding(), 0.dp, paddingValues.calculateBottomPadding()) ) { if (!isAddParticipants) { ConversationCreationOptions() diff --git a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt index 76feaa3..8012d39 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationcreation/ConversationCreationActivity.kt @@ -29,14 +29,12 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.displayCutoutPadding import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.statusBarsPadding import androidx.compose.foundation.layout.width import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape @@ -175,9 +173,6 @@ fun ConversationCreationScreen( ColoredStatusBar() Scaffold( - modifier = Modifier - .statusBarsPadding() - .displayCutoutPadding(), topBar = { TopAppBar( title = { Text(text = stringResource(id = R.string.nc_new_conversation)) }, @@ -196,8 +191,8 @@ fun ConversationCreationScreen( content = { paddingValues -> Column( modifier = Modifier + .padding(0.dp, paddingValues.calculateTopPadding(), 0.dp, 0.dp) .background(colorResource(id = R.color.bg_default)) - .padding(0.dp, paddingValues.calculateTopPadding(), 0.dp, paddingValues.calculateBottomPadding()) .fillMaxSize() .verticalScroll(rememberScrollState()) ) { diff --git a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt index 347ae60..004840a 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationinfo/ConversationInfoActivity.kt @@ -82,7 +82,6 @@ import com.nextcloud.talk.models.json.participants.Participant.ActorType.USERS import com.nextcloud.talk.models.json.participants.ParticipantsOverall import com.nextcloud.talk.repositories.conversations.ConversationsRepository import com.nextcloud.talk.shareditems.activities.SharedItemsActivity -import com.nextcloud.talk.threadsoverview.ThreadsOverviewActivity import com.nextcloud.talk.ui.dialog.DialogBanListFragment import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.CapabilitiesUtil @@ -602,22 +601,6 @@ class ConversationInfoActivity : startActivity(intent) } - fun openThreadsOverview() { - val threadsUrl = ApiUtils.getUrlForRecentThreads( - version = 1, - baseUrl = conversationUser.baseUrl, - token = conversationToken - ) - - val bundle = Bundle() - bundle.putString(KEY_ROOM_TOKEN, conversationToken) - bundle.putString(ThreadsOverviewActivity.KEY_APPBAR_TITLE, getString(R.string.recent_threads)) - bundle.putString(ThreadsOverviewActivity.KEY_THREADS_SOURCE_URL, threadsUrl) - val threadsOverviewIntent = Intent(context, ThreadsOverviewActivity::class.java) - threadsOverviewIntent.putExtras(bundle) - startActivity(threadsOverviewIntent) - } - private fun setupWebinaryView() { if (hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.WEBINARY_LOBBY) && webinaryRoomType(conversation!!) && @@ -1074,17 +1057,9 @@ class ConversationInfoActivity : ) { binding.sharedItemsButton.setOnClickListener { showSharedItems() } } else { - binding.sharedItemsButton.visibility = GONE binding.sharedItems.visibility = GONE } - if (hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.THREADS)) { - binding.sharedItems.visibility = VISIBLE - binding.showThreadsButton.setOnClickListener { openThreadsOverview() } - } else { - binding.showThreadsButton.visibility = GONE - } - if (conversation!!.type == ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && hasSpreedFeatureCapability(spreedCapabilities, SpreedFeatures.CONVERSATION_CREATION_ALL) ) { diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt index 06324a6..7d97bf5 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/ConversationsListActivity.kt @@ -111,7 +111,6 @@ import com.nextcloud.talk.models.json.converters.EnumActorTypeConverter import com.nextcloud.talk.models.json.participants.Participant import com.nextcloud.talk.repositories.unifiedsearch.UnifiedSearchRepository import com.nextcloud.talk.settings.SettingsActivity -import com.nextcloud.talk.threadsoverview.ThreadsOverviewActivity import com.nextcloud.talk.ui.BackgroundVoiceMessageCard import com.nextcloud.talk.ui.dialog.ChooseAccountDialogFragment import com.nextcloud.talk.ui.dialog.ChooseAccountShareToDialogFragment @@ -268,8 +267,9 @@ class ConversationsListActivity : setupActionBar() setContentView(binding.root) initSystemBars() + viewThemeUtils.material.themeSearchCardView(binding.searchToolbar) - viewThemeUtils.material.colorMaterialButtonContent(binding.menuButton, ColorRole.ON_SURFACE_VARIANT) + viewThemeUtils.material.colorMaterialButtonContent(binding.menuButton, ColorRole.ON_SURFACE) viewThemeUtils.platform.colorTextView(binding.searchText, ColorRole.ON_SURFACE_VARIANT) forwardMessage = intent.getBooleanExtra(KEY_FORWARD_MSG_FLAG, false) @@ -343,7 +343,6 @@ class ConversationsListActivity : } showSearchOrToolbar() - conversationsListViewModel.checkIfThreadsExist() } override fun onPause() { @@ -360,7 +359,7 @@ class ConversationsListActivity : @Suppress("MagicNumber") private fun addEmptyItemForEdgeToEdgeIfNecessary() { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { - adapter?.addScrollableFooter(SpacerItem(100)) + adapter?.addScrollableFooter(SpacerItem(200)) } } @@ -429,23 +428,6 @@ class ConversationsListActivity : } } - lifecycleScope.launch { - conversationsListViewModel.threadsExistState.collect { state -> - when (state) { - is ConversationsListViewModel.ThreadsExistUiState.Success -> { - binding.threadsButton.visibility = if (state.threadsExistence == true) { - View.VISIBLE - } else { - View.GONE - } - } - else -> { - binding.threadsButton.visibility = View.GONE - } - } - } - } - lifecycleScope.launch { conversationsListViewModel.getRoomsFlow .onEach { list -> @@ -725,7 +707,6 @@ class ConversationsListActivity : binding.newMentionPopupBubble.visibility = View.GONE } - layoutManager?.scrollToPositionWithOffset(0, 0) updateFilterConversationButtonColor() } @@ -1013,7 +994,7 @@ class ConversationsListActivity : private fun showSearchBar() { val layoutParams = binding.searchToolbar.layoutParams as AppBarLayout.LayoutParams binding.searchToolbar.visibility = View.VISIBLE - binding.searchText.text = getString(R.string.appbar_search_in, getString(R.string.nc_app_product_name)) + binding.searchText.hint = getString(R.string.appbar_search_in, getString(R.string.nc_app_product_name)) binding.conversationListToolbar.visibility = View.GONE // layoutParams.setScrollFlags(AppBarLayout.LayoutParams.SCROLL_FLAG_SCROLL | AppBarLayout // .LayoutParams.SCROLL_FLAG_SNAP | AppBarLayout.LayoutParams.SCROLL_FLAG_ENTER_ALWAYS); @@ -1323,13 +1304,6 @@ class ConversationsListActivity : newFragment.show(supportFragmentManager, FilterConversationFragment.TAG) } - binding.threadsButton.setOnClickListener { - openFollowedThreadsOverview() - } - binding.threadsButton.let { - viewThemeUtils.platform.colorImageView(it, ColorRole.ON_SURFACE_VARIANT) - } - binding.newMentionPopupBubble.visibility = View.GONE binding.newMentionPopupBubble.setOnClickListener { val layoutManager = binding.recyclerView.layoutManager as SmoothScrollLinearLayoutManager? @@ -2231,32 +2205,17 @@ class ConversationsListActivity : binding.filterConversationsButton.let { viewThemeUtils.platform.colorImageView( it, - ColorRole.ON_SURFACE_VARIANT + ColorRole.ON_SURFACE ) } } } - fun openFollowedThreadsOverview() { - val threadsUrl = ApiUtils.getUrlForSubscribedThreads( - version = 1, - baseUrl = currentUser!!.baseUrl - ) - - val bundle = Bundle() - bundle.putString(ThreadsOverviewActivity.KEY_APPBAR_TITLE, getString(R.string.followed_threads)) - bundle.putString(ThreadsOverviewActivity.KEY_THREADS_SOURCE_URL, threadsUrl) - val threadsOverviewIntent = Intent(context, ThreadsOverviewActivity::class.java) - threadsOverviewIntent.putExtras(bundle) - startActivity(threadsOverviewIntent) - } - companion object { private val TAG = ConversationsListActivity::class.java.simpleName const val UNREAD_BUBBLE_DELAY = 2500 const val BOTTOM_SHEET_DELAY: Long = 2500 private const val KEY_SEARCH_QUERY = "ConversationsListActivity.searchQuery" - private const val CHAT_ACTIVITY_LOCAL_NAME = "com.nextcloud.talk.chat.ChatActivity" const val SEARCH_DEBOUNCE_INTERVAL_MS = 300 const val SEARCH_MIN_CHARS = 1 const val HTTP_UNAUTHORIZED = 401 diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/data/OfflineConversationsRepository.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/data/OfflineConversationsRepository.kt index a115ac0..92591fe 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/data/OfflineConversationsRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/data/OfflineConversationsRepository.kt @@ -36,8 +36,4 @@ interface OfflineConversationsRepository { * to be handled asynchronously. */ fun getRoom(roomToken: String): Job - - suspend fun updateConversation(conversationModel: ConversationModel) - - suspend fun getLocallyStoredConversation(roomToken: String): ConversationModel? } diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/data/network/OfflineFirstConversationsRepository.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/data/network/OfflineFirstConversationsRepository.kt index 2e3687a..c4b9419 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/data/network/OfflineFirstConversationsRepository.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/data/network/OfflineFirstConversationsRepository.kt @@ -98,22 +98,12 @@ class OfflineFirstConversationsRepository @Inject constructor( runBlocking { _conversationFlow.emit(model) val entityList = listOf(model.asEntity()) - dao.upsertConversations(user.id!!, entityList) + dao.upsertConversations(entityList) } } }) } - override suspend fun updateConversation(conversationModel: ConversationModel) { - val entity = conversationModel.asEntity() - dao.updateConversation(entity) - } - - override suspend fun getLocallyStoredConversation(roomToken: String): ConversationModel? { - val id = user.id!! - return getConversation(id, roomToken) - } - @Suppress("Detekt.TooGenericExceptionCaught") private suspend fun getRoomsFromServer(): List? { var conversationsFromSync: List? = null @@ -136,7 +126,7 @@ class OfflineFirstConversationsRepository @Inject constructor( } deleteLeftConversations(conversationsFromSync) - dao.upsertConversations(user.id!!, conversationsFromSync) + dao.upsertConversations(conversationsFromSync) } catch (e: Exception) { Log.e(TAG, "Something went wrong when fetching conversations", e) } diff --git a/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt b/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt index f7ef8e2..a185293 100644 --- a/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt +++ b/app/src/main/java/com/nextcloud/talk/conversationlist/viewmodels/ConversationsListViewModel.kt @@ -10,35 +10,21 @@ import android.util.Log import androidx.lifecycle.LiveData import androidx.lifecycle.MutableLiveData import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager import com.nextcloud.talk.conversationlist.data.OfflineConversationsRepository -import com.nextcloud.talk.data.user.model.User import com.nextcloud.talk.invitation.data.InvitationsModel import com.nextcloud.talk.invitation.data.InvitationsRepository -import com.nextcloud.talk.threadsoverview.data.ThreadsRepository import com.nextcloud.talk.users.UserManager -import com.nextcloud.talk.utils.ApiUtils -import com.nextcloud.talk.utils.CapabilitiesUtil.hasSpreedFeatureCapability -import com.nextcloud.talk.utils.SpreedFeatures -import com.nextcloud.talk.utils.UserIdUtils import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew import io.reactivex.Observer import io.reactivex.android.schedulers.AndroidSchedulers import io.reactivex.disposables.Disposable import io.reactivex.schedulers.Schedulers -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow import kotlinx.coroutines.flow.catch import kotlinx.coroutines.flow.onEach -import kotlinx.coroutines.launch -import java.util.concurrent.TimeUnit import javax.inject.Inject class ConversationsListViewModel @Inject constructor( private val repository: OfflineConversationsRepository, - private val threadsRepository: ThreadsRepository, - private val currentUserProvider: CurrentUserProviderNew, var userManager: UserManager ) : ViewModel() { @@ -46,23 +32,10 @@ class ConversationsListViewModel @Inject constructor( lateinit var invitationsRepository: InvitationsRepository @Inject - lateinit var arbitraryStorageManager: ArbitraryStorageManager - - private val _currentUser = currentUserProvider.currentUser.blockingGet() - val currentUser: User = _currentUser - val credentials = ApiUtils.getCredentials(_currentUser.username, _currentUser.token) ?: "" + lateinit var currentUserProvider: CurrentUserProviderNew sealed interface ViewState - sealed class ThreadsExistUiState { - data object None : ThreadsExistUiState() - data class Success(val threadsExistence: Boolean?) : ThreadsExistUiState() - data class Error(val exception: Exception) : ThreadsExistUiState() - } - - private val _threadsExistState = MutableStateFlow(ThreadsExistUiState.None) - val threadsExistState: StateFlow = _threadsExistState - object GetRoomsStartState : ViewState object GetRoomsErrorState : ViewState open class GetRoomsSuccessState(val listIsNotEmpty: Boolean) : ViewState @@ -114,79 +87,6 @@ class ConversationsListViewModel @Inject constructor( repository.getRooms() } - fun checkIfThreadsExist() { - val limitForFollowedThreadsExistenceCheck = 1 - val accountId = UserIdUtils.getIdForUser(currentUserProvider.currentUser.blockingGet()) - - fun isLastCheckTooOld(lastCheckDate: Long): Boolean { - val currentTimeMillis = System.currentTimeMillis() - val differenceMillis = currentTimeMillis - lastCheckDate - val checkIntervalInMillies = TimeUnit.HOURS.toMillis(2) - return differenceMillis > checkIntervalInMillies - } - - fun checkIfFollowedThreadsExist() { - val threadsUrl = ApiUtils.getUrlForSubscribedThreads( - version = 1, - baseUrl = currentUser.baseUrl - ) - - viewModelScope.launch { - try { - val threads = - threadsRepository.getThreads(credentials, threadsUrl, limitForFollowedThreadsExistenceCheck) - val followedThreadsExistNew = threads.ocs?.data?.isNotEmpty() - _threadsExistState.value = ThreadsExistUiState.Success(followedThreadsExistNew) - val followedThreadsExistLastCheckNew = System.currentTimeMillis() - arbitraryStorageManager.storeStorageSetting( - accountId, - FOLLOWED_THREADS_EXIST_LAST_CHECK, - followedThreadsExistLastCheckNew.toString(), - "" - ) - arbitraryStorageManager.storeStorageSetting( - accountId, - FOLLOWED_THREADS_EXIST, - followedThreadsExistNew.toString(), - "" - ) - } catch (exception: Exception) { - _threadsExistState.value = ThreadsExistUiState.Error(exception) - } - } - } - - if (!hasSpreedFeatureCapability(currentUser.capabilities!!.spreedCapability!!, SpreedFeatures.THREADS)) { - _threadsExistState.value = ThreadsExistUiState.Success(false) - return - } - - val followedThreadsExistOld = arbitraryStorageManager.getStorageSetting( - accountId, - FOLLOWED_THREADS_EXIST, - "" - ).blockingGet()?.value?.toBoolean() ?: false - - val followedThreadsExistLastCheckOld = arbitraryStorageManager.getStorageSetting( - accountId, - FOLLOWED_THREADS_EXIST_LAST_CHECK, - "" - ).blockingGet()?.value?.toLong() - - if (followedThreadsExistOld) { - Log.d(TAG, "followed threads exist for this user. No need to check again.") - _threadsExistState.value = ThreadsExistUiState.Success(true) - } else { - if (followedThreadsExistLastCheckOld == null || isLastCheckTooOld(followedThreadsExistLastCheckOld)) { - Log.d(TAG, "check if followed threads exist never happened or is too old. Checking now...") - checkIfFollowedThreadsExist() - } else { - _threadsExistState.value = ThreadsExistUiState.Success(false) - Log.d(TAG, "already checked in the last 2 hours if followed threads exist. Skip check.") - } - } - } - inner class FederatedInvitationsObserver : Observer { override fun onSubscribe(d: Disposable) { // unused atm @@ -222,7 +122,5 @@ class ConversationsListViewModel @Inject constructor( companion object { private val TAG = ConversationsListViewModel::class.simpleName - const val FOLLOWED_THREADS_EXIST_LAST_CHECK = "FOLLOWED_THREADS_EXIST_LAST_CHECK" - const val FOLLOWED_THREADS_EXIST = "FOLLOWED_THREADS_EXIST" } } diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt index 2434cf6..2961316 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RepositoryModule.kt @@ -9,10 +9,6 @@ */ package com.nextcloud.talk.dagger.modules -import android.content.Context -import com.nextcloud.talk.account.data.LoginRepository -import com.nextcloud.talk.account.data.io.LocalLoginDataSource -import com.nextcloud.talk.account.data.network.NetworkLoginDataSource import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.api.NcApiCoroutines import com.nextcloud.talk.chat.data.ChatMessageRepository @@ -58,14 +54,10 @@ import com.nextcloud.talk.repositories.unifiedsearch.UnifiedSearchRepository import com.nextcloud.talk.repositories.unifiedsearch.UnifiedSearchRepositoryImpl import com.nextcloud.talk.shareditems.repositories.SharedItemsRepository import com.nextcloud.talk.shareditems.repositories.SharedItemsRepositoryImpl -import com.nextcloud.talk.threadsoverview.data.ThreadsRepository -import com.nextcloud.talk.threadsoverview.data.ThreadsRepositoryImpl import com.nextcloud.talk.translate.repositories.TranslateRepository import com.nextcloud.talk.translate.repositories.TranslateRepositoryImpl -import com.nextcloud.talk.users.UserManager import com.nextcloud.talk.utils.DateUtils import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew -import com.nextcloud.talk.utils.preferences.AppPreferences import dagger.Module import dagger.Provides import okhttp3.OkHttpClient @@ -192,27 +184,4 @@ class RepositoryModule { ncApiCoroutines: NcApiCoroutines, currentUserProviderNew: CurrentUserProviderNew ): ConversationCreationRepository = ConversationCreationRepositoryImpl(ncApiCoroutines, currentUserProviderNew) - - @Provides - fun provideThreadsRepository( - ncApiCoroutines: NcApiCoroutines, - currentUserProviderNew: CurrentUserProviderNew - ): ThreadsRepository = ThreadsRepositoryImpl(ncApiCoroutines, currentUserProviderNew) - - @Provides - fun provideNetworkDataSource(okHttpClient: OkHttpClient): NetworkLoginDataSource = - NetworkLoginDataSource(okHttpClient) - - @Provides - fun providesLocalDataSource( - userManager: UserManager, - appPreferences: AppPreferences, - context: Context - ): LocalLoginDataSource = LocalLoginDataSource(userManager, appPreferences, context) - - @Provides - fun provideLoginRepository( - networkLoginDataSource: NetworkLoginDataSource, - localLoginDataSource: LocalLoginDataSource - ): LoginRepository = LoginRepository(networkLoginDataSource, localLoginDataSource) } diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java index 8d8233a..e28a1f1 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/RestModule.java @@ -34,10 +34,9 @@ import java.security.KeyStoreException; import java.security.NoSuchAlgorithmException; import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; -import java.util.ArrayList; -import java.util.List; import java.util.concurrent.TimeUnit; +import javax.inject.Named; import javax.inject.Singleton; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.X509KeyManager; @@ -49,7 +48,6 @@ import dagger.Provides; import io.reactivex.schedulers.Schedulers; import okhttp3.Authenticator; import okhttp3.Cache; -import okhttp3.ConnectionSpec; import okhttp3.Credentials; import okhttp3.Dispatcher; import okhttp3.Interceptor; @@ -62,6 +60,7 @@ import okhttp3.internal.tls.OkHostnameVerifier; import okhttp3.logging.HttpLoggingInterceptor; import retrofit2.Retrofit; import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory; +import retrofit2.converter.gson.GsonConverterFactory; @Module(includes = DatabaseModule.class) public class RestModule { @@ -219,16 +218,6 @@ public class RestModule { httpClient.addInterceptor(new HeadersInterceptor()); - List specs = new ArrayList<>(); - if (BuildConfig.DEBUG) { - specs.add(ConnectionSpec.COMPATIBLE_TLS); - specs.add(ConnectionSpec.CLEARTEXT); - httpClient.connectionSpecs(specs); - } else { - specs.add(ConnectionSpec.COMPATIBLE_TLS); - httpClient.connectionSpecs(specs); - } - if (BuildConfig.DEBUG && !context.getResources().getBoolean(R.bool.nc_is_debug)) { HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(); loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); @@ -268,8 +257,8 @@ public class RestModule { public static class HttpAuthenticator implements Authenticator { - private final String credentials; - private final String authenticatorType; + private String credentials; + private String authenticatorType; public HttpAuthenticator(@NonNull String credentials, @NonNull String authenticatorType) { this.credentials = credentials; @@ -302,7 +291,7 @@ public class RestModule { private class GetProxyRunnable implements Runnable { private volatile Proxy proxy; - private final AppPreferences appPreferences; + private AppPreferences appPreferences; GetProxyRunnable(AppPreferences appPreferences) { this.appPreferences = appPreferences; diff --git a/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt b/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt index 7d44652..a514d5b 100644 --- a/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt +++ b/app/src/main/java/com/nextcloud/talk/dagger/modules/ViewModelModule.kt @@ -9,7 +9,6 @@ package com.nextcloud.talk.dagger.modules import androidx.lifecycle.ViewModel import androidx.lifecycle.ViewModelProvider -import com.nextcloud.talk.account.viewmodels.BrowserLoginActivityViewModel import com.nextcloud.talk.chat.viewmodels.ChatViewModel import com.nextcloud.talk.chat.viewmodels.MessageInputViewModel import com.nextcloud.talk.contacts.ContactsViewModel @@ -28,7 +27,6 @@ import com.nextcloud.talk.polls.viewmodels.PollVoteViewModel import com.nextcloud.talk.raisehand.viewmodel.RaiseHandViewModel import com.nextcloud.talk.remotefilebrowser.viewmodels.RemoteFileBrowserItemsViewModel import com.nextcloud.talk.shareditems.viewmodels.SharedItemsViewModel -import com.nextcloud.talk.threadsoverview.viewmodels.ThreadsOverviewViewModel import com.nextcloud.talk.translate.viewmodels.TranslateViewModel import com.nextcloud.talk.viewmodels.CallRecordingViewModel import dagger.Binds @@ -156,14 +154,4 @@ abstract class ViewModelModule { @IntoMap @ViewModelKey(DiagnoseViewModel::class) abstract fun diagnoseViewModel(viewModel: DiagnoseViewModel): ViewModel - - @Binds - @IntoMap - @ViewModelKey(ThreadsOverviewViewModel::class) - abstract fun threadsOverviewViewModel(viewModel: ThreadsOverviewViewModel): ViewModel - - @Binds - @IntoMap - @ViewModelKey(BrowserLoginActivityViewModel::class) - abstract fun browserLoginActivityViewModel(viewModel: BrowserLoginActivityViewModel): ViewModel } diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt index 7c80cb8..af93974 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatBlocksDao.kt @@ -25,24 +25,43 @@ interface ChatBlocksDao { SELECT * FROM ChatBlocks WHERE internalConversationId in (:internalConversationId) - AND (threadId = :threadId OR (threadId IS NULL AND :threadId IS NULL)) + ORDER BY newestMessageId ASC + """ + ) + fun getChatBlocks(internalConversationId: String): Flow> + + // @Query( + // """ + // SELECT * + // FROM ChatBlocks + // WHERE internalConversationId in (:internalConversationId) + // AND newestMessageId >= :messageId + // ORDER BY newestMessageId ASC + // """ + // ) + // fun getChatBlocksThatReachMessageId( + // internalConversationId: String, + // messageId: Long + // ): + // Flow> + + @Query( + """ + SELECT * + FROM ChatBlocks + WHERE internalConversationId in (:internalConversationId) AND oldestMessageId <= :messageId AND newestMessageId >= :messageId ORDER BY newestMessageId ASC """ ) - fun getChatBlocksContainingMessageId( - internalConversationId: String, - threadId: Long?, - messageId: Long - ): Flow> + fun getChatBlocksContainingMessageId(internalConversationId: String, messageId: Long): Flow> @Query( """ SELECT * FROM ChatBlocks WHERE internalConversationId = :internalConversationId - AND (threadId = :threadId OR (threadId IS NULL AND :threadId IS NULL)) AND( (oldestMessageId <= :oldestMessageId AND newestMessageId >= :oldestMessageId) OR @@ -55,24 +74,21 @@ interface ChatBlocksDao { ) fun getConnectedChatBlocks( internalConversationId: String, - threadId: Long?, oldestMessageId: Long, newestMessageId: Long ): Flow> - @Query( - """ - SELECT MAX(newestMessageId) as max_items - FROM ChatBlocks - WHERE internalConversationId = :internalConversationId - AND (threadId = :threadId OR (threadId IS NULL AND :threadId IS NULL)) - """ - ) - fun getNewestMessageIdFromChatBlocks(internalConversationId: String, threadId: Long?): Long - @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun upsertChatBlock(chatBlock: ChatBlockEntity) + @Query( + """ + DELETE FROM ChatBlocks + WHERE internalConversationId LIKE :pattern + """ + ) + fun clearChatBlocksForUser(pattern: String) + @Query( """ DELETE FROM ChatBlocks diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt index b3c5276..70a17a0 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/dao/ChatMessagesDao.kt @@ -18,6 +18,16 @@ import kotlinx.coroutines.flow.Flow @Dao @Suppress("Detekt.TooManyFunctions") interface ChatMessagesDao { + @Query( + """ + SELECT MAX(id) as max_items + FROM ChatMessages + WHERE internalConversationId = :internalConversationId + AND isTemporary = 0 + """ + ) + fun getNewestMessageId(internalConversationId: String): Long + @Query( """ SELECT * @@ -47,14 +57,10 @@ interface ChatMessagesDao { WHERE internalConversationId = :internalConversationId AND isTemporary = 1 AND sendStatus != 'SENT_PENDING_ACK' - AND (:threadId IS NULL OR threadId = :threadId) ORDER BY timestamp DESC, id DESC """ ) - fun getTempUnsentMessagesForConversation( - internalConversationId: String, - threadId: Long? - ): Flow> + fun getTempUnsentMessagesForConversation(internalConversationId: String): Flow> @Query( """ @@ -63,15 +69,10 @@ interface ChatMessagesDao { WHERE internalConversationId = :internalConversationId AND referenceId = :referenceId AND isTemporary = 1 - AND (:threadId IS NULL OR threadId = :threadId) ORDER BY timestamp DESC, id DESC """ ) - fun getTempMessageForConversation( - internalConversationId: String, - referenceId: String, - threadId: Long? - ): Flow + fun getTempMessageForConversation(internalConversationId: String, referenceId: String): Flow @Insert(onConflict = OnConflictStrategy.REPLACE) suspend fun upsertChatMessages(chatMessages: List) @@ -83,8 +84,7 @@ interface ChatMessagesDao { """ SELECT * FROM ChatMessages - WHERE internalConversationId = :internalConversationId - AND id = :messageId + WHERE internalConversationId = :internalConversationId AND id = :messageId """ ) fun getChatMessageForConversation(internalConversationId: String, messageId: Long): Flow @@ -126,15 +126,10 @@ interface ChatMessagesDao { FROM ChatMessages WHERE internalConversationId = :internalConversationId AND id >= :messageId AND isTemporary = 0 - AND (:threadId IS NULL OR threadId = :threadId) ORDER BY timestamp ASC, id ASC """ ) - fun getMessagesForConversationSince( - internalConversationId: String, - messageId: Long, - threadId: Long? - ): Flow> + fun getMessagesForConversationSince(internalConversationId: String, messageId: Long): Flow> @Query( """ @@ -143,7 +138,6 @@ interface ChatMessagesDao { WHERE internalConversationId = :internalConversationId AND isTemporary = 0 AND id < :messageId - AND (:threadId IS NULL OR threadId = :threadId) ORDER BY timestamp DESC, id DESC LIMIT :limit """ @@ -151,8 +145,7 @@ interface ChatMessagesDao { fun getMessagesForConversationBefore( internalConversationId: String, messageId: Long, - limit: Int, - threadId: Long? + limit: Int ): Flow> @Query( @@ -162,7 +155,6 @@ interface ChatMessagesDao { WHERE internalConversationId = :internalConversationId AND isTemporary = 0 AND id <= :messageId - AND (:threadId IS NULL OR threadId = :threadId) ORDER BY timestamp DESC, id DESC LIMIT :limit """ @@ -170,8 +162,7 @@ interface ChatMessagesDao { fun getMessagesForConversationBeforeAndEqual( internalConversationId: String, messageId: Long, - limit: Int, - threadId: Long? + limit: Int ): Flow> @Query( @@ -180,16 +171,10 @@ interface ChatMessagesDao { FROM ChatMessages WHERE internalConversationId = :internalConversationId AND isTemporary = 0 - AND (:threadId IS NULL OR threadId = :threadId) AND id BETWEEN :newestMessageId AND :oldestMessageId """ ) - fun getCountBetweenMessageIds( - internalConversationId: String, - oldestMessageId: Long, - newestMessageId: Long, - threadId: Long? - ): Int + fun getCountBetweenMessageIds(internalConversationId: String, oldestMessageId: Long, newestMessageId: Long): Int @Query( """ @@ -207,18 +192,4 @@ interface ChatMessagesDao { """ ) fun deleteMessagesOlderThan(internalConversationId: String, messageId: Long) - - @Query( - """ - SELECT COUNT(*) - FROM ChatMessages AS child - INNER JOIN ChatMessages AS parent - ON child.parent = parent.id - WHERE child.internalConversationId = :internalConversationId - AND child.isTemporary = 0 - AND child.messageType = 'comment' - AND parent.threadId = :threadId - """ - ) - fun getNumberOfThreadReplies(internalConversationId: String, threadId: Long): Int } diff --git a/app/src/main/java/com/nextcloud/talk/data/database/dao/ConversationsDao.kt b/app/src/main/java/com/nextcloud/talk/data/database/dao/ConversationsDao.kt index 621207c..b6b7ae1 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/dao/ConversationsDao.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/dao/ConversationsDao.kt @@ -8,14 +8,11 @@ package com.nextcloud.talk.data.database.dao import androidx.room.Dao -import androidx.room.Insert -import androidx.room.OnConflictStrategy.Companion.REPLACE import androidx.room.Query -import androidx.room.Transaction import androidx.room.Update +import androidx.room.Upsert import com.nextcloud.talk.data.database.model.ConversationEntity import kotlinx.coroutines.flow.Flow -import kotlinx.coroutines.flow.first @Dao interface ConversationsDao { @@ -25,19 +22,8 @@ interface ConversationsDao { @Query("SELECT * FROM Conversations where accountId = :accountId AND token = :token") fun getConversationForUser(accountId: Long, token: String): Flow - @Transaction - suspend fun upsertConversations(accountId: Long, serverItems: List) { - serverItems.forEach { serverItem -> - val existingItem = getConversationForUser(accountId, serverItem.token).first() - if (existingItem != null) { - val mergedItem = serverItem.copy() - mergedItem.messageDraft = existingItem.messageDraft - updateConversation(mergedItem) - } else { - insertConversation(serverItem) - } - } - } + @Upsert + fun upsertConversations(conversationEntities: List) /** * Deletes rows in the db matching the specified [conversationIds] @@ -50,12 +36,9 @@ interface ConversationsDao { ) fun deleteConversations(conversationIds: List) - @Update(onConflict = REPLACE) + @Update fun updateConversation(conversationEntity: ConversationEntity) - @Insert(onConflict = REPLACE) - fun insertConversation(conversation: ConversationEntity) - @Query( """ DELETE FROM Conversations diff --git a/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt b/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt index 1369740..c2227dd 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/mappers/ChatMessageMapUtils.kt @@ -19,8 +19,6 @@ fun ChatMessageJson.asEntity(accountId: Long) = accountId = accountId, id = id, internalConversationId = "$accountId@$token", - threadId = threadId, - isThread = hasThread, message = message!!, token = token!!, actorType = actorType!!, @@ -42,9 +40,7 @@ fun ChatMessageJson.asEntity(accountId: Long) = lastEditTimestamp = lastEditTimestamp, deleted = deleted, referenceId = referenceId, - silent = silent, - threadTitle = threadTitle, - threadReplies = threadReplies + silent = silent ) fun ChatMessageEntity.asModel() = @@ -52,8 +48,6 @@ fun ChatMessageEntity.asModel() = jsonMessageId = id.toInt(), message = message, token = token, - threadId = threadId, - isThread = isThread, actorType = actorType, actorId = actorId, actorDisplayName = actorDisplayName, @@ -76,9 +70,7 @@ fun ChatMessageEntity.asModel() = isTemporary = isTemporary, sendStatus = sendStatus, readStatus = ReadStatus.NONE, - silent = silent, - threadTitle = threadTitle, - threadReplies = threadReplies + silent = silent ) fun ChatMessageJson.asModel() = @@ -86,8 +78,6 @@ fun ChatMessageJson.asModel() = jsonMessageId = id.toInt(), message = message, token = token, - threadId = threadId, - isThread = hasThread, actorType = actorType, actorId = actorId, actorDisplayName = actorDisplayName, @@ -107,7 +97,5 @@ fun ChatMessageJson.asModel() = lastEditTimestamp = lastEditTimestamp, isDeleted = deleted, referenceId = referenceId, - silent = silent, - threadTitle = threadTitle, - threadReplies = threadReplies + silent = silent ) diff --git a/app/src/main/java/com/nextcloud/talk/data/database/mappers/ConversationMapUtils.kt b/app/src/main/java/com/nextcloud/talk/data/database/mappers/ConversationMapUtils.kt index 0953376..dd28633 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/mappers/ConversationMapUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/mappers/ConversationMapUtils.kt @@ -1,7 +1,7 @@ /* * Nextcloud Talk - Android Client * - * SPDX-FileCopyrightText: 2024 Julius Linus + * SPDX-FileCopyrightText: 2024 Your Name * SPDX-License-Identifier: GPL-3.0-or-later */ @@ -63,8 +63,7 @@ fun ConversationModel.asEntity() = remoteToken = remoteToken, hasArchived = hasArchived, hasSensitive = hasSensitive, - hasImportant = hasImportant, - messageDraft = messageDraft + hasImportant = hasImportant ) fun ConversationEntity.asModel() = @@ -118,8 +117,7 @@ fun ConversationEntity.asModel() = remoteToken = remoteToken, hasArchived = hasArchived, hasSensitive = hasSensitive, - hasImportant = hasImportant, - messageDraft = messageDraft + hasImportant = hasImportant ) fun Conversation.asEntity(accountId: Long) = diff --git a/app/src/main/java/com/nextcloud/talk/data/database/model/ChatBlockEntity.kt b/app/src/main/java/com/nextcloud/talk/data/database/model/ChatBlockEntity.kt index 62ec1b4..15b2008 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/model/ChatBlockEntity.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/model/ChatBlockEntity.kt @@ -35,7 +35,6 @@ data class ChatBlockEntity( @ColumnInfo(name = "internalConversationId") var internalConversationId: String, @ColumnInfo(name = "accountId") var accountId: Long? = null, @ColumnInfo(name = "token") var token: String?, - @ColumnInfo(name = "threadId") var threadId: Long? = null, @ColumnInfo(name = "oldestMessageId") var oldestMessageId: Long, @ColumnInfo(name = "newestMessageId") var newestMessageId: Long, @ColumnInfo(name = "hasHistory") var hasHistory: Boolean diff --git a/app/src/main/java/com/nextcloud/talk/data/database/model/ChatMessageEntity.kt b/app/src/main/java/com/nextcloud/talk/data/database/model/ChatMessageEntity.kt index 3fc2bb0..3661685 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/model/ChatMessageEntity.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/model/ChatMessageEntity.kt @@ -41,8 +41,7 @@ data class ChatMessageEntity( @ColumnInfo(name = "id") var id: Long = 0, // accountId@roomtoken @ColumnInfo(name = "internalConversationId") var internalConversationId: String, - @ColumnInfo(name = "threadId") var threadId: Long? = null, - @ColumnInfo(name = "isThread") var isThread: Boolean = false, + @ColumnInfo(name = "actorDisplayName") var actorDisplayName: String, @ColumnInfo(name = "message") var message: String, @@ -68,7 +67,5 @@ data class ChatMessageEntity( @ColumnInfo(name = "sendStatus") var sendStatus: SendStatus? = null, @ColumnInfo(name = "silent") var silent: Boolean = false, @ColumnInfo(name = "systemMessage") var systemMessageType: ChatMessage.SystemMessageType, - @ColumnInfo(name = "threadTitle") var threadTitle: String? = null, - @ColumnInfo(name = "threadReplies") var threadReplies: Int? = 0, @ColumnInfo(name = "timestamp") var timestamp: Long = 0 ) diff --git a/app/src/main/java/com/nextcloud/talk/data/database/model/ConversationEntity.kt b/app/src/main/java/com/nextcloud/talk/data/database/model/ConversationEntity.kt index 8301b8c..8cdd4db 100644 --- a/app/src/main/java/com/nextcloud/talk/data/database/model/ConversationEntity.kt +++ b/app/src/main/java/com/nextcloud/talk/data/database/model/ConversationEntity.kt @@ -13,7 +13,6 @@ import androidx.room.ForeignKey import androidx.room.Index import androidx.room.PrimaryKey import com.nextcloud.talk.data.user.model.UserEntity -import com.nextcloud.talk.models.MessageDraft import com.nextcloud.talk.models.json.conversations.ConversationEnums import com.nextcloud.talk.models.json.participants.Participant @@ -97,8 +96,7 @@ data class ConversationEntity( @ColumnInfo(name = "unreadMessages") var unreadMessages: Int = 0, @ColumnInfo(name = "hasArchived") var hasArchived: Boolean = false, @ColumnInfo(name = "hasSensitive") var hasSensitive: Boolean = false, - @ColumnInfo(name = "hasImportant") var hasImportant: Boolean = false, - @ColumnInfo(name = "messageDraft") var messageDraft: MessageDraft? = MessageDraft() + @ColumnInfo(name = "hasImportant") var hasImportant: Boolean = false // missing/not needed: attendeeId // missing/not needed: attendeePin // missing/not needed: attendeePermissions diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt index dc5e8ac..be0ccec 100644 --- a/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt +++ b/app/src/main/java/com/nextcloud/talk/data/source/local/Migrations.kt @@ -89,17 +89,6 @@ object Migrations { } } - val MIGRATION_17_19 = object : Migration(17, 19) { - override fun migrate(db: SupportSQLiteDatabase) { - Log.i( - "Migrations", - "Migrating 17 to 19 (migration 17 to 18 had bugs in app version v22.0.0 Alpha 11 and " + - "v22.0.0 Alpha 12)" - ) - migrateToMessageThreads(db) - } - } - //endregion fun migrateToRoom(db: SupportSQLiteDatabase) { @@ -308,7 +297,7 @@ object Migrations { "ADD COLUMN hasArchived INTEGER NOT NULL DEFAULT 0;" ) } catch (e: SQLException) { - Log.i("Migrations", "hasArchived already exists", e) + Log.i("Migrations", "hasArchived already exists") } } @@ -319,7 +308,7 @@ object Migrations { "ADD COLUMN objectId TEXT NOT NULL DEFAULT '';" ) } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when adding column objectId to table Conversations", e) + Log.i("Migrations", "Something went wrong when adding column objectId to table Conversations") } } @@ -330,7 +319,7 @@ object Migrations { "ADD COLUMN hasSensitive INTEGER NOT NULL DEFAULT 0;" ) } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when adding column hasSensitive to table Conversations", e) + Log.i("Migrations", "Something went wrong when adding column hasSensitive to table Conversations") } } @@ -341,43 +330,7 @@ object Migrations { "ADD COLUMN hasImportant INTEGER NOT NULL DEFAULT 0;" ) } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when adding column hasImportant to table Conversations", e) - } - } - - fun migrateToMessageThreads(db: SupportSQLiteDatabase) { - try { - db.execSQL( - "ALTER TABLE ChatBlocks " + - "ADD COLUMN threadId INTEGER;" - ) - - db.execSQL( - "ALTER TABLE ChatMessages " + - "ADD COLUMN threadId INTEGER;" - ) - - db.execSQL( - "ALTER TABLE ChatMessages " + - "ADD COLUMN isThread INTEGER NOT NULL DEFAULT 0;" - ) - - // Foreign key constraints are not active during migration. - // At least db.execSQL("PRAGMA foreign_keys=ON;") etc did not help. - // Because of this it is not enough to just clear the Conversations table (to have cascade deletion in - // other tables), but all related tables have to be cleared with SQL statement as well. - - db.execSQL( - "DELETE FROM Conversations" - ) - db.execSQL( - "DELETE FROM ChatMessages" - ) - db.execSQL( - "DELETE FROM ChatBlocks" - ) - } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when migrating to messageThreads", e) + Log.i("Migrations", "Something went wrong when adding column hasImportant to table Conversations") } } @@ -388,7 +341,7 @@ object Migrations { "ADD COLUMN referenceId TEXT;" ) } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when adding column referenceId to table ChatMessages", e) + Log.i("Migrations", "Something went wrong when adding column referenceId to table ChatMessages") } try { @@ -397,7 +350,7 @@ object Migrations { "ADD COLUMN isTemporary INTEGER NOT NULL DEFAULT 0;" ) } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when adding column isTemporary to table ChatMessages", e) + Log.i("Migrations", "Something went wrong when adding column isTemporary to table ChatMessages") } try { @@ -406,7 +359,7 @@ object Migrations { "ADD COLUMN sendingFailed INTEGER NOT NULL DEFAULT 0;" ) } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when adding column sendingFailed to table ChatMessages", e) + Log.i("Migrations", "Something went wrong when adding column sendingFailed to table ChatMessages") } try { @@ -415,7 +368,7 @@ object Migrations { "ADD COLUMN silent INTEGER NOT NULL DEFAULT 0;" ) } catch (e: SQLException) { - Log.i("Migrations", "Something went wrong when adding column silent to table ChatMessages", e) + Log.i("Migrations", "Something went wrong when adding column silent to table ChatMessages") } } } diff --git a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt index dff97d1..994e9df 100644 --- a/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt +++ b/app/src/main/java/com/nextcloud/talk/data/source/local/TalkDatabase.kt @@ -36,7 +36,6 @@ import com.nextcloud.talk.data.storage.ArbitraryStoragesDao import com.nextcloud.talk.data.storage.model.ArbitraryStorageEntity import com.nextcloud.talk.data.user.UsersDao import com.nextcloud.talk.data.user.model.UserEntity -import com.nextcloud.talk.models.MessageDraftConverter import net.zetetic.database.sqlcipher.SupportOpenHelperFactory import java.util.Locale @@ -48,12 +47,10 @@ import java.util.Locale ChatMessageEntity::class, ChatBlockEntity::class ], - version = 21, + version = 17, autoMigrations = [ AutoMigration(from = 9, to = 10), - AutoMigration(from = 16, to = 17, spec = AutoMigration16To17::class), - AutoMigration(from = 19, to = 20), - AutoMigration(from = 20, to = 21) + AutoMigration(from = 16, to = 17, spec = AutoMigration16To17::class) ], exportSchema = true ) @@ -66,10 +63,8 @@ import java.util.Locale HashMapHashMapConverter::class, LinkedHashMapConverter::class, ArrayListConverter::class, - SendStatusConverter::class, - MessageDraftConverter::class + SendStatusConverter::class ) -@Suppress("MagicNumber") abstract class TalkDatabase : RoomDatabase() { abstract fun usersDao(): UsersDao abstract fun conversationsDao(): ConversationsDao @@ -90,21 +85,6 @@ abstract class TalkDatabase : RoomDatabase() { instance ?: build(context).also { instance = it } } - // If editing the migrations, please add a test case in MigrationsTest under androidTest/data - val MIGRATIONS = arrayOf( - Migrations.MIGRATION_6_8, - Migrations.MIGRATION_7_8, - Migrations.MIGRATION_8_9, - Migrations.MIGRATION_10_11, - Migrations.MIGRATION_11_12, - Migrations.MIGRATION_12_13, - Migrations.MIGRATION_13_14, - Migrations.MIGRATION_14_15, - Migrations.MIGRATION_15_16, - Migrations.MIGRATION_17_19 - ) - - @Suppress("SpreadOperator") private fun build(context: Context): TalkDatabase { val passCharArray = context.getString(R.string.nc_talk_database_encryption_key).toCharArray() val passphrase: ByteArray = getBytesFromChars(passCharArray) @@ -124,8 +104,17 @@ abstract class TalkDatabase : RoomDatabase() { .databaseBuilder(context.applicationContext, TalkDatabase::class.java, dbName) // comment out openHelperFactory to view the database entries in Android Studio for debugging .openHelperFactory(factory) - .fallbackToDestructiveMigrationFrom(true, 18) - .addMigrations(*MIGRATIONS) // * converts migrations to vararg + .addMigrations( + Migrations.MIGRATION_6_8, + Migrations.MIGRATION_7_8, + Migrations.MIGRATION_8_9, + Migrations.MIGRATION_10_11, + Migrations.MIGRATION_11_12, + Migrations.MIGRATION_12_13, + Migrations.MIGRATION_13_14, + Migrations.MIGRATION_14_15, + Migrations.MIGRATION_15_16 + ) .allowMainThreadQueries() .addCallback( object : Callback() { diff --git a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt index 67a21c0..5b854de 100644 --- a/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/diagnose/DiagnoseActivity.kt @@ -19,7 +19,6 @@ import android.widget.Toast import androidx.activity.compose.setContent import androidx.compose.foundation.background import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.displayCutoutPadding import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.statusBarsPadding @@ -115,8 +114,7 @@ class DiagnoseActivity : BaseActivity() { ColoredStatusBar() Scaffold( modifier = Modifier - .statusBarsPadding() - .displayCutoutPadding(), + .statusBarsPadding(), topBar = { StandardAppBar( title = stringResource(R.string.nc_settings_diagnose_title), @@ -128,13 +126,8 @@ class DiagnoseActivity : BaseActivity() { Column( Modifier + .padding(0.dp, paddingValues.calculateTopPadding(), 0.dp, 0.dp) .background(backgroundColor) - .padding( - 0.dp, - paddingValues.calculateTopPadding(), - 0.dp, - paddingValues.calculateBottomPadding() - ) .fillMaxSize() ) { DiagnoseContentComposable( diff --git a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt index 66b8584..1044460 100644 --- a/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/extensions/ImageViewExtensions.kt @@ -11,18 +11,9 @@ package com.nextcloud.talk.extensions import android.content.Context -import android.graphics.Bitmap -import android.graphics.BitmapShader import android.graphics.Canvas import android.graphics.Color -import android.graphics.ColorFilter -import android.graphics.Matrix import android.graphics.Paint -import android.graphics.PixelFormat -import android.graphics.Rect -import android.graphics.RectF -import android.graphics.Shader -import android.graphics.drawable.BitmapDrawable import android.graphics.drawable.Drawable import android.graphics.drawable.LayerDrawable import android.util.Log @@ -30,7 +21,6 @@ import android.widget.ImageView import androidx.core.content.ContextCompat import androidx.core.content.res.ResourcesCompat import androidx.core.graphics.createBitmap -import androidx.core.graphics.drawable.toBitmap import androidx.core.graphics.drawable.toDrawable import coil.annotation.ExperimentalCoilApi import coil.imageLoader @@ -52,7 +42,6 @@ import com.nextcloud.talk.utils.ApiUtils import com.nextcloud.talk.utils.DisplayUtils import com.nextcloud.talk.utils.TextDrawable import java.util.Locale -import kotlin.math.min private const val ROUNDING_PIXEL = 16f private const val TAG = "ImageViewExtensions" @@ -302,12 +291,18 @@ fun ImageView.loadSystemAvatar(): io.reactivex.disposables.Disposable { ) } -fun ImageView.loadNoteToSelfAvatar() { +fun ImageView.loadNoteToSelfAvatar(): io.reactivex.disposables.Disposable { val layers = arrayOfNulls(2) layers[0] = ContextCompat.getDrawable(context, R.drawable.ic_launcher_background) layers[1] = ContextCompat.getDrawable(context, R.drawable.ic_note_to_self) val layerDrawable = LayerDrawable(layers) - setImageDrawable(CircularDrawable(layerDrawable)) + val data: Any = layerDrawable + + return DisposableWrapper( + load(data) { + transformations(CircleCropTransformation()) + } + ) } fun ImageView.loadFirstLetterAvatar(name: String): io.reactivex.disposables.Disposable { @@ -421,77 +416,3 @@ private class DisposableWrapper(private val disposable: coil.request.Disposable) override fun isDisposed(): Boolean = disposable.isDisposed } - -private class CircularDrawable(private val sourceDrawable: Drawable) : Drawable() { - - private val bitmap: Bitmap = drawableToBitmap(sourceDrawable) - private val paint = Paint(Paint.ANTI_ALIAS_FLAG).apply { - shader = BitmapShader(bitmap, Shader.TileMode.CLAMP, Shader.TileMode.CLAMP) - } - - private val rect = RectF() - private var radius = 0f - - override fun onBoundsChange(bounds: Rect) { - super.onBoundsChange(bounds) - rect.set(bounds) - - radius = min(rect.width() / 2.0f, rect.height() / 2.0f) - - val matrix = Matrix() - val scale: Float - var dx = 0f - var dy = 0f - - if (bitmap.width * rect.height() > rect.width() * bitmap.height) { - // Taller than wide, scale to height and center horizontally - scale = rect.height() / bitmap.height.toFloat() - dx = (rect.width() - bitmap.width * scale) / 2.0f - } else { - // Wider than tall, scale to width and center vertically - scale = rect.width() / bitmap.width.toFloat() - dy = (rect.height() - bitmap.height * scale) / 2.0f - } - - matrix.setScale(scale, scale) - matrix.postTranslate(dx.toInt().toFloat() + rect.left, dy.toInt().toFloat() + rect.top) - paint.shader.setLocalMatrix(matrix) - } - - override fun draw(canvas: Canvas) { - canvas.drawCircle(rect.centerX(), rect.centerY(), radius, paint) - } - - override fun setAlpha(alpha: Int) { - paint.alpha = alpha - } - - override fun setColorFilter(colorFilter: ColorFilter?) { - paint.colorFilter = colorFilter - } - - @Deprecated( - "This method is no longer used in graphics optimizations", - ReplaceWith("PixelFormat.TRANSLUCENT", "android.graphics.PixelFormat") - ) - override fun getOpacity(): Int = PixelFormat.TRANSLUCENT - - override fun getIntrinsicWidth(): Int = sourceDrawable.intrinsicWidth - - override fun getIntrinsicHeight(): Int = sourceDrawable.intrinsicHeight - - companion object { - - private fun drawableToBitmap(drawable: Drawable): Bitmap { - if (drawable is BitmapDrawable) { - if (drawable.bitmap != null) { - return drawable.bitmap - } - } - - val width = if (drawable.intrinsicWidth > 0) drawable.intrinsicWidth else 1 - val height = if (drawable.intrinsicHeight > 0) drawable.intrinsicHeight else 1 - return drawable.toBitmap(width, height, Bitmap.Config.ARGB_8888) - } - } -} diff --git a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt index df26436..e46f40b 100644 --- a/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt +++ b/app/src/main/java/com/nextcloud/talk/jobs/NotificationWorker.kt @@ -1,7 +1,7 @@ /* * Nextcloud Talk - Android Client * - * SPDX-FileCopyrightText: 2021-2025 Marcel Hibbe + * SPDX-FileCopyrightText: 2021-2023 Marcel Hibbe * SPDX-FileCopyrightText: 2022 Andy Scherzinger * SPDX-FileCopyrightText: 2017-2018 Mario Danic * SPDX-License-Identifier: GPL-3.0-or-later @@ -134,6 +134,8 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor private lateinit var signatureVerification: SignatureVerification private var context: Context? = null private var conversationType: String? = "one2one" + private var muteCall = false + private var importantConversation = false private lateinit var notificationManager: NotificationManagerCompat override fun doWork(): Result { @@ -184,7 +186,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor private fun handleTestPushMessage() { val intent = Intent(context, MainActivity::class.java) - intent.flags = getIntentFlags() + intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK showNotification(intent, null) } @@ -199,7 +201,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor private fun handleRemoteTalkSharePushMessage() { val mainActivityIntent = Intent(context, MainActivity::class.java) - mainActivityIntent.flags = getIntentFlags() + mainActivityIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK val bundle = Bundle() bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!) bundle.putBoolean(KEY_REMOTE_TALK_SHARE, true) @@ -253,7 +255,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor val bundle = createBundle(conversation) fullScreenIntent.putExtras(bundle) - fullScreenIntent.flags = getIntentFlags() + fullScreenIntent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK val requestCode = System.currentTimeMillis().toInt() @@ -423,7 +425,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor pushMessage.timestamp = ncNotification.datetime!!.millis if (ncNotification.messageRichParameters != null && - ncNotification.messageRichParameters!!.isNotEmpty() + ncNotification.messageRichParameters!!.size > 0 ) { pushMessage.text = getParsedMessage( ncNotification.messageRich, @@ -434,11 +436,11 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor } val subjectRichParameters = ncNotification.subjectRichParameters - if (subjectRichParameters != null && subjectRichParameters.isNotEmpty()) { + if (subjectRichParameters != null && subjectRichParameters.size > 0) { val callHashMap = subjectRichParameters["call"] val userHashMap = subjectRichParameters["user"] val guestHashMap = subjectRichParameters["guest"] - if (callHashMap != null && callHashMap.isNotEmpty() && callHashMap.containsKey("name")) { + if (callHashMap != null && callHashMap.size > 0 && callHashMap.containsKey("name")) { if (subjectRichParameters.containsKey("reaction")) { pushMessage.subject = "" } else if (ncNotification.objectType == "chat") { @@ -488,7 +490,15 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor else -> Log.e(TAG, "unknown pushMessage.type") } - val pendingIntent = createUniquePendingIntent(intent) + // Use unique request code to make sure that a new PendingIntent gets created for each notification + // See https://github.com/nextcloud/talk-android/issues/2111 + val requestCode = System.currentTimeMillis().toInt() + val intentFlag: Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { + PendingIntent.FLAG_MUTABLE + } else { + 0 + } + val pendingIntent = PendingIntent.getActivity(context, requestCode, intent, intentFlag) val uri = signatureVerification.user!!.baseUrl!!.toUri() val baseUrl = uri.host @@ -520,7 +530,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor if ((TYPE_CHAT == pushMessage.type || TYPE_REMINDER == pushMessage.type) && pushMessage.notificationUser != null ) { - prepareChatNotification(notificationBuilder, activeStatusBarNotification) + prepareChatNotification(notificationBuilder, activeStatusBarNotification, systemNotificationId) addReplyAction(notificationBuilder, systemNotificationId) addMarkAsReadAction(notificationBuilder, systemNotificationId) } @@ -626,7 +636,8 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor private fun prepareChatNotification( notificationBuilder: NotificationCompat.Builder, - activeStatusBarNotification: StatusBarNotification? + activeStatusBarNotification: StatusBarNotification?, + systemNotificationId: Int ) { val notificationUser = pushMessage.notificationUser val userType = notificationUser!!.type @@ -936,14 +947,14 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor ) if (isOngoingCallNotificationVisible) { - val notificationBuilder = NotificationCompat.Builder( + val notificationBuilder: NotificationCompat.Builder? + + notificationBuilder = NotificationCompat.Builder( context!!, NotificationUtils.NotificationChannels .NOTIFICATION_CHANNEL_MESSAGES_V4.name ) - val intent = createMainActivityIntent() - val notification: Notification = notificationBuilder .setContentTitle( String.format( @@ -955,7 +966,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor .setOngoing(false) .setAutoCancel(true) .setPriority(NotificationCompat.PRIORITY_LOW) - .setContentIntent(createUniquePendingIntent(intent)) + .setContentIntent(getIntentToOpenConversation()) .build() val notificationId: Int = SystemClock.uptimeMillis().toInt() @@ -978,7 +989,7 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor private fun createMainActivityIntent(): Intent { val intent = Intent(context, MainActivity::class.java) - intent.flags = getIntentFlags() + intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK val bundle = Bundle() bundle.putString(KEY_ROOM_TOKEN, pushMessage.id) bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!) @@ -986,20 +997,23 @@ class NotificationWorker(context: Context, workerParams: WorkerParameters) : Wor return intent } - private fun createUniquePendingIntent(intent: Intent): PendingIntent? { - // Use unique request code to make sure that a new PendingIntent gets created for each notification - // See https://github.com/nextcloud/talk-android/issues/2111 + private fun getIntentToOpenConversation(): PendingIntent? { + val intent = Intent(context, MainActivity::class.java) + intent.flags = Intent.FLAG_ACTIVITY_SINGLE_TOP or Intent.FLAG_ACTIVITY_NEW_TASK + val bundle = Bundle() + bundle.putString(KEY_ROOM_TOKEN, pushMessage.id) + bundle.putLong(KEY_INTERNAL_USER_ID, signatureVerification.user!!.id!!) + intent.putExtras(bundle) + val requestCode = System.currentTimeMillis().toInt() val intentFlag: Int = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) { - PendingIntent.FLAG_MUTABLE or PendingIntent.FLAG_UPDATE_CURRENT + PendingIntent.FLAG_MUTABLE } else { - PendingIntent.FLAG_UPDATE_CURRENT + 0 } return PendingIntent.getActivity(context, requestCode, intent, intentFlag) } - private fun getIntentFlags(): Int = Intent.FLAG_ACTIVITY_CLEAR_TOP or Intent.FLAG_ACTIVITY_SINGLE_TOP - companion object { val TAG = NotificationWorker::class.simpleName private const val TYPE_CHAT = "chat" diff --git a/app/src/main/java/com/nextcloud/talk/models/MessageDraft.kt b/app/src/main/java/com/nextcloud/talk/models/MessageDraft.kt deleted file mode 100644 index 4a49339..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/MessageDraft.kt +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.models - -import android.os.Parcelable -import androidx.room.TypeConverter -import com.bluelinelabs.logansquare.LoganSquare -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import kotlinx.parcelize.Parcelize -import kotlinx.serialization.Serializable - -@Parcelize -@JsonObject -@Serializable -data class MessageDraft( - @JsonField(name = ["messageText"]) - var messageText: String = "", - @JsonField(name = ["messageCursor"]) - var messageCursor: Int = 0, - @JsonField(name = ["quotedJsonId"]) - var quotedJsonId: Int? = null, - @JsonField(name = ["quotedDisplayName"]) - var quotedDisplayName: String? = null, - @JsonField(name = ["quotedMessageText"]) - var quotedMessageText: String? = null, - @JsonField(name = ["quoteImageUrl"]) - var quotedImageUrl: String? = null, - @JsonField(name = ["threadTitle"]) - var threadTitle: String? = null -) : Parcelable { - constructor() : this("", 0, null, null, null, null, null) -} - -class MessageDraftConverter { - - @TypeConverter - fun fromMessageDraftToString(messageDraft: MessageDraft?): String = - if (messageDraft == null) { - "" - } else { - LoganSquare.serialize(messageDraft) - } - - @TypeConverter - fun fromStringToMessageDraft(value: String): MessageDraft? = - if (value.isBlank()) { - null - } else { - LoganSquare.parse(value, MessageDraft::class.java) - } -} diff --git a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt index 76e00f7..59ed023 100644 --- a/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt +++ b/app/src/main/java/com/nextcloud/talk/models/domain/ConversationModel.kt @@ -8,13 +8,12 @@ package com.nextcloud.talk.models.domain import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.models.MessageDraft import com.nextcloud.talk.models.json.chat.ChatMessageJson import com.nextcloud.talk.models.json.conversations.Conversation import com.nextcloud.talk.models.json.conversations.ConversationEnums import com.nextcloud.talk.models.json.participants.Participant -data class ConversationModel( +class ConversationModel( var internalId: String, var accountId: Long, var token: String, @@ -66,8 +65,7 @@ data class ConversationModel( var hasImportant: Boolean = false, // attributes that don't come from API. This should be changed?! - var password: String? = null, - var messageDraft: MessageDraft? = MessageDraft() + var password: String? = null ) { companion object { diff --git a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessageJson.kt b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessageJson.kt index a845b2a..727ac88 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessageJson.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/chat/ChatMessageJson.kt @@ -19,12 +19,6 @@ import kotlinx.parcelize.Parcelize data class ChatMessageJson( @JsonField(name = ["id"]) var id: Long = 0, @JsonField(name = ["token"]) var token: String? = null, - @JsonField(name = ["threadId"]) var threadId: Long? = null, - - // Be aware that variables with "is" at the beginning will lead to the error: - // "@JsonField annotation can only be used on private fields if both getter and setter are present." - // Instead, name it with "has" at the beginning: isThread -> hasThread - @JsonField(name = ["isThread"]) var hasThread: Boolean = false, @JsonField(name = ["actorType"]) var actorType: String? = null, @JsonField(name = ["actorId"]) var actorId: String? = null, @JsonField(name = ["actorDisplayName"]) var actorDisplayName: String? = null, @@ -50,7 +44,5 @@ data class ChatMessageJson( @JsonField(name = ["lastEditTimestamp"]) var lastEditTimestamp: Long? = 0, @JsonField(name = ["deleted"]) var deleted: Boolean = false, @JsonField(name = ["referenceId"]) var referenceId: String? = null, - @JsonField(name = ["silent"]) var silent: Boolean = false, - @JsonField(name = ["threadTitle"]) var threadTitle: String? = null, - @JsonField(name = ["threadReplies"]) var threadReplies: Int? = 0 + @JsonField(name = ["silent"]) var silent: Boolean = false ) : Parcelable diff --git a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt index bb3e72c..9643dae 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/converters/EnumSystemMessageTypeConverter.kt @@ -72,7 +72,6 @@ import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.RECORDIN import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.USER_ADDED import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.USER_REMOVED import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.PHONE_ADDED -import com.nextcloud.talk.chat.data.model.ChatMessage.SystemMessageType.THREAD_CREATED /* * see https://nextcloud-talk.readthedocs.io/en/latest/chat/#system-messages @@ -144,7 +143,6 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter FEDERATED_USER_ADDED "federated_user_removed" -> FEDERATED_USER_REMOVED "phone_added" -> PHONE_ADDED - "thread_created" -> THREAD_CREATED else -> DUMMY } @@ -214,7 +212,6 @@ class EnumSystemMessageTypeConverter : StringBasedTypeConverter "federated_user_added" FEDERATED_USER_REMOVED -> "federated_user_removed" PHONE_ADDED -> "phone_added" - THREAD_CREATED -> "thread_created" else -> "" } } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt index 549f835..b117036 100644 --- a/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt +++ b/app/src/main/java/com/nextcloud/talk/models/json/status/StatusType.kt @@ -11,6 +11,5 @@ enum class StatusType(val string: String) { OFFLINE("offline"), DND("dnd"), AWAY("away"), - BUSY("busy"), INVISIBLE("invisible") } diff --git a/app/src/main/java/com/nextcloud/talk/models/json/threads/Thread.kt b/app/src/main/java/com/nextcloud/talk/models/json/threads/Thread.kt deleted file mode 100644 index a66a568..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/json/threads/Thread.kt +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.models.json.threads - -import android.os.Parcelable -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import kotlinx.parcelize.Parcelize - -@Parcelize -@JsonObject -data class Thread( - @JsonField(name = ["id"]) - var id: Int = 0, - - @JsonField(name = ["roomToken"]) - var roomToken: String = "", - - @JsonField(name = ["title"]) - var title: String = "", - - @JsonField(name = ["lastMessageId"]) - var lastMessageId: Int = 0, - - @JsonField(name = ["lastActivity"]) - var lastActivity: Int = 0, - - @JsonField(name = ["numReplies"]) - var numReplies: Int = 0 -) : Parcelable diff --git a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadAttendee.kt b/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadAttendee.kt deleted file mode 100644 index 120d4e8..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadAttendee.kt +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.models.json.threads - -import android.os.Parcelable -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import kotlinx.parcelize.Parcelize - -@Parcelize -@JsonObject -data class ThreadAttendee( - @JsonField(name = ["notificationLevel"]) - var notificationLevel: Int = 0 -) : Parcelable diff --git a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadInfo.kt b/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadInfo.kt deleted file mode 100644 index 50ea57d..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadInfo.kt +++ /dev/null @@ -1,29 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.models.json.threads - -import android.os.Parcelable -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import com.nextcloud.talk.models.json.chat.ChatMessageJson -import kotlinx.parcelize.Parcelize - -@Parcelize -@JsonObject -data class ThreadInfo( - @JsonField(name = ["thread"]) - var thread: Thread? = null, - - @JsonField(name = ["attendee"]) - var attendee: ThreadAttendee? = null, - - @JsonField(name = ["first"]) - var first: ChatMessageJson? = null, - - @JsonField(name = ["last"]) - var last: ChatMessageJson? = null -) : Parcelable diff --git a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadOCS.kt deleted file mode 100644 index 56b2d65..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadOCS.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.models.json.threads - -import android.os.Parcelable -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import com.nextcloud.talk.models.json.generic.GenericMeta -import kotlinx.parcelize.Parcelize - -@Parcelize -@JsonObject -data class ThreadOCS( - @JsonField(name = ["meta"]) - var meta: GenericMeta?, - @JsonField(name = ["data"]) - var data: ThreadInfo? = null -) : Parcelable { - // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' - constructor() : this(null, null) -} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadOverall.kt deleted file mode 100644 index c622fcf..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadOverall.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.models.json.threads - -import android.os.Parcelable -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import kotlinx.parcelize.Parcelize - -@Parcelize -@JsonObject -data class ThreadOverall( - @JsonField(name = ["ocs"]) - var ocs: ThreadOCS? = null -) : Parcelable { - // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' - constructor() : this(null) -} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadsOCS.kt b/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadsOCS.kt deleted file mode 100644 index bafb22f..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadsOCS.kt +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.models.json.threads - -import android.os.Parcelable -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import com.nextcloud.talk.models.json.generic.GenericMeta -import kotlinx.parcelize.Parcelize - -@Parcelize -@JsonObject -data class ThreadsOCS( - @JsonField(name = ["meta"]) - var meta: GenericMeta?, - @JsonField(name = ["data"]) - var data: List? = null -) : Parcelable { - // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' - constructor() : this(null, null) -} diff --git a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadsOverall.kt b/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadsOverall.kt deleted file mode 100644 index 99fdab5..0000000 --- a/app/src/main/java/com/nextcloud/talk/models/json/threads/ThreadsOverall.kt +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.models.json.threads - -import android.os.Parcelable -import com.bluelinelabs.logansquare.annotation.JsonField -import com.bluelinelabs.logansquare.annotation.JsonObject -import kotlinx.parcelize.Parcelize - -@Parcelize -@JsonObject -data class ThreadsOverall( - @JsonField(name = ["ocs"]) - var ocs: ThreadsOCS? = null -) : Parcelable { - // This constructor is added to work with the 'com.bluelinelabs.logansquare.annotation.JsonObject' - constructor() : this(null) -} diff --git a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt index 93a0aec..611344b 100644 --- a/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/remotefilebrowser/activities/RemoteFileBrowserActivity.kt @@ -10,7 +10,6 @@ package com.nextcloud.talk.remotefilebrowser.activities import android.app.Activity import android.content.Intent -import android.os.Build import android.os.Bundle import android.util.Log import android.view.Menu @@ -19,8 +18,6 @@ import android.view.View import androidx.activity.OnBackPressedCallback import androidx.appcompat.app.AppCompatActivity import androidx.core.content.res.ResourcesCompat -import androidx.core.view.ViewCompat -import androidx.core.view.WindowInsetsCompat import androidx.fragment.app.DialogFragment import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.GridLayoutManager @@ -86,7 +83,6 @@ class RemoteFileBrowserActivity : viewThemeUtils.material.colorMaterialTextButton(binding.pathNavigationBackButton) viewThemeUtils.platform.themeStatusBar(this) setContentView(binding.root) - initSystemBars() DisplayUtils.applyColorToNavigationBar( this.window, @@ -246,21 +242,6 @@ class RemoteFileBrowserActivity : binding.recyclerView.visibility = View.VISIBLE } - fun initSystemBars() { - val decorView = window.decorView - decorView.setOnApplyWindowInsetsListener { view, insets -> - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) { - val systemBars = insets.getInsets( - WindowInsetsCompat.Type.systemBars() or - WindowInsetsCompat.Type.displayCutout() - ) - view.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom) - } - insets - } - ViewCompat.requestApplyInsets(decorView) - } - override fun onRefresh() { refreshCurrentPath() } diff --git a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt index 2da7e51..b84d36a 100644 --- a/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/repositories/reactions/ReactionsRepositoryImpl.kt @@ -101,10 +101,7 @@ class ReactionsRepositoryImpl @Inject constructor( val internalConversationId = "$accountId@$roomToken" val emoji = model.emoji - val message = dao.getChatMessageForConversation( - internalConversationId, - id - ).first() + val message = dao.getChatMessageForConversation(internalConversationId, id).first() // 2. Check state of entity, create params as needed if (message.reactions == null) { diff --git a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt index 21e8f56..e356b79 100644 --- a/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt +++ b/app/src/main/java/com/nextcloud/talk/settings/SettingsActivity.kt @@ -1410,6 +1410,10 @@ class SettingsActivity : json.toRequestBody("application/json".toMediaTypeOrNull()) ) } + withContext(Dispatchers.Main) { + loadCapabilitiesAndUpdateSettings() + Log.i(TAG, "typing status set") + } } catch (e: Exception) { withContext(Dispatchers.Main) { appPreferences.typingStatus = !newBoolean diff --git a/app/src/main/java/com/nextcloud/talk/threadsoverview/ThreadsOverviewActivity.kt b/app/src/main/java/com/nextcloud/talk/threadsoverview/ThreadsOverviewActivity.kt deleted file mode 100644 index d9492b7..0000000 --- a/app/src/main/java/com/nextcloud/talk/threadsoverview/ThreadsOverviewActivity.kt +++ /dev/null @@ -1,257 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.threadsoverview - -import android.content.Intent -import android.os.Bundle -import android.text.format.DateUtils -import android.util.Log -import androidx.activity.compose.setContent -import androidx.compose.foundation.background -import androidx.compose.foundation.layout.Arrangement -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.PaddingValues -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxSize -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.statusBarsPadding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.material3.MaterialTheme -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.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.res.colorResource -import androidx.compose.ui.res.pluralStringResource -import androidx.compose.ui.res.stringResource -import androidx.compose.ui.unit.dp -import androidx.lifecycle.ViewModelProvider -import autodagger.AutoInjector -import com.nextcloud.talk.R -import com.nextcloud.talk.activities.BaseActivity -import com.nextcloud.talk.api.NcApi -import com.nextcloud.talk.application.NextcloudTalkApplication -import com.nextcloud.talk.chat.ChatActivity -import com.nextcloud.talk.chat.ChatActivity.Companion.TAG -import com.nextcloud.talk.components.ColoredStatusBar -import com.nextcloud.talk.components.StandardAppBar -import com.nextcloud.talk.data.database.mappers.asModel -import com.nextcloud.talk.models.json.threads.ThreadInfo -import com.nextcloud.talk.threadsoverview.components.ThreadRow -import com.nextcloud.talk.threadsoverview.viewmodels.ThreadsOverviewViewModel -import com.nextcloud.talk.users.UserManager -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_ROOM_TOKEN -import com.nextcloud.talk.utils.bundle.BundleKeys.KEY_THREAD_ID -import javax.inject.Inject - -@AutoInjector(NextcloudTalkApplication::class) -class ThreadsOverviewActivity : BaseActivity() { - - @Inject - lateinit var viewModelFactory: ViewModelProvider.Factory - - @Inject - lateinit var ncApi: NcApi - - @Inject - lateinit var userManager: UserManager - - lateinit var threadsOverviewViewModel: ThreadsOverviewViewModel - - var threadsSourceUrl: String = "" - var appbarTitle: String = "" - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) - threadsOverviewViewModel = ViewModelProvider( - this, - viewModelFactory - )[ThreadsOverviewViewModel::class.java] - - val colorScheme = viewThemeUtils.getColorScheme(this) - - val extras: Bundle? = intent.extras - threadsSourceUrl = extras?.getString(KEY_THREADS_SOURCE_URL).orEmpty() - appbarTitle = extras?.getString(KEY_APPBAR_TITLE).orEmpty() - - setContent { - val backgroundColor = colorResource(id = R.color.bg_default) - - MaterialTheme( - colorScheme = colorScheme - ) { - ColoredStatusBar() - Scaffold( - modifier = Modifier - .statusBarsPadding(), - topBar = { - StandardAppBar( - title = appbarTitle, - null - ) - }, - content = { paddingValues -> - val uiState by threadsOverviewViewModel.threadsListState.collectAsState() - - Column( - Modifier - .padding(0.dp, paddingValues.calculateTopPadding(), 0.dp, 0.dp) - .background(backgroundColor) - .fillMaxSize() - ) { - ThreadsOverviewScreen( - uiState, - onThreadClick = { roomToken, threadId -> - navigateToChatActivity(roomToken, threadId) - } - ) - } - } - ) - } - } - } - - private fun navigateToChatActivity(roomToken: String, threadId: Int) { - val bundle = Bundle() - bundle.putString(KEY_ROOM_TOKEN, roomToken) - bundle.putLong(KEY_THREAD_ID, threadId.toLong()) - val chatIntent = Intent(context, ChatActivity::class.java) - chatIntent.putExtras(bundle) - startActivity(chatIntent) - } - - override fun onResume() { - super.onResume() - supportActionBar?.show() - threadsOverviewViewModel.init(threadsSourceUrl) - } - - companion object { - val TAG = ThreadsOverviewActivity::class.java.simpleName - val KEY_APPBAR_TITLE = "KEY_APPBAR_TITLE" - val KEY_THREADS_SOURCE_URL = "KEY_THREADS_SOURCE_URL" - } -} - -@Composable -fun ThreadsOverviewScreen( - uiState: ThreadsOverviewViewModel.ThreadsListUiState, - onThreadClick: (roomToken: String, threadId: Int) -> Unit -) { - when (val state = uiState) { - is ThreadsOverviewViewModel.ThreadsListUiState.None -> { - LoadingIndicator() - } - - is ThreadsOverviewViewModel.ThreadsListUiState.Success -> { - ThreadsList( - threads = state.threadsList!!, - onThreadClick = onThreadClick - ) - } - - is ThreadsOverviewViewModel.ThreadsListUiState.Error -> { - Log.e(TAG, "Error when retrieving threads", uiState.exception) - ErrorView(message = stringResource(R.string.nc_common_error_sorry)) - } - } -} - -@Composable -fun ThreadsList(threads: List, onThreadClick: (roomToken: String, threadId: Int) -> Unit) { - val space = ' ' - if (threads.isEmpty()) { - Box( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), - contentAlignment = Alignment.Center - ) { - Text(stringResource(R.string.threads_list_empty)) - } - return - } - - LazyColumn( - modifier = Modifier.fillMaxSize(), - contentPadding = PaddingValues(horizontal = 8.dp, vertical = 8.dp), - verticalArrangement = Arrangement.spacedBy(8.dp) - ) { - items( - items = threads, - key = { threadInfo -> threadInfo.thread!!.id } - ) { threadInfo -> - val messageJson = threadInfo.last ?: threadInfo.first - val messageModel = messageJson?.asModel() - - ThreadRow( - roomToken = threadInfo.thread!!.roomToken, - threadId = threadInfo.thread!!.id, - title = threadInfo.thread?.title.orEmpty(), - numReplies = pluralStringResource( - R.plurals.thread_replies, - threadInfo.thread?.numReplies ?: 0, - threadInfo.thread?.numReplies ?: 0 - ), - secondLineTitle = messageModel?.actorDisplayName?.substringBefore(space)?.let { "$it:" }.orEmpty(), - secondLine = messageModel?.text.orEmpty(), - date = getLastActivityDate(threadInfo), // replace with value from api when available - onClick = onThreadClick - ) - } - item { - Spacer(modifier = Modifier.height(32.dp)) - } - } -} - -@Suppress("MagicNumber") -private fun getLastActivityDate(threadInfo: ThreadInfo): String { - val oneSecond = 1000L - - val lastActivityTimestamp = threadInfo.thread?.lastActivity ?: 0 - - val lastActivityDate = DateUtils.getRelativeTimeSpanString( - lastActivityTimestamp.times(oneSecond), - System.currentTimeMillis(), - 0, - DateUtils.FORMAT_ABBREV_RELATIVE - ).toString() - return lastActivityDate -} - -@Composable -fun LoadingIndicator() { - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center - ) { - CircularProgressIndicator() - } -} - -@Composable -fun ErrorView(message: String) { - Box( - modifier = Modifier - .fillMaxSize() - .padding(16.dp), - contentAlignment = Alignment.Center - ) { - Text(text = message, color = MaterialTheme.colorScheme.error) - } -} diff --git a/app/src/main/java/com/nextcloud/talk/threadsoverview/components/ThreadRow.kt b/app/src/main/java/com/nextcloud/talk/threadsoverview/components/ThreadRow.kt deleted file mode 100644 index 5498190..0000000 --- a/app/src/main/java/com/nextcloud/talk/threadsoverview/components/ThreadRow.kt +++ /dev/null @@ -1,213 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.threadsoverview.components - -import android.content.res.Configuration -import androidx.compose.foundation.background -import androidx.compose.foundation.clickable -import androidx.compose.foundation.layout.Box -import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.Spacer -import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height -import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.layout.size -import androidx.compose.foundation.layout.width -import androidx.compose.foundation.shape.CircleShape -import androidx.compose.material3.Icon -import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.Text -import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment -import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip -import androidx.compose.ui.graphics.Color -import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.res.vectorResource -import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextOverflow -import androidx.compose.ui.tooling.preview.Preview -import androidx.compose.ui.unit.dp -import com.nextcloud.talk.R -import com.nextcloud.talk.utils.ColorGenerator - -@Suppress("LongParameterList", "Detekt.LongMethod") -@Composable -fun ThreadRow( - roomToken: String, - threadId: Int, - title: String, - secondLineTitle: String, - secondLine: String, - numReplies: String, - date: String, - onClick: ((String, Int) -> Unit?)? -) { - Row( - modifier = Modifier.Companion - .fillMaxWidth() - .clickable(enabled = onClick != null) { - onClick?.invoke(roomToken, threadId) - } - .padding(vertical = 8.dp, horizontal = 8.dp), - verticalAlignment = Alignment.Companion.CenterVertically - ) { - ThreadsIcon(title) - - Spacer(modifier = Modifier.Companion.width(12.dp)) - - Column { - Row { - Text( - modifier = Modifier.Companion.weight(1f), - text = title, - style = MaterialTheme.typography.titleSmall, - color = MaterialTheme.colorScheme.onSurfaceVariant, - fontWeight = FontWeight.Medium, - maxLines = 1, - overflow = TextOverflow.Companion.Ellipsis - ) - Spacer(modifier = Modifier.Companion.width(4.dp)) - Text( - text = numReplies, - style = MaterialTheme.typography.titleSmall - ) - } - - Spacer(modifier = Modifier.Companion.height(2.dp)) - - Row( - verticalAlignment = Alignment.Companion.CenterVertically - ) { - Text( - text = secondLineTitle, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Normal, - maxLines = 1, - overflow = TextOverflow.Companion.Ellipsis - ) - Spacer(modifier = Modifier.Companion.width(4.dp)) - Text( - modifier = Modifier.Companion.weight(1f), - text = secondLine, - style = MaterialTheme.typography.titleMedium, - fontWeight = FontWeight.Normal, - maxLines = 1, - overflow = TextOverflow.Companion.Ellipsis - ) - Spacer(modifier = Modifier.Companion.width(4.dp)) - Text( - text = date, - style = MaterialTheme.typography.bodyMedium, - color = MaterialTheme.colorScheme.onSurfaceVariant - ) - } - } - - Spacer(modifier = Modifier.Companion.width(16.dp)) - } -} - -@Composable -fun ThreadsIcon(title: String) { - val baseColorInt = ColorGenerator.usernameToColor(title) - - Box( - modifier = Modifier - .size(48.dp) - .clip(CircleShape) - .background(Color(baseColorInt).copy(alpha = 0.1f)), - contentAlignment = Alignment.Center - ) { - Icon( - imageVector = ImageVector.vectorResource(R.drawable.outline_forum_24), - contentDescription = null, - tint = Color(baseColorInt).copy(alpha = 0.9f), - modifier = Modifier.size(32.dp) - ) - } -} - -@Preview -@Composable -fun ThreadRowPreview() { - ThreadRow( - roomToken = "1234", - threadId = 123, - title = "title1", - secondLine = "last message", - secondLineTitle = "Mia:", - numReplies = "12 replies", - date = "14 sec ago", - onClick = null - ) -} - -@Preview( - name = "Dark Mode", - uiMode = Configuration.UI_MODE_NIGHT_YES -) -@Composable -fun ThreadRowPreviewDark() { - ThreadRow( - roomToken = "1234", - threadId = 123, - title = "title2", - secondLine = "last message", - secondLineTitle = "Mia:", - numReplies = "12 replies", - date = "14 sec ago", - onClick = null - ) -} - -@Preview -@Composable -fun ThreadRowUnreadMessagePreview() { - ThreadRow( - roomToken = "1234", - threadId = 123, - title = "title3", - secondLine = "last message", - secondLineTitle = "Mia:", - numReplies = "12 replies", - date = "14 sec ago", - onClick = null - ) -} - -@Preview -@Composable -fun ThreadRowMentionPreview() { - ThreadRow( - roomToken = "1234", - threadId = 123, - title = "title3", - secondLine = "last message", - secondLineTitle = "Mia:", - numReplies = "12 replies", - date = "14 sec ago", - onClick = null - ) -} - -@Preview -@Composable -fun ThreadRowDirectMentionPreview() { - ThreadRow( - roomToken = "1234", - threadId = 123, - title = "title with a verrrrrrrrrrrrrrrrrrrrrrrrry long text", - secondLine = "title with a verrrrrrrrrrrrrrrrrrrrrrrrry long text", - secondLineTitle = "Mia:", - numReplies = "12 replies", - date = "14 sec ago", - onClick = null - ) -} diff --git a/app/src/main/java/com/nextcloud/talk/threadsoverview/data/ThreadsRepository.kt b/app/src/main/java/com/nextcloud/talk/threadsoverview/data/ThreadsRepository.kt deleted file mode 100644 index 7051a85..0000000 --- a/app/src/main/java/com/nextcloud/talk/threadsoverview/data/ThreadsRepository.kt +++ /dev/null @@ -1,20 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.threadsoverview.data - -import com.nextcloud.talk.models.json.threads.ThreadOverall -import com.nextcloud.talk.models.json.threads.ThreadsOverall - -interface ThreadsRepository { - - suspend fun getThreads(credentials: String, url: String, limit: Int?): ThreadsOverall - - suspend fun getThread(credentials: String, url: String): ThreadOverall - - suspend fun setThreadNotificationLevel(credentials: String, url: String, level: Int): ThreadOverall -} diff --git a/app/src/main/java/com/nextcloud/talk/threadsoverview/data/ThreadsRepositoryImpl.kt b/app/src/main/java/com/nextcloud/talk/threadsoverview/data/ThreadsRepositoryImpl.kt deleted file mode 100644 index 9afc4d6..0000000 --- a/app/src/main/java/com/nextcloud/talk/threadsoverview/data/ThreadsRepositoryImpl.kt +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.threadsoverview.data - -import com.nextcloud.talk.api.NcApiCoroutines -import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.models.json.threads.ThreadOverall -import com.nextcloud.talk.models.json.threads.ThreadsOverall -import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew -import javax.inject.Inject - -class ThreadsRepositoryImpl @Inject constructor( - private val ncApiCoroutines: NcApiCoroutines, - userProvider: CurrentUserProviderNew -) : ThreadsRepository { - - val currentUser: User = userProvider.currentUser.blockingGet() - - override suspend fun getThreads(credentials: String, url: String, limit: Int?): ThreadsOverall = - ncApiCoroutines.getThreads(credentials, url, limit) - - override suspend fun getThread(credentials: String, url: String): ThreadOverall = - ncApiCoroutines.getThread(credentials, url) - - override suspend fun setThreadNotificationLevel(credentials: String, url: String, level: Int): ThreadOverall = - ncApiCoroutines.setThreadNotificationLevel(credentials, url, level) - - companion object { - val TAG = ThreadsRepositoryImpl::class.simpleName - } -} diff --git a/app/src/main/java/com/nextcloud/talk/threadsoverview/viewmodels/ThreadsOverviewViewModel.kt b/app/src/main/java/com/nextcloud/talk/threadsoverview/viewmodels/ThreadsOverviewViewModel.kt deleted file mode 100644 index eabcec6..0000000 --- a/app/src/main/java/com/nextcloud/talk/threadsoverview/viewmodels/ThreadsOverviewViewModel.kt +++ /dev/null @@ -1,80 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Marcel Hibbe - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.threadsoverview.viewmodels - -import androidx.lifecycle.ViewModel -import androidx.lifecycle.viewModelScope -import com.nextcloud.talk.arbitrarystorage.ArbitraryStorageManager -import com.nextcloud.talk.conversationlist.viewmodels.ConversationsListViewModel.Companion.FOLLOWED_THREADS_EXIST -import com.nextcloud.talk.conversationlist.viewmodels.ConversationsListViewModel.Companion.FOLLOWED_THREADS_EXIST_LAST_CHECK -import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.models.json.threads.ThreadInfo -import com.nextcloud.talk.models.json.threads.ThreadsOverall -import com.nextcloud.talk.threadsoverview.data.ThreadsRepository -import com.nextcloud.talk.utils.ApiUtils -import com.nextcloud.talk.utils.UserIdUtils -import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew -import kotlinx.coroutines.flow.MutableStateFlow -import kotlinx.coroutines.flow.StateFlow -import kotlinx.coroutines.launch -import javax.inject.Inject - -@Suppress("TooGenericExceptionCaught") -class ThreadsOverviewViewModel @Inject constructor( - private val threadsRepository: ThreadsRepository, - private val currentUserProvider: CurrentUserProviderNew, - private val arbitraryStorageManager: ArbitraryStorageManager -) : ViewModel() { - private val _currentUser = currentUserProvider.currentUser.blockingGet() - val currentUser: User = _currentUser - val credentials = ApiUtils.getCredentials(_currentUser.username, _currentUser.token) ?: "" - - private val _threadsListState = MutableStateFlow(ThreadsListUiState.None) - val threadsListState: StateFlow = _threadsListState - - fun init(url: String) { - getThreads(credentials, url) - } - - fun getThreads(credentials: String, url: String) { - viewModelScope.launch { - try { - val threads = threadsRepository.getThreads(credentials, url, null) - _threadsListState.value = ThreadsListUiState.Success(threads.ocs?.data) - updateFollowedThreadsIndicator(url, threads) - } catch (exception: Exception) { - _threadsListState.value = ThreadsListUiState.Error(exception) - } - } - } - - private fun updateFollowedThreadsIndicator(url: String, threads: ThreadsOverall) { - val subscribedThreadsEndpoint = "subscribed-threads" - if (url.contains(subscribedThreadsEndpoint) && threads.ocs?.data?.isEmpty() == true) { - val accountId = UserIdUtils.getIdForUser(currentUserProvider.currentUser.blockingGet()) - arbitraryStorageManager.storeStorageSetting( - accountId, - FOLLOWED_THREADS_EXIST, - false.toString(), - "" - ) - arbitraryStorageManager.storeStorageSetting( - accountId, - FOLLOWED_THREADS_EXIST_LAST_CHECK, - null, - "" - ) - } - } - - sealed class ThreadsListUiState { - data object None : ThreadsListUiState() - data class Success(val threadsList: List?) : ThreadsListUiState() - data class Error(val exception: Exception) : ThreadsListUiState() - } -} diff --git a/app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt b/app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt index 266cd73..04aae25 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/MessageInput.kt @@ -21,7 +21,6 @@ import com.stfalcon.chatkit.messages.MessageInput class MessageInput : MessageInput { lateinit var audioRecordDuration: Chronometer lateinit var recordAudioButton: ImageButton - lateinit var submitThreadButton: ImageButton lateinit var slideToCancelDescription: TextView lateinit var microphoneEnabledInfo: ImageView lateinit var microphoneEnabledInfoBackground: ImageView @@ -48,7 +47,6 @@ class MessageInput : MessageInput { private fun init() { audioRecordDuration = findViewById(R.id.audioRecordDuration) recordAudioButton = findViewById(R.id.recordAudioButton) - submitThreadButton = findViewById(R.id.submitThreadButton) slideToCancelDescription = findViewById(R.id.slideToCancelDescription) microphoneEnabledInfo = findViewById(R.id.microphoneEnabledInfo) microphoneEnabledInfoBackground = findViewById(R.id.microphoneEnabledInfoBackground) diff --git a/app/src/main/java/com/nextcloud/talk/ui/StatusDrawable.java b/app/src/main/java/com/nextcloud/talk/ui/StatusDrawable.java index 4c34459..85693fc 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/StatusDrawable.java +++ b/app/src/main/java/com/nextcloud/talk/ui/StatusDrawable.java @@ -54,16 +54,10 @@ public class StatusDrawable extends Drawable { icon = StatusDrawableType.ONLINE; this.context = context; } - - case "busy" -> { - icon = StatusDrawableType.BUSY; - this.context = context; - } case "away" -> { icon = StatusDrawableType.AWAY; this.context = context; } - default -> { } // do not show @@ -130,7 +124,6 @@ public class StatusDrawable extends Drawable { private enum StatusDrawableType { DND(R.drawable.ic_user_status_dnd), ONLINE(R.drawable.online_status), - BUSY(R.drawable.ic_user_status_busy), AWAY(R.drawable.ic_user_status_away), UNDEFINED(-1); diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt index 1f0cf95..a094058 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/AttachmentDialog.kt @@ -81,15 +81,6 @@ class AttachmentDialog(val activity: Activity, var chatActivity: ChatActivity) : dialogAttachmentBinding.menuAttachPoll.visibility = View.GONE } - if (!CapabilitiesUtil.hasSpreedFeatureCapability( - chatActivity.spreedCapabilities, - SpreedFeatures.THREADS - ) || - chatActivity.conversationThreadId != null - ) { - dialogAttachmentBinding.menuCreateThread.visibility = View.GONE - } - if (!context.packageManager.hasSystemFeature(PackageManager.FEATURE_CAMERA_ANY)) { dialogAttachmentBinding.menuAttachVideoFromCam.visibility = View.GONE } @@ -121,11 +112,6 @@ class AttachmentDialog(val activity: Activity, var chatActivity: ChatActivity) : dismiss() } - dialogAttachmentBinding.menuCreateThread.setOnClickListener { - chatActivity.createThread() - dismiss() - } - dialogAttachmentBinding.menuAttachPoll.setOnClickListener { chatActivity.createPoll() dismiss() diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java index 8bc60ff..3c44327 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/ChooseAccountDialogFragment.java @@ -245,25 +245,14 @@ public class ChooseAccountDialogFragment extends DialogFragment { }); - binding.onlineStatus.setOnClickListener(v -> { + binding.setStatus.setOnClickListener(v -> { dismiss(); - if(status!= null && getActivity()!= null){ - OnlineStatusBottomDialogFragment bottomDialog = - OnlineStatusBottomDialogFragment.newInstance(status); - bottomDialog.show(requireActivity().getSupportFragmentManager(), - "fragment_online_status_bottom_dialog"); - - } - }); - binding.statusMessage.setOnClickListener(v -> { - - dismiss(); - if(status!= null && getActivity()!= null){ - StatusMessageBottomDialogFragment bottomDialog = - StatusMessageBottomDialogFragment.newInstance(status); - bottomDialog.show(getActivity().getSupportFragmentManager(), - "fragment_status_message_bottom_dialog"); + if (status != null && getActivity() != null) { + SetStatusDialogFragment setStatusDialog = SetStatusDialogFragment.newInstance(status); + setStatusDialog.show(getActivity().getSupportFragmentManager(), "fragment_set_status"); + } else { + Log.w(TAG, "status was null"); } }); } @@ -272,10 +261,8 @@ public class ChooseAccountDialogFragment extends DialogFragment { viewThemeUtils.platform.themeDialog(binding.getRoot()); viewThemeUtils.platform.themeDialogDivider(binding.divider); - viewThemeUtils.material.colorMaterialTextButton(binding.onlineStatus); - viewThemeUtils.dialog.colorDialogMenuText(binding.onlineStatus); - viewThemeUtils.material.colorMaterialTextButton(binding.statusMessage); - viewThemeUtils.dialog.colorDialogMenuText(binding.statusMessage); + viewThemeUtils.material.colorMaterialTextButton(binding.setStatus); + viewThemeUtils.dialog.colorDialogMenuText(binding.setStatus); viewThemeUtils.material.colorMaterialTextButton(binding.addAccount); viewThemeUtils.dialog.colorDialogMenuText(binding.addAccount); viewThemeUtils.material.colorMaterialTextButton(binding.manageSettings); @@ -305,8 +292,7 @@ public class ChooseAccountDialogFragment extends DialogFragment { } try { - binding.onlineStatus.setEnabled(true); - binding.statusMessage.setEnabled(true); + binding.setStatus.setEnabled(true); drawStatus(); } catch (NullPointerException npe) { Log.i(TAG, "UI already teared down", npe); @@ -405,6 +391,7 @@ public class ChooseAccountDialogFragment extends DialogFragment { binding.currentAccount.ticker.setImageDrawable(drawable); binding.currentAccount.ticker.setVisibility(View.VISIBLE); + if (status.getMessage() != null && !status.getMessage().isEmpty()) { binding.currentAccount.status.setText(status.getMessage()); binding.currentAccount.status.setVisibility(View.VISIBLE); diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimeCompose.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimeCompose.kt index d1ac2a7..adade63 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimeCompose.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/DateTimeCompose.kt @@ -10,7 +10,7 @@ package com.nextcloud.talk.ui.dialog import android.annotation.SuppressLint import android.content.Context import android.os.Bundle -import android.text.format.DateFormat +import androidx.compose.animation.animateContentSize import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.BoxWithConstraints @@ -18,7 +18,6 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.requiredSizeIn import androidx.compose.foundation.layout.size @@ -33,7 +32,6 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme -import androidx.compose.material3.SelectableDates import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.TextButton @@ -50,7 +48,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.draw.scale import androidx.compose.ui.graphics.Color import androidx.compose.ui.graphics.vector.ImageVector -import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.compose.ui.unit.dp import androidx.compose.ui.window.Dialog @@ -117,7 +114,7 @@ class DateTimeCompose(val bundle: Bundle) { ) { Surface( shape = RoundedCornerShape(INT_8.dp), - modifier = Modifier.fillMaxWidth() + modifier = Modifier.fillMaxWidth().animateContentSize() ) { Column( modifier = Modifier @@ -186,31 +183,27 @@ class DateTimeCompose(val bundle: Bundle) { @Composable private fun Body() { - val context = LocalContext.current val currTime = LocalDateTime.now() - val timeFormatter = DateTimeFormatter.ofPattern(timePattern(context)) - val dayTimeFormatter = DateTimeFormatter.ofPattern(dayTimePattern(context)) - val laterToday = LocalDateTime.now() .withHour(INT_18) .withMinute(0) .withSecond(0) - val laterTodayStr = laterToday.format(timeFormatter) + val laterTodayStr = laterToday.format(DateTimeFormatter.ofPattern(PATTERN)) val tomorrow = LocalDateTime.now() .plusDays(1) .withHour(INT_8) .withMinute(0) .withSecond(0) - val tomorrowStr = tomorrow.format(dayTimeFormatter) + val tomorrowStr = tomorrow.format(DateTimeFormatter.ofPattern(PATTERN)) val thisWeekend = LocalDateTime.now() .with(nextOrSame(DayOfWeek.SATURDAY)) .withHour(INT_8) .withMinute(0) .withSecond(0) - val thisWeekendStr = thisWeekend.format(dayTimeFormatter) + val thisWeekendStr = thisWeekend.format(DateTimeFormatter.ofPattern(PATTERN)) val nextWeek = LocalDateTime.now() .plusWeeks(1) @@ -218,7 +211,7 @@ class DateTimeCompose(val bundle: Bundle) { .withHour(INT_8) .withMinute(0) .withSecond(0) - val nextWeekStr = nextWeek.format(dayTimeFormatter) + val nextWeekStr = nextWeek.format(DateTimeFormatter.ofPattern(PATTERN)) if (currTime < laterToday) { TimeOption( @@ -229,14 +222,16 @@ class DateTimeCompose(val bundle: Bundle) { } } - TimeOption( - label = stringResource(R.string.tomorrow), - timeString = tomorrowStr - ) { - setTime(tomorrow) + if (tomorrow.dayOfWeek < DayOfWeek.SATURDAY) { + TimeOption( + label = stringResource(R.string.tomorrow), + timeString = tomorrowStr + ) { + setTime(tomorrow) + } } - if (currTime.dayOfWeek < DayOfWeek.FRIDAY) { + if (currTime.dayOfWeek < DayOfWeek.SATURDAY) { TimeOption( label = stringResource(R.string.this_weekend), timeString = thisWeekendStr @@ -245,13 +240,11 @@ class DateTimeCompose(val bundle: Bundle) { } } - if (currTime.dayOfWeek != DayOfWeek.SUNDAY) { - TimeOption( - label = stringResource(R.string.next_week), - timeString = nextWeekStr - ) { - setTime(nextWeek) - } + TimeOption( + label = stringResource(R.string.next_week), + timeString = nextWeekStr + ) { + setTime(nextWeek) } HorizontalDivider() @@ -264,13 +257,11 @@ class DateTimeCompose(val bundle: Bundle) { @Composable private fun Header() { - val context = LocalContext.current Row( modifier = Modifier .padding(INT_8.dp) - .fillMaxWidth() ) { - Text(stringResource(R.string.nc_remind), modifier = Modifier.weight(HALF_WEIGHT)) + Text(stringResource(R.string.nc_remind), modifier = Modifier.weight(1f)) val reminderState = chatViewModel.getReminderExistState .asFlow() @@ -286,16 +277,9 @@ class DateTimeCompose(val bundle: Bundle) { else -> {} } - val timeText = if (timeState.value != LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.MIN)) { - timeState.value.format(DateTimeFormatter.ofPattern(fullPattern(context))) - } else { - "" + if (timeState.value != LocalDateTime.ofEpochSecond(0, 0, ZoneOffset.MIN)) { + Text(timeState.value.format(DateTimeFormatter.ofPattern(PATTERN))) } - - Text( - timeText, - modifier = Modifier.weight(HALF_WEIGHT) - ) } HorizontalDivider() } @@ -311,23 +295,8 @@ class DateTimeCompose(val bundle: Bundle) { modifier = Modifier.verticalScroll(scrollState) ) { if (!isCollapsed.value) { - val todayMillis = LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant().toEpochMilli() - val currentYear = LocalDate.now().year - val selectableDates = object : SelectableDates { - override fun isSelectableDate(utcTimeMillis: Long): Boolean = utcTimeMillis >= todayMillis - - override fun isSelectableYear(year: Int): Boolean = year >= currentYear - } - - val datePickerState = rememberDatePickerState( - selectableDates = selectableDates - ) - val now = LocalDateTime.now() - val timePickerState = rememberTimePickerState( - initialHour = now.hour, - initialMinute = now.minute, - is24Hour = DateFormat.is24HourFormat(LocalContext.current) - ) + val datePickerState = rememberDatePickerState() + val timePickerState = rememberTimePickerState() BoxWithConstraints( modifier = Modifier @@ -342,8 +311,6 @@ class DateTimeCompose(val bundle: Bundle) { ) } - Spacer(modifier = Modifier.height(16.dp)) - TimePicker( state = timePickerState ) @@ -389,14 +356,6 @@ class DateTimeCompose(val bundle: Bundle) { } } - private fun timePattern(context: Context): String = if (DateFormat.is24HourFormat(context)) "HH:mm" else "hh:mm a" - - private fun dayTimePattern(context: Context): String = - if (DateFormat.is24HourFormat(context)) "EEE, HH:mm" else "EEE, hh:mm a" - - private fun fullPattern(context: Context): String = - if (DateFormat.is24HourFormat(context)) "dd MMM, HH:mm" else "dd MMM, hh:mm a" - @Composable private fun TimeOption(label: String, timeString: String, onClick: () -> Unit) { Row( @@ -411,6 +370,7 @@ class DateTimeCompose(val bundle: Bundle) { } companion object { + private const val PATTERN = "dd MMM, HH:mm a" private const val HALF_WEIGHT = 0.5f private const val INT_8 = 8 private const val INT_16 = 16 diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt index 5b83042..2c40d23 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/MessageActionsDialog.kt @@ -17,12 +17,10 @@ import android.view.MotionEvent import android.view.View import android.view.ViewGroup import android.view.inputmethod.InputMethodManager -import androidx.appcompat.app.AlertDialog import androidx.lifecycle.lifecycleScope import autodagger.AutoInjector import com.google.android.material.bottomsheet.BottomSheetBehavior import com.google.android.material.bottomsheet.BottomSheetDialog -import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.nextcloud.talk.R import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.chat.ChatActivity @@ -59,7 +57,6 @@ import java.util.Date import javax.inject.Inject @AutoInjector(NextcloudTalkApplication::class) -@Suppress("LongParameterList", "TooManyFunctions") class MessageActionsDialog( private val chatActivity: ChatActivity, private val message: ChatMessage, @@ -154,7 +151,6 @@ class MessageActionsDialog( currentConversation?.type != ConversationEnums.ConversationType.ROOM_TYPE_ONE_TO_ONE_CALL && isOnline ) - initMenuOpenThread(message.isThread && chatActivity.conversationThreadId == null) initMenuEditMessage(isMessageEditable) initMenuDeleteMessage(showMessageDeletionButton && isOnline) initMenuForwardMessage( @@ -391,38 +387,8 @@ class MessageActionsDialog( private fun initMenuDeleteMessage(visible: Boolean) { if (visible) { dialogMessageActionsBinding.menuDeleteMessage.setOnClickListener { - val areYouSure = context.resources.getString(R.string.message_delete_are_you_sure) - val deleteMessage = context.resources.getString(R.string.nc_delete_message) - val delete = context.resources.getString(R.string.nc_delete) - val cancel = context.resources.getString(R.string.nc_cancel) - val builder = MaterialAlertDialogBuilder(context) - builder - .setIcon( - viewThemeUtils.dialog - .colorMaterialAlertDialogIcon(context, R.drawable.ic_delete_black_24dp) - ) - .setMessage(areYouSure) - .setTitle(deleteMessage) - .setPositiveButton(delete) { dialog, which -> - chatActivity.deleteMessage(message) - dismiss() - } - .setNegativeButton(cancel) { dialog, which -> - // unused atm - } - .let { dialogBuilder -> - viewThemeUtils.dialog - .colorMaterialAlertDialogBackground(context, dialogBuilder) - } - - val dialog: AlertDialog = builder.create() - dialog.setOnShowListener { - viewThemeUtils.platform.colorTextButtons( - dialog.getButton(BUTTON_POSITIVE), - dialog.getButton(BUTTON_NEGATIVE) - ) - } - dialog.show() + chatActivity.deleteMessage(message) + dismiss() } } dialogMessageActionsBinding.menuDeleteMessage.visibility = getVisibility(visible) @@ -448,19 +414,6 @@ class MessageActionsDialog( dialogMessageActionsBinding.menuReplyPrivately.visibility = getVisibility(visible) } - private fun initMenuOpenThread(visible: Boolean) { - if (visible) { - dialogMessageActionsBinding.menuOpenThread.setOnClickListener { - message.threadId?.let { - chatActivity.openThread(it) - dismiss() - } - } - } - - dialogMessageActionsBinding.menuOpenThread.visibility = getVisibility(visible) - } - private fun initMenuReplyToMessage(visible: Boolean) { if (visible) { dialogMessageActionsBinding.menuReplyToMessage.setOnClickListener { diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/OnlineStatusBottomDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/OnlineStatusBottomDialogFragment.kt deleted file mode 100644 index c96541a..0000000 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/OnlineStatusBottomDialogFragment.kt +++ /dev/null @@ -1,184 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Sowjanya Kota - * SPDX-License-Identifier: GPL-3.0-or-later - */ -package com.nextcloud.talk.ui.dialog - -import android.content.res.Configuration -import android.os.Bundle -import android.util.Log -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.ImageView -import android.widget.TextView -import androidx.core.content.ContextCompat -import androidx.core.view.WindowInsetsControllerCompat -import autodagger.AutoInjector -import com.google.android.material.bottomsheet.BottomSheetDialogFragment -import com.google.android.material.card.MaterialCardView -import com.nextcloud.android.common.ui.theme.utils.ColorRole -import com.nextcloud.talk.R -import com.nextcloud.talk.api.NcApi -import com.nextcloud.talk.application.NextcloudTalkApplication -import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.databinding.DialogSetOnlineStatusBinding -import com.nextcloud.talk.models.json.generic.GenericOverall -import com.nextcloud.talk.models.json.status.Status -import com.nextcloud.talk.models.json.status.StatusType -import com.nextcloud.talk.ui.theme.ViewThemeUtils -import com.nextcloud.talk.utils.ApiUtils -import com.nextcloud.talk.utils.database.user.CurrentUserProviderNew -import io.reactivex.Observer -import io.reactivex.android.schedulers.AndroidSchedulers -import io.reactivex.disposables.Disposable -import io.reactivex.schedulers.Schedulers -import java.util.Locale -import javax.inject.Inject - -@AutoInjector(NextcloudTalkApplication::class) -class OnlineStatusBottomDialogFragment : BottomSheetDialogFragment() { - private lateinit var binding: DialogSetOnlineStatusBinding - private var currentUser: User? = null - private var currentStatus: Status? = null - private val disposables: MutableList = ArrayList() - - @Inject lateinit var ncApi: NcApi - - @Inject lateinit var viewThemeUtils: ViewThemeUtils - - var currentUserProvider: CurrentUserProviderNew? = null - @Inject set - - lateinit var credentials: String - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - NextcloudTalkApplication.sharedApplication!!.componentApplication.inject(this) - - arguments?.let { - currentUser = currentUserProvider?.currentUser?.blockingGet() - currentStatus = it.getParcelable(ARG_CURRENT_STATUS_PARAM) - credentials = ApiUtils.getCredentials(currentUser?.username, currentUser?.token)!! - } - } - - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { - binding = DialogSetOnlineStatusBinding.inflate(inflater, container, false) - viewThemeUtils.platform.themeDialog(binding.root) - viewThemeUtils.material.themeDragHandleView(binding.dragHandle) - - dialog?.window?.let { window -> - window.navigationBarColor = ContextCompat.getColor(requireContext(), R.color.bg_default) - val inLightMode = resources.configuration.uiMode and - Configuration.UI_MODE_NIGHT_MASK != Configuration.UI_MODE_NIGHT_YES - WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightNavigationBars = inLightMode - } - return binding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - super.onViewCreated(view, savedInstanceState) - setupGeneralStatusOptions() - currentStatus?.let { visualizeStatus(it.status) } - } - - private fun setupGeneralStatusOptions() { - binding.onlineStatus.setOnClickListener { setStatus(StatusType.ONLINE) } - binding.dndStatus.setOnClickListener { setStatus(StatusType.DND) } - binding.busyStatus.setOnClickListener { setStatus(StatusType.BUSY) } - binding.awayStatus.setOnClickListener { setStatus(StatusType.AWAY) } - binding.invisibleStatus.setOnClickListener { setStatus(StatusType.INVISIBLE) } - - viewThemeUtils.talk.themeStatusCardView(binding.onlineStatus) - viewThemeUtils.talk.themeStatusCardView(binding.dndStatus) - viewThemeUtils.talk.themeStatusCardView(binding.busyStatus) - viewThemeUtils.talk.themeStatusCardView(binding.awayStatus) - viewThemeUtils.talk.themeStatusCardView(binding.invisibleStatus) - } - - private fun setStatus(statusType: StatusType) { - visualizeStatus(statusType) - - ncApi.setStatusType(credentials, ApiUtils.getUrlForSetStatusType(currentUser?.baseUrl!!), statusType.string) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()) - .subscribe(object : Observer { - override fun onSubscribe(d: Disposable) { - disposables.add(d) - } - override fun onNext(t: GenericOverall) { - dismiss() - } - override fun onError(e: Throwable) { - Log.e(TAG, "Failed to set statusType", e) - } - override fun onComplete() { - // unused atm - } - }) - } - - private fun visualizeStatus(statusType: String) { - StatusType.entries.firstOrNull { it.name == statusType.uppercase(Locale.ROOT) }?.let { visualizeStatus(it) } - } - - private fun visualizeStatus(statusType: StatusType) { - clearTopStatus() - val views: Triple = when (statusType) { - StatusType.ONLINE -> Triple(binding.onlineStatus, binding.onlineHeadline, binding.onlineIcon) - StatusType.BUSY -> Triple(binding.busyStatus, binding.busyHeadline, binding.busyIcon) - StatusType.AWAY -> Triple(binding.awayStatus, binding.awayHeadline, binding.awayIcon) - StatusType.DND -> Triple(binding.dndStatus, binding.dndHeadline, binding.dndIcon) - StatusType.INVISIBLE -> Triple(binding.invisibleStatus, binding.invisibleHeadline, binding.invisibleIcon) - else -> return - } - views.first.isChecked = true - viewThemeUtils.platform.colorTextView(views.second, ColorRole.ON_SECONDARY_CONTAINER) - } - - private fun clearTopStatus() { - context?.let { - binding.onlineHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) - binding.awayHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) - binding.dndHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) - binding.busyHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) - binding.invisibleHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) - - binding.onlineIcon.imageTintList = null - binding.awayIcon.imageTintList = null - binding.dndIcon.imageTintList = null - binding.busyIcon.imageTintList = null - binding.invisibleIcon.imageTintList = null - - binding.onlineStatus.isChecked = false - binding.awayStatus.isChecked = false - binding.dndStatus.isChecked = false - binding.busyStatus.isChecked = false - binding.invisibleStatus.isChecked = false - } - } - - override fun onDestroyView() { - super.onDestroyView() - disposables.forEach { if (!it.isDisposed) it.dispose() } - disposables.clear() - } - - companion object { - private const val ARG_CURRENT_STATUS_PARAM = "currentStatus" - private val TAG = OnlineStatusBottomDialogFragment::class.simpleName - - @JvmStatic - fun newInstance(status: Status): OnlineStatusBottomDialogFragment { - val args = Bundle() - args.putParcelable(ARG_CURRENT_STATUS_PARAM, status) - - val fragment = OnlineStatusBottomDialogFragment() - fragment.arguments = args - return fragment - } - } -} diff --git a/app/src/main/java/com/nextcloud/talk/ui/dialog/StatusMessageBottomDialogFragment.kt b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt similarity index 81% rename from app/src/main/java/com/nextcloud/talk/ui/dialog/StatusMessageBottomDialogFragment.kt rename to app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt index 365ccce..161cc47 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/dialog/StatusMessageBottomDialogFragment.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/dialog/SetStatusDialogFragment.kt @@ -9,8 +9,8 @@ package com.nextcloud.talk.ui.dialog import android.annotation.SuppressLint +import android.app.Dialog import android.content.Context -import android.content.res.Configuration import android.os.Bundle import android.util.Log import android.view.LayoutInflater @@ -20,23 +20,27 @@ import android.view.inputmethod.InputMethodManager import android.widget.AdapterView import android.widget.AdapterView.OnItemSelectedListener import android.widget.ArrayAdapter -import androidx.core.content.ContextCompat -import androidx.core.view.WindowInsetsControllerCompat +import android.widget.ImageView +import android.widget.TextView +import androidx.fragment.app.DialogFragment import androidx.recyclerview.widget.LinearLayoutManager import autodagger.AutoInjector import com.bluelinelabs.logansquare.LoganSquare -import com.google.android.material.bottomsheet.BottomSheetDialogFragment +import com.google.android.material.card.MaterialCardView +import com.google.android.material.dialog.MaterialAlertDialogBuilder +import com.nextcloud.android.common.ui.theme.utils.ColorRole import com.nextcloud.talk.R import com.nextcloud.talk.adapters.PredefinedStatusClickListener import com.nextcloud.talk.adapters.PredefinedStatusListAdapter import com.nextcloud.talk.api.NcApi import com.nextcloud.talk.application.NextcloudTalkApplication import com.nextcloud.talk.data.user.model.User -import com.nextcloud.talk.databinding.DialogSetStatusMessageBinding +import com.nextcloud.talk.databinding.DialogSetStatusBinding import com.nextcloud.talk.models.json.generic.GenericOverall import com.nextcloud.talk.models.json.status.ClearAt import com.nextcloud.talk.models.json.status.Status import com.nextcloud.talk.models.json.status.StatusOverall +import com.nextcloud.talk.models.json.status.StatusType import com.nextcloud.talk.models.json.status.predefined.PredefinedStatus import com.nextcloud.talk.models.json.status.predefined.PredefinedStatusOverall import com.nextcloud.talk.ui.theme.ViewThemeUtils @@ -57,33 +61,32 @@ import java.util.Calendar import java.util.Locale import javax.inject.Inject +private const val ARG_CURRENT_USER_PARAM = "currentUser" private const val ARG_CURRENT_STATUS_PARAM = "currentStatus" private const val POS_DONT_CLEAR = 0 -private const val POS_FIFTEEN_MINUTES = 1 -private const val POS_HALF_AN_HOUR = 2 -private const val POS_AN_HOUR = 3 -private const val POS_FOUR_HOURS = 4 -private const val POS_TODAY = 5 -private const val POS_END_OF_WEEK = 6 +private const val POS_HALF_AN_HOUR = 1 +private const val POS_AN_HOUR = 2 +private const val POS_FOUR_HOURS = 3 +private const val POS_TODAY = 4 +private const val POS_END_OF_WEEK = 5 private const val ONE_SECOND_IN_MILLIS = 1000 private const val ONE_MINUTE_IN_SECONDS = 60 private const val THIRTY_MINUTES = 30 -private const val FIFTEEN_MINUTES = 15 private const val FOUR_HOURS = 4 private const val LAST_HOUR_OF_DAY = 23 private const val LAST_MINUTE_OF_HOUR = 59 private const val LAST_SECOND_OF_MINUTE = 59 @AutoInjector(NextcloudTalkApplication::class) -class StatusMessageBottomDialogFragment : - BottomSheetDialogFragment(), +class SetStatusDialogFragment : + DialogFragment(), PredefinedStatusClickListener { private var selectedPredefinedStatus: PredefinedStatus? = null - private lateinit var binding: DialogSetStatusMessageBinding + private lateinit var binding: DialogSetStatusBinding private var currentUser: User? = null private var currentStatus: Status? = null @@ -206,17 +209,15 @@ class StatusMessageBottomDialogFragment : } }) } - override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View { - binding = DialogSetStatusMessageBinding.inflate(inflater, container, false) - viewThemeUtils.platform.themeDialog(binding.root) - viewThemeUtils.material.themeDragHandleView(binding.dragHandle) - dialog?.window?.let { window -> - window.navigationBarColor = ContextCompat.getColor(requireContext(), R.color.bg_default) - val inLightMode = resources.configuration.uiMode and - Configuration.UI_MODE_NIGHT_MASK != Configuration.UI_MODE_NIGHT_YES - WindowInsetsControllerCompat(window, window.decorView).isAppearanceLightNavigationBars = inLightMode - } - return binding.root + + @SuppressLint("InflateParams") + override fun onCreateDialog(savedInstanceState: Bundle?): Dialog { + binding = DialogSetStatusBinding.inflate(layoutInflater) + + val dialogBuilder = MaterialAlertDialogBuilder(binding.root.context).setView(binding.root) + viewThemeUtils.dialog.colorMaterialAlertDialogBackground(binding.root.context, dialogBuilder) + + return dialogBuilder.create() } @SuppressLint("DefaultLocale") @@ -231,6 +232,8 @@ class StatusMessageBottomDialogFragment : binding.predefinedStatusList.adapter = adapter binding.predefinedStatusList.layoutManager = LinearLayoutManager(context) + setupGeneralStatusOptions() + if (currentStatus?.icon == null) { binding.emoji.setText(getString(R.string.default_emoji)) } @@ -274,34 +277,12 @@ class StatusMessageBottomDialogFragment : viewThemeUtils.material.colorTextInputLayout(binding.customStatusInputContainer) } - private fun clearStatus() { - val credentials = ApiUtils.getCredentials(currentUser?.username, currentUser?.token) - ncApi.statusDeleteMessage(credentials, ApiUtils.getUrlForStatusMessage(currentUser?.baseUrl!!)) - .subscribeOn(Schedulers.io()) - .observeOn(AndroidSchedulers.mainThread()).subscribe(object : Observer { - override fun onSubscribe(d: Disposable) { - disposables.add(d) - } - - override fun onNext(statusOverall: GenericOverall) { - // unused atm - } - - override fun onError(e: Throwable) { - Log.e(TAG, "Failed to clear status", e) - } - - override fun onComplete() { - dismiss() - } - }) - } - private fun setupCurrentStatus() { currentStatus?.let { binding.emoji.setText(it.icon) binding.customStatusInput.text?.clear() binding.customStatusInput.setText(it.message?.trim()) + visualizeStatus(it.status) if (it.clearAt > 0) { binding.clearStatusAfterSpinner.visibility = View.GONE @@ -362,11 +343,22 @@ class StatusMessageBottomDialogFragment : } } + private fun setupGeneralStatusOptions() { + binding.onlineStatus.setOnClickListener { setStatus(StatusType.ONLINE) } + binding.dndStatus.setOnClickListener { setStatus(StatusType.DND) } + binding.awayStatus.setOnClickListener { setStatus(StatusType.AWAY) } + binding.invisibleStatus.setOnClickListener { setStatus(StatusType.INVISIBLE) } + + viewThemeUtils.talk.themeStatusCardView(binding.onlineStatus) + viewThemeUtils.talk.themeStatusCardView(binding.dndStatus) + viewThemeUtils.talk.themeStatusCardView(binding.awayStatus) + viewThemeUtils.talk.themeStatusCardView(binding.invisibleStatus) + } + private fun createClearTimesArrayAdapter(): ArrayAdapter { val adapter = ArrayAdapter(requireContext(), android.R.layout.simple_spinner_item) adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) adapter.add(getString(R.string.dontClear)) - adapter.add(getString(R.string.fifteenMinutes)) adapter.add(getString(R.string.thirtyMinutes)) adapter.add(getString(R.string.oneHour)) adapter.add(getString(R.string.fourHours)) @@ -385,10 +377,6 @@ class StatusMessageBottomDialogFragment : clearAt = null } - POS_FIFTEEN_MINUTES -> { - clearAt = currentTime + FIFTEEN_MINUTES * ONE_MINUTE_IN_SECONDS - } - POS_HALF_AN_HOUR -> { // 30 minutes clearAt = currentTime + THIRTY_MINUTES * ONE_MINUTE_IN_SECONDS @@ -462,6 +450,96 @@ class StatusMessageBottomDialogFragment : popup.show() } + private fun clearStatus() { + val credentials = ApiUtils.getCredentials(currentUser?.username, currentUser?.token) + ncApi.statusDeleteMessage(credentials, ApiUtils.getUrlForStatusMessage(currentUser?.baseUrl!!)) + .subscribeOn(Schedulers.io()) + .observeOn(AndroidSchedulers.mainThread()).subscribe(object : Observer { + override fun onSubscribe(d: Disposable) { + disposables.add(d) + } + + override fun onNext(statusOverall: GenericOverall) { + // unused atm + } + + override fun onError(e: Throwable) { + Log.e(TAG, "Failed to clear status", e) + } + + override fun onComplete() { + dismiss() + } + }) + } + + private fun setStatus(statusType: StatusType) { + visualizeStatus(statusType) + + ncApi.setStatusType(credentials, ApiUtils.getUrlForSetStatusType(currentUser?.baseUrl!!), statusType.string) + .subscribeOn( + Schedulers + .io() + ) + .observeOn(AndroidSchedulers.mainThread()).subscribe(object : Observer { + override fun onSubscribe(d: Disposable) { + disposables.add(d) + } + + override fun onNext(statusOverall: GenericOverall) { + Log.d(TAG, "statusType successfully set") + } + + override fun onError(e: Throwable) { + Log.e(TAG, "Failed to set statusType", e) + clearTopStatus() + } + + override fun onComplete() { + // unused atm + } + }) + } + + private fun visualizeStatus(statusType: String) { + StatusType.values().firstOrNull { it.name == statusType.uppercase(Locale.ROOT) }?.let { visualizeStatus(it) } + } + + private fun visualizeStatus(statusType: StatusType) { + clearTopStatus() + val views: Triple = when (statusType) { + StatusType.ONLINE -> Triple(binding.onlineStatus, binding.onlineHeadline, binding.onlineIcon) + StatusType.AWAY -> Triple(binding.awayStatus, binding.awayHeadline, binding.awayIcon) + StatusType.DND -> Triple(binding.dndStatus, binding.dndHeadline, binding.dndIcon) + StatusType.INVISIBLE -> Triple(binding.invisibleStatus, binding.invisibleHeadline, binding.invisibleIcon) + else -> { + Log.d(TAG, "unknown status") + return + } + } + views.first.isChecked = true + viewThemeUtils.platform.colorTextView(views.second, ColorRole.ON_SECONDARY_CONTAINER) + } + + private fun clearTopStatus() { + context?.let { + binding.onlineHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) + binding.awayHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) + binding.dndHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) + binding.invisibleHeadline.setTextColor(resources.getColor(R.color.high_emphasis_text, null)) + + binding.onlineIcon.imageTintList = null + binding.awayIcon.imageTintList = null + binding.dndIcon.imageTintList = null + binding.invisibleIcon.imageTintList = null + + binding.onlineStatus.isChecked = false + binding.awayStatus.isChecked = false + binding.dndStatus.isChecked = false + binding.invisibleStatus.isChecked = false + } + } + private fun setStatusMessage() { val inputText = binding.customStatusInput.text.toString().ifEmpty { "" } // The endpoint '/message/custom' expects a valid emoji as string or null @@ -528,6 +606,9 @@ class StatusMessageBottomDialogFragment : } } + override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View = + binding.root + override fun onClick(predefinedStatus: PredefinedStatus) { selectedPredefinedStatus = predefinedStatus @@ -551,7 +632,6 @@ class StatusMessageBottomDialogFragment : private fun setClearAt(clearAt: ClearAt) { if (clearAt.type == "period") { when (clearAt.time) { - "900" -> binding.clearStatusAfterSpinner.setSelection(POS_FIFTEEN_MINUTES) "1800" -> binding.clearStatusAfterSpinner.setSelection(POS_HALF_AN_HOUR) "3600" -> binding.clearStatusAfterSpinner.setSelection(POS_AN_HOUR) "14400" -> binding.clearStatusAfterSpinner.setSelection(POS_FOUR_HOURS) @@ -583,16 +663,16 @@ class StatusMessageBottomDialogFragment : * Fragment creator */ companion object { - private val TAG = StatusMessageBottomDialogFragment::class.simpleName + private val TAG = SetStatusDialogFragment::class.simpleName private const val HTTP_STATUS_CODE_OK = 200 private const val HTTP_STATUS_CODE_NOT_FOUND = 404 @JvmStatic - fun newInstance(status: Status): StatusMessageBottomDialogFragment { + fun newInstance(status: Status): SetStatusDialogFragment { val args = Bundle() args.putParcelable(ARG_CURRENT_STATUS_PARAM, status) - val dialogFragment = StatusMessageBottomDialogFragment() + val dialogFragment = SetStatusDialogFragment() dialogFragment.arguments = args return dialogFragment } diff --git a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt index aea2703..e8ba0a9 100644 --- a/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/ui/theme/TalkSpecificViewThemeUtils.kt @@ -14,7 +14,6 @@ import android.graphics.PorterDuff import android.graphics.PorterDuffColorFilter import android.graphics.Typeface import android.graphics.drawable.Drawable -import android.graphics.drawable.GradientDrawable import android.graphics.drawable.LayerDrawable import android.text.Spannable import android.text.Spanned @@ -132,6 +131,12 @@ class TalkSpecificViewThemeUtils @Inject constructor( } } + fun colorOutgoingQuoteBackground(view: View) { + withScheme(view) { scheme -> + view.setBackgroundColor(dynamicColor.onSurfaceVariant().getArgb(scheme)) + } + } + fun colorContactChatItemName(contactName: androidx.emoji2.widget.EmojiTextView) { withScheme(contactName) { scheme -> contactName.setTextColor(dynamicColor.onPrimaryContainer().getArgb(scheme)) @@ -230,6 +235,7 @@ class TalkSpecificViewThemeUtils @Inject constructor( fun themeStatusCardView(cardView: MaterialCardView) { withScheme(cardView) { scheme -> + val background = cardView.context.getColor(R.color.grey_200) cardView.backgroundTintList = ColorStateList( arrayOf( @@ -238,7 +244,7 @@ class TalkSpecificViewThemeUtils @Inject constructor( ), intArrayOf( dynamicColor.secondaryContainer().getArgb(scheme), - dynamicColor.surfaceContainerHigh().getArgb(scheme) + background ) ) cardView.setStrokeColor( @@ -374,18 +380,11 @@ class TalkSpecificViewThemeUtils @Inject constructor( @ColorRes quoteColorNonSelf: Int = R.color.textColorMaxContrast ) { withScheme(quoteColoredView) { scheme -> - val shapeRectangle = ContextCompat.getDrawable( - quoteColoredView.context, - R.drawable.reply_background - ) - as LayerDrawable - val gradient = shapeRectangle.findDrawableByLayerId(R.id.quoteLine) as GradientDrawable if (parentChatMessage.actorId?.equals(message.activeUser!!.userId) == true) { - gradient.setColor(dynamicColor.primary().getArgb(scheme)) + quoteColoredView.setBackgroundColor(dynamicColor.primary().getArgb(scheme)) } else { - gradient.setColor(dynamicColor.onSurfaceVariant().getArgb(scheme)) + quoteColoredView.setBackgroundResource(quoteColorNonSelf) } - quoteColoredView.background = shapeRectangle } } diff --git a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt index 848316f..37e8876 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ApiUtils.kt @@ -527,16 +527,4 @@ object ApiUtils { "$baseUrl$OCS_API_VERSION$SPREED_API_VERSION/chat/$token/$messageId/context" fun getUrlForProfile(baseUrl: String, userId: String): String = "$baseUrl$OCS_API_VERSION/profile/$userId" - - fun getUrlForRecentThreads(version: Int, baseUrl: String?, token: String): String = - getUrlForChat(version, baseUrl, token) + "/threads/recent" - - fun getUrlForSubscribedThreads(version: Int, baseUrl: String?): String = - getUrlForApi(version, baseUrl) + "/chat/subscribed-threads" - - fun getUrlForThread(version: Int, baseUrl: String?, token: String, threadId: Int): String = - getUrlForChat(version, baseUrl, token) + "/threads" + "/$threadId" - - fun getUrlForThreadNotificationLevel(version: Int, baseUrl: String?, token: String, threadId: Int): String = - getUrlForChat(version, baseUrl, token) + "/threads" + "/$threadId" + "/notify" } diff --git a/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt b/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt index 9fe321b..982c273 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/AppCompatActivityExtensions.kt @@ -28,7 +28,7 @@ fun AppCompatActivity.adjustUIForAPILevel35( // general, supporting both XML and Compose system bar handling is a pain and we will have it easier without XML) // So in short: migrate all screens to Compose. Then it's easier to decide if navigation bar should be semi // transparent or not for all screens. - navigationBarStyle: SystemBarStyle = SystemBarStyle.auto(Color.TRANSPARENT, Color.TRANSPARENT) + navigationBarStyle: SystemBarStyle = SystemBarStyle.light(Color.TRANSPARENT, Color.TRANSPARENT) ) { val isApiLevel35OrHigher = (Build.VERSION.SDK_INT >= Build.VERSION_CODES.VANILLA_ICE_CREAM) if (!isApiLevel35OrHigher) { diff --git a/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt b/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt index 75af1dd..c13f425 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/CapabilitiesUtil.kt @@ -60,8 +60,7 @@ enum class SpreedFeatures(val value: String) { CONVERSATION_CREATION_ALL("conversation-creation-all"), UNBIND_CONVERSATION("unbind-conversation"), SENSITIVE_CONVERSATIONS("sensitive-conversations"), - IMPORTANT_CONVERSATIONS("important-conversations"), - THREADS("threads") + IMPORTANT_CONVERSATIONS("important-conversations") } @Suppress("TooManyFunctions") diff --git a/app/src/main/java/com/nextcloud/talk/utils/ColorGenerator.kt b/app/src/main/java/com/nextcloud/talk/utils/ColorGenerator.kt index 57bec12..468f723 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ColorGenerator.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/ColorGenerator.kt @@ -10,60 +10,98 @@ package com.nextcloud.talk.utils import android.graphics.Color import java.security.MessageDigest +import kotlin.math.abs // See https://github.com/nextcloud/nextcloud-vue/blob/56b79afae93f4701a0cb933bfeb7b4a2fbd590fb/src/functions/usernameToColor/usernameToColor.js // and https://github.com/nextcloud/nextcloud-vue/blob/56b79afae93f4701a0cb933bfeb7b4a2fbd590fb/src/utils/GenColors.js @Suppress("MagicNumber") -object ColorGenerator { +class ColorGenerator private constructor() { - private const val STEPS = 6 - private val finalPalette: List = genColors() + private val steps = 6 + private val finalPalette: List = genColors(steps) - private data class RGB(val r: Int, val g: Int, val b: Int) + companion object { + val shared = ColorGenerator() + private const val MULTIPLIER = 256.0f + + private fun stepCalc(steps: Int, colorStart: Int, colorEnd: Int): List { + val r0 = Color.red(colorStart) / MULTIPLIER + val g0 = Color.green(colorStart) / MULTIPLIER + val b0 = Color.blue(colorStart) / MULTIPLIER + + val r1 = Color.red(colorEnd) / MULTIPLIER + val g1 = Color.green(colorEnd) / MULTIPLIER + val b1 = Color.blue(colorEnd) / MULTIPLIER + + return listOf( + (r1 - r0) / steps, + (g1 - g0) / steps, + (b1 - b0) / steps + ) + } + + private fun mixPalette(steps: Int, color1: Int, color2: Int): List { + val palette = mutableListOf(color1) + val step = stepCalc(steps, color1, color2) + + val rStart = Color.red(color1) / MULTIPLIER + val gStart = Color.green(color1) / MULTIPLIER + val bStart = Color.blue(color1) / MULTIPLIER + + for (i in 1 until steps) { + val r = (abs(rStart + step[0] * i) * MULTIPLIER).toInt().coerceIn(0, 255) + val g = (abs(gStart + step[1] * i) * MULTIPLIER).toInt().coerceIn(0, 255) + val b = (abs(bStart + step[2] * i) * MULTIPLIER).toInt().coerceIn(0, 255) + + palette.add(Color.rgb(r, g, b)) + } + + return palette + } + + fun genColors(steps: Int): List { + val red = Color.rgb( + (182 / MULTIPLIER * 255).toInt(), + (70 / MULTIPLIER * 255).toInt(), + (157 / MULTIPLIER * 255).toInt() + ) + val yellow = Color.rgb( + (221 / MULTIPLIER * 255).toInt(), + (203 / MULTIPLIER * 255).toInt(), + (85 / MULTIPLIER * 255).toInt() + ) + val blue = Color.rgb( + 0, + (130 / MULTIPLIER * 255).toInt(), + (201 / MULTIPLIER * 255).toInt() + ) + + val palette1 = mixPalette(steps, red, yellow).toMutableList() + val palette2 = mixPalette(steps, yellow, blue) + val palette3 = mixPalette(steps, blue, red) + + palette1.addAll(palette2) + palette1.addAll(palette3) + + return palette1 + } + } fun usernameToColor(username: String): Int { - var hash = username.lowercase() + val hash = username.lowercase() + var hashInt: Int - val md5Regex = Regex("^([0-9a-f]{4}-?){8}$") - if (!hash.matches(md5Regex)) { - val digest = MessageDigest.getInstance("MD5").digest(hash.toByteArray(Charsets.UTF_8)) - hash = digest.joinToString("") { "%02x".format(it) } - } + val bytes = hash.toByteArray(Charsets.UTF_8) + val md = MessageDigest.getInstance("MD5") + val digest = md.digest(bytes) + val hex = digest.joinToString("") { "%02x".format(it) } - hash = hash.replace(Regex("[^0-9a-f]"), "") + hashInt = hex.map { it.digitToInt(16) % 16 }.sum() - val idx = hashToInt(hash, finalPalette.size) + val maximum = steps * 3 + hashInt %= maximum - val rgb = finalPalette[idx] - return Color.rgb(rgb.r, rgb.g, rgb.b) - } - - private fun hashToInt(hash: String, maximum: Int): Int { - val sum = hash.map { it.lowercaseChar().digitToInt(16) % 16 }.sum() - return sum % maximum - } - - private fun genColors(): List { - val red = RGB(182, 70, 157) - val yellow = RGB(221, 203, 85) - val blue = RGB(0, 130, 201) - - return mixPalette(red, yellow) + mixPalette(yellow, blue) + mixPalette(blue, red) - } - - private fun mixPalette(start: RGB, end: RGB): List { - val palette = mutableListOf(start) - val rStep = (end.r - start.r).toFloat() / STEPS - val gStep = (end.g - start.g).toFloat() / STEPS - val bStep = (end.b - start.b).toFloat() / STEPS - - for (i in 1 until STEPS) { - val r = (start.r + rStep * i).toInt().coerceIn(0, 255) - val g = (start.g + gStep * i).toInt().coerceIn(0, 255) - val b = (start.b + bStep * i).toInt().coerceIn(0, 255) - palette.add(RGB(r, g, b)) - } - return palette + return finalPalette[hashInt] } } diff --git a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt index 857adf0..d35ee36 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/DisplayUtils.kt @@ -292,7 +292,7 @@ object DisplayUtils { return spannableString } - fun searchAndColor(text: Spannable, searchText: String, @ColorInt color: Int, textSize: Int): Spannable { + fun searchAndColor(text: Spannable, searchText: String, @ColorInt color: Int): Spannable { val spannableString: Spannable = SpannableString(text) val stringText = text.toString() if (TextUtils.isEmpty(text) || TextUtils.isEmpty(searchText)) { @@ -303,6 +303,7 @@ object DisplayUtils { Pattern.CASE_INSENSITIVE or Pattern.LITERAL or Pattern.MULTILINE ) .matcher(spannableString) + val textSize = sharedApplication!!.resources.getDimensionPixelSize(R.dimen.chat_text_size) var lastStartIndex = -1 while (m.find()) { val start = stringText.indexOf(m.group(), lastStartIndex) diff --git a/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt index ca7e54c..627787d 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/FileUtils.kt @@ -129,10 +129,7 @@ object FileUtils { val cursor: Cursor? = context.contentResolver.query(uri, null, null, null, null) try { if (cursor != null && cursor.moveToFirst()) { - val displayNameColumnIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME) - if (displayNameColumnIndex != -1) { - filename = cursor.getString(displayNameColumnIndex) - } + filename = cursor.getString(cursor.getColumnIndexOrThrow(OpenableColumns.DISPLAY_NAME)) } } finally { cursor?.close() diff --git a/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt b/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt index 7d6d528..1d4d610 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/bundle/BundleKeys.kt @@ -82,6 +82,4 @@ object BundleKeys { const val KEY_CHAT_URL: String = "KEY_CHAT_URL" const val KEY_SCROLL_TO_NOTIFICATION_CATEGORY: String = "KEY_SCROLL_TO_NOTIFICATION_CATEGORY" const val KEY_FOCUS_INPUT: String = "KEY_FOCUS_INPUT" - const val KEY_THREAD_ID = "KEY_THREAD_ID" - const val KEY_FROM_QR: String = "KEY_FROM_QR" } diff --git a/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtil.kt b/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtil.kt index e285902..7116d7b 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtil.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtil.kt @@ -14,5 +14,4 @@ interface PlatformPermissionUtil { fun isBluetoothPermissionGranted(): Boolean fun isFilesPermissionGranted(): Boolean fun isPostNotificationsPermissionGranted(): Boolean - fun isLocationPermissionGranted(): Boolean } diff --git a/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtilImpl.kt b/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtilImpl.kt index a939561..8f3de4d 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtilImpl.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/permissions/PlatformPermissionUtilImpl.kt @@ -91,12 +91,6 @@ class PlatformPermissionUtilImpl(private val context: Context) : PlatformPermiss Manifest.permission.POST_NOTIFICATIONS ) == PermissionChecker.PERMISSION_GRANTED - override fun isLocationPermissionGranted(): Boolean = - PermissionChecker.checkSelfPermission( - context, - Manifest.permission.ACCESS_FINE_LOCATION - ) == PermissionChecker.PERMISSION_GRANTED - companion object { private val TAG = PlatformPermissionUtilImpl::class.simpleName } diff --git a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtils.kt b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtils.kt index c2924d5..6bad62a 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtils.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtils.kt @@ -41,8 +41,6 @@ import com.nextcloud.talk.data.user.UsersRepository import com.nextcloud.talk.data.user.UsersRepositoryImpl import com.nextcloud.talk.repositories.reactions.ReactionsRepository import com.nextcloud.talk.repositories.reactions.ReactionsRepositoryImpl -import com.nextcloud.talk.threadsoverview.data.ThreadsRepository -import com.nextcloud.talk.threadsoverview.data.ThreadsRepositoryImpl import com.nextcloud.talk.ui.theme.MaterialSchemesProviderImpl import com.nextcloud.talk.ui.theme.TalkSpecificViewThemeUtils import com.nextcloud.talk.ui.theme.ViewThemeUtils @@ -149,9 +147,6 @@ class ComposePreviewUtils private constructor(context: Context) { userProvider ) - val threadsRepository: ThreadsRepository - get() = ThreadsRepositoryImpl(ncApiCoroutines, userProvider) - val conversationNetworkDataSource: ConversationsNetworkDataSource get() = RetrofitConversationsNetwork(ncApi) @@ -178,7 +173,6 @@ class ComposePreviewUtils private constructor(context: Context) { appPreferences, chatNetworkDataSource, chatRepository, - threadsRepository, conversationRepository, reactionsRepository, mediaRecorderManager, diff --git a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt index 5743d04..976ae25 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt +++ b/app/src/main/java/com/nextcloud/talk/utils/preview/ComposePreviewUtilsDaos.kt @@ -23,23 +23,21 @@ import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.flowOf class DummyChatMessagesDaoImpl : ChatMessagesDao { + override fun getNewestMessageId(internalConversationId: String): Long = 0L + override fun getMessagesForConversation(internalConversationId: String): Flow> = flowOf() override fun getTempMessagesForConversation(internalConversationId: String): Flow> = flowOf() - override fun getTempUnsentMessagesForConversation( - internalConversationId: String, - threadId: Long? - ): Flow> { + override fun getTempUnsentMessagesForConversation(internalConversationId: String): Flow> { // nothing to return here as long this class is only used for the Search window return flowOf() } override fun getTempMessageForConversation( internalConversationId: String, - referenceId: String, - threadId: Long? + referenceId: String ): Flow = flowOf() override suspend fun upsertChatMessages(chatMessages: List) { /* */ } @@ -61,36 +59,30 @@ class DummyChatMessagesDaoImpl : ChatMessagesDao { override fun getMessagesForConversationSince( internalConversationId: String, - messageId: Long, - threadId: Long? + messageId: Long ): Flow> = flowOf() override fun getMessagesForConversationBefore( internalConversationId: String, messageId: Long, - limit: Int, - threadId: Long? + limit: Int ): Flow> = flowOf() override fun getMessagesForConversationBeforeAndEqual( internalConversationId: String, messageId: Long, - limit: Int, - threadId: Long? + limit: Int ): Flow> = flowOf() override fun getCountBetweenMessageIds( internalConversationId: String, oldestMessageId: Long, - newestMessageId: Long, - threadId: Long? + newestMessageId: Long ): Int = 0 override fun clearAllMessagesForUser(pattern: String) { /* */ } override fun deleteMessagesOlderThan(internalConversationId: String, messageId: Long) { /* */ } - - override fun getNumberOfThreadReplies(internalConversationId: String, threadId: Long): Int = 0 } class DummyUserDaoImpl : UsersDao() { @@ -194,36 +186,34 @@ class DummyConversationDaoImpl : ConversationsDao { override fun getConversationForUser(accountId: Long, token: String): Flow = flowOf() - override suspend fun upsertConversations(accountId: Long, serverItems: List) { /* */ } + override fun upsertConversations(conversationEntities: List) { /* */ } override fun deleteConversations(conversationIds: List) { /* */ } override fun updateConversation(conversationEntity: ConversationEntity) { /* */ } - override fun insertConversation(conversation: ConversationEntity) { /* */ } - override fun clearAllConversationsForUser(accountId: Long) { /* */ } } class DummyChatBlocksDaoImpl : ChatBlocksDao { override fun deleteChatBlocks(blocks: List) { /* */ } + override fun getChatBlocks(internalConversationId: String): Flow> = flowOf() + override fun getChatBlocksContainingMessageId( internalConversationId: String, - threadId: Long?, messageId: Long ): Flow> = flowOf() override fun getConnectedChatBlocks( internalConversationId: String, - threadId: Long?, oldestMessageId: Long, newestMessageId: Long ): Flow> = flowOf() - override fun getNewestMessageIdFromChatBlocks(internalConversationId: String, threadId: Long?): Long = 0L - override suspend fun upsertChatBlock(chatBlock: ChatBlockEntity) { /* */ } + override fun clearChatBlocksForUser(pattern: String) { /* */ } + override fun deleteChatBlocksOlderThan(internalConversationId: String, messageId: Long) { /* */ } } diff --git a/app/src/main/java/com/nextcloud/talk/utils/ssl/TrustManager.java b/app/src/main/java/com/nextcloud/talk/utils/ssl/TrustManager.java index 1cb96ac..c8aeba9 100644 --- a/app/src/main/java/com/nextcloud/talk/utils/ssl/TrustManager.java +++ b/app/src/main/java/com/nextcloud/talk/utils/ssl/TrustManager.java @@ -7,7 +7,6 @@ * * Influenced by https://gitlab.com/bitfireAT/cert4android/blob/master/src/main/java/at/bitfire/cert4android/CustomCertService.kt */ - package com.nextcloud.talk.utils.ssl; import android.content.Context; @@ -35,7 +34,7 @@ import javax.net.ssl.X509TrustManager; public class TrustManager implements X509TrustManager { private static final String TAG = "TrustManager"; - private final File keystoreFile; + private File keystoreFile; private X509TrustManager systemTrustManager = null; private KeyStore trustedKeyStore = null; @@ -156,7 +155,7 @@ public class TrustManager implements X509TrustManager { private class HostnameVerifier implements javax.net.ssl.HostnameVerifier { private static final String TAG = "HostnameVerifier"; - private final javax.net.ssl.HostnameVerifier defaultHostNameVerifier; + private javax.net.ssl.HostnameVerifier defaultHostNameVerifier; private HostnameVerifier(javax.net.ssl.HostnameVerifier defaultHostNameVerifier) { this.defaultHostNameVerifier = defaultHostNameVerifier; @@ -166,14 +165,16 @@ public class TrustManager implements X509TrustManager { public boolean verify(String s, SSLSession sslSession) { if (defaultHostNameVerifier.verify(s, sslSession)) { - try { - X509Certificate[] certificates = (X509Certificate[]) sslSession.getPeerCertificates(); - if (certificates.length > 0 && isCertInTrustStore(certificates, s)) { - return true; - } - } catch (SSLPeerUnverifiedException e) { - Log.d(TAG, "Couldn't get certificate for host name verification"); + return true; + } + + try { + X509Certificate[] certificates = (X509Certificate[]) sslSession.getPeerCertificates(); + if (certificates.length > 0 && isCertInTrustStore(certificates, s)) { + return true; } + } catch (SSLPeerUnverifiedException e) { + Log.d(TAG, "Couldn't get certificate for host name verification"); } return false; diff --git a/app/src/main/res/drawable-land/link_text_background.xml b/app/src/main/res/drawable-land/link_text_background.xml deleted file mode 100644 index 9825cef..0000000 --- a/app/src/main/res/drawable-land/link_text_background.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/forward_24.xml b/app/src/main/res/drawable/forward_24.xml deleted file mode 100644 index 6da3fec..0000000 --- a/app/src/main/res/drawable/forward_24.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_check_circle_outlined.xml b/app/src/main/res/drawable/ic_check_circle_outlined.xml deleted file mode 100644 index f34aa6f..0000000 --- a/app/src/main/res/drawable/ic_check_circle_outlined.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/ic_user_status_away.xml b/app/src/main/res/drawable/ic_user_status_away.xml index 1f7a59a..c5c776d 100644 --- a/app/src/main/res/drawable/ic_user_status_away.xml +++ b/app/src/main/res/drawable/ic_user_status_away.xml @@ -1,15 +1,19 @@ + android:autoMirrored="true" + android:viewportWidth="24" + android:viewportHeight="24" + tools:ignore="VectorRaster"> + android:fillColor="#f4a331" + android:pathData="m10.615,2.1094c-4.8491,0.6811 -8.6152,4.8615 -8.6152,9.8906 0,5.5 4.5,10 10,10 5.0292,0 9.2096,-3.7661 9.8906,-8.6152 -1.4654,1.601 -3.5625,2.6152 -5.8906,2.6152 -4.4,0 -8,-3.6 -8,-8 0,-2.3281 1.0143,-4.4252 2.6152,-5.8906z" /> diff --git a/app/src/main/res/drawable/ic_user_status_busy.xml b/app/src/main/res/drawable/ic_user_status_busy.xml deleted file mode 100644 index d472086..0000000 --- a/app/src/main/res/drawable/ic_user_status_busy.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_user_status_dnd.xml b/app/src/main/res/drawable/ic_user_status_dnd.xml index d57be6a..a7a0f99 100644 --- a/app/src/main/res/drawable/ic_user_status_dnd.xml +++ b/app/src/main/res/drawable/ic_user_status_dnd.xml @@ -1,15 +1,25 @@ + android:autoMirrored="true" + android:viewportWidth="24" + android:viewportHeight="24" + tools:ignore="VectorRaster"> + android:fillColor="#ed484c" + android:pathData="m12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10 10,-4.48 10,-10 -4.48,-10 -10,-10z" /> + diff --git a/app/src/main/res/drawable/ic_user_status_invisible.xml b/app/src/main/res/drawable/ic_user_status_invisible.xml index 954e489..f9afdb8 100644 --- a/app/src/main/res/drawable/ic_user_status_invisible.xml +++ b/app/src/main/res/drawable/ic_user_status_invisible.xml @@ -1,15 +1,19 @@ + android:autoMirrored="true" + android:viewportWidth="24" + android:viewportHeight="24" + tools:ignore="VectorRaster"> + android:fillColor="#000000" + android:pathData="m12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10 10,-4.48 10,-10 -4.48,-10 -10,-10zM12,6a6,6 0,0 1,6 6,6 6,0 0,1 -6,6 6,6 0,0 1,-6 -6,6 6,0 0,1 6,-6z" /> diff --git a/app/src/main/res/drawable/link_text_background.xml b/app/src/main/res/drawable/link_text_background.xml deleted file mode 100644 index 2b225d7..0000000 --- a/app/src/main/res/drawable/link_text_background.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/link_text_no_preview_background.xml b/app/src/main/res/drawable/link_text_no_preview_background.xml deleted file mode 100644 index 55346cd..0000000 --- a/app/src/main/res/drawable/link_text_no_preview_background.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - - - - diff --git a/app/src/main/res/drawable/online_status.xml b/app/src/main/res/drawable/online_status.xml index 392a28a..4d60e47 100644 --- a/app/src/main/res/drawable/online_status.xml +++ b/app/src/main/res/drawable/online_status.xml @@ -2,15 +2,19 @@ + android:autoMirrored="true" + android:viewportWidth="24" + android:viewportHeight="24" + tools:ignore="VectorRaster"> + android:fillColor="#49b382" + android:pathData="m12,2c-5.52,0 -10,4.48 -10,10s4.48,10 10,10 10,-4.48 10,-10 -4.48,-10 -10,-10z" /> + diff --git a/app/src/main/res/drawable/online_status_with_border.xml b/app/src/main/res/drawable/online_status_with_border.xml new file mode 100644 index 0000000..bee74be --- /dev/null +++ b/app/src/main/res/drawable/online_status_with_border.xml @@ -0,0 +1,15 @@ + + + + + + + diff --git a/app/src/main/res/drawable/outline_forum_24.xml b/app/src/main/res/drawable/outline_forum_24.xml deleted file mode 100644 index 500206a..0000000 --- a/app/src/main/res/drawable/outline_forum_24.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/outline_notifications_active_24.xml b/app/src/main/res/drawable/outline_notifications_active_24.xml deleted file mode 100644 index 9f73730..0000000 --- a/app/src/main/res/drawable/outline_notifications_active_24.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - diff --git a/app/src/main/res/drawable/outline_qr_code_24.xml b/app/src/main/res/drawable/outline_qr_code_24.xml deleted file mode 100644 index 6686eb4..0000000 --- a/app/src/main/res/drawable/outline_qr_code_24.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - diff --git a/app/src/main/res/drawable/reply_background.xml b/app/src/main/res/drawable/reply_background.xml deleted file mode 100644 index d750b2e..0000000 --- a/app/src/main/res/drawable/reply_background.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout-land/reference_inside_message.xml b/app/src/main/res/layout-land/reference_inside_message.xml deleted file mode 100644 index 475f50c..0000000 --- a/app/src/main/res/layout-land/reference_inside_message.xml +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/activity_conversation_info.xml b/app/src/main/res/layout/activity_conversation_info.xml index 2663a8d..4f1b702 100644 --- a/app/src/main/res/layout/activity_conversation_info.xml +++ b/app/src/main/res/layout/activity_conversation_info.xml @@ -249,32 +249,6 @@ android:textSize="@dimen/two_line_primary_text_size" /> - - - - - - - - - - - + app:layout_constraintTop_toTopOf="parent" /> - - + android:background="@color/grey950"> - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_attachment.xml b/app/src/main/res/layout/dialog_attachment.xml index 0f6895b..a194601 100644 --- a/app/src/main/res/layout/dialog_attachment.xml +++ b/app/src/main/res/layout/dialog_attachment.xml @@ -203,39 +203,6 @@ android:layout_marginEnd="16dp" android:background="@color/low_emphasis_text"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + - + - + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_set_online_status.xml b/app/src/main/res/layout/dialog_set_online_status.xml deleted file mode 100644 index ea2498a..0000000 --- a/app/src/main/res/layout/dialog_set_online_status.xml +++ /dev/null @@ -1,379 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/dialog_set_status.xml b/app/src/main/res/layout/dialog_set_status.xml new file mode 100644 index 0000000..fc03b9e --- /dev/null +++ b/app/src/main/res/layout/dialog_set_status.xml @@ -0,0 +1,463 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/dialog_set_status_message.xml b/app/src/main/res/layout/dialog_set_status_message.xml deleted file mode 100644 index 84b3e16..0000000 --- a/app/src/main/res/layout/dialog_set_status_message.xml +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/layout/fragment_message_input.xml b/app/src/main/res/layout/fragment_message_input.xml index 7507959..f4fd43f 100644 --- a/app/src/main/res/layout/fragment_message_input.xml +++ b/app/src/main/res/layout/fragment_message_input.xml @@ -42,14 +42,6 @@ android:layout_marginEnd="6dp"> - - - ~ SPDX-FileCopyrightText: 2022 Marcel Hibbe + ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic ~ SPDX-License-Identifier: GPL-3.0-or-later --> @@ -65,14 +65,9 @@ app:layout_wrapBefore="true" tools:text="Talk to you later!" /> - - - + - - - - - - - - + ~ SPDX-FileCopyrightText: 2022 Marcel Hibbe + ~ SPDX-FileCopyrightText: 2021 Andy Scherzinger ~ SPDX-FileCopyrightText: 2017-2018 Mario Danic ~ SPDX-License-Identifier: GPL-3.0-or-later --> @@ -44,14 +44,9 @@ android:textIsSelectable="false" tools:text="Talk to you later!" /> - - - + - - - - - - - - + + - - - - - - - - diff --git a/app/src/main/res/layout/predefined_status.xml b/app/src/main/res/layout/predefined_status.xml index 7b75d2c..3cf01da 100644 --- a/app/src/main/res/layout/predefined_status.xml +++ b/app/src/main/res/layout/predefined_status.xml @@ -6,70 +6,61 @@ ~ SPDX-FileCopyrightText: 2020 Tobias Kaminsky ~ SPDX-License-Identifier: GPL-3.0-or-later --> - + android:layout_height="wrap_content" + android:orientation="horizontal"> + + - - + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingTop="8dp" + android:paddingBottom="4dp"> - - - - \ No newline at end of file + + diff --git a/app/src/main/res/layout/reactions_inside_message.xml b/app/src/main/res/layout/reactions_inside_message.xml index 4a07941..ea083ff 100644 --- a/app/src/main/res/layout/reactions_inside_message.xml +++ b/app/src/main/res/layout/reactions_inside_message.xml @@ -5,31 +5,20 @@ ~ SPDX-FileCopyrightText: 2022 Marcel Hibbe ~ SPDX-License-Identifier: GPL-3.0-or-later --> - + android:layout_alignParentTop="true" + android:fillViewport="true" + android:measureAllChildren="false" + android:scrollbars="none"> - - - - - - - \ No newline at end of file + android:layout_marginTop="@dimen/standard_half_margin" + android:gravity="center_vertical" + android:orientation="horizontal" /> + diff --git a/app/src/main/res/layout/reference_inside_message.xml b/app/src/main/res/layout/reference_inside_message.xml index 1414d9c..a90a6c2 100644 --- a/app/src/main/res/layout/reference_inside_message.xml +++ b/app/src/main/res/layout/reference_inside_message.xml @@ -2,86 +2,80 @@ + android:layout_marginTop="5dp"> - + + - + android:layout_below="@id/referenceName" + android:layout_marginStart="10dp" + android:ellipsize="end" + android:lineSpacingMultiplier="1.2" + android:maxLines="2" + android:textAlignment="viewStart" + android:textIsSelectable="false" + android:visibility="gone" + tools:text="Description of Website" + tools:visibility="visible" /> - + - - - - - - - + + \ No newline at end of file diff --git a/app/src/main/res/layout/view_message_input.xml b/app/src/main/res/layout/view_message_input.xml index 6bca893..3f021f6 100644 --- a/app/src/main/res/layout/view_message_input.xml +++ b/app/src/main/res/layout/view_message_input.xml @@ -225,16 +225,6 @@ android:src="@drawable/ic_baseline_mic_24" android:contentDescription="@string/nc_description_record_voice" /> - - - + xmlns:app="http://schemas.android.com/apk/res-auto"> + app:showAsAction="ifRoom"> + + + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="ifRoom" /> + app:showAsAction="never" /> - - + app:showAsAction="never" /> diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml index b4aa47e..edfaf2c 100644 --- a/app/src/main/res/values-ar/strings.xml +++ b/app/src/main/res/values-ar/strings.xml @@ -5,7 +5,6 @@ إضافة إلى الملاحظات إضافة المحادثة %1$sإلى المُفضّلة بحث في %s - الحالة غير متصل أرشفة المحادثة رد أرشفة محادثة، سيتم إخفاؤها افتراضياً. حدِّد الفلتر \"مُؤرشَفة\" لعرض المحادثات المؤرشفة. الإشارات المباشرة ستظل قابلة ليُشار إليها حتى بعد الأرشفة. مؤرشفة @@ -22,7 +21,6 @@ حظر حظر مشارك قائمة المحظورين - مشغول التقويم Calendar خيارات الاتصال المتقدمة المكالمة ما زالت مستمرة منذ حوالي الساعة. @@ -58,7 +56,6 @@ حدثت مشكلة أثناء رفع دردشاتك حدث خطأ عند محاولة رفع الحظر عن مشارك تعذّر حفظ %1$s - 15 دقيقة مُجلّد التحميل جارٍ … %1$s (%2$d) @@ -92,7 +89,6 @@ أكتب هنا للبحث … بحث … الرسائل - عدم إظهار جميع التنبيهات تم استيراد الحساب المحدد وهو متاح الآن عن مستخدِم نشط @@ -176,7 +172,7 @@ حذف الكل احذف المحادثة إذا قمت بحذف المحادثة، سوف يتم حذفها أيضًا لدى المشاركين الآخرين. - إحْذِفِ الرسالة + حذف تم حذف الرسالة بنجاح، لكن من الممكن أن تم تسريبها لخدمات أخرى تمّ حذف المستخدِم %1$s تخفيض رتبة مشرف @@ -513,9 +509,6 @@ الأسبوع القادم لم يتم حفظ أي رسائل غير متصلة بالإنترنت لا ارتباط لرقم الهاتف بسبب أذونات ناقصة - \@-إشارة فقط - معطل - التلقائي 1 ساعة مُتّصلٌ حالة الاتصال @@ -618,7 +611,6 @@ هذا الأسبوع هذه رسالة اختبار نهاية هذا الأسبوع - الرَّدّ اليوم غدا ترجِم diff --git a/app/src/main/res/values-ast/strings.xml b/app/src/main/res/values-ast/strings.xml index 792b9a7..289e624 100644 --- a/app/src/main/res/values-ast/strings.xml +++ b/app/src/main/res/values-ast/strings.xml @@ -5,7 +5,6 @@ Amestar a Notes La conversación «%1$s» metióse en Favoritos Buscar en: %s - Apaecer desconectáu Archivóse Bluetooth Salida d\'audiu @@ -15,7 +14,6 @@ L\'estáu afitóse automáticamente Avatar Ausente - Ocupáu Calendariu Concedióse\'l permisu de la cámara. Volvi escoyer la cámara. Escoyer un avatar de la nube @@ -39,7 +37,6 @@ Finar la llamada Hebo un problema al cargar les charres Nun se pue guardar «%1$s» - 15 minutos carpeta Cargando… %1$s (%2$d) @@ -64,7 +61,6 @@ Nun hai nengún resultáu de la busca Buscar… Mensaxes - Desactivar tolos avisos Tocante a Usuariu activu Amestar una cuenta @@ -118,7 +114,7 @@ Desanciar too Desaniciar la conversación Si desanicies la conversación, tamién la desanicies pa los demás participantes. - Desaniciar el mensaxe + Desaniciar Unviar el mensaxe Cuenta actual Srividor @@ -276,9 +272,6 @@ Webinariu Sí La selmana que vien - Tolos mensaxes - Non - Por defeutu 1 hora En llinia Estáu en llinia @@ -335,7 +328,6 @@ Esta selmana Esto ye un mensaxe de prueba Esta fin de selmana - Responder Güei Mañana Traducir diff --git a/app/src/main/res/values-b+en+001/strings.xml b/app/src/main/res/values-b+en+001/strings.xml index 5f8ebb7..aa8d0b9 100644 --- a/app/src/main/res/values-b+en+001/strings.xml +++ b/app/src/main/res/values-b+en+001/strings.xml @@ -5,7 +5,6 @@ Add to Notes Added conversation %1$s to favourites Search in %s - Appear offline Archive conversation Once a conversation is archived, it will be hidden by default. Select the filter \"Archived\" to view archived conversations. Direct mentions will still be received. Archived @@ -23,7 +22,6 @@ Ban Ban participant Bans list - Busy Calendar Advanced call options Note: the call has been going on for an hour already. @@ -63,11 +61,9 @@ There was a problem loading your chats Error occurred when unbanning participant Failed to save %1$s - 15 minutes folder Loading … %1$s (%2$d) - Followed threads 4 hours Failed to fetch pending invitations (edited) @@ -80,10 +76,6 @@ You left the conversation %1$s Load more results Local time: %1$s - Location permission denied - Please enable it in the app settings - Location services disabled - Please enable location services (GPS) to use this feature Lock conversation Lock symbol Lower hand @@ -97,7 +89,6 @@ Biggest first Smallest first Message copied - Are you sure you want to delete this message? Message deleted by you Edited by %1$s Tap to open poll @@ -105,7 +96,7 @@ Start typing to search … Search … Messages - Mute all notifications + Messages could not be loaded Selected account is now imported and available About Active user @@ -190,7 +181,7 @@ Delete all Delete conversation If you delete the conversation, it will also be deleted for all other participants. - Delete message + Delete Message deleted successfully, but it might have been leaked to other services Delete now User %1$s was removed @@ -435,6 +426,7 @@ %1$s sent a deck card Test server connection Please upgrade your %1$s database + Unable to connect to server Failed to import selected account The link to your %1$s web interface when you open it in the browser. Import account from the %1$s app @@ -554,11 +546,6 @@ No archived conversations No offline messages saved No phone number integration due to missing permissions - All messages - \@-mentions only - Off - Default - Follow conversation settings 1 hour Online Online status @@ -568,6 +555,7 @@ Go to thread Play/pause voice message Playback speed control + Please continue the login process in the browser Add option Edit vote End poll @@ -645,9 +633,10 @@ Voice Show ban reason Show banned participants + Show threads Favourite You are not allowed to start a call - Create a thread + Start a thread started a call Status message Status Reverted @@ -667,8 +656,7 @@ This is a test message This weekend Cancel thread creation - Thread notifications - Reply + %1$d replies Thread title Today Tomorrow @@ -715,10 +703,6 @@ This conversation will be automatically deleted for everyone in %1$d day of no activity This conversation will be automatically deleted for everyone in %1$d days of no activity - - %d reply - %d replies - %d vote %d votes diff --git a/app/src/main/res/values-be/strings.xml b/app/src/main/res/values-be/strings.xml deleted file mode 100644 index faa77d0..0000000 --- a/app/src/main/res/values-be/strings.xml +++ /dev/null @@ -1,683 +0,0 @@ - - - Рэдагаваць - Дадаць - Дадаць да Нататак - Размова %1$s дададзена ў абранае - Пошук у %s - Паказваць \"Па-за сеткай\" - Архіваваць размову - Пасля архівавання размова будзе прадвызначана схавана. Выберыце фільтр \"Архіваванае\", каб праглядзець архіваваныя размовы. Прамыя згадкі ўсё роўна будуць атрыманыя. - Архіваванае - Архівавана %1$s - Аўдыявыклік - Bluetooth - Аўдыявыхад - Тэлефон - Дынамік - Правадная гарнітура - Ваш статус будзе зададзены аўтаматычна - Аватар - Адышоў - Кнопка назад - Заблакіраваць - Заблакіраваць удзельніка - Спіс блакіроўвак - Заняты - Каляндар - Дадатковыя опцыі выкліку - Выклік доўжыцца ўжо гадзіну - Выклік без апавяшчэння - Дазвол на камеру атрыманы. Выберыце камеру яшчэ раз. - Скасаваць уваход - Выбраць аватар з воблака - Ачысціць паведамленне статусу - Ачысціць паведамленне статусу пасля - Закрыць - Значок Закрыць - Злучэнне ўсталявана - Няма злучэння з серверам - Злучэнне страчана — адпраўленыя паведамленні пастаўлены ў чаргу - Блакіроўка запісу для бесперапыннага запісу галасавога паведамлення - Размова архівавана - Размова у рэжыме \"толькі для чытання\" - Не атрымалася перавесці размову ў рэжым \"толькі для чытання\" - Размовы - Стварыць размову - Стварыць справаздачу - Уласны - Небяспечная зона - %1$s у %2$s - Выдаліць аватар - Выдаліць галасавы запіс - Выдалена размова %1$s - Не турбаваць - Не ачышчаць - Рэдагаваць - Паведамленні, старэйшыя за 24 гадзіны, нельга рэдагаваць - Рэдагаваць паведамленне - Нядаўнія - Зашыфравана - Завяршыць выклік - Завяршыць выклік для ўсіх - Узнікла праблема з загрузкай вашых чатаў - Адбылася памылка пры разблакіраванні ўдзельніка - Не ўдалося захаваць %1$s - 15 хвілін - папка - Загрузка … - %1$s (%2$d) - 4 гадзіны - Не ўдалося атрымаць запрашэнні, якія чакаюць разгляду - (адрэдагавана) - Унутраная заўвага - Нябачны - Не ўдалося атрымаць мовы - Памылка атрымання - Пазней сёння - Выйсці з выкліку - Вы выйшлі з размовы %1$s - Загрузіць больш вынікаў - Мясцовы час: %1$s - Няма доступу да геалакацыі - Уключыце яго ў наладах праграмы - Службы геалакацыі адключаны - Каб карыстацца гэтай функцыяй, уключыце службы геалакацыі (GPS) - Заблакіраваць размову - Сімвал блакіроўкі - Апусціць руку - Размова %1$s пазначана як прачытаная - Размова %1$s пазначана як непрачытаная - Спачатку новыя - Спачатку старыя - А-Я - Я-А - Спачатку вялікія - Спачатку малыя - Паведамленне скапіявана - Вы ўпэўнены, што хочаце выдаліць гэта паведамленне? - Вы выдалілі паведамленне - Адрэдагаваў(-ла) %1$s - Націсніце, каб адкрыць апытанне - Няма вынікаў пошуку - Пачніце ўводзіць тэкст для пошуку … - Пошук ... - Паведамленні - Адключыць усе апавяшчэнні - Выбраны ўліковы запіс імпартаваны і даступны - Аб праграме - Актыўны карыстальнік - Дадаць уліковы запіс - Запланавана выдаленне ўліковага запісу і таму ён не можа быць зменены - Адкрыць галоўнае меню - Дадаць далучэнне - Дадаць эмодзі - Дадаць да размовы - Дадаць удзельнікаў - У абранае - ОК, усё гатова! - Разблакіраваць %1$s - Каб уключыць Bluetooth дынамікі, дайце доступ да \"Прылад паблізу\". - Прыняць як відэавыклік - Прыняць як галасавы выклік - Змяніць аўдыявыхад - Укл./выкл. камеру - Пакласці слухаўку - Укл./выкл. мікрафон - Пераключыцца на відэа з сабой - УВАХОДНЫ - Назва размовы - Апавяшчэнні аб выкліках - %1$s падняў(-ла) руку - Перазлучэнне ... - ВЫКЛІК - %1$s у выкліку - %1$s з тэлефонам - %1$s з відэа - Няма адказу на працягу 45 секунд, націсніце, каб паспрабаваць яшчэ раз - %s, выклік - %s, відэавыклік - %s, галасавы выклік - Каб уключыць відэасувязь, дайце дазвол на доступ да камеры. - Скасаваць - Не ўдалося атрымаць магчымасці, скасаванне - Подпіс - Ці давяраеце вы дагэтуль невядомаму SSL-сертыфікату, выдадзенаму %1$s для %2$s, які дзейнічае з %3$s да %4$s? - Праверка сертыфіката - Ваша канфігурацыя SSL перашкодзіла злучэнню - Змяніць сертыфікат аўтэнтыфікацыі - Змяніць пароль - Скасаваць рэдагаванне - Скасаваць рэдагаванне - Выдаліць усе паведамленні - Усе паведамленні былі выдалены - Вы сапраўды хочаце выдаліць усе паведамленні ў гэтай размове? - Змяніць сертыфікат кліента - Наладзіць сертыфікат кліента - і - Капіяваць - Скапіявана ў буфер абмену - Стварыць - Адключана - Адхіліць - Нешта пайшло не так! - Больш параметраў - Задаць - Прапусціць - Невядомы - Выберыце сертыфікат аўтэнтыфікацыі - Злучэнне … - Гатова - Апісанне размовы - Інфармацыя пра размову - Відэавыклік - Галасавы выклік - Размова не знойдзена - Налады размовы - Далучайцеся да размовы або пачніце новую - Прывітайцеся з сябрамі і калегамі! - Капіяваць - Стварыць новую размову - Стварыць апытанне - Вы: - Сёння - Учора - Выдаліць - Выдаліць усе - Выдаліць размову - Калі вы выдаліце ​​размову, яна будзе выдалена і для ўсіх астатніх удзельнікаў. - Выдаліць паведамленне - Паведамленне паспяхова выдалена, але яно магло трапіць у іншыя сэрвісы - Выдаліць зараз - Карыстальнік %1$s быў выдалены - Запісаць галасавое паведамленне - Адправіць паведамленне - Бягучы ўліковы запіс - Сервер - Ці ўсталявана на серверы праграма для апавяшчэнняў? - Карыстальнік - Статус карыстальніка ўключаны? - Версія Android - Праграма - Назва праграмы - Зарэгістраваныя карыстальнікі - Версія праграмы - Аптымізацыя батарэі ігнаруецца, усё добра - Аптымізацыя батарэі ўключана, што можа выклікаць праблемы. Вам варта адключыць аптымізацыю батарэі! - Налады батарэі - Прылада - Адкрыць кантрольны спіс вырашэння праблем - Адкрыць экран дыягностыкі - Адкрыць dontkillmyapp.com - Сэрвісы Google Play недаступны. Апавяшчэнні не падтрымліваюцца - Сэрвісы Google Play - Сэрвісы Google Play даступны - Пакуль не зарэгістраваны на серверы - Метаінфармацыя - Стварэнне сістэмнай справаздачы - Канал апавяшчэнняў аб выкліках уключаны? - Дазволы на апавяшчэнні - Тэлефон - Версія сервера Talk - Версія сервера - Знешні - Унутраны - Рэжым сігналізацыі - Няправільны пароль - Сервер знаходзіцца ў рэжыме тэхнічнага абслугоўвання. - Праграма састарэла - Праграма занадта старая і больш не падтрымліваецца гэтым серверам. Абнавіце яе. - Абнавіць - Вы хочаце паўторна аўтарызавацца ці выдаліць гэты ўліковы запіс? - Захаванне гэтага медыяфайла ў сховішчы дазволіць любым іншым праграмам на вашай прыладзе атрымаць да яго доступ. - Працягнуць? - Не - Захаваць у сховішча? - Так - Рэдагаваць - Рэдагаваць - Рэдагаваць паведамленне - Адрэдагавана адміністратарам - Меню размовы пра падзею - Расклад - 8 гадзін - 4 тыдні - Выкл. - 1 дзень - 1 гадзіна - 1 тыдзень - Тэрмін дзеяння паведамленняў - Тэрмін дзеяння паведамленняў у чаце можа скончыцца праз пэўны час. Заўвага: файлы, абагуленыя ў чаце, не будуць выдалены для ўладальніка, але больш не будуць абагулены ў размове. - Прыняць - Адхіліць - ад %1$s у %2$s - Няма запрашэнняў у чаканні - У вас ёсць запрашэнні ў чаканні - Назад - Патрабуецца дазвол на доступ да файлаў - Фільтраваць размовы - Вы: %1$s - Пераслаць - Пераслаць … - Галерэя - Атрымаць зыходны код - Група - Госць - Гасцявы доступ - Немагчыма ўключыць/выключыць гасцявы доступ. - Дазволіць гасцей, каб абагульваць публічную спасылку для далучэння да гэтай размовы. - Дазволіць гасцей - Увядзіце пароль - Пароль гасцявога доступу - Памылка падчас задання/адключэння пароля. - Задайце пароль, каб абмежаваць, хто можа карыстацца публічнай спасылкай. - Абарона паролем - Адправіць запрашэнні паўторна - Запрашэнні не былі адпраўлены з-за памылкі. - Запрашэнні былі адпраўлены зноў. - Абагуліць спасылку на размову - Увядзіце паведамленне … - Аптымізацыя батарэі не ігнаруецца. Гэта трэба змяніць, каб апавяшчэнні працавалі ў фонавым рэжыме! Націсніце \"ОК\" і выберыце \"Усе праграмы\" -> %1$s -> \"Не аптымізаваць\" - Ігнараваць аптымізацыю батарэі - Важная размова - Статус карыстальніка \"Не турбаваць\" ігнаруецца падчас важных размоў - Памылковы час - Запрашэнні - Далучыцца да адкрытых размоў - Пакінуць - %1$s | Апошняе змяненне: %2$s - Выйсці з размовы - Выхад з выкліку … - Агульная публічная ліцэнзія GNU, версія 3 - Ліцэнзія - Дасягнуты ліміт у %s сімвалы(-аў) - Лобі - Гэта сустрэча запланавана на %1$s - Сустрэча неўзабаве пачнецца - Вы зараз чакаеце ў лобі. - Ваша бягучае месцазнаходжанне - патрэбны доступ да геалакацыі - Месцазнаходжанне невядома - Заблакіравана - Націсніце, каб разблакіраваць - Не зададзена - Пазначыць як прачытанае - Пазначыць як непрачытанае - Размова пазначана як важная - З размовы знята пазнака сакрэтнасці - Размова пазначана як сакрэтная - Пазнака важнасці размовы скасавана - Сустрэча завершана - Паведамленне дададзена ў нататкі - Не ўдалося - Не атрымалася адправіць паведамленне: - Па-за сеткай - Скасаваць адказ - Паведамленне прачытана - Адпраўка - Паведамленне адпраўлена - Мікрафон уключаны, і гук запісваецца - Каб уключыць галасавую сувязь, дайце дазвол на доступ да мікрафона. - Вы прапусцілі выклік ад %s - Мадэратар - Новая размова - Бачнасць - Непрачытаныя згадкі - Непрачытаныя паведамленні - %1$s недаступна (не ўсталявана або абмежавана адміністратарам) - Госць - Не - Няма адкрытых размоў - Няма адкрытых размоў, да якіх вы можаце далучыцца.\nАбо адкрытых размоў няма, або вы ўжо далучыліся да ўсіх з іх. - Няма проксі - Вам не дазволена ўключаць гук! - Вам не дазволена ўключаць відэа! - Не цяпер - Выклікі - Апавяшчаць пры ўваходных выкліках - Паведамленні - Апавяшчаць пры ўваходных паведамленнях - Запампоўванні - Апавяшчаць пра ход выканання запампоўвання - Налады апавяшчэнняў - Апавяшчэнні наладжаны няправільна - Вырашэнне праблем з апавяшчэннямі - Заўсёды апавяшчаць - Апавяшчаць пры згадванні - Ніколі не апавяшчаць - Вы па-за сеткай, праверце падключэнне - OK - Бягучая сустрэча - Адкрыць размову для зарэгістраваных карыстальнікаў - Таксама адкрыта для гасцей - Уладальнік - Удзельнікі - Дадаць удзельнікаў - Пароль - Задаць дазволы - Некаторыя дазволы былі адхілены. - Дайце дазволы - Адкрыць налады - Дайце дазволы ў раздзеле \"Налады\" > \"Дазволы\" - Уліковы запіс не знойдзены - Чат праз %s - Выключыць мікрафон - Уключыць мікрафон - Паведамленні - Прыватнасць - Асабістыя звесткі - Публічная размова - Push-апавяшчэнні адключаны - Нешта пайшло не так, памылка: %1$s - Нешта пайшло не так, не ўдалося атрымаць тэставае push-паведамленне - Push-апавяшчэнне паспяхова адпраўлена. Цяпер вы павінны атрымацьна гэтай прыладзе апавяшчэнне з назвай \"Тэставае push-апавяшчэнне\". - Націсні і гавары - Калі мікрафон адключаны, націсніце і ўтрымлівайце, каб выкарыстоўваць функцыю «Націсні і гавары» - Нагадаць пазней - Выдаліць з абранага - Выдаліць групу і ўдзельнікаў - Выдаліць удзельніка - Выдаліць пароль - Выдаліць каманду і членаў - Перайменаваць размову - Перайменаваць - Адказаць - Адказаць прыватна - Пакой паспяхова захаваны - Захаваць - Паспяхова захавана - 30 секунд - 5 хвілін - 1 хвіліна - 10 хвілін - Неадкладна - 600 - 60 - 30 - 300 - Пошук - Ачысціць пошук - Выберыце ўліковы запіс - Абнавіць паведамленне - Адправіць галасавы запіс - Сакрэтная размова - Перадпрагляд паведамленняў будзе адключаны ў спісе размоў і апавяшчэннях - %1$s адправіў(-ла) GIF. - Вы адправілі GIF. - %1$s адправіў(-ла) відэа. - Вы адправілі відэа. - %1$s адправіў(-ла) аўдыя. - Вы адправілі аўдыя. - %1$s адправіў(-ла) відарыс. - Вы адправілі відарыс. - Праверыць злучэнне з серверам - Абнавіце базу даных %1$s - Не ўдалося імпартаваць выбраны ўліковы запіс - Спасылка на вэб-інтэрфейс %1$s пры адкрыцці ў браўзеры. - Імпартаваць уліковы запіс з праграмы %1$s - Імпартаваць уліковы запіс - Імпартаваць уліковыя запісы з праграмы %1$s - Імпартаваць уліковыя запісы - Выведзіце %1$s з рэжыму тэхнічнага абслугоўвання - Звяршыце ўсталяванне %1$s - Праверка злучэння - На серверы не ўсталявана праграма Talk, якая падтрымліваецца - Адрас сервера https://… - %1$s працуе толькі з %2$s версіі 13 і вышэй - Задаць новы пароль - Задаць пароль - Налады - Быў абноўлены ваш існуючы ўліковы запіс замест дадавання новага - Пашыраныя - Знешні выгляд - Выклікі - Звярніцеся да адміністратара - Адкрыйце экран дыягностыкі, каб праверыць налады або стварыць справаздачу пра памылку - Дыягностыка - Дае каманду клавіятуры адключыць персаналізаванае навучанне (без гарантый) - Клавіятура інкогніта - Няма гуку - Праграма Talk не ўсталявана на серверы, на якім вы спрабавалі прайсці аўтэнтыфікацыю - Апавяшчэнні - Апавяшчэнні адхілены - Апавяшчэнні дазволены - Паведамленні - Супастаўленне кантактаў па нумары тэлефона для інтэграцыі хуткага доступу да Talk у сістэмную праграму кантактаў - Памылка 429: занадта шмат запытаў - Вы можаце задаць свой нумар тэлефона, каб іншыя карыстальнікі маглі вас знайсці - Увядзіце нумар тэлефона - Памылковы нумар тэлефона - Нумар тэлефона паспяхова зададзены - Нумар тэлефона - Інтэграцыя нумара тэлефона - Прыватнасць - Хост проксі - Пароль проксі - Порт проксі - Тып проксі - Імя карыстальніка проксі - Выдаліць - Выдаліць уліковы запіс - Час чакання блакіроўкі экрана пры бяздзейнасці - Блакіроўка экрана - Забараняе рабіць здымкі экрана ў спісе нядаўняга і ўнутры праграмы - Бяспека экрана - Версія сервера вельмі старая і не будзе падтрымлівацца ў наступным выпуску! - Версія сервера занадта старая і не падтрымліваецца гэтай версіяй праграмы для Android. - Сервер не падтрымліваецца - Цёмная - Сістэмная - тэма - Светлая - Тэма - Абагуліць мой статус набору тэксту і паказаць статус набору тэксту іншых - Статус набору тэксту даступны толькі пры выкарыстанні высокапрадукцыйнага бэкенда (HPB) - Статус набору тэксту - Проксі-сервер патрабуе ўліковых даных - Папярэджанне - Толькі бягучы ўліковы запіс можа быць перааўтарызаваны - Абагуліць кантакт - Патрабуецца дазвол на чытанне кантактаў - Абагуліць бягучае месцазнаходжанне - Абагуліць спасылку - Абагуліць месцазнаходжанне - Абагуліць гэта месцазнаходжанне - Выберыце ўліковы запіс - Абагуленыя элементы - Відарысы, файлы, галасавыя паведамленні… - Няма абагуленых элементаў - Месцазнаходжанне - Абагуленае месцазнаходжанне - Калі апавяшчэнні настроены няправільна, паказваць звычайнае папярэджанне - Паказваць звычайнае папярэджанне аб апавяшчэннях - Сартаваць па - Пачаць супольны чат - Час пачатку - Змяніць уліковы запіс - Каманда - Тэставае push-апавяшчэнне - Вынікі тэста - Сёння ў %1$s - Заўтра ў %1$s - Выберыце файлы - Адправіць гэтыя файлы карыстальніку %1$s? - Адправіць гэты файл карыстальніку %1$s? - Не ўдалося запампаваць - Не ўдалося запампаваць %1$s - Няўдача - Абагульванне ад %1$s - Запампаваць з прылады - Запампоўванне - %1$s у %2$s - %3$s\%% - Зрабіць фота - Зняць відэа - Карыстальнік - Відэазапіс ад %1$s - Запіс размовы ад %1$s (%2$s) - Утрымлівайце для запісу, адпусціце для адпраўкі. - Патрабуецца дазвол на аўдыязапіс - « Правядзіце пальцам, каб скасаваць - Вэбінар - Так - На наступным тыдні - Няма архіваваных размоў - Усе паведамленні - Толькі згадкі з @ - Выкл. - Прадвызначаныя - 1 гадзіна - У сетцы - Статус у сетцы - Адкрытыя размовы - Адкрыць у Файлах - Адкрыць Нататкі - Перайсці да гутаркі - Прайграць/прыпыніць галасавое паведамленне - Дадаць варыянт - Рэдагаваць голас - Завяршыць апытанне - Вы сапраўды хочаце завяршыць гэта апытанне? Гэта нельга адрабіць. - Вы не можаце прагаласаваць, выбраўшы больш варыянтаў для гэтага апытання. - Некалькі адказаў - Выдаліць варыянт %1$d - Варыянт %1$d - Варыянты - Прыватнае апытанне - Пытанне - Ваша пытанне - Вынікі - Налады - Галасаваць - Голас адпраўлены - Зададзены раней - Не ўдалося прачытаць QR-код - Падняць руку - Усе - Абагульванне файлаў са сховішча немагчыма без дазволаў - Нядаўнія гутаркі - Выклік запісваецца - Не ўдалося зрабіць запіс. Звярніцеся да адміністратара. - Пачаць запіс - Вы сапраўды хочаце спыніць запіс? - Спыніць запіс выкліку - Спыніць запіс - Спыненне запісу … - Для ўсіх выклікаў патрабуецца згода на запіс - Запіс можа ўключаць ваш голас, відэа з камеры і абагульванне экрана. Перад далучэннем да размовы патрэбна ваша згода. Вы даяце згоду? - Патрабаваць згоду на запіс перад далучэннем да выкліку ў гэтай размове - Згода на запіс - Выклік можа быць запісаны. - Запіс - Размова %1$s выдалена з абранага - Размова %1$s перайменавана - Адправіць паўторна - Скінуць статус - Немагчыма далучыцца да іншых пакояў падчас выкліку - Захаваць - Сканіраваць QR-код - Сінхранізацыя толькі з даверанымі серверамі - Федэратыўны - Змяніць узровень прыватнасці %1$s - Прагартаць уніз - Значок пошуку - с таму - Выбрана - Адправіць электронны ліст - Адправіць - Вам забаронена абагульваць змесціва ў гэтым чаце - Адправіць … - Адправіць без апавяшчэння - Задаць - Задаць аватар з камеры - Задаць статус - Задаць паведамленне статусу - Абагуліць - Далучайцеся да размовы %1$s у %2$s - Аўдыя - Файл - Медыя - Іншае - Апытанне - Запіс выкліку - Голас - Паказаць прычыну блакіроўкі - Паказаць заблакіраваных удзельнікаў - Абранае - Вам не дазволена пачынаць выклік - Стварыць гутарку - Паведамленне статусу - Статус вернуты - Пераключыцца на пакой для абмеркавання - Пераключыцца на галоўны пакой - Зрабіць фота - Памылка пры здымку - Немагчыма зрабіць фота без дазволаў - Зрабіць фота паўторна - Адправіць - Пераключыць камеру - Абрэзаць фота - Зменшыць памер відарыса - Уключыць/выключыць ліхтарык - 30 хвілін - На гэтым тыдні - Гэта тэставае паведамленне - У гэты ўік-энд - Скасаваць стварэнне гутаркі - Апавяшчэнні гутаркі - Адказаць - Загаловак гутаркі - Гутарак не знойдзена - Сёння - Заўтра - Перакласці - Пераклад - Скапіяваць перакладзены тэкст - Вызначыць мову - Налады прылады - Не ўдалося вызначыць мову - Не ўдалося перакласці - З - На - і яшчэ 1 пішуць … - пішуць … - піша … - і яшчэ %1$s пішуць … - Разархіваваць размову - Пасля таго, як размова будзе разархівавана, яна зноў будзе прадвызначана паказвацца. - Разархівавана %1$s - Разблакіраваць - Непрачытанае - Запампаваць новы аватар з прылады - %1$s сёння не на працы і можа не адказаць - %1$s сёння не на працы - Замена: - Аватар карыстальніка - Адрас - Поўнае імя - Электронная пошта - Нумар тэлефона - Twitter - Вэб-сайт - Статус - Дадайце імя, аватар і кантактную інфармацыю на старонку вашага профілю. - Відэавыклік - Які ў вас статус? - - Гэтая размова будзе аўтаматычна выдалена для ўсіх праз %1$d дзень бяздзейнасці. - Гэтая размова будзе аўтаматычна выдалена для ўсіх праз %1$d дні бяздзейнасці. - Гэтая размова будзе аўтаматычна выдалена для ўсіх праз %1$d дзён бяздзейнасці. - Гэтая размова будзе аўтаматычна выдалена для ўсіх праз %1$d дзён бяздзейнасці. - - - %d адказ - %d адказы - %d адказаў - %d адказаў - - - %d голас - %d галасы - %d галасоў - %d галасоў - - diff --git a/app/src/main/res/values-bg-rBG/strings.xml b/app/src/main/res/values-bg-rBG/strings.xml index 9245474..a5183c2 100644 --- a/app/src/main/res/values-bg-rBG/strings.xml +++ b/app/src/main/res/values-bg-rBG/strings.xml @@ -12,7 +12,6 @@ Състоянието ви беше зададено автоматично Аватар Винаги - Зает Kалендар Разширени опции за повикване Обаждане без известие @@ -36,7 +35,6 @@ Прекратяване на разговора за всички Имаше проблем със зареждането на вашите чатове Неуспешно записване %1$s - 15 минути папка Зареждане … %1$s (%2$d) @@ -137,7 +135,7 @@ Изтриване на всички Изтриване на разговора Ако изтриете разговора, той ще бъде изтрит и за всички останали участници. - Изтриване на съобщението + Изтрий Съобщението е изтрито успешно, но може да е изтекло към други услуги Понижаване от модератор Запис на гласово съобщение @@ -396,10 +394,6 @@ Да Следваща седмица Няма интеграция на телефонен номер поради липсващи права - Всички съобщения - \@-само споменавания - Изключен - По подразбиране 1 час На линия Състояние diff --git a/app/src/main/res/values-ca/strings.xml b/app/src/main/res/values-ca/strings.xml index 244c33e..f743377 100644 --- a/app/src/main/res/values-ca/strings.xml +++ b/app/src/main/res/values-ca/strings.xml @@ -5,7 +5,6 @@ Afegeix-ho a les notes S\'ha afegit la conversa %1$s als preferits Cerca a %s - Apareixeu fora de línia Arxivar la conversa Un cop arxivada una conversa, s\'ocultarà per defecte. Seleccioneu el filtre \"Arxivada\" per a veure les converses arxivades. Es continuaran rebent les mencions directes. Arxivat @@ -23,7 +22,6 @@ Prohibeix Prohibeix el participant Llista de prohibicions - Ocupat Calendari Opcions avançades de trucada La trucada porta una hora en marxa. @@ -61,7 +59,6 @@ S\'ha produït un problema carregant els xats S\'ha produït un error en anul·lar la prohibició del participant No s\'ha pogut desar %1$s - 15 minuts carpeta Carregant … %1$s (%2$d) @@ -95,7 +92,6 @@ Comença a escriure per cercar … Cerca … Missatges - Silencieu totes les notificacions El compte que heu seleccionat s\'ha importat i ja és disponible Quant a Usuari actiu @@ -179,7 +175,7 @@ Suprimir-ho tot Suprimir la conversa Al suprimir la conversa, també serà suprimit per a la resta de participants. - Suprimeix el missatge + Suprimir El missatge s\'ha suprimit correctament, però podria haver-se filtrat a altres serveis S\'ha suprimit l\'usuari %1$s Deposat des del moderador @@ -505,8 +501,6 @@ Setmana següent No s\'han desat els missatges fora de línia No hi ha integració amb el número de telèfon perquè falten permisos - Apagat - Per defecte 1 hora En línia Estat en línia @@ -606,7 +600,6 @@ Aquesta setmana Això és un missatge de prova Aquest cap de setmana - Resposta Avui Demà Traducció diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index 118e8de..ef23a23 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -5,7 +5,6 @@ Přidat do Poznámek Konverzace %1$s přidána do oblíbených Hledat v %s - Jevit se offline Archivovat konverzaci Jakmile je konverzace archivována, bude ve výchozím stavu skrytá. Pokud si chcete zobrazit archivované konverzace, vyberte filtr „Archivováno“. Přímá zmínění budou chodit i nadále. Archivováno @@ -23,7 +22,6 @@ Vyloučit Vyloučit účastníka Seznam vyloučení - Zaneprázdněn(a) Kalendář Pokročilé předvolby pro hovor Hovor trvá už hodinu. @@ -63,11 +61,9 @@ Došlo k problému při načítání vašich chatů Došlo k chybě při rušení vyloučení účastníka Nepodařilo se uložit %1$s - 15 minut složka Načítání… %1$s (%2$d) - Sledovaná vlákna 4 hodiny Nepodařilo se získat čekající pozvání (upraveno) @@ -184,7 +180,7 @@ Smazat vše Smazat konverzaci Pokud konverzaci smažete, bude smazána také pro všechny její ostatní účastníky. - Smazat zprávu + Smazat Zpráva úspěšně smazána, ale možná unikla do jiných služeb Smazat nyní Uživatel %1$s byl odebrán @@ -548,11 +544,6 @@ Žádné archivované konverzace Neuloženy žádné zprávy pro režim bez připojení Není možné propojit telefonní čísla, protože chybí potřebná oprávnění - Všechny zprávy - Pouze zmínky ve stylu @jméno - Vypnuto - Výchozí - Nastavení následování konverzace 1 hodina Online Stav online @@ -562,6 +553,7 @@ Přejít na vlákno Přehrát/pozastavit hlasovou zprávu Ovládání rychlosti přehrávání + Pokračujte v procesu přihlášení ve webovém prohlížeči Přidat volbu Upravit hlas Ukončit anketu @@ -639,9 +631,10 @@ Hlas Zobrazit důvod vyloučení Zobrazit vyloučené účasníky + Zobrazit vlákna Oblíbené Nemáte oprávnění pro zahájení hovoru - Vytvořit vlákno + Začít vlákno zahájen hovor Stavová zpráva Stav vrácen na původní @@ -660,9 +653,7 @@ Tento týden Toto je zkušební zpráva Tento víkend - Zrušit vytváření vlákna - Notifikace ohledně vlákna - Odpověď + %1$d odpovědí Název vlákna Dnes Zítra @@ -713,12 +704,6 @@ Tato konverzace bude automaticky smazána pro kohokoli po %1$d dnech bez jakékoli aktivity. Tato konverzace bude automaticky smazána pro kohokoli po %1$d dnech bez jakékoli aktivity. - - %d odpověď - %d odpovědi - %d odpovědí - %d odpovědi - %d hlas %d hlasy diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 105a49c..387d434 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -1,11 +1,10 @@ - Redigér + Rediger Tilføj Tilføj til Noter Tilføjede samtalen %1$s til favoritter Søg i %s - Er offline Arkivér samtale Når en samtale er arkiveret, vil den blive skjult som standard. Vælg filteret \"Arkiveret\" for at se arkiverede samtaler. Direkte omtaler vil stadig blive modtaget. Arkiveret @@ -22,13 +21,12 @@ Bloker Bloker deltager Liste over blokerede - Optaget Kalender Avancerede opkaldsmuligheder Opkaldet har været igang i en time. Ring uden notifikation Kameratilladelse er givet. Vælg kamera igen. - Annullér log på + Annuller log på Vælg avatar fra skyen Ryd status notifikation Ryd status notifikationer efter @@ -49,14 +47,13 @@ Slettede samtale %1$s Forstyr ikke Ryd ikke - Redigér + Rediger Nylige Krypteret Afslut opkald for alle Der opstod et problem med at indlæse dine chats En fejl opstod under fjernelse af blokering af deltager Kunne ikke gemme %1$s - 15 minutter mappe Loading … %1$s (%2$d) @@ -90,7 +87,6 @@ Start indtastning for at søge ... Søg ... Beskeder - Vis ikke notifikationer Den valgte konto blev importeret og kan bruges nu Om Aktiv bruger @@ -172,7 +168,7 @@ Slet alt Slet samtale Hvis du sletter konversationen, vil den også blive slettet for alle andre deltagere. - Slet besked + Slet Besked slettet, men kan kan være lækket til andre services Brugeren %1$s blev fjernet Degrader fra moderator @@ -221,7 +217,7 @@ Server er aktuelt i vedligeholdelsestilstand. App\'en er forældet is outdated Denne app er for gammel og understøttes ikke længere af denne server. Opdater venligst. - Opdatér + Opdater Ønsker du at genautorisere eller slette denne konto? Hvis du gemmer dette medie i dit lager, så vil enhver anden app på dit apparat kunne tilgå det. Fortsæt? @@ -231,7 +227,7 @@ Display navn kunne ikke hentes, afbrydes Kunne ikke opbevare skærmnavn, afbryder Redigér - Redigér + Rediger Redigeret af admin 8 timer 4 uger @@ -506,9 +502,6 @@ Næste uge Ingen offline beskeder gemt Ingen telefonnummerintegration på grund af manglende rettigheder - Kun omtalt med @ - Deaktivér - Standard 1 time Online Online status @@ -517,7 +510,7 @@ Afspil/pauser stemmebesked Afspilningshastighedskontrol Tilføj valg - Redigér stemme + Rediger stemme Afslut afstemning Ønsker du virkelig at afslutte denne afstemning? Dette kan ikke fortrydes. Du kan ikke stemme med flere muligheder i denne afstemning. diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index b9a3586..889e32c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -5,7 +5,6 @@ Zu Notizen hinzufügen Unterhaltung %1$s zu Favoriten hinzugefügt Suche in %s - Offline erscheinen Unterhaltung archivieren Sobald eine Unterhaltung archiviert ist, wird sie standardmäßig ausgeblendet. Wählen Sie den Filter \"Archiviert\", um archivierte Unterhaltungen anzuzeigen. Direkte Erwähnungen werden weiterhin empfangen. Archiviert @@ -23,7 +22,6 @@ Sperren Teilnehmer sperren Sperrliste - Beschäftigt Kalender Erweiterte Anrufoptionen Der Anruf läuft seit einer Stunde. @@ -63,11 +61,9 @@ Beim Laden Ihrer Chats ist ein Problem aufgetreten Fehler beim Entsperren des Teilnehmers %1$s konnte nicht gespeichert werden - 15 Minuten Ordner Lade … %1$s (%2$d) - Nachverfolgte Themen 4 Stunden Ausstehende Einladungen konnten nicht abgerufen werden (Bearbeitet) @@ -80,10 +76,6 @@ Sie haben die Unterhaltung %1$s verlassen Weitere Ergebnisse laden Ortszeit: %1$s - Standort-Berechtigung abgelehnt - Dies bitte in in App-Einstellungen aktivieren - Standortdienste deaktiviert - Bitte die Standortdienste (GPS) aktivieren, um diese Funktion zu nutzen Unterhaltung sperren Schloss-Symbol Hand herunternehmen @@ -97,7 +89,6 @@ Größste zuerst Kleinste zuerst Nachricht kopiert - Möchten Sie diese Nachricht löschen? Nachricht von Ihnen gelöscht Bearbeitet von %1$s Tippen, um die Umfrage zu öffnen @@ -105,7 +96,7 @@ Beginnen Sie mit der Eingabe, um zu suchen … Suche … Nachrichten - Alle Benachrichtigungen stummschalten + Nachrichten konnten nicht geladen werden. Das ausgewählte Konto ist nun importiert und verfügbar Über Aktiver Benutzer @@ -190,7 +181,7 @@ Alle löschen Unterhaltung löschen Wenn Sie diese Unterhaltung löschen, dann wird diese auch für alle anderen Teilnehmer gelöscht. - Nachricht löschen + Löschen Nachricht gelöscht, sie wurde aber möglicherweise an andere Dienste weitergegeben. Jetzt löschen Benutzer %1$s wurde entfernt @@ -435,6 +426,7 @@ %1$s hat eine Deck-Karte gesendet Prüfe Verbindung zum Server Bitte aktualisieren Sie Ihre %1$s Datenbank + Verbindung zum Server kann nicht hergestellt werden Das ausgewählte Konto konnte nicht importiert werden Der Link zu Ihrer %1$s Webseite, wenn Sie diese im Browser öffnen. Ein Konto aus der App %1$s importieren @@ -554,11 +546,6 @@ Keine archivierten Unterhaltungen Keine Offlinenachrichten gespeichert Keine Rufnummernintegration aufgrund fehlender Berechtigungen - Alle Nachrichten - Nur @-Erwähnungen - Aus - Standard - Unterhaltungseinstellungen folgen 1 Stunde Online Online-Status @@ -568,6 +555,7 @@ Zu Thema gehen Sprachnachricht wiedergeben/pausieren Steuerung der Wiedergabegeschwindigkeit + Bitte den Anmeldeprozess im Browser fortsetzen Option hinzufügen Abstimmung bearbeiten Umfrage beenden @@ -645,9 +633,10 @@ Sprachnachrichten Sperrgrund anzeigen Gesperrte Teilnehmer anzeigen + Themen anzeigen Favorit Sie dürfen keinen Anruf zu tätigen - Ein Thema erstellen + Ein Thema starten hat einen Anruf begonnen Statusnachricht Status zurückgesetzt @@ -667,10 +656,8 @@ Dies ist eine Testnachricht Dieses Wochenende Themenerstellung abbrechen - Themen-Benachrichtigungen - Antwort + %1$d Antworten Thementitel - Keine Themen gefunden Heute Morgen Übersetzen @@ -716,10 +703,6 @@ Diese Unterhaltung wird für alle bei Inaktivität in %1$d Tag gelöscht Diese Unterhaltung wird für alle bei Inaktivität in %1$d Tagen gelöscht - - %d Antwort - %d Antworten - %d Stimme %d Stimmen diff --git a/app/src/main/res/values-el/strings.xml b/app/src/main/res/values-el/strings.xml index 1bb70d8..6a25dc2 100644 --- a/app/src/main/res/values-el/strings.xml +++ b/app/src/main/res/values-el/strings.xml @@ -9,7 +9,6 @@ Μεγάφωνο Εικόνα προφίλ Λείπω - Απασχολημένος Ημερολόγιο Επιλογή εικόνας προφίλ από το cloud Εκκαθάριση μηνύματος κατάστασης @@ -29,7 +28,6 @@ Κρυπτογραφημένο Τερματισμός κλήσης Αποτυχία αποθήκευσης %1$s - 15 λεπτά φάκελος Φόρτωση … %1$s (%2$d) @@ -118,7 +116,7 @@ Διαγραφή όλων Διαγραφή συνομιλίας Αν διαγράψετε την συνομιλία, θα διαγραφεί επίσης για όλους τους υπόλοιπους συμμετέχοντες. - Διαγραφή μηνύματος + Διαγραφή Το μήνυμα διαγράφηκε με επιτυχία, αλλά ενδέχεται να έχει διαρρεύσει σε άλλες υπηρεσίες Υποβάθμιση από συντονιστή Εγγραφή φωνητικού μηνύματος @@ -346,8 +344,6 @@ Ναι Επόμενη εβδομάδα Δεν υπάρχει ενσωμάτωση αριθμού τηλεφώνου λόγω έλλειψης δικαιωμάτων - Απενεργοποιημένο - Προεπιλογή 1 ώρα Σε σύνδεση Κατάσταση σε σύνδεση diff --git a/app/src/main/res/values-es-rEC/strings.xml b/app/src/main/res/values-es-rEC/strings.xml index 23c2e45..0a872b7 100644 --- a/app/src/main/res/values-es-rEC/strings.xml +++ b/app/src/main/res/values-es-rEC/strings.xml @@ -3,7 +3,6 @@ Editar Guardar Compartir en %s - Aparecer como desconectado Archivado Bluetooth Salida de audio @@ -13,7 +12,6 @@ Tu estado se estableció automáticamente Avatar Ausente - Ocupado Calendario Opciones avanzadas de llamada Llamar sin notificación @@ -38,7 +36,6 @@ Finalizar llamada para todos Hubo un problema al cargar tus chats Error al guardar %1$s - 15 minutos carpeta Loading … %1$s (%2$d) @@ -62,7 +59,6 @@ Comienza a escribir para buscar... Buscar... Mensajes - Silenciar todas las notificaciones La cuenta seleccionada ha sido importada y está disponible Acerca Usuario activo @@ -142,7 +138,7 @@ Borrar todo Borrar conversación Si borras la conversación, también se borrará para todos los demás participantes. - Eliminar mensaje + Borrar El mensaje se borró correctamente, pero podría haber sido filtrado a otros servicios Degradar de moderador Grabar mensaje de voz @@ -402,9 +398,6 @@ Sí Semana siguiente No hay integración de número de teléfono debido a permisos faltantes - Todos los mensajes - Solo @-menciones - Apagado 1 hora En línea Estado en línea diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml index 927505c..a52e468 100644 --- a/app/src/main/res/values-es/strings.xml +++ b/app/src/main/res/values-es/strings.xml @@ -5,7 +5,6 @@ Añadir a Notas Se añadió la conversación %1$s a los favoritos Buscar en %s - Aparecer como desconectado Archivar conversación Una vez que una conversación es archivada, estará escondida por defecto. Seleccione el filtro \"Archivadas\" para ver las conversaciones archivadas. Cualquier mención directa seguirá siendo recibida. Archivada @@ -23,7 +22,6 @@ Bloquear Bloquear participante Lista de bloqueados - Ocupado Calendario Opciones avanzadas de llamada La llamada ha estado activa por una hora. @@ -63,11 +61,9 @@ Hubo un problema cargando sus chats Ocurrió un error al desbloquear al participante Fallo al guardar %1$s - 15 minutos carpeta Cargando … %1$s (%2$d) - Hilos suscritos 4 horas Fallo al obtener invitaciones pendientes (editado) @@ -80,10 +76,6 @@ Ud. Abandonó la conversación %1$s Cargar más resultados Hora local: %1$s - Se denegó el permiso de ubicación - Por favor, habilítelo en los ajustes de aplicación - Servicios de ubicación desactivados - Por favor, habilite los servicios de ubicación (GPS) para utilizar esta característica Bloquear conversación Símbolo de bloqueo Bajar la mano @@ -97,7 +89,6 @@ Más grandes primero Más pequeñas primero Mensaje copiado - ¿Está seguro que desea eliminar este mensaje? Has eliminado este mensaje Editado por %1$s Pulse para abrir la encuesta @@ -105,7 +96,6 @@ Empiece a escribir para buscar… Buscar … Mensajes - Silenciar todas las notificaciones La cuenta seleccionada ha sido importada y está disponible Acerca de Activar usuario @@ -190,7 +180,7 @@ Eliminar todos Eliminar conversación Si borras la conversación, también se borrará para los demás participantes. - Eliminar mensaje + Eliminar Mensaje borrado con éxito, pero puede haber sido filtrado a otros servicios Eliminar ahora El Usuario %1$s fue eliminado @@ -555,11 +545,6 @@ No hay conversaciones archivadas No hay mensajes fuera de línea guardados No hubo integración de la agenda telefónica debido a la falta de permisos - Todos los mensajes - Solo las menciones con @ - Apagado - Predeterminado - Seguir los ajustes de la conversación 1 hora En línea Estado en línea @@ -569,6 +554,7 @@ Ir al hilo Reproducir/pausar mensaje de voz Control de velocidad de reproducción + Por favor, continúe el proceso de inicio de sesión en el navegador Añadir opción Editar voto Cerrar la encuesta @@ -646,9 +632,10 @@ Voz Mostrar razón de bloqueo Mostrar participantes bloqueados + Mostrar hilos Favorito No está autorizado a iniciar una llamada - Crear un hilo + Iniciar un hilo inició una llamada Mensaje de estado El estado ha sido revertido @@ -667,11 +654,8 @@ Esta semana Esto es un mensaje de prueba Este fin de semana - Cancelar la creación del hilo - Notificaciones para hilos - Responder + %1$d respuestas Título del hilo - No se encontraron hilos Hoy Mañana Traducir @@ -719,11 +703,6 @@ Esta conversación será eliminada automáticamente para todos tras %1$d días de inactividad Esta conversación será eliminada automáticamente para todos tras %1$d días de inactividad - - %d respuesta - %d respuestas - %d respuestas - %d voto %d votos diff --git a/app/src/main/res/values-et-rEE/strings.xml b/app/src/main/res/values-et-rEE/strings.xml index 84a63ed..25b7ec4 100644 --- a/app/src/main/res/values-et-rEE/strings.xml +++ b/app/src/main/res/values-et-rEE/strings.xml @@ -5,7 +5,6 @@ Lisa Märkmetesse „%1$s“ vestlus on märgitud lemmikuks Otsi siin: %s - Sellega paistad olema võrgust väljas Arhiveeri vestlus Kui vestlus on arhiveeritud, siis on ta vaikimisi peidetud. Saad neid leida, kui kasutad filtrivalikut „Arhiveeritud“. Otsemainimiste teave liigub sellele vaatamata. Arhiveeritud @@ -23,7 +22,6 @@ Sea suhtluskeeld Sea osalejale suhtluskeeld Suhtluskeelu saanute loend - Hõivatud Kalender Kõne lisavalikud Kõne on kestnud üle tunni. @@ -63,11 +61,9 @@ Sinu vestluste laadimisel tekkis viga Osaleja suhtluskeelu eemaldamisel tekkis viga „%1$s“ salvestamine ei õnnestunud - 15 minutit kaust Laadimisel... %1$s (%2$d) - Jutulõngad, mida sa jälgid 4 tundi Ootel kutsete laadimine ei õnnestunud (muudetud) @@ -80,10 +76,6 @@ Sa lahkusid %1$s vestlusest Laadi veel tulemusi Kohalik aeg: %1$s - Õigused asukoha tuvastamiseks on keelatud - Palun luba see rakenduse seadistustest - Asukohateenused pole sisse lülitatud - Selle funktsionaalsuses kasutamiseks palun luba asukohateenused (GPS) Lukusta vestlus Lukuikoon Lase käsi alla @@ -97,7 +89,6 @@ Suuremad esimesena Väiksemad esimesenaa Sõnum on kopeeritud - Kas oled kindel, et tahad selle sõnumi kustutada? Sina kustutasid sõnumi %1$s muutis sõnumit Küsitluse avamiseks klõpsi @@ -105,7 +96,7 @@ Otsimiseks alusta kirjutamist… Otsi… Sõnumid - Sellega summutad teavitused + Sõnumite laadimine ei õnnestunud Valitud kasutajakonto on nüüd imporditud ja saadaval Info Aktiivne kasutaja @@ -190,7 +181,7 @@ Kustuta kõik Kustuta vestlus Kui kustutad selle vestluse, siis kustub see ka kõikide osalejate jaoks. - Kustuta sõnum + Kustuta Sõnumi kustutamine õnnestus, kuid võis juhtuda, et ta oli juba teistesse sõnumiteenustesse edastatud Kustuta kohe Kasutaja „%1$s“ on eemaldatud @@ -435,6 +426,7 @@ %1$s saatis kanbani kaardi Testi ühendust serveriga Palun uuenda oma %1$si andmebaasi + Ei õnnestu luua ühendust serveriga Valitud kasutajakonto importimine ei õnnestunud See on sinu %1$s kasutajaliidese veebiaadress, kui sa avad ta veebibrauseris. Impordi kasutajakonto rakendusest %1$s @@ -554,11 +546,6 @@ Arhiveeritud vestlusi pole Ühtegi vallasrežiimis salvestatud sõnumit ei leidu Telefoninumbrite lõiming ei toimi puuduvate õiguste tõttu - Kõik sõnumid - Vaid @-mainimised - Pole kasutusel - Vaikimisi - Järgi vestluse seadistusi 1 tund Online Võrgus staatus @@ -568,6 +555,7 @@ Ava jutulõng Esita häälsõnumit või peata esitus Taasesituse kiiruse juhtimine + Palun jätka sisselogimisprotsessi veebibrauseris Lisa valik Muuda oma häält Lõpeta küsitlus @@ -645,9 +633,10 @@ Hääl Näita suhtluskeelu seadmise põhjus Näita suhtluskeelu saanud osalejaid + Näita jutulõngu Lemmik Sul pole luba kõne algatamiseks - Alusta jutulõnga + Koosta jutulõng helistas Staatuse teade Olek on tagasi pööratud @@ -667,10 +656,8 @@ See on testsõnum See nädalavahetus Katkesta jutulõnga koostamine - Jutulõngade teavitused - Vasta + %1$d vastust Jutulõnga pealkiri - Ühtegi jutulõnga ei leidu Täna Homme Tõlgi @@ -716,10 +703,6 @@ See vestlus kustub automaatselt kõigi osalejate jaoks, kui siin pole olnud tegevust %1$d päeva jooksul. See vestlus kustub automaatselt kõigi osalejate jaoks, kui siin pole olnud tegevust %1$d päeva jooksul. - - %d vastus - %d vastust - %d hääl %d häält diff --git a/app/src/main/res/values-eu/strings.xml b/app/src/main/res/values-eu/strings.xml index f8aa767..cddc8db 100644 --- a/app/src/main/res/values-eu/strings.xml +++ b/app/src/main/res/values-eu/strings.xml @@ -17,7 +17,6 @@ Kanpoan Debekatu Debekatu parte-hartzailea - Lanpetua Egutegia Dei-ezarpen aurreratuak Deia ordubetez egon da martxan. @@ -47,7 +46,6 @@ Amaitu deia denontzat Arazo bat gertatu da zure txatak kargatzean %1$s gordetzeak huts egin du - 15 minutu karpeta Kargatzen … %1$s(%2$d) @@ -162,7 +160,7 @@ Ezabatu denak Ezabatu elkarrizketa Elkarrizketa hau ezabatzen baduzu beste kideentzat ere ezabatuko da. - Mezua ezabatzen + Ezabatu Mezua ondo ezabatu da, baina baliteke beste zerbitzu batzuetara filtratu izana %1$s erabiltzailea kendu da Moderatzailetik degradatua @@ -454,8 +452,6 @@ Bai Hurrengo astea Ezin izan da telefono zenbakia integratu, baimen falta dela eta - Off - Lehenetsia Ordu 1 Linean Lineako egoera diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml index e7aabaa..ea35e0b 100644 --- a/app/src/main/res/values-fa/strings.xml +++ b/app/src/main/res/values-fa/strings.xml @@ -1,11 +1,9 @@ ویرایش - افزودن افزودن به یادداشت‌ها گفتگوی %1$sبه علاقه‌مندی‌ها افزوده شد جستجو در %s - نمایش آفلاین Archived بلوتوث خروجی صدا @@ -19,7 +17,6 @@ انسداد مسدود کردن شرکت‌کننده فهرست مسدودی‌ها - مشغول تقویم گزینه‌های پیشرفتهٔ تماس پیام وضعیت را پاک کن @@ -38,7 +35,6 @@ اخیر Encrypted End call for everyone - ۱۵ دقیقه پوشه بارگذاری … %1$s (%2$d) @@ -60,7 +56,6 @@ جستجو نتیجه‌ای نداشت جستجو ... پیام ها - خاموش کردن همه اعلانات حساب انتخاب‌شده اکنون وارد شده و در دسترس است . درباره کاربر فعال @@ -130,7 +125,7 @@ همه را حذف کنید مکالمه را حذف کنید اگر این مکالمه را حذف کنید ، برای سایر شرکت کنندگان نیز حذف خواهد شد. - Delete message + حذف تنزل مقام از مدیر ضبط پیام صوتی فرستادن پیام @@ -352,9 +347,6 @@ وبینار بله هفتهٔ بعد - All messages - \@-mentions only - پیش‌فرض ۱ ساعت برخط وضعیت برخط diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index baab44e..ed7d075 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -3,7 +3,6 @@ Muokkaa Lisää Etsi kohteesta %s - Näytä olevan poissa Arkistoitu Bluetooth Äänen ulostulo @@ -13,7 +12,6 @@ Tilatietosi asetettiin automaattisesti Profiilikuva Poissa - Varattu Kalenteri Tämä puhelu on kestänyt yhden tunnin. Puhelu ilman ilmoitusta @@ -36,7 +34,6 @@ Lopeta puhelu Päätä puhelu kaikkien osalta Ei voitu tallentaa %1$s - 15 minuuttia kansio Ladataan… %1$s (%2$d) @@ -58,7 +55,6 @@ Aloita kirjoittaminen hakeaksesi… Hae… Viestit - Mykistä kaikki ilmoitukset Valittu tili on nyt tuotu ja käytettävissä Tietoja Aktiivinen käyttäjä @@ -121,7 +117,7 @@ Poista kaikki Poista keskustelu Jos poistat keskustelun, keskustelu poistetaan myös muilta osapuolilta. - Poista viesti + Poista Alenna moderaattorista Äänitä ääniviesti Lähetä viesti @@ -345,7 +341,6 @@ Webinaari Kyllä Seuraava viikko - Oletus 1 tunti Paikalla Online-tila diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 5cebfd8..b60002e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -5,7 +5,6 @@ Ajouter à Notes La conversation %1$s a été ajoutée aux favoris Rechercher dans %s - Apparaître hors-ligne Archiver la conversation Lorsqu\'une conversation est archivée, elle est cachée par défaut. Choisissez le filtre \"Archivés\" pour voir les conversations archivées. Les mentions directes seront toujours bien reçues. Archivé @@ -16,14 +15,13 @@ Téléphone Haut-parleur Écouteurs filaires - Votre statut a été automatiquement défini + Votre état a été automatiquement défini Avatar Absent(e) Bouton précédent Bannir Bannir le participant Liste des bannis - Occupé Agenda Options d\'appel avancées L\'appel est en cours depuis une heure. @@ -49,7 +47,6 @@ Zone de danger %1$s dans %2$s Supprimer l\'avatar - Supprimer l\'enregistrement vocal La conversation %1$s a été supprimée Ne pas déranger Ne pas effacer @@ -63,11 +60,9 @@ Un problème est survenu lors du chargement de vos discussions Une erreur est survenue à la réintégration du participant Échec de la sauvegarde de %1$s - 15 minutes Dossier Chargement… %1$s (%2$d) - Conversations suivies 4 heures Échec de la récupération des invitations en attente (modifié) @@ -80,8 +75,6 @@ Vous avez quitté la conversation %1$s Charger plus de résultats Heure locale : %1$s - Autorisation de localisation refusée - Services de localisation désactivés Verrouiller la conversation Symbole de verrouillage Baisser la main @@ -95,7 +88,6 @@ Les plus gros d\'abord Le plus petit en premier Message copié - Êtes-vous sûr de vouloir effacer ce message ? Message supprimé par vous Modifié par %1$s Toucher pour ouvrir le sondage @@ -103,7 +95,6 @@ Commencer à taper pour lancer la recherche… Recherche… Messages - Désactiver les notifications Le compte sélectionné est maintenant importé et disponible À propos Utilisateur actif @@ -188,7 +179,7 @@ Supprimer tout Supprimer la conversation Si vous supprimez la conversation, elle sera supprimée pour tous les participants. - Supprimer le message + Supprimer Message supprimé avec succès, mais il pourrait avoir été divulgué à d’autres services Supprimer maintenant L\'utilisateur %1$s a été supprimé @@ -296,7 +287,7 @@ L\'optimisation de la batterie n\'est pas ignorée. Ceci devrait être modifié pour vous assurer que les notifications fonctionnent en arrière-plan. Merci de cliquer OK et sélectionner \"Toutes les applications\" -> %1$s -> Ne pas optimiser Ignorer l\'optimisation de batterie Conversation importante - Le statut utilisateur \"Ne pas déranger\" est ignoré pour les conversations importantes + Le statut utilisateur \"Ne pas déranger\" est ignoré pour les conversations importantes. Heure invalide Invitations Rejoindre des conversations ouvertes @@ -333,7 +324,6 @@ Message lu Envoi en cours Message envoyé - Le micro est activé et le son est enregistré Pour autoriser la communication audio, merci de donner l\'autorisation « Microphone ». Vous avez manqué un appel de %s Modérateur @@ -403,7 +393,7 @@ Renommer Répondre Répondre en privé - Salle réservée avec succès + Salle retenue avec succès Enregistrer Enregistré avec succès 30 secondes @@ -419,7 +409,6 @@ Effacer la recherche Choisissez un compte Message de mise à jour - Envoyer l\'enregistrement vocal Conversation sensible La prévisualisation des messages sera désactivée dans la liste des conversations et les notifiactions %1$s a envoyé un GIF. @@ -499,7 +488,7 @@ Clair Thème Partager mon statut de saisie et montrer le statut de saisie des autres - Le statut de saisie n\'est disponible que lors de l\'utilisation d\'un backend haute performance (HPB). + L\'état de saisie n\'est disponible que lors de l\'utilisation d\'un backend haute performance (HPB). État de saisie Le proxy requiert les informations d\'identification Attention @@ -552,10 +541,6 @@ Aucune conversation archivée Aucun message hors-ligne trouvé Pas d\'intégration avec le carnet d\'adresses à cause d\'autorisations manquantes - Seulement les mentions @ - Désactiver - Défaut - Utiliser les paramètres de la conversation 1 heure En ligne Statut de connexion @@ -582,7 +567,6 @@ Vote Vote soumis Précédemment défini - Le code QR ne peut être lu Lever la main Tout le partage de fichier n\'est pas possible sans les permissions @@ -604,10 +588,10 @@ La conversation %1$s a été supprimée des favorites La conversation %1$s a été renommée Renvoyer - Réinitialiser le statut + Réinitialiser l\'état Il est impossible de rejoindre une autre salle pendant un appel Sauvegarder - Scanner le QR Code + Scan QR Code Synchronisation avec les serveurs de confiance uniquement Fédéré Visible uniquement aux personnes dans l\'instance et aux invités @@ -644,7 +628,6 @@ Afficher les participants bannis Favori Vous n\'êtes pas autorisé à lancer un appel - Créer une conversation a lancé un appel Message d\'état Statut rétabli @@ -663,9 +646,7 @@ Cette semaine Ceci est un message de test Ce week-end - Annuler la création de la conversation - Notifications de conversation - Répondre + %1$d réponses Titre de la conversation Aujourd\'hui Demain @@ -703,7 +684,7 @@ Aucunes informations personnelles renseignées Ajoutez vos nom, photo et coordonnées sur votre page de profil. Appel vidéo - Quel est votre statut ? + Quel est votre état ? Voir %d message similaire Voir %d messages similaires @@ -714,11 +695,6 @@ Cette conversation sera automatiquement supprimée pour tout le monde après %1$d jours d\'inactivité Cette conversation sera automatiquement supprimée pour tout le monde après %1$d jours d\'inactivité - - %d réponses - %d réponses - %d réponses - %d vote %d votes diff --git a/app/src/main/res/values-ga/strings.xml b/app/src/main/res/values-ga/strings.xml index ceaef09..0579139 100644 --- a/app/src/main/res/values-ga/strings.xml +++ b/app/src/main/res/values-ga/strings.xml @@ -5,7 +5,6 @@ Cuir le Nótaí Cuireadh comhrá %1$s le ceanáin Cuardaigh i %s - Le feiceáil as líne Comhrá cartlainne Nuair a bheidh comhrá curtha i gcartlann, cuirfear i bhfolach é de réir réamhshocraithe. Roghnaigh an scagaire \"Cartlannaithe\" chun féachaint ar chomhráite cartlainne. Gheofar tagairtí díreacha fós. Cartlannaithe @@ -23,7 +22,6 @@ Bac Cosc ar rannpháirtí Liosta toirmisc - Gnóthach Féilire Ardroghanna glaonna Tá an glao ar siúl ar feadh uair an chloig. @@ -63,11 +61,9 @@ Tharla fadhb agus do chomhráite á lódáil Tharla earráid agus rannpháirtí á bhaint de Theip ar shábháil %1$s - 15 nóiméad fillteán Á lódáil… %1$s (%2$d) - Snáitheanna leanta 4 uair an chloig Theip ar chuirí ar feitheamh a fháil (in eagar) @@ -80,10 +76,6 @@ D\'fhág tú an comhrá %1$s Íoslódáil níos mó torthaí Am áitiúil: %1$s - Cead suímh diúltaithe - Cumasaigh é i socruithe an aip le do thoil - Seirbhísí suímh díchumasaithe - Cumasaigh seirbhísí suímh (GPS) le go mbeidh tú in ann an ghné seo a úsáid Cuir glas ar an gcomhrá Siombail ghlais Lámh íochtair @@ -97,7 +89,6 @@ An ceann is mó ar dtús Is lú ar dtús Teachtaireacht cóipeáilte - An bhfuil tú cinnte gur mian leat an teachtaireacht seo a scriosadh? Scrios tú an teachtaireacht Curtha in eagar ag %1$s Tapáil chun vótaíocht a oscailt @@ -105,7 +96,6 @@ Tosaigh ag clóscríobh chun cuardach a dhéanamh… Cuardaigh… Teachtaireachtaí - Balbhaigh gach fógra Tá cuntas roghnaithe iompórtáilte anois agus ar fáil Faoi Úsáideoir gníomhach @@ -190,7 +180,7 @@ Scrios go léir Scrios an comhrá Má scriosann tú an comhrá, scriosfar é do gach rannpháirtí eile freisin. - Scrios teachtaireacht + Scrios D\'éirigh leis an teachtaireacht a scriosadh, ach seans gur sceitheadh ​​chuig seirbhísí eile í Scrios anois Baineadh úsáideoir %1$s @@ -554,11 +544,6 @@ Níl aon chomhráite sa chartlann Níor sábháladh aon teachtaireacht as líne Níl aon chomhtháthú uimhir theileafóin mar gheall ar cheadanna in easnamh - Gach teachtaireacht - \@-luaite amháin - as - Réamhshocrú - Lean socruithe comhrá 1 uair Ar líne Stádas ar líne @@ -568,6 +553,7 @@ Téigh go dtí an snáithe Seinn/cuir teachtaireacht gutha ar sos Rialú luas athsheinm + Lean ar aghaidh leis an bpróiseas logála isteach sa bhrabhsálaí le do thoil. Cuir rogha leis Cuir vóta in eagar Deireadh vótaíocht @@ -645,9 +631,10 @@ Guth Taispeáin Cúis Toirmeasc Taispeáin rannpháirtithe toirmiscthe + Taispeáin snáitheanna is fearr leat Níl cead agat glao a thosú - Cruthaigh snáithe + Tosaigh snáithe thosaigh glao Teachtaireacht stádais Stádas ar ais @@ -666,11 +653,8 @@ An tseachtain seo Is teachtaireacht tástála é seo An deireadh seachtaine seo - Cealaigh cruthú snáithe - Fógraí snáithe - Freagra + %1$d freagraí Teideal an snáithe - Níor aimsíodh aon snáitheanna Inniu Amárach Aistrigh @@ -722,13 +706,6 @@ Scriosfar an comhrá seo go huathoibríoch do gach duine i %1$d lá gan aon ghníomhaíocht Scriosfar an comhrá seo go huathoibríoch do gach duine i %1$d lá gan aon ghníomhaíocht - - %d freagra - %d freagraí - %d freagraí - %d freagraí - %d freagraí - %d vóta %d vótaí diff --git a/app/src/main/res/values-gl/strings.xml b/app/src/main/res/values-gl/strings.xml index d5a807a..b1b10b4 100644 --- a/app/src/main/res/values-gl/strings.xml +++ b/app/src/main/res/values-gl/strings.xml @@ -5,12 +5,10 @@ Engadir a Notas Engadiuse a conversa %1$s aos favoritos Buscar en %s - Aparecer como sen conexión Arquivar a conversa Unha vez arquivada unha conversa, de xeito predeterminado vai ser agochada. Seleccione o filtro «Arquivado» para ver as conversas arquivadas. Seguirá a recibir as mencións directas. Arquivada %1$s foi arquivada - Chamada de voz Bluetooth Saída de son Teléfono @@ -23,7 +21,6 @@ Expulsión Expulsar o participante Lista de expulsións - Ocupado Calendario Opcións avanzadas de chamada A chamada leva unha hora en curso. @@ -36,10 +33,8 @@ Pechar Icona «Pechar» Estabeleceuse a conexión - Non hai conexión co servidor - Perdeuse a conexión — As mensaxes enviadas póñense en cola + Perdeuse a conexión – As mensaxes enviadas póñense en cola Bloquear a gravación para gravar continuamente a mensaxe de voz - A conversa está arquivada A conversa é só de lectura Produciuse un fallo ao definir a conversa como de só lectura Conversas @@ -49,12 +44,10 @@ Zona de perigo %1$s en %2$s Eliminar avatar - Eliminar a gravación de voz A conversa %1$s foi eliminada Non molestar Non limpar Editar - Non é posíbel editar as mensaxes con máis de 24 horas Editar a mensaxe Recente Cifrado @@ -63,11 +56,9 @@ Produciuse un problema ao cargar as súas parolas Produciuse un erro ao retirar a expulsión dun participante Produciuse un fallo ao gardar %1$s - 15 minutos cartafol Cargando… %1$s (%2$d) - Fíos seguidos 4 horas Produciuse un fallo ao recuperar os convites pendentes (editado) @@ -76,14 +67,9 @@ Non foi posíbel recuperar os idiomas Produciuse un fallo na recuperación Hoxe máis tarde - Abandonar a chamada + Deixar a chamada Vde. deixou a conversa %1$s Cargando máis resultados - Hora local: %1$s - Permiso de localización denegado - Actíveo nos axustes da aplicación - Servizos de localización desactivados - Active os servizos de localización (GPS) para usar esta función Bloquear a conversa Símbolo de bloqueo Baixar a man @@ -96,8 +82,6 @@ Z - A Primeiro o máis grande Primeiro o máis pequeno - Copiouse a mensaxe - Confirma que quere eliminar esta mensaxe? Mensaxe eliminada por Vde. Editado por %1$s Toque para abrir a enquisa @@ -105,7 +89,6 @@ Comece a escribir para buscar… Buscar… Mensaxes - Enmudecer todas as notificacións A conta seleccionada foi importada e xa está dispoñíbel Sobre Usuario activo @@ -183,16 +166,14 @@ Copiar Crear unha nova conversa Crear enquisa - Vde.: Hoxe Onte Eliminar Eliminar todo Eliminar a conversa Se elimina a conversa, tamén se eliminará para todos os demais participantes. - Eliminar a mensaxe + Eliminar A mensaxe foi eliminada correctamente, pero é posíbel que se filtrase a outros servizos - Eliminar agora O usuario %1$s foi retirado Relegar de moderador Gravar mensaxe de voz @@ -253,8 +234,7 @@ Editar Editar a mensaxe Editado por alguén de administración - Menú do evento de conversa - Programación + Programa 8 horas 4 semanas Apagado @@ -271,7 +251,6 @@ Vde. ten convites pendentes Atrás Precísase de permiso para acceder ao ficheiro - Filtrar conversas Usuario seguindo unha ligazón pública Vde.: %1$s Reenviar @@ -298,14 +277,12 @@ Non se ignora a optimización da batería. Isto debería cambiarse para asegurarse de que as notificacións funcionan en segundo plano. Prema en Aceptar e seleccione «Todas as aplicacións» → %1$s → Non optimizar Ignorar a optimización da batería Conversa importante - Nas conversas importantes, ignorarase o estado «Non molestar» - Hora incorrecta Convites Unirse a conversas abertas - Conservar - Debe promover un novo moderador antes de poder abandonar a conversa + Manter + Debe promover un novo moderador antes de poder deixar a conversa %1$s | Última modificación: %2$s - Abandonar a conversa + Deixar a conversa Abandonando a chamada… Licenza Pública Xeral GNU, versión 3 licenza @@ -322,12 +299,6 @@ Sen definir Marcar como lido Marcar como sen ler - Conversa marcada como importante - Conversa sen marcar como sensíbel - Conversa marcada como sensíbel - Conversa sen marcar como importante - Rematou a xuntanza - Mensaxe engadida ás notas Fallado Produciuse un fallo ao enviar a mensaxe: Sen conexión @@ -335,7 +306,6 @@ Mensaxe lida Enviando Mensaxe enviada - O micrófono está activado e estase a gravar o son Para activar a comunicación por voz, conceda o permiso de «Micrófono». Perdeu unha chamada de %s Moderador @@ -349,8 +319,8 @@ Non hai conversas abertas Non hai conversas abertas ás que poida unirse.\nNon hai conversas abertas ou xa se uníu a todas. Sen proxy - Vde. non ten permiso para activar o son! - Vde. non ten permiso para activar o vídeo! + Non ten permiso para activar o son! + Non ten permiso para activar o vídeo! Agora non %1$s na canle de notificación %2$s Chamadas @@ -368,7 +338,6 @@ Non notificar nunca Non ten conexión, verifique a súa conectividade Aceptar - Xuntanza en curso Abrir a conversa a usuarios rexistrados Aberta tamén aos usuarios da aplicación convidados Propietario @@ -390,9 +359,6 @@ Promover a moderador Conversa pública Desactivadas as notificacións emerxentes - Desculpe, algo foi mal, o erro é %1$s - Desculpe, algo foi mal,, non foi posíbel obter a mensaxe emerxente de proba - A notificación emerxente foi enviada satisfactoriamente. Agora ten que recibir unha notificación sobre este dispositivo co título «Probas de notificacións emerxentes» Prema para falar Co microfono desactivado, prema e manteña para usar a función «Prema para falar» Lembrarmo más adiante @@ -405,7 +371,6 @@ Cambiar o nome Responder Responder en privado - A sala foi reservada satisfactoriamente Gardar Gardadao satisfactoriamente 30 segundos @@ -420,10 +385,6 @@ Buscar Limpar a busca Seleccione unha conta - Actualizar a mensaxe - Enviar a gravación de voz - Conversa sensíbel - A vista previa da mensaxe estará desactivada na lista de conversas e nas notificacións %1$s enviou un GIF. Vde. enviou un GIF. %1$s enviou un vídeo. @@ -494,7 +455,6 @@ A versión do servidor é demasiado antiga e non é compatíbel con esta versión da aplicación para Android Servidor non admitido A aplicación de notificacións do servidor non está instalada - Definido polo aforrador de batería Escuro Usar o predeterminado do sistema tema @@ -522,14 +482,9 @@ Cando as notificacións non estean configuradas correctamente, amosa unha advertencia periódica Amosar a advertencia de notificación periódica Ordenar por - Iniciar unha parola en grupo Hora de comezo Cambiar de conta Equipo - Proba das notificacións emerxentes - Resultados da proba - Hoxe ás %1$s - Mañá ás %1$s Escoller os ficheiros Quere enviar estes ficheiros a %1$s? Quere enviar este ficheiro a %1$s? @@ -551,21 +506,13 @@ Seminario web Si Semana seguinte - Non hai conversas arquivadas Non se gardou ningunha mensaxe sen conexión Non hai integración do número de teléfono por mor da falta de permisos - Todas as mensaxes - Só as mencións con \@ - Apagado - Predeterminado - Seguir os axustes da conversa 1 hora En liña Estado en liña Conversas abertas Abrir na aplicación de Ficheiros - Abrir Notas - Ir ao fío Reproducir/poñer en pausa a mensaxe de voz Control da velocidade de reprodución Engadir unha opción @@ -585,11 +532,9 @@ Votar Voto enviado Estabelecido previamente - Non foi posíbel ler o código QR. Erguer a man Todo Non é posible compartir ficheiros desde o almacenamento sen permisos - Fíos recentes Estase a gravar a chamada Cancelar o inicio da gravación Produciuse un fallo na gravación. Póñase en contacto coa administración desta instancia. @@ -627,7 +572,7 @@ Seleccionado Enviar o correo Enviar a - Vde. non ten permiso para compartir contido nesta parola + Non ten permiso para compartir contido nesta parola Enviar a… Enviar sen notificación Definir @@ -646,8 +591,7 @@ Amosar o motivo da expulsión Amosar os participantes expulsados Favorito - Vde. non ten permiso para iniciar unha chamada - Crear un fío + Non ten permiso para iniciar unha chamada iniciar unha chamada Mensaxe de estado Estado revertido @@ -666,11 +610,6 @@ Esta semana Esta é unha mensaxe de proba Este fin de semana - Cancelar a creación do fío - Notificacións de fíos - Responder - Título do fío - Non se atopou ningún fío Hoxe Mañá Traducir @@ -694,7 +633,7 @@ Enviar un novo avatar desde o dispositivo %1$s está fóra da oficina e é posíbel que non responda %1$s hoxe está fóra da oficina - Substitución: + Substitución: Avatar do usuario Enderezo Nome completo @@ -712,14 +651,6 @@ Ver %d mensaxe semellante Ver %d mensaxes semellantes - - Esta conversa eliminarase automaticamente para todos con %1$d día sen actividade. - Esta conversa eliminarase automaticamente para todos aos %1$d días sen actividade. - - - %d resposta - %d respostas - %d voto %d votos diff --git a/app/src/main/res/values-hr/strings.xml b/app/src/main/res/values-hr/strings.xml index e6ea335..0ff9f88 100644 --- a/app/src/main/res/values-hr/strings.xml +++ b/app/src/main/res/values-hr/strings.xml @@ -8,7 +8,6 @@ Zvučnik Avatar Odsutan - Zauzeto Kalendar Odaberi avatar iz oblaka Izbriši poruku statusa @@ -26,7 +25,6 @@ Nedavni Šifrirano Spremanje %1$s nije uspjelo - 15 minuta mapa Učitavanje… %1$s (%2$d) @@ -112,7 +110,7 @@ Izbriši sve Izbriši razgovor Ako izbrišete razgovor, također će biti izbrisan za sve ostale sudionike. - Izbriši poruku + Izbriši Poruka je uspješno izbrisana, ali je možda prenesena u druge usluge Ukloni moderatora Snimi glasovnu poruku @@ -335,7 +333,6 @@ Da Sljedeći tjedan Integracija broja telefona nije moguća jer nedostaje dopuštenje - Zadani 1 sat Na mreži Status na mreži diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index a9ed840..5add234 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -22,7 +22,6 @@ Tiltás Résztvevő letiltása Tiltólista - Foglalt Naptár Speciális hívásbeállítások A hívás egy órája tart. @@ -61,7 +60,6 @@ Hiba történt a csevegések betöltése során Hiba történt a résztvevő tiltásának visszavonása során Sikertelen mentés: %1$s - 15 perc mappa Betöltés… %1$s (%2$d) @@ -181,7 +179,7 @@ Összes törlése Beszélgetés törlése Ha törli a beszélgetést, akkor az összes többi résztvevő számára is törölve lesz. - Üzenet törlése + Törlés Az üzenet törlése sikeresen megtörtént, de lehet, hogy az már megjelent más szolgáltatásokon Törlés most %1$s felhasználó el lett távolítva @@ -543,9 +541,6 @@ Nincs archivált beszélgetés Nincs mentett offline üzenet A hiányzó engedélyek miatt nincs telefonszám-integráció - Minden üzenet - csak @-megemlítések - Alapértelmezett 1 óra Elérhető Elérhető állapot diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml index 8d7399b..1e829f5 100644 --- a/app/src/main/res/values-it/strings.xml +++ b/app/src/main/res/values-it/strings.xml @@ -3,8 +3,6 @@ Modifica Aggiungi Cerca in %s - Appari non in linea - Archivia conversazione Archiviati Archiviato %1$s Bluetooth @@ -15,7 +13,6 @@ Stato impostato automaticamente Avatar Assente - Occupato Calendario Opzioni avanzate per le chiamate Chiama senza notifica @@ -39,11 +36,9 @@ Cifrato Si è verificato un problema durante il caricamento delle tue chat Salvataggio di %1$s fallito - 15 minuti cartella Caricamento … %1$s (%2$d) - Argomenti seguiti 4 ore Invisibile Più tardi oggi @@ -134,7 +129,7 @@ Elimina tutto Elimina conversazione Se elimini la conversazione, sarà eliminata anche per tutti i partecipanti. - Elimina messaggio + Elimina Messaggio eliminato correttamente, ma potrebbe essere stato distribuito ad altri servizi Declassa da moderatore Registra messaggio vocale @@ -172,7 +167,6 @@ Recupero delle impostazioni di segnalazione non riuscito Accetta Rifiuta - Nessun invito in attesa Indietro Utente che segue un collegamento pubblico Tu: %1$s @@ -192,10 +186,7 @@ Condividi collegamento della conversazione Digita un messaggio … Conversazione importante - Lo stato utente “Non disturbare” viene ignorato per le conversazioni importanti. Inviti - Entra nelle conversazioni aperte - Devi promuovere un nuovo moderatore prima di poter lasciare la conversazione. %1$s | Ultima modifica: %2$s Lascia la conversazione Chiusura della chiamata in corso … @@ -257,7 +248,6 @@ Riservatezza Informazioni personali Promuovi a moderatore - Conversazione pubblica Notifiche push disabilitate Premi per parlare Con il microfono disabilitato, fai clic e mantieni per utilizzare Premi per parlare @@ -282,8 +272,6 @@ Cerca Svuota ricerca Seleziona account - Conversazione delicata - L\'anteprima dei messaggi sarà disabilitata nell\'elenco delle conversazioni e nelle notifiche. %1$s ha inviato una GIF. Hai inviato una GIF. %1$s ha inviato un video. @@ -390,8 +378,6 @@ Sì Settimana successiva Nessuna integrazione del numero di telefono a causa di autorizzazioni mancanti - Spento - Predefinito 1 ora In linea Stato in linea @@ -410,9 +396,7 @@ Tutti La condivisione dei file dall\'archiviazione non è possibile senza permessi Il permesso di registrazione è richiesto per tutte le call - Richiedi il consenso alla registrazione prima di partecipare alla chiamata in questa conversazione Permesso di registrazione - La chiamata potrebbe essere registrata. Registrazione Ripristina stato Salva @@ -467,9 +451,7 @@ Traduzione fallita Da A - Disarchivia conversazione Non archiviato %1$s - Rimuovi ban Da leggere Carica nuovo avatar dal dispositivo Avatar dell\'utente diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index c639afd..52a50a2 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -5,7 +5,6 @@ メモに追加する %1$s会話をお気に入りに追加した %sを検索 - オフライン 会話をアーカイブ アーカイブ済み Bluetooth @@ -16,7 +15,6 @@ あなたのステータスは自動的に設定されました アバター 離席中 - ビジー カレンダー 高度なコールオプション 通話が1 時間経過 @@ -47,7 +45,6 @@ 全員の通話を終了する あなたのチャットの読み込み中に問題が発生しました %1$sの保存に失敗しました - 15分 フォルダー 読み込み中… %1$s (%2$d) @@ -80,7 +77,6 @@ 入力して検索を開始 … 検索… メッセージ - 全ての通知をミュートします 選択したアカウントがインポートされ、使用可能になりました バージョン情報 アクティブなユーザー @@ -164,7 +160,7 @@ 全て削除 会話を削除 会話を削除すると、ほかの参加者でも一緒に解除されます。 - メッセージを削除 + 削除 メッセージは削除されましたが、他サービスへは転送されている可能性があります。 ユーザー%1$sは削除されました モデレータから降格 @@ -482,8 +478,6 @@ はい 来週 利用権限がないため、電話番号統合ができません。 - \@で直接会話 - デフォルト 1時間 オンライン オンラインステータス diff --git a/app/src/main/res/values-ko/strings.xml b/app/src/main/res/values-ko/strings.xml index 2b115ba..e0ab1cd 100644 --- a/app/src/main/res/values-ko/strings.xml +++ b/app/src/main/res/values-ko/strings.xml @@ -3,7 +3,6 @@ 편집 추가 %s 검색 - 접속 안함으로 표시 보관된 블루투스 오디오 출력 @@ -12,7 +11,6 @@ 유선 헤드셋 아바타 자리비움 - 바쁨 일정 통화가 한 시간동안 진행되었습니다. 알림 없이 전화하기 @@ -37,7 +35,6 @@ 모든 이들에 대해 통화 끝내기 당신의 채팅을 불러들이는데 문제가 생겼습니다. %1$s 저장 실패 - 15분 폴더 불러오는 중 … %1$s (%2$d) @@ -62,7 +59,6 @@ ...를 검색하기 위하여 입력을 시작합니다 ...를 검색 메시지 - 모든 알림을 음소거 선택한 계정을 가져왔고 사용할 수 있음 정보 활성 사용자 @@ -133,7 +129,7 @@ 모두 삭제 대화 삭제 대화를 삭제하면 다른 모든 참가자에게서도 삭제됩니다. - 메시지 삭제 + 삭제 메시지가 성공적으로 삭제되었지만, 다른 서비스에 노출되었을 수 있습니다. 중재자 권한 제거 음성 메시지 녹음 @@ -390,8 +386,6 @@ 예 다음주 권한 없음으로 인하여 전화 번호를 통합하지 않습니다. - \@-언급만 - 디폴트 1시간 접속 중 접속 상태 diff --git a/app/src/main/res/values-land/dimens.xml b/app/src/main/res/values-land/dimens.xml index 28a9a9f..740d407 100644 --- a/app/src/main/res/values-land/dimens.xml +++ b/app/src/main/res/values-land/dimens.xml @@ -2,12 +2,10 @@ 24dp - 110dp diff --git a/app/src/main/res/values-lt-rLT/strings.xml b/app/src/main/res/values-lt-rLT/strings.xml index 36191bd..bc4ac81 100644 --- a/app/src/main/res/values-lt-rLT/strings.xml +++ b/app/src/main/res/values-lt-rLT/strings.xml @@ -3,7 +3,6 @@ Taisyti Pridėti Ieškoti %s - Atrodyti atsijungusiu Archyvuota Bluetooth Garso išvestis @@ -11,7 +10,6 @@ Jūsų būsena buvo nustatyta automatiškai Avataras Atsitraukęs - Užimtas laikas Kalendorius Išplėstinės skambučio parinktys Atsisakyti prisijungimo @@ -30,7 +28,6 @@ Taisyti laišką Paskiausi Nepavyko įrašyti %1$s - 15 minučių aplankas Įkeliama… %1$s (%2$d) @@ -52,7 +49,6 @@ Rašykite norėdami atlikti paiešką… Ieškoti… Žinutės - Išjungti visus pranešimus Dabar, pasirinkta paskyra yra importuota ir prieinama Apie Aktyvus naudotojas @@ -116,7 +112,7 @@ Ištrinti visus Ištrinti pokalbį Jei ištrinsite pokalbį, jis taip pat bus ištrintas visiems kitiems dalyviams. - Ištrinti laišką + Ištrinti Pažeminti iš moderatorių Siųsti žinutę Dabartinė paskyra @@ -314,7 +310,6 @@ Internetinis seminaras Taip Kita savaitė - Numatytasis 1 valanda Prisijungęs Prisijungimo būsena @@ -366,7 +361,6 @@ Šią savaitę Tai yra bandomoji žinutė Šį savaitgalį - Atsakyt Šiandiena Rytoj Verskite diff --git a/app/src/main/res/values-nb-rNO/strings.xml b/app/src/main/res/values-nb-rNO/strings.xml index 1f756ec..a597d66 100644 --- a/app/src/main/res/values-nb-rNO/strings.xml +++ b/app/src/main/res/values-nb-rNO/strings.xml @@ -5,7 +5,6 @@ Legg til notater La til samtale %1$s i favoritter Søk i %s - Vis som frakoblet Arkivert Bluetooth Lydutgang @@ -19,7 +18,6 @@ Utesteng Utesteng deltaker Liste over utestengelser - Opptatt Kalender Avanserte samtalealternativer Samtalen har pågått i én time. @@ -53,7 +51,6 @@ Det oppstod et problem med å laste inn chattene dine Det oppstod feil ved oppheving av utestengelse av deltaker Kunne ikke lagre %1$s - 15 minutter mappe Laster ... %1$s (%2$d) @@ -87,7 +84,6 @@ Begynn å skrive for å søke... Søk... Meldinger - Demp alle varslinger Valgt konto er nå importert og tilgjengelig Om Aktiv bruker @@ -171,7 +167,7 @@ Slett alle Slett samtale Hvis du sletter samtalen, blir den også slettet for alle andre deltakere. - Slett melding + Slett Meldingen ble slettet, men den kan ha blitt lekket til andre tjenester Bruker %1$s ble fjernet Fjern moderatorstatus @@ -494,10 +490,6 @@ Ja Neste uke Ingen telefonnummerintegrasjon på grunn av manglende rettigheter - Alle meldinger - kun @-nevner - Av - Forvalg 1 time Pålogget Online-status diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml index 3623f75..05d9f10 100644 --- a/app/src/main/res/values-night/colors.xml +++ b/app/src/main/res/values-night/colors.xml @@ -13,6 +13,7 @@ @color/colorPrimary #ff6F6F6F + #1E1E1E #FFFFFF @@ -39,9 +40,6 @@ #484848 - - #33000000 - #121212 #2A2A2A diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index c2a3dbb..c698e66 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -5,7 +5,6 @@ Toevoegen aan Notities Gesprek %1$s toegevoegd aan favorieten Zoeken in %s - Toon afwezig Archiveer gesprek Wanneer een gesprek wordt gearchiveerd is het standaard verborgen. Selecteer de filter \"Gearchiveerd\" om gearchiveerdde gesprekken te zien. Directe vermeldingen worden nog steeds ontvangen. Gearchiveerd @@ -23,7 +22,6 @@ Blokkeer Blokkeer deelnemer Blokkeerlijst - Bezet Agenda Geavanceerde oproepopties Dit gesprek is actief gedurende een uur @@ -61,7 +59,6 @@ Het laden van uw gesprekken was problematisch Fout opgetreden bij deblokkeren deelnemer Kon %1$s niet opslaan - 15 minuten map Laden … %1$s (%2$d) @@ -97,7 +94,6 @@ Begin met typen om te zoeken Zoeken ... Berichten - Onderdruk alle meldingen Het geselecteerde account is nu geïmporteerd en beschikbaar Over Actieve gebruiker @@ -182,7 +178,7 @@ Alles verwijderen Verwijder gesprek Als je het gesprek verwijdert, wordt het ook verwijderd voor alle andere deelnemers. - Bericht verwijderen + verwijderen Het bericht is verwijderd, maar het is mogelijk gelekt naar andere services Verwijder nu Gebruiker %1$s is verwijderd @@ -546,7 +542,6 @@ Kies er eentje van een provider. Geen gearchiveerde gesprekken Geen offline berichten bewaard Geen telefoonnummer-integratie wegens ontbrekende machtigingen - Standaard 1 uur Online Online status diff --git a/app/src/main/res/values-pl/strings.xml b/app/src/main/res/values-pl/strings.xml index c5b4f8f..2529ee1 100644 --- a/app/src/main/res/values-pl/strings.xml +++ b/app/src/main/res/values-pl/strings.xml @@ -5,7 +5,6 @@ Dodaj do Notatek Dodano rozmowę %1$s do ulubionych Szukaj w %s - Wyglądaj jako offline Archiwizuj rozmowę Po zarchiwizowaniu rozmowa zostanie domyślnie ukryta. Wybierz filtr „Zarchiwizowane”, aby wyświetlić zarchiwizowane rozmowy. Bezpośrednie wzmianki będą nadal otrzymywane. Zarchiwizowane @@ -23,7 +22,6 @@ Blokowanie Zablokuj uczestnika Lista zablokowanych - Brak dostępności Kalendarz Zaawansowane opcje połączeń Połączenie trwa od godziny. @@ -63,11 +61,9 @@ Wystąpił problem z wczytaniem Twoich czatów Wystąpił błąd podczas odblokowywania uczestnika Nie udało się zapisać %1$s - 15 minut katalog Wczytywanie… %1$s (%2$d) - Obserwowane wątki 4 godziny Nie udało się pobrać oczekujących zaproszeń (edytowane) @@ -80,10 +76,6 @@ Opuściłeś rozmowę %1$s Wczytaj więcej wyników Czas lokalny: %1$s - Odmowa dostępu do lokalizacji - Proszę włączyć w ustawieniach aplikacji - Usługi lokalizacji wyłączone - Proszę włączyć usługi lokalizacji (GPS), aby użyć tej funkcji Zablokuj rozmowę Symbol zamknięcia Opuścić rękę @@ -97,7 +89,6 @@ Od największych Od najmniejszych Wiadomość skopiowana - Czy na pewno chcesz usunąć tę wiadomość? Wiadomość usunięta przez Ciebie Edytowany przez %1$s Dotknij, aby otworzyć sondę @@ -105,7 +96,6 @@ Zacznij pisać, aby wyszukać… Szukaj… Wiadomości - Wycisz wszystkie powiadomienia Wybrane konto jest teraz zaimportowane i dostępne O aplikacji Aktywny użytkownik @@ -190,7 +180,7 @@ Usuń wszystko Usuń rozmowę Jeśli usuniesz rozmowę, zostanie ona również usunięta dla wszystkich pozostałych uczestników. - Usuń wiadomość + Usuń Wiadomość została pomyślnie usunięta, ale mogła przedostać się do innych usług Usuń teraz Użytkownik %1$s został usunięty @@ -554,11 +544,6 @@ Brak zarchiwizowanych rozmów Nie zapisano żadnych wiadomości offline Brak integracji numeru telefonu z powodu braku uprawnień - Wszystkie wiadomości - Tylko, gdy @-wspomniano - Wyłączone - Domyślny - Śledź ustawienia rozmowy 1 godzina Online Status online @@ -568,6 +553,7 @@ Przejdź do wątku Odtwórz/wstrzymaj wiadomość głosową Kontrola prędkości odtwarzania + Proszę kontynuować proces logowania w przeglądarce Dodaj opcję Edytuj głos Zakończ sondę @@ -645,9 +631,10 @@ Połączenie głosowe Pokaż powód zablokowania Pokaż zablokowanych uczestników + Pokaż wątki Ulubione Nie możesz rozpocząć połączenia - Utwórz wątek + Rozpocznij wątek rozpoczął połączenie Komunikat statusu Status przywrócone @@ -666,11 +653,8 @@ W tym tygodniu To jest wiadomość testowa W ten weekend - Anuluj tworzenie wątku - Powiadomienia wątków - Odpowiedź + %1$d odpowiedzi Tytuł wątku - Nie znaleziono wątków Dzisiaj Jutro Tłumaczenie @@ -720,12 +704,6 @@ Ta konwersacja zostanie automatycznie usunięta dla wszystkich po %1$d dniach braku aktywności. Ta konwersacja zostanie automatycznie usunięta dla wszystkich po %1$d dniach braku aktywności. - - %d odpowiedź - %d odpowiedzi - %d odpowiedzi - %d odpowiedzi - %d głos %d głosy diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index 7dda2b8..f4e78c4 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -5,7 +5,6 @@ Adicionar a Notas Conversa %1$s adicionada para favoritos Pesquisar em %s - Aparecer off-line Arquivar conversa Quando uma conversa for arquivada, ela ficará oculta por padrão. Selecione o filtro \"Arquivada\" para visualizar as conversas arquivadas. As menções diretas ainda serão recebidas. Arquivada @@ -23,7 +22,6 @@ Banir Banir participante Lista de banimentos - Ocupado Calendário Opções avançadas de chamada A chamada está em andamento há uma hora. @@ -63,11 +61,9 @@ Ocorreu um problema ao carregar seus bate-papos Ocorreu um erro ao cancelar o banimento do participante Falha ao salvar %1$s - 15 minutos pasta Carregando … %1$s (%2$d) - Fios seguidos 4 horas Falha ao buscar convites pendentes (editado) @@ -80,10 +76,6 @@ Você saiu da conversa %1$s Carregar mais resultados Horário local: %1$s - Permissão de localização negada - Por favor, ative-a nas configurações do aplicativo - Serviços de localização desativados - Ative os serviços de localização (GPS) para usar este recurso Bloquear conversa Símbolo de cadeado Baixar mão @@ -97,7 +89,6 @@ Maior primeiro Menor primeiro Mensagem copiada - Tem certeza de que deseja excluir esta mensagem? Mensagem excluída por você Editado por %1$s Toque para abrir enquete @@ -105,7 +96,6 @@ Comece a digitar para pesquisar … Pesquisar … Mensagens - Silenciar todas as notificações A conta selecionada agora está importada e disponível Sobre Usuário ativo @@ -190,7 +180,7 @@ Excluir todos Excluir conversa Se você excluir a conversa, ela também será excluída para todos os outros participantes. - Excluir mensagem + Excluir Mensagem excluída com sucesso, mas pode ter sido vazada para outros serviços Excluir agora Usuário %1$s foi removido @@ -554,11 +544,6 @@ Nenhuma conversa arquivada Nenhuma mensagem off-line foi salva Sem integração de número de telefone devido à falta de permissões - Todas as mensagens - Apenas menções de @ - Desativado - Padrão - Seguir as configurações da conversa 1 hora On-line Status on-line @@ -568,6 +553,7 @@ Ir para fio Reproduzir/pausar mensagem de voz Controle de velocidade de reprodução + Por favor, continue o processo de login no navegador Adicionar opção Editar voto Encerrar enquete @@ -645,9 +631,10 @@ Voz Mostrar motivo do banimento Mostrar participantes banidos + Mostrar fios Favorito Você não tem permissão para iniciar uma chamada - Criar um fio + Iniciar um fio iniciou uma chamada Mensagem de status Status Revertido @@ -666,9 +653,7 @@ Esta semana Esta é uma mensagem de teste Este fim de semana - Cancelar a criação do fio - Notificações de fios - Responder + %1$d respostas Título do fio Hoje Amanhã @@ -717,11 +702,6 @@ Esta conversa será excluída automaticamente para todos em %1$d de dias sem atividade Esta conversa será excluída automaticamente para todos em %1$d dias sem atividade - - %d resposta - %d de respostas - %d respostas - %d voto %d votos diff --git a/app/src/main/res/values-ru/strings.xml b/app/src/main/res/values-ru/strings.xml index c72b8b1..8e6dc5d 100644 --- a/app/src/main/res/values-ru/strings.xml +++ b/app/src/main/res/values-ru/strings.xml @@ -3,14 +3,9 @@ Редактирование Добавить Добавить в заметки - Обсуждение добавлено %1$s в избранное Искать в %s - \"Не в сети\" для остальных Архивировать обсуждение - После архивации обсуждение будет скрыто по-умолчанию. Выберите фильтр \"Архивировано\", чтобы увидеть архивированные обсуждения. Прямые упоминания все еще будут получены. В архиве - Архивировано %1$s - Голосовой звонок Bluetooth Аудиовыход Телефон @@ -19,11 +14,6 @@ Ваш статус был установлен автоматически Аватар Отошёл - Кнопка Назад - Заблокировать - Заблокировать участника - Список заблокированных - Занят Календарь Дополнительные настройки звонка Звонок длится уже час @@ -34,27 +24,19 @@ Очистить сообщение о статусе Очищать статус после Закрыть - Значок Закрыть Соединение установлено - Нет подключения к серверу Соединение потеряно - отправленные сообщения ставятся в очередь Блокировка записи для непрерывной записи голосового сообщения - Обсуждение архивировано Разговор доступен только для чтения - Ошибка установки обсуждения только на чтение Беседы Создать беседу - Создать запрос Задать Опасная зона - %1$s в %2$s Удалить аватар - Удалить голосовую запись Удалённый чат %1$s Не беспокоить Не очищать Редактировать - Сообщения старше 24 часов нельзя редактировать Редактировать сообщение Недавние Зашифровано @@ -63,18 +45,14 @@ Возникла проблема при загрузке ваших чатов Произошла ошибка при разблокировке участника Не удалось сохранить %1$s - 15 минут каталог Загрузка … %1$s (%2$d) - Отслеживаемые темы 4 часа Не удалось получить ожидающие приглашения (изменено) Внутреннее примечание Невидимый - Языки не могут быть извлечены - Не удалось получить Позже сегодня Покинуть вызов Вы покинули чат %1$s @@ -92,8 +70,6 @@ Я - А Самый большой первый Самый маленький первый - Сообщение скопировано - Вы уверены, что хотите удалить это сообщение? Сообщение удалено вами Изменено %1$s Нажмите для открытия опроса @@ -101,7 +77,6 @@ Начните печатать для поиска … Поиск … Сообщения - Без уведомлений Выбранная учётная запись теперь доступна О программе Активный пользователь @@ -186,7 +161,7 @@ Удалить все Удалить беседу При удалении беседы, она будет также удалена у других участников - Удалить сообщение + Удалить Сообщение удалено, но его содержимое могло быть прочитано другими службами Удалить сейчас Пользователь %1$s был удален @@ -204,30 +179,13 @@ Зарегистрированные пользователи Версия приложения Оптимизация батареи игнорируется, все в порядке - Включена оптимизация батареи, что может вызвать проблемы. Вам нужно отключить оптимизацию батареи! Настройки батареи Устройство Открыть контрольный список устранения неполадок Открыть экран диагностики Открыть dontkillmyapp.com - Получение последнего пуш-токена firebaseпоследнийпоследний - Генерация последнего пуш-токена firebase - Не установлен пуш-токен firebase. Создайте сообщение о проблеме. - Пуш-токен firebase - Сервисы Google Play недоступны. Уведомления не поддерживаются - Сервисы Google Play - Сервисы Google Play доступны - Последняя пуш-регистрация на пуш-прокси - Пока не зарегистрирован на пуш-прокси - Последняя пуш-регистрация на сервере - Пока не зарегистрирован на сервере - Общее уведомление - Генерация отчета системы - Включен ли канал голосовых звонков? - Включен ли канал уведомлений? Разрешения на уведомления Телефон - Версия Talk на сервере Версия сервера Внешний Внутренние @@ -249,8 +207,6 @@ Редактирование Редактировать сообщение Изменено администратором - Меню обсуждения события - Расписание 8 часов 4 недели Отключить @@ -262,12 +218,10 @@ Не удалось получить параметры сигнализации Принять Отклонить - из %1$s на %2$s Нет ожидающих приглашений У вас есть ожидающие приглашения Назад Требуется разрешение на доступ к файлу - Фильтровать обсуждения Пользователь, вошедший по ссылке Вы: %1$s Переслать @@ -291,11 +245,9 @@ Приглашения были разосланы повторно. Поделиться ссылкой на беседу Напишите сообщение … - Оптимизация батареи не игнорируется. Это необходимо изменить, чтобы уведомления работали в фоне. Нажмите OK и выберите \"Все приложения\" -> %1$s -> Не оптимизировать Игнорировать оптимизацию батареи Важное обсуждение Статус «Не беспокоить» игнорируется для важных обсуждений - Некорректное время Приглашения Присоединиться к открытым обсуждениям Сохранить @@ -318,12 +270,6 @@ Не задано Отметить прочитанным Отметить непрочитанным - Обсуждение помечено как важное - Обсуждение не помечено как конфиденциальное - Обсуждение помечено как конфиденциальное - Обсуждение не помечено как важное - Встреча завершена - Сообщение добавлено в записки Не удалось Не удалось отправить сообщение: Не в сети @@ -331,7 +277,6 @@ Сообщение прочитано Отправка Сообщение отправлено - Микрофон включен, и беседа записывается Для включения голосовой связи предоставьте разрешение «Микрофон». Вы пропустили звонок от %s Модератор @@ -343,7 +288,6 @@ Гость Нет Нет открытых чатов - Нет открытых обсуждений, к которым вы могли бы присоединиться. Либо открытых обсуждений нет, либо вы уже подключились ко всем. Не использовать прокси-сервер Вам запрещено активировать аудио! Вам запрещено активировать видео! @@ -356,7 +300,6 @@ Загрузки Уведомление о ходе загрузки Параметры уведомлений - Уведомления некорректно настроены Разрешение на уведомления и настройки батареи настроены правильно для получения уведомлений. Если у вас всё равно возникли проблемы с получением уведомлений, проверьте, включены ли каналы уведомлений для звонков и сообщений. Дополнительную помощь можно найти на сайте DontKillMyApp.com или в контрольном списке устранения неполадок. Если это не помогло, перейдите на экран диагностики и отправьте отчёт об ошибке. Устранение неполадок с уведомлениями Всегда уведомлять @@ -364,7 +307,6 @@ Не уведомлять Нет подключения к сети, пожалуйста, проверьте ваше соединение ОК - Идущая беседа Открыть обсуждение для зарегистрированных пользователей Открыть для гостей Владелец @@ -373,7 +315,6 @@ Пароль Установить разрешения В некоторых разрешениях было отказано. - Пожалуйста, разрешить права доступа Открыть настройки Пожалуйста, предоставьте разрешения в разделе «Настройки» > «Разрешения». Учётная запись не найдена @@ -386,29 +327,23 @@ Назначить модератором Открытое обсуждение Всплывающие уведомления отключены - Что-то пошло не так, ошибка %1$s - Что-то пошло не так, не могу получить тестовое пуш-сообщение - Пуш-сообщение отправлено успешно. Вы теперь должны получить сообщение на этом устройстве с заголовком \"Тестирование пуш-сообщений\" PTT (нажми чтобы говорить) Нажмите и удерживайте для использования PTT при отключённом микрофоне Напомнить позже Удалить из избранного Удалить группу и её участников Удалить участника - Удалить пароль Исключить команду и её участников Переименовать разговор Переименовать Ответить Ответить личным сообщением - Комната сохранена успешно Сохранить Сохранено успешно 30 секунд 5 минут 1 минута 10 минут - Немедленно 600 60 30 @@ -416,8 +351,6 @@ Поиск Очистить поиск Выберите учётную запись - Обновить сообщение - Послать голосовую запись Конфиденциальное обсуждение Предварительный просмотр сообщений будет отключен в списке обсуждений и уведомлениях %1$s отправил(а) GIF. @@ -428,7 +361,6 @@ Вы отправили аудиофайл. %1$s отправил(а) изображение. Вы отправили изображение. - %1$s отправил карточку Проверить соединение с сервером Обновите базу данных %1$s Не удалось импортировать выбранную учётную запись @@ -450,9 +382,7 @@ Дополнительно Внешний вид Вызовы - Свяжитесь с администратором Откройте экран диагностики, чтобы проверить настройки или создать отчёт об ошибке. - Диагностика Указывает клавиатуре отключить персонализированное обучение (без гарантий) Клавиатура инкогнито Без звука @@ -489,8 +419,6 @@ Версия сервера очень старая и не будет поддерживаться в следующем релизе! Версия сервера слишком старая и не поддерживается данной версией приложения Android Неподдерживаемый сервер - Приложение сообщений от сервера не установлно - Установлено охранителем батареи Тёмное Как в системе стиль оформления @@ -515,17 +443,10 @@ Нет общих элементов Местоположение Местоположением поделились - Если уведомления настроены неверно, показывать регулярное предупреждение - Показывать регулярное предупреждение Сортировать по - Начать групповой чат Время начала Сменить аккаунт Команда - Проверить пуш-уведомления - Результаты теста - Сегодня в %1$s - Завтра в %1$s Выберите файлы Отправить эти файлы %1$s? Отправить этот файл %1$s? @@ -547,12 +468,7 @@ Вебинар Да Следующая неделя - Отсутствуют архивированные обсуждения - Нет сохраненных оффлайн сообщений Отсутствуют разрешения на интеграцию номера телефона - Отключить - По умолчанию - Следовать настройкам обсуждения 1 час В сети Онлайн статус @@ -561,15 +477,12 @@ Открыть примечания Перейти в тему Воспроизведение/пауза голосового сообщения - Управление скоростью вопроизведения Добавить вариант Изменить голос Завершить опрос Вы действительно хотите закончить этот опрос? Это нельзя отменить. Вы не можете голосовать с несколькими вариантами для этого опроса. Множество ответов - Удалите опцию %1$d - Опция %1$d Варианты Закрытый опрос Вопрос @@ -593,13 +506,10 @@ Остановить запись Запись останавливается... Согласие на запись вызова требуется для всех вызовов - В записи могут оказаться ваш голос, видео с камеры и изображения экрана. Ваше согласие необходимо перед присоединением ко звонку. Вы согласны? Требовать согласие на запись вызова перед присоединением к вызову в этом обсуждении Согласие на запись вызова Звонок может быть записан. Запись - Удалено обсуждение %1$s из избранного - Обсуждение %1$s переименовано Отправить заново Сбросить статус Невозможно присоединиться к другим комнатам находясь в звонке @@ -629,7 +539,6 @@ Установить статус Установить статус Поделиться - Вступить в обсуждение %1$s в %2$s Звук Файл Медиа @@ -637,14 +546,11 @@ Опрос Запись звонка Голосовая почта - Показать причину блокировки - Показать заблокированных участников + Показать темы Избранное Вам не разрешено звонить - Создать тему - начал(-а) звонок + Начать тему Описание статуса - Статус возвращен Перейти в комнат отдыха Перейти в основную комнату Сфотографировать @@ -658,11 +564,8 @@ Переключатель фонарика 30 минут Эта неделя - Это тестовое сообщение Эти выходные - Отменить создание темы - Уведомления для темы - Ответ + %1$d ответов Заголовок темы Сегодня Завтра @@ -680,13 +583,9 @@ печатает... и ещё %1$s собеседника печатают... Разархивировать обсуждение - После разархивирования обсуждения оно будет видимо по-умолчанию - Разархивировано %1$s Разбанить Непрочитанное Загрузить новый аватар с устройства - %1$s находится вне офиса и может не ответить - %1$s вне офиса сегодня Замена: Изображение профиля Адрес @@ -699,24 +598,11 @@ Не удалось получить личную информации о пользователе Личная информация не указана На странице профиля укажите своё имя, добавьте изображение и подробные сведения - Видеозвонок Какой у вас статус? - - Посмотреть %d похожее сообщение - Посмотреть %d похожих сообщения - Посмотреть %d похожих сообщений - Посмотреть %d похожих сообщений - - - Данное обсуждение будет автоматически удалено для всех через %1$d день отсутствия активности. - Данное обсуждение будет автоматически удалено для всех через %1$d дня отсутствия активности. - Данное обсуждение будет автоматически удалено для всех через %1$d дней отсутствия активности. - Данное обсуждение будет автоматически удалено для всех через %1$d дней отсутствия активности. - %d голос %d голоса %d голосов - %d голосов + %d голоса diff --git a/app/src/main/res/values-sc/strings.xml b/app/src/main/res/values-sc/strings.xml index 04701b3..e56a0fc 100644 --- a/app/src/main/res/values-sc/strings.xml +++ b/app/src/main/res/values-sc/strings.xml @@ -3,13 +3,11 @@ Modìfica Agiunghe Chirca in %s - Mustra•ti foras de lìnia Archiviadu Telèfonu Altoparlante Avatar Ausente - Impinnadu Calendàriu Sèbera s\'avatar dae sa nue virtuale Lìmpia su messàgiu de istadu @@ -26,7 +24,6 @@ Reghente Tzifradu No at fatu a sarvare %1$s - 15 minutos cartella Carrigamentu … %1$s (%2$d) @@ -46,7 +43,6 @@ Messàgiu cantzelladu dae tue Perunu resurtadu de chirca Messàgios - Istuda totu is notìficas Su contu seletzionadu est importadu e a disponimentu In contu de Utèntzia ativa @@ -112,7 +108,7 @@ Cantzella totu Cantzella resonada Si cantzellas sa resonada, s\'at a cantzellare puru pro su restu de partetzipantes. - Cantzella messàgiu + Cantzella Messàgiu cantzelladu, ma diat pòdere èssere istadu dispensadu a àteros servìtzios Lea·ssi su permissu de moderare Registra messàgiu de boghe @@ -327,7 +323,6 @@ Eja Sa chida chi benit Peruna integratzione de nùmeru de telèfonu pro farta de permissos - Predefinidu 1 ora In lìnia Istadu in lìnia @@ -377,7 +372,6 @@ Ativa sa tortza 30 minutos Custa chida - Risponde Oe Cras Borta diff --git a/app/src/main/res/values-sk-rSK/strings.xml b/app/src/main/res/values-sk-rSK/strings.xml index e8b6f60..8bbd289 100644 --- a/app/src/main/res/values-sk-rSK/strings.xml +++ b/app/src/main/res/values-sk-rSK/strings.xml @@ -21,7 +21,6 @@ Ban Udeliť účastníkovy ban Zoznam banov - Zaneprázdnený Kalendár Pokročilé možnosti hovoru Hovor už trvá viac ako jednu hodinu. @@ -57,7 +56,6 @@ Nastal problém s načítaním vašich správ Pri rušení banu pre účastníka sa vyskytla chyba Nepodarilo sa uložiť %1$s - 15 minút priečinok Načítavam … %1$s (%2$d) @@ -174,7 +172,7 @@ Vymazať všetko Zmazať konverzáciu Ak zmažete konverzáciu, bude takisto zmazaná pre všetkých ostatných zúčastnených - Zmazať správu + Zmazať Správa úspešne odstránená, ale mohla uniknúť na iné serveri. Užívateľ %1$s bol vymazaný Odobrať moderovanie @@ -509,9 +507,6 @@ Nasledujúci týždeň Žiadne správy pri odpojení neboli uložené Registrácia telefónneho čísla nie je povolená pre chýbajúce oprávnenia - Iba zmienky v tvare @-meno - Vypnúť - Predvolené 1 hodina Pripojený Stav pripojenia @@ -614,7 +609,6 @@ Tento týždeň Toto je skúšobná správa Tento víkend - Odpovedať Dnes Zajtra Preložiť diff --git a/app/src/main/res/values-sl/strings.xml b/app/src/main/res/values-sl/strings.xml index 6fc359d..ab0bd86 100644 --- a/app/src/main/res/values-sl/strings.xml +++ b/app/src/main/res/values-sl/strings.xml @@ -3,7 +3,6 @@ Uredi Dodaj Poišči v %s - Pokaže kot brez povezave Arhivirano Bluetooth Odvod zvoka @@ -13,7 +12,6 @@ Stanje je določeno samodejno Podoba Ne spremljam - Zasedeno Koledar Napredne možnosti klica Pogovor traja že eno uro. @@ -39,7 +37,6 @@ Končaj klic za vse Prišlo je do napake nalaganja pogovorov. Shranjevanje %1$s je spodletelo. - 15 minut mapa Poteka nalaganje … %1$s (%2$d) @@ -64,7 +61,6 @@ Vpišite niz za iskanje … Poišči … Sporočila - Utiša vsa obvestila Izbran račun je uvožen in na voljo za uporabo O programu Dejavni uporabnik @@ -144,7 +140,7 @@ Izbriši vse Izbriši pogovor Če izbrišete pogovor, bo ta izbrisan za vse udeležence. - Izbriši sporočilo + Izbriši Sporočilo je uspešno izbrisano, a je lahko že poslano na druge storitve. Izbriši Ponižaj iz moderatorja @@ -412,7 +408,6 @@ Da Naslednji teden Povezava s telefonskim imenikom ni na voljo zaradi neustreznih dovoljenj. - Privzeto 1 uri Trenutno na spletu Povezano stanje diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml index b617a4d..0a3b034 100644 --- a/app/src/main/res/values-sr/strings.xml +++ b/app/src/main/res/values-sr/strings.xml @@ -5,7 +5,6 @@ Додај у Белешке Разговор %1$s је додат у омиљене Тражи у %s - Прикажи као ван мреже Архивирај разговор Када се разговор архивира, подразумевано ће бити сакривен. Да бисте видели архивиране разговоре, изаберите филтер „Архивирано”. И даље ће се примати директна помињања. Архивирано @@ -23,7 +22,6 @@ Забрана Забрани учесника Листа забрањених - Заузет Календар Напредне опције позива Позив траје један сат. @@ -63,11 +61,9 @@ Дошло је до проблема приликом учитавања ваших четова Дошло је до грешке приликом укидања забране за учесника Није успело чување %1$s - 15 минута фасцикли Учитавање… %1$s (%2$d) - Низови које пратите 4 сата Није успело добављање позивница на чекању (уређено) @@ -80,10 +76,6 @@ Напустили сте разговор %1$s Учитај још резултата Локално време: %1$s - Одбијена је дозвола за локацију - Молимо вас да је укључите у подешавањима апликације - Искључени су сервиси локације - Да бисте користили ову функционалност, молимо вас да укључите сервисе локације (GPS) Закључај разговор Симбол катанца Спуштена рука @@ -97,7 +89,6 @@ Прво највеће Прво најмање Порука је копирана - Да ли сте сигурни да желите да обришете ову поруку? Обрисали сте поруку Уредио је %1$s Тапните да отворите гласање @@ -105,7 +96,6 @@ Крените да куцате и претрага почиње ... Претрага ... Поруке - Искључи сва обавештења Одабрани налог је сада увезен и доступан О програму Активни корисник @@ -190,7 +180,7 @@ Обриши све Обриши разговор Ако обришете разговор, он ће бити обрисан и за све друге учеснике. - Обриши поруку + Избриши Порука је успешно обрисана, али је можда процурела на друге сервисе Обриши одмах Корисник %1$s је уклоњен @@ -554,11 +544,6 @@ Нема архивираних разговора Није сачувана ниједна порука за ван мреже Нема интеграције броја телефона јер недостају дозволе - Све поруке - Само @-помињања - Искључено - Подразумевано - Прати подешавања разговора 1 сат На мрежи Мрежни статус @@ -568,6 +553,7 @@ Иди на нит Пусти/паузирај гласовну поруку Контрола брзине репродукције + Молимо вас да процес пријаве наставите у интернет прегледачу Додај ставку Уреди гласање Заврши гласање @@ -647,7 +633,6 @@ Прикажи забрањене кориснике Омиљени Није вам дозвољене да започнете позив - Креирај нит је започео позив Порука стања Враћено је старо стање статуса @@ -666,11 +651,6 @@ Ове недеље Ово је тест порука Овог викенда - Откажи креирање нити - Обавештења низова - Одговори - Наслов нити - Није пронађен ниједан низ Данас Сутра Превођење @@ -718,11 +698,6 @@ Овај разговор ће се аутоматски обрисати за све након %1$d дана неактивности Овај разговор ће се аутоматски обрисати за све након %1$d дана неактивности - - %d одговор - %d одговора - %d одговора - %d глас %d гласа diff --git a/app/src/main/res/values-sv/strings.xml b/app/src/main/res/values-sv/strings.xml index 316ba5b..f0bc51c 100644 --- a/app/src/main/res/values-sv/strings.xml +++ b/app/src/main/res/values-sv/strings.xml @@ -5,7 +5,6 @@ Lägg till i anteckningar Lade till konversationen %1$s till favoriter Sök i %s - Visa som frånkopplad Arkivera konversation När en konversation väl har arkiverats döljs den som standard. Välj filtret \"Arkiverad\" för att se arkiverade konversationer. Direkta omnämnanden kommer fortfarande att tas emot. Arkiverad @@ -23,7 +22,6 @@ Blockera Blockera deltagare Blockeringslista - Upptagen Kalender Avancerade samtalsalternativ Samtalet har pågått i en timme. @@ -62,11 +60,9 @@ Det gick inte att ladda dina chattar Fel uppstod när deltagare skulle avblockeras Misslyckades att spara %1$s - 15 minuter mapp Läser in … %1$s (%2$d) - Följda trådar 4 timmar Kunde inte hämta väntande inbjudningar (redigerad) @@ -79,10 +75,6 @@ Du lämnade konversationen %1$s Visa fler resultat Lokal tid: %1$s - Behörighet för plats nekad - Aktivera det i appens inställningar - Platstjänster inaktiverat - Aktivera platstjänster (GPS) för att använda denna funktion Lås konversation Låssymbol Ta ner handen @@ -96,7 +88,6 @@ Störst först Minst först Meddelandet kopierat - Är du säker på att du vill ta bort detta meddelande? Meddelandet togs bort av dig Redigerad av %1$s Tryck för att öppna omröstningen @@ -104,7 +95,6 @@ Börja skriva för att söka ... Sök ... Meddelanden - Stäng av alla aviseringar Valt konto är nu importerat och tillgängligt Om Aktiv användare @@ -189,7 +179,7 @@ Ta bort alla Ta bort konversation Om du raderar konversationen, kommer den även att raderas för alla andra deltagare. - Radera meddelande + Radera Meddelandet har raderats, men kan ha läckt till andra tjänster Ta bort nu Användare %1$s togs bort @@ -553,9 +543,6 @@ Inga arkiverade konversationer Inga offlinemeddelanden sparade Ingen telefonnummerintegrering på grund av saknade behörigheter - Av - Förvald - Följ konversationsinställningar 1 timme Online Online-status @@ -565,6 +552,7 @@ Gå till tråd Spela/pausa röstmeddelande Kontroll av uppspelningshastighet + Fortsätt inloggningen i webbläsaren Lägg till alternativ Redigera röst Avsluta omröstning @@ -641,9 +629,10 @@ Röst Visa orsak till blockering Visa blockerade deltagare + Visa trådar Favorit Du får inte starta ett samtal - Skapa en tråd + Starta en tråd startade ett samtal Statusmeddelande Status återställd @@ -662,10 +651,7 @@ Denna vecka Detta är ett testmeddelande Denna helgen - Avbryt skapande av tråd - Trådaviseringar - Svara - Trådtitel + %1$d svar Idag I morgon Översätt @@ -711,10 +697,6 @@ Den här konversationen kommer automatiskt att tas bort för alla om %1$d dag utan aktivitet Den här konversationen kommer automatiskt att tas bort för alla om %1$d dagar utan aktivitet - - %d svar - %d svar - %d röst %d röster diff --git a/app/src/main/res/values-sw/strings.xml b/app/src/main/res/values-sw/strings.xml index cd866e3..9d99542 100644 --- a/app/src/main/res/values-sw/strings.xml +++ b/app/src/main/res/values-sw/strings.xml @@ -5,7 +5,6 @@ Ongeza katika kumbukumbu Mazungumzo yaliyoongezwa %1$skatika vipendwa Tafuta katika %s - Tokea nje ya mtandao Hifadhi mazungumzo Mara tu mazungumzo yanapowekwa kwenye kumbukumbu, yatafichwa kwa chaguo-msingi. Chagua kichujio \"Kilichohifadhiwa\" ili kutazama mazungumzo yaliyohifadhiwa. Matangazo ya moja kwa moja bado yatapokelewa. Imewekwa katika kumbukumbu @@ -23,7 +22,6 @@ Piga marufuku Mshiriki aliyepigwa marufuku Orodha iliyopigwa marufuku - Bize Kalenda Chaguzi za simu za hali ya juu Simu imekuwa ikifanya kazi kwa saa moja. @@ -63,11 +61,9 @@ Kulikuwa na tatizo kupakia chati zako Hitilafu ilitokea wakati wa kubatilisha mshiriki Imeshindwa kuhifadhi %1$s - Dakika 15 folda Inapakia %1$s (%2$d) - Mazungumzo yaliyofuatwa Masaa 4 Imeshindwa kuleta mialiko ambayo haijashughulikiwa (imehaririwa) @@ -80,10 +76,6 @@ Umeacha mazungumzo %1$s Pakia matokeo zaidi Muda wa kawaida: %1$s - Ruhusa ya eneo imekataliwa - Tafadhali iwashe katika mipangilio ya programu - Huduma za eneo zimezimwa - Tafadhali wezesha huduma za eneo (GPS) ili kutumia kipengele hiki Funga mazungumzo Funga ishara Mkono wa chini @@ -97,7 +89,6 @@ Kubwa zaidi kwanza Ndogo zaidi kwanza Ujumbe umenakiliwa - Je, una uhakika unataka kufuta ujumbe huu? Ujumbe umefutwa na wewe Imehaririwa na %1$s Bonyeza kufungua poll @@ -105,12 +96,12 @@ Anza kuchapa ili kutafuta Tafuta... Jumbe - Zima arifu zote Akaunti iliyochaguliwa sasa imeingizwa na inapatikana Kuhusu Mtumiaji anayetumia Ongeza akaunti - Akaunti imeratibiwa kufutwa, na haiwezi kubadilishwa + Akaunti imeratibiwa kufutwa, na haiwezi kubadilishwa +  Fungua mwongozo mkuu Ongeza kiambatisho Ongeza emoji @@ -190,7 +181,7 @@ Futa zote Futa mazungumzo Ukifuta mazungumzo, yatafutwa pia kwa washiriki wengine wote. - Futa ujumbe + Futa Ujumbe umefutwa kikamilifu, lakini huenda umevuja kwa huduma zingine Futa sasa Mtumiaji %1$s aliondolewa @@ -199,7 +190,8 @@ Tuma ujumbe Akaunti ya sasa Seva - Programu ya arifa ya seva imesakinishwa? + Programu ya arifa ya seva imesakinishwa? +  Mtumiaji Je, hali ya mtumiaji imewezeshwa? Toleo la Android @@ -556,11 +548,6 @@ Hakuna mazungumzo yaliyohifadhiwa kwenye kumbukumbu Hakuna jumbe za nje ya mtandao zilizohifadhiwa Hakuna muunganisho wa nambari ya simu kwa sababu ya kukosa ruhusa - Jumbe zote - \@-mitajo pekee - Imezimwa - Chaguo msingi - Fuata mipangilio ya mazungumzo Saa 1 Mtandaoni Hadhi ya mtandaoni @@ -570,6 +557,7 @@ Nenda kwenye mjadala Cheza/simamisha ujumbe wa sauti Udhibiti wa kasi ya mshindonyuma + Tafadhali endeleza mchakato wa kuingia katika kivinjari Ongeza mbadala Hariri kura Maliza kura ya maoni @@ -612,7 +600,7 @@ Pangilia hali Haiwezekani kujiunga na vyumba vingine ukiwa kwenye simu Hifadhi - Changanua Msimbo wa QR + Scan QR Code Sawazisha kwa seva zinazoaminika pekee Shirikisho Inaonekana kwa watu katika tukio hili na wageni pekee @@ -647,9 +635,10 @@ Sauti Onesha sababu ya zuio Onesha washiriki waliozuiliwa + Onesha mijadala Kipendwa Huruhusiwi kuanzisha simu - Unda mjadala + Anza mjadala Umeanzisha simu Ujumbe wa hadhi Hali Imerejeshwa @@ -663,16 +652,13 @@ Badili kamera Dondosha picha Punguza ukubwa wa picha - Washa tochi + Toggle torch Dakika 30 Wiki hii Huu ni ujumbe wa jaribio Wikendi hii - Ghairi uundaji wa mjadala - Arifa za mjadala - Jibu + %1$d majibu Kichwa cha mjadala - Hakuna nyuzi zilizopatikana Leo Kesho Tafsiri @@ -716,11 +702,8 @@ This conversation will be automatically deleted for everyone in %1$d day of no activity - Mazungumzo haya yatafutwa kiotomatiki kwa kila mtu baada ya siku %1$d bila shughuli yoyote - - - %d reply - %dmajibu + Mazungumzo haya yatafutwa kiotomatiki kwa kila mtu baada ya siku %1$d bila shughuli yoyote +  %d vote diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml index d39f16b..5018bf0 100644 --- a/app/src/main/res/values-tr/strings.xml +++ b/app/src/main/res/values-tr/strings.xml @@ -5,7 +5,6 @@ Notlar uygulamasına ekle %1$s görüşmesi sık kullanılara eklendi %s içinde ara - Çevrim dışı görün Görüşmeyi arşivle Bir görüşme arşivlendiğinde, varsayılan olarak gizlenir. Arşivlenmiş görüşmeleri görüntülemek için \"Arşivlenmiş\" süzgecini seçin. Doğrudan anmalar yine de alınır. Arşivlenmiş @@ -23,7 +22,6 @@ Yasakla Katılımcıyı yasakla Yasaklama listesi - Meşgul Takvim Gelişmiş çağrı seçenekleri Çağrı bir saattir sürüyor. @@ -63,11 +61,9 @@ Çizelgeleriniz yüklenirken bir sorun çıktı Katılımcının yasaklaması kaldırılırken sorun çıktı %1$s kaydedilemedi - 15 dakika klasör Yükleniyor… %1$s (%2$d) - Takip edilen yazışmalar 4 saat Bekleyen davetler alınamadı (düzenlendi) @@ -80,10 +76,6 @@ %1$s görüşmesinden çıktınız Diğer sonuçları yükle Yerel zaman: %1$s - Konum izni reddedildi - Lütfen Ayarlar içinden izin verin - Konum hizmetleri kapalı - Bu özelliği kullanabilmek için konum hizmetlerini (GPS) açın Görüşmeyi kilitle Kilit simgesi Eli indir @@ -97,7 +89,6 @@ Büyükten küçüğe Küçükten büyüğe İleti kopyalandı - Bu iletiyi silmek istediğinize emin misiniz? İleti sizin tarafınızdan silindi %1$s tarafından düzenlendi Anketi açmak için dokunun @@ -105,7 +96,7 @@ Aramak için yazmaya başlayın… Arama… İletiler - Tüm bildirimleri kapat + İletiler yüklenemedi Seçilmiş hesap içe aktarıldı ve kullanılabilir Hakkında Etkin kullanıcı @@ -190,7 +181,7 @@ Tümünü sil Görüşmeyi sil Görüşmeyi silerseniz tüm diğer katılımcılar için de silinecek. - İletiyi sil + Sil İleti silindi ancak başka hizmetlere aktarılmış olabilir Şimdi sil %1$s kullanıcısı kaldırıldı @@ -435,6 +426,7 @@ %1$s bir tahta kartı gönderdi Sunucu bağlantısını sına Lütfen %1$s veri tabanınızı güncelleyin + Sunucu ile bağlantı kurulamadı Seçilmiş hesap içe aktarılamadı %1$s site arayüzü için tarayıcıda açacağınız bağlantı. %1$s uygulamasındaki hesabı içe aktar @@ -554,11 +546,6 @@ Arşivlenmiş bir görüşme yok Herhangi bir çevrim dışı iletisi kaydedilmemiş İzinler eksik olduğundan telefon numarası bütünleştirmesi yok - Tüm iletiler - Yalnızca @-anmaları - Kapalı - Varsayılan - Görüşme ayarları kullanılsın 1 saat Çevrim içi Çevrim içi durumu @@ -568,6 +555,7 @@ Yazışmaya git Ses iletisini oynat/duraklat Oynatma hızı denetimi + Lütfen oturum açma işlemini tarayıcınızdan sürdürün Seçenek ekle Oyu düzenle Anleti sonlandır @@ -645,9 +633,10 @@ Ses Yasaklama nedeni görüntülensin Yasaklanmış katılımcıları görüntüle + Yazışmaları görüntüle Sık kullanılanlara ekle Bir çağrı başlatma izniniz yok - Bir yazışma oluştur + Yazışma başlat bir çağrı başlattı Durum iletisi Durum geri alındı @@ -667,15 +656,13 @@ Bu bir deneme iletisidir Bu hafta sonu Yazışma başlatmaktan vazgeç - Yazışma bildirimleri - Yanıtla + %1$d yanıt Yazışma başlığı - Herhangi bir yazışma bulunamadı Bugün Yarın Çevir Çeviri - Çevrilmiş yazıyı kopyala + Çevrilmiş metni kopyala Dili algıla Aygıt ayarları Dil algılanamadı @@ -716,10 +703,6 @@ Bu görüşme, %1$d gün boyunca etkileşim olmazsa herkesten otomatik olarak silinecek. Bu görüşme, %1$d gün boyunca etkileşim olmazsa herkesten otomatik olarak silinecek. - - %d yanıt - %d yanıt - %d oy %d oy diff --git a/app/src/main/res/values-ug/strings.xml b/app/src/main/res/values-ug/strings.xml index d367fed..562c894 100644 --- a/app/src/main/res/values-ug/strings.xml +++ b/app/src/main/res/values-ug/strings.xml @@ -5,7 +5,6 @@ ئىزاھاتقا قوشۇڭ ياقتۇرىدىغانلارغا %1$s پاراڭ قوشۇلدى %s دىن ئىزدەڭ - تورسىز كۆرۈنۈش ئارخىپ سۆھبىتى ئارخىپلاشتۇرۇلغان كۆك چىش @@ -20,7 +19,6 @@ Ban قاتناشقۇچىنى چەكلەش چەكلەش تىزىملىكى - ئالدىراش كالېندار ئىلغار چاقىرىش تاللانمىلىرى تېلېفون بىر سائەت داۋاملاشتى. @@ -55,7 +53,6 @@ پاراڭلىرىڭىزنى يۈكلەشتە مەسىلە كۆرۈلدى قاتناشقۇچىنى چەكلىگەندە خاتالىق كۆرۈلدى %1$s نى تېجەلمىدى - 15 مىنۇت ھۆججەت قىسقۇچ Loading… %1$s (%2$d) @@ -89,7 +86,6 @@ ئىزدەشنى باشلاڭ… ئىزدەش… ئۇچۇرلار - بارلىق ئۇقتۇرۇشلارنى ئاۋازسىز قىلىڭ تاللانغان ھېسابات ھازىر ئىمپورت قىلىندى ۋە ئىشلەتكىلى بولىدۇ ھەققىدە ئاكتىپ ئىشلەتكۈچى @@ -173,7 +169,7 @@ ھەممىنى ئۆچۈرۈڭ سۆھبەتنى ئۆچۈرۈڭ ئەگەر سۆھبەتنى ئۆچۈرسىڭىز ، ئۇ باشقا بارلىق قاتناشقۇچىلار ئۈچۈن ئۆچۈرۈلىدۇ. - ئۇچۇرنى ئۆچۈرۈڭ + ئۆچۈرۈش ئۇچۇر مۇۋەپپەقىيەتلىك ئۆچۈرۈلدى ، ئەمما ئۇ باشقا مۇلازىمەتلەرگە ئاشكارىلانغان بولۇشى مۇمكىن ئىشلەتكۈچى%1$s چىقىرىۋېتىلدى رىياسەتچىدىن تۆۋەنلەش @@ -499,10 +495,6 @@ ھەئە كېلەر ھەپتە ئىجازەت يوقالغانلىقتىن تېلېفون نومۇرىنى بىرلەشتۈرۈش يوق - بارلىق ئۇچۇرلار - \@ -mentions only - Off - كۆڭۈلدىكى 1 سائەت توردا توردىكى ئورنى @@ -600,7 +592,6 @@ بۇ ھەپتە بۇ بىر سىناق ئۇچۇرى بۇ ھەپتە ئاخىرى - جاۋاب بۈگۈن ئەتە تەرجىمە diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml index cab7c82..5a40f20 100644 --- a/app/src/main/res/values-uk/strings.xml +++ b/app/src/main/res/values-uk/strings.xml @@ -5,7 +5,6 @@ Додати до нотаток Додано розмову %1$s до обраного Пошук у %s - Перебуваю поза мережею Архівна розмова Після архівування розмова буде прихована за замовчуванням. Виберіть фільтр «Архів» для перегляду архівних розмов. Прямі згадки все одно будуть надходити. Заархівовані @@ -23,7 +22,6 @@ Заборона Забанити учасника Список заборон - Зайнято Календар Розширені опції дзвінка Дзвінок триває вже годину. @@ -63,11 +61,9 @@ Виникла проблема під час завантаження ваших чатів Виникла помилка при знятті бану з учасника Не вдалося зберегти %1$s - 15 хвилин каталог Завантаження … %1$s (%2$d) - Відстежувані теми 4 години Не вдалося отримати очікувані запрошення (відредаговано) @@ -100,7 +96,7 @@ Що шукаємо? Пошук … Повідомлення - Вимкнути всі сповіщення + Не вдалося отримати повідомлення Обраний обліковий запис імпортовано і він доступний Про застосунок Активний користувач @@ -185,7 +181,7 @@ Вилучити все Вилучити розмову Якщо ви вилучите розмову, її буде вилучено у всіх інших учасників цієї розмови. - Вилучити повідомлення + Вилучити Повідомлення вилучено, але воно могло потрапити до інших сервісів Видалити зараз Користувача %1$s було видалено @@ -430,6 +426,7 @@ %1$s надіслав карту колоди Перевірка з\'єднання з сервером Будь ласка, оновіть вашу %1$s базу даних + Не вдалося з\'єднатися з сервером Не вдалося імпортувати обраний акаунт. Посилання на ваш веб-інтерфейс %1$s, коли ви відкриєте його у веб-переглядачі. Імпортувати обліковий запис із застосунку %1$s @@ -549,9 +546,6 @@ Розмови не архівуються Не збережено жодного офлайн-повідомлення Відсутні дозволи на інтеграцію номера телефону - Вимкнено - Типово - Слідкувати за налаштуваннями розмови 1 година Онлайн Статус онлайну @@ -561,6 +555,7 @@ Перейти до теми Відтворення/пауза голосового повідомлення Регулювання швидкості відтворення + Будь ласка, продовжте процес входу в браузері Додати варіант Змінити голос Завершити опитування @@ -638,9 +633,10 @@ Голос Показати причину бану Показати заборонених учасників + Показати теми Із зірочкою Ви не маєте права починати розмову - Створіть тему + Почніть тему почала дзвонити. Повідомлення про статус Статус скасовано @@ -660,6 +656,7 @@ Це тестове повідомлення Цими вихідними Відхилити створення гілки + %1$d відповідей Назва гілки Сьогодні Завтра diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index 2c527b2..9c5adde 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -4,7 +4,6 @@ 添加 对话%1$s已添加至收藏 搜索位置 %s - 显示为离线 存档对话 已存档 蓝牙 @@ -15,7 +14,6 @@ 您的状态已自动设定 头像 离开 - 忙碌 日历 高级呼叫选项 通话已持续一小时 @@ -44,11 +42,9 @@ 为所有人结束通话 加载聊天记录时出错 保存%1$s失败 - 15 分钟 文件夹 正在加载 … %1$s (%2$d) - 关注的帖子 4小时 （已编辑） 隐身 @@ -75,7 +71,6 @@ 开始输入以搜索… 搜索... 消息 - 静音所有通知 所选帐户现已导入并可用 关于 活跃用户 @@ -159,7 +154,7 @@ 删除全部 删除对话 如果你删除了该对话，它也会被从其他所有与会者那里删除。 - 删除邮件 + 删除 消息已成功删除，但可能已泄漏给其他服务 立即删除 取消主持人资格 @@ -446,10 +441,6 @@ 是的 下周 由于缺少权限，没有电话集成 - 仅被@提及的消息 - 关 - 默认 - 遵循对话设置 1小时 在线 在线状态 @@ -528,7 +519,6 @@ 语音 收藏 您没有开始通话的权限。 - 创建帖子 发起了通话 状态消息 切换到分组讨论 @@ -546,7 +536,7 @@ 本周 这是一个测试消息 本周末 - 帖子通知 + %1$d 个回复 帖子‌标题 今天 明天 diff --git a/app/src/main/res/values-zh-rHK/strings.xml b/app/src/main/res/values-zh-rHK/strings.xml index 61c45b6..563201a 100644 --- a/app/src/main/res/values-zh-rHK/strings.xml +++ b/app/src/main/res/values-zh-rHK/strings.xml @@ -5,7 +5,6 @@ 添加到筆記 添加了對話 %1$s 至最愛 %s內搜尋 - 顯示為離線 封存對話 對話封存後，預設會隱藏。選取篩選條件「已封存」可檢視已封存的對話。仍會收到直接提及。 已封存 @@ -23,7 +22,6 @@ 封禁 封禁參與者 封禁清單 - 忙碌 日曆 進階通話選項 請注意，通話已經持續一個小時了。 @@ -63,11 +61,9 @@ 載入您的聊天記錄時時發生問題 取消封禁參與者時發生錯誤 儲存 %1$s 失敗 - 15 分鐘 資料夾 加載中 … %1$s（%2$d） - 關注的討論串 4 小時 無法擷取待定的邀請 （已編輯） @@ -80,10 +76,6 @@ 你離開了對話 %1$s 正在載入更多結果 本地時間︰%1$s - 位置權限被拒絕 - 請在「應用程式設定」中啟用 - 已停用位置服務 - 您必須啟用位置服務 (GPS) 以使用此功能 鎖定對話 鎖符號 放下手 @@ -97,7 +89,6 @@ 最大先 最小先 已複製訊息 - 您確定要刪除此訊息？ 訊息被您刪除 由 %1$s 編輯 點按即可打開民意調查 @@ -105,7 +96,7 @@ 輸入文字以搜尋 … 搜尋 … 訊息 - 所有通知靜音 + 載入訊息失敗 所選帳戶現已匯入並可用 關於 活躍用戶 @@ -190,7 +181,7 @@ 全部刪除 刪除對話 如果您刪除了此對話，它也將會從所有其他參與者處刪除。 - 刪除訊息 + 刪除 消息已成功刪除，但可能已分發到其他服務 立刻刪除 用户 %1$s 已被移除 @@ -435,6 +426,7 @@ %1$s 傳送了一張卡片 測試伺服器連線 請升級你的%1$s數據庫 + 無法連接至伺服器 無法匯入所選的帳戶 在瀏覽器中打開 %1$s 網絡界面的連結。 從%1$s應用程式匯入帳戶 @@ -554,11 +546,6 @@ 沒有已封存的對話 未儲存離線訊息 由於缺少權限而無法集成電話號碼 - 全部消息 - 僅被 @提及的消息 - 關閉 - 默認 - 跟隨對話設定 1 小時 在線 線上狀態 @@ -568,6 +555,7 @@ 前往討論串 播放﹨暫停話音短訊 播放速度控制 + 請在瀏覽器中完成登入流程 添加選項 編輯選票 結束民意調查 @@ -645,9 +633,10 @@ 音頻 顯示封禁原因 顯示被封禁的參與者 + 顯示討論串 我的最愛 你無權開始通話 - 創建討論串 + 開始討論串 發起了通話 狀態訊息 狀態已還原 @@ -667,10 +656,8 @@ 此乃測試訊息 本週末 取消創建討論串 - 討論串通知 - 回覆 + %1$d 個回覆 討論串標題 - 找不到討論串 今日 明日 翻譯 @@ -714,9 +701,6 @@ 此對話如無人於%1$d天內互動，將會自動為所有人刪除。 - - %d 個回覆 - %d 選票 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 16e4864..d070475 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -5,7 +5,6 @@ 新增至筆記 已新增對話 %1$s 至最愛 在 %s內搜尋 - 顯示為離線 封存對話 對話封存後，預設會隱藏。選取篩選條件「已封存」可檢視已封存的對話。仍會收到直接提及。 已封存 @@ -23,7 +22,6 @@ 封鎖 封鎖參與者 封鎖清單 - 忙碌 日曆 進階通話選項 通話已經持續一個小時了。 @@ -63,11 +61,9 @@ 在載入您的對話時出現錯誤 解除封鎖參與者時遇到錯誤 儲存 %1$s 失敗 - 15分鐘 資料夾 正在載入…… %1$s (%2$d) - 已追蹤的討論串 4小時 擷取擱置中的邀請失敗 （已編輯） @@ -80,10 +76,6 @@ 您離開了對話 %1$s 載入更多結果 當地時間：%1$s - 位置權限被拒絕 - 請在應用程式設定中啟用 - 已停用位置服務 - 請啟用位置服務 (GPS) 以使用此功能 鎖定對話 上鎖符號 放手 @@ -97,7 +89,6 @@ 最大優先 最小優先 已複製訊息 - 您確定要刪除此訊息？ 訊息已被您刪除 由 %1$s 編輯 點按開啟投票 @@ -105,7 +96,7 @@ 輸入文字以搜尋 … 搜尋 … 訊息 - 靜音所有通知 + 無法載入訊息 選擇已匯入且可用的帳號 關於 活躍使用者 @@ -190,7 +181,7 @@ 全部刪除 刪除對話 如果您刪除了此對話，它也將會從所有其他參與者處刪除。 - 刪除訊息 + 刪除 訊息已成功刪除，但可能已分發到其他服務 立刻刪除 使用 %1$s 已移除 @@ -435,6 +426,7 @@ %1$s 傳送了一張卡片 測試伺服器連線 請升級你的%1$s資料庫 + 無法連線至伺服器 無法匯入所選的帳戶 在瀏覽器中開啟您 %1$s 網頁介面的連結。 從%1$s應用程式匯入帳戶 @@ -554,11 +546,6 @@ 無封存的對話 未儲存離線訊息 因為缺少權限而無法整合電話號碼 - 所有訊息 - 僅被 @ - 提及 的訊息 - 關閉 - 預設 - 遵循對話設定 1小時 線上 線上狀態 @@ -568,6 +555,7 @@ 到討論串 播放/暫停語音訊息 播放速度控制 + 請在瀏覽器中繼續登入流程 新增選項 編輯投票 結束投票 @@ -645,9 +633,10 @@ 語音 顯示封鎖理由 顯示已封鎖的參與者 + 顯示討論串 收藏 您不被允許開始通話 - 建立討論串 + 開始討論串 開始通話 狀態訊息 狀態已還原 @@ -667,10 +656,8 @@ 這是測試訊息 本週末 取消建立討論串 - 討論串通知 - 回覆 + %1$d 個回覆 討論串標題 - 找不到討論串 今天 明天 翻譯 @@ -714,9 +701,6 @@ 此對話若於%1$d天內沒有活動，將會自動為所有人刪除 - - %d 個回覆 - %d 票 diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index a39e44a..661c429 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -14,6 +14,8 @@ #ffffff #B3FFFFFF + + @android:color/white #666666 @@ -37,8 +39,6 @@ #FFFFFF @color/high_emphasis_text - - #55FFFFFF @color/high_emphasis_text diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 9f309e0..f9ccd0c 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -2,7 +2,6 @@ Add to conversation Take photo @@ -894,12 +869,4 @@ How to translate with transifex: Conversation is archived Local time: %1$s Open Notes - Cancel Login - Scan QR Code - QR code could not be read - Are you sure you want to delete this message? - Location permission denied - Please enable it in the app settings - Location services disabled - Please enable location services (GPS) to use this feature diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 927e7b2..83ca98d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -89,12 +89,10 @@ - - - - diff --git a/app/src/test/java/com/nextcloud/talk/login/data/LoginRepositoryTest.kt b/app/src/test/java/com/nextcloud/talk/login/data/LoginRepositoryTest.kt deleted file mode 100644 index b6bda98..0000000 --- a/app/src/test/java/com/nextcloud/talk/login/data/LoginRepositoryTest.kt +++ /dev/null @@ -1,596 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.login.data - -import android.os.Bundle -import androidx.arch.core.executor.testing.InstantTaskExecutorRule -import androidx.lifecycle.LiveData -import androidx.work.WorkInfo -import com.nextcloud.talk.account.data.LoginRepository -import com.nextcloud.talk.account.data.io.LocalLoginDataSource -import com.nextcloud.talk.account.data.model.LoginCompletion -import com.nextcloud.talk.account.data.model.LoginResponse -import com.nextcloud.talk.account.data.network.NetworkLoginDataSource -import junit.framework.TestCase.assertEquals -import junit.framework.TestCase.assertNotNull -import junit.framework.TestCase.assertNull -import junit.framework.TestCase.assertTrue -import kotlinx.coroutines.ExperimentalCoroutinesApi -import kotlinx.coroutines.test.runTest -import org.junit.Before -import org.junit.Rule -import org.junit.Test -import org.junit.runner.RunWith -import org.mockito.Mock -import org.mockito.MockitoAnnotations -import org.mockito.junit.MockitoJUnitRunner -import org.mockito.kotlin.any -import org.mockito.kotlin.never -import org.mockito.kotlin.times -import org.mockito.kotlin.verify -import org.mockito.kotlin.whenever - -@Suppress("TooManyFunctions", "TooGenericExceptionCaught") -@ExperimentalCoroutinesApi -@RunWith(MockitoJUnitRunner.Silent::class) -class LoginRepositoryTest { - - @get:Rule - val rule = InstantTaskExecutorRule() - - // Repository dependencies - @Mock - lateinit var networkLoginDataSource: NetworkLoginDataSource - - @Mock - lateinit var localLoginDataSource: LocalLoginDataSource - - // Additional mocks for LocalLoginDataSource dependencies - @Mock - lateinit var liveData: LiveData - - lateinit var repo: LoginRepository - - @Before - fun setup() { - MockitoAnnotations.openMocks(this) - repo = LoginRepository(networkLoginDataSource, localLoginDataSource) - } - - // ========== pollLogin() Tests ========== - - @Test - fun `pollLogin returns successful LoginCompletion when network returns HTTP 200`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - val successfulLoginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(successfulLoginData) - - // Act - val result = repo.pollLogin(mockResponse) - - // Assert - assertNotNull(result) - assertEquals(200, result?.status) - assertEquals("https://server.com", result?.server) - assertEquals("testuser", result?.loginName) - assertEquals("apppass123", result?.appPassword) - } - - @Test - fun `pollLogin returns null when network returns null`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(null) - - // Act - val result = repo.pollLogin(mockResponse) - - // Assert - assertNull(result) - } - - @Test - fun `pollLogin continues polling when status is not HTTP 200 then returns successful result`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - val pendingLoginData = LoginCompletion(202, "https://server.com", "testuser", "apppass123") - val successfulLoginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(pendingLoginData) - .thenReturn(successfulLoginData) - - // Act - val result = repo.pollLogin(mockResponse) - - // Assert - assertNotNull(result) - assertEquals(200, result?.status) - verify(networkLoginDataSource, times(2)).performLoginFlowV2(mockResponse) - } - - @Test - fun `pollLogin handles slow connection by continuing to poll with delays`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - val slowResponse1 = LoginCompletion(202, "https://server.com", "testuser", "apppass123") - val slowResponse2 = LoginCompletion(404, "https://server.com", "testuser", "apppass123") - val slowResponse3 = LoginCompletion(500, "https://server.com", "testuser", "apppass123") - val successResponse = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(slowResponse1) - .thenReturn(slowResponse2) - .thenReturn(slowResponse3) - .thenReturn(successResponse) - - // Act - val result = repo.pollLogin(mockResponse) - - // Assert - assertNotNull(result) - assertEquals(200, result?.status) - verify(networkLoginDataSource, times(4)).performLoginFlowV2(mockResponse) - } - - @Test - fun `pollLogin handles network timeouts during slow connection gracefully`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - val timeoutResponse = LoginCompletion(408, "https://server.com", "testuser", "apppass123") - val successResponse = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(timeoutResponse) - .thenReturn(timeoutResponse) - .thenReturn(successResponse) - - // Act - val result = repo.pollLogin(mockResponse) - - // Assert - assertNotNull(result) - assertEquals(200, result?.status) - verify(networkLoginDataSource, times(3)).performLoginFlowV2(mockResponse) - } - - @Test - fun `pollLogin stops when cancelLoginFlow is called`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - val pendingLoginData = LoginCompletion( - 202, - "https://server.com", - "testuser", - "apppass123" - ) - - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(pendingLoginData) - - // Act - cancel before polling - repo.cancelLoginFlow() - val result = repo.pollLogin(mockResponse) - - // Assert - assertNull(result) - verify(networkLoginDataSource, never()).performLoginFlowV2(any()) - } - - // ========== startLoginFlowFromQR() Tests ========== - - @Test - fun `startLoginFlowFromQR returns LoginCompletion for valid QR data with all parameters`() { - // Arrange - val qrData = "nc://login/user:testuser&server:https%3A//example.com&password:testpass" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNotNull(result) - assertEquals(200, result?.status) - assertEquals("https://example.com", result?.server) - assertEquals("testuser", result?.loginName) - assertEquals("testpass", result?.appPassword) - } - - @Test - fun `startLoginFlowFromQR returns LoginCompletion for minimal valid QR data`() { - // Arrange - val qrData = "nc://login/server:https%3A//example.com" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNull(result) - } - - @Test - fun `startLoginFlowFromQR returns null for invalid prefix`() { - // Arrange - val qrData = "invalid://login/user:testuser&server:https://example.com" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNull(result) - } - - @Test - fun `startLoginFlowFromQR returns null when too many arguments provided`() { - // Arrange - val qrData = "nc://login/user:test&server:https://example.com&password:pass&extra:value" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNull(result) - } - - @Test - fun `startLoginFlowFromQR returns null for empty data`() { - // Arrange - val qrData = "nc://login/" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNull(result) - } - - @Test - fun `startLoginFlowFromQR sets reAuth flag correctly`() { - // Arrange - val qrData = "nc://login/server:https%3A//example.com" - - // Act - val result = repo.startLoginFlowFromQR(qrData, reAuth = true) - - // Assert - assertNull(result) - } - - @Test - fun `startLoginFlowFromQR handles URL encoding correctly`() { - // Arrange - val qrData = "nc://login/user:test%40user.com&server:https%3A//example.com%3A8080&password:test%26pass" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNotNull(result) - assertEquals("test@user.com", result?.loginName) - assertEquals("https://example.com:8080", result?.server) - assertEquals("test&pass", result?.appPassword) - } - - @Test - fun `startLoginFlowFromQR handles mixed parameter order`() { - // Arrange - val qrData = "nc://login/password:testpass&user:testuser&server:https%3A//example.com" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNotNull(result) - assertEquals("https://example.com", result?.server) - assertEquals("testuser", result?.loginName) - assertEquals("testpass", result?.appPassword) - } - - // ========== startLoginFlow() Tests ========== - - @Test - fun `startLoginFlow returns LoginResponse from network`() = - runTest { - // Arrange - val baseUrl = "https://example.com" - val mockResponse = LoginResponse("token123", "https://example.com/poll", "https://example.com/login") - whenever(networkLoginDataSource.anonymouslyPostLoginRequest(baseUrl)) - .thenReturn(mockResponse) - - // Act - val result = repo.startLoginFlow(baseUrl) - - // Assert - assertEquals(mockResponse, result) - verify(networkLoginDataSource).anonymouslyPostLoginRequest(baseUrl) - } - - @Test - fun `startLoginFlow returns null when network returns null`() = - runTest { - // Arrange - val baseUrl = "https://example.com" - whenever(networkLoginDataSource.anonymouslyPostLoginRequest(baseUrl)) - .thenReturn(null) - - // Act - val result = repo.startLoginFlow(baseUrl) - - // Assert - assertNull(result) - } - - @Test - fun `startLoginFlow sets reAuth flag correctly`() = - runTest { - // Arrange - val baseUrl = "https://example.com" - val mockResponse = LoginResponse("token123", "https://example.com/poll", "https://example.com/login") - whenever(networkLoginDataSource.anonymouslyPostLoginRequest(baseUrl)) - .thenReturn(mockResponse) - - // Act - val result = repo.startLoginFlow(baseUrl, reAuth = true) - - // Assert - assertEquals(mockResponse, result) - } - - @Test - fun `startLoginFlow handles network SSL exceptions`() = - runTest { - // Arrange - val baseUrl = "https://example.com" - whenever(networkLoginDataSource.anonymouslyPostLoginRequest(baseUrl)) - .thenReturn(null) // NetworkLoginDataSource catches SSL exceptions and returns null - - // Act - val result = repo.startLoginFlow(baseUrl) - - // Assert - assertNull(result) - verify(networkLoginDataSource).anonymouslyPostLoginRequest(baseUrl) - } - - // ========== cancelLoginFlow() Tests ========== - - @Test - fun `cancelLoginFlow stops polling loop`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - val pendingLoginData = LoginCompletion(202, "https://server.com", "testuser", "apppass123") - - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(pendingLoginData) - - // Act - repo.cancelLoginFlow() - val result = repo.pollLogin(mockResponse) - - // Assert - assertNull(result) - } - - // ========== parseAndLogin() Tests ========== - - @Test - fun `parseAndLogin returns null when user is scheduled for deletion`() { - // Arrange - val loginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(true) - whenever(localLoginDataSource.startAccountRemovalWorker()) - .thenReturn(liveData) - - // Act - val result = repo.parseAndLogin(loginData) - - // Assert - assertNull(result) - verify(localLoginDataSource).startAccountRemovalWorker() - } - - @Test - fun `parseAndLogin returns null when user exists and reAuth is false`() { - // Arrange - val loginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(false) - whenever(localLoginDataSource.checkIfUserExists(loginData)) - .thenReturn(true) - - // Act - val result = repo.parseAndLogin(loginData) - - // Assert - assertNull(result) - verify(localLoginDataSource, never()).updateUser(any()) - } - - @Test - fun `parseAndLogin updates user when user exists and reAuth is true`() { - // Arrange - First set reAuth to true via QR flow - val qrData = "nc://login/server:https%3A//example.com" - repo.startLoginFlowFromQR(qrData, reAuth = true) - - val loginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(false) - whenever(localLoginDataSource.checkIfUserExists(loginData)) - .thenReturn(true) - - // Act - val result = repo.parseAndLogin(loginData) - - // Assert - assertNull(result) - verify(localLoginDataSource).updateUser(loginData) - } - - @Test - fun `parseAndLogin returns Bundle for new user with https protocol`() { - // Arrange - val loginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(false) - whenever(localLoginDataSource.checkIfUserExists(loginData)) - .thenReturn(false) - - // Act - val result = repo.parseAndLogin(loginData) - - // Assert - assertNotNull(result) - assertTrue(result is Bundle) - } - - @Test - fun `parseAndLogin returns Bundle for new user with http protocol`() { - // Arrange - val loginData = LoginCompletion(200, "http://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(false) - whenever(localLoginDataSource.checkIfUserExists(loginData)) - .thenReturn(false) - - // Act - val result = repo.parseAndLogin(loginData) - - // Assert - assertNotNull(result) - assertTrue(result is Bundle) - } - - @Test - fun `parseAndLogin returns Bundle for new user without protocol prefix`() { - // Arrange - val loginData = LoginCompletion(200, "server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(false) - whenever(localLoginDataSource.checkIfUserExists(loginData)) - .thenReturn(false) - - // Act - val result = repo.parseAndLogin(loginData) - - // Assert - assertNotNull(result) - assertTrue(result is Bundle) - } - - // ========== LocalLoginDataSource Integration Tests ========== - - @Test - fun `parseAndLogin properly integrates with LocalLoginDataSource checkIfUserIsScheduledForDeletion`() { - // Arrange - val loginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(true) - whenever(localLoginDataSource.startAccountRemovalWorker()) - .thenReturn(liveData) - - // Act - repo.parseAndLogin(loginData) - - // Assert - verify(localLoginDataSource).checkIfUserIsScheduledForDeletion(loginData) - verify(localLoginDataSource).startAccountRemovalWorker() - } - - @Test - fun `parseAndLogin properly integrates with LocalLoginDataSource checkIfUserExists`() { - // Arrange - val loginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(false) - whenever(localLoginDataSource.checkIfUserExists(loginData)) - .thenReturn(true) - - // Act - repo.parseAndLogin(loginData) - - // Assert - verify(localLoginDataSource).checkIfUserExists(loginData) - verify(localLoginDataSource, never()).updateUser(any()) - } - - @Test - fun `parseAndLogin calls updateUser with correct LoginCompletion data`() { - // Arrange - Set reAuth flag first - val qrData = "nc://login/server:https%3A//example.com" - repo.startLoginFlowFromQR(qrData, reAuth = true) - - val loginData = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - whenever(localLoginDataSource.checkIfUserIsScheduledForDeletion(loginData)) - .thenReturn(false) - whenever(localLoginDataSource.checkIfUserExists(loginData)) - .thenReturn(true) - - // Act - repo.parseAndLogin(loginData) - - // Assert - verify(localLoginDataSource).updateUser(loginData) - } - - // ========== Edge Cases and Error Handling ========== - - @Test - fun `pollLogin handles performLoginFlowV2 returning error status codes`() = - runTest { - // Arrange - val mockResponse = LoginResponse("token123", "https://server.com/poll", "https://server.com/login") - val errorResponse = LoginCompletion(404, "", "", "") - val successResponse = LoginCompletion(200, "https://server.com", "testuser", "apppass123") - - whenever(networkLoginDataSource.performLoginFlowV2(mockResponse)) - .thenReturn(errorResponse) - .thenReturn(successResponse) - - // Act - val result = repo.pollLogin(mockResponse) - - // Assert - assertNotNull(result) - assertEquals(200, result?.status) - } - - @Test - fun `startLoginFlowFromQR handles malformed URL gracefully`() { - // Arrange - val qrData = "nc://login/malformed&data&without&proper&key:value" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNull(result) // Should still create LoginCompletion with empty values - } - - @Test - fun `startLoginFlowFromQR handles partial parameter data`() { - // Arrange - val qrData = "nc://login/user:testuser&server:" - - // Act - val result = repo.startLoginFlowFromQR(qrData) - - // Assert - assertNull(result) - } -} diff --git a/app/src/test/java/com/nextcloud/talk/login/data/network/NetworkLoginDataSourceTest.kt b/app/src/test/java/com/nextcloud/talk/login/data/network/NetworkLoginDataSourceTest.kt deleted file mode 100644 index e83156f..0000000 --- a/app/src/test/java/com/nextcloud/talk/login/data/network/NetworkLoginDataSourceTest.kt +++ /dev/null @@ -1,167 +0,0 @@ -/* - * Nextcloud Talk - Android Client - * - * SPDX-FileCopyrightText: 2025 Julius Linus - * SPDX-License-Identifier: GPL-3.0-or-later - */ - -package com.nextcloud.talk.login.data.network - -import com.nextcloud.talk.account.data.model.LoginResponse -import com.nextcloud.talk.account.data.network.NetworkLoginDataSource -import junit.framework.TestCase.assertNotNull -import junit.framework.TestCase.assertNull -import okhttp3.OkHttpClient -import okhttp3.mockwebserver.MockResponse -import okhttp3.mockwebserver.MockWebServer -import org.junit.Before -import org.junit.Test -import org.mockito.MockitoAnnotations - -@Suppress("ktlint:standard:max-line-length", "MaxLineLength") -class NetworkLoginDataSourceTest { - - lateinit var network: NetworkLoginDataSource - private val okHttpClient: OkHttpClient = OkHttpClient.Builder().build() - - @Before - fun setup() { - MockitoAnnotations.openMocks(this) - network = NetworkLoginDataSource(okHttpClient) - } - - @Test - fun `testing anonymouslyPostLoginRequest correct path`() { - val server = MockWebServer() - server.start(0) - val httpUrl = server.url("index.php/login/v2") - val validResponse = """ - { - "poll":{ - "token":"mQUYQdffOSAMJYtm8pVpkOsVqXt5hglnuSpO5EMbgJMNEPFGaiDe8OUjvrJ2WcYcBSLgqynu9jaPFvZHMl83ybMvp6aDIDARjTFIBpRWod6p32fL9LIpIStvc6k8Wrs1", - "endpoint":"https:\/\/cloud.example.com\/login\/v2\/poll" - }, - "login":"https:\/\/cloud.example.com\/login\/v2\/flow\/guyjGtcKPTKCi4epIRIupIexgJ8wNInMFSfHabACRPZUkmEaWZSM54bFkFuzWksbps7jmTFQjeskLpyJXyhpHlgK8sZBn9HXLXjohIx5iXgJKdOkkZTYCzUWHlsg3YFg" - } - """.trimIndent() - val mockResponse = MockResponse().setBody(validResponse) - server.enqueue(mockResponse) - - val loginResponse = network.anonymouslyPostLoginRequest(httpUrl.toString()) - assertNotNull(loginResponse) - } - - @Test - fun `testing anonymouslyPostLoginRequest error path`() { - val server = MockWebServer() - val invalidResponse = MockResponse() - .addHeader("Content-Type", "application/json; charset=utf-8") - .addHeader("Cache-Control", "no-cache") - .setResponseCode(404) - .setBody("{}") - - server.start() - server.enqueue(invalidResponse) - val httpUrl = server.url("index.php/login/v2") - - val loginResponse = network.anonymouslyPostLoginRequest(httpUrl.toString()) - assertNull(loginResponse) - } - - @Test - fun `testing anonymouslyPostLoginRequest malformed response`() { - val server = MockWebServer() - val validResponse = """ - { - "poll":{ - "token":"mQUYQdffOSAMJYtm8pVpkOsVqXt5hglnuSpO5EMbgJMNEPFGaiDe8OUjvrJ2WcYcBSLgqynu9jaPFvZHMl83ybMvp6aDIDARjTFIBpRWod6p32fL9LIpIStvc6k8Wrs1" - }, - "login":"https:\/\/cloud.example.com\/login\/v2\/flow\/guyjGtcKPTKCi4epIRIupIexgJ8wNInMFSfHabACRPZUkmEaWZSM54bFkFuzWksbps7jmTFQjeskLpyJXyhpHlgK8sZBn9HXLXjohIx5iXgJKdOkkZTYCzUWHlsg3YFg" - } - """.trimIndent() - - val mockResponse = MockResponse().setBody(validResponse) - server.enqueue(mockResponse) - server.start() - val httpUrl = server.url("index.php/login/v2") - - val loginResponse = network.anonymouslyPostLoginRequest(httpUrl.toString()) - assertNull(loginResponse) - } - - @Test - fun `testing performLoginFlowV2 correct path`() { - val server = MockWebServer() - val validBody = """ - { - "server":"https:\/\/cloud.example.com", - "loginName":"username", - "appPassword":"yKTVA4zgxjfivy52WqD8kW3M2pKGQr6srmUXMipRdunxjPFripJn0GMfmtNOqOolYSuJ6sCN" - } - """.trimIndent() - - val validResponse = MockResponse() - .setBody(validBody) - - server.enqueue(validResponse) - server.start() - val httpUrl = server.url("login/v2/poll") - val loginResponse = LoginResponse( - token = "mQUYQdffOSAMJYtm8pVpkOsVqXt5hglnuSpO5EMbgJMNEPFGaiDe8OUjvrJ2WcYcBSLgqynu9jaPFvZHMl83ybMvp6aDIDARjTFIBpRWod6p32fL9LIpIStvc6k8Wrs1", - pollUrl = httpUrl.toString(), - loginUrl = "https:\\/\\/cloud.example.com\\/login\\/v2\\/flow\\/guyjGtcKPTKCi4epIRIupIexgJ8wNInMFSfHabACRPZUkmEaWZSM54bFkFuzWksbps7jmTFQjeskLpyJXyhpHlgK8sZBn9HXLXjohIx5iXgJKdOkkZTYCzUWHlsg3YFg" - ) - - val loginCompletion = network.performLoginFlowV2(loginResponse) - assertNotNull(loginCompletion) - } - - @Test - fun `testing performLoginFlowV2 error path`() { - val server = MockWebServer() - - val invalidResponse = MockResponse() - .addHeader("Content-Type", "application/json; charset=utf-8") - .addHeader("Cache-Control", "no-cache") - .setResponseCode(404) - .setBody("{}") - - server.enqueue(invalidResponse) - server.start() - val httpUrl = server.url("login/v2/poll") - val loginResponse = LoginResponse( - token = "mQUYQdffOSAMJYtm8pVpkOsVqXt5hglnuSpO5EMbgJMNEPFGaiDe8OUjvrJ2WcYcBSLgqynu9jaPFvZHMl83ybMvp6aDIDARjTFIBpRWod6p32fL9LIpIStvc6k8Wrs1", - pollUrl = httpUrl.toString(), - loginUrl = "https:\\/\\/cloud.example.com\\/login\\/v2\\/flow\\/guyjGtcKPTKCi4epIRIupIexgJ8wNInMFSfHabACRPZUkmEaWZSM54bFkFuzWksbps7jmTFQjeskLpyJXyhpHlgK8sZBn9HXLXjohIx5iXgJKdOkkZTYCzUWHlsg3YFg" - ) - - val loginCompletion = network.performLoginFlowV2(loginResponse) - assert(loginCompletion?.status == 404) - } - - @Test - fun `testing performLoginFlowV2 malformed response`() { - val server = MockWebServer() - val validBody = """ - { - "server":"https:\/\/cloud.example.com", - "loginName":"username" - } - """.trimIndent() - - val validResponse = MockResponse() - .setBody(validBody) - - server.enqueue(validResponse) - server.start() - val httpUrl = server.url("login/v2/poll") - val loginResponse = LoginResponse( - token = "mQUYQdffOSAMJYtm8pVpkOsVqXt5hglnuSpO5EMbgJMNEPFGaiDe8OUjvrJ2WcYcBSLgqynu9jaPFvZHMl83ybMvp6aDIDARjTFIBpRWod6p32fL9LIpIStvc6k8Wrs1", - pollUrl = httpUrl.toString(), - loginUrl = "https:\\/\\/cloud.example.com\\/login\\/v2\\/flow\\/guyjGtcKPTKCi4epIRIupIexgJ8wNInMFSfHabACRPZUkmEaWZSM54bFkFuzWksbps7jmTFQjeskLpyJXyhpHlgK8sZBn9HXLXjohIx5iXgJKdOkkZTYCzUWHlsg3YFg" - ) - - val loginCompletion = network.performLoginFlowV2(loginResponse) - assertNull(loginCompletion) - } -} diff --git a/build.gradle b/build.gradle index 5c7a6f0..d6b39e3 100644 --- a/build.gradle +++ b/build.gradle @@ -11,7 +11,7 @@ buildscript { ext { - kotlinVersion = '2.2.20' + kotlinVersion = '2.2.0' } repositories { @@ -21,12 +21,12 @@ buildscript { } dependencies { - classpath 'com.android.tools.build:gradle:8.13.0' + classpath 'com.android.tools.build:gradle:8.11.1' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-serialization:${kotlinVersion}" - classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.4.2' + classpath 'com.github.spotbugs.snom:spotbugs-gradle-plugin:6.2.2' classpath "io.gitlab.arturbosch.detekt:detekt-gradle-plugin:1.23.8" - classpath "org.jlleitschuh.gradle:ktlint-gradle:13.1.0" + classpath "org.jlleitschuh.gradle:ktlint-gradle:13.0.0" // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -42,10 +42,10 @@ allprojects { repositories { google() mavenCentral() - maven { url = 'https://jitpack.io' } + maven { url 'https://jitpack.io' } } } tasks.register('clean', Delete) { - delete rootProject.layout.buildDirectory + delete rootProject.buildDir } diff --git a/gradle/verification-keyring.keys b/gradle/verification-keyring.keys index ce65ac9..663e42c 100644 --- a/gradle/verification-keyring.keys +++ b/gradle/verification-keyring.keys @@ -307,50 +307,6 @@ CqZ5vSc= =B+Kr -----END PGP PUBLIC KEY BLOCK----- -pub 893A028475557671 -uid Gradle Inc. - -sub 5E9AEEBA28836032 ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBGUVRogBEAChVh0t3YAJIdreb6SP/lf4x097IRpOiJ7Ww+DDtXFUhKJBwgfC -4T10TBGP835tV6TfkEeCPGWABoxaD88zUlSHs7k7v/SfedwfOKbOE3c+oR43JL7P -Gi2++Z+ZYiEJwPuEgoKITj76Pn/x7yyoRUI2VEX4U6UzZSi9QQ6EltQFTxHPB8Gp -XBpRf9j1e6K4INGga4wyAXqrUl84PAahoQnspc16suc5ouJYINpf6/bbZqELHvcx -+x3uACrQq0ZoU/2V3N/E7dF4BJP2Bt93HV8xGrRz/rG7xu6ki2+PtZzxp+hBpgZL -VOQKwfm/jLmO7xK8XjcOzQu7vEetWdrYv7a2TA4MBZCcSS/C+u02XlacYqh7bTYC -Fy0nZO6p0qej1OiQI+dfsbYCSqooUPGhIC0aOAJjPGsmtkxlFVTcg2nqFABw65Uj -nENeBAvCMz8155UqLEFcgF/KrMjIFN8j8QGC9vAQ3Jegi0EBvyEOBydw93zziCE2 -POhaGABn2P6tx+7BmXrwwtycrPrTFNhb/4/ofQVZA0dA98zXHNOP8dYwbLVCtnYH -QEt0uorqoj+bEI1Q0WKKzyocaS5nnw1rYjs4tih1rhJqL1ThUiFFeFSU54v/D8CO -5KSm2Toqf0qzv0zj3Q4ICXLTdGG6iQtGonNynPc5a76waUjGdhtW2+of0QARAQAB -tB1HcmFkbGUgSW5jLiA8aW5mb0BncmFkbGUuY29tPrkCDQRlFUaIARAAx7Jeb988 -XoHevPyfazUgd7O+0mPafYsH8+pPmVu3jXoOA7BLRMdQpX9ckc045A+Zmx/VJbLK -gFcHubGLWvay8KOBxVbexvckZbwIpsXqynOyCKscre5yK9rIIslYtceo3faLTKVh -JHJdg7EDwdjbwiMtMLj/YbvPIrNRggQ43asg1S6vVdqIhsaCWHZ/81MYm4VgOMxZ -vPQHIladKZFqjIMmoQ57knduClIh0ML52tXxt3czmgeZ798as5QD6hv9RWeB3JgP -9bgXfX7s5MjOKTaPu1zRSdOkLvDZ1CUbsvh5XiIxpwEtjzLFJOCA1blRTuhmc5eg -Fp5V6669SppnTPezX24nSM3zBZ72em3JXl7R3aNBAuJIIvikN0d511dg/LSmoSUU -LQnF2CQU9ZR9dLGM0KR15m05EbD01jxtPdHLPcWDG058At6ZcHRQHWnysEBdg7cX -mqXPUDUqjpojIY5KD6HixxeY2oFVMnpNDtJ1e8PNwv7RaKglE3i/XOXlaY3RHQy+ -q9ER0iEI2bGPWBONO778hR4zyX9VUSNDtvzrbeTVlfyLC8yWbsA+GbpOt28MhaWD -de6/WtIl+O3wKO1O7F6cLTqXe/nc6smZco41tiII2DnUG6eFMn5zCfuohcoUY2Gp -5zHCJiZZh2jZ8/oZPNAJ/mtjHN+GWhMLv7cAEQEAAYkCNgQYAQgAIBYhBHt5rdEf -inef6Q/T0Ik6AoR1VXZxBQJlFUaIAhsMAAoJEIk6AoR1VXZxgwwP/1bH9XxxzyVE -TexhKm7Yc/RlgrIdE+TGUV0W0b+233jHN01l0cOIU35dn5Ohi/7+PH4Tq0I8rGnW -dUaHLHkmF/tJC+y3etnsqsLVxiZH0reBoq+EnjwOCRdpU2IrOeLTaDjkvpy8nmNj -aA1tsEooT4iKyU1OxUk5GzH5z18HTTxuQ7EYPUFxBCkhx33EvRe1XTxflBd1AMZM -/+tc/2r3LBZPZLMKSz6fhwdx+kN2dIGoyuN6UuG95BwADu7ePFD/BlSJXE8RKkSN -wjuV1ZUsyJdX9h99ljYaknE9i8AyBb3AF9Nc8k/Cd3m6b+nUuA/ZWmMWHOXEyVlc -Oih1/jf0DL6ZiaHEeHi5K5lDN5WGCljDrrfR4b0Z5Xz1BbE6ZYy+ZzKjs/yJc/YH -3g7/7NuxyK+k+wIpgyUMYe0s7Djy2yx+6eNuHsv6AGi3Z253mATH5G7mpatPxWKZ -uBaF/k2v38BBsvD0dLHFZGLABOWIKXJE0VcYyT1zR5CGviYlykG8SD8qtBj6Aynp -4cZtKf/Oe8MlAZAvB1w/KGrZQIBpTN5E9ybEVkxFEiF8oqXuN7TPXJPL+3oAVU6s -qSGbP5W6LdZKGCYM+FivMHDvAyRJhHK/lKDxIqIEwtAmUO66SkBPyFvQUTAeT9LR -WzZKkqBVoahM3qqyoKOy7mfpt1hB4gEq -=E5AV ------END PGP PUBLIC KEY BLOCK----- - pub 8CD7D660AE857DAD uid Emarc Magtanong @@ -1040,24 +996,6 @@ EEIhZlI/ojefaZkRseFrtl3X =pJaU -----END PGP PUBLIC KEY BLOCK----- -pub A6EA2E2BF22E0543 -uid Tobias Warneke (for development purposes) - ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBFJQhigBDADpuhND/VUQwJT0nnJxfjAIur59hyaZZ3Ph/KIgmCneyq7lzYO6 -xa1ucH8mqNBVNLLBhs4CjihBddU/ZKTX3WnZyhQKQMZr3Tg+TCNFmAR4/hnZ3NjZ -N5N5gUj/dqVI2rIvypIuxUApl88BYMsxYpn2+8FKeMd8oBJLqFRJ3WNjB4Op2tRO -XRWoxs1ypubS/IV1zkphHHpi6VSABlTyTWu4kXEj/1/GpsdtHRa9kvdWw7yKQbnM -XuwOxtzZFJcyu0P2jYVfHHvxcjxuklc9edmCGdNxgKIoo0LXZOeFIi6OWtwzD0pn -O6ovJ+PL9QscMdnQlPwsiCwjNUNue20GBv3aUIYc+Z8Gq0SqSan5V0IiKRHMJkzd -FAhnpkSFBvHhPJn07BCcb1kctqL+xnLxIdi7arq3WNA/6bJjsojc/x3FdIvORIeP -sqejhtL8mCBvbMAMHSBrFxclMp+HSz2ouHEEPIQam0KeN8t1yEqIy3/aYKMzHj9c -C3s8XOaBCbJbKpMAEQEAAbQ9VG9iaWFzIFdhcm5la2UgKGZvciBkZXZlbG9wbWVu -dCBwdXJwb3NlcykgPHQud2FybmVrZUBnbXgubmV0Pg== -=q1C6 ------END PGP PUBLIC KEY BLOCK----- - pub A730529CA355A63E uid Jukka Zitting @@ -2181,18 +2119,6 @@ ikmfPIGVw73RF3HXjJ8GVqTkqbo4ZpgTw/7Z3+fAYE/vxquhnpl2HvE= =5tlI -----END PGP PUBLIC KEY BLOCK----- -pub D46C5610D06E7001 -sub 00E25FE3776F21F2 ------BEGIN PGP PUBLIC KEY BLOCK----- - -mDMEZsO4fRYJKwYBBAHaRw8BAQdAcxaiyqFbaECpSz7mhsXzopzN9Cxwv80WlWGN -gM3qpOi4OARmw7h9EgorBgEEAZdVAQUBAQdA45tqjMbTvozvroU+Z0nApYG0r3Zl -gI27fUSEIetPuEIDAQgHiH4EGBYKACYWIQTlLweHelgF+a9KsKzUbFYQ0G5wAQUC -ZsO4fQIbDAUJBaOagAAKCRDUbFYQ0G5wAZG1AP4m+dkpV5g3AT7Lws/lUDrKrdTr -5noqEjUmwUNCiuTOugEArO87llEEIabZngdpe7D+dvJ7Bb+BSX2fzHKmrsE6uwY= -=9gxs ------END PGP PUBLIC KEY BLOCK----- - pub D4DA5EAB3CD7E958 uid Jiaxiang Chen @@ -2298,42 +2224,6 @@ zU7kkPUpKBx6hHg/zJnwTVAY/g4+Iw6CHwBhw+2/KoMpjQ63VqjwQZ6+VIwdsSCh =Uwqi -----END PGP PUBLIC KEY BLOCK----- -pub E08F28E25BD93E9F -uid Jens Nyman - -sub D7B501D37A3AE550 ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGQdnjEBDADm35hD/kMiNXVocImrrdOkA4xvNQ8OLirzETb5DSSocIW+OBLZ -V3k5OiKTqYxlZIa9JT8XLLVc8pi9Is/x/xjoodEYSsj0LL0BODMeyt6ECmfi0brN -CqKv1J46cuWun0iSog3KaGrMx1tcNAVvYHdDuBlZ8X1BbaFwSqdNv1Hq9LkfOUwB -kafs8vXc+5THSkB2XAq9v4B+P9Rl4fwMPsjgkS0X/3JNMq0dqlUXuxNTj9h/dNAv -l7sYEBF5gY1wqmVbesHWurl8Bqbq6wvDualZ0ccGyisaaz2FxIKuQHBK63ffxXVF -/AABfDBsS1nx83qK3T7LFemSwQ+hMdKjck4Vng7RbB/FlUNZlbTiyrwZP9492YG7 -k5EcbB1K9tIPJDccYN3zkmYbaEAHL8j7PnTq7XyRPrNYFLKWBBa3sYz21+d8Ym2+ -ExuFgqvtnyToeKVfGX+mNbftrVK4j2OL6fZMmkDL/6niG34UJvHdsKvqVddTMPXM -1jlZYh35WbM1eIEAEQEAAbQeSmVucyBOeW1hbiA8am55bWFuQGdvb2dsZS5jb20+ -uQGNBGQdnjEBDADQUQl5FP5g6/KTI0aAe05jJk8rkLK7nMQK7ayHdij5RmuRPJO6 -snlEPmSpd80BL9sCuCq8Fo87Al6NcD8Fd39IZl/n7ZbKZHfcSQNkyKlGoNMprAtA -nh4rFdhG8Fn8Z+HRP5VcwG9BUIzvScyCLF4f4gGaaOAMd57I4q1+PsgvUZbGee74 -wqfLBspnkut0CEblr//nYf+Vkoo6EfSwi9QbJLYacy/3IrfByUIyUyrwEGFWMpul -RXFzTRExpnX2j9g+XZO12LHMxJQ2ptOI70m4JDGd8MnPnvMofLsy65DBz/5qZKtV -8haE73KKSWjJi9d81kwAzZR9WjltDDhyYOYYpDFcK4x0Py/XB5Unj1jf49PrgF16 -NVlfRh7vS6VeqUoNHYAR5qagftBiDZQ317GpRpm3LUidqyiFexlLhYHGdUk/vpAO -SCK6azGBmW+dXx/BCC9fX6wVVRv0LNeAWgnyf13SG0d0jFJjzxqRzXclsffo/oEd -JV7MQqo+ZHcdI8sAEQEAAYkBvAQYAQoAJhYhBC7okAcK6TGMOtNSDOCPKOJb2T6f -BQJkHZ4xAhsMBQkDwmcAAAoJEOCPKOJb2T6fNkoMAIVtequTvVXw9Ax92uPbmCDg -iNB2aiF4U23e5ZTPvSMWZlMx8hgI2vMCgRGcNOcEQcIyvFy1dZ5qxqzd/QjFvaY5 -2JutEUbeXvNfKmzjn2VzDiW/SHAc8KnWlAmJfqY+SPSIJNJ72Qc0EkxuGbjbWW+y -eazFuDOafej5Cw/nRTMvAVm5hElNKtdRztQVJOOBPEFefbb9YG9gcVVo0Jxs2WY4 -1rh+GjK8rB/PnK4NicQcbh1hk21enla6j2jYKNhCJkifw0HXsa185cnISSv6fVsG -H8tCCDoaZ8mXhU0W49n+NyWhRdHM9Gr9USkYVsHzJTZgTk429CI+ThEMjsxeIpJH -Qu/m64DNlDu0rrzHpgjyUedNB05QEwEtxv3nMKryLcYifLhbrk4ktLIMtYLdDgJe -ddn3I+ytL779X+SOCm292NQdg9+M6hkvgITfIoPe/seHjc0hP5COIbrfDeIdciyJ -1c3wN0nS/z6/50wBTdmj11Kx3Phb0uKtekcn3BVXug== -=36gl ------END PGP PUBLIC KEY BLOCK----- - pub E16AB52D79FD224F sub 5A34A5E06B936F93 -----BEGIN PGP PUBLIC KEY BLOCK----- @@ -2890,52 +2780,6 @@ IQkQ9C6H+WZQFckWIQTzGEvNVfTQFuMNTJv0Lof5ZlAVyX7PAJ9ztvyEP04cy6zP =dtK1 -----END PGP PUBLIC KEY BLOCK----- -pub F5C81DE10A0B8ECC -uid Andrey Somov (SnakeYAML) - ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBGY/odABDADzlZ1BXT0zN3rL+z4HP8r/2xM6zN950fwRimBTOiT6uE8aQSxq -283R/gIgM+yQBGjStLP3k/TsFJ2FCz7sug+7s1RP70ymkshalTRg+9QHBr2MU1Cx -Xoh3fiH8BLOb3FIxH1wdAtOOoNxbz64Ftcptu3L0I1y2qEwOGNOyvqbntdCuwNbX -/zwZUyb3tOVVrrZ5bp+6jMoBKEEWS7effqhGqXLlO4yTMBXR4pwzhch2IGCe+4M3 -a5C2SIJbR70PMk6aJ2+no2LycYRYJx/t2umAbxuCtwT6t/xh8v5ekbXAu5G3h5y+ -T2bF8rjMhVe6DBgJ08uFge3Oom5a5uZx8sQASdLCng8nKjGO4Q8jWmsEj+OiHnnX -g0oKkirnWbAVrWysgNKAXfwGfDBG95K1F67kVhNjXTx0MDcxpsT9TPxz/nDuzRpQ -ey5M11+Bl/fEM5UuzRpPgPd//bU+L3FgEUguB4kzsiYlhsUQRyCq1x868AchLWey -vaVIq2DY101GIP0AEQEAAbQxQW5kcmV5IFNvbW92IChTbmFrZVlBTUwpIDxwdWJs -aWMuc29tb3ZAZ21haWwuY29tPg== -=9D46 ------END PGP PUBLIC KEY BLOCK----- - -pub F6CE9695C9318406 -uid Sean Owen (ZXing) - -sub 811B3B85BC31841F ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBFHW7ksBCADGzo3LGVyWpBWqxRQlGhpQ9YNav7jiR5WSLnatr8chZx+ldy5j -KquO7GHO0qaHGXyc/CKeKH9Eey0mH4EcvOvEhBOE27Fnuw2NppxQjxXyhYTfvr6q -CHGN+lTORVC3zD6UkMm2R92zNI+ZGWqK2zND5/RZQMW4JNH/Y4ZA6t+fm+dHm/Q5 -Mn/2XEnMnDiuJGnIwb6+sgH4GHdXkzGl+/grayerAp52HWGmKo3TWWtxdZQcdZe7 -spaLlVJEfw5K7uwpR0JDwSHtak7gfs613n1VuQeT9ZA/CnBk0L1JkkSezPO0NFxL -ONjrQA6zBA6apJsdDQYgg55xtFaAWUfBAV37ABEBAAG0JFNlYW4gT3dlbiAoWlhp -bmcpIDxzcm93ZW5AZ21haWwuY29tPrkBDQRR1u5LAQgArA+334bZKR9IOvArfF6T -Yo1gx1wQjiFrbl3rcNrkADzu9/h5PbvkLma1zTSYUo5VZPIn0HbX+GctInY9AkjG -sc3OrBmPi2FI/KOUXnMCmd1ShyphdB5CJjG2VpR4ejG/I1YyMQ2ABWGes1IQJNPs -Hf1PXkJ2NA1gCxD+oAT9RgdXZBolln+TL3sYV4Z0EWhEL+yPjxInvFpabZErssim -tRRrfSuT/wczrLt46zTgmtEKJ7udp6kzC3Nmut6IozlBr5qcEOTdiH6+BxgvW4hH -uqANx4PzVWCCqwTxuiME/Q5kr45tgawSSoIsMAZaPGqeNluXap9qEsXPd3SsZUfg -IQARAQABiQEfBBgBCgAJBQJR1u5LAhsMAAoJEPbOlpXJMYQGP2AH/jkwFM70jQCz -uyMJNX4uHlmP37TNq8n2WxCNb5rQrXJ7UQ/3FSOiF86PRhOYAJHz0aEKWjQG+gr2 -aXc1HZr9g3AB5dLVxJ27SNgrV7Bvw1fI8NvYp+XyDodbQzyjavuslkf6BrQ9CSer -R3WahwNtscMXYCi08f9dB1hooKmjkqgHGE+WHvs5zxtVnmdQ9Oaeu7IYYkhSAFA1 -Pdb2T90L+0xno4kCXaN7Mlw2ffxV53eLDq3fCoO4wkmVdjHjNc6Cq2qa7ntPo1wS -BEhqoEjsNLqVXYq/cm7h+X5AwuLgkYCqA/TOjClEe8C/rVLVj9++Qw2lgbiUC6ry -lkXgEU5D+DY= -=6M1h ------END PGP PUBLIC KEY BLOCK----- - pub F6D4A1D411E9D1AE uid Christopher Povirk @@ -2992,42 +2836,6 @@ B7NlACz0MCH3fYo= =PlCZ -----END PGP PUBLIC KEY BLOCK----- -pub FEFE78456EDDC34A -uid Mattia Tommasone - -sub C3720DDC2E713B7C ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGNBF+y5lsBDAC5h0qk+OBAscHc/ac3A9C8ZPohXcTVpsOjds73soUAH+QCKO0y -gAUuG/hUUU9xkm9PgTwWOEl2qDDcOFXY+9ykeYNUUcCWfs+JmVRfRod4W5pntaT4 -g9Z+T6LbXKNAfZgPvTv4rr7UjD05N4XS4vckrS4taYLtBRJAmqT3pt43KxlyoTbh -f4xcO2rWeXsPqgzTYIHH7M5mYPeqA2gc9NBAhkHjesFuYfWXqUfOVcOLvzULxrra -pZDOyrINr83WikC8DkuDrAav4mIWjIhYmfBWzuNeYJsusVnFENeOxpEHV8RT+8uE -v1gPjbjAKUPfZoa7egvz3EmDkshpNIIym0XxNGTj5ntJWR2SLT7mDrSYPeHrZKW6 -/aKuAcOxpGLpdVOMM+y4N5mTQfdlL81G9kbGQarMmwGaJb2a82PaF20wRwVgiVfO -p/GWgwXr0XdJNLqx13LdM8BMM5vmLomOQOjnpQBOlJWRgrYUJQOReKAEAQqNMsxS -IW9laXkrewJtblEAEQEAAbQtTWF0dGlhIFRvbW1hc29uZSA8bWF0dGlhLnRvbW1h -c29uZUBnbWFpbC5jb20+uQGNBF+y5lsBDACv+jA4LF5tkxOOn1yhSwOMVpsmjBkf -QX76+6HvdRj+/bP6+rC6Dz0AGOs9QhxwT3+3l1HISMG3QQPYoUzeaLr3ZCHJgTy5 -FpQpbPSRhow+7DRbtFNuWGFcSsGuivWbTSJs0MZJ/d8iv0Vnu7l6n9FMUMINpmCq -1ZAZUP64ueoDkQd3BTKJ5YNKB5OFF10zeEpcHV6V3gkok/NDRfBcuC/wyZs5z1bm -nFvVQsPjizXtIoOOUG1G+tJF2ATGB+kpTrccfQPqaf6Qk/TrqSdh126c3DsewqC/ -aY+51NUhBdgZvzEMuE/pRgmjB28kRszy+nW3938KAIxfJVUk6VNnB0loQITSfiAw -naKENnypsOXzU5CFOJa+Cgo4UctPBmCbKEqm3fpG+ReSjLCqUo0ZplU2L0K3VfF+ -muPiyjMDkxx/wEBrFdX2xB9ksofs2EasXNz+vW/ZHftFhZ+Zgvv10mPXGytwQ3zb -pxKjIuLr35c7G9t2jgp/KilHEQJN13o6qT8AEQEAAYkBvAQYAQgAJhYhBFmwYiT9 -iRLjZgO+ef7+eEVu3cNKBQJfsuZbAhsMBQkDwmcAAAoJEP7+eEVu3cNKJfwMAJOe -VNi01GBqtS3gz85GUGBngKt04cvVL1JgG3ov6YCJ9fw4a4WSQIhQU6Q8w4EJ+Nr1 -64IIpv7N5G2mhLJSJVcUzlA8G8ZFXPiW6opYwQFh9HhrqMA92yrwdXYzxGKyhaXZ -TMXZfGryjuHLs8YMQfSXX8giGZLtvJSMkfJsM5TWi4bjlMqpoJ3P8qgmTm9dni74 -tdAWWP0VpFiDl6nD7mz7IP4S1ntcsl8IGCD8bKmnYoL9IGIhXlBatKqPra+hyNrI -iGZQciVA8vxmVFBGnuuR5oCCYDiwuH9/BMWjyj1sGlN+dk7HI7phL+kwwxVpyTYW -Oyt20j/MShit+/cGsDEXkgHgnKi7sxKIgenBz/ECSGEjYiLioZcxnIdBYSfdfDG/ -LvFJeNoNu0g3HZeNNcvKRB2/mlJ/HeJssV41ctc0sL3F3ShOK9NlzY4nNn8yKtv7 -Shma5nGIB6R1N366OBlUvjTs0ggfYypbVA+6WqpzParu/r7S8VozcUwcNZt4Cw== -=Ru9R ------END PGP PUBLIC KEY BLOCK----- - pub 012579464D01C06A uid Herve Boutemy @@ -3908,50 +3716,6 @@ pIXjPlQ0i6kV0h8KapE1Uo005JYgeg== =ASmD -----END PGP PUBLIC KEY BLOCK----- -pub 1DE461528F1F1B2A -uid Julian Reschke (CODE SIGNING KEY) - -sub D4569BDF799A59AB ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQINBFd7wYcBEAC1jmtowY8q/BXHFr4bOvA4WtniUcECC36dHmQzd3LrG8zdDPK4 -DgO/5w8xdilEe7BRD9etCV/uKXVM3KsKjFDHgh2puge4JElbePQL5l1oMmDUIGpK -cj+O7REa8fSAh8MOKRYTBQ6C8z3S4iEJuiiO73gvoe8XvAdoM9tN6G8lh8HBcpIZ -OT552jofRcStDw5WRKWj/MFYnqacReFo4ni6i+A733P+vtU5ZzWqtvhza6YNy4YA -dLTqc2AUzCGFSEaFLTxQNuUGPaykvTUqnN+6sg2EY+3aTLoR2FuXJLN+iwYekWS0 -GBwS/mkK5uvj3+PlIxuuYWu79Aa4W/g4bLzlRZBEigh5yHYHR8qcsBoINiZIq/Ak -7Az1QQRZd9WJFXQFusFTsCcrMt/5FOaBZml92uiLrVQzn8azt9G6aVK6m8yIlLE0 -Ya1Qvt4oGijY+BKNnoiKBBJnQuay4y0dgfolpdmFZf7BR2wmh4Svzttwt00v2OEB -6Qs+caUz4uoa6mzDpuFaZaIpdP4kTSwsGdwqemHsjLaAYcdWssTOi9oS+ioUNjLa -sIPGtI8pZ0WuN1X/IRSGSA6d/S+efqDGGyRligMtxuUicCk7+ew0fQ4dNxettN0B -/wKRJ0ZP9TClw1jdLHDcuonI+8gxdxiT6dNOzCjMssQ1D4qfV56SenTNAQARAQAB -tDZKdWxpYW4gUmVzY2hrZSAoQ09ERSBTSUdOSU5HIEtFWSkgPHJlc2Noa2VAYXBh -Y2hlLm9yZz65Ag0EV3vBhwEQAJfPmNzuUFCB3grJBPq+XTxA25hFAUJJyguOLcnv -MSXKqjT6O3IVetA3C5PEp1uFwqtPV6KqWjv9kFjMMwH9hDBsn+wrrODKst2jz57U -bVIBaOW+hBGCCY0gwfLrtGNkLeUHZ2TIvBbBpc0y7LI4ZcmuGcIa++kwVscAW60u -zkOHip8D5ch1WB070kM6ZmIx6aW2DgxHcp3S+Q0MH8HzUkZPKRniNtaJmNJgeXeF -jEJZe72EGJECAcnuyenS87Bsuf/6lhIN8ThuuKkwGnc0SaxQSwI9qiCHvgI6s63z -+eT21PRJE4P73+4zzSgwmEyLYeQU+q1R9DqIoOGzUAiEXqETMOwDPXFp5WV/K+Ep -cCvzPWkn8ojje9F5JjGRzxFFv7HgtILurmLrHtEEMaO9hN7MVyh8cnbgHZpVk5YJ -9Y3Szm3DtMYljhVa9+j/K/0887yT4XvktUX1jQLj1ItglA3vLUeWN/8ifnmbEqfT -NnMXDpvUGNxbUasHcGjV81kExbVBmM9PH02g6wb8K9x1dqOF1owD7zbzssbkP1VS -FX9RnqwRCLZdtUyQmePj2ES/F+nm4Gns4kI+O0VqQqGCkyZoYbaSpnL/Jz86USKs -xV1dDbVMKzFDkslbxX1X5z7ZeKA4HRvqfcAfMzl67zlcG8af6Nu5uTnnFDE4mF8A -LXx7ABEBAAGJAh8EGAECAAkFAld7wYcCGwwACgkQHeRhUo8fGyrJ+BAAh3L+kebn -F33N19iwVI2dEddDigZutE7Lq2KRr2BQtn53eINQ7FvEsnXy35fZPu/sjaEsYT43 -zfK6uXCx4+DP0ySPMl3rdLuOjJ8hrWYWX1R9yqQIAdL4AOqMX6eXWTCS2lwxoFpz -0dCIonadn8xwftaHgcHebjAtAChd80ckKk9wMbBRxdi3i6+8aeqARf/SZt5toxbm -zXg+oDFDnCigta7xkR2olc72xWhimjBUMMuoQuicpz46huQRCqc5fh79KbKHvaUo -2eEOhN9mGFAfmCJJipe9EDxLfYlnnmlZpAYPSkQLffcEPK9p1Q++voSkb/48GpB7 -lW+Sf7yyVdiqhbUMpy7SuX5c0cOpv1hucaPs0ripKjvRSMvhOH5kPoQtqXGq4AcR -OElystZcX7VEuNZZFymlVJWlAo9M0HFVWcuAZRLGAZIWM2uPhhebqeElDOJORU3B -3sKQjtdKY1zidyPsjsKuTeq2qkq6bJTbJkZmu/7SX/qAP1Q0fEvsFhGf0ou6RFxe -Rlu5Z4N59K6lkXo9+GLAWuc99maXWuYioln5OcoP7xTaFZwqDlF+Z9/Pxzu1foQW -B8KrqPXwhp7/Z3JmW/7jP4EeiXKgA5r4tbBjZnugOhkeRv58z0IKlLLo0c4raiuJ -ZAstgdvEqFLHh1yX4I+if5VODD2nEzXFDzE= -=d5S6 ------END PGP PUBLIC KEY BLOCK----- - pub 1F7A8F87B9D8F501 uid Download @@ -5190,35 +4954,6 @@ xXZy2unHAPYyfxDLPkbTR7Mm4k8Cva8PCcXotDow4bDLm9rhwVkJ =Hgs4 -----END PGP PUBLIC KEY BLOCK----- -pub 44CE7BF2825EA2CD -uid ICU Project @IBM (International Components for Unicode Development at IBM) - -sub E01173141D06B1BF ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQENBEzQQMUBCACbwbw7tuTWgwPsDAdQTWGO355jP75oBLHwGgEwV+OCKtxkNXNw -wrJqXst83vmD1dEJyHflQww+d+Olj90IefQGfR+K7O005C2nky7eNGIomxaP52Y/ -90+tmw8qtsI4nsPWPuVj4WdFvlFgUwIZ0SmX4CauVzg0Ris8f0taxg7PH9zEvICs -G/WAXdB9em08WDD6ruhMAvDF4W8Yy7mpGmdWiFD+B9OC006tv+GzYAvUHRFeCnnT -SoKRiBeLejW+t4kpdMnEfC9ILAYBEEjNYvBIyPdPKBwNfy0yjRebsUf0eNmjGTpk -VPlfofjVaUaOZytUOQvntYpocMX+377DGQIdABEBAAG0X0lDVSBQcm9qZWN0IEBJ -Qk0gKEludGVybmF0aW9uYWwgQ29tcG9uZW50cyBmb3IgVW5pY29kZSBEZXZlbG9w -bWVudCBhdCBJQk0pIDxpY3VpbnRsQHVzLmlibS5jb20+uQENBEzQQMUBCADad+Zs -ICC1lkCN+hdkslhUxRfM7qY86pXBeFcdTI7Nq0GBK79arNPUyXzvrsT0QL2tHyop -PTxZmdLyzO1AL3mYGpJ8400L3jmgCbk+To7naMqbRvNYpRzuuvnvUZ7sleoEiDZ7 -esJ6uJ/CkT6BJiP58TIb5gQj8PmJsRt2XFOWZKOBrYywOCdNZ2oO42Pix9PKhXz3 -CrAA5sexLQkbgXF4ENtNpBd6OwY1C3C1d0fL54t46eZ5Yx9LyRuVEkmNmUdWxYi7 -UwjDvHJvoyLmstuYlopeQ2nowEiF82807UmIPUpMXrdvQFo5a7dfsymbDEiz2yie -qoXVuVzVOEKPcnMdABEBAAGJAR8EGAECAAkFAkzQQMUCGwwACgkQRM578oJeos2c -IAf+IDqhh3NAnNeuT2YIMG39Z8iWfmn9EIilmrIKFM6OGuzkiCEpgWDxp1v1T+BD -LGjRIZ6lit07vnLonVus+zFh0bKi3L2FCnomRNiIZzD/OWndkteFDhxPHG5C8HyB -nvqyLvs2Kc8nOW3EWKni73eQ5NR/3ltP4bGnVvaqUlkERsVjxLDKmgIYq3rdJ7ZR -h9ooLMGe0mDWCzbSu/MKaRaqhR3xb51btVzZokww7pNiKJDyBkY3ljufXkkf5KLY -NM6MeEvgiW0XUHT6tqHwzaigiBLYOsuMjPnXO3O59U8ZOd3zATM13xpyxn20xS6N -YaWHQubHqQGQNV1i0YGd/ufrww== -=/t0B ------END PGP PUBLIC KEY BLOCK----- - pub 4604091C01C3086A uid Dave Brosius @@ -5730,37 +5465,6 @@ cDvA =Sagc -----END PGP PUBLIC KEY BLOCK----- -pub 5ED22F661BBF0ACC -uid Igor Sereda - -sub 31ADCD8BFCB760B4 ------BEGIN PGP PUBLIC KEY BLOCK----- - -mQGiBExyNhsRBAC/W5cMapoP7NUn8S22iWG5bPw0bconApJHP4kQdT17gT2JgNJz -BmuGWV59ZOGQkc6woeFKc1s6twlsgIL51jMeVOtgLJRGTS4So2hthNqDcgO4j8Lm -yXpqbTkbD7/ZlRzL2hhedrMz4NQOZCvsZpQ1RaCDrr2hxDq/HhD2omGdlwCg/9Mt -JNc7897LgfCMmtPOvAFt+rsD/0K87nvW37nlRqHdEtzvwUlyLJmYxdW9hDr8tm4Q -Y/8rDvNFlhKV/yXmxQuhtgQ1qpBo75dwD86aJmzIMIWM0iei9Ecfu2DsWiWvArq1 -heDjMYSeQl6k37cmD59afo6e/jQmg2/ALC6mRf3912SfmqV5spw0k+NYdFxAnbot -9jOfA/41shIdZloZ0aDcJDTNe22wFFh2sW8RwWtJJO8rmOCgh3MmkPn7LHPI9idJ -bSdD1dRcR7UTyeigEeDTu0PAKfKZutc91lfcIGSZdk39SEEhUkL2JdPKVRBotiZZ -Jsi+NxDdsprF/yQtr00XSGJYzh2TW/Srnb5nZQm2Iyokod3M1rQeSWdvciBTZXJl -ZGEgPHNlcmVkYUBnbWFpbC5jb20+uQINBExyNhsQCACTTDNmrbllfvcMiXHDfS7x -CbLQczZxWZF7jk+PznsWVJCw7zZg084zFKQAIKYcABPekAK4wJ/lnQc7mItsevF6 -AU8ZYuQ0TcInnKBrXMiIWDM1z2o2pa09AhIkhCMAGK3hKx4xjyL7e3oDz02NZz8A -4rUGWgd2MCa29Pnihi2oVgIyU0y0ItpHqKhJQffyotWNe0W+ZNjg6qiQ1rPolfHN -PKbKjyAl9/0lGlybZLZeSyvR0s1iblDAkQ3spfgTyIfxHPxNbF8CGt/TOfjkPtuA -c6TckU8RfMoZXWX3pNvmH/LL3C43gl4/JcMZ+KC5v7WCtXkMEpDeyuQTDLqLABjD -AAMFB/4tehSPbgS+Fx744n1kJo8SmmZXrEn4tpT/0PWHAyRDoJdzQgfeh40YBts4 -eFczYbKZF+DyebNsgdW55M/whJ47sNz6AyvuXuXmQHVbsiy0yVLXEjdV2D0Pwdo8 -lrmAHeoQasg90M/UpFHAl+XD4OZBcHmM6Pi9bXEQKpfRsZj1c0UVpIyGSvldFVPf -GBDx3TC4IH2i25RkL2nGbAWIfbD8W8rMxMoxHArghE6fkU+FI7ZUEcGeW8X+ZJsQ -PbaOMHsOeBQLisXR8TUysDoMMkgAquwOWTRUjvH+0g5huQQ7LKkOAF/gkuvGCsjq -OfeIJF2aLnWFLt21dfdkiSYNUms5iEkEGBECAAkFAkxyNhsCGwwACgkQXtIvZhu/ -CsymUgCg/kZJOCScWbc41n9bn2Ir6X5claEAn0Gu7stpIpkazuPCpeoY2tnRnPE3 -=ZFxP ------END PGP PUBLIC KEY BLOCK----- - pub 5F69AD087600B22C uid Eric Bruneton diff --git a/gradle/verification-metadata.xml b/gradle/verification-metadata.xml index f77a341..1fab9b7 100644 --- a/gradle/verification-metadata.xml +++ b/gradle/verification-metadata.xml @@ -3,7 +3,6 @@ true true - armored @@ -15,9 +14,9 @@ - - - + + + @@ -41,32 +40,25 @@ - - - - - - - @@ -84,17 +76,12 @@ - - - - - - + @@ -105,7 +92,6 @@ - @@ -116,8 +102,6 @@ - - @@ -128,7 +112,6 @@ - @@ -137,7 +120,6 @@ - @@ -172,10 +154,8 @@ - - @@ -184,10 +164,8 @@ - - @@ -210,7 +188,6 @@ - @@ -243,10 +220,7 @@ - - - - + @@ -263,17 +237,14 @@ - - - @@ -293,9 +264,6 @@ - - - @@ -331,11 +299,9 @@ - - @@ -351,8 +317,6 @@ - - @@ -362,7 +326,6 @@ - @@ -420,14 +383,6 @@ - - - - - - - - @@ -620,11 +575,6 @@ - - - - - @@ -639,9 +589,6 @@ - - - @@ -687,9 +634,6 @@ - - - @@ -1128,26 +1072,6 @@ - - - - - - - - - - - - - - - - - - - - @@ -2439,14 +2363,6 @@ - - - - - - - - @@ -2455,14 +2371,6 @@ - - - - - - - - @@ -2618,9 +2526,6 @@ - - - @@ -2731,14 +2636,6 @@ - - - - - - - - @@ -2843,14 +2740,6 @@ - - - - - - - - @@ -2955,14 +2844,6 @@ - - - - - - - - @@ -3789,14 +3670,6 @@ - - - - - - - - @@ -3813,14 +3686,6 @@ - - - - - - - - @@ -3837,14 +3702,6 @@ - - - - - - - - @@ -3909,11 +3766,6 @@ - - - - - @@ -3922,24 +3774,6 @@ - - - - - - - - - - - - - - - - - - @@ -3948,11 +3782,6 @@ - - - - - @@ -3982,14 +3811,6 @@ - - - - - - - - @@ -4006,14 +3827,6 @@ - - - - - - - - @@ -4030,14 +3843,6 @@ - - - - - - - - @@ -4054,14 +3859,6 @@ - - - - - - - - @@ -4087,9 +3884,6 @@ - - - @@ -4105,9 +3899,6 @@ - - - @@ -4123,14 +3914,6 @@ - - - - - - - - @@ -4147,14 +3930,6 @@ - - - - - - - - @@ -4171,14 +3946,6 @@ - - - - - - - - @@ -4195,14 +3962,6 @@ - - - - - - - - @@ -4219,14 +3978,6 @@ - - - - - - - - @@ -4243,14 +3994,6 @@ - - - - - - - - @@ -4277,14 +4020,6 @@ - - - - - - - - @@ -4310,9 +4045,6 @@ - - - @@ -4354,17 +4086,6 @@ - - - - - - - - - - - @@ -4381,14 +4102,6 @@ - - - - - - - - @@ -4405,14 +4118,6 @@ - - - - - - - - @@ -4429,14 +4134,6 @@ - - - - - - - - @@ -4453,14 +4150,6 @@ - - - - - - - - @@ -4470,9 +4159,6 @@ - - - @@ -4498,14 +4184,6 @@ - - - - - - - - @@ -4514,14 +4192,6 @@ - - - - - - - - @@ -4602,14 +4272,6 @@ - - - - - - - - @@ -4658,14 +4320,6 @@ - - - - - - - - @@ -4714,14 +4368,6 @@ - - - - - - - - @@ -4770,14 +4416,6 @@ - - - - - - - - @@ -4826,14 +4464,6 @@ - - - - - - - - @@ -4882,14 +4512,6 @@ - - - - - - - - @@ -4938,14 +4560,6 @@ - - - - - - - - @@ -4994,14 +4608,6 @@ - - - - - - - - @@ -5425,9 +5031,6 @@ - - - @@ -5448,14 +5051,6 @@ - - - - - - - - @@ -5464,14 +5059,6 @@ - - - - - - - - @@ -5493,14 +5080,6 @@ - - - - - - - - @@ -5649,14 +5228,6 @@ - - - - - - - - @@ -5673,14 +5244,6 @@ - - - - - - - - @@ -5697,22 +5260,6 @@ - - - - - - - - - - - - - - - - @@ -5737,14 +5284,6 @@ - - - - - - - - @@ -5777,14 +5316,6 @@ - - - - - - - - @@ -5801,14 +5332,6 @@ - - - - - - - - @@ -5825,14 +5348,6 @@ - - - - - - - - @@ -5849,14 +5364,6 @@ - - - - - - - - @@ -5873,14 +5380,6 @@ - - - - - - - - @@ -5897,14 +5396,6 @@ - - - - - - - - @@ -5929,14 +5420,6 @@ - - - - - - - - @@ -5953,14 +5436,6 @@ - - - - - - - - @@ -5977,14 +5452,6 @@ - - - - - - - - @@ -6001,14 +5468,6 @@ - - - - - - - - @@ -6025,14 +5484,6 @@ - - - - - - - - @@ -6190,14 +5641,6 @@ - - - - - - - - @@ -6214,14 +5657,6 @@ - - - - - - - - @@ -6238,14 +5673,6 @@ - - - - - - - - @@ -6384,14 +5811,6 @@ - - - - - - - - @@ -6496,14 +5915,6 @@ - - - - - - - - @@ -6608,14 +6019,6 @@ - - - - - - - - @@ -6720,14 +6123,6 @@ - - - - - - - - @@ -6832,14 +6227,6 @@ - - - - - - - - @@ -6944,14 +6331,6 @@ - - - - - - - - @@ -7096,14 +6475,6 @@ - - - - - - - - @@ -7208,14 +6579,6 @@ - - - - - - - - @@ -7320,14 +6683,6 @@ - - - - - - - - @@ -7432,14 +6787,6 @@ - - - - - - - - @@ -7544,14 +6891,6 @@ - - - - - - - - @@ -7656,14 +6995,6 @@ - - - - - - - - @@ -7768,14 +7099,6 @@ - - - - - - - - @@ -7880,14 +7203,6 @@ - - - - - - - - @@ -7968,14 +7283,6 @@ - - - - - - - - @@ -8080,14 +7387,6 @@ - - - - - - - - @@ -8192,14 +7491,6 @@ - - - - - - - - @@ -8304,14 +7595,6 @@ - - - - - - - - @@ -8416,14 +7699,6 @@ - - - - - - - - @@ -8528,14 +7803,6 @@ - - - - - - - - @@ -8640,14 +7907,6 @@ - - - - - - - - @@ -8808,14 +8067,6 @@ - - - - - - - - @@ -8936,14 +8187,6 @@ - - - - - - - - @@ -9064,14 +8307,6 @@ - - - - - - - - @@ -9192,14 +8427,6 @@ - - - - - - - - @@ -9344,14 +8571,6 @@ - - - - - - - - @@ -9456,14 +8675,6 @@ - - - - - - - - @@ -9688,14 +8899,6 @@ - - - - - - - - @@ -9960,14 +9163,6 @@ - - - - - - - - @@ -10072,14 +9267,6 @@ - - - - - - - - @@ -10184,14 +9371,6 @@ - - - - - - - - @@ -10296,14 +9475,6 @@ - - - - - - - - @@ -10408,14 +9579,6 @@ - - - - - - - - @@ -10520,14 +9683,6 @@ - - - - - - - - @@ -10632,14 +9787,6 @@ - - - - - - - - @@ -10712,14 +9859,6 @@ - - - - - - - - @@ -10792,14 +9931,6 @@ - - - - - - - - @@ -10904,14 +10035,6 @@ - - - - - - - - @@ -11016,14 +10139,6 @@ - - - - - - - - @@ -11128,14 +10243,6 @@ - - - - - - - - @@ -11240,14 +10347,6 @@ - - - - - - - - @@ -11352,14 +10451,6 @@ - - - - - - - - @@ -11464,14 +10555,6 @@ - - - - - - - - @@ -11576,14 +10659,6 @@ - - - - - - - - @@ -11688,14 +10763,6 @@ - - - - - - - - @@ -11800,14 +10867,6 @@ - - - - - - - - @@ -11912,14 +10971,6 @@ - - - - - - - - @@ -12024,14 +11075,6 @@ - - - - - - - - @@ -12280,14 +11323,6 @@ - - - - - - - - @@ -12392,14 +11427,6 @@ - - - - - - - - @@ -12504,14 +11531,6 @@ - - - - - - - - @@ -12672,11 +11691,6 @@ - - - - - @@ -12702,11 +11716,6 @@ - - - - - @@ -12727,11 +11736,6 @@ - - - - - @@ -12753,14 +11757,6 @@ - - - - - - - - @@ -12795,14 +11791,6 @@ - - - - - - - - @@ -12819,14 +11807,6 @@ - - - - - - - - @@ -12976,14 +11956,6 @@ - - - - - - - - @@ -13128,30 +12100,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -13236,30 +12184,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -13340,30 +12264,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - @@ -13476,14 +12376,6 @@ - - - - - - - - @@ -13750,22 +12642,6 @@ - - - - - - - - - - - - - - - - @@ -14815,14 +13691,6 @@ - - - - - - - - @@ -15017,11 +13885,6 @@ - - - - - @@ -15363,19 +14226,6 @@ - - - - - - - - - - - - - @@ -15442,14 +14292,6 @@ - - - - - - - - @@ -17310,22 +16152,6 @@ - - - - - - - - - - - - - - - - @@ -17601,14 +16427,6 @@ - - - - - - - - @@ -17677,11 +16495,6 @@ - - - - - @@ -17728,14 +16541,6 @@ - - - - - - - - @@ -17824,11 +16629,6 @@ - - - - - @@ -18430,16 +17230,6 @@ - - - - - - - - - - @@ -18576,11 +17366,6 @@ - - - - - @@ -18717,16 +17502,6 @@ - - - - - - - - - - @@ -18931,16 +17706,6 @@ - - - - - - - - - - @@ -19056,16 +17821,6 @@ - - - - - - - - - - @@ -19470,16 +18225,6 @@ - - - - - - - - - - @@ -19568,14 +18313,6 @@ - - - - - - - - @@ -20119,11 +18856,6 @@ - - - - - @@ -20691,16 +19423,6 @@ - - - - - - - - - - @@ -20857,11 +19579,6 @@ - - - - - @@ -20923,14 +19640,6 @@ - - - - - - - - @@ -21055,11 +19764,6 @@ - - - - - @@ -21279,14 +19983,6 @@ - - - - - - - - @@ -21388,11 +20084,6 @@ - - - - - @@ -21483,14 +20174,6 @@ - - - - - - - - @@ -21555,22 +20238,6 @@ - - - - - - - - - - - - - - - - @@ -21635,14 +20302,6 @@ - - - - - - - - @@ -21752,14 +20411,6 @@ - - - - - - - - @@ -21946,318 +20597,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -22396,11 +20735,6 @@ - - - - - diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 8bdaf60..1b33c55 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a84e18..d4081da 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-9.0.0-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/gradlew b/gradlew index ef07e01..23d15a9 100755 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. diff --git a/scripts/QA_keystore.jks b/scripts/QA_keystore.jks new file mode 100644 index 0000000..2b8fb9b Binary files /dev/null and b/scripts/QA_keystore.jks differ diff --git a/scripts/QA_keystore.jks.license b/scripts/QA_keystore.jks.license new file mode 100644 index 0000000..2c6c5df --- /dev/null +++ b/scripts/QA_keystore.jks.license @@ -0,0 +1,2 @@ +SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors +SPDX-License-Identifier: GPL-3.0-or-later diff --git a/scripts/analysis/lint-results.txt b/scripts/analysis/lint-results.txt index 9dc6fc1..a4c0bfd 100644 --- a/scripts/analysis/lint-results.txt +++ b/scripts/analysis/lint-results.txt @@ -1,2 +1,2 @@ DO NOT TOUCH; GENERATED BY DRONE - Lint Report: 99 warnings + Lint Report: 97 warnings diff --git a/scripts/repo b/scripts/repo deleted file mode 100644 index c1cc361..0000000 --- a/scripts/repo +++ /dev/null @@ -1 +0,0 @@ -talk-android diff --git a/scripts/repo.license b/scripts/repo.license deleted file mode 100644 index 23e2d6b..0000000 --- a/scripts/repo.license +++ /dev/null @@ -1,2 +0,0 @@ -SPDX-FileCopyrightText: 2025 Nextcloud GmbH and Nextcloud contributors -SPDX-License-Identifier: AGPL-3.0-or-later diff --git a/scripts/uploadArtifact.sh b/scripts/uploadArtifact.sh new file mode 100755 index 0000000..cc8da35 --- /dev/null +++ b/scripts/uploadArtifact.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env bash + +# +# SPDX-FileCopyrightText: 2021-2024 Nextcloud GmbH and Nextcloud contributors +# SPDX-FileCopyrightText: 2021 Andy Scherzinger +# SPDX-License-Identifier: GPL-3.0-or-later +# + +#1: LOG_USERNAME +#2: LOG_PASSWORD +#3: DRONE_BUILD_NUMBER +#4: DRONE_PULL_REQUEST +#5: GITHUB_TOKEN + +PUBLIC_URL=https://www.kaminsky.me/nc-dev/android-artifacts +USER=$1 +PASS=$2 +BUILD=$3 +PR=$4 +GITHUB_TOKEN=$5 +DAV_URL=https://nextcloud.kaminsky.me/remote.php/dav/files/$USER/android-artifacts/ + +if ! test -e app/build/outputs/apk/qa/debug/app-qa-*.apk ; then + exit 1 +fi +echo "Uploaded artifact to $DAV_URL/$BUILD-talk.apk" + +# delete all old comments, starting with "APK file:" +oldComments=$(curl 2>/dev/null --header "authorization: Bearer $GITHUB_TOKEN" -X GET https://api.github.com/repos/nextcloud/talk-android/issues/$PR/comments | jq '.[] | (.id |tostring) + "|" + (.user.login | test("github-actions") | tostring) + "|" + (.body | test("APK file:.*") | tostring)' | grep "true|true" | tr -d "\"" | cut -f1 -d"|") + +echo $oldComments | while read comment ; do + curl 2>/dev/null --header "authorization: Bearer $GITHUB_TOKEN" -X DELETE https://api.github.com/repos/nextcloud/talk-android/issues/comments/$comment +done + +apt-get -y install qrencode + +qrencode -o $PR.png "$PUBLIC_URL/$BUILD-talk.apk" + +curl -u $USER:$PASS -X PUT $DAV_URL/$BUILD-talk.apk --upload-file app/build/outputs/apk/qa/debug/app-qa-*.apk +curl -u $USER:$PASS -X PUT $DAV_URL/$BUILD-talk.png --upload-file $PR.png +curl --header "authorization: Bearer $GITHUB_TOKEN" -X POST https://api.github.com/repos/nextcloud/talk-android/issues/$PR/comments -d "{ \"body\" : \"APK file: $PUBLIC_URL/$BUILD-talk.apk

![qrcode]($PUBLIC_URL/$BUILD-talk.png)

To test this change/fix you can simply download above APK file and install and test it in parallel to your existing Nextcloud Talk app. \" }"