Make sure boot_img is initialized correctly

When Magisk is magic mounting /system/bin, there is a chance that logcat would be temporarily unavailable. Leave a copy and use that for magisklogd

.gitattributes

@@ -0,0 +1,18 @@
+# Set the default behavior, in case people don't have core.autocrlf set.
+* text eol=lf
+
+# Explicitly declare text files you want to always be normalized and converted
+# to native line endings on checkout.
+# *.c text
+# *.h text
+
+# Declare files that will always have CRLF line endings on checkout.
+*.cmd text eol=crlf
+*.bat text eol=crlf
+
+# Denote all files that are truly binary and should not be modified.
+chromeos/** binary
+*.jar binary
+*.exe binary
+*.apk binary
+*.png binary

.gitignore

@@ -1,12 +1,20 @@
+out
+*.zip
+*.jks
+*.apk
+config.prop
+
+# Manually dumped jars
+snet/libs
+
+# Built binaries
+native/out
+
+# Android Studio / Gradle
 *.iml
 .gradle
 /local.properties
-.idea/
+/.idea
 /build
-app/release
-*.hprof
-.externalNativeBuild/
-src/full/res/raw/util_functions.sh
-public.certificate.x509.pem
-private.key.pk8
-*.apk
+/captures
+.externalNativeBuild

.gitmodules

@@ -0,0 +1,21 @@
+[submodule "selinux"]
+	path = native/jni/external/selinux
+	url = https://github.com/topjohnwu/selinux.git
+[submodule "busybox"]
+	path = native/jni/external/busybox
+	url = https://github.com/topjohnwu/ndk-busybox.git
+[submodule "dtc"]
+	path = native/jni/external/dtc
+	url = https://github.com/dgibson/dtc
+[submodule "lz4"]
+	path = native/jni/external/lz4
+	url = https://github.com/lz4/lz4.git
+[submodule "bzip2"]
+	path = native/jni/external/bzip2
+	url = https://github.com/nemequ/bzip2.git
+[submodule "xz"]
+	path = native/jni/external/xz
+	url = https://github.com/xz-mirror/xz.git
+[submodule "nanopb"]
+	path = native/jni/external/nanopb
+	url = https://github.com/nanopb/nanopb.git

LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://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 <http://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:
+
+    {project}  Copyright (C) {year}  {fullname}
+    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
+<http://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
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.MD

@@ -0,0 +1,41 @@
+# Magisk
+[Downloads](https://github.com/topjohnwu/Magisk/releases) | [Documentation](https://topjohnwu.github.io/Magisk/) | [XDA Thread](https://forum.xda-developers.com/apps/magisk/official-magisk-v7-universal-systemless-t3473445)
+
+## Introduction
+Magisk is a suite of open source tools for customizing Android, supporting devices higher than Android 5.0 (API 21). It covers the fundamental parts for Android customization: root, boot scripts, SELinux patches, AVB2.0 / dm-verity / forceencrypt removals etc.
+
+Furthermore, Magisk provides a **Systemless Interface** to alter the system (or vendor) arbitrarily while the actual partitions stay completely intact. With its systemless nature along with several other hacks, Magisk can hide modifications from nearly any system integrity verifications used in banking apps, corporation monitoring apps, game cheat detections, and most importantly [Google's SafetyNet API](https://developer.android.com/training/safetynet/index.html).
+
+## Bug Reports
+**Make sure to install the latest [Canary Build](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337) before reporting any bugs!** **DO NOT** report bugs that is already fixed upstream. Follow the instructions in the [Canary Channel XDA Thread](https://forum.xda-developers.com/apps/magisk/dev-magisk-canary-channel-bleeding-edge-t3839337), and report a bug either by opening an issue on GitHub or directly in the thread.
+
+## Building Environment Requirements
+1. Python 3.5+: run `build.py` script
+2. Java Development Kit (JDK) 8: Compile Magisk Manager and sign zips
+3. Latest Android SDK: set `ANDROID_HOME` environment variable to the path to Android SDK
+4. Android NDK: Install NDK along with SDK (`$ANDROID_HOME/ndk-bundle`), or optionally specify a custom path `ANDROID_NDK_HOME`
+5. (Windows Only) Python package Colorama: Install with `pip install colorama`, used for ANSI color codes
+
+## Building Notes and Instructions
+1. Clone sources with submodules: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
+2. Building is supported on macOS, Linux, and Windows. Official releases are built and tested with [FrankeNDK](https://github.com/topjohnwu/FrankeNDK); point `ANDROID_NDK_HOME` to FrankeNDK if you want to use it for compiling.
+3. Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
+4. Run `build.py` with argument `-h` to see the built-in help message. The `-h` option also works for each supported actions, e.g. `./build.py binary -h`
+5. By default, `build.py` build binaries and Magisk Manager in debug mode. If you want to build Magisk Manager in release mode (via the `-r, --release` flag), you need a Java Keystore file `release-key.jks` (only `JKS` format is supported) to sign APKs and zips. For more information, check out [Google's Official Documentation](https://developer.android.com/studio/publish/app-signing.html#signing-manually).
+
+## License
+
+```
+Magisk, including all git submodules are 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/>.
+```

README.md

@@ -1,7 +0,0 @@
-# Magisk Manager
-This repo is no longer an independent component. It is a submodule of the [Magisk Project](https://github.com/topjohnwu/Magisk).
-
-# Translations
-The default (English) string resources are scattered in these files: `src/full/res/values/strings.xml`, `src/main/res/values/strings.xml`, `src/stub/res/values/strings.xml`.  
-Place the translated XMLs in the corresponding folder to the locale.  
-Translations are highly appreciated via pull requests here on Github.

app/.gitignore

@@ -0,0 +1,12 @@
+*.iml
+.gradle
+/local.properties
+.idea/
+/build
+app/release
+*.hprof
+.externalNativeBuild/
+src/full/res/raw/util_functions.sh
+public.certificate.x509.pem
+private.key.pk8
+*.apk

app/README.md

@@ -0,0 +1,7 @@
+# Magisk Manager
+This repo is no longer an independent component. It is merged into the [Magisk Project](https://github.com/topjohnwu/Magisk).
+
+# Translations
+The default (English) strings are mainly in `src/full/res/values/strings.xml`; some are scattered in `src/main/res/values/strings.xml` and `src/stub/res/values/strings.xml`.  
+Translations are highly appreciated via pull requests here on Github.  
+Place translated XMLs in the corresponding locale folder.

app/build.gradle

@@ -0,0 +1,90 @@
+apply plugin: 'com.android.application'
+
+def configProps = new Properties()
+def configPath = project.hasProperty('configPath') ? project.configPath : rootProject.file('config.prop')
+configProps.load(new FileInputStream(configPath))
+
+android {
+    compileSdkVersion rootProject.ext.compileSdkVersion
+    buildToolsVersion rootProject.ext.buildToolsVersion
+
+    defaultConfig {
+        applicationId "com.topjohnwu.magisk"
+        minSdkVersion 21
+        targetSdkVersion rootProject.ext.compileSdkVersion
+    }
+
+    signingConfigs {
+        config {
+            storeFile rootProject.file('release-key.jks')
+            storePassword configProps['keyStorePass']
+            keyAlias configProps['keyAlias']
+            keyPassword configProps['keyPass']
+        }
+    }
+
+    buildTypes {
+        debug {
+            // If keystore exists, sign the APK with custom signature
+            if (signingConfigs.config.storeFile.exists())
+                signingConfig signingConfigs.config
+        }
+        release {
+            minifyEnabled true
+            shrinkResources true
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.config
+        }
+    }
+
+    flavorDimensions "mode"
+
+    productFlavors {
+        full {
+            versionName configProps['appVersion']
+            versionCode configProps['appVersionCode'] as Integer
+            javaCompileOptions {
+                annotationProcessorOptions {
+                    argument('butterknife.debuggable', 'false')
+                }
+            }
+        }
+        stub {
+            versionCode 1
+            versionName "stub"
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    dexOptions {
+        preDexLibraries true
+        javaMaxHeapSize "2g"
+    }
+    lintOptions {
+        disable 'MissingTranslation'
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    fullImplementation project(':utils')
+    implementation "androidx.core:core:${rootProject.ext.androidXVersion}"
+    fullImplementation "androidx.preference:preference:${rootProject.ext.androidXVersion}"
+    fullImplementation "androidx.recyclerview:recyclerview:${rootProject.ext.androidXVersion}"
+    fullImplementation "androidx.cardview:cardview:${rootProject.ext.androidXVersion}"
+    fullImplementation "com.google.android.material:material:${rootProject.ext.androidXVersion}"
+    fullImplementation 'com.github.topjohnwu:libsu:2.0.2'
+    fullImplementation 'com.atlassian.commonmark:commonmark:0.11.0'
+    fullImplementation 'org.kamranzafar:jtar:2.3'
+
+    def butterKnifeVersion = '9.0.0-rc1'
+    if (properties.containsKey('android.injected.invoked.from.ide')) {
+        fullImplementation "com.jakewharton:butterknife-reflect:${butterKnifeVersion}"
+    } else {
+        fullImplementation "com.jakewharton:butterknife-runtime:${butterKnifeVersion}"
+        fullAnnotationProcessor "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
+    }
+}

app/proguard-rules.pro

@@ -16,14 +16,20 @@
 #   public *;
 #}
 
-# Keep all names, we are open source anyway :)
--keepnames class ** { *; }
-
 # BouncyCastle
 -keep class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
 -keep class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
 -keep class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
 -dontwarn javax.naming.**
 
-# Gson
--keepattributes Signature
+# Snet extention
+-keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
+
+# Strip logging
+-assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
+  public *** debug(...);
+}
+
+# Excessive obfuscation
+-repackageclasses 'a'
+-allowaccessmodification

app/src/full/AndroidManifest.xml

@@ -1,21 +1,26 @@
 <?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="com.topjohnwu.magisk">
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
-        android:name=".MagiskManager"
-        android:theme="@style/AppTheme">
+        android:name="a.q"
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
+
+        <!-- Activities -->
 
         <activity
-            android:name=".MainActivity"
+            android:name="a.b"
             android:configChanges="orientation|screenSize"
             android:exported="true" />
         <activity
-            android:name=".SplashActivity"
+            android:name="a.c"
             android:configChanges="orientation|screenSize"
             android:exported="true"
             android:theme="@style/SplashTheme">
@@ -25,57 +30,75 @@
             </intent-filter>
         </activity>
         <activity
-            android:name=".AboutActivity"
+            android:name="a.d"
             android:theme="@style/AppTheme.StatusBar" />
         <activity
-            android:name=".SettingsActivity"
-            android:theme="@style/AppTheme.StatusBar" />
+            android:name="a.e"
+            android:theme="@style/AppTheme.StatusBar"/>
         <activity
-            android:name=".FlashActivity"
+            android:name="a.f"
             android:configChanges="keyboardHidden|orientation|screenSize"
             android:screenOrientation="nosensor"
             android:theme="@style/AppTheme.StatusBar" />
         <activity
-            android:name=".NoUIActivity"
+            android:name="a.g"
             android:theme="@style/AppTheme.Translucent" />
+
+        <!-- Superuser -->
+
         <activity
-            android:name=".superuser.RequestActivity"
+            android:name="a.p"
             android:excludeFromRecents="true"
             android:launchMode="singleTask"
             android:taskAffinity="internal.superuser"
             android:theme="@style/SuRequest" />
 
+        <activity
+            android:name=".superuser.RequestActivity"
+            android:excludeFromRecents="true"
+            android:launchMode="singleTask"
+            android:taskAffinity="internal.superuser"
+            android:theme="@style/AppTheme.Translucent" />
+
         <receiver android:name=".superuser.SuReceiver" />
-        <receiver android:name=".receivers.BootReceiver">
+
+        <!-- Receiver -->
+
+        <receiver android:name="a.h">
             <intent-filter>
                 <action android:name="android.intent.action.BOOT_COMPLETED" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".receivers.PackageReceiver">
+        <receiver android:name="a.i">
             <intent-filter>
                 <action android:name="android.intent.action.PACKAGE_REPLACED" />
                 <action android:name="android.intent.action.PACKAGE_FULLY_REMOVED" />
                 <data android:scheme="package" />
             </intent-filter>
         </receiver>
-        <receiver android:name=".receivers.ManagerUpdate" />
-        <receiver android:name=".receivers.RebootReceiver" />
-        <receiver android:name=".receivers.ShortcutReceiver">
+        <receiver android:name="a.j" />
+        <receiver android:name="a.k" />
+        <receiver android:name="a.l">
             <intent-filter>
                 <action android:name="android.intent.action.LOCALE_CHANGED" />
             </intent-filter>
         </receiver>
 
-        <service android:name=".services.OnBootIntentService" />
+        <!-- Service -->
+
         <service
-            android:name=".services.UpdateCheckService"
+            android:name="a.m"
+            android:exported="true"
+            android:permission="android.permission.BIND_JOB_SERVICE" />
+        <service
+            android:name="a.n"
             android:exported="true"
             android:permission="android.permission.BIND_JOB_SERVICE" />
 
         <!-- Hardcode GMS version -->
         <meta-data
             android:name="com.google.android.gms.version"
-            android:value="7095000" />
+            android:value="12451000" />
 
     </application>
 

app/src/full/java/a/a.java

@@ -0,0 +1,10 @@
+package a;
+
+import com.topjohnwu.magisk.utils.BootSigner;
+
+import androidx.annotation.Keep;
+
+@Keep
+public class a extends BootSigner {
+    /* stub */
+}

app/src/full/java/a/b.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.MainActivity;
+
+public class b extends MainActivity {
+    /* stub */
+}

app/src/full/java/a/c.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.SplashActivity;
+
+public class c extends SplashActivity {
+    /* stub */
+}

app/src/full/java/a/d.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.AboutActivity;
+
+public class d extends AboutActivity {
+    /* stub */
+}

app/src/full/java/a/e.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.DonationActivity;
+
+public class e extends DonationActivity {
+    /* stub */
+}

app/src/full/java/a/f.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.FlashActivity;
+
+public class f extends FlashActivity {
+    /* stub */
+}

app/src/full/java/a/h.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.receivers.BootReceiver;
+
+public class h extends BootReceiver {
+    /* stub */
+}

app/src/full/java/a/i.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.receivers.PackageReceiver;
+
+public class i extends PackageReceiver {
+    /* stub */
+}

app/src/full/java/a/j.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.receivers.ManagerUpdate;
+
+public class j extends ManagerUpdate {
+    /* stub */
+}

app/src/full/java/a/k.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.receivers.RebootReceiver;
+
+public class k extends RebootReceiver {
+    /* stub */
+}

app/src/full/java/a/l.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.receivers.ShortcutReceiver;
+
+public class l extends ShortcutReceiver {
+    /* stub */
+}

app/src/full/java/a/m.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.services.OnBootService;
+
+public class m extends OnBootService {
+    /* stub */
+}

app/src/full/java/a/n.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.services.UpdateCheckService;
+
+public class n extends UpdateCheckService {
+    /* stub */
+}

app/src/full/java/a/o.java

@@ -0,0 +1,22 @@
+package a;
+
+import android.content.Context;
+import android.util.AttributeSet;
+
+import com.topjohnwu.magisk.components.AboutCardRow;
+
+public class o extends AboutCardRow {
+    /* stub */
+
+    public o(Context context) {
+        super(context);
+    }
+
+    public o(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public o(Context context, AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+}

app/src/full/java/a/p.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.SuRequestActivity;
+
+public class p extends SuRequestActivity {
+    /* stub */
+}

app/src/full/java/a/q.java

@@ -0,0 +1,7 @@
+package a;
+
+import com.topjohnwu.magisk.MagiskManager;
+
+public class q extends MagiskManager {
+    /* stub */
+}

app/src/full/java/com/topjohnwu/magisk/AboutActivity.java

@@ -1,25 +1,23 @@
 package com.topjohnwu.magisk;
 
-import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 
 import com.topjohnwu.magisk.asyncs.MarkDownWindow;
 import com.topjohnwu.magisk.components.AboutCardRow;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.Locale;
 
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
-public class AboutActivity extends Activity {
+public class AboutActivity extends BaseActivity {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.app_version_info) AboutCardRow appVersionInfo;
@@ -27,7 +25,7 @@ public class AboutActivity extends Activity {
     @BindView(R.id.app_translators) AboutCardRow appTranslators;
     @BindView(R.id.app_source_code) AboutCardRow appSourceCode;
     @BindView(R.id.support_thread) AboutCardRow supportThread;
-    @BindView(R.id.donation) AboutCardRow donation;
+    @BindView(R.id.follow_twitter) AboutCardRow twitter;
 
     @Override
     public int getDarkTheme() {
@@ -38,7 +36,7 @@ public class AboutActivity extends Activity {
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_about);
-        ButterKnife.bind(this);
+        new AboutActivity_ViewBinding(this);
 
         setSupportActionBar(toolbar);
         toolbar.setNavigationOnClickListener(view -> finish());
@@ -52,7 +50,6 @@ public class AboutActivity extends Activity {
         appVersionInfo.setSummary(String.format(Locale.US, "%s (%d) (%s)",
                 BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE, getPackageName()));
 
-        appChangelog.removeSummary();
         appChangelog.setOnClickListener(v -> {
             new MarkDownWindow(this, getString(R.string.app_changelog),
                     getResources().openRawResource(R.raw.changelog)).exec();
@@ -65,14 +62,9 @@ public class AboutActivity extends Activity {
             appTranslators.setSummary(translators);
         }
 
-        appSourceCode.removeSummary();
-        appSourceCode.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.SOURCE_CODE_URL))));
-
-        supportThread.removeSummary();
-        supportThread.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.XDA_THREAD))));
-
-        donation.removeSummary();
-        donation.setOnClickListener(view -> startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(Const.Url.DONATION_URL))));
+        appSourceCode.setOnClickListener(v -> Utils.openLink(this, Uri.parse(Const.Url.SOURCE_CODE_URL)));
+        supportThread.setOnClickListener(v -> Utils.openLink(this, Uri.parse(Const.Url.XDA_THREAD)));
+        twitter.setOnClickListener(v -> Utils.openLink(this, Uri.parse(Const.Url.TWITTER_URL)));
 
         setFloating();
     }

app/src/full/java/com/topjohnwu/magisk/Const.java

@@ -1,11 +1,7 @@
-package com.topjohnwu.magisk.utils;
+package com.topjohnwu.magisk;
 
-import android.os.Environment;
 import android.os.Process;
 
-import com.topjohnwu.magisk.BuildConfig;
-import com.topjohnwu.magisk.MagiskManager;
-
 import java.io.File;
 import java.util.Arrays;
 import java.util.List;
@@ -34,61 +30,54 @@ public class Const {
     public static final String BUSYBOX_PATH = "/sbin/.core/busybox";
     public static final String TMP_FOLDER_PATH = "/dev/tmp";
     public static final String MAGISK_LOG = "/cache/magisk.log";
-    public static final File EXTERNAL_PATH = new File(Environment.getExternalStorageDirectory(), "MagiskManager");
     public static final String MANAGER_CONFIGS = ".tmp.magisk.config";
 
     // Versions
     public static final int UPDATE_SERVICE_VER = 1;
-    public static final int SNET_VER = 8;
 
     public static int MIN_MODULE_VER() {
-        return MagiskManager.get().magiskVersionCode >= MAGISK_VER.REMOVE_LEGACY_LINK ? 1500 : 1400;
+        return Data.magiskVersionCode >= MAGISK_VER.REMOVE_LEGACY_LINK ? 1500 : 1400;
     }
 
     /* A list of apps that should not be shown as hide-able */
     public static final List<String> HIDE_BLACKLIST =  Arrays.asList(
-            "android",
-            MagiskManager.get().getPackageName(),
+            Data.MM().getPackageName(),
             "com.google.android.gms"
     );
 
     public static final int USER_ID = Process.myUid() / 100000;
 
     public static final class MAGISK_VER {
-        public static final int UNIFIED = 1300;
-        public static final int FBE_AWARE = 1410;
-        public static final int RESETPROP_PERSIST = 1436;
-        public static final int MANAGER_HIDE = 1440;
-        public static final int DTBO_SUPPORT = 1446;
-        public static final int HIDDEN_PATH = 1460;
         public static final int REMOVE_LEGACY_LINK = 1630;
         public static final int SEPOL_REFACTOR = 1640;
         public static final int FIX_ENV = 1650;
+        public static final int DBVER_SIX = 17000;
     }
 
     public static class ID {
         public static final int UPDATE_SERVICE_ID = 1;
         public static final int FETCH_ZIP = 2;
         public static final int SELECT_BOOT = 3;
+        public static final int ONBOOT_SERVICE_ID = 6;
 
         // notifications
         public static final int MAGISK_UPDATE_NOTIFICATION_ID = 4;
         public static final int APK_UPDATE_NOTIFICATION_ID = 5;
-        public static final int ONBOOT_NOTIFICATION_ID = 6;
         public static final int DTBO_NOTIFICATION_ID = 7;
         public static final String NOTIFICATION_CHANNEL = "magisk_notification";
     }
 
     public static class Url {
-        public static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/stable.json";
-        public static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/MagiskManager/update/beta.json";
-        public static final String SNET_URL = "https://github.com/topjohnwu/MagiskManager/raw/788f01f499714471949613820d43bc364786e85d/snet.apk";
-        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&page=%d";
+        public static final String STABLE_URL = "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/stable.json";
+        public static final String BETA_URL = "https://raw.githubusercontent.com/topjohnwu/magisk_files/master/beta.json";
+        public static final String REPO_URL = "https://api.github.com/users/Magisk-Modules-Repo/repos?per_page=100&sort=pushed&page=%d";
         public static final String FILE_URL = "https://raw.githubusercontent.com/Magisk-Modules-Repo/%s/master/%s";
         public static final String ZIP_URL = "https://github.com/Magisk-Modules-Repo/%s/archive/master.zip";
-        public static final String DONATION_URL = "https://www.paypal.me/topjohnwu";
+        public static final String PAYPAL_URL = "https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=CC7FZ7526MNGG";
+        public static final String PATREON_URL = "https://www.patreon.com/topjohnwu";
+        public static final String TWITTER_URL = "https://twitter.com/topjohnwu";
         public static final String XDA_THREAD = "http://forum.xda-developers.com/showthread.php?t=3432382";
-        public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/MagiskManager";
+        public static final String SOURCE_CODE_URL = "https://github.com/topjohnwu/Magisk";
     }
 
 
@@ -108,7 +97,6 @@ public class Const {
         public static final String OPEN_SECTION = "section";
         public static final String INTENT_SET_FILENAME = "filename";
         public static final String INTENT_SET_LINK = "link";
-        public static final String INTENT_PERM = "perm_dialog";
         public static final String FLASH_ACTION = "action";
         public static final String FLASH_SET_BOOT = "boot";
 
@@ -147,16 +135,13 @@ public class Const {
         public static final int NAMESPACE_MODE_ISOLATE = 2;
         public static final int NO_NOTIFICATION = 0;
         public static final int NOTIFICATION_TOAST = 1;
-        public static final int NOTIFY_NORMAL_LOG = 0;
-        public static final int NOTIFY_USER_TOASTS = 1;
-        public static final int NOTIFY_USER_TO_OWNER = 2;
         public static final int SU_PROMPT = 0;
         public static final int SU_AUTO_DENY = 1;
         public static final int SU_AUTO_ALLOW = 2;
         public static final String FLASH_ZIP = "flash";
         public static final String PATCH_BOOT = "patch";
         public static final String FLASH_MAGISK = "magisk";
-        public static final String FLASH_SECOND_SLOT = "slot";
+        public static final String FLASH_INACTIVE_SLOT = "slot";
         public static final String UNINSTALL = "uninstall";
         public static final int[] timeoutList = {0, -1, 10, 20, 30, 60};
         public static final int ORDER_NAME = 0;

app/src/full/java/com/topjohnwu/magisk/Data.java

@@ -0,0 +1,217 @@
+package com.topjohnwu.magisk;
+
+import android.content.SharedPreferences;
+import android.os.Handler;
+import android.os.Looper;
+import android.util.Xml;
+
+import com.topjohnwu.magisk.components.AboutCardRow;
+import com.topjohnwu.magisk.receivers.BootReceiver;
+import com.topjohnwu.magisk.receivers.ManagerUpdate;
+import com.topjohnwu.magisk.receivers.PackageReceiver;
+import com.topjohnwu.magisk.receivers.RebootReceiver;
+import com.topjohnwu.magisk.receivers.ShortcutReceiver;
+import com.topjohnwu.magisk.services.OnBootService;
+import com.topjohnwu.magisk.services.UpdateCheckService;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+
+import org.xmlpull.v1.XmlPullParser;
+import org.xmlpull.v1.XmlPullParserException;
+
+import java.io.File;
+import java.io.IOException;
+import java.lang.ref.WeakReference;
+import java.util.HashMap;
+import java.util.Map;
+
+public class Data {
+    // Global app instance
+    public static WeakReference<MagiskManager> weakApp;
+    public static Handler mainHandler = new Handler(Looper.getMainLooper());
+    public static Map<Class, Class> classMap = new HashMap<>();
+
+    // Current status
+    public static String magiskVersionString;
+    public static int magiskVersionCode = -1;
+    public static boolean magiskHide;
+
+    // Update Info
+    public static String remoteMagiskVersionString;
+    public static int remoteMagiskVersionCode = -1;
+    public static String magiskLink;
+    public static String magiskNoteLink;
+    public static String magiskMD5;
+    public static String remoteManagerVersionString;
+    public static int remoteManagerVersionCode = -1;
+    public static String managerLink;
+    public static String managerNoteLink;
+    public static String uninstallerLink;
+    public static int snetVersionCode;
+    public static String snetLink;
+
+    // Install flags
+    public static boolean keepVerity = false;
+    public static boolean keepEnc = false;
+
+    // Configs
+    public static boolean isDarkTheme;
+    public static int suRequestTimeout;
+    public static int suLogTimeout = 14;
+    public static int suAccessState;
+    public static boolean suFingerprint;
+    public static int multiuserMode;
+    public static int suResponseType;
+    public static int suNotificationType;
+    public static int suNamespaceMode;
+    public static int updateChannel;
+    public static int repoOrder;
+
+    static {
+        classMap.put(MagiskManager.class, a.q.class);
+        classMap.put(MainActivity.class, a.b.class);
+        classMap.put(SplashActivity.class, a.c.class);
+        classMap.put(AboutActivity.class, a.d.class);
+        classMap.put(DonationActivity.class, a.e.class);
+        classMap.put(FlashActivity.class, a.f.class);
+        classMap.put(NoUIActivity.class, a.g.class);
+        classMap.put(BootReceiver.class, a.h.class);
+        classMap.put(PackageReceiver.class, a.i.class);
+        classMap.put(ManagerUpdate.class, a.j.class);
+        classMap.put(RebootReceiver.class, a.k.class);
+        classMap.put(ShortcutReceiver.class, a.l.class);
+        classMap.put(OnBootService.class, a.m.class);
+        classMap.put(UpdateCheckService.class, a.n.class);
+        classMap.put(AboutCardRow.class, a.o.class);
+        classMap.put(SuRequestActivity.class, a.p.class);
+
+    }
+
+    public static void loadMagiskInfo() {
+        try {
+            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
+            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
+            String s = ShellUtils.fastCmd(("resetprop -p ") + Const.MAGISKHIDE_PROP);
+            magiskHide = s.isEmpty() || Integer.parseInt(s) != 0;
+        } catch (NumberFormatException ignored) {}
+    }
+
+    public static MagiskManager MM() {
+        return weakApp.get();
+    }
+
+    public static void exportPrefs() {
+        // Flush prefs to disk
+        MagiskManager mm = MM();
+        mm.prefs.edit().commit();
+        File xml = new File(mm.getFilesDir().getParent() + "/shared_prefs",
+                mm.getPackageName() + "_preferences.xml");
+        Shell.su(Utils.fmt("for usr in /data/user/*; do cat %s > ${usr}/%s; done", xml, Const.MANAGER_CONFIGS)).exec();
+    }
+
+    public static void importPrefs() {
+        MagiskManager mm = MM();
+        SuFile config = new SuFile(Utils.fmt("/data/user/%d/%s", Const.USER_ID, Const.MANAGER_CONFIGS));
+        if (config.exists()) {
+            SharedPreferences.Editor editor = mm.prefs.edit();
+            try {
+                SuFileInputStream is = new SuFileInputStream(config);
+                XmlPullParser parser = Xml.newPullParser();
+                parser.setFeature(XmlPullParser.FEATURE_PROCESS_NAMESPACES, false);
+                parser.setInput(is, "UTF-8");
+                parser.nextTag();
+                parser.require(XmlPullParser.START_TAG, null, "map");
+                while (parser.next() != XmlPullParser.END_TAG) {
+                    if (parser.getEventType() != XmlPullParser.START_TAG)
+                        continue;
+                    String key = parser.getAttributeValue(null, "name");
+                    String value = parser.getAttributeValue(null, "value");
+                    switch (parser.getName()) {
+                        case "string":
+                            parser.require(XmlPullParser.START_TAG, null, "string");
+                            editor.putString(key, parser.nextText());
+                            parser.require(XmlPullParser.END_TAG, null, "string");
+                            break;
+                        case "boolean":
+                            parser.require(XmlPullParser.START_TAG, null, "boolean");
+                            editor.putBoolean(key, Boolean.parseBoolean(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "boolean");
+                            break;
+                        case "int":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putInt(key, Integer.parseInt(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        case "long":
+                            parser.require(XmlPullParser.START_TAG, null, "long");
+                            editor.putLong(key, Long.parseLong(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "long");
+                            break;
+                        case "float":
+                            parser.require(XmlPullParser.START_TAG, null, "int");
+                            editor.putFloat(key, Float.parseFloat(value));
+                            parser.nextTag();
+                            parser.require(XmlPullParser.END_TAG, null, "int");
+                            break;
+                        default:
+                            parser.next();
+                    }
+                }
+            } catch (IOException | XmlPullParserException e) {
+                e.printStackTrace();
+            }
+            editor.remove(Const.Key.ETAG_KEY);
+            editor.apply();
+            loadConfig();
+            config.delete();
+        }
+    }
+
+    public static void loadConfig() {
+        MagiskManager mm = MM();
+        // su
+        suRequestTimeout = Utils.getPrefsInt(mm.prefs, Const.Key.SU_REQUEST_TIMEOUT, Const.Value.timeoutList[2]);
+        suResponseType = Utils.getPrefsInt(mm.prefs, Const.Key.SU_AUTO_RESPONSE, Const.Value.SU_PROMPT);
+        suNotificationType = Utils.getPrefsInt(mm.prefs, Const.Key.SU_NOTIFICATION, Const.Value.NOTIFICATION_TOAST);
+        suAccessState = mm.mDB.getSettings(Const.Key.ROOT_ACCESS, Const.Value.ROOT_ACCESS_APPS_AND_ADB);
+        multiuserMode = mm.mDB.getSettings(Const.Key.SU_MULTIUSER_MODE, Const.Value.MULTIUSER_MODE_OWNER_ONLY);
+        suNamespaceMode = mm.mDB.getSettings(Const.Key.SU_MNT_NS, Const.Value.NAMESPACE_MODE_REQUESTER);
+        suFingerprint = mm.mDB.getSettings(Const.Key.SU_FINGERPRINT, 0) != 0;
+        if (suFingerprint && !FingerprintHelper.canUseFingerprint()) {
+            // User revoked the fingerprint
+            mm.mDB.setSettings(Const.Key.SU_FINGERPRINT, 0);
+            suFingerprint = false;
+        }
+
+        // config
+        isDarkTheme = mm.prefs.getBoolean(Const.Key.DARK_THEME, false);
+        updateChannel = Utils.getPrefsInt(mm.prefs, Const.Key.UPDATE_CHANNEL, Const.Value.STABLE_CHANNEL);
+        repoOrder = mm.prefs.getInt(Const.Key.REPO_ORDER, Const.Value.ORDER_DATE);
+    }
+
+    public static void writeConfig() {
+        MM().prefs.edit()
+                .putBoolean(Const.Key.DARK_THEME, isDarkTheme)
+                .putBoolean(Const.Key.MAGISKHIDE, magiskHide)
+                .putBoolean(Const.Key.HOSTS, Const.MAGISK_HOST_FILE.exists())
+                .putBoolean(Const.Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
+                .putBoolean(Const.Key.SU_FINGERPRINT, suFingerprint)
+                .putString(Const.Key.SU_REQUEST_TIMEOUT, String.valueOf(suRequestTimeout))
+                .putString(Const.Key.SU_AUTO_RESPONSE, String.valueOf(suResponseType))
+                .putString(Const.Key.SU_NOTIFICATION, String.valueOf(suNotificationType))
+                .putString(Const.Key.ROOT_ACCESS, String.valueOf(suAccessState))
+                .putString(Const.Key.SU_MULTIUSER_MODE, String.valueOf(multiuserMode))
+                .putString(Const.Key.SU_MNT_NS, String.valueOf(suNamespaceMode))
+                .putString(Const.Key.UPDATE_CHANNEL, String.valueOf(updateChannel))
+                .putInt(Const.Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER)
+                .putInt(Const.Key.REPO_ORDER, repoOrder)
+                .apply();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/DonationActivity.java

@@ -0,0 +1,44 @@
+package com.topjohnwu.magisk;
+
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.topjohnwu.magisk.components.AboutCardRow;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.utils.Utils;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import butterknife.BindView;
+
+public class DonationActivity extends BaseActivity {
+
+    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.paypal) AboutCardRow paypal;
+    @BindView(R.id.patreon) AboutCardRow patreon;
+
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_StatusBar_Dark;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_donation);
+        new DonationActivity_ViewBinding(this);
+
+        setSupportActionBar(toolbar);
+        toolbar.setNavigationOnClickListener(view -> finish());
+
+        ActionBar ab = getSupportActionBar();
+        if (ab != null) {
+            ab.setTitle(R.string.donation);
+            ab.setDisplayHomeAsUpEnabled(true);
+        }
+
+        paypal.setOnClickListener(v -> Utils.openLink(this, Uri.parse(Const.Url.PAYPAL_URL)));
+        patreon.setOnClickListener(v -> Utils.openLink(this, Uri.parse(Const.Url.PATREON_URL)));
+    }
+}

app/src/full/java/com/topjohnwu/magisk/FlashActivity.java

@@ -1,11 +1,9 @@
 package com.topjohnwu.magisk;
 
+import android.Manifest;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
-import android.os.Handler;
-import android.support.v7.app.ActionBar;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Button;
@@ -16,9 +14,10 @@ import android.widget.Toast;
 
 import com.topjohnwu.magisk.asyncs.FlashZip;
 import com.topjohnwu.magisk.asyncs.InstallMagisk;
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.CallbackList;
 import com.topjohnwu.superuser.Shell;
 
@@ -30,11 +29,12 @@ import java.util.Calendar;
 import java.util.List;
 import java.util.Locale;
 
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
 
-public class FlashActivity extends Activity {
+public class FlashActivity extends BaseActivity {
 
     @BindView(R.id.toolbar) Toolbar toolbar;
     @BindView(R.id.txtLog) TextView flashLogs;
@@ -44,37 +44,33 @@ public class FlashActivity extends Activity {
 
     private List<String> logs;
 
-    @OnClick(R.id.no_thanks)
-    void dismiss() {
-        finish();
-    }
-
     @OnClick(R.id.reboot)
     void reboot() {
-        Shell.Async.su("/system/bin/reboot");
+        Shell.su("/system/bin/reboot").submit();
     }
 
     @OnClick(R.id.save_logs)
     void saveLogs() {
-        Calendar now = Calendar.getInstance();
-        String filename = String.format(Locale.US,
-                "install_log_%04d%02d%02d_%02d%02d%02d.log",
-                now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
-                now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
-                now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
+        runWithPermission(new String[] {Manifest.permission.WRITE_EXTERNAL_STORAGE}, () -> {
+            Calendar now = Calendar.getInstance();
+            String filename = String.format(Locale.US,
+                    "magisk_install_log_%04d%02d%02d_%02d%02d%02d.log",
+                    now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
+                    now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
+                    now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
 
-        File logFile = new File(Const.EXTERNAL_PATH + "/logs", filename);
-        logFile.getParentFile().mkdirs();
-        try (FileWriter writer = new FileWriter(logFile)) {
-            for (String s : logs) {
-                writer.write(s);
-                writer.write('\n');
+            File logFile = new File(Download.EXTERNAL_PATH, filename);
+            try (FileWriter writer = new FileWriter(logFile)) {
+                for (String s : logs) {
+                    writer.write(s);
+                    writer.write('\n');
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                return;
             }
-        } catch (IOException e) {
-            e.printStackTrace();
-            return;
-        }
-        MagiskManager.toast(logFile.getPath(), Toast.LENGTH_LONG);
+            Utils.toast(logFile.getPath(), Toast.LENGTH_LONG);
+        });
     }
 
     @Override
@@ -86,7 +82,8 @@ public class FlashActivity extends Activity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_flash);
-        ButterKnife.bind(this);
+        new FlashActivity_ViewBinding(this);
+
         setSupportActionBar(toolbar);
         ActionBar ab = getSupportActionBar();
         if (ab != null) {
@@ -99,11 +96,23 @@ public class FlashActivity extends Activity {
 
         logs = new ArrayList<>();
         CallbackList<String> console = new CallbackList<String>(new ArrayList<>()) {
+
+            private void updateUI() {
+                flashLogs.setText(TextUtils.join("\n", this));
+                sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 10);
+            }
+
             @Override
             public void onAddElement(String s) {
                 logs.add(s);
-                flashLogs.setText(TextUtils.join("\n", this));
-                sv.postDelayed(() -> sv.fullScroll(ScrollView.FOCUS_DOWN), 10);
+                updateUI();
+            }
+
+            @Override
+            public String set(int i, String s) {
+                String ret = super.set(i, s);
+                Data.mainHandler.post(this::updateUI);
+                return ret;
             }
         };
 
@@ -119,18 +128,24 @@ public class FlashActivity extends Activity {
                 new UninstallMagisk(this, uri, console, logs).exec();
                 break;
             case Const.Value.FLASH_MAGISK:
-                new InstallMagisk(this, console, logs, uri, InstallMagisk.DIRECT_MODE).exec();
+                new InstallMagisk(this, console, logs, InstallMagisk.DIRECT_MODE).exec();
                 break;
-            case Const.Value.FLASH_SECOND_SLOT:
-                new InstallMagisk(this, console, logs, uri, InstallMagisk.SECOND_SLOT_MODE).exec();
+            case Const.Value.FLASH_INACTIVE_SLOT:
+                new InstallMagisk(this, console, logs, InstallMagisk.SECOND_SLOT_MODE).exec();
                 break;
             case Const.Value.PATCH_BOOT:
-                new InstallMagisk(this, console, logs, uri,
+                new InstallMagisk(this, console, logs,
                         intent.getParcelableExtra(Const.Key.FLASH_SET_BOOT)).exec();
                 break;
         }
     }
 
+    @OnClick(R.id.close)
+    @Override
+    public void finish() {
+        super.finish();
+    }
+
     @Override
     public void onBackPressed() {
         // Prevent user accidentally press back button
@@ -138,14 +153,14 @@ public class FlashActivity extends Activity {
 
     private static class UninstallMagisk extends FlashZip {
 
-        private UninstallMagisk(Activity context, Uri uri, List<String> console, List<String> logs) {
+        private UninstallMagisk(BaseActivity context, Uri uri, List<String> console, List<String> logs) {
             super(context, uri, console, logs);
         }
 
         @Override
         protected void onPostExecute(Integer result) {
             if (result == 1) {
-                new Handler().postDelayed(() ->
+                Data.mainHandler.postDelayed(() ->
                         RootUtils.uninstallPkg(getActivity().getPackageName()), 3000);
             } else {
                 super.onPostExecute(result);

app/src/full/java/com/topjohnwu/magisk/MagiskManager.java

@@ -0,0 +1,65 @@
+package com.topjohnwu.magisk;
+
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.preference.PreferenceManager;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.superuser.ContainerApp;
+import com.topjohnwu.superuser.Shell;
+
+import java.lang.ref.WeakReference;
+
+public class MagiskManager extends ContainerApp {
+
+    // Info
+    public boolean hasInit = false;
+
+    // Global resources
+    public SharedPreferences prefs;
+    public MagiskDatabaseHelper mDB;
+    public RepoDatabaseHelper repoDB;
+
+    public MagiskManager() {
+        Data.weakApp = new WeakReference<>(this);
+    }
+
+    @Override
+    public void onCreate() {
+        super.onCreate();
+
+        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER);
+        Shell.Config.verboseLogging(BuildConfig.DEBUG);
+        Shell.Config.setInitializer(RootUtils.class);
+
+        prefs = PreferenceManager.getDefaultSharedPreferences(this);
+        mDB = MagiskDatabaseHelper.getInstance();
+
+        String pkg = mDB.getStrings(Const.Key.SU_MANAGER, null);
+        if (pkg != null && getPackageName().equals(Const.ORIG_PKG_NAME)) {
+            mDB.setStrings(Const.Key.SU_MANAGER, null);
+            Shell.su("pm uninstall " + pkg).exec();
+        }
+        if (TextUtils.equals(pkg, getPackageName())) {
+            try {
+                // We are the manager, remove com.topjohnwu.magisk as it could be malware
+                getPackageManager().getApplicationInfo(Const.ORIG_PKG_NAME, 0);
+                RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
+            } catch (PackageManager.NameNotFoundException ignored) {}
+        }
+
+        LocaleManager.setLocale(this);
+        Data.loadConfig();
+    }
+
+    @Override
+    public void onConfigurationChanged(Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        LocaleManager.setLocale(this);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/MainActivity.java

@@ -3,37 +3,41 @@ package com.topjohnwu.magisk;
 import android.content.Intent;
 import android.os.Bundle;
 import android.os.Handler;
-import android.support.annotation.NonNull;
-import android.support.design.widget.NavigationView;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentTransaction;
-import android.support.v4.widget.DrawerLayout;
-import android.support.v7.app.ActionBarDrawerToggle;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 
-import com.topjohnwu.magisk.components.Activity;
-import com.topjohnwu.magisk.utils.Const;
+import com.google.android.material.navigation.NavigationView;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.fragments.LogFragment;
+import com.topjohnwu.magisk.fragments.MagiskFragment;
+import com.topjohnwu.magisk.fragments.MagiskHideFragment;
+import com.topjohnwu.magisk.fragments.ModulesFragment;
+import com.topjohnwu.magisk.fragments.ReposFragment;
+import com.topjohnwu.magisk.fragments.SettingsFragment;
+import com.topjohnwu.magisk.fragments.SuperuserFragment;
+import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBarDrawerToggle;
+import androidx.appcompat.widget.Toolbar;
+import androidx.drawerlayout.widget.DrawerLayout;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentTransaction;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
-public class MainActivity extends Activity
+public class MainActivity extends BaseActivity
         implements NavigationView.OnNavigationItemSelectedListener, Topic.Subscriber {
 
     private final Handler mDrawerHandler = new Handler();
     private int mDrawerItem;
-    private boolean fromShortcut = true;
+    private static boolean fromShortcut = false;
 
-    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.toolbar) public Toolbar toolbar;
     @BindView(R.id.drawer_layout) DrawerLayout drawer;
-    @BindView(R.id.nav_view) public NavigationView navigationView;
+    @BindView(R.id.nav_view) NavigationView navigationView;
 
     private float toolbarElevation;
 
@@ -44,27 +48,14 @@ public class MainActivity extends Activity
 
     @Override
     protected void onCreate(final Bundle savedInstanceState) {
-
-        MagiskManager mm = getMagiskManager();
-
         if (!mm.hasInit) {
-            Intent intent = new Intent(this, SplashActivity.class);
-            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
-            if (section != null) {
-                intent.putExtra(Const.Key.OPEN_SECTION, section);
-            }
-            startActivity(intent);
+            startActivity(new Intent(this, Data.classMap.get(SplashActivity.class)));
             finish();
         }
 
-        String perm = getIntent().getStringExtra(Const.Key.INTENT_PERM);
-        if (perm != null) {
-            ActivityCompat.requestPermissions(this, new String[] { perm }, 0);
-        }
-
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        ButterKnife.bind(this);
+        new MainActivity_ViewBinding(this);
 
         setSupportActionBar(toolbar);
 
@@ -86,8 +77,11 @@ public class MainActivity extends Activity
         drawer.addDrawerListener(toggle);
         toggle.syncState();
 
-        if (savedInstanceState == null)
-            navigate(getIntent().getStringExtra(Const.Key.OPEN_SECTION));
+        if (savedInstanceState == null) {
+            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
+            fromShortcut = section != null;
+            navigate(section);
+        }
 
         navigationView.setNavigationItemSelectedListener(this);
     }
@@ -118,28 +112,20 @@ public class MainActivity extends Activity
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onPublish(int topic, Object[] result) {
         recreate();
     }
 
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getMagiskManager().reloadActivity };
-    }
-
     public void checkHideSection() {
-        MagiskManager mm = getMagiskManager();
         Menu menu = navigationView.getMenu();
-        menu.findItem(R.id.magiskhide).setVisible(
-                Shell.rootAccess() && mm.magiskVersionCode >= Const.MAGISK_VER.UNIFIED
-                        && mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false));
-        menu.findItem(R.id.modules).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false) &&
-                Shell.rootAccess() && mm.magiskVersionCode >= 0);
-        menu.findItem(R.id.downloads).setVisible(!mm.prefs.getBoolean(Const.Key.COREONLY, false)
-                && Utils.checkNetworkStatus() && Shell.rootAccess() && mm.magiskVersionCode >= 0);
+        menu.findItem(R.id.magiskhide).setVisible(Shell.rootAccess() &&
+                mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false));
+        menu.findItem(R.id.modules).setVisible(Shell.rootAccess() && Data.magiskVersionCode >= 0);
+        menu.findItem(R.id.downloads).setVisible(Download.checkNetworkStatus(this)
+                && Shell.rootAccess() && Data.magiskVersionCode >= 0);
         menu.findItem(R.id.log).setVisible(Shell.rootAccess());
         menu.findItem(R.id.superuser).setVisible(Shell.rootAccess() &&
-                !(Const.USER_ID > 0 && mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED));
+                !(Const.USER_ID > 0 && Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED));
     }
 
     public void navigate(String item) {
@@ -167,6 +153,9 @@ public class MainActivity extends Activity
                 case "about":
                     itemId = R.id.app_about;
                     break;
+                case "donation":
+                    itemId = R.id.donation;
+                    break;
             }
         }
         navigate(itemId);
@@ -197,11 +186,14 @@ public class MainActivity extends Activity
                 displayFragment(new LogFragment(), false);
                 break;
             case R.id.settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                mDrawerItem = bak;
+                displayFragment(new SettingsFragment(), true);
                 break;
             case R.id.app_about:
-                startActivity(new Intent(this, AboutActivity.class));
+                startActivity(new Intent(this, Data.classMap.get(AboutActivity.class)));
+                mDrawerItem = bak;
+                break;
+            case R.id.donation:
+                startActivity(new Intent(this, Data.classMap.get(DonationActivity.class)));
                 mDrawerItem = bak;
                 break;
         }

app/src/full/java/com/topjohnwu/magisk/NoUIActivity.java

@@ -0,0 +1,13 @@
+package com.topjohnwu.magisk;
+
+import com.topjohnwu.magisk.components.BaseActivity;
+
+import androidx.annotation.NonNull;
+
+public class NoUIActivity extends BaseActivity {
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        finish();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/SplashActivity.java

@@ -0,0 +1,67 @@
+package com.topjohnwu.magisk;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+
+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.asyncs.UpdateRepos;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.receivers.ShortcutReceiver;
+import com.topjohnwu.magisk.utils.Download;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+
+public class SplashActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        // Magisk working as expected
+        if (Shell.rootAccess() && Data.magiskVersionCode > 0) {
+            // Update check service
+            Utils.setupUpdateCheck();
+            // Load modules
+            Utils.loadModules();
+        }
+
+        mm.repoDB = new RepoDatabaseHelper(this);
+        Data.importPrefs();
+
+        // Dynamic detect all locales
+        LocaleManager.loadAvailableLocales();
+
+        // Create notification channel on Android O
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationChannel channel = new NotificationChannel(Const.ID.NOTIFICATION_CHANNEL,
+                    getString(R.string.magisk_updates), NotificationManager.IMPORTANCE_DEFAULT);
+            getSystemService(NotificationManager.class).createNotificationChannel(channel);
+        }
+
+        // Setup shortcuts
+        sendBroadcast(new Intent(this, Data.classMap.get(ShortcutReceiver.class)));
+
+        if (Download.checkNetworkStatus(this)) {
+            // Fire update check
+            CheckUpdates.check();
+            // Repo update check
+            new UpdateRepos().exec();
+        }
+
+        // Write back default values
+        Data.writeConfig();
+
+        mm.hasInit = true;
+
+        Intent intent = new Intent(this, Data.classMap.get(MainActivity.class));
+        intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
+        intent.putExtra(BaseActivity.INTENT_PERM, getIntent().getStringExtra(BaseActivity.INTENT_PERM));
+        startActivity(intent);
+        finish();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/SuRequestActivity.java

@@ -1,10 +1,8 @@
-package com.topjohnwu.magisk.superuser;
+package com.topjohnwu.magisk;
 
-import android.content.ContentValues;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.hardware.fingerprint.FingerprintManager;
-import android.net.LocalSocket;
 import android.net.LocalSocketAddress;
 import android.os.Bundle;
 import android.os.CountDownTimer;
@@ -19,23 +17,19 @@ import android.widget.LinearLayout;
 import android.widget.Spinner;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.components.Activity;
+import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.container.Policy;
-import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.FingerprintHelper;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.SuConnector;
 
-import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
+import java.io.OutputStream;
 
+import androidx.annotation.Nullable;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-
-public class RequestActivity extends Activity {
 
+public class SuRequestActivity extends BaseActivity {
     @BindView(R.id.su_popup) LinearLayout suPopup;
     @BindView(R.id.timeout) Spinner timeout;
     @BindView(R.id.app_icon) ImageView appIcon;
@@ -46,44 +40,54 @@ public class RequestActivity extends Activity {
     @BindView(R.id.fingerprint) ImageView fingerprintImg;
     @BindView(R.id.warning) TextView warning;
 
-    private String socketPath;
-    private LocalSocket socket;
-    private PackageManager pm;
-    private MagiskManager mm;
-
-    private boolean hasTimeout;
+    private SuConnector connector;
     private Policy policy;
     private CountDownTimer timer;
     private FingerprintHelper fingerprintHelper;
 
-    @Override
-    public int getDarkTheme() {
-        return R.style.SuRequest_Dark;
+    class SuConnectorV1 extends SuConnector {
+
+        SuConnectorV1(String name) throws IOException {
+            socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.FILESYSTEM));
+            new FileObserver(name) {
+                @Override
+                public void onEvent(int fileEvent, String path) {
+                    if (fileEvent == FileObserver.DELETE_SELF) {
+                        finish();
+                    }
+                }
+            }.startWatching();
+        }
+
+        @Override
+        public void response() {
+            try (OutputStream out = getOutputStream()) {
+                out.write((policy.policy == Policy.ALLOW ? "socket:ALLOW" : "socket:DENY").getBytes());
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    class SuConnectorV2 extends SuConnector {
+
+        SuConnectorV2(String name) throws IOException {
+            socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT));
+        }
+
+        @Override
+        public void response() {
+            try (DataOutputStream out = getOutputStream()) {
+                out.writeInt(policy.policy);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        }
     }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
-
-        pm = getPackageManager();
-        mm = Utils.getMagiskManager(this);
-        mm.mDB.clearOutdated();
-
-        Intent intent = getIntent();
-        socketPath = intent.getStringExtra("socket");
-        hasTimeout = intent.getBooleanExtra("timeout", true);
-
-        new FileObserver(socketPath) {
-            @Override
-            public void onEvent(int fileEvent, String path) {
-                if (fileEvent == FileObserver.DELETE_SELF) {
-                    finish();
-                }
-            }
-        }.startWatching();
-
-        new SocketManager(this).exec();
+    public int getDarkTheme() {
+        return R.style.SuRequest_Dark;
     }
 
     @Override
@@ -95,14 +99,48 @@ public class RequestActivity extends Activity {
         super.finish();
     }
 
-    private boolean cancelTimeout() {
-        timer.cancel();
-        deny_btn.setText(getString(R.string.deny));
-        return false;
+    @Override
+    public void onBackPressed() {
+        if (policy != null) {
+            handleAction(Policy.DENY);
+        } else {
+            finish();
+        }
     }
 
-    private void showRequest() {
-        switch (mm.suResponseType) {
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        PackageManager pm = getPackageManager();
+        mm.mDB.clearOutdated();
+
+        // Get policy
+        Intent intent = getIntent();
+        try {
+            connector =  intent.getIntExtra("version", 1) == 1 ?
+                    new SuConnectorV1(intent.getStringExtra("socket")) :
+                    new SuConnectorV2(intent.getStringExtra("socket"));
+            Bundle bundle = connector.readSocketInput();
+            int uid = Integer.parseInt(bundle.getString("uid"));
+            policy = mm.mDB.getPolicy(uid);
+            if (policy == null) {
+                policy = new Policy(uid, pm);
+            }
+        } catch (IOException | PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            finish();
+            return;
+        }
+
+        // Never allow com.topjohnwu.magisk (could be malware)
+        if (TextUtils.equals(policy.packageName, Const.ORIG_PKG_NAME)) {
+            finish();
+            return;
+        }
+
+        switch (Data.suResponseType) {
             case Const.Value.SU_AUTO_DENY:
                 handleAction(Policy.DENY, 0);
                 return;
@@ -120,7 +158,7 @@ public class RequestActivity extends Activity {
         }
 
         setContentView(R.layout.activity_request);
-        ButterKnife.bind(this);
+        new SuRequestActivity_ViewBinding(this);
 
         appIcon.setImageDrawable(policy.info.loadIcon(pm));
         appNameView.setText(policy.appName);
@@ -131,7 +169,7 @@ public class RequestActivity extends Activity {
         adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
         timeout.setAdapter(adapter);
 
-        timer = new CountDownTimer(mm.suRequestTimeout * 1000, 1000) {
+        timer = new CountDownTimer(Data.suRequestTimeout * 1000, 1000) {
             @Override
             public void onTick(long millisUntilFinished) {
                 deny_btn.setText(getString(R.string.deny_with_str, "(" + millisUntilFinished / 1000 + ")"));
@@ -143,7 +181,7 @@ public class RequestActivity extends Activity {
             }
         };
 
-        boolean useFingerprint = mm.prefs.getBoolean(Const.Key.SU_FINGERPRINT, false) && FingerprintHelper.canUseFingerprint();
+        boolean useFingerprint = Data.suFingerprint && FingerprintHelper.canUseFingerprint();
 
         if (useFingerprint) {
             try {
@@ -168,7 +206,7 @@ public class RequestActivity extends Activity {
                         warning.setText(R.string.auth_fail);
                     }
                 };
-                fingerprintHelper.startAuth();
+                fingerprintHelper.authenticate();
             } catch (Exception e) {
                 e.printStackTrace();
                 useFingerprint = false;
@@ -192,44 +230,25 @@ public class RequestActivity extends Activity {
         });
         suPopup.setOnClickListener(v -> cancelTimeout());
         timeout.setOnTouchListener((v, event) -> cancelTimeout());
-
-        if (hasTimeout) {
-            timer.start();
-        } else {
-            cancelTimeout();
-        }
+        timer.start();
     }
 
-    @Override
-    public void onBackPressed() {
-        if (policy != null) {
-            handleAction(Policy.DENY);
-        } else {
-            finish();
-        }
+    private boolean cancelTimeout() {
+        timer.cancel();
+        deny_btn.setText(getString(R.string.deny));
+        return false;
     }
 
-    void handleAction() {
-        String response;
-        if (policy.policy == Policy.ALLOW) {
-            response = "socket:ALLOW";
-        } else {
-            response = "socket:DENY";
-        }
-        try {
-            socket.getOutputStream().write((response).getBytes());
-            socket.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+    private void handleAction() {
+        connector.response();
         finish();
     }
 
-    void handleAction(int action) {
+    private void handleAction(int action) {
         handleAction(action, Const.Value.timeoutList[timeout.getSelectedItemPosition()]);
     }
 
-    void handleAction(int action, int time) {
+    private void handleAction(int action, int time) {
         policy.policy = action;
         if (time >= 0) {
             policy.until = (time == 0) ? 0 : (System.currentTimeMillis() / 1000 + time * 60);
@@ -237,64 +256,4 @@ public class RequestActivity extends Activity {
         }
         handleAction();
     }
-
-    private class SocketManager extends ParallelTask<Void, Void, Boolean> {
-
-        SocketManager(Activity context) {
-            super(context);
-        }
-
-        @Override
-        protected Boolean doInBackground(Void... params) {
-            try {
-                socket = new LocalSocket();
-                socket.connect(new LocalSocketAddress(socketPath, LocalSocketAddress.Namespace.FILESYSTEM));
-
-                DataInputStream is = new DataInputStream(socket.getInputStream());
-                ContentValues payload = new ContentValues();
-
-                while (true) {
-                    int nameLen = is.readInt();
-                    byte[] nameBytes = new byte[nameLen];
-                    is.readFully(nameBytes);
-                    String name = new String(nameBytes);
-                    if (TextUtils.equals(name, "eof"))
-                        break;
-
-                    int dataLen = is.readInt();
-                    byte[] dataBytes = new byte[dataLen];
-                    is.readFully(dataBytes);
-                    String data = new String(dataBytes);
-                    payload.put(name, data);
-                }
-
-                if (payload.getAsInteger("uid") == null) {
-                    return false;
-                }
-
-                int uid = payload.getAsInteger("uid");
-                policy = mm.mDB.getPolicy(uid);
-                if (policy == null) {
-                    policy = new Policy(uid, pm);
-                }
-
-                /* Never allow com.topjohnwu.magisk (could be malware) */
-                if (TextUtils.equals(policy.packageName, Const.ORIG_PKG_NAME))
-                    return false;
-            } catch (Exception e) {
-                e.printStackTrace();
-                return false;
-            }
-            return true;
-        }
-
-        @Override
-        protected void onPostExecute(Boolean result) {
-            if (result) {
-                showRequest();
-            } else {
-                finish();
-            }
-        }
-    }
 }

app/src/full/java/com/topjohnwu/magisk/adapters/ApplicationAdapter.java

@@ -1,8 +1,9 @@
 package com.topjohnwu.magisk.adapters;
 
+import android.content.Context;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.support.v7.widget.RecyclerView;
+import android.os.AsyncTask;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -12,10 +13,10 @@ import android.widget.Filter;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.Const;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.asyncs.ParallelTask;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
@@ -23,8 +24,9 @@ import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.ViewHolder> {
 
@@ -33,36 +35,61 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
     private PackageManager pm;
     private ApplicationFilter filter;
 
-    public ApplicationAdapter() {
+    public ApplicationAdapter(Context context) {
         fullList = showList = Collections.emptyList();
         hideList = Collections.emptyList();
         filter = new ApplicationFilter();
-        pm = MagiskManager.get().getPackageManager();
-        new LoadApps().exec();
+        pm = context.getPackageManager();
+        AsyncTask.THREAD_POOL_EXECUTOR.execute(this::loadApps);
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
+        return new ViewHolder(v);
+    }
+
+    private void loadApps() {
+        fullList = pm.getInstalledApplications(0);
+        hideList = Shell.su("magiskhide --ls").exec().getOut();
+        for (Iterator<ApplicationInfo> i = fullList.iterator(); i.hasNext(); ) {
+            ApplicationInfo info = i.next();
+            if (Const.HIDE_BLACKLIST.contains(info.packageName) || !info.enabled || info.uid == 1000) {
+                i.remove();
+            }
+        }
+        Collections.sort(fullList, (a, b) -> {
+            boolean ah = hideList.contains(a.packageName);
+            boolean bh = hideList.contains(b.packageName);
+            if (ah == bh) {
+                return Utils.getAppLabel(a, pm).toLowerCase()
+                        .compareTo(Utils.getAppLabel(b, pm).toLowerCase());
+            } else if (ah) {
+                return -1;
+            } else {
+                return 1;
+            }
+        });
+        Topic.publish(false, Topic.MAGISK_HIDE_DONE);
     }
 
     @Override
-    public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        View mView = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_app, parent, false);
-        return new ViewHolder(mView);
-    }
-
-    @Override
-    public void onBindViewHolder(final ViewHolder holder, int position) {
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
         ApplicationInfo info = showList.get(position);
 
         holder.appIcon.setImageDrawable(info.loadIcon(pm));
-        holder.appName.setText(info.loadLabel(pm));
+        holder.appName.setText(Utils.getAppLabel(info, pm));
         holder.appPackage.setText(info.packageName);
 
         holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(hideList.contains(info.packageName));
         holder.checkBox.setOnCheckedChangeListener((v, isChecked) -> {
             if (isChecked) {
-                Shell.Async.su("magiskhide --add " + info.packageName);
+                Shell.su("magiskhide --add " + info.packageName).submit();
                 hideList.add(info.packageName);
             } else {
-                Shell.Async.su("magiskhide --rm " + info.packageName);
+                Shell.su("magiskhide --rm " + info.packageName).submit();
                 hideList.remove(info.packageName);
             }
         });
@@ -78,7 +105,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
     }
 
     public void refresh() {
-        new LoadApps().exec();
+        AsyncTask.THREAD_POOL_EXECUTOR.execute(this::loadApps);
     }
 
     static class ViewHolder extends RecyclerView.ViewHolder {
@@ -90,11 +117,11 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
 
         ViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ApplicationAdapter$ViewHolder_ViewBinding(this, itemView);
         }
     }
 
-    private class ApplicationFilter extends Filter {
+    class ApplicationFilter extends Filter {
 
         private boolean lowercaseContains(String s, CharSequence filter) {
             return !TextUtils.isEmpty(s) && s.toLowerCase().contains(filter);
@@ -108,7 +135,7 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
                 showList = new ArrayList<>();
                 String filter = constraint.toString().toLowerCase();
                 for (ApplicationInfo info : fullList) {
-                    if (lowercaseContains(info.loadLabel(pm).toString(), filter)
+                    if (lowercaseContains(Utils.getAppLabel(info, pm), filter)
                             || lowercaseContains(info.packageName, filter)) {
                         showList.add(info);
                     }
@@ -122,37 +149,4 @@ public class ApplicationAdapter extends RecyclerView.Adapter<ApplicationAdapter.
             notifyDataSetChanged();
         }
     }
-
-    private class LoadApps extends ParallelTask<Void, Void, Void> {
-
-        @Override
-        protected Void doInBackground(Void... voids) {
-            fullList = pm.getInstalledApplications(0);
-            hideList = Shell.Sync.su("magiskhide --ls");
-            for (Iterator<ApplicationInfo> i = fullList.iterator(); i.hasNext(); ) {
-                ApplicationInfo info = i.next();
-                if (Const.HIDE_BLACKLIST.contains(info.packageName) || !info.enabled) {
-                    i.remove();
-                }
-            }
-            Collections.sort(fullList, (a, b) -> {
-                boolean ah = hideList.contains(a.packageName);
-                boolean bh = hideList.contains(b.packageName);
-                if (ah == bh) {
-                    return a.loadLabel(pm).toString().toLowerCase().compareTo(
-                            b.loadLabel(pm).toString().toLowerCase());
-                } else if (ah) {
-                    return -1;
-                } else {
-                    return 1;
-                }
-            });
-            return null;
-        }
-
-        @Override
-        protected void onPostExecute(Void v) {
-            MagiskManager.get().magiskHideDone.publish(false);
-        }
-    }
 }

app/src/full/java/com/topjohnwu/magisk/adapters/ModulesAdapter.java

@@ -1,8 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
 import android.content.Context;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -11,6 +9,7 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Module;
@@ -18,8 +17,9 @@ import com.topjohnwu.superuser.Shell;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {
 
@@ -29,6 +29,7 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
         mList = list;
     }
 
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_module, parent, false);
@@ -46,9 +47,9 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
         String noInfo = context.getString(R.string.no_info_provided);
 
         holder.title.setText(module.getName());
-        holder.versionName.setText( TextUtils.isEmpty(version) ? noInfo : version);
-        holder.author.setText( TextUtils.isEmpty(author) ? noInfo : context.getString(R.string.author, author));
-        holder.description.setText( TextUtils.isEmpty(description) ? noInfo : description);
+        holder.versionName.setText(TextUtils.isEmpty(version) ? noInfo : version);
+        holder.author.setText(TextUtils.isEmpty(author) ? noInfo : context.getString(R.string.author, author));
+        holder.description.setText(TextUtils.isEmpty(description) ? noInfo : description);
 
         holder.checkBox.setOnCheckedChangeListener(null);
         holder.checkBox.setChecked(module.isEnabled());
@@ -114,7 +115,7 @@ public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHold
 
         ViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ModulesAdapter$ViewHolder_ViewBinding(this, itemView);
 
             if (!Shell.rootAccess()) {
                 checkBox.setEnabled(false);

app/src/full/java/com/topjohnwu/magisk/adapters/PolicyAdapter.java

@@ -2,8 +2,6 @@ package com.topjohnwu.magisk.adapters;
 
 import android.app.Activity;
 import android.content.pm.PackageManager;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -11,19 +9,23 @@ import android.widget.ImageView;
 import android.widget.Switch;
 import android.widget.TextView;
 
+import com.google.android.material.snackbar.Snackbar;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.CustomAlertDialog;
 import com.topjohnwu.magisk.components.ExpandableView;
 import com.topjohnwu.magisk.components.SnackbarMaker;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.database.MagiskDatabaseHelper;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
 
 import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {
 
@@ -38,6 +40,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         this.pm = pm;
     }
 
+    @NonNull
     @Override
     public ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_policy, parent, false);
@@ -63,14 +66,34 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
         holder.appName.setText(policy.appName);
         holder.packageName.setText(policy.packageName);
         holder.appIcon.setImageDrawable(policy.info.loadIcon(pm));
-        holder.masterSwitch.setOnCheckedChangeListener((v, isChecked) -> {
-            if ((isChecked && policy.policy == Policy.DENY) ||
-                    (!isChecked && policy.policy == Policy.ALLOW)) {
-                policy.policy = isChecked ? Policy.ALLOW : Policy.DENY;
-                String message = v.getContext().getString(
-                        isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
-                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
-                dbHelper.updatePolicy(policy);
+
+        holder.notificationSwitch.setOnCheckedChangeListener(null);
+        holder.loggingSwitch.setOnCheckedChangeListener(null);
+
+        holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
+        holder.notificationSwitch.setChecked(policy.notification);
+        holder.loggingSwitch.setChecked(policy.logging);
+
+        holder.masterSwitch.setOnClickListener(v -> {
+            boolean isChecked = holder.masterSwitch.isChecked();
+            Runnable r = () -> {
+                if ((isChecked && policy.policy == Policy.DENY) ||
+                        (!isChecked && policy.policy == Policy.ALLOW)) {
+                    policy.policy = isChecked ? Policy.ALLOW : Policy.DENY;
+                    String message = v.getContext().getString(
+                            isChecked ? R.string.su_snack_grant : R.string.su_snack_deny, policy.appName);
+                    SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                    dbHelper.updatePolicy(policy);
+                }
+            };
+            if (Data.suFingerprint) {
+                holder.masterSwitch.setChecked(!isChecked);
+                FingerprintHelper.showAuthDialog((Activity) v.getContext(), () -> {
+                    holder.masterSwitch.setChecked(isChecked);
+                    r.run();
+                });
+            } else {
+                r.run();
             }
         });
         holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
@@ -93,7 +116,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
                 dbHelper.updatePolicy(policy);
             }
         });
-        holder.delete.setOnClickListener(v -> new AlertDialogBuilder((Activity) v.getContext())
+        holder.delete.setOnClickListener(v -> new CustomAlertDialog((Activity) v.getContext())
                 .setTitle(R.string.su_revoke_title)
                 .setMessage(v.getContext().getString(R.string.su_revoke_msg, policy.appName))
                 .setPositiveButton(R.string.yes, (dialog, which) -> {
@@ -107,9 +130,6 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
                 .setNegativeButton(R.string.no_thanks, null)
                 .setCancelable(true)
                 .show());
-        holder.masterSwitch.setChecked(policy.policy == Policy.ALLOW);
-        holder.notificationSwitch.setChecked(policy.notification);
-        holder.loggingSwitch.setChecked(policy.logging);
 
         // Hide for now
         holder.moreInfo.setVisibility(View.GONE);
@@ -137,7 +157,7 @@ public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder
 
         public ViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new PolicyAdapter$ViewHolder_ViewBinding(this, itemView);
             container.expandLayout = expandLayout;
             setupExpandable();
         }

app/src/full/java/com/topjohnwu/magisk/adapters/ReposAdapter.java

@@ -1,9 +1,7 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.app.Activity;
 import android.content.Context;
 import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Pair;
 import android.view.LayoutInflater;
@@ -16,18 +14,18 @@ import android.widget.TextView;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.MarkDownWindow;
 import com.topjohnwu.magisk.asyncs.ProcessRepoZip;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.components.CustomAlertDialog;
 import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.container.Repo;
 import com.topjohnwu.magisk.database.RepoDatabaseHelper;
-import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder> {
 
@@ -90,29 +88,31 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
         Repo repo = repoPairs.get(section).second.get(position);
         Context context = holder.itemView.getContext();
 
-        holder.title.setText(repo.getName());
-        holder.versionName.setText(repo.getVersion());
+        String name = repo.getName();
+        String version = repo.getVersion();
         String author = repo.getAuthor();
-        holder.author.setText(TextUtils.isEmpty(author) ? null : context.getString(R.string.author, author));
-        holder.description.setText(repo.getDescription());
+        String description = repo.getDescription();
+        String noInfo = context.getString(R.string.no_info_provided);
+
+        holder.title.setText(TextUtils.isEmpty(name) ? noInfo : name);
+        holder.versionName.setText(TextUtils.isEmpty(version) ? noInfo : version);
+        holder.author.setText(TextUtils.isEmpty(author) ? noInfo : context.getString(R.string.author, author));
+        holder.description.setText(TextUtils.isEmpty(description) ? noInfo : description);
         holder.updateTime.setText(context.getString(R.string.updated_on, repo.getLastUpdateString()));
 
         holder.infoLayout.setOnClickListener(v ->
-                new MarkDownWindow((Activity) context, null, repo.getDetailUrl()).exec());
+                new MarkDownWindow((BaseActivity) context, null, repo.getDetailUrl()).exec());
 
         holder.downloadImage.setOnClickListener(v -> {
-            String filename = repo.getName() + "-" + repo.getVersion() + ".zip";
-            new AlertDialogBuilder((Activity) context)
+            new CustomAlertDialog((BaseActivity) context)
                     .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
-                    .setMessage(context.getString(R.string.repo_install_msg, filename))
+                    .setMessage(context.getString(R.string.repo_install_msg, repo.getDownloadFilename()))
                     .setCancelable(true)
                     .setPositiveButton(R.string.install, (d, i) ->
-                        new ProcessRepoZip((Activity) context, repo.getZipUrl(),
-                                Utils.getLegalFilename(filename), true).exec()
+                        new ProcessRepoZip((BaseActivity) context, repo, true).exec()
                     )
                     .setNeutralButton(R.string.download, (d, i) ->
-                        new ProcessRepoZip((Activity) context, repo.getZipUrl(),
-                                Utils.getLegalFilename(filename), false).exec())
+                        new ProcessRepoZip((BaseActivity) context, repo, false).exec())
                     .setNegativeButton(R.string.no_thanks, null)
                     .show();
         });
@@ -169,7 +169,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
 
         SectionHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ReposAdapter$SectionHolder_ViewBinding(this, itemView);
         }
     }
 
@@ -185,7 +185,7 @@ public class ReposAdapter extends SectionedAdapter<ReposAdapter.SectionHolder, R
 
         RepoHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new ReposAdapter$RepoHolder_ViewBinding(this, itemView);
         }
 
     }

app/src/full/java/com/topjohnwu/magisk/adapters/SectionedAdapter.java

@@ -1,8 +1,9 @@
 package com.topjohnwu.magisk.adapters;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C extends RecyclerView.ViewHolder>
         extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 

app/src/full/java/com/topjohnwu/magisk/adapters/SuLogAdapter.java

@@ -1,7 +1,6 @@
 package com.topjohnwu.magisk.adapters;
 
 import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -20,8 +19,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {
 
@@ -124,7 +123,7 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
         SectionHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new SuLogAdapter$SectionHolder_ViewBinding(this, itemView);
         }
     }
 
@@ -142,7 +141,7 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
         LogViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new SuLogAdapter$LogViewHolder_ViewBinding(this, itemView);
             container.expandLayout = expandLayout;
             setupExpandable();
         }

app/src/full/java/com/topjohnwu/magisk/adapters/TabFragmentAdapter.java

@@ -1,13 +1,13 @@
 package com.topjohnwu.magisk.adapters;
 
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
+
 public class TabFragmentAdapter extends FragmentPagerAdapter {
 
     private List<Fragment> fragmentList;

app/src/full/java/com/topjohnwu/magisk/asyncs/CheckSafetyNet.java

@@ -2,9 +2,9 @@ package com.topjohnwu.magisk.asyncs;
 
 import android.app.Activity;
 
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.utils.ISafetyNetHelper;
+import com.topjohnwu.magisk.utils.Topic;
 import com.topjohnwu.magisk.utils.WebService;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
@@ -19,10 +19,10 @@ import java.net.HttpURLConnection;
 
 import dalvik.system.DexClassLoader;
 
-public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
+public class CheckSafetyNet extends ParallelTask<Void, Void, Void> {
 
     public static final File dexPath =
-            new File(MagiskManager.get().getFilesDir().getParent() + "/snet", "snet.apk");
+            new File(Data.MM().getFilesDir().getParent() + "/snet", "snet.apk");
     private ISafetyNetHelper helper;
 
     public CheckSafetyNet(Activity activity) {
@@ -30,9 +30,9 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
     }
 
     private void dlSnet() throws Exception {
-        Shell.Sync.sh("rm -rf " + dexPath.getParent());
+        Shell.sh("rm -rf " + dexPath.getParent()).exec();
         dexPath.getParentFile().mkdir();
-        HttpURLConnection conn = WebService.request(Const.Url.SNET_URL, null);
+        HttpURLConnection conn = WebService.mustRequest(Data.snetLink, null);
         try (
                 OutputStream out = new BufferedOutputStream(new FileOutputStream(dexPath));
                 InputStream in = new BufferedInputStream(conn.getInputStream())) {
@@ -45,17 +45,19 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
     private void dyload() throws Exception {
         DexClassLoader loader = new DexClassLoader(dexPath.getPath(), dexPath.getParent(),
                 null, ISafetyNetHelper.class.getClassLoader());
-        Class<?> clazz = loader.loadClass("com.topjohnwu.snet.SafetyNetHelper");
-        helper = (ISafetyNetHelper) clazz.getConstructors()[0]
-                .newInstance(getActivity(), (ISafetyNetHelper.Callback)
-                        code -> MagiskManager.get().safetyNetDone.publish(false, code));
-        if (helper.getVersion() != Const.SNET_VER) {
+        Class<?> clazz = loader.loadClass("com.topjohnwu.snet.Snet");
+        helper = (ISafetyNetHelper) clazz.getMethod("newHelper",
+                Class.class, String.class, Activity.class, Object.class)
+                .invoke(null, ISafetyNetHelper.class, dexPath.getPath(), getActivity(),
+                        (ISafetyNetHelper.Callback) code ->
+                                Topic.publish(false, Topic.SNET_CHECK_DONE, code));
+        if (helper.getVersion() < Data.snetVersionCode) {
             throw new Exception();
         }
     }
 
     @Override
-    protected Exception doInBackground(Void... voids) {
+    protected Void doInBackground(Void... voids) {
         try {
             try {
                 dyload();
@@ -64,21 +66,12 @@ public class CheckSafetyNet extends ParallelTask<Void, Void, Exception> {
                 dlSnet();
                 dyload();
             }
+            // Run attestation
+            helper.attest();
         } catch (Exception e) {
-            return e;
+            e.printStackTrace();
+            Topic.publish(false, Topic.SNET_CHECK_DONE, -1);
         }
-
         return null;
     }
-
-    @Override
-    protected void onPostExecute(Exception e) {
-        if (e == null) {
-            helper.attest();
-        } else {
-            e.printStackTrace();
-            MagiskManager.get().safetyNetDone.publish(false, -1);
-        }
-        super.onPostExecute(e);
-    }
 }

app/src/full/java/com/topjohnwu/magisk/asyncs/CheckUpdates.java

@@ -0,0 +1,105 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.os.AsyncTask;
+
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.utils.NotificationMgr;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.WebService;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class CheckUpdates {
+
+    private static int getInt(JSONObject json, String name, int defValue) {
+        if (json == null)
+            return defValue;
+        try {
+            return json.getInt(name);
+        } catch (JSONException e) {
+            return defValue;
+        }
+    }
+
+    private static String getString(JSONObject json, String name, String defValue) {
+        if (json == null)
+            return defValue;
+        try {
+            return json.getString(name);
+        } catch (JSONException e) {
+            return defValue;
+        }
+    }
+
+    private static JSONObject getJson(JSONObject json, String name) {
+        try {
+            return json.getJSONObject(name);
+        } catch (JSONException e) {
+            return null;
+        }
+    }
+
+    public static void fetchUpdates() {
+        String jsonStr = "";
+        switch (Data.updateChannel) {
+            case Const.Value.STABLE_CHANNEL:
+                jsonStr = WebService.getString(Const.Url.STABLE_URL);
+                break;
+            case Const.Value.BETA_CHANNEL:
+                jsonStr = WebService.getString(Const.Url.BETA_URL);
+                break;
+            case Const.Value.CUSTOM_CHANNEL:
+                jsonStr = WebService.getString(Data.MM().prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
+                break;
+        }
+
+        JSONObject json;
+        try {
+            json = new JSONObject(jsonStr);
+        } catch (JSONException e) {
+            return;
+        }
+
+        JSONObject magisk = getJson(json, "magisk");
+        Data.remoteMagiskVersionString = getString(magisk, "version", null);
+        Data.remoteMagiskVersionCode = getInt(magisk, "versionCode", -1);
+        Data.magiskLink = getString(magisk, "link", null);
+        Data.magiskNoteLink = getString(magisk, "note", null);
+        Data.magiskMD5 = getString(magisk, "md5", null);
+
+        JSONObject manager = getJson(json, "app");
+        Data.remoteManagerVersionString = getString(manager, "version", null);
+        Data.remoteManagerVersionCode = getInt(manager, "versionCode", -1);
+        Data.managerLink = getString(manager, "link", null);
+        Data.managerNoteLink = getString(manager, "note", null);
+
+        JSONObject uninstaller = getJson(json, "uninstaller");
+        Data.uninstallerLink = getString(uninstaller, "link", null);
+
+        JSONObject snet = getJson(json, "snet");
+        Data.snetVersionCode = getInt(snet, "versionCode", -1);
+        Data.snetLink = getString(snet, "link", null);
+    }
+
+    public static void check(Runnable cb) {
+        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+            fetchUpdates();
+            if (cb != null) {
+                if (BuildConfig.VERSION_CODE < Data.remoteManagerVersionCode) {
+                    NotificationMgr.managerUpdate();
+                } else if (Data.magiskVersionCode < Data.remoteMagiskVersionCode) {
+                    NotificationMgr.magiskUpdate();
+                }
+                cb.run();
+            }
+            Topic.publish(Topic.UPDATE_CHECK_DONE);
+        });
+    }
+
+    public static void check() {
+        check(null);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/asyncs/FlashZip.java

@@ -2,13 +2,13 @@ package com.topjohnwu.magisk.asyncs;
 
 import android.app.Activity;
 import android.net.Uri;
-import android.text.TextUtils;
 import android.view.View;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.ZipUtils;
 import com.topjohnwu.superuser.Shell;
@@ -45,7 +45,7 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
 
     @Override
     protected Integer doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
+        MagiskManager mm = Data.MM();
         try {
             console.add("- Copying zip to temp directory");
 
@@ -66,12 +66,10 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
             }
             if (!unzipAndCheck()) return 0;
             console.add("- Installing " + Utils.getNameFromUri(mm, mUri));
-            Shell.Sync.su(console, logs,
-                    "cd " + mCachedFile.getParent(),
-                    "BOOTMODE=true sh update-binary dummy 1 " + mCachedFile + " || echo 'Failed!'"
-            );
-
-            if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
+            if (!Shell.su("cd " + mCachedFile.getParent(),
+                    "BOOTMODE=true sh update-binary dummy 1 " + mCachedFile)
+                    .to(console, logs)
+                    .exec().isSuccess())
                 return -1;
 
         } catch (Exception e) {
@@ -86,10 +84,7 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
     @Override
     protected void onPostExecute(Integer result) {
         FlashActivity activity = (FlashActivity) getActivity();
-        Shell.Async.su(
-                "rm -rf " + mCachedFile.getParent(),
-                "rm -rf " + Const.TMP_FOLDER_PATH
-        );
+        Shell.su("rm -rf " + mCachedFile.getParent(), "rm -rf " + Const.TMP_FOLDER_PATH).submit();
         switch (result) {
             case -1:
                 console.add("! Installation failed");
@@ -99,8 +94,8 @@ public class FlashZip extends ParallelTask<Void, Void, Integer> {
                 console.add("! This zip is not a Magisk Module!");
                 break;
             case 1:
-                // Success
-                new LoadModules().exec();
+                // Reload modules
+                Utils.loadModules();
                 break;
         }
         activity.reboot.setVisibility(result > 0 ? View.VISIBLE : View.GONE);

app/src/full/java/com/topjohnwu/magisk/asyncs/InstallMagisk.java

@@ -8,16 +8,22 @@ import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.FlashActivity;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.TarEntry;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.WebService;
 import com.topjohnwu.magisk.utils.ZipUtils;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.internal.NOPList;
+import com.topjohnwu.superuser.io.SuFile;
 import com.topjohnwu.superuser.io.SuFileInputStream;
+import com.topjohnwu.superuser.io.SuFileOutputStream;
 import com.topjohnwu.utils.SignBoot;
 
 import org.kamranzafar.jtar.TarInputStream;
@@ -26,15 +32,19 @@ import org.kamranzafar.jtar.TarOutputStream;
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
+import java.io.FilterInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
-import java.util.AbstractList;
+import java.net.HttpURLConnection;
 import java.util.Arrays;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
 
     private static final int PATCH_MODE = 0;
@@ -42,7 +52,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     private static final int FIX_ENV_MODE = 2;
     public static final int SECOND_SLOT_MODE = 3;
 
-    private Uri bootUri, mZip;
+    private Uri bootUri;
     private List<String> console, logs;
     private String mBoot;
     private int mode;
@@ -50,22 +60,21 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     private ProgressDialog dialog;
     private MagiskManager mm;
 
-    public InstallMagisk(Activity context, Uri zip) {
+    public InstallMagisk(Activity context) {
         super(context);
-        mZip = zip;
-        mm = MagiskManager.get();
+        mm = Data.MM();
         mode = FIX_ENV_MODE;
     }
 
-    public InstallMagisk(Activity context, List<String> console, List<String> logs, Uri zip, int mode) {
-        this(context, zip);
+    public InstallMagisk(Activity context, List<String> console, List<String> logs, int mode) {
+        this(context);
         this.console = console;
         this.logs = logs;
         this.mode = mode;
     }
 
-    public InstallMagisk(FlashActivity context, List<String> console, List<String> logs, Uri zip, Uri boot) {
-        this(context, console, logs, zip, PATCH_MODE);
+    public InstallMagisk(FlashActivity context, List<String> console, List<String> logs, Uri boot) {
+        this(context, console, logs, PATCH_MODE);
         bootUri = boot;
     }
 
@@ -74,37 +83,92 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
         if (mode == FIX_ENV_MODE) {
             Activity a = getActivity();
             dialog = ProgressDialog.show(a, a.getString(R.string.setup_title), a.getString(R.string.setup_msg));
-            console = new NOPList<>();
+            console = NOPList.getInstance();
+        }
+    }
+
+    private class ProgressStream extends FilterInputStream {
+
+        private int prev = -1;
+        private int progress = 0;
+        private int total;
+
+        private ProgressStream(HttpURLConnection conn) throws IOException {
+            super(conn.getInputStream());
+            total = conn.getContentLength();
+            console.add("... 0%");
+        }
+
+        private void update(int step) {
+            progress += step;
+            int curr = (int) (100 * (double) progress / total);
+            if (prev != curr) {
+                prev = curr;
+                console.set(console.size() - 1, "... " + prev + "%");
+            }
+        }
+
+        @Override
+        public int read() throws IOException {
+            int b = super.read();
+            if (b > 0)
+                update(1);
+            return b;
+        }
+
+        @Override
+        public int read(@NonNull byte[] b) throws IOException {
+            return read(b, 0, b.length);
+        }
+
+        @Override
+        public int read(@NonNull byte[] b, int off, int len) throws IOException {
+            int step = super.read(b, off, len);
+            if (step > 0)
+                update(step);
+            return step;
         }
     }
 
     private void extractFiles(String arch) throws IOException {
+        File zip = new File(mm.getFilesDir(), "magisk.zip");
+        BufferedInputStream buf;
+
+        if (!ShellUtils.checkSum("MD5", zip, Data.magiskMD5)) {
+            console.add("- Downloading zip");
+            HttpURLConnection conn = WebService.mustRequest(Data.magiskLink, null);
+            buf = new BufferedInputStream(new ProgressStream(conn), conn.getContentLength());
+            buf.mark(conn.getContentLength() + 1);
+            try (OutputStream out = new FileOutputStream(zip)) {
+                ShellUtils.pump(buf, out);
+            }
+            buf.reset();
+            conn.disconnect();
+        } else {
+            console.add("- Existing zip found");
+            buf = new BufferedInputStream(new FileInputStream(zip), (int) zip.length());
+            buf.mark((int) zip.length() + 1);
+        }
+
         console.add("- Extracting files");
-        try (InputStream in = mm.getContentResolver().openInputStream(mZip)) {
-            if (in == null) throw new FileNotFoundException();
-            BufferedInputStream buf = new BufferedInputStream(in);
-            buf.mark(Integer.MAX_VALUE);
-            ZipUtils.unzip(buf, installDir, arch + "/", true);
-            buf.reset();
-            ZipUtils.unzip(buf, installDir, "common/", true);
-            buf.reset();
-            ZipUtils.unzip(buf, installDir, "chromeos/", false);
-            buf.reset();
-            ZipUtils.unzip(buf, installDir, "META-INF/com/google/android/update-binary", true);
-            buf.close();
-        } catch (FileNotFoundException e) {
-            console.add("! Invalid Uri");
-            throw e;
+        try (InputStream in = buf) {
+            ZipUtils.unzip(in, installDir, arch + "/", true);
+            in.reset();
+            ZipUtils.unzip(in, installDir, "common/", true);
+            in.reset();
+            ZipUtils.unzip(in, installDir, "chromeos/", false);
+            in.reset();
+            ZipUtils.unzip(in, installDir, "META-INF/com/google/android/update-binary", true);
         } catch (IOException e) {
             console.add("! Cannot unzip zip");
             throw e;
         }
-        Shell.Sync.sh(Utils.fmt("chmod -R 755 %s/*; %s/magiskinit -x magisk %s/magisk",
-                installDir, installDir, installDir));
+        Shell.sh(Utils.fmt("chmod -R 755 %s/*; %s/magiskinit -x magisk %s/magisk",
+                installDir, installDir, installDir)).exec();
     }
 
     private boolean dumpBoot() {
-        console.add("- Copying image locally");
+        console.add("- Copying image to cache");
         // Copy boot image to local
         try (InputStream in = mm.getContentResolver().openInputStream(bootUri);
              OutputStream out = new FileOutputStream(mBoot)
@@ -150,16 +214,13 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
         }
 
         // Patch boot image
-        Shell.Sync.sh(console, logs,
-                "cd " + installDir,
-                Utils.fmt("KEEPFORCEENCRYPT=%b KEEPVERITY=%b sh update-binary indep " +
-                                "boot_patch.sh %s || echo 'Failed!'",
-                        mm.keepEnc, mm.keepVerity, mBoot));
-
-        if (TextUtils.equals(console.get(console.size() - 1), "Failed!"))
+        if (!Shell.sh("cd " + installDir, Utils.fmt(
+                "KEEPFORCEENCRYPT=%b KEEPVERITY=%b sh update-binary indep boot_patch.sh %s",
+                Data.keepEnc, Data.keepVerity, mBoot))
+                .to(console, logs).exec().isSuccess())
             return null;
 
-        Shell.Sync.sh("mv bin/busybox busybox",
+        Shell.Job job = Shell.sh("mv bin/busybox busybox",
                 "rm -rf magisk.apk bin boot.img update-binary",
                 "cd /");
 
@@ -172,18 +233,20 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
             ) {
                 SignBoot.doSignature("/boot", in, out, null, null);
             }
-            Shell.Sync.su("mv -f " + signed + " " + patched);
+            job.add("mv -f " + signed + " " + patched);
         }
+        job.exec();
         return patched;
     }
 
-    private void outputBoot(File patched) throws IOException {
+    private boolean outputBoot(File patched) throws IOException {
         switch (mode) {
             case PATCH_MODE:
-                File dest = new File(Const.EXTERNAL_PATH, "patched_boot" + mm.bootFormat);
+                String fmt = mm.prefs.getString(Const.Key.BOOT_FORMAT, ".img");
+                File dest = new File(Download.EXTERNAL_PATH, "patched_boot" + fmt);
                 dest.getParentFile().mkdirs();
                 OutputStream out;
-                switch (mm.bootFormat) {
+                switch (fmt) {
                     case ".img.tar":
                         out = new TarOutputStream(new BufferedOutputStream(new FileOutputStream(dest)));
                         ((TarOutputStream) out).putNextEntry(new TarEntry(patched, "boot.img"));
@@ -197,7 +260,7 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                     ShellUtils.pump(in, out);
                     out.close();
                 }
-                Shell.Sync.su("rm -f " + patched);
+                Shell.sh("rm -f " + patched).exec();
                 console.add("");
                 console.add("****************************");
                 console.add(" Patched image is placed in ");
@@ -206,26 +269,42 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                 break;
             case SECOND_SLOT_MODE:
             case DIRECT_MODE:
-                Shell.Sync.sh(console, logs,
-                        Utils.fmt("direct_install %s %s %s", patched, mBoot, installDir));
-                if (!mm.keepVerity)
-                    Shell.Sync.sh(console, logs, "find_dtbo_image", "patch_dtbo_image");
+                if (!Shell.su(Utils.fmt("direct_install %s %s", installDir, mBoot))
+                        .to(console, logs).exec().isSuccess())
+                    return false;
+                if (!Data.keepVerity)
+                    Shell.su("find_dtbo_image", "patch_dtbo_image").to(console, logs).exec();
                 break;
         }
+        return true;
+    }
+
+    private void postOTA() {
+        SuFile bootctl = new SuFile(Const.MAGISK_PATH + "/.core/bootctl");
+        try (InputStream in = mm.getResources().openRawResource(R.raw.bootctl);
+             OutputStream out = new SuFileOutputStream(bootctl)) {
+            ShellUtils.pump(in, out);
+            Shell.su("post_ota " + bootctl.getParent()).exec();
+            console.add("***************************************");
+            console.add(" Next reboot will boot to second slot!");
+            console.add("***************************************");
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 
     @Override
     protected Boolean doInBackground(Void... voids) {
         if (mode == FIX_ENV_MODE) {
             installDir = new File("/data/adb/magisk");
-            Shell.Sync.sh("rm -rf /data/adb/magisk/*");
+            Shell.su("rm -rf /data/adb/magisk/*").exec();
         } else {
             installDir = new File(
                     (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ?
                             mm.createDeviceProtectedStorageContext() : mm)
                             .getFilesDir().getParent()
                     , "install");
-            Shell.Sync.sh("rm -rf " + installDir);
+            Shell.sh("rm -rf " + installDir).exec();
             installDir.mkdirs();
         }
 
@@ -240,13 +319,16 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
                 mBoot = ShellUtils.fastCmd("find_boot_image", "echo \"$BOOTIMAGE\"");
                 break;
             case SECOND_SLOT_MODE:
+                String slot = ShellUtils.fastCmd("echo $SLOT");
+                String target = (TextUtils.equals(slot, "_a") ? "_b" : "_a");
+                console.add("- Target slot: " + target);
                 console.add("- Detecting target image");
-                char slot[] = ShellUtils.fastCmd("echo $SLOT").toCharArray();
-                if (slot[1] == 'a') slot[1] = 'b';
-                else slot[1] = 'a';
-                mBoot = ShellUtils.fastCmd("SLOT=" + String.valueOf(slot),
-                        "find_boot_image", "echo \"$BOOTIMAGE\"");
-                Shell.Async.su("mount_partitions");
+                mBoot = ShellUtils.fastCmd(
+                        "SLOT=" + target,
+                        "find_boot_image",
+                        "SLOT=" + slot,
+                        "echo \"$BOOTIMAGE\""
+                );
                 break;
             case FIX_ENV_MODE:
                 mBoot = "";
@@ -257,12 +339,13 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
             return false;
         }
 
-        console.add("- Target image: " + mBoot);
+        if (mode == DIRECT_MODE || mode == SECOND_SLOT_MODE)
+            console.add("- Target image: " + mBoot);
 
         List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
         String arch;
 
-        if (mm.remoteMagiskVersionCode >= Const.MAGISK_VER.SEPOL_REFACTOR) {
+        if (Data.remoteMagiskVersionCode >= Const.MAGISK_VER.SEPOL_REFACTOR) {
             // 32-bit only
             if (abis.contains("x86")) arch = "x86";
             else arch = "arm";
@@ -278,12 +361,15 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
         try {
             extractFiles(arch);
             if (mode == FIX_ENV_MODE) {
-                Shell.Sync.sh("fix_env");
+                Shell.su("fix_env").exec();
             } else {
                 File patched = patchBoot();
                 if (patched == null)
                     return false;
-                outputBoot(patched);
+                if (!outputBoot(patched))
+                    return false;
+                if (mode == SECOND_SLOT_MODE)
+                    postOTA();
                 console.add("- All done!");
             }
         } catch (Exception e) {
@@ -297,31 +383,16 @@ public class InstallMagisk extends ParallelTask<Void, Void, Boolean> {
     protected void onPostExecute(Boolean result) {
         if (mode == FIX_ENV_MODE) {
             dialog.dismiss();
-            MagiskManager.toast(result ? R.string.setup_done : R.string.setup_fail, Toast.LENGTH_LONG);
+            Utils.toast(result ? R.string.setup_done : R.string.setup_fail, Toast.LENGTH_LONG);
         } else {
             // Running in FlashActivity
             FlashActivity activity = (FlashActivity) getActivity();
             if (!result) {
-                Shell.Async.sh("rm -rf " + installDir);
+                Shell.sh("rm -rf " + installDir).submit();
                 console.add("! Installation failed");
                 activity.reboot.setVisibility(View.GONE);
             }
             activity.buttonPanel.setVisibility(View.VISIBLE);
         }
     }
-
-    private static class NOPList<E> extends AbstractList<E> {
-        @Override
-        public E get(int index) {
-            return null;
-        }
-
-        @Override
-        public int size() {
-            return 0;
-        }
-
-        @Override
-        public void add(int index, E element) {}
-    }
 }

app/src/full/java/com/topjohnwu/magisk/asyncs/MarkDownWindow.java

@@ -1,9 +1,9 @@
 package com.topjohnwu.magisk.asyncs;
 
 import android.app.Activity;
-import android.support.v7.app.AlertDialog;
 import android.webkit.WebView;
 
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.WebService;
@@ -17,6 +17,8 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 
+import androidx.appcompat.app.AlertDialog;
+
 public class MarkDownWindow extends ParallelTask<Void, Void, String> {
 
     private String mTitle;
@@ -38,7 +40,7 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
 
     @Override
     protected String doInBackground(Void... voids) {
-        MagiskManager mm = MagiskManager.get();
+        MagiskManager mm = Data.MM();
         String md;
         if (mUrl != null) {
             md = WebService.getString(mUrl);
@@ -54,9 +56,9 @@ public class MarkDownWindow extends ParallelTask<Void, Void, String> {
         }
         String css;
         try (
-            InputStream in = mm.getResources().openRawResource(
-                    mm.isDarkTheme ? R.raw.dark : R.raw.light);
-            ByteArrayOutputStream out = new ByteArrayOutputStream()
+                InputStream in = mm.getResources().openRawResource(
+                    Data.isDarkTheme ? R.raw.dark : R.raw.light);
+                ByteArrayOutputStream out = new ByteArrayOutputStream()
         ) {
             ShellUtils.pump(in, out);
             css = out.toString();

app/src/full/java/com/topjohnwu/magisk/asyncs/ParallelTask.java

@@ -9,8 +9,6 @@ public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<P
 
     private WeakReference<Activity> weakActivity;
 
-    private Runnable callback = null;
-
     public ParallelTask() {}
 
     public ParallelTask(Activity context) {
@@ -22,18 +20,7 @@ public abstract class ParallelTask<Params, Progress, Result> extends AsyncTask<P
     }
 
     @SuppressWarnings("unchecked")
-    public ParallelTask<Params, Progress, Result> exec(Params... params) {
+    public void exec(Params... params) {
         executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR, params);
-        return this;
-    }
-
-    @Override
-    protected void onPostExecute(Result result) {
-        if (callback != null) callback.run();
-    }
-
-    public ParallelTask<Params, Progress, Result> setCallBack(Runnable next) {
-        callback = next;
-        return this;
     }
 }

app/src/full/java/com/topjohnwu/magisk/asyncs/PatchAPK.java

@@ -0,0 +1,154 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.os.AsyncTask;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileOutputStream;
+import com.topjohnwu.utils.JarMap;
+import com.topjohnwu.utils.SignAPK;
+
+import java.security.SecureRandom;
+import java.util.jar.JarEntry;
+
+public class PatchAPK {
+
+    private static String genPackageName(String prefix, int length) {
+        StringBuilder builder = new StringBuilder(length);
+        builder.append(prefix);
+        length -= prefix.length();
+        SecureRandom random = new SecureRandom();
+        String base = "abcdefghijklmnopqrstuvwxyz";
+        String alpha = base + base.toUpperCase();
+        String full = alpha + "0123456789..........";
+        char next, prev = '\0';
+        for (int i = 0; i < length; ++i) {
+            if (prev == '.' || i == length - 1 || i == 0) {
+                next = alpha.charAt(random.nextInt(alpha.length()));
+            } else {
+                next = full.charAt(random.nextInt(full.length()));
+            }
+            builder.append(next);
+            prev = next;
+        }
+        return builder.toString();
+    }
+
+    private static int findOffset(byte buf[], byte pattern[]) {
+        int offset = -1;
+        for (int i = 0; i < buf.length - pattern.length; ++i) {
+            boolean match = true;
+            for (int j = 0; j < pattern.length; ++j) {
+                if (buf[i + j] != pattern[j]) {
+                    match = false;
+                    break;
+                }
+            }
+            if (match) {
+                offset = i;
+                break;
+            }
+        }
+        return offset;
+    }
+
+    /* It seems that AAPT sometimes generate another type of string format */
+    private static boolean fallbackPatch(byte xml[], String from, String to) {
+
+        byte[] target = new byte[from.length() * 2 + 2];
+        for (int i = 0; i < from.length(); ++i) {
+            target[i * 2] = (byte) from.charAt(i);
+        }
+        int offset = findOffset(xml, target);
+        if (offset < 0)
+            return false;
+        byte[] dest = new byte[target.length - 2];
+        for (int i = 0; i < to.length(); ++i) {
+            dest[i * 2] = (byte) to.charAt(i);
+        }
+        System.arraycopy(dest, 0, xml, offset, dest.length);
+        return true;
+    }
+
+    private static boolean findAndPatch(byte xml[], String from, String to) {
+        byte target[] = (from + '\0').getBytes();
+        int offset = findOffset(xml, target);
+        if (offset < 0)
+            return fallbackPatch(xml, from, to);
+        System.arraycopy(to.getBytes(), 0, xml, offset, to.length());
+        return true;
+    }
+
+    private static boolean patchAndHide() {
+        MagiskManager mm = Data.MM();
+
+        // Generate a new app with random package name
+        SuFile repack = new SuFile("/data/local/tmp/repack.apk");
+        String pkg = genPackageName("com.", Const.ORIG_PKG_NAME.length());
+
+        try {
+            JarMap apk = new JarMap(mm.getPackageCodePath());
+            if (!patchPackageID(apk, Const.ORIG_PKG_NAME, pkg))
+                return false;
+            SignAPK.sign(apk, new SuFileOutputStream(repack));
+        } catch (Exception e) {
+            return false;
+        }
+
+        // Install the application
+        if (!ShellUtils.fastCmdResult("pm install " + repack))
+            return false;
+
+        repack.delete();
+
+        mm.mDB.setStrings(Const.Key.SU_MANAGER, pkg);
+        mm.mDB.flush();
+        Data.exportPrefs();
+        RootUtils.uninstallPkg(Const.ORIG_PKG_NAME);
+
+        return true;
+    }
+
+    public static boolean patchPackageID(JarMap apk, String from, String to) {
+        try {
+            JarEntry je = apk.getJarEntry(Const.ANDROID_MANIFEST);
+            byte xml[] = apk.getRawData(je);
+
+            if (!findAndPatch(xml, from, to))
+                return false;
+            if (!findAndPatch(xml, from + ".provider", to + ".provider"))
+                return false;
+
+            // Write in changes
+            apk.getOutputStream(je).write(xml);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    public static void hideManager(Activity activity) {
+        ProgressDialog dialog = ProgressDialog.show(activity,
+                activity.getString(R.string.hide_manager_toast),
+                activity.getString(R.string.hide_manager_toast2));
+        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+            boolean b = patchAndHide();
+            Data.mainHandler.post(() -> {
+                dialog.cancel();
+                if (!b) {
+                    Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
+                }
+            });
+        });
+    }
+}

app/src/full/java/com/topjohnwu/magisk/asyncs/ProcessRepoZip.java

@@ -1,19 +1,20 @@
 package com.topjohnwu.magisk.asyncs;
 
 import android.Manifest;
-import android.app.Activity;
 import android.app.ProgressDialog;
 import android.content.Intent;
 import android.net.Uri;
-import android.os.Handler;
-import android.support.annotation.NonNull;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.FlashActivity;
-import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.BaseActivity;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.utils.Download;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;
 import com.topjohnwu.magisk.utils.ZipUtils;
 import com.topjohnwu.superuser.Shell;
@@ -33,21 +34,21 @@ import java.util.jar.JarEntry;
 import java.util.jar.JarInputStream;
 import java.util.jar.JarOutputStream;
 
+import androidx.annotation.NonNull;
+
 public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
 
     private ProgressDialog progressDialog;
     private boolean mInstall;
-    private String mLink;
     private File mFile;
+    private Repo mRepo;
     private int progress = 0, total = -1;
-    private Handler mHandler;
 
-    public ProcessRepoZip(Activity context, String link, String filename, boolean install) {
+    public ProcessRepoZip(BaseActivity context, Repo repo, boolean install) {
         super(context);
-        mLink = link;
-        mFile = new File(Const.EXTERNAL_PATH, filename);
-        mInstall = install;
-        mHandler = new Handler();
+        mRepo = repo;
+        mInstall = install && Shell.rootAccess();
+        mFile = new File(Download.EXTERNAL_PATH, repo.getDownloadFilename());
     }
 
     private void removeTopFolder(File input, File output) throws IOException {
@@ -74,28 +75,26 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
         }
     }
 
+    @Override
+    protected BaseActivity getActivity() {
+        return (BaseActivity) super.getActivity();
+    }
+
     @Override
     protected void onPreExecute() {
-        Activity activity = getActivity();
+        BaseActivity activity = getActivity();
         mFile.getParentFile().mkdirs();
         progressDialog = ProgressDialog.show(activity, activity.getString(R.string.zip_download_title), activity.getString(R.string.zip_download_msg, 0));
     }
 
     @Override
     protected Boolean doInBackground(Void... params) {
-        Activity activity = getActivity();
+        BaseActivity activity = getActivity();
         if (activity == null) return null;
         try {
             // Request zip from Internet
-            HttpURLConnection conn;
-            do {
-                conn = WebService.request(mLink, null);
-                total = conn.getContentLength();
-                if (total < 0)
-                    conn.disconnect();
-                else
-                    break;
-            } while (true);
+            HttpURLConnection conn = WebService.mustRequest(mRepo.getZipUrl(), null);
+            total = conn.getContentLength();
 
             // Temp files
             File temp1 = new File(activity.getCacheDir(), "1.zip");
@@ -112,7 +111,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
             }
             conn.disconnect();
 
-            mHandler.post(() -> {
+            Data.mainHandler.post(() -> {
                 progressDialog.setTitle(R.string.zip_process_title);
                 progressDialog.setMessage(getActivity().getString(R.string.zip_process_msg));
             });
@@ -136,30 +135,28 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
 
     @Override
     protected void onPostExecute(Boolean result) {
-        Activity activity = getActivity();
+        BaseActivity activity = getActivity();
         if (activity == null) return;
         progressDialog.dismiss();
         if (result) {
             Uri uri = Uri.fromFile(mFile);
-            if (Shell.rootAccess() && mInstall) {
-                Intent intent = new Intent(activity, FlashActivity.class);
+            if (mInstall) {
+                Intent intent = new Intent(activity, Data.classMap.get(FlashActivity.class));
                 intent.setData(uri).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
                 activity.startActivity(intent);
             } else {
                 SnackbarMaker.showUri(activity, uri);
             }
         } else {
-            MagiskManager.toast(R.string.process_error, Toast.LENGTH_LONG);
+            Utils.toast(R.string.process_error, Toast.LENGTH_LONG);
         }
         super.onPostExecute(result);
     }
 
     @Override
-    public ParallelTask<Void, Object, Boolean> exec(Void... voids) {
-        com.topjohnwu.magisk.components.Activity.runWithPermission(
-                getActivity(), new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE },
-                () -> super.exec(voids));
-        return this;
+    public void exec(Void... voids) {
+        getActivity().runWithPermission(
+                new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, super::exec);
     }
 
     private class ProgressInputStream extends FilterInputStream {
@@ -170,14 +167,15 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
 
         private void updateDlProgress(int step) {
             progress += step;
-            progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg, (int) (100 * (double) progress / total + 0.5)));
+            progressDialog.setMessage(getActivity().getString(R.string.zip_download_msg,
+                    (int) (100 * (double) progress / total + 0.5)));
         }
 
         @Override
         public synchronized int read() throws IOException {
             int b = super.read();
             if (b > 0) {
-                mHandler.post(() -> updateDlProgress(1));
+                Data.mainHandler.post(() -> updateDlProgress(1));
             }
             return b;
         }
@@ -191,7 +189,7 @@ public class ProcessRepoZip extends ParallelTask<Void, Object, Boolean> {
         public synchronized int read(@NonNull byte[] b, int off, int len) throws IOException {
             int read = super.read(b, off, len);
             if (read > 0) {
-                mHandler.post(() -> updateDlProgress(read));
+                Data.mainHandler.post(() -> updateDlProgress(read));
             }
             return read;
         }

app/src/full/java/com/topjohnwu/magisk/asyncs/UpdateRepos.java

@@ -0,0 +1,159 @@
+package com.topjohnwu.magisk.asyncs;
+
+import android.database.Cursor;
+import android.os.AsyncTask;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.container.Repo;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.WebService;
+
+import org.json.JSONArray;
+import org.json.JSONException;
+import org.json.JSONObject;
+
+import java.net.HttpURLConnection;
+import java.text.DateFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.TimeUnit;
+
+public class UpdateRepos {
+
+    private static final int CPU_COUNT = Runtime.getRuntime().availableProcessors();
+    private static final int CORE_POOL_SIZE = Math.max(2, CPU_COUNT - 1);
+    private static final DateFormat dateFormat;
+
+    static {
+        dateFormat = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+        dateFormat.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    private MagiskManager mm;
+    private Set<String> cached;
+    private ExecutorService threadPool;
+
+    public UpdateRepos() {
+        mm = Data.MM();
+    }
+
+    private void waitTasks() {
+        threadPool.shutdown();
+        try {
+            threadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException ignored) {}
+    }
+
+    private boolean loadJSON(String jsonString) throws JSONException, ParseException {
+        JSONArray jsonArray = new JSONArray(jsonString);
+
+        // Empty page, halt
+        if (jsonArray.length() == 0)
+            return false;
+
+        for (int i = 0; i < jsonArray.length(); i++) {
+            JSONObject rawRepo = jsonArray.getJSONObject(i);
+            String id = rawRepo.getString("name");
+            Date date = dateFormat.parse(rawRepo.getString("pushed_at"));
+            threadPool.execute(() -> {
+                Repo repo = mm.repoDB.getRepo(id);
+                try {
+                    if (repo == null)
+                        repo = new Repo(id);
+                    else
+                        cached.remove(id);
+                    repo.update(date);
+                    mm.repoDB.addRepo(repo);
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.debug(e.getMessage());
+                    mm.repoDB.removeRepo(id);
+                }
+            });
+        }
+        return true;
+    }
+
+    /* We sort repos by last push, which means that we only need to check whether the
+     * first page is updated to determine whether the online repo database is changed
+     */
+    private boolean loadPage(int page) {
+        Map<String, String> header = new HashMap<>();
+        if (page == 0)
+            header.put(Const.Key.IF_NONE_MATCH, mm.prefs.getString(Const.Key.ETAG_KEY, ""));
+        String url = Utils.fmt(Const.Url.REPO_URL, page + 1);
+
+        try {
+            HttpURLConnection conn = WebService.request(url, header);
+            // No updates
+            if (conn.getResponseCode() == HttpURLConnection.HTTP_NOT_MODIFIED)
+                return false;
+            // Current page is the last page
+            if (!loadJSON(WebService.getString(conn)))
+                return true;
+        } catch (Exception e) {
+            // Should not happen, but if exception occurs, page load fails
+            return false;
+        }
+
+        // Update ETAG
+        if (page == 0) {
+            String etag = header.get(Const.Key.ETAG_KEY);
+            etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
+            mm.prefs.edit().putString(Const.Key.ETAG_KEY, etag).apply();
+        }
+
+        String links = header.get(Const.Key.LINK_KEY);
+        return links == null || !links.contains("next") || loadPage(page + 1);
+    }
+
+    private void fullReload() {
+        Cursor c = mm.repoDB.getRawCursor();
+        while (c.moveToNext()) {
+            Repo repo = new Repo(c);
+            threadPool.execute(() -> {
+                try {
+                    repo.update();
+                    mm.repoDB.addRepo(repo);
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.debug(e.getMessage());
+                    mm.repoDB.removeRepo(repo);
+                }
+            });
+        }
+        waitTasks();
+    }
+
+    public void exec(boolean force) {
+        Topic.reset(Topic.REPO_LOAD_DONE);
+        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+            cached = Collections.synchronizedSet(mm.repoDB.getRepoIDSet());
+            threadPool = Executors.newFixedThreadPool(CORE_POOL_SIZE);
+
+            if (loadPage(0)) {
+                waitTasks();
+                // The leftover cached means they are removed from online repo
+                mm.repoDB.removeRepo(cached);
+            } else if (force) {
+                fullReload();
+            }
+            Topic.publish(Topic.REPO_LOAD_DONE);
+        });
+    }
+
+    public void exec() {
+        exec(false);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/AboutCardRow.java

@@ -28,19 +28,17 @@ import android.widget.TextView;
 
 import com.topjohnwu.magisk.R;
 
+import butterknife.BindView;
+
 /**
  * @author dvdandroid
  */
 public class AboutCardRow extends LinearLayout {
 
-    private final String title;
-    private final Drawable icon;
-
-    private final TextView mTitle;
-    private final TextView mSummary;
-    private final ImageView mIcon;
-
-    private final View mView;
+    @BindView(android.R.id.title) TextView mTitle;
+    @BindView(android.R.id.summary) TextView mSummary;
+    @BindView(android.R.id.icon) ImageView mIcon;
+    @BindView(R.id.container) View mView;
 
     public AboutCardRow(Context context) {
         this(context, null);
@@ -53,37 +51,28 @@ public class AboutCardRow extends LinearLayout {
     public AboutCardRow(Context context, AttributeSet attrs, int defStyleAttr) {
         super(context, attrs, defStyleAttr);
         LayoutInflater.from(context).inflate(R.layout.info_item_row, this);
-        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AboutCardRow, 0, 0);
+        new AboutCardRow_ViewBinding(this, this);
 
+        TypedArray a = context.getTheme().obtainStyledAttributes(attrs, R.styleable.AboutCardRow, 0, 0);
+        String title;
+        Drawable icon;
         try {
             title = a.getString(R.styleable.AboutCardRow_text);
             icon = a.getDrawable(R.styleable.AboutCardRow_icon);
         } finally {
             a.recycle();
         }
-
-        mView = findViewById(R.id.container);
-
-        mTitle = (TextView) findViewById(android.R.id.title);
-        mSummary = (TextView) findViewById(android.R.id.summary);
-        mIcon = (ImageView) findViewById(android.R.id.icon);
-
         mTitle.setText(title);
         mIcon.setImageDrawable(icon);
     }
 
     @Override
     public void setOnClickListener(OnClickListener l) {
-        super.setOnClickListener(l);
-
         mView.setOnClickListener(l);
     }
 
     public void setSummary(String s) {
+        mSummary.setVisibility(VISIBLE);
         mSummary.setText(s);
     }
-
-    public void removeSummary() {
-        mSummary.setVisibility(GONE);
-    }
 }

app/src/full/java/com/topjohnwu/magisk/components/BaseFragment.java

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.components;
+
+import android.content.Intent;
+
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.Topic;
+
+import androidx.fragment.app.Fragment;
+import butterknife.Unbinder;
+
+public class BaseFragment extends Fragment implements Topic.AutoSubscriber {
+
+    public MagiskManager mm;
+    protected Unbinder unbinder = null;
+
+    public BaseFragment() {
+        mm = Data.MM();
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Topic.subscribe(this);
+    }
+
+    @Override
+    public void onPause() {
+        Topic.unsubscribe(this);
+        super.onPause();
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        if (unbinder != null)
+            unbinder.unbind();
+    }
+
+    @Override
+    public void startActivityForResult(Intent intent, int requestCode) {
+        startActivityForResult(intent, requestCode, this::onActivityResult);
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode, BaseActivity.ActivityResultListener listener) {
+        ((BaseActivity) requireActivity()).startActivityForResult(intent, requestCode, listener);
+    }
+
+    public void runWithPermission(String[] permissions, Runnable callback) {
+        ((BaseActivity) requireActivity()).runWithPermission(permissions,callback);
+    }
+
+    @Override
+    public int[] getSubscribedTopics() {
+        return FlavorActivity.EMPTY_INT_ARRAY;
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/CustomAlertDialog.java

@@ -0,0 +1,161 @@
+package com.topjohnwu.magisk.components;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.R;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AlertDialog;
+import butterknife.BindView;
+
+public class CustomAlertDialog extends AlertDialog.Builder {
+
+    private DialogInterface.OnClickListener positiveListener;
+    private DialogInterface.OnClickListener negativeListener;
+    private DialogInterface.OnClickListener neutralListener;
+    private AlertDialog dialog;
+
+    private ViewHolder vh;
+
+    public class ViewHolder {
+        @BindView(R.id.dialog_layout) public LinearLayout dialogLayout;
+        @BindView(R.id.button_panel) public LinearLayout buttons;
+
+        @BindView(R.id.message) public TextView messageView;
+        @BindView(R.id.negative) public Button negative;
+        @BindView(R.id.positive) public Button positive;
+        @BindView(R.id.neutral) public Button neutral;
+
+        ViewHolder(View v) {
+            new CustomAlertDialog$ViewHolder_ViewBinding(this, v);
+            messageView.setVisibility(View.GONE);
+            negative.setVisibility(View.GONE);
+            positive.setVisibility(View.GONE);
+            neutral.setVisibility(View.GONE);
+            buttons.setVisibility(View.GONE);
+        }
+    }
+
+    {
+        View v = LayoutInflater.from(getContext()).inflate(R.layout.alert_dialog, null);
+        vh = new ViewHolder(v);
+        super.setView(v);
+
+    }
+
+    public CustomAlertDialog(@NonNull Activity context) {
+        super(context);
+    }
+
+    public CustomAlertDialog(@NonNull Activity context, @StyleRes int themeResId) {
+        super(context, themeResId);
+    }
+
+    public ViewHolder getViewHolder() {
+        return vh;
+    }
+
+    @Override
+    public CustomAlertDialog setView(int layoutResId) { return this; }
+
+    @Override
+    public CustomAlertDialog setView(View view) { return this; }
+
+    @Override
+    public CustomAlertDialog setMessage(@Nullable CharSequence message) {
+        vh.messageView.setVisibility(View.VISIBLE);
+        vh.messageView.setText(message);
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog setMessage(@StringRes int messageId) {
+        return setMessage(getContext().getString(messageId));
+    }
+
+    @Override
+    public CustomAlertDialog setPositiveButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        vh.buttons.setVisibility(View.VISIBLE);
+        vh.positive.setVisibility(View.VISIBLE);
+        vh.positive.setText(text);
+        positiveListener = listener;
+        vh.positive.setOnClickListener((v) -> {
+            if (positiveListener != null) {
+                positiveListener.onClick(dialog, DialogInterface.BUTTON_POSITIVE);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog setPositiveButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setPositiveButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public CustomAlertDialog setNegativeButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        vh.buttons.setVisibility(View.VISIBLE);
+        vh.negative.setVisibility(View.VISIBLE);
+        vh.negative.setText(text);
+        negativeListener = listener;
+        vh.negative.setOnClickListener((v) -> {
+            if (negativeListener != null) {
+                negativeListener.onClick(dialog, DialogInterface.BUTTON_NEGATIVE);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog setNegativeButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setNegativeButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public CustomAlertDialog setNeutralButton(CharSequence text, DialogInterface.OnClickListener listener) {
+        vh.buttons.setVisibility(View.VISIBLE);
+        vh.neutral.setVisibility(View.VISIBLE);
+        vh.neutral.setText(text);
+        neutralListener = listener;
+        vh.neutral.setOnClickListener((v) -> {
+            if (neutralListener != null) {
+                neutralListener.onClick(dialog, DialogInterface.BUTTON_NEUTRAL);
+            }
+            dialog.dismiss();
+        });
+        return this;
+    }
+
+    @Override
+    public CustomAlertDialog setNeutralButton(@StringRes int textId, DialogInterface.OnClickListener listener) {
+        return setNeutralButton(getContext().getString(textId), listener);
+    }
+
+    @Override
+    public AlertDialog create() {
+        dialog = super.create();
+        return dialog;
+    }
+
+    @Override
+    public AlertDialog show() {
+        create();
+        dialog.show();
+        return dialog;
+    }
+
+    public void dismiss() {
+        dialog.dismiss();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/EnvFixDialog.java

@@ -0,0 +1,20 @@
+package com.topjohnwu.magisk.components;
+
+import android.app.Activity;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.asyncs.InstallMagisk;
+
+import androidx.annotation.NonNull;
+
+public class EnvFixDialog extends CustomAlertDialog {
+
+    public EnvFixDialog(@NonNull Activity activity) {
+        super(activity);
+        setTitle(R.string.env_fix_title);
+        setMessage(R.string.env_fix_msg);
+        setCancelable(true);
+        setPositiveButton(R.string.yes, (d, i) -> new InstallMagisk(activity).exec());
+        setNegativeButton(R.string.no_thanks, null);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/FlavorActivity.java

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.components;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.view.WindowManager;
+
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.Topic;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatActivity;
+
+public abstract class FlavorActivity extends AppCompatActivity implements Topic.AutoSubscriber {
+
+    private ActivityResultListener activityResultListener;
+    static int[] EMPTY_INT_ARRAY = new int[0];
+    public MagiskManager mm;
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        Configuration config = base.getResources().getConfiguration();
+        config.setLocale(LocaleManager.locale);
+        applyOverrideConfiguration(config);
+        mm = Data.MM();
+    }
+
+    @Override
+    public int[] getSubscribedTopics() {
+        return EMPTY_INT_ARRAY;
+    }
+
+    @StyleRes
+    public int getDarkTheme() {
+        return -1;
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        Topic.subscribe(this);
+        if (Data.isDarkTheme && getDarkTheme() != -1) {
+            setTheme(getDarkTheme());
+        }
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onDestroy() {
+        Topic.unsubscribe(this);
+        super.onDestroy();
+    }
+
+    protected void setFloating() {
+        boolean isTablet = getResources().getBoolean(R.bool.isTablet);
+        if (isTablet) {
+            WindowManager.LayoutParams params = getWindow().getAttributes();
+            params.height = getResources().getDimensionPixelSize(R.dimen.floating_height);
+            params.width = getResources().getDimensionPixelSize(R.dimen.floating_width);
+            params.alpha = 1.0f;
+            params.dimAmount = 0.6f;
+            params.flags |= 2;
+            getWindow().setAttributes(params);
+            setFinishOnTouchOutside(true);
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        if (activityResultListener != null)
+            activityResultListener.onActivityResult(requestCode, resultCode, data);
+        activityResultListener = null;
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
+        activityResultListener = listener;
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    public interface ActivityResultListener {
+        void onActivityResult(int requestCode, int resultCode, Intent data);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/InstallMethodDialog.java

@@ -0,0 +1,79 @@
+package com.topjohnwu.magisk.components;
+
+import android.Manifest;
+import android.app.Activity;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.receivers.DownloadReceiver;
+import com.topjohnwu.magisk.utils.Download;
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.util.List;
+
+import androidx.appcompat.app.AlertDialog;
+
+class InstallMethodDialog extends AlertDialog.Builder {
+
+    InstallMethodDialog(BaseActivity activity, List<String> options) {
+        super(activity);
+        setTitle(R.string.select_method);
+        setItems(options.toArray(new String [0]), (dialog, idx) -> {
+            Intent intent;
+            switch (idx) {
+                case 1:
+                    Utils.toast(R.string.boot_file_patch_msg, Toast.LENGTH_LONG);
+                    intent = new Intent(Intent.ACTION_GET_CONTENT).setType("*/*");
+                    activity.runWithPermission(new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, () ->
+                        activity.startActivityForResult(intent, Const.ID.SELECT_BOOT,
+                        (requestCode, resultCode, data) -> {
+                            if (requestCode == Const.ID.SELECT_BOOT &&
+                                    resultCode == Activity.RESULT_OK && data != null) {
+                                Intent i = new Intent(activity, Data.classMap.get(FlashActivity.class))
+                                        .putExtra(Const.Key.FLASH_SET_BOOT, data.getData())
+                                        .putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_BOOT);
+                                activity.startActivity(i);
+                            }
+                        })
+                    );
+
+                    break;
+                case 0:
+                    String filename = Utils.fmt("Magisk-v%s(%d).zip",
+                            Data.remoteMagiskVersionString, Data.remoteMagiskVersionCode);
+                    Download.receive(activity, new DownloadReceiver() {
+                        @Override
+                        public void onDownloadDone(Context context, Uri uri) {
+                            SnackbarMaker.showUri(activity, uri);
+                        }
+                    }, Data.magiskLink, filename);
+                    break;
+                case 2:
+                    intent = new Intent(activity, Data.classMap.get(FlashActivity.class))
+                            .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_MAGISK);
+                    activity.startActivity(intent);
+                    break;
+                case 3:
+                    new CustomAlertDialog(activity)
+                        .setTitle(R.string.warning)
+                        .setMessage(R.string.install_inactive_slot_msg)
+                        .setCancelable(true)
+                        .setPositiveButton(R.string.yes, (d, i) -> {
+                            Intent it = new Intent(activity, Data.classMap.get(FlashActivity.class))
+                                    .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_INACTIVE_SLOT);
+                            activity.startActivity(it);
+                        })
+                        .setNegativeButton(R.string.no_thanks, null)
+                        .show();
+                    break;
+                default:
+            }
+        });
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/MagiskInstallDialog.java

@@ -0,0 +1,51 @@
+package com.topjohnwu.magisk.components;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.asyncs.MarkDownWindow;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class MagiskInstallDialog extends CustomAlertDialog {
+    public MagiskInstallDialog(BaseActivity activity) {
+        super(activity);
+        MagiskManager mm = Data.MM();
+        String filename = Utils.fmt("Magisk-v%s(%d).zip",
+                Data.remoteMagiskVersionString, Data.remoteMagiskVersionCode);
+        setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.magisk)));
+        setMessage(mm.getString(R.string.repo_install_msg, filename));
+        setCancelable(true);
+        setPositiveButton(R.string.install, (d, i) -> {
+            List<String> options = new ArrayList<>();
+            options.add(mm.getString(R.string.download_zip_only));
+            options.add(mm.getString(R.string.patch_boot_file));
+            if (Shell.rootAccess()) {
+                options.add(mm.getString(R.string.direct_install));
+                String s = ShellUtils.fastCmd("grep_prop ro.build.ab_update");
+                if (!s.isEmpty() && Boolean.parseBoolean(s)) {
+                    options.add(mm.getString(R.string.install_inactive_slot));
+                }
+            }
+            new InstallMethodDialog(activity, options).show();
+        });
+        setNegativeButton(R.string.no_thanks, null);
+        if (!TextUtils.isEmpty(Data.magiskNoteLink)) {
+            setNeutralButton(R.string.release_notes, (d, i) -> {
+                if (Data.magiskNoteLink.contains("forum.xda-developers")) {
+                    // Open forum links in browser
+                    Utils.openLink(activity, Uri.parse(Data.magiskNoteLink));
+                } else {
+                    new MarkDownWindow(activity, null, Data.magiskNoteLink).exec();
+                }
+            });
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/ManagerInstallDialog.java

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.components;
+
+import android.Manifest;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.asyncs.MarkDownWindow;
+import com.topjohnwu.magisk.receivers.ManagerUpdate;
+import com.topjohnwu.magisk.utils.Utils;
+
+import androidx.annotation.NonNull;
+
+public class ManagerInstallDialog extends CustomAlertDialog {
+
+    public ManagerInstallDialog(@NonNull BaseActivity activity) {
+        super(activity);
+        MagiskManager mm = Data.MM();
+        String filename = Utils.fmt("MagiskManager-v%s(%d).apk",
+                Data.remoteManagerVersionString, Data.remoteManagerVersionCode);
+        setTitle(mm.getString(R.string.repo_install_title, mm.getString(R.string.app_name)));
+        setMessage(mm.getString(R.string.repo_install_msg, filename));
+        setCancelable(true);
+        setPositiveButton(R.string.install, (d, i) -> activity.runWithPermission(
+                new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, () -> {
+                    Intent intent = new Intent(mm, Data.classMap.get(ManagerUpdate.class));
+                    intent.putExtra(Const.Key.INTENT_SET_LINK, Data.managerLink);
+                    intent.putExtra(Const.Key.INTENT_SET_FILENAME, filename);
+                    mm.sendBroadcast(intent);
+                }))
+                .setNegativeButton(R.string.no_thanks, null);
+        if (!TextUtils.isEmpty(Data.managerNoteLink)) {
+            setNeutralButton(R.string.app_changelog, (d, i) ->
+                    new MarkDownWindow(activity, null, Data.managerNoteLink).exec());
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/components/SnackbarMaker.java

@@ -2,14 +2,15 @@ package com.topjohnwu.magisk.components;
 
 import android.app.Activity;
 import android.net.Uri;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
 import android.view.View;
 import android.widget.TextView;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.utils.Utils;
 
+import androidx.annotation.StringRes;
+
 public class SnackbarMaker {
 
     public static Snackbar make(Activity activity, CharSequence text, int duration) {
@@ -34,13 +35,13 @@ public class SnackbarMaker {
     }
 
     private static void setup(Snackbar snack) {
-        TextView text = snack.getView().findViewById(android.support.design.R.id.snackbar_text);
+        TextView text = snack.getView().findViewById(com.google.android.material.R.id.snackbar_text);
         text.setMaxLines(Integer.MAX_VALUE);
     }
 
     public static void showUri(Activity activity, Uri uri) {
         make(activity, activity.getString(R.string.internal_storage,
-                "/MagiskManager/" + Utils.getNameFromUri(activity, uri)),
+                "/Download/" + Utils.getNameFromUri(activity, uri)),
                 Snackbar.LENGTH_LONG)
                 .setAction(R.string.ok, (v)->{}).show();
     }

app/src/full/java/com/topjohnwu/magisk/components/UninstallDialog.java

@@ -0,0 +1,57 @@
+package com.topjohnwu.magisk.components;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.receivers.DownloadReceiver;
+import com.topjohnwu.magisk.utils.Download;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+
+import androidx.annotation.NonNull;
+
+public class UninstallDialog extends CustomAlertDialog {
+
+    public UninstallDialog(@NonNull Activity activity) {
+        super(activity);
+        MagiskManager mm = Data.MM();
+        setTitle(R.string.uninstall_magisk_title);
+        setMessage(R.string.uninstall_magisk_msg);
+        setNeutralButton(R.string.restore_img, (d, i) -> {
+            ProgressDialog dialog = ProgressDialog.show(activity,
+                    activity.getString(R.string.restore_img),
+                    activity.getString(R.string.restore_img_msg));
+            Shell.su("restore_imgs").submit(result -> {
+                dialog.cancel();
+                if (result.isSuccess()) {
+                    Utils.toast(R.string.restore_done, Toast.LENGTH_SHORT);
+                } else {
+                    Utils.toast(R.string.restore_fail, Toast.LENGTH_LONG);
+                }
+            });
+        });
+        if (!TextUtils.isEmpty(Data.uninstallerLink)) {
+            setPositiveButton(R.string.complete_uninstall, (d, i) ->
+                    Download.receive(activity, new DownloadReceiver() {
+                        @Override
+                        public void onDownloadDone(Context context, Uri uri) {
+                            Intent intent = new Intent(context, Data.classMap.get(FlashActivity.class))
+                                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                    .setData(uri)
+                                    .putExtra(Const.Key.FLASH_ACTION, Const.Value.UNINSTALL);
+                            context.startActivity(intent);
+                        }
+                    }, Data.uninstallerLink, "magisk-uninstaller.zip"));
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/container/BaseModule.java

@@ -1,29 +1,35 @@
 package com.topjohnwu.magisk.container;
 
-
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
 
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public abstract class BaseModule implements Comparable<BaseModule> {
 
-    private String mId = null, mName, mVersion, mAuthor, mDescription;
+    private String mId, mName, mVersion, mAuthor, mDescription;
     private int mVersionCode = -1, minMagiskVersion = -1;
 
-    protected BaseModule() {}
+    protected BaseModule() {
+        mId = mName = mVersion = mAuthor = mDescription = "";
+    }
 
     protected BaseModule(Cursor c) {
-        mId = c.getString(c.getColumnIndex("id"));
-        mName = c.getString(c.getColumnIndex("name"));
-        mVersion = c.getString(c.getColumnIndex("version"));
+        mId = nonNull(c.getString(c.getColumnIndex("id")));
+        mName = nonNull(c.getString(c.getColumnIndex("name")));
+        mVersion = nonNull(c.getString(c.getColumnIndex("version")));
         mVersionCode = c.getInt(c.getColumnIndex("versionCode"));
-        mAuthor = c.getString(c.getColumnIndex("author"));
-        mDescription = c.getString(c.getColumnIndex("description"));
+        mAuthor = nonNull(c.getString(c.getColumnIndex("author")));
+        mDescription = nonNull(c.getString(c.getColumnIndex("description")));
         minMagiskVersion = c.getInt(c.getColumnIndex("minMagisk"));
     }
 
+    private String nonNull(String s) {
+        return s == null ? "" : s;
+    }
+
     public ContentValues getContentValues() {
         ContentValues values = new ContentValues();
         values.put("id", mId);
@@ -45,31 +51,32 @@ public abstract class BaseModule implements Comparable<BaseModule> {
                 continue;
 
             String key = prop[0].trim();
-            if (key.charAt(0) == '#')
+            String value = prop[1].trim();
+            if (key.isEmpty() || key.charAt(0) == '#')
                 continue;
 
             switch (key) {
                 case "id":
-                    mId = prop[1];
+                    mId = value;
                     break;
                 case "name":
-                    mName = prop[1];
+                    mName = value;
                     break;
                 case "version":
-                    mVersion = prop[1];
+                    mVersion = value;
                     break;
                 case "versionCode":
-                    mVersionCode = Integer.parseInt(prop[1]);
+                    mVersionCode = Integer.parseInt(value);
                     break;
                 case "author":
-                    mAuthor = prop[1];
+                    mAuthor = value;
                     break;
                 case "description":
-                    mDescription = prop[1];
+                    mDescription = value;
                     break;
                 case "minMagisk":
                 case "template":
-                    minMagiskVersion = Integer.parseInt(prop[1]);
+                    minMagiskVersion = Integer.parseInt(value);
                     break;
                 default:
                     break;

app/src/full/java/com/topjohnwu/magisk/container/Module.java

@@ -14,9 +14,9 @@ public class Module extends BaseModule {
             parseProps(Shell.Sync.su("dos2unix <  " + path + "/module.prop"));
         } catch (NumberFormatException ignored) {}
 
-        mRemoveFile = new SuFile(path + "/remove");
-        mDisableFile = new SuFile(path + "/disable");
-        mUpdateFile = new SuFile(path + "/update");
+        mRemoveFile = new SuFile(path, "remove");
+        mDisableFile = new SuFile(path, "disable");
+        mUpdateFile = new SuFile(path, "update");
 
         if (getId() == null) {
             int sep = path.lastIndexOf('/');

app/src/full/java/com/topjohnwu/magisk/container/Policy.java

@@ -4,7 +4,10 @@ import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+
+import com.topjohnwu.magisk.utils.Utils;
+
+import androidx.annotation.NonNull;
 
 
 public class Policy implements Comparable<Policy>{
@@ -25,7 +28,7 @@ public class Policy implements Comparable<Policy>{
         this.uid = uid;
         packageName = pkgs[0];
         info = pm.getApplicationInfo(packageName, 0);
-        appName = info.loadLabel(pm).toString();
+        appName = Utils.getAppLabel(info, pm);
     }
 
     public Policy(Cursor c, PackageManager pm) throws PackageManager.NameNotFoundException {

app/src/full/java/com/topjohnwu/magisk/container/Repo.java

@@ -3,8 +3,8 @@ package com.topjohnwu.magisk.container;
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.Logger;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.magisk.utils.WebService;
@@ -14,16 +14,14 @@ import java.util.Date;
 
 public class Repo extends BaseModule {
 
-    private String repoName;
     private Date mLastUpdate;
 
-    public Repo(String name) {
-        repoName = name;
+    public Repo(String id) {
+        setId(id);
     }
 
     public Repo(Cursor c) {
         super(c);
-        repoName = c.getString(c.getColumnIndex("repo_name"));
         mLastUpdate = new Date(c.getLong(c.getColumnIndex("last_update")));
     }
 
@@ -32,17 +30,14 @@ public class Repo extends BaseModule {
         try {
             parseProps(props);
         } catch (NumberFormatException e) {
-            throw new IllegalRepoException("Repo [" + repoName + "] parse error: " + e.getMessage());
+            throw new IllegalRepoException("Repo [" + getId() + "] parse error: " + e.getMessage());
         }
 
-        if (getId() == null) {
-            throw new IllegalRepoException("Repo [" + repoName + "] does not contain id");
-        }
         if (getVersionCode() < 0) {
-            throw new IllegalRepoException("Repo [" + repoName + "] does not contain versionCode");
+            throw new IllegalRepoException("Repo [" + getId() + "] does not contain versionCode");
         }
         if (getMinMagiskVersion() < Const.MIN_MODULE_VER()) {
-            Logger.debug("Repo [" + repoName + "] is outdated");
+            Logger.debug("Repo [" + getId() + "] is outdated");
         }
     }
 
@@ -54,36 +49,34 @@ public class Repo extends BaseModule {
     @Override
     public ContentValues getContentValues() {
         ContentValues values = super.getContentValues();
-        values.put("repo_name", repoName);
         values.put("last_update", mLastUpdate.getTime());
         return values;
     }
 
-    public String getRepoName() {
-        return repoName;
-    }
-
     public String getZipUrl() {
-        return String.format(Const.Url.ZIP_URL, repoName);
+        return String.format(Const.Url.ZIP_URL, getId());
     }
 
     public String getManifestUrl() {
-        return String.format(Const.Url.FILE_URL, repoName, "module.prop");
+        return String.format(Const.Url.FILE_URL, getId(), "module.prop");
     }
 
     public String getDetailUrl() {
-        return String.format(Const.Url.FILE_URL, repoName, "README.md");
+        return String.format(Const.Url.FILE_URL, getId(), "README.md");
     }
 
     public String getLastUpdateString() {
-        return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM,
-                MagiskManager.locale).format(mLastUpdate);
+        return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(mLastUpdate);
     }
 
     public Date getLastUpdate() {
         return mLastUpdate;
     }
 
+    public String getDownloadFilename() {
+        return Download.getLegalFilename(getName() + "-" + getVersion() + ".zip");
+    }
+
     public class IllegalRepoException extends Exception {
         IllegalRepoException(String message) {
             super(message);

app/src/full/java/com/topjohnwu/magisk/container/SuLogEntry.java

@@ -3,7 +3,7 @@ package com.topjohnwu.magisk.container;
 import android.content.ContentValues;
 import android.database.Cursor;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.utils.LocaleManager;
 
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
@@ -47,10 +47,10 @@ public class SuLogEntry {
     }
 
     public String getDateString() {
-        return DateFormat.getDateInstance(DateFormat.MEDIUM, MagiskManager.locale).format(date);
+        return DateFormat.getDateInstance(DateFormat.MEDIUM, LocaleManager.locale).format(date);
     }
 
     public String getTimeString() {
-        return new SimpleDateFormat("h:mm a", MagiskManager.locale).format(date);
+        return new SimpleDateFormat("h:mm a", LocaleManager.locale).format(date);
     }
 }

app/src/full/java/com/topjohnwu/magisk/container/ValueSortedMap.java

@@ -1,7 +1,5 @@
 package com.topjohnwu.magisk.container;
 
-import android.support.annotation.NonNull;
-
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
@@ -9,6 +7,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
+import androidx.annotation.NonNull;
+
 public class ValueSortedMap<K, V extends Comparable<? super V>> extends HashMap<K, V> {
 
     private List<V> sorted = new ArrayList<>();

app/src/full/java/com/topjohnwu/magisk/database/MagiskDatabaseHelper.java

@@ -7,15 +7,16 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.os.Build;
 import android.os.Process;
-import android.support.annotation.NonNull;
 import android.text.TextUtils;
 import android.widget.Toast;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.container.Policy;
 import com.topjohnwu.magisk.container.SuLogEntry;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.LocaleManager;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.io.SuFile;
@@ -27,85 +28,84 @@ import java.util.Collections;
 import java.util.Date;
 import java.util.List;
 
+import androidx.annotation.NonNull;
+
 public class MagiskDatabaseHelper {
 
-    private static final int DATABASE_VER = 5;
+    private static final int DATABASE_VER = 6;
+    private static final int OLD_DATABASE_VER = 5;
     private static final String POLICY_TABLE = "policies";
     private static final String LOG_TABLE = "logs";
     private static final String SETTINGS_TABLE = "settings";
     private static final String STRINGS_TABLE = "strings";
+    private static final File MANAGER_DB =
+            new File(Utils.fmt("/sbin/.core/db-%d/magisk.db", Const.USER_ID));
 
     private PackageManager pm;
     private SQLiteDatabase db;
 
     @NonNull
-    public static MagiskDatabaseHelper getInstance(MagiskManager mm) {
+    public static MagiskDatabaseHelper getInstance() {
         try {
-            return new MagiskDatabaseHelper(mm);
+            return new MagiskDatabaseHelper();
         } catch (Exception e) {
             // Let's cleanup everything and try again
-            Shell.Sync.su("db_clean '*'");
-            return new MagiskDatabaseHelper(mm);
+            Shell.su("db_clean '*'").exec();
+            return new MagiskDatabaseHelper();
         }
     }
 
-    private MagiskDatabaseHelper(MagiskManager mm) {
-        pm = mm.getPackageManager();
-        db = openDatabase(mm);
+    private MagiskDatabaseHelper() {
+        pm = Data.MM().getPackageManager();
+        init();
+    }
+
+    private void init() {
+        db = openDatabase();
         db.disableWriteAheadLogging();
-        int version = db.getVersion();
-        if (version < DATABASE_VER) {
-            onUpgrade(db, version);
-        } else if (version > DATABASE_VER) {
+        int version = Data.magiskVersionCode >= Const.MAGISK_VER.DBVER_SIX ? DATABASE_VER : OLD_DATABASE_VER;
+        int curVersion = db.getVersion();
+        if (curVersion < version) {
+            onUpgrade(db, curVersion);
+        } else if (curVersion > DATABASE_VER) {
+            /* Higher than we can possibly support */
             onDowngrade(db);
         }
-        db.setVersion(DATABASE_VER);
+        db.setVersion(version);
         clearOutdated();
     }
 
-    private SQLiteDatabase openDatabase(MagiskManager mm) {
-        final File DB_FILE = new File(Utils.fmt("/sbin/.core/db-%d/magisk.db", Const.USER_ID));
+    private SQLiteDatabase openDatabase() {
+        MagiskManager mm = Data.MM();
         Context de = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N
                 ? mm.createDeviceProtectedStorageContext() : mm;
-        if (!DB_FILE.canWrite()) {
+        if (!MANAGER_DB.canWrite()) {
             if (!Shell.rootAccess()) {
                 // We don't want the app to crash, create a db and return
                 return mm.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
             }
-            mm.loadMagiskInfo();
             // Cleanup
-            Shell.Sync.su("db_clean " + Const.USER_ID);
-            if (mm.magiskVersionCode < Const.MAGISK_VER.FBE_AWARE) {
-                // Super old legacy mode
-                return mm.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
-            } else if (mm.magiskVersionCode < Const.MAGISK_VER.HIDDEN_PATH) {
-                // Legacy mode with FBE aware
-                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
-                    de.moveDatabaseFrom(mm, "su.db");
-                }
-                return de.openOrCreateDatabase("su.db", Context.MODE_PRIVATE, null);
-            } else {
-                // Global database
-                final SuFile GLOBAL_DB = new SuFile("/data/adb/magisk.db");
-                mm.deleteDatabase("su.db");
-                de.deleteDatabase("su.db");
-                if (mm.magiskVersionCode < Const.MAGISK_VER.SEPOL_REFACTOR) {
-                    // We need some additional policies on old versions
-                    Shell.Sync.su("db_sepatch");
-                }
-                if (!GLOBAL_DB.exists()) {
-                    Shell.Sync.su("db_init");
-                    SQLiteDatabase.openOrCreateDatabase(GLOBAL_DB, null).close();
-                    Shell.Sync.su("db_restore");
-                }
+            Shell.su("db_clean " + Const.USER_ID).exec();
+            // Global database
+            final SuFile GLOBAL_DB = new SuFile("/data/adb/magisk.db");
+            mm.deleteDatabase("su.db");
+            de.deleteDatabase("su.db");
+            if (Data.magiskVersionCode < Const.MAGISK_VER.SEPOL_REFACTOR) {
+                // We need some additional policies on old versions
+                Shell.su("db_sepatch").exec();
             }
-            Shell.Sync.su("db_setup " + Process.myUid());
+            if (!GLOBAL_DB.exists()) {
+                Shell.su("db_init").exec();
+                SQLiteDatabase.openOrCreateDatabase(GLOBAL_DB, null).close();
+                Shell.su("db_restore").exec();
+            }
+            Shell.su("db_setup " + Process.myUid()).exec();
         }
         // Not using legacy mode, open the mounted global DB
-        return SQLiteDatabase.openOrCreateDatabase(DB_FILE, null);
+        return SQLiteDatabase.openOrCreateDatabase(MANAGER_DB, null);
     }
 
-    public void onUpgrade(SQLiteDatabase db, int oldVersion) {
+    private void onUpgrade(SQLiteDatabase db, int oldVersion) {
         if (oldVersion == 0) {
             createTables(db);
             oldVersion = 3;
@@ -123,7 +123,7 @@ public class MagiskDatabaseHelper {
                     POLICY_TABLE, POLICY_TABLE));
             db.execSQL(Utils.fmt("DROP TABLE %s_old", POLICY_TABLE));
 
-            MagiskManager.get().deleteDatabase("sulog.db");
+            Data.MM().deleteDatabase("sulog.db");
             ++oldVersion;
         }
         if (oldVersion == 2) {
@@ -138,11 +138,16 @@ public class MagiskDatabaseHelper {
             db.execSQL(Utils.fmt("UPDATE %s SET uid=uid%%100000", POLICY_TABLE));
             ++oldVersion;
         }
+        if (oldVersion == 5) {
+            setSettings(Const.Key.SU_FINGERPRINT,
+                    Data.MM().prefs.getBoolean(Const.Key.SU_FINGERPRINT, false) ? 1 : 0);
+            ++oldVersion;
+        }
     }
 
     // Remove everything, we do not support downgrade
-    public void onDowngrade(SQLiteDatabase db) {
-        MagiskManager.toast(R.string.su_db_corrupt, Toast.LENGTH_LONG);
+    private void onDowngrade(SQLiteDatabase db) {
+        Utils.toast(R.string.su_db_corrupt, Toast.LENGTH_LONG);
         db.execSQL("DROP TABLE IF EXISTS " + POLICY_TABLE);
         db.execSQL("DROP TABLE IF EXISTS " + LOG_TABLE);
         db.execSQL("DROP TABLE IF EXISTS " + SETTINGS_TABLE);
@@ -170,11 +175,16 @@ public class MagiskDatabaseHelper {
                 "(key TEXT, value INT, PRIMARY KEY(key))");
     }
 
+    public void flush() {
+        db.close();
+        init();
+    }
+
     public void clearOutdated() {
         // Clear outdated policies
         db.delete(POLICY_TABLE, Utils.fmt("until > 0 AND until < %d", System.currentTimeMillis() / 1000), null);
         // Clear outdated logs
-        db.delete(LOG_TABLE, Utils.fmt("time < %d", System.currentTimeMillis() - MagiskManager.get().suLogTimeout * 86400000), null);
+        db.delete(LOG_TABLE, Utils.fmt("time < %d", System.currentTimeMillis() - Data.suLogTimeout * 86400000), null);
     }
 
     public void deletePolicy(Policy policy) {
@@ -236,7 +246,7 @@ public class MagiskDatabaseHelper {
             String dateString = null, newString;
             while (c.moveToNext()) {
                 Date date = new Date(c.getLong(c.getColumnIndex("time")));
-                newString = DateFormat.getDateInstance(DateFormat.MEDIUM, MagiskManager.locale).format(date);
+                newString = DateFormat.getDateInstance(DateFormat.MEDIUM, LocaleManager.locale).format(date);
                 if (!TextUtils.equals(dateString, newString)) {
                     dateString = newString;
                     list = new ArrayList<>();

app/src/full/java/com/topjohnwu/magisk/database/RepoDatabaseHelper.java

@@ -5,25 +5,27 @@ import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.adapters.ReposAdapter;
 import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
 
 import java.util.HashSet;
 import java.util.Set;
 
 public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
-    private static final int DATABASE_VER = 3;
+    private static final int DATABASE_VER = 4;
     private static final String TABLE_NAME = "repos";
 
     private SQLiteDatabase mDb;
     private MagiskManager mm;
+    private ReposAdapter adapter;
 
     public RepoDatabaseHelper(Context context) {
         super(context, "repo.db", null, DATABASE_VER);
-        mm = Utils.getMagiskManager(context);
+        mm = Data.MM();
         mDb = getWritableDatabase();
 
         // Remove outdated repos
@@ -38,21 +40,14 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     @Override
     public void onUpgrade(SQLiteDatabase db, int oldVersion, int newVersion) {
-        try {
-            if (oldVersion < 3) {
-                db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
-                db.execSQL(
-                        "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
-                                "(id TEXT, name TEXT, version TEXT, versionCode INT, minMagisk INT, " +
-                                "author TEXT, description TEXT, repo_name TEXT, last_update INT, " +
-                                "PRIMARY KEY(id))");
-                mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
-                oldVersion = 3;
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            // Reset database
-            onDowngrade(db, DATABASE_VER, 0);
+        if (oldVersion != newVersion) {
+            // Nuke old DB and create new table
+            db.execSQL("DROP TABLE IF EXISTS " + TABLE_NAME);
+            db.execSQL(
+                    "CREATE TABLE IF NOT EXISTS " + TABLE_NAME + " " +
+                            "(id TEXT, name TEXT, version TEXT, versionCode INT, minMagisk INT, " +
+                            "author TEXT, description TEXT, last_update INT, PRIMARY KEY(id))");
+            mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
         }
     }
 
@@ -63,15 +58,17 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     public void clearRepo() {
         mDb.delete(TABLE_NAME, null, null);
+        notifyAdapter();
     }
 
 
     public void removeRepo(String id) {
         mDb.delete(TABLE_NAME, "id=?", new String[] { id });
+        notifyAdapter();
     }
 
     public void removeRepo(Repo repo) {
-        mDb.delete(TABLE_NAME, "repo_name=?", new String[] { repo.getRepoName() });
+        removeRepo(repo.getId());
     }
 
     public void removeRepo(Iterable<String> list) {
@@ -79,10 +76,12 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
             if (id == null) continue;
             mDb.delete(TABLE_NAME, "id=?", new String[] { id });
         }
+        notifyAdapter();
     }
 
     public void addRepo(Repo repo) {
         mDb.replace(TABLE_NAME, null, repo.getContentValues());
+        notifyAdapter();
     }
 
     public Repo getRepo(String id) {
@@ -100,7 +99,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
 
     public Cursor getRepoCursor() {
         String orderBy = null;
-        switch (mm.repoOrder) {
+        switch (Data.repoOrder) {
             case Const.Value.ORDER_NAME:
                 orderBy = "name COLLATE NOCASE";
                 break;
@@ -108,7 +107,7 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
                 orderBy = "last_update DESC";
         }
         return mDb.query(TABLE_NAME, null, "minMagisk<=? AND minMagisk>=?",
-                new String[] { String.valueOf(mm.magiskVersionCode), String.valueOf(Const.MIN_MODULE_VER()) },
+                new String[] { String.valueOf(Data.magiskVersionCode), String.valueOf(Const.MIN_MODULE_VER()) },
                 null, null, orderBy);
     }
 
@@ -121,4 +120,18 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
         }
         return set;
     }
+
+    public void registerAdapter(ReposAdapter a) {
+        adapter = a;
+    }
+
+    public void unregisterAdapter() {
+        adapter = null;
+    }
+
+    private void notifyAdapter() {
+        if (adapter != null) {
+            Data.mainHandler.post(adapter::notifyDBChanged);
+        }
+    }
 }

app/src/full/java/com/topjohnwu/magisk/fragments/LogFragment.java

@@ -1,24 +1,23 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 
 import android.os.Bundle;
-import android.support.design.widget.TabLayout;
-import android.support.v4.view.ViewPager;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.google.android.material.tabs.TabLayout;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MainActivity;
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.adapters.TabFragmentAdapter;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.components.BaseFragment;
 
+import androidx.viewpager.widget.ViewPager;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 
-public class LogFragment extends Fragment {
-
-    private Unbinder unbinder;
+public class LogFragment extends BaseFragment {
 
     @BindView(R.id.container) ViewPager viewPager;
     @BindView(R.id.tab) TabLayout tab;
@@ -28,13 +27,13 @@ public class LogFragment extends Fragment {
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_log, container, false);
-        unbinder = ButterKnife.bind(this, v);
+        unbinder = new LogFragment_ViewBinding(this, v);
 
-        ((MainActivity) getActivity()).toolbar.setElevation(0);
+        ((MainActivity) requireActivity()).toolbar.setElevation(0);
 
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 
-        if (!(Const.USER_ID > 0 && getApplication().multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
+        if (!(Const.USER_ID > 0 && Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
             adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
         }
         adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
@@ -45,11 +44,4 @@ public class LogFragment extends Fragment {
 
         return v;
     }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
 }

app/src/full/java/com/topjohnwu/magisk/fragments/MagiskFragment.java

@@ -1,13 +1,10 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 import android.app.NotificationManager;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.annotation.StringRes;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.CardView;
-import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -18,35 +15,45 @@ import android.widget.ProgressBar;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MainActivity;
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.asyncs.CheckSafetyNet;
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.components.AlertDialogBuilder;
+import com.topjohnwu.magisk.components.BaseActivity;
+import com.topjohnwu.magisk.components.BaseFragment;
+import com.topjohnwu.magisk.components.CustomAlertDialog;
+import com.topjohnwu.magisk.components.EnvFixDialog;
 import com.topjohnwu.magisk.components.ExpandableView;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.components.MagiskInstallDialog;
+import com.topjohnwu.magisk.components.ManagerInstallDialog;
+import com.topjohnwu.magisk.components.UninstallDialog;
+import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.ISafetyNetHelper;
-import com.topjohnwu.magisk.utils.ShowUI;
 import com.topjohnwu.magisk.utils.Topic;
-import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.ShellUtils;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.cardview.widget.CardView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import butterknife.BindColor;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.Unbinder;
 
-public class MagiskFragment extends Fragment
-        implements Topic.Subscriber, SwipeRefreshLayout.OnRefreshListener, ExpandableView {
+public class MagiskFragment extends BaseFragment
+        implements SwipeRefreshLayout.OnRefreshListener, ExpandableView, Topic.Subscriber {
 
     private Container expandableContainer = new Container();
-
-    private MagiskManager mm;
-    private Unbinder unbinder;
     private static boolean shownDialog = false;
 
-    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
+    @BindView(R.id.swipeRefreshLayout) public SwipeRefreshLayout mSwipeRefreshLayout;
+
+    @BindView(R.id.core_only_notice) CardView coreOnlyNotice;
 
     @BindView(R.id.magisk_update) RelativeLayout magiskUpdate;
     @BindView(R.id.magisk_update_icon) ImageView magiskUpdateIcon;
@@ -75,7 +82,7 @@ public class MagiskFragment extends Fragment
     @BindColor(R.color.red500) int colorBad;
     @BindColor(R.color.green500) int colorOK;
     @BindColor(R.color.yellow500) int colorWarn;
-    @BindColor(R.color.grey500) int colorNeutral;
+    @BindColor(R.color.green500) int colorNeutral;
     @BindColor(R.color.blue500) int colorInfo;
 
     @OnClick(R.id.safetyNet_title)
@@ -84,19 +91,12 @@ public class MagiskFragment extends Fragment
             safetyNetProgress.setVisibility(View.VISIBLE);
             safetyNetRefreshIcon.setVisibility(View.GONE);
             safetyNetStatusText.setText(R.string.checking_safetyNet_status);
-            new CheckSafetyNet(getActivity()).exec();
+            new CheckSafetyNet(requireActivity()).exec();
             collapse();
         };
-        if (!TextUtils.equals(mm.getPackageName(), Const.ORIG_PKG_NAME)) {
-            new AlertDialogBuilder(getActivity())
-                    .setTitle(R.string.cannot_check_sn_title)
-                    .setMessage(R.string.cannot_check_sn_notice)
-                    .setCancelable(true)
-                    .setPositiveButton(R.string.ok, null)
-                    .show();
-        } else if (!CheckSafetyNet.dexPath.exists()) {
+        if (!CheckSafetyNet.dexPath.exists()) {
             // Show dialog
-            new AlertDialogBuilder(getActivity())
+            new CustomAlertDialog(requireActivity())
                     .setTitle(R.string.proprietary_title)
                     .setMessage(R.string.proprietary_notice)
                     .setCancelable(true)
@@ -114,36 +114,35 @@ public class MagiskFragment extends Fragment
         shownDialog = true;
 
         // Show Manager update first
-        if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
-            ShowUI.managerInstallDialog(getActivity());
+        if (Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+            new ManagerInstallDialog((BaseActivity) requireActivity()).show();
             return;
         }
 
         ((NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE)).cancelAll();
-        ShowUI.magiskInstallDialog(getActivity());
+        new MagiskInstallDialog((BaseActivity) getActivity()).show();
     }
 
     @OnClick(R.id.uninstall_button)
     void uninstall() {
-        ShowUI.uninstallDialog(getActivity());
+        new UninstallDialog(requireActivity()).show();
     }
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
         View v = inflater.inflate(R.layout.fragment_magisk, container, false);
-        unbinder = ButterKnife.bind(this, v);
-        getActivity().setTitle(R.string.magisk);
-
-        mm = getApplication();
+        unbinder = new MagiskFragment_ViewBinding(this, v);
+        requireActivity().setTitle(R.string.magisk);
 
         expandableContainer.expandLayout = expandLayout;
         setupExpandable();
 
-        keepVerityChkbox.setChecked(mm.keepVerity);
-        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepVerity = checked);
-        keepEncChkbox.setChecked(mm.keepEnc);
-        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> mm.keepEnc = checked);
+        keepVerityChkbox.setChecked(Data.keepVerity);
+        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> Data.keepVerity = checked);
+        keepEncChkbox.setChecked(Data.keepEnc);
+        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> Data.keepEnc = checked);
 
         mSwipeRefreshLayout.setOnRefreshListener(this);
         updateUI();
@@ -153,7 +152,7 @@ public class MagiskFragment extends Fragment
 
     @Override
     public void onRefresh() {
-        mm.loadMagiskInfo();
+        Data.loadMagiskInfo();
         updateUI();
 
         magiskUpdateText.setText(R.string.checking_for_updates);
@@ -162,69 +161,75 @@ public class MagiskFragment extends Fragment
 
         safetyNetStatusText.setText(R.string.safetyNet_check_text);
 
-        mm.safetyNetDone.reset();
-        mm.updateCheckDone.reset();
-        mm.remoteMagiskVersionString = null;
-        mm.remoteMagiskVersionCode = -1;
+        Topic.reset(getSubscribedTopics());
+        Data.remoteMagiskVersionString = null;
+        Data.remoteMagiskVersionCode = -1;
         collapse();
 
         shownDialog = false;
 
         // Trigger state check
-        if (Utils.checkNetworkStatus()) {
-            new CheckUpdates().exec();
+        if (Download.checkNetworkStatus(mm)) {
+            CheckUpdates.check();
         } else {
             mSwipeRefreshLayout.setRefreshing(false);
         }
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
-        if (topic == mm.updateCheckDone) {
-            updateCheckUI();
-        } else if (topic == mm.safetyNetDone) {
-            updateSafetyNetUI((int) topic.getResults()[0]);
+    public int[] getSubscribedTopics() {
+        return new int[] {Topic.SNET_CHECK_DONE, Topic.UPDATE_CHECK_DONE};
+    }
+
+    @Override
+    public void onPublish(int topic, Object[] result) {
+        switch (topic) {
+            case Topic.SNET_CHECK_DONE:
+                updateSafetyNetUI((int) result[0]);
+                break;
+            case Topic.UPDATE_CHECK_DONE:
+                updateCheckUI();
+                break;
         }
     }
 
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { mm.updateCheckDone, mm.safetyNetDone };
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     @Override
     public Container getContainer() {
         return expandableContainer;
     }
 
-    private void updateUI() {
-        ((MainActivity) getActivity()).checkHideSection();
+    private boolean hasGms() {
+        PackageManager pm = mm.getPackageManager();
+        PackageInfo info;
+        try {
+            info = pm.getPackageInfo("com.google.android.gms", 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+        return info.applicationInfo.enabled;
+    }
 
-        boolean hasNetwork = Utils.checkNetworkStatus();
+    private void updateUI() {
+        ((MainActivity) requireActivity()).checkHideSection();
+
+        boolean hasNetwork = Download.checkNetworkStatus(mm);
         boolean hasRoot = Shell.rootAccess();
-        boolean isUpToDate = mm.magiskVersionCode > Const.MAGISK_VER.UNIFIED;
 
         magiskUpdate.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        safetyNetCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
         installOptionCard.setVisibility(hasNetwork ? View.VISIBLE : View.GONE);
-        uninstallButton.setVisibility(isUpToDate && hasRoot ? View.VISIBLE : View.GONE);
+        uninstallButton.setVisibility(hasRoot ? View.VISIBLE : View.GONE);
+        coreOnlyNotice.setVisibility(mm.prefs.getBoolean(Const.Key.COREONLY, false) ? View.VISIBLE : View.GONE);
 
         int image, color;
 
-        if (mm.magiskVersionCode < 0) {
+        if (Data.magiskVersionCode < 0) {
             color = colorBad;
             image = R.drawable.ic_cancel;
             magiskVersionText.setText(R.string.magisk_version_error);
         } else {
             color = colorOK;
             image = R.drawable.ic_check_circle;
-            magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + mm.magiskVersionString));
+            magiskVersionText.setText(getString(R.string.current_magisk_title, "v" + Data.magiskVersionString));
         }
 
         magiskStatusIcon.setImageResource(image);
@@ -234,7 +239,9 @@ public class MagiskFragment extends Fragment
     private void updateCheckUI() {
         int image, color;
 
-        if (mm.remoteMagiskVersionCode < 0) {
+        safetyNetCard.setVisibility(hasGms() ? View.VISIBLE : View.GONE);
+
+        if (Data.remoteMagiskVersionCode < 0) {
             color = colorNeutral;
             image = R.drawable.ic_help;
             magiskUpdateText.setText(R.string.invalid_update_channel);
@@ -242,11 +249,11 @@ public class MagiskFragment extends Fragment
         } else {
             color = colorOK;
             image = R.drawable.ic_check_circle;
-            magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + mm.remoteMagiskVersionString));
+            magiskUpdateText.setText(getString(R.string.install_magisk_title, "v" + Data.remoteMagiskVersionString));
             installButton.setVisibility(View.VISIBLE);
-            if (mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+            if (Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
                 installText.setText(getString(R.string.update, getString(R.string.app_name)));
-            } else if (mm.magiskVersionCode > 0 && mm.remoteMagiskVersionCode > mm.magiskVersionCode) {
+            } else if (Data.magiskVersionCode > 0 && Data.remoteMagiskVersionCode > Data.magiskVersionCode) {
                 installText.setText(getString(R.string.update, getString(R.string.magisk)));
             } else {
                 installText.setText(R.string.install);
@@ -261,12 +268,12 @@ public class MagiskFragment extends Fragment
         mSwipeRefreshLayout.setRefreshing(false);
 
         if (!shownDialog) {
-            if (mm.remoteMagiskVersionCode > mm.magiskVersionCode
-                    || mm.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+            if (Data.remoteMagiskVersionCode > Data.magiskVersionCode
+                    || Data.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
                 install();
-            } else if (mm.remoteMagiskVersionCode >= Const.MAGISK_VER.FIX_ENV &&
+            } else if (Data.remoteMagiskVersionCode >= Const.MAGISK_VER.FIX_ENV &&
                     !ShellUtils.fastCmdResult("env_check")) {
-                ShowUI.envFixDialog(getActivity());
+                new EnvFixDialog(requireActivity()).show();
             }
         }
     }
@@ -292,12 +299,6 @@ public class MagiskFragment extends Fragment
         } else {
             @StringRes int resid;
             switch (response) {
-                case ISafetyNetHelper.CAUSE_SERVICE_DISCONNECTED:
-                    resid = R.string.safetyNet_network_loss;
-                    break;
-                case ISafetyNetHelper.CAUSE_NETWORK_LOST:
-                    resid = R.string.safetyNet_service_disconnected;
-                    break;
                 case ISafetyNetHelper.RESPONSE_ERR:
                     resid = R.string.safetyNet_res_invalid;
                     break;

app/src/full/java/com/topjohnwu/magisk/fragments/MagiskHideFragment.java

@@ -1,9 +1,6 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -11,19 +8,22 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.SearchView;
 
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.adapters.ApplicationAdapter;
-import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.BaseFragment;
 import com.topjohnwu.magisk.utils.Topic;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 
-public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
+public class MagiskHideFragment extends BaseFragment implements Topic.Subscriber {
 
-    private Unbinder unbinder;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
+    SearchView search;
 
     private ApplicationAdapter appAdapter;
 
@@ -37,15 +37,15 @@ public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false);
-        unbinder = ButterKnife.bind(this, view);
+        unbinder = new MagiskHideFragment_ViewBinding(this, view);
+
+        appAdapter = new ApplicationAdapter(requireActivity());
+        recyclerView.setAdapter(appAdapter);
 
         mSwipeRefreshLayout.setRefreshing(true);
-        mSwipeRefreshLayout.setOnRefreshListener(() -> appAdapter.refresh());
-
-        appAdapter = new ApplicationAdapter();
-        recyclerView.setAdapter(appAdapter);
+        mSwipeRefreshLayout.setOnRefreshListener(appAdapter::refresh);
 
         searchListener = new SearchView.OnQueryTextListener() {
             @Override
@@ -61,7 +61,7 @@ public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
             }
         };
 
-        getActivity().setTitle(R.string.magiskhide);
+        requireActivity().setTitle(R.string.magiskhide);
 
         return view;
     }
@@ -69,24 +69,18 @@ public class MagiskHideFragment extends Fragment implements Topic.Subscriber {
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_magiskhide, menu);
-        SearchView search = (SearchView) menu.findItem(R.id.app_search).getActionView();
+        search = (SearchView) menu.findItem(R.id.app_search).getActionView();
         search.setOnQueryTextListener(searchListener);
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
+    public int[] getSubscribedTopics() {
+        return new int[] {Topic.MAGISK_HIDE_DONE};
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
+    public void onPublish(int topic, Object[] result) {
         mSwipeRefreshLayout.setRefreshing(false);
-        appAdapter.filter(null);
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getApplication().magiskHideDone };
+        appAdapter.filter(search.getQuery().toString());
     }
 }

app/src/full/java/com/topjohnwu/magisk/fragments/MagiskLogFragment.java

@@ -1,10 +1,7 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 import android.Manifest;
 import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -17,25 +14,23 @@ import android.widget.ProgressBar;
 import android.widget.ScrollView;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.components.Fragment;
+import com.google.android.material.snackbar.Snackbar;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.BaseFragment;
 import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.utils.Download;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
-import com.topjohnwu.superuser.ShellUtils;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.Calendar;
-import java.util.List;
 
+import androidx.annotation.Nullable;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 
-public class MagiskLogFragment extends Fragment {
-
-    private Unbinder unbinder;
+public class MagiskLogFragment extends BaseFragment {
 
     @BindView(R.id.txtLog) TextView txtLog;
     @BindView(R.id.svLog) ScrollView svLog;
@@ -46,7 +41,7 @@ public class MagiskLogFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
-        unbinder = ButterKnife.bind(this, view);
+        unbinder = new MagiskLogFragment_ViewBinding(this, view);
         setHasOptionsMenu(true);
         txtLog.setTextIsSelectable(true);
         return view;
@@ -64,12 +59,6 @@ public class MagiskLogFragment extends Fragment {
         readLogs();
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_log, menu);
@@ -92,54 +81,39 @@ public class MagiskLogFragment extends Fragment {
         }
     }
 
-    public void readLogs() {
-        Shell.Async.su(new Shell.Async.Callback() {
-            @Override
-            public void onTaskResult(@Nullable List<String> out, @Nullable List<String> err) {
-                progressBar.setVisibility(View.GONE);
-                if (ShellUtils.isValidOutput(out)) {
-                    txtLog.setText(TextUtils.join("\n", out));
-                } else {
-                    txtLog.setText(R.string.log_is_empty);
-                }
-                svLog.postDelayed(() -> svLog.fullScroll(ScrollView.FOCUS_DOWN), 100);
-                hsvLog.postDelayed(() -> hsvLog.fullScroll(ScrollView.FOCUS_LEFT), 100);
-            }
-
-            @Override
-            public void onTaskError(@NonNull Throwable throwable) {
+    private void readLogs() {
+        Shell.su("cat " + Const.MAGISK_LOG + " | tail -n 5000").submit(result -> {
+            progressBar.setVisibility(View.GONE);
+            if (result.getOut().isEmpty())
                 txtLog.setText(R.string.log_is_empty);
-            }
-        }, "cat " + Const.MAGISK_LOG + " | tail -n 5000");
+            else
+                txtLog.setText(TextUtils.join("\n", result.getOut()));
+            svLog.postDelayed(() -> svLog.fullScroll(ScrollView.FOCUS_DOWN), 100);
+            hsvLog.postDelayed(() -> hsvLog.fullScroll(ScrollView.FOCUS_LEFT), 100);
+        });
     }
 
-    public void saveLogs() {
+    private void saveLogs() {
         Calendar now = Calendar.getInstance();
         String filename = Utils.fmt("magisk_log_%04d%02d%02d_%02d%02d%02d.log",
                 now.get(Calendar.YEAR), now.get(Calendar.MONTH) + 1,
                 now.get(Calendar.DAY_OF_MONTH), now.get(Calendar.HOUR_OF_DAY),
                 now.get(Calendar.MINUTE), now.get(Calendar.SECOND));
 
-        File targetFile = new File(Const.EXTERNAL_PATH + "/logs", filename);
-        targetFile.getParentFile().mkdirs();
+        File logFile = new File(Download.EXTERNAL_PATH, filename);
         try {
-            targetFile.createNewFile();
+            logFile.createNewFile();
         } catch (IOException e) {
             return;
         }
-        Shell.Async.su(new Shell.Async.Callback() {
-            @Override
-            public void onTaskResult(@Nullable List<String> out, @Nullable List<String> err) {
-                SnackbarMaker.make(txtLog, targetFile.getPath(), Snackbar.LENGTH_SHORT).show();
-            }
-
-            @Override
-            public void onTaskError(@NonNull Throwable throwable) {}
-        }, "cat " + Const.MAGISK_LOG + " > " + targetFile);
+        Shell.su("cat " + Const.MAGISK_LOG + " > " + logFile)
+                .submit(result ->
+                        SnackbarMaker.make(txtLog, logFile.getPath(), Snackbar.LENGTH_SHORT).show());
     }
 
-    public void clearLogs() {
-        Shell.Async.su("echo -n > " + Const.MAGISK_LOG);
+    private void clearLogs() {
+        Shell.su("echo -n > " + Const.MAGISK_LOG).submit();
+        txtLog.setText(R.string.log_is_empty);
         SnackbarMaker.make(txtLog, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
     }
 }

app/src/full/java/com/topjohnwu/magisk/fragments/ModulesFragment.java

@@ -1,12 +1,9 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 import android.Manifest;
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -15,30 +12,36 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.FlashActivity;
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.adapters.ModulesAdapter;
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.BaseFragment;
 import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.utils.Const;
 import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import butterknife.BindView;
-import butterknife.ButterKnife;
 import butterknife.OnClick;
-import butterknife.Unbinder;
 
-public class ModulesFragment extends Fragment implements Topic.Subscriber {
+public class ModulesFragment extends BaseFragment implements Topic.Subscriber {
 
-    private Unbinder unbinder;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
     @BindView(R.id.empty_rv) TextView emptyRv;
+
     @OnClick(R.id.fab)
-    public void selectFile() {
+    void selectFile() {
         runWithPermission(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, () -> {
             Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("application/zip");
@@ -50,14 +53,14 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_modules, container, false);
-        unbinder = ButterKnife.bind(this, view);
+        unbinder = new ModulesFragment_ViewBinding(this, view);
         setHasOptionsMenu(true);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.GONE);
-            new LoadModules().exec();
+            Utils.loadModules();
         });
 
         recyclerView.addOnScrollListener(new RecyclerView.OnScrollListener() {
@@ -72,37 +75,31 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
             }
         });
 
-        getActivity().setTitle(R.string.modules);
+        requireActivity().setTitle(R.string.modules);
 
         return view;
     }
 
     @Override
-    public void onTopicPublished(Topic topic) {
-        updateUI();
+    public int[] getSubscribedTopics() {
+        return new int[] {Topic.MODULE_LOAD_DONE};
     }
 
     @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getApplication().moduleLoadDone };
+    public void onPublish(int topic, Object[] result) {
+        updateUI((Map<String, Module>) result[0]);
     }
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == Const.ID.FETCH_ZIP && resultCode == Activity.RESULT_OK && data != null) {
             // Get the URI of the selected file
-            Intent intent = new Intent(getActivity(), FlashActivity.class);
+            Intent intent = new Intent(getActivity(), Data.classMap.get(FlashActivity.class));
             intent.setData(data.getData()).putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
             startActivity(intent);
         }
     }
 
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
     @Override
     public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
         inflater.inflate(R.menu.menu_reboot, menu);
@@ -112,25 +109,25 @@ public class ModulesFragment extends Fragment implements Topic.Subscriber {
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
             case R.id.reboot:
-                Shell.Async.su("/system/bin/reboot");
+                Shell.su("/system/bin/reboot").submit();
                 return true;
             case R.id.reboot_recovery:
-                Shell.Async.su("/system/bin/reboot recovery");
+                Shell.su("/system/bin/reboot recovery").submit();
                 return true;
             case R.id.reboot_bootloader:
-                Shell.Async.su("/system/bin/reboot bootloader");
+                Shell.su("/system/bin/reboot bootloader").submit();
                 return true;
             case R.id.reboot_download:
-                Shell.Async.su("/system/bin/reboot download");
+                Shell.su("/system/bin/reboot download").submit();
                 return true;
             default:
                 return false;
         }
     }
 
-    private void updateUI() {
+    private void updateUI(Map<String, Module> moduleMap) {
         listModules.clear();
-        listModules.addAll(getApplication().moduleMap.values());
+        listModules.addAll(moduleMap.values());
         if (listModules.size() == 0) {
             emptyRv.setVisibility(View.VISIBLE);
             recyclerView.setVisibility(View.GONE);

app/src/full/java/com/topjohnwu/magisk/fragments/ReposFragment.java

@@ -1,10 +1,7 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 import android.app.AlertDialog;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -14,25 +11,30 @@ import android.view.ViewGroup;
 import android.widget.SearchView;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.adapters.ReposAdapter;
 import com.topjohnwu.magisk.asyncs.UpdateRepos;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Const;
+import com.topjohnwu.magisk.components.BaseFragment;
+import com.topjohnwu.magisk.container.Module;
 import com.topjohnwu.magisk.utils.Topic;
 
+import java.util.Map;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 
-public class ReposFragment extends Fragment implements Topic.Subscriber {
+public class ReposFragment extends BaseFragment implements Topic.Subscriber {
 
-    private Unbinder unbinder;
-    private MagiskManager mm;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
     @BindView(R.id.empty_rv) TextView emptyRv;
     @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
 
-    public static ReposAdapter adapter;
+    private ReposAdapter adapter;
 
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
@@ -42,47 +44,43 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
 
     @Nullable
     @Override
-    public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_repos, container, false);
-        unbinder = ButterKnife.bind(this, view);
-        mm = getApplication();
+        unbinder = new ReposFragment_ViewBinding(this, view);
 
-        mSwipeRefreshLayout.setRefreshing(mm.repoLoadDone.isPending());
+        mSwipeRefreshLayout.setRefreshing(true);
+        recyclerView.setVisibility(View.GONE);
 
         mSwipeRefreshLayout.setOnRefreshListener(() -> {
             recyclerView.setVisibility(View.VISIBLE);
             emptyRv.setVisibility(View.GONE);
-            new UpdateRepos(true).exec();
+            new UpdateRepos().exec(true);
         });
 
-        getActivity().setTitle(R.string.downloads);
+        requireActivity().setTitle(R.string.downloads);
 
         return view;
     }
 
     @Override
-    public void onResume() {
-        adapter = new ReposAdapter(mm.repoDB, mm.moduleMap);
-        recyclerView.setAdapter(adapter);
-        super.onResume();
+    public int[] getSubscribedTopics() {
+        return new int[] {Topic.MODULE_LOAD_DONE, Topic.REPO_LOAD_DONE};
     }
 
     @Override
-    public void onPause() {
-        super.onPause();
-        adapter = null;
-    }
-
-    @Override
-    public void onTopicPublished(Topic topic) {
-        mSwipeRefreshLayout.setRefreshing(false);
-        recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
-        emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { mm.repoLoadDone };
+    public void onPublish(int topic, Object[] result) {
+        if (topic == Topic.MODULE_LOAD_DONE) {
+            adapter = new ReposAdapter(mm.repoDB, (Map<String, Module>) result[0]);
+            mm.repoDB.registerAdapter(adapter);
+            recyclerView.setAdapter(adapter);
+            recyclerView.setVisibility(View.VISIBLE);
+            emptyRv.setVisibility(View.GONE);
+        }
+        if (Topic.isPublished(getSubscribedTopics())) {
+            mSwipeRefreshLayout.setRefreshing(false);
+            recyclerView.setVisibility(adapter.getItemCount() == 0 ? View.GONE : View.VISIBLE);
+            emptyRv.setVisibility(adapter.getItemCount() == 0 ? View.VISIBLE : View.GONE);
+        }
     }
 
     @Override
@@ -108,9 +106,9 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
         if (item.getItemId() == R.id.repo_sort) {
             new AlertDialog.Builder(getActivity())
                 .setTitle(R.string.sorting_order)
-                .setSingleChoiceItems(R.array.sorting_orders, mm.repoOrder, (d, which) -> {
-                    mm.repoOrder = which;
-                    mm.prefs.edit().putInt(Const.Key.REPO_ORDER, mm.repoOrder).apply();
+                .setSingleChoiceItems(R.array.sorting_orders, Data.repoOrder, (d, which) -> {
+                    Data.repoOrder = which;
+                    mm.prefs.edit().putInt(Const.Key.REPO_ORDER, Data.repoOrder).apply();
                     adapter.notifyDBChanged();
                     d.dismiss();
                 }).show();
@@ -121,6 +119,6 @@ public class ReposFragment extends Fragment implements Topic.Subscriber {
     @Override
     public void onDestroyView() {
         super.onDestroyView();
-        unbinder.unbind();
+        mm.repoDB.unregisterAdapter();
     }
 }

app/src/full/java/com/topjohnwu/magisk/fragments/SettingsFragment.java

@@ -0,0 +1,342 @@
+package com.topjohnwu.magisk.fragments;
+
+import android.annotation.SuppressLint;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.net.Uri;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.asyncs.CheckUpdates;
+import com.topjohnwu.magisk.asyncs.PatchAPK;
+import com.topjohnwu.magisk.receivers.DownloadReceiver;
+import com.topjohnwu.magisk.utils.Download;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Topic;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.IOException;
+import java.util.Locale;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceGroupAdapter;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.PreferenceViewHolder;
+import androidx.preference.SwitchPreference;
+import androidx.recyclerview.widget.RecyclerView;
+
+public class SettingsFragment extends PreferenceFragmentCompat
+        implements SharedPreferences.OnSharedPreferenceChangeListener,
+        Topic.Subscriber, Topic.AutoSubscriber {
+
+    private PreferenceScreen prefScreen;
+
+    private ListPreference updateChannel, suAccess, autoRes, suNotification,
+            requestTimeout, multiuserMode, namespaceMode;
+    private MagiskManager mm;
+    private PreferenceCategory generalCatagory;
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.app_settings, rootKey);
+        mm = Data.MM();
+        prefScreen = getPreferenceScreen();
+
+        generalCatagory = (PreferenceCategory) findPreference("general");
+        PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
+        PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
+        Preference hideManager = findPreference("hide");
+        Preference restoreManager = findPreference("restore");
+        findPreference("clear").setOnPreferenceClickListener((pref) -> {
+            mm.prefs.edit().remove(Const.Key.ETAG_KEY).apply();
+            mm.repoDB.clearRepo();
+            Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
+            return true;
+        });
+
+        updateChannel = (ListPreference) findPreference(Const.Key.UPDATE_CHANNEL);
+        suAccess = (ListPreference) findPreference(Const.Key.ROOT_ACCESS);
+        autoRes = (ListPreference) findPreference(Const.Key.SU_AUTO_RESPONSE);
+        requestTimeout = (ListPreference) findPreference(Const.Key.SU_REQUEST_TIMEOUT);
+        suNotification = (ListPreference) findPreference(Const.Key.SU_NOTIFICATION);
+        multiuserMode = (ListPreference) findPreference(Const.Key.SU_MULTIUSER_MODE);
+        namespaceMode = (ListPreference) findPreference(Const.Key.SU_MNT_NS);
+        SwitchPreference reauth = (SwitchPreference) findPreference(Const.Key.SU_REAUTH);
+        SwitchPreference fingerprint = (SwitchPreference) findPreference(Const.Key.SU_FINGERPRINT);
+
+        updateChannel.setOnPreferenceChangeListener((p, o) -> {
+            String prev =String.valueOf(Data.updateChannel);
+            int channel = Integer.parseInt((String) o);
+            if (channel == Const.Value.CUSTOM_CHANNEL) {
+                View v = LayoutInflater.from(requireActivity()).inflate(R.layout.custom_channel_dialog, null);
+                EditText url = v.findViewById(R.id.custom_url);
+                url.setText(mm.prefs.getString(Const.Key.CUSTOM_CHANNEL, ""));
+                new AlertDialog.Builder(requireActivity())
+                        .setTitle(R.string.settings_update_custom)
+                        .setView(v)
+                        .setPositiveButton(R.string.ok, (d, i) ->
+                                mm.prefs.edit().putString(Const.Key.CUSTOM_CHANNEL,
+                                        url.getText().toString()).apply())
+                        .setNegativeButton(R.string.close, (d, i) ->
+                                mm.prefs.edit().putString(Const.Key.UPDATE_CHANNEL, prev).apply())
+                        .setOnCancelListener(d ->
+                                mm.prefs.edit().putString(Const.Key.UPDATE_CHANNEL, prev).apply())
+                        .show();
+            }
+            return true;
+        });
+
+        setSummary();
+
+        // Disable dangerous settings in secondary user
+        if (Const.USER_ID > 0) {
+            suCategory.removePreference(multiuserMode);
+        }
+
+        // Disable re-authentication option on Android O, it will not work
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            reauth.setEnabled(false);
+            reauth.setChecked(false);
+            reauth.setSummary(R.string.android_o_not_support);
+        }
+
+        // Disable fingerprint option if not possible
+        if (!FingerprintHelper.canUseFingerprint()) {
+            fingerprint.setEnabled(false);
+            fingerprint.setChecked(false);
+            fingerprint.setSummary(R.string.disable_fingerprint);
+        }
+
+        if (Shell.rootAccess()) {
+            if (mm.getPackageName().equals(Const.ORIG_PKG_NAME)) {
+                hideManager.setOnPreferenceClickListener((pref) -> {
+                    PatchAPK.hideManager(requireActivity());
+                    return true;
+                });
+                generalCatagory.removePreference(restoreManager);
+            } else {
+                if (Download.checkNetworkStatus(mm)) {
+                    restoreManager.setOnPreferenceClickListener((pref) -> {
+                        Download.receive(
+                            requireActivity(), new DownloadReceiver() {
+                                @Override
+                                public void onDownloadDone(Context context, Uri uri) {
+                                    Data.exportPrefs();
+                                    Shell.su("cp " + uri.getPath() + " /data/local/tmp/manager.apk").exec();
+                                    if (ShellUtils.fastCmdResult("pm install /data/local/tmp/manager.apk")) {
+                                        Shell.su("rm -f /data/local/tmp/manager.apk").exec();
+                                        RootUtils.uninstallPkg(context.getPackageName());
+                                        return;
+                                    }
+                                    Shell.su("rm -f /data/local/tmp/manager.apk").exec();
+                                }
+                            },
+                            Data.managerLink,
+                            Utils.fmt("MagiskManager-v%s.apk", Data.remoteManagerVersionString)
+                        );
+                        return true;
+                    });
+                } else {
+                    generalCatagory.removePreference(restoreManager);
+                }
+                generalCatagory.removePreference(hideManager);
+            }
+        } else {
+            generalCatagory.removePreference(restoreManager);
+            generalCatagory.removePreference(hideManager);
+        }
+
+        if (!Shell.rootAccess() || (Const.USER_ID > 0 &&
+                Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
+            prefScreen.removePreference(suCategory);
+        }
+
+        if (!Shell.rootAccess()) {
+            prefScreen.removePreference(magiskCategory);
+            generalCatagory.removePreference(hideManager);
+        }
+    }
+
+    private void setLocalePreference(ListPreference lp) {
+        CharSequence[] entries = new CharSequence[LocaleManager.locales.size() + 1];
+        CharSequence[] entryValues = new CharSequence[LocaleManager.locales.size() + 1];
+        entries[0] = LocaleManager.getString(LocaleManager.defaultLocale, R.string.system_default);
+        entryValues[0] = "";
+        int i = 1;
+        for (Locale locale : LocaleManager.locales) {
+            entries[i] = locale.getDisplayName(locale);
+            entryValues[i++] = locale.toLanguageTag();
+        }
+        lp.setEntries(entries);
+        lp.setEntryValues(entryValues);
+        lp.setSummary(LocaleManager.locale.getDisplayName(LocaleManager.locale));
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        mm.prefs.registerOnSharedPreferenceChangeListener(this);
+        Topic.subscribe(this);
+        requireActivity().setTitle(R.string.settings);
+        return super.onCreateView(inflater, container, savedInstanceState);
+    }
+
+    @Override
+    public void onDestroyView() {
+        mm.prefs.unregisterOnSharedPreferenceChangeListener(this);
+        Topic.unsubscribe(this);
+        super.onDestroyView();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+        switch (key) {
+            case Const.Key.ROOT_ACCESS:
+            case Const.Key.SU_MULTIUSER_MODE:
+            case Const.Key.SU_MNT_NS:
+                mm.mDB.setSettings(key, Utils.getPrefsInt(prefs, key));
+                break;
+        }
+        Data.loadConfig();
+        setSummary();
+        switch (key) {
+            case Const.Key.DARK_THEME:
+                requireActivity().recreate();
+                break;
+            case Const.Key.COREONLY:
+                if (prefs.getBoolean(key, false)) {
+                    try {
+                        Const.MAGISK_DISABLE_FILE.createNewFile();
+                    } catch (IOException ignored) {}
+                } else {
+                    Const.MAGISK_DISABLE_FILE.delete();
+                }
+                Utils.toast(R.string.settings_reboot_toast, Toast.LENGTH_LONG);
+                break;
+            case Const.Key.MAGISKHIDE:
+                if (prefs.getBoolean(key, false)) {
+                    Shell.su("magiskhide --enable").submit();
+                } else {
+                    Shell.su("magiskhide --disable").submit();
+                }
+                break;
+            case Const.Key.HOSTS:
+                if (prefs.getBoolean(key, false)) {
+                    Shell.su("cp -af /system/etc/hosts " + Const.MAGISK_HOST_FILE,
+                            "mount -o bind " + Const.MAGISK_HOST_FILE + " /system/etc/hosts")
+                            .submit();
+                } else {
+                    Shell.su("umount -l /system/etc/hosts",
+                            "rm -f " + Const.MAGISK_HOST_FILE)
+                            .submit();
+                }
+                break;
+            case Const.Key.LOCALE:
+                LocaleManager.setLocale(mm);
+                requireActivity().recreate();
+                break;
+            case Const.Key.UPDATE_CHANNEL:
+            case Const.Key.CUSTOM_CHANNEL:
+                CheckUpdates.check();
+                break;
+            case Const.Key.CHECK_UPDATES:
+                Utils.setupUpdateCheck();
+                break;
+        }
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        String key = preference.getKey();
+        switch (key) {
+            case Const.Key.SU_FINGERPRINT:
+                boolean checked = ((SwitchPreference) preference).isChecked();
+                ((SwitchPreference) preference).setChecked(!checked);
+                FingerprintHelper.showAuthDialog(requireActivity(), () -> {
+                    ((SwitchPreference) preference).setChecked(checked);
+                    Data.suFingerprint = checked;
+                    mm.mDB.setSettings(key, checked ? 1 : 0);
+                });
+                break;
+        }
+        return true;
+    }
+
+    private void setSummary() {
+        updateChannel.setSummary(getResources()
+                .getStringArray(R.array.update_channel)[Data.updateChannel]);
+        suAccess.setSummary(getResources()
+                .getStringArray(R.array.su_access)[Data.suAccessState]);
+        autoRes.setSummary(getResources()
+                .getStringArray(R.array.auto_response)[Data.suResponseType]);
+        suNotification.setSummary(getResources()
+                .getStringArray(R.array.su_notification)[Data.suNotificationType]);
+        requestTimeout.setSummary(
+                getString(R.string.request_timeout_summary,
+                        mm.prefs.getString(Const.Key.SU_REQUEST_TIMEOUT, "10")));
+        multiuserMode.setSummary(getResources()
+                .getStringArray(R.array.multiuser_summary)[Data.multiuserMode]);
+        namespaceMode.setSummary(getResources()
+                .getStringArray(R.array.namespace_summary)[Data.suNamespaceMode]);
+    }
+
+    @Override
+    public void onPublish(int topic, Object[] result) {
+        setLocalePreference((ListPreference) findPreference(Const.Key.LOCALE));
+    }
+
+    @Override
+    public int[] getSubscribedTopics() {
+        return new int[] {Topic.LOCALE_FETCH_DONE};
+    }
+
+    @Override
+    protected RecyclerView.Adapter onCreateAdapter(PreferenceScreen preferenceScreen) {
+        return new PreferenceGroupAdapter(preferenceScreen) {
+            @SuppressLint("RestrictedApi")
+            @Override
+            public void onBindViewHolder(PreferenceViewHolder holder, int position) {
+                super.onBindViewHolder(holder, position);
+                Preference preference = getItem(position);
+                if (preference instanceof PreferenceCategory)
+                    setZeroPaddingToLayoutChildren(holder.itemView);
+                else {
+                    View iconFrame = holder.itemView.findViewById(R.id.icon_frame);
+                    if (iconFrame != null) {
+                        iconFrame.setVisibility(preference.getIcon() == null ? View.GONE : View.VISIBLE);
+                    }
+                }
+            }
+        };
+    }
+
+    private void setZeroPaddingToLayoutChildren(View view) {
+        if (!(view instanceof ViewGroup))
+            return;
+        ViewGroup viewGroup = (ViewGroup) view;
+        int childCount = viewGroup.getChildCount();
+        for (int i = 0; i < childCount; i++) {
+            setZeroPaddingToLayoutChildren(viewGroup.getChildAt(i));
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1)
+                viewGroup.setPaddingRelative(0, viewGroup.getPaddingTop(), viewGroup.getPaddingEnd(), viewGroup.getPaddingBottom());
+            else
+                viewGroup.setPadding(0, viewGroup.getPaddingTop(), viewGroup.getPaddingRight(), viewGroup.getPaddingBottom());
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/fragments/SuLogFragment.java

@@ -1,8 +1,6 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -11,20 +9,19 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.adapters.SuLogAdapter;
-import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.BaseFragment;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 
-public class SuLogFragment extends Fragment {
+public class SuLogFragment extends BaseFragment {
 
     @BindView(R.id.empty_rv) TextView emptyRv;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
 
-    private Unbinder unbinder;
-    private MagiskManager mm;
     private SuLogAdapter adapter;
 
     @Override
@@ -44,8 +41,7 @@ public class SuLogFragment extends Fragment {
                              Bundle savedInstanceState) {
         // Inflate the layout for this fragment
         View v = inflater.inflate(R.layout.fragment_su_log, container, false);
-        unbinder = ButterKnife.bind(this, v);
-        mm = getApplication();
+        unbinder = new SuLogFragment_ViewBinding(this, v);
         adapter = new SuLogAdapter(mm.mDB);
         recyclerView.setAdapter(adapter);
 
@@ -80,10 +76,4 @@ public class SuLogFragment extends Fragment {
                 return true;
         }
     }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
 }

app/src/full/java/com/topjohnwu/magisk/fragments/SuperuserFragment.java

@@ -1,39 +1,53 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.fragments;
 
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.adapters.PolicyAdapter;
-import com.topjohnwu.magisk.components.Fragment;
+import com.topjohnwu.magisk.components.BaseFragment;
 import com.topjohnwu.magisk.container.Policy;
 
 import java.util.List;
 
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
 import butterknife.BindView;
-import butterknife.ButterKnife;
-import butterknife.Unbinder;
 
-public class SuperuserFragment extends Fragment {
+public class SuperuserFragment extends BaseFragment {
 
-    private Unbinder unbinder;
     @BindView(R.id.recyclerView) RecyclerView recyclerView;
     @BindView(R.id.empty_rv) TextView emptyRv;
 
+    private PackageManager pm;
+
     @Nullable
     @Override
     public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.fragment_superuser, container, false);
-        unbinder = ButterKnife.bind(this, view);
+        unbinder = new SuperuserFragment_ViewBinding(this, view);
 
-        PackageManager pm = getActivity().getPackageManager();
-        MagiskManager mm = getApplication();
+        pm = requireActivity().getPackageManager();
+        return view;
+    }
 
+    @Override
+    public void onStart() {
+        super.onStart();
+        requireActivity().setTitle(getString(R.string.superuser));
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        displayPolicyList();
+    }
+
+    private void displayPolicyList() {
         List<Policy> policyList = mm.mDB.getPolicyList(pm);
 
         if (policyList.size() == 0) {
@@ -44,20 +58,6 @@ public class SuperuserFragment extends Fragment {
             emptyRv.setVisibility(View.GONE);
             recyclerView.setVisibility(View.VISIBLE);
         }
-
-        return view;
-    }
-
-    @Override
-    public void onStart() {
-        super.onStart();
-        getActivity().setTitle(getString(R.string.superuser));
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
     }
 
 }

app/src/full/java/com/topjohnwu/magisk/receivers/BootReceiver.java

@@ -0,0 +1,35 @@
+package com.topjohnwu.magisk.receivers;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.SuRequestActivity;
+import com.topjohnwu.magisk.services.OnBootService;
+import com.topjohnwu.magisk.utils.SuConnector;
+
+public class BootReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        if (TextUtils.equals(intent.getAction(), Intent.ACTION_BOOT_COMPLETED)) {
+            switch (intent.getExtras().getString("action", "boot")) {
+                case "request":
+                    Intent i = new Intent(context, Data.classMap.get(SuRequestActivity.class))
+                            .putExtra("socket", intent.getStringExtra("socket"))
+                            .putExtra("version", 2)
+                            .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+                    context.startActivity(i);
+                    break;
+                case "log":
+                    SuConnector.handleLogs(intent, 2);
+                    break;
+                case "boot":
+                    OnBootService.enqueueWork(context);
+                    break;
+            }
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/receivers/ManagerUpdate.java

@@ -6,20 +6,21 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.AsyncTask;
 
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.PatchAPK;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.asyncs.PatchAPK;
+import com.topjohnwu.magisk.utils.Download;
+import com.topjohnwu.utils.JarMap;
+import com.topjohnwu.utils.SignAPK;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 
 public class ManagerUpdate extends BroadcastReceiver {
 
     @Override
     public void onReceive(Context context, Intent intent) {
-        Utils.dlAndReceive(
+        Download.receive(
                 context, new PatchedInstall(),
                 intent.getStringExtra(Const.Key.INTENT_SET_LINK),
                 intent.getStringExtra(Const.Key.INTENT_SET_FILENAME)
@@ -31,13 +32,14 @@ public class ManagerUpdate extends BroadcastReceiver {
         public void onDownloadDone(Context context, Uri uri) {
             if (!context.getPackageName().equals(Const.ORIG_PKG_NAME)) {
                 AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
-                    String o = uri.getPath();
-                    String p = o.substring(0, o.lastIndexOf('.')) + "-patched.apk";
+                    String orig = uri.getPath();
+                    String patch = orig.substring(0, orig.lastIndexOf('.')) + "-patched.apk";
                     try {
-                        PatchAPK.patchPackageID(o, new BufferedOutputStream(new FileOutputStream(p)),
-                                Const.ORIG_PKG_NAME, context.getPackageName());
-                    } catch (FileNotFoundException ignored) { }
-                    super.onDownloadDone(context, Uri.fromFile(new File(p)));
+                        JarMap apk = new JarMap(orig);
+                        PatchAPK.patchPackageID(apk, Const.ORIG_PKG_NAME, context.getPackageName());
+                        SignAPK.sign(apk, new BufferedOutputStream(new FileOutputStream(patch)));
+                        super.onDownloadDone(context, Uri.fromFile(new File(patch)));
+                    } catch (Exception ignored) { }
                 });
             } else {
                 super.onDownloadDone(context, uri);

app/src/full/java/com/topjohnwu/magisk/receivers/PackageReceiver.java

@@ -4,15 +4,15 @@ import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
 public class PackageReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        MagiskManager mm = Utils.getMagiskManager(context);
+        MagiskManager mm = Data.MM();
 
         String pkg = intent.getData().getEncodedSchemeSpecificPart();
 
@@ -25,7 +25,7 @@ public class PackageReceiver extends BroadcastReceiver {
                 break;
             case Intent.ACTION_PACKAGE_FULLY_REMOVED:
                 mm.mDB.deletePolicy(pkg);
-                Shell.Async.su("magiskhide --rm " + pkg);
+                Shell.su("magiskhide --rm " + pkg).submit();
                 break;
         }
     }

app/src/full/java/com/topjohnwu/magisk/receivers/RebootReceiver.java

@@ -9,6 +9,6 @@ import com.topjohnwu.superuser.Shell;
 public class RebootReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
-        Shell.Async.su("/system/bin/reboot");
+        Shell.su("/system/bin/reboot").submit();
     }
 }

app/src/full/java/com/topjohnwu/magisk/receivers/ShortcutReceiver.java

@@ -7,28 +7,24 @@ import android.content.pm.ShortcutInfo;
 import android.content.pm.ShortcutManager;
 import android.graphics.drawable.Icon;
 import android.os.Build;
-import android.support.annotation.RequiresApi;
-import android.text.TextUtils;
 
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
 import com.topjohnwu.magisk.MagiskManager;
 import com.topjohnwu.magisk.R;
 import com.topjohnwu.magisk.SplashActivity;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
 
+import androidx.annotation.RequiresApi;
+
 public class ShortcutReceiver extends BroadcastReceiver {
     @Override
     public void onReceive(Context context, Intent intent) {
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
-            MagiskManager mm = Utils.getMagiskManager(context);
+            MagiskManager mm = Data.MM();
             ShortcutManager manager = context.getSystemService(ShortcutManager.class);
-            if (TextUtils.equals(intent.getAction(), Intent.ACTION_LOCALE_CHANGED)) {
-                // It is triggered with locale change, manual load Magisk info
-                mm.loadMagiskInfo();
-            }
             manager.setDynamicShortcuts(getShortCuts(mm));
         }
     }
@@ -36,12 +32,12 @@ public class ShortcutReceiver extends BroadcastReceiver {
     @RequiresApi(api = Build.VERSION_CODES.N_MR1)
     private ArrayList<ShortcutInfo> getShortCuts(MagiskManager mm) {
         ArrayList<ShortcutInfo> shortCuts = new ArrayList<>();
-        if (Shell.rootAccess() &&
-                !(Const.USER_ID > 0 &&
-                        mm.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
+        boolean root = Shell.rootAccess();
+        if (root && !(Const.USER_ID > 0 &&
+                Data.multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
             shortCuts.add(new ShortcutInfo.Builder(mm, "superuser")
                     .setShortLabel(mm.getString(R.string.superuser))
-                    .setIntent(new Intent(mm, SplashActivity.class)
+                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
                             .putExtra(Const.Key.OPEN_SECTION, "superuser")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
@@ -49,11 +45,10 @@ public class ShortcutReceiver extends BroadcastReceiver {
                     .setRank(0)
                     .build());
         }
-        if (Shell.rootAccess() && mm.magiskVersionCode >= Const.MAGISK_VER.UNIFIED
-                && mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false)) {
+        if (root && mm.prefs.getBoolean(Const.Key.MAGISKHIDE, false)) {
             shortCuts.add(new ShortcutInfo.Builder(mm, "magiskhide")
                     .setShortLabel(mm.getString(R.string.magiskhide))
-                    .setIntent(new Intent(mm, SplashActivity.class)
+                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
                             .putExtra(Const.Key.OPEN_SECTION, "magiskhide")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
@@ -61,11 +56,10 @@ public class ShortcutReceiver extends BroadcastReceiver {
                     .setRank(1)
                     .build());
         }
-        if (!mm.prefs.getBoolean(Const.Key.COREONLY, false) &&
-                Shell.rootAccess() && mm.magiskVersionCode >= 0) {
+        if (!mm.prefs.getBoolean(Const.Key.COREONLY, false) && root && Data.magiskVersionCode >= 0) {
             shortCuts.add(new ShortcutInfo.Builder(mm, "modules")
                     .setShortLabel(mm.getString(R.string.modules))
-                    .setIntent(new Intent(mm, SplashActivity.class)
+                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
                             .putExtra(Const.Key.OPEN_SECTION, "modules")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
@@ -74,7 +68,7 @@ public class ShortcutReceiver extends BroadcastReceiver {
                     .build());
             shortCuts.add(new ShortcutInfo.Builder(mm, "downloads")
                     .setShortLabel(mm.getString(R.string.download))
-                    .setIntent(new Intent(mm, SplashActivity.class)
+                    .setIntent(new Intent(mm, Data.classMap.get(SplashActivity.class))
                             .putExtra(Const.Key.OPEN_SECTION, "downloads")
                             .setAction(Intent.ACTION_VIEW)
                             .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))

app/src/full/java/com/topjohnwu/magisk/services/OnBootService.java

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.services;
+
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.utils.NotificationMgr;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import androidx.annotation.NonNull;
+import androidx.core.app.JobIntentService;
+
+public class OnBootService extends JobIntentService {
+
+    public static void enqueueWork(Context context) {
+        enqueueWork(context, Data.classMap.get(OnBootService.class), Const.ID.ONBOOT_SERVICE_ID, new Intent());
+    }
+
+    @Override
+    protected void onHandleWork(@NonNull Intent intent) {
+        /* Devices with DTBO might want to patch dtbo.img.
+         * However, that is not possible if Magisk is installed by
+         * patching boot image with Magisk Manager and flashed via
+         * fastboot, since at that time we do not have root.
+         * Check for dtbo status every boot time, and prompt user
+         * to reboot if dtbo wasn't patched and patched by Magisk Manager.
+         * */
+        if (Shell.rootAccess() && ShellUtils.fastCmdResult("mm_patch_dtbo"))
+            NotificationMgr.dtboPatched();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/services/UpdateCheckService.java

@@ -4,15 +4,14 @@ import android.app.job.JobParameters;
 import android.app.job.JobService;
 
 import com.topjohnwu.magisk.asyncs.CheckUpdates;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
 
 public class UpdateCheckService extends JobService {
 
     @Override
     public boolean onStartJob(JobParameters params) {
-        Utils.getMagiskManager(this).loadMagiskInfo();
-        new CheckUpdates(true)
-                .setCallBack(() -> jobFinished(params, false)).exec();
+        Shell.getShell();
+        CheckUpdates.check(() -> jobFinished(params, false));
         return true;
     }
 

app/src/full/java/com/topjohnwu/magisk/superuser/RequestActivity.java

@@ -0,0 +1,21 @@
+package com.topjohnwu.magisk.superuser;
+
+import android.content.Intent;
+import android.os.Bundle;
+
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.SuRequestActivity;
+import com.topjohnwu.magisk.components.BaseActivity;
+
+public class RequestActivity extends BaseActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Intent intent = new Intent(this, Data.classMap.get(SuRequestActivity.class))
+                .putExtra("socket", getIntent().getStringExtra("socket"))
+                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        startActivity(intent);
+        finish();
+    }
+}

app/src/full/java/com/topjohnwu/magisk/superuser/SuReceiver.java

@@ -0,0 +1,15 @@
+package com.topjohnwu.magisk.superuser;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.utils.SuConnector;
+
+public class SuReceiver extends BroadcastReceiver {
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        SuConnector.handleLogs(intent, 1);
+    }
+}

app/src/full/java/com/topjohnwu/magisk/utils/BootSigner.java

@@ -1,12 +1,12 @@
 package com.topjohnwu.magisk.utils;
 
-import android.support.annotation.Keep;
-
 import com.topjohnwu.utils.SignBoot;
 
 import java.io.FileInputStream;
 import java.io.InputStream;
 
+import androidx.annotation.Keep;
+
 public class BootSigner {
 
     @Keep

app/src/full/java/com/topjohnwu/magisk/utils/FingerprintHelper.java

@@ -0,0 +1,174 @@
+package com.topjohnwu.magisk.utils;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+import android.app.KeyguardManager;
+import android.content.res.Resources;
+import android.content.res.TypedArray;
+import android.graphics.Color;
+import android.graphics.drawable.Drawable;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Build;
+import android.os.CancellationSignal;
+import android.security.keystore.KeyGenParameterSpec;
+import android.security.keystore.KeyPermanentlyInvalidatedException;
+import android.security.keystore.KeyProperties;
+import android.view.Gravity;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.components.CustomAlertDialog;
+
+import java.security.KeyStore;
+
+import javax.crypto.Cipher;
+import javax.crypto.KeyGenerator;
+import javax.crypto.SecretKey;
+
+@TargetApi(Build.VERSION_CODES.M)
+public abstract class FingerprintHelper {
+
+    private FingerprintManager manager;
+    private Cipher cipher;
+    private CancellationSignal cancel;
+
+    public static boolean canUseFingerprint() {
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
+            return false;
+        MagiskManager mm = Data.MM();
+        KeyguardManager km = mm.getSystemService(KeyguardManager.class);
+        FingerprintManager fm = mm.getSystemService(FingerprintManager.class);
+        return km.isKeyguardSecure() && fm != null && fm.isHardwareDetected() && fm.hasEnrolledFingerprints();
+    }
+
+    public static void showAuthDialog(Activity activity, Runnable onSuccess) {
+        CustomAlertDialog dialog = new CustomAlertDialog(activity);
+        CustomAlertDialog.ViewHolder vh = dialog.getViewHolder();
+        try {
+            FingerprintHelper helper = new FingerprintHelper() {
+                @Override
+                public void onAuthenticationError(int errorCode, CharSequence errString) {
+                    vh.messageView.setTextColor(Color.RED);
+                    vh.messageView.setText(errString);
+                }
+
+                @Override
+                public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+                    vh.messageView.setTextColor(Color.RED);
+                    vh.messageView.setText(helpString);
+                }
+
+                @Override
+                public void onAuthenticationFailed() {
+                    vh.messageView.setTextColor(Color.RED);
+                    vh.messageView.setText(R.string.auth_fail);
+                }
+
+                @Override
+                public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+                    dialog.dismiss();
+                    onSuccess.run();
+                }
+            };
+            Drawable fingerprint = activity.getResources().getDrawable(R.drawable.ic_fingerprint);
+            fingerprint.setBounds(0, 0, Utils.dpInPx(50), Utils.dpInPx(50));
+            Resources.Theme theme = activity.getTheme();
+            TypedArray ta = theme.obtainStyledAttributes(new int[] {R.attr.imageColorTint});
+            fingerprint.setTint(ta.getColor(0, Color.GRAY));
+            ta.recycle();
+            vh.messageView.setCompoundDrawables(null, null, null, fingerprint);
+            vh.messageView.setCompoundDrawablePadding(Utils.dpInPx(20));
+            vh.messageView.setGravity(Gravity.CENTER);
+            dialog.setMessage(R.string.auth_fingerprint)
+                    .setNegativeButton(R.string.close, (d, w) -> helper.cancel())
+                    .setOnCancelListener(d -> helper.cancel())
+                    .show();
+            helper.authenticate();
+        } catch (Exception e) {
+            e.printStackTrace();
+            Utils.toast(R.string.auth_fail, Toast.LENGTH_SHORT);
+        }
+
+    }
+
+    protected FingerprintHelper() throws Exception {
+        KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
+        manager = Data.MM().getSystemService(FingerprintManager.class);
+        cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/"
+                + KeyProperties.BLOCK_MODE_CBC + "/"
+                + KeyProperties.ENCRYPTION_PADDING_PKCS7);
+        keyStore.load(null);
+        SecretKey key = (SecretKey) keyStore.getKey(Const.SU_KEYSTORE_KEY, null);
+        if (key == null) {
+            key = generateKey();
+        }
+        try {
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+        } catch (KeyPermanentlyInvalidatedException e) {
+            // Only happens on Marshmallow
+            key = generateKey();
+            cipher.init(Cipher.ENCRYPT_MODE, key);
+        }
+    }
+
+    public abstract void onAuthenticationError(int errorCode, CharSequence errString);
+
+    public abstract void onAuthenticationHelp(int helpCode, CharSequence helpString);
+
+    public abstract void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result);
+
+    public abstract void onAuthenticationFailed();
+
+    public void authenticate() {
+        cancel = new CancellationSignal();
+        FingerprintManager.CryptoObject cryptoObject = new FingerprintManager.CryptoObject(cipher);
+        manager.authenticate(cryptoObject, cancel, 0, new Callback(), null);
+    }
+
+    public void cancel() {
+        if (cancel != null)
+            cancel.cancel();
+    }
+
+    private SecretKey generateKey() throws Exception {
+        KeyGenerator keygen = KeyGenerator
+                .getInstance(KeyProperties.KEY_ALGORITHM_AES, "AndroidKeyStore");
+        KeyGenParameterSpec.Builder builder = new KeyGenParameterSpec.Builder(
+                Const.SU_KEYSTORE_KEY,
+                KeyProperties.PURPOSE_ENCRYPT | KeyProperties.PURPOSE_DECRYPT)
+                .setBlockModes(KeyProperties.BLOCK_MODE_CBC)
+                .setUserAuthenticationRequired(true)
+                .setEncryptionPaddings(KeyProperties.ENCRYPTION_PADDING_PKCS7);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            builder.setInvalidatedByBiometricEnrollment(false);
+        }
+        keygen.init(builder.build());
+        return keygen.generateKey();
+    }
+
+    private class Callback extends FingerprintManager.AuthenticationCallback {
+        @Override
+        public void onAuthenticationError(int errorCode, CharSequence errString) {
+            FingerprintHelper.this.onAuthenticationError(errorCode, errString);
+        }
+
+        @Override
+        public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+            FingerprintHelper.this.onAuthenticationHelp(helpCode, helpString);
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+            FingerprintHelper.this.onAuthenticationSucceeded(result);
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+            FingerprintHelper.this.onAuthenticationFailed();
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java

@@ -1,22 +1,18 @@
 package com.topjohnwu.magisk.utils;
 
-import android.support.annotation.Keep;
-
 public interface ISafetyNetHelper {
 
-    int CAUSE_SERVICE_DISCONNECTED = 0x01;
-    int CAUSE_NETWORK_LOST = 0x02;
-    int RESPONSE_ERR = 0x04;
-    int CONNECTION_FAIL = 0x08;
+    int RESPONSE_ERR = 0x01;
+    int CONNECTION_FAIL = 0x02;
 
     int BASIC_PASS = 0x10;
     int CTS_PASS = 0x20;
 
     void attest();
+
     int getVersion();
 
     interface Callback {
-        @Keep
         void onResponse(int responseCode);
     }
 }

app/src/full/java/com/topjohnwu/magisk/utils/LocaleManager.java

@@ -0,0 +1,77 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.AsyncTask;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+
+import androidx.annotation.StringRes;
+
+public class LocaleManager {
+    public static Locale locale = Locale.getDefault();
+    public final static Locale defaultLocale = Locale.getDefault();
+    public static List<Locale> locales;
+
+    public static void setLocale(MagiskManager mm) {
+        String localeConfig = mm.prefs.getString(Const.Key.LOCALE, "");
+        if (localeConfig.isEmpty()) {
+            locale = defaultLocale;
+        } else {
+            locale = Locale.forLanguageTag(localeConfig);
+        }
+        Locale.setDefault(locale);
+        Resources res = mm.getResources();
+        Configuration config = res.getConfiguration();
+        config.setLocale(locale);
+        res.updateConfiguration(config, res.getDisplayMetrics());
+    }
+
+    public static String getString(Locale locale, @StringRes int id) {
+        Configuration config = new Configuration();
+        config.setLocale(locale);
+        return Data.MM().createConfigurationContext(config).getString(id);
+    }
+
+    public static void loadAvailableLocales() {
+        AsyncTask.THREAD_POOL_EXECUTOR.execute(() -> {
+            locales = new ArrayList<>();
+            HashSet<String> set = new HashSet<>();
+            Resources res = Data.MM().getResources();
+            Locale locale;
+
+            @StringRes int compareId = R.string.download_file_error;
+
+            // Add default locale
+            locales.add(Locale.ENGLISH);
+            set.add(getString(Locale.ENGLISH, compareId));
+
+            // Add some special locales
+            locales.add(Locale.TAIWAN);
+            set.add(getString(Locale.TAIWAN, compareId));
+            locale = new Locale("pt", "BR");
+            locales.add(locale);
+            set.add(getString(locale, compareId));
+
+            // Other locales
+            for (String s : res.getAssets().getLocales()) {
+                locale = Locale.forLanguageTag(s);
+                if (set.add(getString(locale, compareId))) {
+                    locales.add(locale);
+                }
+            }
+
+            Collections.sort(locales, (a, b) -> a.getDisplayName(a).compareTo(b.getDisplayName(b)));
+            Topic.publish(Topic.LOCALE_FETCH_DONE);
+        });
+    }
+}

app/src/full/java/com/topjohnwu/magisk/utils/Logger.java

@@ -3,8 +3,7 @@ package com.topjohnwu.magisk.utils;
 import android.util.Log;
 
 import com.topjohnwu.magisk.BuildConfig;
-
-import java.util.Locale;
+import com.topjohnwu.magisk.Const;
 
 public class Logger {
 

app/src/full/java/com/topjohnwu/magisk/utils/NotificationMgr.java

@@ -0,0 +1,87 @@
+package com.topjohnwu.magisk.utils;
+
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.SplashActivity;
+import com.topjohnwu.magisk.receivers.ManagerUpdate;
+import com.topjohnwu.magisk.receivers.RebootReceiver;
+
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.TaskStackBuilder;
+
+public class NotificationMgr {
+
+    public static void magiskUpdate() {
+        MagiskManager mm = Data.MM();
+
+        Intent intent = new Intent(mm, Data.classMap.get(SplashActivity.class));
+        intent.putExtra(Const.Key.OPEN_SECTION, "magisk");
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(mm);
+        stackBuilder.addParentStack(Data.classMap.get(SplashActivity.class));
+        stackBuilder.addNextIntent(intent);
+        PendingIntent pendingIntent = stackBuilder.getPendingIntent(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID,
+                PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk_outline)
+                .setContentTitle(mm.getString(R.string.magisk_update_title))
+                .setContentText(mm.getString(R.string.magisk_update_available, Data.remoteMagiskVersionString))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager =
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, builder.build());
+    }
+
+    public static void managerUpdate() {
+        MagiskManager mm = Data.MM();
+        String filename = Utils.fmt("MagiskManager-v%s(%d).apk",
+                Data.remoteManagerVersionString, Data.remoteManagerVersionCode);
+
+        Intent intent = new Intent(mm, Data.classMap.get(ManagerUpdate.class));
+        intent.putExtra(Const.Key.INTENT_SET_LINK, Data.managerLink);
+        intent.putExtra(Const.Key.INTENT_SET_FILENAME, filename);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
+                Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk_outline)
+                .setContentTitle(mm.getString(R.string.manager_update_title))
+                .setContentText(mm.getString(R.string.manager_download_install))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        NotificationManager notificationManager =
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(Const.ID.APK_UPDATE_NOTIFICATION_ID, builder.build());
+    }
+
+    public static void dtboPatched() {
+        MagiskManager mm = Data.MM();
+
+        Intent intent = new Intent(mm, Data.classMap.get(RebootReceiver.class));
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(mm,
+                Const.ID.DTBO_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(mm, Const.ID.NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk_outline)
+                .setContentTitle(mm.getString(R.string.dtbo_patched_title))
+                .setContentText(mm.getString(R.string.dtbo_patched_reboot))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .addAction(R.drawable.ic_refresh, mm.getString(R.string.reboot), pendingIntent);
+
+        NotificationManager notificationManager =
+                (NotificationManager) mm.getSystemService(Context.NOTIFICATION_SERVICE);
+        notificationManager.notify(Const.ID.DTBO_NOTIFICATION_ID, builder.build());
+    }
+}

app/src/full/java/com/topjohnwu/magisk/utils/RootUtils.java

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Context;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.superuser.BusyBox;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.io.File;
+import java.io.InputStream;
+
+import androidx.annotation.NonNull;
+
+public class RootUtils extends Shell.Initializer {
+
+    static {
+        BusyBox.BB_PATH = new File(Const.BUSYBOX_PATH);
+    }
+
+    public static void uninstallPkg(String pkg) {
+        Shell.su("db_clean " + Const.USER_ID, "pm uninstall " + pkg).exec();
+    }
+
+    @Override
+    public boolean onInit(Context context, @NonNull Shell shell) {
+        Shell.Job job = shell.newJob();
+        if (shell.isRoot()) {
+            InputStream magiskUtils = context.getResources().openRawResource(R.raw.util_functions);
+            InputStream managerUtils = context.getResources().openRawResource(R.raw.utils);
+            job.add(magiskUtils).add(managerUtils);
+
+            Const.MAGISK_DISABLE_FILE = new SuFile("/cache/.disable_magisk");
+            SuFile file = new SuFile("/sbin/.core/img");
+            if (file.exists()) {
+                Const.MAGISK_PATH = file;
+            } else if ((file = new SuFile("/dev/magisk/img")).exists()) {
+                Const.MAGISK_PATH = file;
+            } else {
+                Const.MAGISK_PATH = new SuFile("/magisk");
+            }
+            Const.MAGISK_HOST_FILE = new SuFile(Const.MAGISK_PATH + "/.core/hosts");
+
+            Data.loadMagiskInfo();
+        } else {
+            InputStream nonroot = context.getResources().openRawResource(R.raw.nonroot_utils);
+            job.add(nonroot);
+        }
+
+        job.add("mount_partitions", "get_flags", "run_migrations", "export BOOTMODE=true").exec();
+
+        Data.keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY"));
+        Data.keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT"));
+        return true;
+    }
+}

app/src/full/java/com/topjohnwu/magisk/utils/SuConnector.java

@@ -0,0 +1,118 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.net.LocalSocket;
+import android.os.Bundle;
+import android.os.Process;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.Data;
+import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.container.Policy;
+import com.topjohnwu.magisk.container.SuLogEntry;
+
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.Date;
+
+public abstract class SuConnector {
+
+    protected LocalSocket socket = new LocalSocket();
+
+    private String readString(DataInputStream is) throws IOException {
+        int len = is.readInt();
+        byte[] buf = new byte[len];
+        is.readFully(buf);
+        return new String(buf);
+    }
+
+    public Bundle readSocketInput() throws IOException {
+        Bundle bundle = new Bundle();
+        DataInputStream is = new DataInputStream(socket.getInputStream());
+        while (true) {
+            String name = readString(is);
+            if (TextUtils.equals(name, "eof"))
+                break;
+            bundle.putString(name, readString(is));
+        }
+        return bundle;
+    }
+
+    protected DataOutputStream getOutputStream() throws IOException {
+        return new DataOutputStream(socket.getOutputStream());
+    }
+
+    public abstract void response();
+
+    public static void handleLogs(Intent intent, int version) {
+        MagiskManager mm = Data.MM();
+
+        if (intent == null) return;
+
+        int fromUid = intent.getIntExtra("from.uid", -1);
+        if (fromUid < 0) return;
+        if (fromUid == Process.myUid()) return;
+
+        Policy policy = mm.mDB.getPolicy(fromUid);
+        if (policy == null) {
+            try {
+                policy = new Policy(fromUid, mm.getPackageManager());
+            } catch (PackageManager.NameNotFoundException e) {
+                e.printStackTrace();
+                return;
+            }
+        }
+
+        SuLogEntry log = new SuLogEntry(policy);
+        if (version == 1) {
+            String action = intent.getStringExtra("action");
+            if (action == null) return;
+            switch (action) {
+                case "allow":
+                    log.action = true;
+                    break;
+                case "deny":
+                    log.action = false;
+                    break;
+                default:
+                    return;
+            }
+        } else {
+            switch (intent.getIntExtra("policy", -1)) {
+                case Policy.ALLOW:
+                    log.action = true;
+                    break;
+                case Policy.DENY:
+                    log.action = false;
+                    break;
+                default:
+                    return;
+            }
+        }
+
+        String message = mm.getString(log.action ?
+                R.string.su_allow_toast : R.string.su_deny_toast, policy.appName);
+
+        if (policy.notification && Data.suNotificationType == Const.Value.NOTIFICATION_TOAST)
+            Utils.toast(message, Toast.LENGTH_SHORT);
+
+        if (policy.logging) {
+            int toUid = intent.getIntExtra("to.uid", -1);
+            if (toUid < 0) return;
+            int pid = intent.getIntExtra("pid", -1);
+            if (pid < 0) return;
+            String command = intent.getStringExtra("command");
+            if (command == null) return;
+            log.toUid = toUid;
+            log.fromPid = pid;
+            log.command = command;
+            log.date = new Date();
+            mm.mDB.addLog(log);
+        }
+    }
+}

app/src/full/java/com/topjohnwu/magisk/utils/Topic.java

@@ -0,0 +1,107 @@
+package com.topjohnwu.magisk.utils;
+
+import com.topjohnwu.magisk.Data;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.HashSet;
+import java.util.Set;
+
+import androidx.annotation.IntDef;
+
+public class Topic {
+
+    public static final int MAGISK_HIDE_DONE = 0;
+    public static final int MODULE_LOAD_DONE = 1;
+    public static final int REPO_LOAD_DONE = 2;
+    public static final int UPDATE_CHECK_DONE = 3;
+    public static final int SNET_CHECK_DONE = 4;
+    public static final int LOCALE_FETCH_DONE = 5;
+
+    @IntDef({MAGISK_HIDE_DONE, MODULE_LOAD_DONE, REPO_LOAD_DONE,
+            UPDATE_CHECK_DONE, SNET_CHECK_DONE, LOCALE_FETCH_DONE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface TopicID {}
+
+    // We will not dynamically add topics, so use arrays instead of hash tables
+    private static Store[] topicList = new Store[6];
+
+    public static void subscribe(Subscriber sub, @TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                topicList[topic] = new Store();
+            topicList[topic].subscribers.add(sub);
+            if (topicList[topic].published) {
+                sub.onPublish(topic, topicList[topic].results);
+            }
+        }
+    }
+
+    public static void subscribe(AutoSubscriber sub) {
+        if (sub instanceof Subscriber)
+            subscribe((Subscriber) sub, sub.getSubscribedTopics());
+    }
+
+    public static void unsubscribe(Subscriber sub, @TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                continue;
+            topicList[topic].subscribers.remove(sub);
+        }
+    }
+
+    public static void unsubscribe(AutoSubscriber sub) {
+        if (sub instanceof Subscriber)
+            unsubscribe((Subscriber) sub, sub.getSubscribedTopics());
+    }
+
+    public static void publish(@TopicID int topic, Object... results) {
+        publish(true, topic, results);
+    }
+
+    public static void publish(boolean persist, @TopicID int topic, Object... results) {
+        if (topicList[topic] == null)
+            topicList[topic] = new Store();
+        if (persist) {
+            topicList[topic].results = results;
+            topicList[topic].published = true;
+        }
+        for (Subscriber sub : topicList[topic].subscribers) {
+            Data.mainHandler.post(() -> sub.onPublish(topic, results));
+        }
+    }
+
+    public static void reset(@TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                continue;
+            topicList[topic].published = false;
+            topicList[topic].results = null;
+        }
+    }
+
+    public static boolean isPublished(@TopicID int... topics) {
+        for (int topic : topics) {
+            if (topicList[topic] == null)
+                return false;
+            if (!topicList[topic].published)
+                return false;
+        }
+        return true;
+    }
+
+    private static class Store {
+        boolean published = false;
+        Set<Subscriber> subscribers = new HashSet<>();
+        Object[] results;
+    }
+
+    public interface Subscriber {
+        void onPublish(int topic, Object[] result);
+    }
+
+    public interface AutoSubscriber {
+        @TopicID
+        int[] getSubscribedTopics();
+    }
+}