Implements edit socks

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <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 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<https://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<https://www.gnu.org/licenses/why-not-lgpl.html>.

app/build.gradle

@@ -51,6 +51,12 @@ android {
         coreLibraryDesugaringEnabled true
     }
 
+    lintOptions {
+        disable "MissingTranslation"
+        disable "ExtraTranslation"
+        disable "BlockedPrivateApi"
+    }
+
     packagingOptions {
         exclude "/META-INF/*.version"
         exclude "/META-INF/*.kotlin_module"
@@ -63,6 +69,20 @@ android {
     kotlinOptions {
         jvmTarget = "1.8"
     }
+
+    bundle {
+        language {
+            enableSplit = false
+        }
+    }
+
+    splits {
+        abi {
+            enable true
+            universalApk false
+        }
+    }
+
 }
 
 dependencies {
@@ -90,7 +110,7 @@ dependencies {
     implementation "me.weishu:free_reflection:3.0.1"
     implementation "com.github.zawadz88.materialpopupmenu:material-popup-menu:4.1.0"
     implementation "com.squareup.okhttp3:okhttp:5.0.0-alpha.2"
-    implementation 'androidx.preference:preference:1.1.1'
+    implementation("com.takisoft.preferencex:preferencex-simplemenu:1.1.0")
 
     def room_version = "2.2.6"
     implementation "androidx.room:room-runtime:$room_version"

app/proguard-rules.pro

@@ -19,5 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
--dontobfuscate
+
+-repackageclasses ''
 -keepattributes SourceFile,LineNumberTable

app/src/main/AndroidManifest.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     package="io.nekohasekai.sagernet">
 
     <permission
@@ -13,7 +14,9 @@
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission
+        android:name="android.permission.WRITE_EXTERNAL_STORAGE"
+        tools:ignore="ScopedStorage" />
 
     <uses-feature
         android:name="android.software.leanback"
@@ -27,12 +30,6 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/Theme.SagerNet.Immersive">
-        <activity
-            android:name=".ui.settings.SettingsActivity"
-            android:label="@string/title_activity_settings"></activity>
-        <activity
-            android:name=".ui.entity.SocksSettingsActivity"
-            android:label="@string/title_activity_socks_settings" />
         <activity
             android:name=".ui.MainActivity"
             android:label="@string/app_name"
@@ -44,6 +41,7 @@
             </intent-filter>
         </activity>
         <activity android:name=".ui.VpnRequestActivity" />
+        <activity android:name=".ui.settings.SocksSettingsActivity" />
 
         <service
             android:name=".bg.ProxyService"

app/src/main/java/io/nekohasekai/sagernet/Constants.kt

@@ -11,6 +11,16 @@ object Key {
     const val MODE_PROXY = 1
     const val MODE_TRANS = 2
 
+    const val PROFILE_ID = "profileId"
+    const val PROFILE_NAME = "profileName"
+    const val PROFILE_GROUP = "profileGroup"
+
+    const val SERVER_ADDRESS = "serverAddress"
+    const val SERVER_PORT = "serverPort"
+    const val SERVER_USERNAME = "serverUsername"
+    const val SERVER_PASSWORD = "serverPassword"
+    const val SERVER_UDP = "serverUdp"
+
 }
 
 object Action {

app/src/main/java/io/nekohasekai/sagernet/bg/BaseService.kt

@@ -15,6 +15,7 @@ import io.nekohasekai.sagernet.Action
 import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.database.DataStore
 import io.nekohasekai.sagernet.database.SagerDatabase
+import io.nekohasekai.sagernet.ktx.Logs
 import io.nekohasekai.sagernet.ktx.broadcastReceiver
 import io.nekohasekai.sagernet.ktx.readableMessage
 import kotlinx.coroutines.*
@@ -284,7 +285,7 @@ class BaseService {
                     preInit()
                     proxy.init(this@Interface)
                     data.processes = GuardedProcessPool {
-//                        Timber.w(it)
+                        Logs.w(it)
                         stopRunner(false, it.readableMessage)
                     }
                     startProcesses()
@@ -294,7 +295,7 @@ class BaseService {
                 } catch (_: UnknownHostException) {
                     stopRunner(false, getString(R.string.invalid_server))
                 } catch (exc: Throwable) {
-//                    if (exc is ExpectedException) Timber.d(exc) else Timber.w(exc)
+                    if (exc is ExpectedException) Logs.d(exc.readableMessage) else Logs.w(exc)
                     stopRunner(false,
                         "${getString(R.string.service_failed)}: ${exc.readableMessage}")
                 } finally {

app/src/main/java/io/nekohasekai/sagernet/bg/VpnService.kt

@@ -337,7 +337,6 @@ class VpnService : BaseVpnService(), BaseService.Interface {
                 localSocket.setFileDescriptorsForSend(arrayOf(fd))
                 localSocket.outputStream.write(42)
             }
-            System.out.println("FD Sended")
             return
         } catch (e: IOException) {
             if (tries > 5) throw e

app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt

@@ -14,8 +14,8 @@ import kotlinx.coroutines.DEBUG_PROPERTY_VALUE_ON
 
 object DataStore {
 
-    val publicStore = RoomPreferenceDataStore(PublicDatabase.kvPairDao)
-    val sagerStore = RoomPreferenceDataStore(SagerDatabase.kvPairDao)
+    val configurationStore = RoomPreferenceDataStore(PublicDatabase.kvPairDao)
+    val profileCacheStore = RoomPreferenceDataStore(SagerDatabase.profileCacheDao)
 
     fun init() {
         if (Build.VERSION.SDK_INT >= 24) {
@@ -26,16 +26,25 @@ object DataStore {
 
     }
 
-    var serviceMode by sagerStore.int(Key.SERVICE_MODE)
-    var selectedProxy by sagerStore.long("selected_proxy")
-    var allowAccess by sagerStore.boolean("allow_access")
-    var socks5Port by sagerStore.int("socks5_port") { 3389 }
-    var useHttp by sagerStore.boolean("use_http")
-    var httpPort by sagerStore.long("http_port")
-    var ipv6Route by sagerStore.boolean("ipv6_route")
-    var preferIpv6 by sagerStore.boolean("prefer_ipv6")
-    var meteredNetwork by sagerStore.boolean("metered_network")
-    var proxyApps by sagerStore.int("proxyApps")
-    var individual by sagerStore.string("individual")
+    var serviceMode by configurationStore.int(Key.SERVICE_MODE)
+    var selectedProxy by configurationStore.long("selected_proxy")
+    var allowAccess by configurationStore.boolean("allow_access")
+    var socks5Port by configurationStore.int("socks5_port") { 3389 }
+    var useHttp by configurationStore.boolean("use_http")
+    var httpPort by configurationStore.long("http_port")
+    var ipv6Route by configurationStore.boolean("ipv6_route")
+    var preferIpv6 by configurationStore.boolean("prefer_ipv6")
+    var meteredNetwork by configurationStore.boolean("metered_network")
+    var proxyApps by configurationStore.int("proxyApps")
+    var individual by configurationStore.string("individual")
+
+    var editingId by profileCacheStore.long(Key.PROFILE_ID)
+    var editingGroup by profileCacheStore.long(Key.PROFILE_GROUP)
+    var profileName by profileCacheStore.string(Key.PROFILE_NAME)
+    var serverAddress by profileCacheStore.string(Key.SERVER_ADDRESS)
+    var serverPort by profileCacheStore.string(Key.SERVER_PORT)
+    var serverUsername by profileCacheStore.string(Key.SERVER_USERNAME)
+    var serverPassword by profileCacheStore.string(Key.SERVER_PASSWORD)
+    var serverUdp by profileCacheStore.boolean(Key.SERVER_UDP)
 
 }

app/src/main/java/io/nekohasekai/sagernet/database/ProxyEntity.kt

@@ -32,7 +32,8 @@ class ProxyEntity(
     }
 
     fun displayName(): String {
-        return requireBean().name
+        return requireBean().name.takeIf { !it.isNullOrBlank() }
+            ?: "${requireBean().serverAddress}:${requireBean().serverPort}"
     }
 
     fun requireBean(): AbstractBean {
@@ -55,6 +56,9 @@ class ProxyEntity(
         @Query("SELECT * FROM proxy_entities WHERE id = :proxyId")
         fun getById(proxyId: Long): ProxyEntity?
 
+        @Query("DELETE FROM proxy_entities WHERE id = :proxyId")
+        fun deleteById(proxyId: Long): Int
+
         @Insert
         fun addProxy(proxy: ProxyEntity)
 

app/src/main/java/io/nekohasekai/sagernet/database/SagerDatabase.kt

@@ -29,13 +29,13 @@ abstract class SagerDatabase : RoomDatabase() {
                 .build()
         }
 
-        val kvPairDao get() = instance.keyValuePairDao()
+        val profileCacheDao get() = instance.profileCacheDao()
         val groupDao get() = instance.groupDao()
         val proxyDao get() = instance.proxyDao()
 
     }
 
-    abstract fun keyValuePairDao(): KeyValuePair.Dao
+    abstract fun profileCacheDao(): KeyValuePair.Dao
     abstract fun groupDao(): ProxyGroup.Dao
     abstract fun proxyDao(): ProxyEntity.Dao
 

app/src/main/java/io/nekohasekai/sagernet/fmt/KryoConverters.java

@@ -25,9 +25,7 @@ public class KryoConverters {
         ByteBufferOutput buffer = KryosKt.byteBuffer(out);
         bean.serialize(buffer);
         IoUtil.flush(buffer);
-        IoUtil.flush(out);
         IoUtil.close(buffer);
-        IoUtil.close(out);
         return out.toByteArray();
     }
 
@@ -36,7 +34,6 @@ public class KryoConverters {
         ByteBufferInput buffer = KryosKt.byteBuffer(input);
         bean.deserialize(buffer);
         IoUtil.close(buffer);
-        IoUtil.close(input);
         return bean;
     }
 

app/src/main/java/io/nekohasekai/sagernet/ktx/Events.kt

@@ -0,0 +1,36 @@
+package io.nekohasekai.sagernet.ktx
+
+import java.lang.ref.SoftReference
+import java.util.*
+import java.util.concurrent.ConcurrentHashMap
+
+interface EventListener {
+    fun onEvent(eventId: Int, vararg args: Any)
+}
+
+const val EVENT_UPDATE_PROFILE = 0
+const val EVENT_UPDATE_GROUP = EVENT_UPDATE_PROFILE + 1
+
+private val listeners = ConcurrentHashMap<Int, LinkedList<SoftReference<EventListener>>>()
+
+fun registerListener(eventId: Int, listener: EventListener) {
+    listeners.getOrPut(eventId) { LinkedList() }.add(SoftReference(listener))
+}
+
+fun removeListener(eventId: Int, listener: EventListener) {
+    listeners[eventId]?.removeIf { it.get() == listener }
+}
+
+fun postNotification(eventId: Int, vararg args: Any) {
+    listeners[eventId]?.apply {
+        val iterator = iterator()
+        while (iterator.hasNext()) {
+            val listener = iterator.next().get()
+            if (listener == null) {
+                iterator.remove()
+                continue
+            }
+            listener.onEvent(eventId, * args)
+        }
+    }
+}

app/src/main/java/io/nekohasekai/sagernet/ktx/Utils.kt

@@ -8,15 +8,19 @@ import android.content.IntentFilter
 import android.content.pm.PackageInfo
 import android.content.res.Resources
 import android.os.Build
+import android.os.Parcelable
 import android.system.Os
 import android.system.OsConstants
 import android.util.TypedValue
 import androidx.annotation.AttrRes
+import androidx.fragment.app.DialogFragment
+import androidx.fragment.app.FragmentManager
 import androidx.preference.Preference
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.suspendCancellableCoroutine
+import kotlinx.parcelize.Parcelize
 import java.io.FileDescriptor
 import java.net.HttpURLConnection
 import java.net.InetAddress
@@ -114,4 +118,13 @@ fun String?.parseNumericAddress(): InetAddress? = Os.inet_pton(OsConstants.AF_IN
     ?: Os.inet_pton(OsConstants.AF_INET6, this)?.let {
         if (Build.VERSION.SDK_INT >= 29) it else parseNumericAddress.invoke(null,
             this) as InetAddress
-    }
+    }
+
+
+@Parcelize
+class Empty : Parcelable
+
+@JvmOverloads
+fun DialogFragment.showAllowingStateLoss(fragmentManager: FragmentManager, tag: String? = null) {
+    if (!fragmentManager.isStateSaved) show(fragmentManager, tag)
+}

app/src/main/java/io/nekohasekai/sagernet/ui/ConfigurationFragment.kt

@@ -5,6 +5,7 @@ import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.core.view.isGone
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.widget.ViewPager2
 import com.github.zawadz88.materialpopupmenu.popupMenu
@@ -26,16 +27,18 @@ class ConfigurationFragment : Fragment() {
         return inflater.inflate(R.layout.group_list_main, container, false)
     }
 
+    lateinit var adapter: GroupPagerAdapter
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         val groupPager = view.findViewById<ViewPager2>(R.id.group_pager)
         val tabLayout = view.findViewById<TabLayout>(R.id.group_tab)
-        val adapter = GroupPagerAdapter(this)
+        adapter = GroupPagerAdapter(this)
         groupPager.adapter = adapter
 
         TabLayoutMediator(tabLayout, groupPager) { tab, position ->
             tab.text = adapter.groupList[position].name
                 .takeIf { !it.isNullOrBlank() } ?: getString(R.string.group_default)
-            tab.view.setOnLongClickListener {
+            tab.view.setOnLongClickListener { tabView ->
                 popupMenu {
                     dropDownVerticalOffset = 100
                     if (position == 0) {
@@ -66,19 +69,24 @@ class ConfigurationFragment : Fragment() {
                             callback = {
                                 runOnIoDispatcher {
                                     SagerDatabase.groupDao.delete(group)
-                                    adapter.reloadList()
+                                    adapter.reloadList {
+                                        tabLayout.isGone = it
+                                    }
                                 }
                             }
                         }
-                        //  }
                     }
-                }.show(requireContext(), it)
+                }.show(requireContext(), tabView)
 
                 true
             }
         }.attach()
 
-        adapter.reloadList()
+        runOnIoDispatcher {
+            adapter.reloadList {
+                tabLayout.isGone = it
+            }
+        }
 
     }
 

app/src/main/java/io/nekohasekai/sagernet/ui/MainActivity.kt

@@ -2,6 +2,7 @@ package io.nekohasekai.sagernet.ui
 
 import android.os.Bundle
 import android.os.RemoteException
+import android.view.Menu
 import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.Toolbar
@@ -85,9 +86,13 @@ class MainActivity : AppCompatActivity(), SagerConnection.Callback,
         changeState(BaseService.State.Idle) // reset everything to init state
 
         connection.connect(this, this)
-        DataStore.publicStore.registerChangeListener(this)
+        DataStore.configurationStore.registerChangeListener(this)
     }
 
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.profile_manager_menu, menu)
+        return true
+    }
 
     var state = BaseService.State.Idle
 
@@ -170,7 +175,7 @@ class MainActivity : AppCompatActivity(), SagerConnection.Callback,
 
     override fun onDestroy() {
         super.onDestroy()
-        DataStore.publicStore.unregisterChangeListener(this)
+        DataStore.configurationStore.unregisterChangeListener(this)
         connection.disconnect(this)
     }
 

app/src/main/java/io/nekohasekai/sagernet/ui/VpnRequestActivity.kt

@@ -16,6 +16,7 @@ import io.nekohasekai.sagernet.Key
 import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.SagerApp
 import io.nekohasekai.sagernet.database.DataStore
+import io.nekohasekai.sagernet.ktx.Logs
 import io.nekohasekai.sagernet.ktx.broadcastReceiver
 
 class VpnRequestActivity : AppCompatActivity() {
@@ -62,7 +63,7 @@ class VpnRequestActivity : AppCompatActivity() {
                 SagerApp.startService()
                 false
             } else {
-//            Timber.e("Failed to start VpnService: $intent")
+                Logs.e(Z"Failed to start VpnService: $intent")
                 true
             }
     }

app/src/main/java/io/nekohasekai/sagernet/ui/configuration/ConfigurationAdapter.kt

@@ -7,11 +7,19 @@ import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.database.ProxyEntity
 import io.nekohasekai.sagernet.database.SagerDatabase
 import io.nekohasekai.sagernet.fmt.socks.SOCKSBean
-import io.nekohasekai.sagernet.ktx.onMainDispatcher
-import io.nekohasekai.sagernet.ktx.runOnIoDispatcher
+import io.nekohasekai.sagernet.ktx.*
 
 class ConfigurationAdapter(private val groupIdToQuery: Long) :
-    RecyclerView.Adapter<ConfigurationHolder>() {
+    RecyclerView.Adapter<ConfigurationHolder>(), EventListener {
+
+    init {
+        registerListener(EVENT_UPDATE_GROUP, this)
+    }
+
+    override fun onEvent(eventId: Int, vararg args: Any) {
+        if (args[0] != groupIdToQuery) return
+        reloadList()
+    }
 
     var configurationList: List<ProxyEntity> = listOf()
 

app/src/main/java/io/nekohasekai/sagernet/ui/configuration/ConfigurationHolder.kt

@@ -11,19 +11,39 @@ import androidx.recyclerview.widget.RecyclerView
 import io.nekohasekai.sagernet.R
 import io.nekohasekai.sagernet.database.DataStore
 import io.nekohasekai.sagernet.database.ProxyEntity
-import io.nekohasekai.sagernet.ktx.onMainDispatcher
-import io.nekohasekai.sagernet.ktx.runOnIoDispatcher
-import io.nekohasekai.sagernet.ui.settings.SettingsActivity
+import io.nekohasekai.sagernet.database.SagerDatabase
+import io.nekohasekai.sagernet.ktx.*
+import io.nekohasekai.sagernet.ui.settings.ProfileSettingsActivity
+import io.nekohasekai.sagernet.ui.settings.SocksSettingsActivity
 
-class ConfigurationHolder(val view: View) : RecyclerView.ViewHolder(view) {
+class ConfigurationHolder(val view: View) : RecyclerView.ViewHolder(view), EventListener {
 
     val profileName: TextView = view.findViewById(R.id.profile_name)
     val profileType: TextView = view.findViewById(R.id.profile_type)
+    val profileAddress: TextView = view.findViewById(R.id.profile_address)
     val trafficText: TextView = view.findViewById(R.id.traffic_text)
     val selectedView: LinearLayout = view.findViewById(R.id.selected_view)
     val editButton: ImageView = view.findViewById(R.id.edit)
 
+    var profileId = 0L
+
+    init {
+        registerListener(EVENT_UPDATE_PROFILE, this)
+    }
+
+    override fun onEvent(eventId: Int, vararg args: Any) {
+        if (args[0] != profileId) return
+        runOnIoDispatcher {
+            val profile = SagerDatabase.proxyDao.getById(profileId) ?: return@runOnIoDispatcher
+            onMainDispatcher {
+                bind(profile)
+            }
+        }
+    }
+
     fun bind(proxyEntity: ProxyEntity) {
+        profileId = proxyEntity.id
+
         view.setOnClickListener {
             runOnIoDispatcher {
                 if (DataStore.selectedProxy != proxyEntity.id) {
@@ -35,7 +55,7 @@ class ConfigurationHolder(val view: View) : RecyclerView.ViewHolder(view) {
             }
         }
 
-        profileName.text = proxyEntity.requireBean().name
+        profileName.text = proxyEntity.displayName()
         profileType.text = proxyEntity.displayType()
         val showTraffic = proxyEntity.rx + proxyEntity.tx != 0L
         trafficText.isGone = !showTraffic
@@ -45,9 +65,20 @@ class ConfigurationHolder(val view: View) : RecyclerView.ViewHolder(view) {
                 Formatter.formatFileSize(view.context, proxyEntity.tx))
         }
 
+        if (proxyEntity.requireBean().name.isNullOrBlank()) {
+            profileAddress.isGone = true
+        } else {
+            profileAddress.isGone = false
+            val bean = proxyEntity.requireBean()
+            profileAddress.text = "${bean.serverAddress}:${bean.serverPort}"
+        }
+
         editButton.setOnClickListener {
-            it.context.startActivity(Intent(it.context, SettingsActivity::class.java).apply {
-                putExtra("id", proxyEntity.id)
+            it.context.startActivity(Intent(it.context, when (proxyEntity.type) {
+                "socks" -> SocksSettingsActivity::class.java
+                else -> throw IllegalArgumentException()
+            }).apply {
+                putExtra(ProfileSettingsActivity.EXTRA_PROFILE_ID, proxyEntity.id)
             })
         }
 

app/src/main/java/io/nekohasekai/sagernet/ui/configuration/GroupPagerAdapter.kt

@@ -5,7 +5,6 @@ import androidx.viewpager2.adapter.FragmentStateAdapter
 import io.nekohasekai.sagernet.database.ProxyGroup
 import io.nekohasekai.sagernet.database.SagerDatabase
 import io.nekohasekai.sagernet.ktx.onMainDispatcher
-import io.nekohasekai.sagernet.ktx.runOnIoDispatcher
 
 class GroupPagerAdapter(
     activity: Fragment,
@@ -13,16 +12,15 @@ class GroupPagerAdapter(
 
     var groupList: List<ProxyGroup> = listOf()
 
-    fun reloadList() {
-        runOnIoDispatcher {
+    suspend fun reloadList(hideTab: (hideTab: Boolean) -> Unit) {
+        groupList = SagerDatabase.groupDao.allGroups()
+        if (groupList.isEmpty()) {
+            SagerDatabase.groupDao.createGroup(ProxyGroup(isDefault = true))
             groupList = SagerDatabase.groupDao.allGroups()
-            if (groupList.isEmpty()) {
-                SagerDatabase.groupDao.createGroup(ProxyGroup(isDefault = true))
-                groupList = SagerDatabase.groupDao.allGroups()
-            }
-            onMainDispatcher {
-                notifyDataSetChanged()
-            }
+        }
+        onMainDispatcher {
+            notifyDataSetChanged()
+            hideTab(groupList.size == 1 && groupList[0].isDefault)
         }
     }
 

app/src/main/java/io/nekohasekai/sagernet/ui/settings/ProfileSettingsActivity.kt

@@ -0,0 +1,121 @@
+package io.nekohasekai.sagernet.ui.settings
+
+import android.content.DialogInterface
+import android.os.Bundle
+import android.os.Parcelable
+import android.view.Menu
+import android.view.MenuItem
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.preference.EditTextPreference
+import androidx.preference.Preference
+import androidx.preference.PreferenceFragmentCompat
+import io.nekohasekai.sagernet.R
+import io.nekohasekai.sagernet.database.DataStore
+import io.nekohasekai.sagernet.database.SagerDatabase
+import io.nekohasekai.sagernet.fmt.AbstractBean
+import io.nekohasekai.sagernet.ktx.EVENT_UPDATE_GROUP
+import io.nekohasekai.sagernet.ktx.Empty
+import io.nekohasekai.sagernet.ktx.postNotification
+import io.nekohasekai.sagernet.utils.AlertDialogFragment
+import kotlinx.parcelize.Parcelize
+
+@Suppress("UNCHECKED_CAST")
+abstract class ProfileSettingsActivity<T : AbstractBean> : AppCompatActivity() {
+
+    class UnsavedChangesDialogFragment : AlertDialogFragment<Empty, Empty>() {
+        override fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener) {
+            setTitle(R.string.unsaved_changes_prompt)
+            setPositiveButton(R.string.yes, listener)
+            setNegativeButton(R.string.no, listener)
+            setNeutralButton(android.R.string.cancel, null)
+        }
+    }
+
+    @Parcelize
+    data class ProfileIdArg(val profileId: Long, val groupId: Long) : Parcelable
+    class DeleteConfirmationDialogFragment : AlertDialogFragment<ProfileIdArg, Empty>() {
+        override fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener) {
+            setTitle(R.string.delete_confirm_prompt)
+            setPositiveButton(R.string.yes) { _, _ ->
+                SagerDatabase.proxyDao.deleteById(arg.profileId)
+                postNotification(EVENT_UPDATE_GROUP, arg.groupId)
+                requireActivity().finish()
+            }
+            setNegativeButton(R.string.no, null)
+        }
+    }
+
+    companion object {
+        const val REQUEST_UNSAVED_CHANGES = 10
+        const val EXTRA_PROFILE_ID = "id"
+        const val EXTRA_GROUP_ID = "group"
+    }
+
+    abstract fun createFragment(): Fragment
+    abstract fun init(bean: T?)
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        setContentView(R.layout.settings_activity)
+        setSupportActionBar(findViewById(R.id.toolbar))
+        supportActionBar?.apply {
+            setDisplayHomeAsUpEnabled(true)
+            setHomeAsUpIndicator(R.drawable.ic_navigation_close)
+        }
+
+        if (savedInstanceState == null) {
+            val editingId = intent.getLongExtra(EXTRA_PROFILE_ID, 0L)
+            DataStore.editingId = editingId
+            if (editingId == 0L) {
+                val editingGroup = intent.getLongExtra(EXTRA_GROUP_ID, 0L)
+                DataStore.editingGroup = editingGroup
+                init(null)
+            } else {
+                val proxyEntity = SagerDatabase.proxyDao.getById(editingId)
+                if (proxyEntity == null) {
+                    finish()
+                    return
+                }
+                DataStore.editingGroup = proxyEntity.groupId
+                init(proxyEntity.requireBean() as T)
+            }
+            supportFragmentManager.beginTransaction()
+                .replace(R.id.settings, createFragment())
+                .commit()
+        }
+
+    }
+
+    private val child by lazy { supportFragmentManager.findFragmentById(R.id.settings) as MyPreferenceFragmentCompat<T, ProfileSettingsActivity<T>> }
+
+    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+        menuInflater.inflate(R.menu.profile_config_menu, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem) = child.onOptionsItemSelected(item)
+
+    override fun onBackPressed() {
+        if (child.unsaved) UnsavedChangesDialogFragment().show(child, REQUEST_UNSAVED_CHANGES)
+        else super.onBackPressed()
+    }
+
+    override fun onSupportNavigateUp(): Boolean {
+        if (!super.onSupportNavigateUp()) finish()
+        return true
+    }
+
+    abstract class MyPreferenceFragmentCompat<T : AbstractBean, P : ProfileSettingsActivity<T>> :
+        PreferenceFragmentCompat() {
+        val activity get() = requireActivity() as P
+        var unsaved = false
+    }
+
+    object PasswordSummaryProvider : Preference.SummaryProvider<EditTextPreference> {
+        override fun provideSummary(preference: EditTextPreference?) =
+            "\u2022".repeat(preference?.text?.length ?: 0)
+    }
+
+}

app/src/main/java/io/nekohasekai/sagernet/ui/settings/SettingsActivity.kt

@@ -1,44 +0,0 @@
-package io.nekohasekai.sagernet.ui.settings
-
-import android.os.Bundle
-import androidx.appcompat.app.AppCompatActivity
-import androidx.preference.PreferenceFragmentCompat
-import io.nekohasekai.sagernet.R
-import io.nekohasekai.sagernet.database.SagerDatabase
-import io.nekohasekai.sagernet.ktx.onMainDispatcher
-import io.nekohasekai.sagernet.ktx.runOnIoDispatcher
-
-class SettingsActivity : AppCompatActivity() {
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        setContentView(R.layout.settings_activity)
-        if (savedInstanceState == null) {
-            val entityId = intent.getLongExtra("id", -1)
-            if (entityId == -1L) {
-                finish()
-                return
-            }
-            runOnIoDispatcher {
-                val entity = SagerDatabase.proxyDao.getById(entityId)
-                if (entity == null) {
-                    onMainDispatcher {
-                        finish()
-                    }
-                }
-
-            }
-            supportFragmentManager
-                .beginTransaction()
-                .replace(R.id.settings, SettingsFragment())
-                .commit()
-        }
-        supportActionBar?.setDisplayHomeAsUpEnabled(true)
-    }
-
-    class SettingsFragment : PreferenceFragmentCompat() {
-        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
-            setPreferencesFromResource(R.xml.root_preferences, rootKey)
-        }
-    }
-}

app/src/main/java/io/nekohasekai/sagernet/ui/settings/SocksSettingsActivity.kt

@@ -0,0 +1,112 @@
+package io.nekohasekai.sagernet.ui.settings
+
+import android.os.Bundle
+import android.view.MenuItem
+import android.view.View
+import androidx.core.view.ViewCompat
+import androidx.preference.EditTextPreference
+import cn.hutool.core.util.NumberUtil
+import io.nekohasekai.sagernet.Key
+import io.nekohasekai.sagernet.R
+import io.nekohasekai.sagernet.database.DataStore
+import io.nekohasekai.sagernet.database.ProxyEntity
+import io.nekohasekai.sagernet.database.SagerDatabase
+import io.nekohasekai.sagernet.database.preference.EditTextPreferenceModifiers
+import io.nekohasekai.sagernet.fmt.socks.SOCKSBean
+import io.nekohasekai.sagernet.ktx.EVENT_UPDATE_GROUP
+import io.nekohasekai.sagernet.ktx.EVENT_UPDATE_PROFILE
+import io.nekohasekai.sagernet.ktx.postNotification
+import io.nekohasekai.sagernet.widget.ListListener
+
+class SocksSettingsActivity : ProfileSettingsActivity<SOCKSBean>() {
+
+    override fun createFragment() = SocksPreferenceFragment()
+
+    override fun init(bean: SOCKSBean?) {
+        DataStore.profileName = bean?.name ?: ""
+        DataStore.serverAddress = bean?.serverAddress ?: ""
+        DataStore.serverPort = (bean?.serverPort ?: 1080).toString()
+        DataStore.serverUsername = bean?.username ?: ""
+        DataStore.serverPassword = bean?.password ?: ""
+        DataStore.serverUdp = bean?.udp ?: false
+    }
+
+    fun saveAndExit() {
+        val editingId = DataStore.editingId
+        if (editingId == 0L) {
+            val editingGroup = DataStore.editingGroup
+            // create new entity
+            SagerDatabase.proxyDao.addProxy(ProxyEntity(
+                groupId = editingGroup,
+                type = "socks",
+                socksBean = SOCKSBean().apply {
+                    name = DataStore.profileName
+                    serverAddress = DataStore.serverAddress
+                    serverPort =
+                        DataStore.serverPort
+                            .takeIf { !it.isNullOrBlank() && NumberUtil.isInteger(it) }?.toInt()
+                            ?: 1080
+                    username = DataStore.serverUsername
+                    password = DataStore.serverPassword
+                    udp = DataStore.serverUdp
+                }
+            ))
+            postNotification(EVENT_UPDATE_GROUP, editingGroup)
+        } else {
+            val entity = SagerDatabase.proxyDao.getById(DataStore.editingId)
+            if (entity == null) {
+                finish()
+                return
+            }
+            SagerDatabase.proxyDao.updateProxy(entity.apply {
+                requireSOCKS().apply {
+                    name = DataStore.profileName
+                    serverAddress = DataStore.serverAddress
+                    serverPort = DataStore.serverPort
+                        .takeIf { !it.isNullOrBlank() && NumberUtil.isInteger(it) }?.toInt()
+                        ?: 1080
+                    username = DataStore.serverUsername
+                    password = DataStore.serverPassword
+                    udp = DataStore.serverUdp
+                }
+            })
+            postNotification(EVENT_UPDATE_PROFILE, editingId)
+        }
+        finish()
+    }
+
+    class SocksPreferenceFragment : MyPreferenceFragmentCompat<SOCKSBean, SocksSettingsActivity>() {
+
+        override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+            preferenceManager.preferenceDataStore = DataStore.profileCacheStore
+            addPreferencesFromResource(R.xml.socks_preferences)
+            findPreference<EditTextPreference>(Key.SERVER_PORT)!!.apply {
+                setOnBindEditTextListener(EditTextPreferenceModifiers.Port)
+            }
+            findPreference<EditTextPreference>(Key.SERVER_PASSWORD)!!.apply {
+                summaryProvider = PasswordSummaryProvider
+            }
+        }
+
+        override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+            super.onViewCreated(view, savedInstanceState)
+            ViewCompat.setOnApplyWindowInsetsListener(listView, ListListener)
+        }
+
+        override fun onOptionsItemSelected(item: MenuItem) = when (item.itemId) {
+            R.id.action_delete -> {
+                DeleteConfirmationDialogFragment().withArg(ProfileIdArg(DataStore.editingId,
+                    DataStore.editingGroup))
+                    .show(this)
+                true
+            }
+            R.id.action_apply -> {
+                activity.saveAndExit()
+                true
+            }
+            else -> false
+        }
+
+    }
+
+}

app/src/main/java/io/nekohasekai/sagernet/utils/AlertDialogFragment.kt

@@ -0,0 +1,68 @@
+/*******************************************************************************
+ *                                                                             *
+ *  Copyright (C) 2019 by Max Lv <[email protected]>                          *
+ *  Copyright (C) 2019 by Mygod Studio <[email protected]>  *
+ *                                                                             *
+ *  This program is free software: you can redistribute it and/or modify       *
+ *  it under the terms of the GNU General Public License as published by       *
+ *  the Free Software Foundation, either version 3 of the License, or          *
+ *  (at your option) any later version.                                        *
+ *                                                                             *
+ *  This program is distributed in the hope that it will be useful,            *
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of             *
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the              *
+ *  GNU General Public License for more details.                               *
+ *                                                                             *
+ *  You should have received a copy of the GNU General Public License          *
+ *  along with this program. If not, see <http://www.gnu.org/licenses/>.       *
+ *                                                                             *
+ *******************************************************************************/
+
+package io.nekohasekai.sagernet.utils
+
+import android.app.Activity
+import android.content.DialogInterface
+import android.content.Intent
+import android.os.Bundle
+import android.os.Parcelable
+import androidx.appcompat.app.AlertDialog
+import androidx.appcompat.app.AppCompatDialogFragment
+import androidx.fragment.app.Fragment
+import io.nekohasekai.sagernet.ktx.showAllowingStateLoss
+
+/**
+ * Based on: https://android.googlesource.com/platform/packages/apps/ExactCalculator/+/8c43f06/src/com/android/calculator2/AlertDialogFragment.java
+ */
+abstract class AlertDialogFragment<Arg : Parcelable, Ret : Parcelable> :
+    AppCompatDialogFragment(), DialogInterface.OnClickListener {
+    companion object {
+        private const val KEY_ARG = "arg"
+        private const val KEY_RET = "ret"
+        fun <T : Parcelable> getRet(data: Intent) = data.extras!!.getParcelable<T>(KEY_RET)!!
+    }
+
+    protected abstract fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener)
+
+    protected val arg by lazy { requireArguments().getParcelable<Arg>(KEY_ARG)!! }
+    protected open fun ret(which: Int): Ret? = null
+    fun withArg(arg: Arg) = apply { arguments = Bundle().apply { putParcelable(KEY_ARG, arg) } }
+
+    override fun onCreateDialog(savedInstanceState: Bundle?): AlertDialog =
+        AlertDialog.Builder(requireContext()).also { it.prepare(this) }.create()
+
+    override fun onClick(dialog: DialogInterface?, which: Int) {
+        targetFragment?.onActivityResult(targetRequestCode, which, ret(which)?.let {
+            Intent().replaceExtras(Bundle().apply { putParcelable(KEY_RET, it) })
+        })
+    }
+
+    override fun onDismiss(dialog: DialogInterface) {
+        super.onDismiss(dialog)
+        onClick(dialog, Activity.RESULT_CANCELED)
+    }
+
+    fun show(target: Fragment, requestCode: Int = 0, tag: String = javaClass.simpleName) {
+        setTargetFragment(target, requestCode)
+        showAllowingStateLoss(target.fragmentManager ?: return, tag)
+    }
+}

app/src/main/res/drawable/ic_baseline_person_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z"/>
+</vector>

app/src/main/res/drawable/ic_baseline_radio_button_checked_24.xml

@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M12,7c-2.76,0 -5,2.24 -5,5s2.24,5 5,5 5,-2.24 5,-5 -2.24,-5 -5,-5zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.42,0 -8,-3.58 -8,-8s3.58,-8 8,-8 8,3.58 8,8 -3.58,8 -8,8z"/>
+</vector>

app/src/main/res/layout/layout_profile.xml

@@ -105,6 +105,7 @@
                     android:textColor="@color/color_primary_text" />
 
                 <TextView
+                    android:id="@+id/profile_address"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="8dp"

app/src/main/res/layout/preference_dialog_password.xml

@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Based on: https://android.googlesource.com/platform/frameworks/support/+/9b8fb51/preference/res/layout/preference_dialog_edittext.xml -->
+<ScrollView
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:layout_marginTop="48dp"
+    android:layout_marginBottom="48dp"
+    android:overScrollMode="ifContentScrolls">
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+        <TextView
+            android:id="@android:id/message"
+            style="?android:attr/textAppearanceSmall"
+            android:layout_marginLeft="24dp"
+            android:layout_marginRight="24dp"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp"
+            android:layout_marginBottom="48dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="?android:attr/textColorSecondary"/>
+        <com.google.android.material.textfield.TextInputLayout
+            android:orientation="vertical"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginStart="20dp"
+            android:layout_marginEnd="20dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:passwordToggleEnabled="true">
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@android:id/edit"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:paddingTop="12dp"
+                android:singleLine="true"
+                android:inputType="textPassword"
+                android:typeface="monospace"/>
+        </com.google.android.material.textfield.TextInputLayout>
+    </LinearLayout>
+</ScrollView>

app/src/main/res/layout/settings_activity.xml

@@ -1,19 +1,16 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <include
         layout="@layout/app_bar_main"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <FrameLayout
+    <androidx.fragment.app.FragmentContainerView
         android:id="@+id/settings"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
 
-    <FrameLayout
-        android:id="@+id/settings"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
 </LinearLayout>

app/src/main/res/menu/profile_config_menu.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/action_delete"
+          android:title="@string/delete"
+          android:icon="@drawable/ic_action_delete"
+          android:alphabeticShortcut="d"
+          app:showAsAction="always"/>
+    <item android:id="@+id/action_apply"
+          android:title="@string/apply"
+          android:icon="@drawable/ic_action_done"
+          android:alphabeticShortcut="s"
+          app:showAsAction="always"/>
+</menu>

app/src/main/res/menu/profile_manager_menu.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:alphabeticShortcut="n"
+        android:icon="@drawable/ic_action_note_add"
+        android:title="@string/add_profile"
+        app:showAsAction="always">
+        <menu>
+            <item
+                android:id="@+id/action_scan_qr_code"
+                android:title="@string/add_profile_methods_scan_qr_code" />
+            <item android:title="@string/action_profile">
+                <menu>
+                    <item
+                        android:id="@+id/action_import_clipboard"
+                        android:alphabeticShortcut="v"
+                        android:title="@string/action_import" />
+                    <item
+                        android:id="@+id/action_manual_settings"
+                        android:alphabeticShortcut="n"
+                        android:title="@string/add_profile_methods_manual_settings"
+                        app:alphabeticModifiers="CTRL|SHIFT" />
+                </menu>
+            </item>
+            <item android:title="@string/action_group">
+                <menu>
+                    <item
+                        android:id="@+id/action_from_link"
+                        android:title="@string/action_from_link" />
+                </menu>
+            </item>
+        </menu>
+    </item>
+</menu>

app/src/main/res/values/strings.xml

@@ -38,10 +38,12 @@
 
     <!-- proxy category -->
     <string name="profile_name">Profile Name</string>
-    <string name="proxy">Server</string>
-    <string name="remote_port">Remote Port</string>
-    <string name="sitekey">Password</string>
-    <string name="enc_method">Encrypt Method</string>
+    <string name="server_address">Server</string>
+    <string name="server_port">Remote Port</string>
+    <string name="username_opt">Username (Optional)</string>
+    <string name="password_opt">Password (Optional)</string>
+    <string name="server_udp">UDP Route</string>
+    <string name="udp_summary">Redirect UDP traffic to remote</string>
 
     <!-- feature category -->
     <string name="ipv6">IPv6 Route</string>
@@ -96,13 +98,12 @@
     <!-- menu category -->
     <string name="profiles">Profiles</string>
     <string name="settings">Settings</string>
-    <string name="faq">FAQ</string>
-    <string name="faq_url">https://github.com/shadowsocks/shadowsocks-android/blob/master/.github/faq.md</string>
-    <string name="about">About</string>
-    <string name="about_title">Shadowsocks %s</string>
     <string name="edit">Edit</string>
     <string name="share">Share</string>
     <string name="add_profile">Add Profile</string>
+    <string name="action_profile">Profile</string>
+    <string name="action_group">Group</string>
+    <string name="action_from_link">From subscription</string>
     <string name="action_apply_all">Apply Settings to All Profiles</string>
     <string name="action_export_more">Export…</string>
     <string name="action_export_file">Export to file…</string>
@@ -183,6 +184,12 @@
     <string name="attachment_summary_on">Automatically download attachments for incoming emails
     </string>
     <string name="attachment_summary_off">Only download attachments when manually requested</string>
-    <string name="title_activity_settings">SettingsActivity</string>
+
+    <string name="proxy_cat">Server Settings</string>
+    <string name="feature_cat">Feature Settings</string>
+    <string name="unsaved_changes_prompt">Changes not saved. Do you want to save?</string>
+    <string name="yes">Yes</string>
+    <string name="no">No</string>
+    <string name="apply">Apply</string>
 
 </resources>

app/src/main/res/xml/root_preferences.xml

@@ -1,65 +0,0 @@
-<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <PreferenceCategory app:title="@string/messages_header">
-
-        <EditTextPreference
-            app:key="signature"
-            app:title="@string/signature_title"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            app:defaultValue="reply"
-            app:entries="@array/reply_entries"
-            app:entryValues="@array/reply_values"
-            app:key="reply"
-            app:title="@string/reply_title"
-            app:useSimpleSummaryProvider="true" />
-
-    </PreferenceCategory>
-
-    <PreferenceCategory app:title="@string/sync_header">
-
-        <SwitchPreferenceCompat
-            app:key="sync"
-            app:title="@string/sync_title" />
-
-        <SwitchPreferenceCompat
-            app:dependency="sync"
-            app:key="attachment"
-            app:summaryOff="@string/attachment_summary_off"
-            app:summaryOn="@string/attachment_summary_on"
-            app:title="@string/attachment_title" />
-
-    </PreferenceCategory>
-    <PreferenceCategory app:title="@string/messages_header">
-
-        <EditTextPreference
-            app:key="signature"
-            app:title="@string/signature_title"
-            app:useSimpleSummaryProvider="true" />
-
-        <ListPreference
-            app:defaultValue="reply"
-            app:entries="@array/reply_entries"
-            app:entryValues="@array/reply_values"
-            app:key="reply"
-            app:title="@string/reply_title"
-            app:useSimpleSummaryProvider="true" />
-
-    </PreferenceCategory>
-    <PreferenceCategory app:title="@string/sync_header">
-
-        <SwitchPreferenceCompat
-            app:key="sync"
-            app:title="@string/sync_title" />
-
-        <SwitchPreferenceCompat
-            app:dependency="sync"
-            app:key="attachment"
-            app:summaryOff="@string/attachment_summary_off"
-            app:summaryOn="@string/attachment_summary_on"
-            app:title="@string/attachment_title" />
-
-    </PreferenceCategory>
-
-</PreferenceScreen>

app/src/main/res/xml/socks_preferences.xml

@@ -0,0 +1,39 @@
+<PreferenceScreen xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <EditTextPreference
+        app:icon="@drawable/ic_social_emoji_symbols"
+        app:key="profileName"
+        app:title="@string/profile_name"
+        app:useSimpleSummaryProvider="true" />
+
+    <PreferenceCategory app:title="@string/proxy_cat">
+
+        <EditTextPreference
+            app:icon="@drawable/ic_hardware_router"
+            app:key="serverAddress"
+            app:title="@string/server_address"
+            app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:icon="@drawable/ic_maps_directions_boat"
+            app:key="serverPort"
+            app:title="@string/server_port"
+            app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:icon="@drawable/ic_baseline_person_24"
+            app:key="serverUsername"
+            app:title="@string/username_opt"
+            app:useSimpleSummaryProvider="true" />
+        <EditTextPreference
+            app:dialogLayout="@layout/preference_dialog_password"
+            app:icon="@drawable/ic_settings_password"
+            app:key="serverPassword"
+            app:title="@string/password_opt" />
+        <CheckBoxPreference
+            app:icon="@drawable/ic_baseline_radio_button_checked_24"
+            app:key="serverUdp"
+            app:summary="@string/udp_summary"
+            app:title="@string/server_udp" />
+    </PreferenceCategory>
+
+
+</PreferenceScreen>