Update app changelog

Added missing strings

.gitattributes

@@ -0,0 +1,19 @@
+# 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
+*.jpg binary

.gitignore

@@ -1,12 +1,17 @@
+out
+*.zip
+*.jks
+*.apk
+config.prop
+update.sh
+
+# Built binaries
+native/out
+
+# Android Studio / Gradle
 *.iml
 .gradle
 /local.properties
-.idea/
+/.idea
 /build
-app/release
-*.hprof
-.externalNativeBuild/
-src/main/assets
-public.certificate.x509.pem
-private.key.pk8
-*.apk
+/captures

.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,75 @@
+# 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 4.2 (API 17). 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
+
+-  Python 3: run `build.py` script
+-  Java Development Kit (JDK) 8: Compile Magisk Manager and sign zips
+-  Latest Android SDK: set `ANDROID_HOME` environment variable to the path to Android SDK
+-  Android NDK: Install NDK along with SDK (`$ANDROID_HOME/ndk-bundle`), or optionally specify a custom path `ANDROID_NDK_HOME`
+-  (Windows Only) Python package Colorama: Install with `pip install colorama`, used for ANSI color codes
+
+## Building Notes and Instructions
+
+-  Clone sources with submodules: `git clone --recurse-submodules https://github.com/topjohnwu/Magisk.git`
+-  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.
+-  Set configurations in `config.prop`. A sample file `config.prop.sample` is provided as an example.
+-  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`
+-  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).
+
+## Translations
+
+Default string resources for Magisk Manager are scattered throughout
+
+- `app/src/main/res/values/strings.xml`
+- `stub/src/main/res/values/strings.xml`
+- `shared/src/main/res/values/strings.xml`
+
+Translate each and place them in the respective locations (`<module>/src/main/res/values-<lang>/strings.xml`).
+
+## Signature Verification
+
+Official release zips and APKs are signed with my personal private key. You can verify the key certificate to make sure the binaries you downloaded are not manipulated in anyway.
+
+``` bash
+# Use the keytool command from JDK to print certificates
+keytool -printcert -jarfile <APK or Magisk zip>
+
+# The output should contain the following signature
+Owner: CN=John Wu, L=Taipei, C=TW
+Issuer: CN=John Wu, L=Taipei, C=TW
+Serial number: 50514879
+Valid from: Sun Aug 14 13:23:44 EDT 2016 until: Tue Jul 21 13:23:44 EDT 2116
+Certificate fingerprints:
+	 MD5:  CE:DA:68:C1:E1:74:71:0A:EF:58:89:7D:AE:6E:AB:4F
+	 SHA1: DC:0F:2B:61:CB:D7:E9:D3:DB:BE:06:0B:2B:87:0D:46:BB:06:02:11
+	 SHA256: B4:CB:83:B4:DA:D9:9F:99:7D:BE:87:2F:01:3A:A1:6C:14:EE:C4:1D:16:70:21:F3:71:F7:E1:33:0F:27:3E:E6
+	 Signature algorithm name: SHA256withRSA
+	 Version: 3
+```
+
+## 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,2 +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).

app/.gitignore

@@ -0,0 +1,11 @@
+*.iml
+.gradle
+/local.properties
+.idea/
+/build
+app/release
+*.hprof
+.externalNativeBuild/
+public.certificate.x509.pem
+private.key.pk8
+*.apk

app/build.gradle

@@ -0,0 +1,66 @@
+apply plugin: 'com.android.application'
+apply plugin: 'kotlin-android-extensions'
+apply plugin: 'kotlin-android'
+apply plugin: 'kotlin-kapt'
+
+kapt {
+    correctErrorTypes = true
+    useBuildCache = true
+    mapDiagnosticLocations = true
+    javacOptions {
+        option("-Xmaxerrs", 1000)
+    }
+}
+
+android {
+    defaultConfig {
+        applicationId 'com.topjohnwu.magisk'
+        vectorDrawables.useSupportLibrary = true
+        versionName configProps['appVersion']
+        versionCode configProps['appVersionCode'] as Integer
+        javaCompileOptions {
+            annotationProcessorOptions {
+                argument('butterknife.debuggable', 'false')
+            }
+        }
+    }
+
+    buildTypes {
+        release {
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation project(':net')
+    implementation project(':shared')
+    implementation project(':signing')
+    implementation 'com.github.topjohnwu:jtar:1.0.0'
+    implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.0'
+    implementation 'com.github.sevar83:indeterminate-checkbox:1.0.5'
+
+    def markwonVersion = '3.0.0'
+    implementation "ru.noties.markwon:core:${markwonVersion}"
+    implementation "ru.noties.markwon:html:${markwonVersion}"
+    implementation "ru.noties.markwon:image-svg:${markwonVersion}"
+
+    def androidXVersion = "1.0.0"
+    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
+    implementation 'androidx.appcompat:appcompat:1.0.2'
+    implementation "androidx.preference:preference:${androidXVersion}"
+    implementation "androidx.recyclerview:recyclerview:${androidXVersion}"
+    implementation "androidx.cardview:cardview:${androidXVersion}"
+    implementation "com.google.android.material:material:${androidXVersion}"
+    implementation 'androidx.work:work-runtime:2.0.1'
+    implementation 'androidx.transition:transition:1.1.0-beta01'
+
+    def libsuVersion = '2.5.0'
+    implementation "com.github.topjohnwu.libsu:core:${libsuVersion}"
+    implementation "com.github.topjohnwu.libsu:io:${libsuVersion}"
+
+    def butterKnifeVersion = '10.1.0'
+    implementation "com.jakewharton:butterknife-runtime:${butterKnifeVersion}"
+    kapt "com.jakewharton:butterknife-compiler:${butterKnifeVersion}"
+}

app/proguard-rules.pro

@@ -0,0 +1,56 @@
+# Add project specific ProGuard rules here.
+# By default, the flags in this file are appended to flags specified
+# in /Users/topjohnwu/Library/Android/sdk/tools/proguard/proguard-android.txt
+# You can edit the include path and order by changing the proguardFiles
+# directive in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# Add any project specific keep options here:
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# BouncyCastle
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.asymmetric.rsa.**SHA1** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.asymmetric.RSA** { *; }
+-keep,allowoptimization class org.bouncycastle.jcajce.provider.digest.SHA1** { *; }
+-dontwarn javax.naming.**
+
+# Snet
+-keepclassmembers class com.topjohnwu.magisk.utils.ISafetyNetHelper { *; }
+-keep,allowobfuscation interface com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback
+-keepclassmembers class * implements com.topjohnwu.magisk.utils.ISafetyNetHelper$Callback {
+  void onResponse(int);
+}
+
+# DelegateWorker
+-keep,allowobfuscation class * extends com.topjohnwu.magisk.model.worker.DelegateWorker
+
+# BootSigner
+-keepclassmembers class com.topjohnwu.signing.BootSigner { *; }
+
+# SVG
+-dontwarn com.caverock.androidsvg.SVGAndroidRenderer
+
+# RetroStreams
+-dontwarn java9.**
+
+# Strip logging
+-assumenosideeffects class com.topjohnwu.magisk.utils.Logger {
+  public *** debug(...);
+}
+
+# Excessive obfuscation
+-repackageclasses 'a'
+-allowaccessmodification
+
+# QOL
+-dontnote **
+-dontwarn com.caverock.androidsvg.**
+-dontwarn ru.noties.markwon.**

app/src/main/AndroidManifest.xml

@@ -0,0 +1,77 @@
+<?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.RECEIVE_BOOT_COMPLETED" />
+    <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
+    <uses-permission android:name="android.permission.USE_FINGERPRINT" />
+
+    <application
+        android:allowBackup="true"
+        android:name="a.e"
+        android:theme="@style/AppTheme"
+        android:usesCleartextTraffic="true"
+        tools:ignore="UnusedAttribute,GoogleAppIndexingWarning">
+
+        <!-- Activities -->
+
+        <activity
+            android:name="a.b"
+            android:configChanges="orientation|screenSize"
+            android:exported="true" />
+        <activity
+            android:name="a.c"
+            android:configChanges="orientation|screenSize"
+            android:exported="true"
+            android:theme="@style/SplashTheme">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity
+            android:name="a.f"
+            android:configChanges="keyboardHidden|orientation|screenSize"
+            android:screenOrientation="nosensor"
+            android:theme="@style/AppTheme.NoDrawer" />
+
+        <!-- Superuser -->
+
+        <activity
+            android:name="a.m"
+            android:exported="false"
+            android:directBootAware="true"
+            android:excludeFromRecents="true"
+            android:theme="@style/SuRequest" />
+
+        <!-- Receiver -->
+
+        <receiver
+            android:name="a.h"
+            android:directBootAware="true">
+            <intent-filter>
+                <action android:name="android.intent.action.BOOT_COMPLETED" />
+                <action android:name="android.intent.action.LOCALE_CHANGED" />
+            </intent-filter>
+            <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>
+
+        <!-- Service -->
+
+        <service android:name="a.j" />
+
+        <!-- Hardcode GMS version -->
+        <meta-data
+            android:name="com.google.android.gms.version"
+            android:value="12451000" />
+
+    </application>
+
+</manifest>

app/src/main/java/a/a.java

@@ -0,0 +1,13 @@
+package a;
+
+import com.topjohnwu.magisk.utils.PatchAPK;
+import com.topjohnwu.signing.BootSigner;
+
+import androidx.annotation.Keep;
+
+@Keep
+public class a extends BootSigner {
+    public static boolean patchAPK(String in, String out, String pkg) {
+        return PatchAPK.patch(in, out, pkg);
+    }
+}

app/src/main/java/a/b.java

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

app/src/main/java/a/c.java

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

app/src/main/java/a/e.java

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

app/src/main/java/a/f.java

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

app/src/main/java/a/g.java

@@ -0,0 +1,15 @@
+package a;
+
+import android.content.Context;
+
+import com.topjohnwu.magisk.model.update.UpdateCheckService;
+
+import androidx.annotation.NonNull;
+import androidx.work.WorkerParameters;
+
+public class g extends w<UpdateCheckService> {
+    /* Stub */
+    public g(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+        super(context, workerParams);
+    }
+}

app/src/main/java/a/h.java

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

app/src/main/java/a/j.java

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

app/src/main/java/a/m.java

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

app/src/main/java/a/w.java

@@ -0,0 +1,42 @@
+package a;
+
+import android.content.Context;
+
+import com.topjohnwu.magisk.model.worker.DelegateWorker;
+
+import java.lang.reflect.ParameterizedType;
+
+import androidx.annotation.NonNull;
+import androidx.work.Worker;
+import androidx.work.WorkerParameters;
+
+public abstract class w<T extends DelegateWorker> extends Worker {
+
+    /* Wrapper class to workaround Proguard -keep class * extends Worker */
+
+    private T base;
+
+    @SuppressWarnings("unchecked")
+    w(@NonNull Context context, @NonNull WorkerParameters workerParams) {
+        super(context, workerParams);
+        try {
+            base = ((Class<T>) ((ParameterizedType) getClass().getGenericSuperclass())
+                    .getActualTypeArguments()[0]).newInstance();
+            base.setActualWorker(this);
+        } catch (Exception ignored) {}
+    }
+
+    @NonNull
+    @Override
+    public Result doWork() {
+        if (base == null)
+            return Result.failure();
+        return base.doWork();
+    }
+
+    @Override
+    public void onStopped() {
+        if (base != null)
+            base.onStopped();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/App.java

@@ -0,0 +1,101 @@
+package com.topjohnwu.magisk;
+
+import android.app.Activity;
+import android.app.Application;
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.content.res.Configuration;
+import android.os.AsyncTask;
+import android.os.Build;
+import android.os.Bundle;
+import android.preference.PreferenceManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
+
+import com.topjohnwu.magisk.data.database.MagiskDB;
+import com.topjohnwu.magisk.data.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+import java.util.concurrent.ThreadPoolExecutor;
+
+public class App extends Application implements Application.ActivityLifecycleCallbacks {
+
+    public static App self;
+    public static Context deContext;
+    public static ThreadPoolExecutor THREAD_POOL;
+
+    // Global resources
+    public SharedPreferences prefs;
+    public MagiskDB mDB;
+    public RepoDatabaseHelper repoDB;
+    private volatile BaseActivity foreground;
+
+    static {
+        AppCompatDelegate.setCompatVectorFromResourcesEnabled(true);
+        Shell.Config.setFlags(Shell.FLAG_MOUNT_MASTER | Shell.FLAG_USE_MAGISK_BUSYBOX);
+        Shell.Config.verboseLogging(BuildConfig.DEBUG);
+        Shell.Config.addInitializers(RootUtils.class);
+        Shell.Config.setTimeout(2);
+        THREAD_POOL = (ThreadPoolExecutor) AsyncTask.THREAD_POOL_EXECUTOR;
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(base);
+        self = this;
+        deContext = base;
+        registerActivityLifecycleCallbacks(this);
+
+        if (Build.VERSION.SDK_INT >= 24) {
+            deContext = base.createDeviceProtectedStorageContext();
+            deContext.moveSharedPreferencesFrom(base,
+                    PreferenceManager.getDefaultSharedPreferencesName(base));
+        }
+        prefs = PreferenceManager.getDefaultSharedPreferences(deContext);
+        mDB = new MagiskDB(base);
+
+        Networking.init(base);
+        LocaleManager.setLocale(this);
+    }
+
+    @Override
+    public void onConfigurationChanged(@NonNull Configuration newConfig) {
+        super.onConfigurationChanged(newConfig);
+        LocaleManager.setLocale(this);
+    }
+
+    public static BaseActivity foreground() {
+        return self.foreground;
+    }
+
+    @Override
+    public void onActivityCreated(@NonNull Activity activity, @Nullable Bundle bundle) {}
+
+    @Override
+    public void onActivityStarted(@NonNull Activity activity) {}
+
+    @Override
+    public synchronized void onActivityResumed(@NonNull Activity activity) {
+        foreground = (BaseActivity) activity;
+    }
+
+    @Override
+    public synchronized void onActivityPaused(@NonNull Activity activity) {
+        foreground = null;
+    }
+
+    @Override
+    public void onActivityStopped(@NonNull Activity activity) {}
+
+    @Override
+    public void onActivitySaveInstanceState(@NonNull Activity activity, @NonNull Bundle bundle) {}
+
+    @Override
+    public void onActivityDestroyed(@NonNull Activity activity) {}
+}

app/src/main/java/com/topjohnwu/magisk/ClassMap.java

@@ -0,0 +1,31 @@
+package com.topjohnwu.magisk;
+
+import com.topjohnwu.magisk.model.download.DownloadModuleService;
+import com.topjohnwu.magisk.model.receiver.GeneralReceiver;
+import com.topjohnwu.magisk.model.update.UpdateCheckService;
+import com.topjohnwu.magisk.ui.MainActivity;
+import com.topjohnwu.magisk.ui.SplashActivity;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity;
+
+import java.util.HashMap;
+import java.util.Map;
+
+public class ClassMap {
+    private static Map<Class, Class> classMap = new HashMap<>();
+
+    static {
+        classMap.put(App.class, a.e.class);
+        classMap.put(MainActivity.class, a.b.class);
+        classMap.put(SplashActivity.class, a.c.class);
+        classMap.put(FlashActivity.class, a.f.class);
+        classMap.put(UpdateCheckService.class, a.g.class);
+        classMap.put(GeneralReceiver.class, a.h.class);
+        classMap.put(DownloadModuleService.class, a.j.class);
+        classMap.put(SuRequestActivity.class, a.m.class);
+    }
+    
+    public static <T> Class<T> get(Class c) {
+        return classMap.get(c);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/Config.java

@@ -0,0 +1,396 @@
+package com.topjohnwu.magisk;
+
+import android.content.SharedPreferences;
+import android.util.Xml;
+
+import androidx.collection.ArrayMap;
+
+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;
+
+public class Config {
+
+    // Current status
+    public static String magiskVersionString;
+    public static int magiskVersionCode = -1;
+    private 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;
+
+    // Install flags
+    public static boolean keepVerity = false;
+    public static boolean keepEnc = false;
+    public static boolean recovery = false;
+
+    public static int suLogTimeout = 14;
+
+    public static class Key {
+        // su configs
+        public static final String ROOT_ACCESS = "root_access";
+        public static final String SU_MULTIUSER_MODE = "multiuser_mode";
+        public static final String SU_MNT_NS = "mnt_ns";
+        public static final String SU_MANAGER = "requester";
+        public static final String SU_REQUEST_TIMEOUT = "su_request_timeout";
+        public static final String SU_AUTO_RESPONSE = "su_auto_response";
+        public static final String SU_NOTIFICATION = "su_notification";
+        public static final String SU_REAUTH = "su_reauth";
+        public static final String SU_FINGERPRINT = "su_fingerprint";
+
+        // prefs
+        public static final String CHECK_UPDATES = "check_update";
+        public static final String UPDATE_CHANNEL = "update_channel";
+        public static final String CUSTOM_CHANNEL = "custom_channel";
+        public static final String LOCALE = "locale";
+        public static final String DARK_THEME = "dark_theme";
+        public static final String ETAG_KEY = "ETag";
+        public static final String REPO_ORDER = "repo_order";
+        public static final String SHOW_SYSTEM_APP = "show_system";
+
+        // system state
+        public static final String UPDATE_SERVICE_VER = "update_service_version";
+        public static final String MAGISKHIDE = "magiskhide";
+        public static final String COREONLY = "disable";
+    }
+
+    public static class Value {
+        public static final int DEFAULT_CHANNEL = -1;
+        public static final int STABLE_CHANNEL = 0;
+        public static final int BETA_CHANNEL = 1;
+        public static final int CUSTOM_CHANNEL = 2;
+        public static final int CANARY_CHANNEL = 3;
+        public static final int CANARY_DEBUG_CHANNEL = 4;
+        public static final int ROOT_ACCESS_DISABLED = 0;
+        public static final int ROOT_ACCESS_APPS_ONLY = 1;
+        public static final int ROOT_ACCESS_ADB_ONLY = 2;
+        public static final int ROOT_ACCESS_APPS_AND_ADB = 3;
+        public static final int MULTIUSER_MODE_OWNER_ONLY = 0;
+        public static final int MULTIUSER_MODE_OWNER_MANAGED = 1;
+        public static final int MULTIUSER_MODE_USER = 2;
+        public static final int NAMESPACE_MODE_GLOBAL = 0;
+        public static final int NAMESPACE_MODE_REQUESTER = 1;
+        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 SU_PROMPT = 0;
+        public static final int SU_AUTO_DENY = 1;
+        public static final int SU_AUTO_ALLOW = 2;
+        public static final int[] TIMEOUT_LIST = {0, -1, 10, 20, 30, 60};
+        public static final int ORDER_NAME = 0;
+        public static final int ORDER_DATE = 1;
+    }
+
+    public static void loadMagiskInfo() {
+        try {
+            magiskVersionString = ShellUtils.fastCmd("magisk -v").split(":")[0];
+            magiskVersionCode = Integer.parseInt(ShellUtils.fastCmd("magisk -V"));
+            magiskHide = Shell.su("magiskhide --status").exec().isSuccess();
+        } catch (NumberFormatException ignored) {}
+    }
+
+    public static void export() {
+        // Flush prefs to disk
+        App app = App.self;
+        app.prefs.edit().commit();
+        File xml = new File(App.deContext.getFilesDir().getParent() + "/shared_prefs",
+                app.getPackageName() + "_preferences.xml");
+        Shell.su(Utils.fmt("cat %s > /data/adb/%s", xml, Const.MANAGER_CONFIGS)).exec();
+    }
+
+    public static void initialize() {
+        SharedPreferences pref = App.self.prefs;
+        SharedPreferences.Editor editor = pref.edit();
+        File config = SuFile.open("/data/adb", Const.MANAGER_CONFIGS);
+        if (config.exists()) {
+            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(Key.ETAG_KEY);
+            editor.apply();
+            editor = pref.edit();
+            config.delete();
+        }
+
+        // Set defaults if not set
+        setDefs(pref, editor);
+
+        // These settings are from actual device state
+        editor.putBoolean(Key.MAGISKHIDE, magiskHide)
+                .putBoolean(Key.COREONLY, Const.MAGISK_DISABLE_FILE.exists())
+                .putInt(Key.UPDATE_SERVICE_VER, Const.UPDATE_SERVICE_VER)
+                .apply();
+    }
+
+    private static final int PREF_INT = 0;
+    private static final int PREF_STR_INT = 1;
+    private static final int PREF_BOOL = 2;
+    private static final int PREF_STR = 3;
+    private static final int DB_INT = 4;
+    private static final int DB_BOOL = 5;
+    private static final int DB_STR = 6;
+
+    private static int getConfigType(String key) {
+        switch (key) {
+            case Key.REPO_ORDER:
+                return PREF_INT;
+
+            case Key.SU_REQUEST_TIMEOUT:
+            case Key.SU_AUTO_RESPONSE:
+            case Key.SU_NOTIFICATION:
+            case Key.UPDATE_CHANNEL:
+                return PREF_STR_INT;
+
+            case Key.DARK_THEME:
+            case Key.SU_REAUTH:
+            case Key.CHECK_UPDATES:
+            case Key.MAGISKHIDE:
+            case Key.COREONLY:
+            case Key.SHOW_SYSTEM_APP:
+                return PREF_BOOL;
+
+            case Key.CUSTOM_CHANNEL:
+            case Key.LOCALE:
+            case Key.ETAG_KEY:
+                return PREF_STR;
+
+            case Key.ROOT_ACCESS:
+            case Key.SU_MNT_NS:
+            case Key.SU_MULTIUSER_MODE:
+                return DB_INT;
+
+            case Key.SU_FINGERPRINT:
+                return DB_BOOL;
+
+            case Key.SU_MANAGER:
+                return DB_STR;
+
+            default:
+                throw new IllegalArgumentException();
+        }
+    }
+
+    @SuppressWarnings("unchecked")
+    public static <T> T get(String key) {
+        App app = App.self;
+        switch (getConfigType(key)) {
+            case PREF_INT:
+                return (T) (Integer) app.prefs.getInt(key, getDef(key));
+            case PREF_STR_INT:
+                return (T) (Integer) Utils.getPrefsInt(app.prefs, key, getDef(key));
+            case PREF_BOOL:
+                return (T) (Boolean) app.prefs.getBoolean(key, getDef(key));
+            case PREF_STR:
+                return (T) app.prefs.getString(key, getDef(key));
+            case DB_INT:
+                return (T) (Integer) app.mDB.getSettings(key, getDef(key));
+            case DB_BOOL:
+                return (T) (Boolean) (app.mDB.getSettings(key, getDef(key) ? 1 : 0) != 0);
+            case DB_STR:
+                return (T) app.mDB.getStrings(key, getDef(key));
+        }
+        /* Will never get here (IllegalArgumentException in getConfigType) */
+        return null;
+    }
+
+    public static void set(String key, Object val) {
+        App app = App.self;
+        switch (getConfigType(key)) {
+            case PREF_INT:
+                app.prefs.edit().putInt(key, (int) val).apply();
+                break;
+            case PREF_STR_INT:
+                app.prefs.edit().putString(key, String.valueOf(val)).apply();
+                break;
+            case PREF_BOOL:
+                app.prefs.edit().putBoolean(key, (boolean) val).apply();
+                break;
+            case PREF_STR:
+                app.prefs.edit().putString(key, (String) val).apply();
+                break;
+            case DB_INT:
+                app.mDB.setSettings(key, (int) val);
+                break;
+            case DB_BOOL:
+                app.mDB.setSettings(key, (boolean) val ? 1 : 0);
+                break;
+            case DB_STR:
+                app.mDB.setStrings(key, (String) val);
+                break;
+        }
+    }
+
+    public static void remove(String key) {
+        App app = App.self;
+        switch (getConfigType(key)) {
+            case PREF_INT:
+            case PREF_STR_INT:
+            case PREF_BOOL:
+            case PREF_STR:
+                app.prefs.edit().remove(key).apply();
+                break;
+            case DB_BOOL:
+            case DB_INT:
+                app.mDB.rmSettings(key);
+                break;
+            case DB_STR:
+                app.mDB.setStrings(key, null);
+                break;
+        }
+    }
+
+    private static ArrayMap<String, Object> defs = new ArrayMap<>();
+
+    static {
+        /* Set default configurations */
+
+        // prefs int
+        defs.put(Key.REPO_ORDER, Value.ORDER_DATE);
+
+        // prefs string int
+        defs.put(Key.SU_REQUEST_TIMEOUT, 10);
+        defs.put(Key.SU_AUTO_RESPONSE, Value.SU_PROMPT);
+        defs.put(Key.SU_NOTIFICATION, Value.NOTIFICATION_TOAST);
+        defs.put(Key.UPDATE_CHANNEL, Utils.isCanary() ?
+                Value.CANARY_DEBUG_CHANNEL : Value.DEFAULT_CHANNEL);
+
+        // prefs bool
+        defs.put(Key.CHECK_UPDATES, true);
+        defs.put(Key.DARK_THEME, true);
+        //defs.put(Key.SU_REAUTH, false);
+        //defs.put(Key.SHOW_SYSTEM_APP, false);
+
+        // prefs string
+        defs.put(Key.CUSTOM_CHANNEL, "");
+        defs.put(Key.LOCALE, "");
+        //defs.put(Key.ETAG_KEY, null);
+
+        // db int
+        defs.put(Key.ROOT_ACCESS, Value.ROOT_ACCESS_APPS_AND_ADB);
+        defs.put(Key.SU_MNT_NS, Value.NAMESPACE_MODE_REQUESTER);
+        defs.put(Key.SU_MULTIUSER_MODE, Value.MULTIUSER_MODE_OWNER_ONLY);
+
+        // db bool
+        //defs.put(Key.SU_FINGERPRINT, false);
+
+        // db strings
+        //defs.put(Key.SU_MANAGER, null);
+    }
+
+    private static <T> T getDef(String key) {
+        Object val = defs.get(key);
+        switch (getConfigType(key)) {
+            case PREF_INT:
+            case DB_INT:
+            case PREF_STR_INT:
+                return val != null ? (T) val : (T) (Integer) 0;
+            case DB_BOOL:
+            case PREF_BOOL:
+                return val != null ? (T) val : (T) (Boolean) false;
+            case DB_STR:
+            case PREF_STR:
+                return (T) val;
+        }
+        /* Will never get here (IllegalArgumentException in getConfigType) */
+        return null;
+    }
+
+    private static void setDefs(SharedPreferences pref, SharedPreferences.Editor editor) {
+        App app = App.self;
+        for (String key : defs.keySet()) {
+            int type = getConfigType(key);
+            switch (type) {
+                case DB_INT:
+                    editor.putString(key, String.valueOf(
+                            app.mDB.getSettings(key, (Integer) defs.get(key))));
+                    continue;
+                case DB_STR:
+                    editor.putString(key, app.mDB.getStrings(key, (String) defs.get(key)));
+                    continue;
+                case DB_BOOL:
+                    int bs = app.mDB.getSettings(key, -1);
+                    editor.putBoolean(key, bs < 0 ? (Boolean) defs.get(key) : bs != 0);
+                    continue;
+            }
+            if (pref.contains(key))
+                continue;
+            switch (type) {
+                case PREF_INT:
+                    editor.putInt(key, (Integer) defs.get(key));
+                    break;
+                case PREF_STR_INT:
+                    editor.putString(key, String.valueOf(defs.get(key)));
+                    break;
+                case PREF_STR:
+                    editor.putString(key, (String) defs.get(key));
+                    break;
+                case PREF_BOOL:
+                    editor.putBoolean(key, (Boolean) defs.get(key));
+                    break;
+            }
+        }
+    }
+}

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

@@ -0,0 +1,99 @@
+package com.topjohnwu.magisk;
+
+import android.os.Environment;
+import android.os.Process;
+
+import java.io.File;
+
+public class Const {
+
+    public static final String DEBUG_TAG = "MagiskManager";
+
+    // APK content
+    public static final String ANDROID_MANIFEST = "AndroidManifest.xml";
+
+    public static final String SU_KEYSTORE_KEY = "su_key";
+
+    // Paths
+    public static final String MAGISK_PATH = "/sbin/.magisk/img";
+    public static final File EXTERNAL_PATH;
+    public static File MAGISK_DISABLE_FILE;
+
+    static {
+        MAGISK_DISABLE_FILE = new File("xxx");
+        EXTERNAL_PATH = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+        EXTERNAL_PATH.mkdirs();
+    }
+
+    public static final String TMP_FOLDER_PATH = "/dev/tmp";
+    public static final String MAGISK_LOG = "/cache/magisk.log";
+    public static final String MANAGER_CONFIGS = ".tmp.magisk.config";
+
+    // Versions
+    public static final int UPDATE_SERVICE_VER = 1;
+    public static final int SNET_EXT_VER = 12;
+
+    public static final int USER_ID = Process.myUid() / 100000;
+
+    public static final class MAGISK_VER {
+        public static final int MIN_SUPPORT = 18000;
+    }
+
+    public static class ID {
+        public static final int FETCH_ZIP = 2;
+        public static final int SELECT_BOOT = 3;
+
+        // notifications
+        public static final int MAGISK_UPDATE_NOTIFICATION_ID = 4;
+        public static final int APK_UPDATE_NOTIFICATION_ID = 5;
+        public static final int DTBO_NOTIFICATION_ID = 7;
+        public static final int HIDE_MANAGER_NOTIFICATION_ID = 8;
+        public static final String UPDATE_NOTIFICATION_CHANNEL = "update";
+        public static final String PROGRESS_NOTIFICATION_CHANNEL = "progress";
+        public static final String CHECK_MAGISK_UPDATE_WORKER_ID = "magisk_update";
+    }
+
+    public static class Url {
+        private static String getRaw(String where, String name) {
+            return String.format("https://raw.githubusercontent.com/topjohnwu/magisk_files/%s/%s", where, name);
+        }
+        public static final String STABLE_URL = getRaw("master", "stable.json");
+        public static final String BETA_URL = getRaw("master", "beta.json");
+        public static final String CANARY_URL = getRaw("master", "canary_builds/release.json");
+        public static final String CANARY_DEBUG_URL = getRaw("master", "canary_builds/canary.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 MODULE_INSTALLER = "https://raw.githubusercontent.com/topjohnwu/Magisk/master/scripts/module_installer.sh";
+        public static final String PAYPAL_URL = "https://www.paypal.me/topjohnwu";
+        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/Magisk";
+        public static final String SNET_URL = getRaw("b66b1a914978e5f4c4bbfd74a59f4ad371bac107", "snet.apk");
+        public static final String BOOTCTL_URL = getRaw("9c5dfc1b8245c0b5b524901ef0ff0f8335757b77", "bootctl");
+    }
+
+    public static class Key {
+        // others
+        public static final String LINK_KEY = "Link";
+        public static final String IF_NONE_MATCH = "If-None-Match";
+        // intents
+        public static final String OPEN_SECTION = "section";
+        public static final String INTENT_SET_NAME = "filename";
+        public static final String INTENT_SET_LINK = "link";
+        public static final String FLASH_ACTION = "action";
+        public static final String BROADCAST_MANAGER_UPDATE = "manager_update";
+        public static final String BROADCAST_REBOOT = "reboot";
+    }
+
+    public static class Value {
+        public static final String FLASH_ZIP = "flash";
+        public static final String PATCH_FILE = "patch";
+        public static final String FLASH_MAGISK = "magisk";
+        public static final String FLASH_INACTIVE_SLOT = "slot";
+        public static final String UNINSTALL = "uninstall";
+    }
+
+
+}

app/src/main/java/com/topjohnwu/magisk/data/database/MagiskDB.java

@@ -0,0 +1,190 @@
+package com.topjohnwu.magisk.data.database;
+
+import android.content.ContentValues;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.model.entity.Policy;
+import com.topjohnwu.magisk.model.entity.SuLogEntry;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+
+import java.text.DateFormat;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+public class MagiskDB {
+
+    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 PackageManager pm;
+
+    public MagiskDB(Context context) {
+        pm = context.getPackageManager();
+    }
+
+    public void deletePolicy(Policy policy) {
+        deletePolicy(policy.uid);
+    }
+
+    private List<String> rawSQL(String fmt, Object... args) {
+        return Shell.su("magisk --sqlite '" + Utils.fmt(fmt, args) + "'").exec().getOut();
+    }
+
+    private List<ContentValues> SQL(String fmt, Object... args) {
+        List<ContentValues> list = new ArrayList<>();
+        for (String raw : rawSQL(fmt, args)) {
+            ContentValues values = new ContentValues();
+            String[] cols = raw.split("\\|");
+            for (String col : cols) {
+                String[] pair = col.split("=", 2);
+                if (pair.length != 2)
+                    continue;
+                values.put(pair[0], pair[1]);
+            }
+            list.add(values);
+        }
+        return list;
+    }
+
+    private String toSQL(ContentValues values) {
+        StringBuilder keys = new StringBuilder(), vals = new StringBuilder();
+        keys.append('(');
+        vals.append("VALUES(");
+        boolean first = true;
+        for (Map.Entry<String, Object> entry : values.valueSet()) {
+            if (!first) {
+                keys.append(',');
+                vals.append(',');
+            } else {
+                first = false;
+            }
+            keys.append(entry.getKey());
+            vals.append('"');
+            vals.append(entry.getValue());
+            vals.append('"');
+        }
+        keys.append(')');
+        vals.append(')');
+        keys.append(vals);
+        return keys.toString();
+    }
+
+    public void clearOutdated() {
+        rawSQL(
+                "DELETE FROM %s WHERE until > 0 AND until < %d;" +
+                        "DELETE FROM %s WHERE time < %d",
+                POLICY_TABLE, System.currentTimeMillis() / 1000,
+                LOG_TABLE, System.currentTimeMillis() - Config.suLogTimeout * 86400000
+        );
+    }
+
+    public void deletePolicy(String pkg) {
+        rawSQL("DELETE FROM %s WHERE package_name=\"%s\"", POLICY_TABLE, pkg);
+    }
+
+    public void deletePolicy(int uid) {
+        rawSQL("DELETE FROM %s WHERE uid=%d", POLICY_TABLE, uid);
+    }
+
+    public Policy getPolicy(int uid) {
+        List<ContentValues> res =
+                SQL("SELECT * FROM %s WHERE uid=%d", POLICY_TABLE, uid);
+        if (!res.isEmpty()) {
+            try {
+                return new Policy(res.get(0), pm);
+            } catch (PackageManager.NameNotFoundException e) {
+                deletePolicy(uid);
+            }
+        }
+        return null;
+    }
+
+    public void updatePolicy(Policy policy) {
+        rawSQL("REPLACE INTO %s %s", POLICY_TABLE, toSQL(policy.getContentValues()));
+    }
+
+    public List<Policy> getPolicyList() {
+        List<Policy> list = new ArrayList<>();
+        for (ContentValues values : SQL("SELECT * FROM %s WHERE uid/100000=%d", POLICY_TABLE, Const.USER_ID)) {
+            try {
+                list.add(new Policy(values, pm));
+            } catch (PackageManager.NameNotFoundException e) {
+                deletePolicy(values.getAsInteger("uid"));
+            }
+        }
+        Collections.sort(list);
+        return list;
+    }
+
+    public List<List<SuLogEntry>> getLogs() {
+        List<List<SuLogEntry>> ret = new ArrayList<>();
+        List<SuLogEntry> list = null;
+        String dateString = null, newString;
+        for (ContentValues values : SQL("SELECT * FROM %s ORDER BY time DESC", LOG_TABLE)) {
+            Date date = new Date(values.getAsLong("time"));
+            newString = DateFormat.getDateInstance(DateFormat.MEDIUM, LocaleManager.locale).format(date);
+            if (!TextUtils.equals(dateString, newString)) {
+                dateString = newString;
+                list = new ArrayList<>();
+                ret.add(list);
+            }
+            list.add(new SuLogEntry(values));
+        }
+        return ret;
+    }
+
+    public void addLog(SuLogEntry log) {
+        rawSQL("INSERT INTO %s %s", LOG_TABLE, toSQL(log.getContentValues()));
+    }
+
+    public void clearLogs() {
+        rawSQL("DELETE FROM %s", LOG_TABLE);
+    }
+
+    public void rmSettings(String key) {
+        rawSQL("DELETE FROM %s WHERE key=\"%s\"", SETTINGS_TABLE, key);
+    }
+
+    public void setSettings(String key, int value) {
+        ContentValues data = new ContentValues();
+        data.put("key", key);
+        data.put("value", value);
+        rawSQL("REPLACE INTO %s %s", SETTINGS_TABLE, toSQL(data));
+    }
+
+    public int getSettings(String key, int defaultValue) {
+        List<ContentValues> res = SQL("SELECT value FROM %s WHERE key=\"%s\"", SETTINGS_TABLE, key);
+        if (res.isEmpty())
+            return defaultValue;
+        return res.get(0).getAsInteger("value");
+    }
+
+    public void setStrings(String key, String value) {
+        if (value == null) {
+            rawSQL("DELETE FROM %s WHERE key=\"%s\"", STRINGS_TABLE, key);
+            return;
+        }
+        ContentValues data = new ContentValues();
+        data.put("key", key);
+        data.put("value", value);
+        rawSQL("REPLACE INTO %s %s", STRINGS_TABLE, toSQL(data));
+    }
+
+    public String getStrings(String key, String defaultValue) {
+        List<ContentValues> res = SQL("SELECT value FROM %s WHERE key=\"%s\"", STRINGS_TABLE, key);
+        if (res.isEmpty())
+            return defaultValue;
+        return res.get(0).getAsString("value");
+    }
+}

app/src/main/java/com/topjohnwu/magisk/data/database/RepoDatabaseHelper.java

@@ -1,34 +1,26 @@
-package com.topjohnwu.magisk.database;
+package com.topjohnwu.magisk.data.database;
 
 import android.content.Context;
 import android.database.Cursor;
 import android.database.sqlite.SQLiteDatabase;
 import android.database.sqlite.SQLiteOpenHelper;
 
-import com.topjohnwu.magisk.MagiskManager;
-import com.topjohnwu.magisk.container.Repo;
-import com.topjohnwu.magisk.utils.Const;
-import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.model.entity.Repo;
 
-import java.util.LinkedList;
-import java.util.List;
+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 = 5;
     private static final String TABLE_NAME = "repos";
 
     private SQLiteDatabase mDb;
-    private MagiskManager mm;
 
     public RepoDatabaseHelper(Context context) {
         super(context, "repo.db", null, DATABASE_VER);
-        mm = Utils.getMagiskManager(context);
         mDb = getWritableDatabase();
-
-        // Clear bad repos
-        mDb.delete(TABLE_NAME, "minMagisk<?",
-                new String[] { String.valueOf(Const.MIN_MODULE_VER) });
     }
 
     @Override
@@ -38,21 +30,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, " +
+                            "author TEXT, description TEXT, last_update INT, PRIMARY KEY(id))");
+            Config.remove(Config.Key.ETAG_KEY);
         }
     }
 
@@ -71,10 +56,10 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
     }
 
     public void removeRepo(Repo repo) {
-        mDb.delete(TABLE_NAME, "repo_name=?", new String[] { repo.getRepoName() });
+        removeRepo(repo.getId());
     }
 
-    public void removeRepo(List<String> list) {
+    public void removeRepo(Iterable<String> list) {
         for (String id : list) {
             if (id == null) continue;
             mDb.delete(TABLE_NAME, "id=?", new String[] { id });
@@ -94,27 +79,29 @@ public class RepoDatabaseHelper extends SQLiteOpenHelper {
         return null;
     }
 
-    public Cursor getRepoCursor() {
-        String orderBy = null;
-        switch (mm.repoOrder) {
-            case Const.Value.ORDER_NAME:
-                orderBy = "name COLLATE NOCASE";
-                break;
-            case Const.Value.ORDER_DATE:
-                orderBy = "last_update DESC";
-        }
-        return mDb.query(TABLE_NAME, null, "minMagisk<=?",
-                new String[] { String.valueOf(mm.magiskVersionCode) },
-                null, null, orderBy);
+    public Cursor getRawCursor() {
+        return mDb.query(TABLE_NAME, null, null, null, null, null, null);
     }
 
-    public List<String> getRepoIDList() {
-        LinkedList<String> ret = new LinkedList<>();
+    public Cursor getRepoCursor() {
+        String orderBy = null;
+        switch ((int) Config.get(Config.Key.REPO_ORDER)) {
+            case Config.Value.ORDER_NAME:
+                orderBy = "name COLLATE NOCASE";
+                break;
+            case Config.Value.ORDER_DATE:
+                orderBy = "last_update DESC";
+        }
+        return mDb.query(TABLE_NAME, null, null, null, null, null, orderBy);
+    }
+
+    public Set<String> getRepoIDSet() {
+        HashSet<String> set = new HashSet<>(300);
         try (Cursor c = mDb.query(TABLE_NAME, null, null, null, null, null, null)) {
             while (c.moveToNext()) {
-                ret.add(c.getString(c.getColumnIndex("id")));
+                set.add(c.getString(c.getColumnIndex("id")));
             }
         }
-        return ret;
+        return set;
     }
 }

app/src/main/java/com/topjohnwu/magisk/model/adapters/ApplicationAdapter.java

@@ -0,0 +1,427 @@
+package com.topjohnwu.magisk.model.adapters;
+
+import android.content.Context;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.ComponentInfo;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.os.AsyncTask;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.WorkerThread;
+import androidx.collection.ArraySet;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.buildware.widget.indeterm.IndeterminateCheckBox;
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.ArrowExpandable;
+import com.topjohnwu.magisk.view.Expandable;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Set;
+
+import butterknife.BindView;
+import java9.util.Comparators;
+import java9.util.Lists;
+import java9.util.Objects;
+import java9.util.Sets;
+import java9.util.stream.Collectors;
+import java9.util.stream.Stream;
+import java9.util.stream.StreamSupport;
+
+public class ApplicationAdapter extends SectionedAdapter
+        <ApplicationAdapter.AppViewHolder, ApplicationAdapter.ProcessViewHolder> {
+
+    private static final String SAFETYNET_PROCESS = "com.google.android.gms.unstable";
+    private static final String GMS_PACKAGE = "com.google.android.gms";
+    private static boolean old_hide = false;
+
+    /* A list of apps that should not be shown as hide-able */
+    private static final List<String> HIDE_BLACKLIST = Lists.of(
+            App.self.getPackageName(),
+            "android",
+            "com.android.chrome",
+            "com.chrome.beta",
+            "com.chrome.dev",
+            "com.chrome.canary",
+            "com.android.webview",
+            "com.google.android.webview"
+    );
+    private static final List<String> DEFAULT_HIDELIST = Lists.of(
+            SAFETYNET_PROCESS
+    );
+
+    private static int BOTTOM_MARGIN = -1;
+
+    private List<HideAppInfo> fullList, showList;
+    private List<HideTarget> hideList;
+    private PackageManager pm;
+    private boolean showSystem;
+
+    public ApplicationAdapter(Context context) {
+        fullList = showList = Collections.emptyList();
+        hideList = Collections.emptyList();
+        pm = context.getPackageManager();
+        showSystem = Config.get(Config.Key.SHOW_SYSTEM_APP);
+        AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps);
+    }
+
+    private static ViewGroup.MarginLayoutParams getMargins(RecyclerView.ViewHolder vh) {
+        return (ViewGroup.MarginLayoutParams) vh.itemView.getLayoutParams();
+    }
+
+    @Override
+    public int getSectionCount() {
+        return showList.size();
+    }
+
+    @Override
+    public int getItemCount(int section) {
+        HideAppInfo app = showList.get(section);
+        return app.expanded ? app.processList.size() : 0;
+    }
+
+    @Override
+    public AppViewHolder onCreateSectionViewHolder(ViewGroup parent) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_hide_app, parent, false);
+        AppViewHolder vh = new AppViewHolder(v);
+        if (BOTTOM_MARGIN < 0)
+            BOTTOM_MARGIN = getMargins(vh).bottomMargin;
+        return vh;
+    }
+
+    @Override
+    public ProcessViewHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_hide_process, parent, false);
+        return new ProcessViewHolder(v);
+    }
+
+    @Override
+    public void onBindSectionViewHolder(AppViewHolder holder, int section) {
+        HideAppInfo app = showList.get(section);
+        holder.app_name.setText(app.name);
+        holder.app_icon.setImageDrawable(app.info.loadIcon(pm));
+        holder.package_name.setText(app.info.packageName);
+        holder.checkBox.setOnStateChangedListener(null);
+        holder.checkBox.setState(app.getState());
+        holder.ex.setExpanded(app.expanded);
+
+        int index = getItemPosition(section, 0);
+        holder.checkBox.setOnStateChangedListener((IndeterminateCheckBox box, @Nullable Boolean status) -> {
+            if (status != null) {
+                setHide(status, app);
+                if (app.expanded)
+                    notifyItemRangeChanged(index, app.processList.size());
+            }
+        });
+
+        if (app.processList.size() > 1) {
+            holder.arrow.setVisibility(View.VISIBLE);
+
+            holder.trigger.setOnClickListener((v) -> {
+                if (app.expanded) {
+                    app.expanded = false;
+                    notifyItemRangeRemoved(index, app.processList.size());
+                    holder.ex.collapse();
+                } else {
+                    app.expanded = true;
+                    notifyItemRangeInserted(index, app.processList.size());
+                    holder.ex.expand();
+                }
+            });
+        } else {
+            holder.arrow.setVisibility(View.GONE);
+            holder.trigger.setOnClickListener(null);
+        }
+
+    }
+
+    @Override
+    public void onBindItemViewHolder(ProcessViewHolder holder, int section, int position) {
+        HideAppInfo app = showList.get(section);
+        HideProcessInfo target = app.processList.get(position);
+        holder.process.setText(target.name);
+        holder.checkbox.setOnCheckedChangeListener(null);
+        holder.checkbox.setChecked(target.hidden);
+        holder.checkbox.setOnCheckedChangeListener((v, checked) -> {
+            setHide(checked, app, target);
+            notifyItemChanged(getSectionPosition(section));
+        });
+        getMargins(holder).bottomMargin =
+                position == app.processList.size() - 1 ? BOTTOM_MARGIN : 0;
+    }
+
+    public void filter(String constraint) {
+        AsyncTask.SERIAL_EXECUTOR.execute(() -> {
+            Stream<HideAppInfo> s = StreamSupport.stream(fullList)
+                    .filter(this::systemFilter)
+                    .filter(t -> nameFilter(t, constraint));
+            UiThreadHandler.run(() -> {
+                showList = s.collect(Collectors.toList());
+                notifyDataSetChanged();
+            });
+        });
+    }
+
+    public void setShowSystem(boolean b) {
+        showSystem = b;
+    }
+
+    public void refresh() {
+        AsyncTask.SERIAL_EXECUTOR.execute(this::loadApps);
+    }
+
+    private void setHide(boolean add, HideAppInfo app) {
+        if (add) {
+            StreamSupport.stream(app.processList).forEach(p -> setHide(true, app, p));
+        } else {
+            if (StreamSupport.stream(app.processList)
+                    .anyMatch(p -> p.name.equals(SAFETYNET_PROCESS))) {
+                StreamSupport.stream(app.processList).forEach(p -> setHide(false, app, p));
+            } else {
+                // Quick removal
+                Shell.su("magiskhide --rm " + app.info.packageName).submit();
+                StreamSupport.stream(app.processList).forEach(p -> p.hidden = false);
+            }
+        }
+    }
+
+    private void setHide(boolean add, HideAppInfo app, HideProcessInfo process) {
+        // Don't remove SafetyNet
+        if (!add && DEFAULT_HIDELIST.contains(process.name))
+            return;
+        Shell.su(Utils.fmt("magiskhide --%s %s %s", add ? "add" : "rm",
+                app.info.packageName, process.name)).submit();
+        process.hidden = add;
+    }
+
+    private void addProcesses(Set<String> set, ComponentInfo[] infos) {
+        if (infos != null)
+            for (ComponentInfo info : infos)
+                set.add(info.processName);
+    }
+
+    private PackageInfo getPackageInfo(String pkg) {
+        // Try super hard to get as much info as possible
+        try {
+            return pm.getPackageInfo(pkg,
+                    PackageManager.GET_ACTIVITIES | PackageManager.GET_SERVICES |
+                            PackageManager.GET_RECEIVERS | PackageManager.GET_PROVIDERS);
+        } catch (Exception e1) {
+            try {
+                PackageInfo info = pm.getPackageInfo(pkg, PackageManager.GET_ACTIVITIES);
+                info.services = pm.getPackageInfo(pkg, PackageManager.GET_SERVICES).services;
+                info.receivers = pm.getPackageInfo(pkg, PackageManager.GET_RECEIVERS).receivers;
+                info.providers = pm.getPackageInfo(pkg, PackageManager.GET_PROVIDERS).providers;
+                return info;
+            } catch (Exception e2) {
+                return null;
+            }
+        }
+    }
+
+    @WorkerThread
+    private void loadApps() {
+        hideList = StreamSupport.stream(Shell.su("magiskhide --ls").exec().getOut())
+                .map(HideTarget::new)
+                .collect(Collectors.toList());
+
+        fullList = StreamSupport.stream(pm.getInstalledApplications(0))
+                .filter(info -> !HIDE_BLACKLIST.contains(info.packageName) && info.enabled)
+                .map(info -> {
+                    if (old_hide) {
+                        return new HideAppInfo(info, Sets.of(info.packageName));
+                    } else {
+                        Set<String> set = new ArraySet<>();
+                        PackageInfo pkg = getPackageInfo(info.packageName);
+                        if (pkg != null) {
+                            addProcesses(set, pkg.activities);
+                            addProcesses(set, pkg.services);
+                            addProcesses(set, pkg.receivers);
+                            addProcesses(set, pkg.providers);
+                        }
+                        if (set.isEmpty())
+                            return null;
+                        return new HideAppInfo(info, set);
+                    }
+                }).filter(Objects::nonNull).sorted()
+                .collect(Collectors.toList());
+
+        Event.trigger(false, Event.MAGISK_HIDE_DONE);
+    }
+
+    // True if not system app or user already hidden it
+    private boolean systemFilter(HideAppInfo target) {
+        return showSystem || target.haveHidden() ||
+                (target.info.flags & ApplicationInfo.FLAG_SYSTEM) == 0;
+    }
+
+    private boolean contains(String s, String filter) {
+        return s.toLowerCase().contains(filter);
+    }
+
+    private boolean nameFilter(HideAppInfo target, String filter) {
+        if (filter == null || filter.isEmpty())
+            return true;
+        filter = filter.toLowerCase();
+        if (contains(target.name, filter))
+            return true;
+        for (HideProcessInfo p : target.processList) {
+            if (contains(p.name, filter))
+                return true;
+        }
+        return contains(target.info.packageName, filter);
+    }
+
+    class HideAppInfo implements Comparable<HideAppInfo> {
+        String name;
+        ApplicationInfo info;
+        List<HideProcessInfo> processList;
+        boolean expanded;
+        IndeterminateCheckBox.OnStateChangedListener listener;
+
+        HideAppInfo(ApplicationInfo appInfo, Set<String> set) {
+            info = appInfo;
+            name = Utils.getAppLabel(info, pm);
+            expanded = false;
+            processList = StreamSupport.stream(set)
+                    .map(process -> new HideProcessInfo(info.packageName, process))
+                    .sorted().collect(Collectors.toList());
+            listener = (IndeterminateCheckBox box, @Nullable Boolean status) -> {
+                if (status != null) {
+                    for (HideProcessInfo p : processList) {
+                        String cmd = Utils.fmt("magiskhide --%s %s %s",
+                                status ? "add" : "rm", info.packageName, p.name);
+                        Shell.su(cmd).submit();
+                        p.hidden = status;
+                    }
+                }
+            };
+        }
+
+        @Override
+        public int compareTo(HideAppInfo o) {
+            Comparator<HideAppInfo> c;
+            c = Comparators.comparing(HideAppInfo::haveHidden);
+            c = Comparators.reversed(c);
+            c = Comparators.thenComparing(c, t -> t.name, String::compareToIgnoreCase);
+            c = Comparators.thenComparing(c, t -> t.info.packageName);
+            return c.compare(this, o);
+        }
+
+        Boolean getState() {
+            boolean all = true;
+            boolean hidden = false;
+            for (HideProcessInfo p : processList) {
+                if (!p.hidden)
+                    all = false;
+                else
+                    hidden = true;
+            }
+            if (all)
+                return true;
+            return hidden ? null : false;
+        }
+
+        boolean haveHidden() {
+            Boolean c = getState();
+            return c == null ? true : c;
+        }
+    }
+
+    class HideProcessInfo implements Comparable<HideProcessInfo> {
+        String name;
+        boolean hidden;
+
+        HideProcessInfo(String pkg, String process) {
+            this.name = process;
+            for (HideTarget t : hideList) {
+                if (t.pkg.equals(pkg) && t.process.equals(process)) {
+                    hidden = true;
+                    break;
+                }
+            }
+        }
+
+        @Override
+        public int compareTo(HideProcessInfo o) {
+            Comparator<HideProcessInfo> c;
+            c = Comparators.comparing((HideProcessInfo t) -> t.hidden);
+            c = Comparators.reversed(c);
+            c = Comparators.thenComparing(c, t -> t.name);
+            return c.compare(this, o);
+        }
+    }
+
+    class HideTarget {
+        String pkg;
+        String process;
+
+        HideTarget(String line) {
+            String[] split = line.split("\\|", 2);
+            pkg = split[0];
+            if (split.length == 2) {
+                process = split[1];
+            } else {
+                // Backwards compatibility
+                old_hide = true;
+                process = pkg;
+            }
+        }
+    }
+
+    class AppViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.app_icon) ImageView app_icon;
+        @BindView(R.id.app_name) TextView app_name;
+        @BindView(R.id.package_name) TextView package_name;
+        @BindView(R.id.checkbox) IndeterminateCheckBox checkBox;
+        @BindView(R.id.trigger) View trigger;
+        @BindView(R.id.arrow) ImageView arrow;
+
+        Expandable ex;
+
+        AppViewHolder(@NonNull View itemView) {
+            super(itemView);
+            new ApplicationAdapter$AppViewHolder_ViewBinding(this, itemView);
+            ex = new ArrowExpandable(new Expandable() {
+                @Override
+                protected void onExpand() {
+                    getMargins(AppViewHolder.this).bottomMargin = 0;
+                }
+
+                @Override
+                protected void onCollapse() {
+                    getMargins(AppViewHolder.this).bottomMargin = BOTTOM_MARGIN;
+                }
+            }, arrow);
+        }
+    }
+
+    class ProcessViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.process) TextView process;
+        @BindView(R.id.checkbox) CheckBox checkbox;
+
+        ProcessViewHolder(@NonNull View itemView) {
+            super(itemView);
+            new ApplicationAdapter$ProcessViewHolder_ViewBinding(this, itemView);
+        }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/model/adapters/ModulesAdapter.java

@@ -1,8 +1,6 @@
-package com.topjohnwu.magisk.adapters;
+package com.topjohnwu.magisk.model.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,15 +9,18 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.snackbar.Snackbar;
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.SnackbarMaker;
-import com.topjohnwu.magisk.container.Module;
+import com.topjohnwu.magisk.model.entity.Module;
+import com.topjohnwu.magisk.view.SnackbarMaker;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.List;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class ModulesAdapter extends RecyclerView.Adapter<ModulesAdapter.ViewHolder> {
 
@@ -29,6 +30,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 +48,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 +116,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/main/java/com/topjohnwu/magisk/model/adapters/PolicyAdapter.java

@@ -0,0 +1,172 @@
+package com.topjohnwu.magisk.model.adapters;
+
+import android.app.Activity;
+import android.content.DialogInterface;
+import android.content.pm.PackageManager;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.widget.SwitchCompat;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.data.database.MagiskDB;
+import com.topjohnwu.magisk.model.entity.Policy;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.view.ArrowExpandable;
+import com.topjohnwu.magisk.view.Expandable;
+import com.topjohnwu.magisk.view.ExpandableViewHolder;
+import com.topjohnwu.magisk.view.SnackbarMaker;
+import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog;
+import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog;
+
+import java.util.List;
+
+import butterknife.BindView;
+
+public class PolicyAdapter extends RecyclerView.Adapter<PolicyAdapter.ViewHolder> {
+
+    private List<Policy> policyList;
+    private MagiskDB dbHelper;
+    private PackageManager pm;
+    private boolean[] expandList;
+
+    public PolicyAdapter(List<Policy> list, MagiskDB db, PackageManager pm) {
+        policyList = list;
+        expandList = new boolean[policyList.size()];
+        dbHelper = db;
+        this.pm = pm;
+    }
+
+    @NonNull
+    @Override
+    public ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_policy, parent, false);
+        return new ViewHolder(v);
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull ViewHolder holder, int position) {
+        Policy policy = policyList.get(position);
+
+        holder.settings.setExpanded(expandList[position]);
+        holder.trigger.setOnClickListener(view -> {
+            if (holder.settings.isExpanded()) {
+                holder.settings.collapse();
+                expandList[position] = false;
+            } else {
+                holder.settings.expand();
+                expandList[position] = true;
+            }
+        });
+
+        holder.appName.setText(policy.appName);
+        holder.packageName.setText(policy.packageName);
+        holder.appIcon.setImageDrawable(policy.info.loadIcon(pm));
+
+        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 (FingerprintHelper.useFingerprint()) {
+                holder.masterSwitch.setChecked(!isChecked);
+                new FingerprintAuthDialog((Activity) v.getContext(), () -> {
+                    holder.masterSwitch.setChecked(isChecked);
+                    r.run();
+                }).show();
+            } else {
+                r.run();
+            }
+        });
+        holder.notificationSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && !policy.notification) ||
+                    (!isChecked && policy.notification)) {
+                policy.notification = isChecked;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_notif_on : R.string.su_snack_notif_off, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.loggingSwitch.setOnCheckedChangeListener((v, isChecked) -> {
+            if ((isChecked && !policy.logging) ||
+                    (!isChecked && policy.logging)) {
+                policy.logging = isChecked;
+                String message = v.getContext().getString(
+                        isChecked ? R.string.su_snack_log_on : R.string.su_snack_log_off, policy.appName);
+                SnackbarMaker.make(holder.itemView, message, Snackbar.LENGTH_SHORT).show();
+                dbHelper.updatePolicy(policy);
+            }
+        });
+        holder.delete.setOnClickListener(v -> {
+            DialogInterface.OnClickListener l = (dialog, which) -> {
+                policyList.remove(position);
+                notifyItemRemoved(position);
+                notifyItemRangeChanged(position, policyList.size());
+                SnackbarMaker.make(holder.itemView, v.getContext().getString(R.string.su_snack_revoke, policy.appName),
+                        Snackbar.LENGTH_SHORT).show();
+                dbHelper.deletePolicy(policy);
+            };
+            if (FingerprintHelper.useFingerprint()) {
+                new FingerprintAuthDialog((Activity) v.getContext(),
+                        () -> l.onClick(null, 0)).show();
+            } else {
+                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, l)
+                        .setNegativeButton(R.string.no_thanks, null)
+                        .setCancelable(true)
+                        .show();
+            }
+        });
+    }
+
+    @Override
+    public int getItemCount() {
+        return policyList.size();
+    }
+
+    static class ViewHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.app_name) TextView appName;
+        @BindView(R.id.package_name) TextView packageName;
+        @BindView(R.id.app_icon) ImageView appIcon;
+        @BindView(R.id.master_switch) SwitchCompat masterSwitch;
+        @BindView(R.id.notification_switch) SwitchCompat notificationSwitch;
+        @BindView(R.id.logging_switch) SwitchCompat loggingSwitch;
+        @BindView(R.id.expand_layout) ViewGroup expandLayout;
+        @BindView(R.id.arrow) ImageView arrow;
+        @BindView(R.id.trigger) View trigger;
+        @BindView(R.id.delete) ImageView delete;
+        @BindView(R.id.more_info) ImageView moreInfo;
+
+        Expandable settings;
+
+        public ViewHolder(View itemView) {
+            super(itemView);
+            new PolicyAdapter$ViewHolder_ViewBinding(this, itemView);
+            settings = new ArrowExpandable(new ExpandableViewHolder(expandLayout), arrow);
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/adapters/ReposAdapter.java

@@ -0,0 +1,246 @@
+package com.topjohnwu.magisk.model.adapters;
+
+import android.content.Context;
+import android.content.Intent;
+import android.database.Cursor;
+import android.os.Build;
+import android.text.TextUtils;
+import android.util.Pair;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.SearchView;
+import android.widget.TextView;
+
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.data.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.model.download.DownloadModuleService;
+import com.topjohnwu.magisk.model.entity.Module;
+import com.topjohnwu.magisk.model.entity.Repo;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.view.MarkDownWindow;
+import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import butterknife.BindView;
+import java9.util.stream.StreamSupport;
+
+public class ReposAdapter
+        extends SectionedAdapter<ReposAdapter.SectionHolder, ReposAdapter.RepoHolder>
+        implements Event.AutoListener, SearchView.OnQueryTextListener {
+
+    private static final int UPDATES = 0;
+    private static final int INSTALLED = 1;
+    private static final int OTHERS = 2;
+
+    private Map<String, Module> moduleMap;
+    private RepoDatabaseHelper repoDB;
+    private List<Pair<Integer, List<Repo>>> repoPairs;
+    private List<Repo> fullList;
+    private SearchView mSearch;
+
+    public ReposAdapter() {
+        repoDB = App.self.repoDB;
+        moduleMap = Collections.emptyMap();
+        fullList = Collections.emptyList();
+        repoPairs = new ArrayList<>();
+    }
+
+    @Override
+    public int getSectionCount() {
+        return repoPairs.size();
+    }
+
+    @Override
+    public int getItemCount(int section) {
+        return repoPairs.get(section).second.size();
+    }
+
+    @Override
+    public SectionHolder onCreateSectionViewHolder(ViewGroup parent) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.section, parent, false);
+        return new SectionHolder(v);
+    }
+
+    @Override
+    public RepoHolder onCreateItemViewHolder(ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(R.layout.list_item_repo, parent, false);
+        return new RepoHolder(v);
+    }
+
+    @Override
+    public void onBindSectionViewHolder(SectionHolder holder, int section) {
+        switch (repoPairs.get(section).first) {
+            case UPDATES:
+                holder.sectionText.setText(R.string.update_available);
+                break;
+            case INSTALLED:
+                holder.sectionText.setText(R.string.installed);
+                break;
+            case OTHERS:
+                holder.sectionText.setText(R.string.not_installed);
+                break;
+        }
+    }
+
+    @Override
+    public void onBindItemViewHolder(RepoHolder holder, int section, int position) {
+        Repo repo = repoPairs.get(section).second.get(position);
+        Context context = holder.itemView.getContext();
+
+        String name = repo.getName();
+        String version = repo.getVersion();
+        String author = repo.getAuthor();
+        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 ->
+                MarkDownWindow.show((BaseActivity) context, null, repo.getDetailUrl()));
+
+        holder.downloadImage.setOnClickListener(v -> {
+            new CustomAlertDialog((BaseActivity) context)
+                .setTitle(context.getString(R.string.repo_install_title, repo.getName()))
+                .setMessage(context.getString(R.string.repo_install_msg, repo.getDownloadFilename()))
+                .setCancelable(true)
+                .setPositiveButton(R.string.install, (d, i) ->
+                        startDownload((BaseActivity) context, repo, true))
+                .setNeutralButton(R.string.download, (d, i) ->
+                        startDownload((BaseActivity) context, repo, false))
+                .setNegativeButton(R.string.no_thanks, null)
+                .show();
+        });
+    }
+
+    private void startDownload(BaseActivity activity, Repo repo, Boolean install) {
+        activity.runWithExternalRW(() -> {
+            Intent intent = new Intent(activity, ClassMap.get(DownloadModuleService.class))
+                    .putExtra("repo", repo).putExtra("install", install);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+                activity.startForegroundService(intent);
+            } else {
+                activity.startService(intent);
+            }
+        });
+    }
+
+    private void updateLists() {
+        if (mSearch != null)
+            onQueryTextChange(mSearch.getQuery().toString());
+        else
+            onQueryTextChange("");
+    }
+
+    private static boolean noCaseContain(String a, String b) {
+        return a.toLowerCase().contains(b.toLowerCase());
+    }
+
+    public void setSearchView(SearchView view) {
+        mSearch = view;
+        mSearch.setOnQueryTextListener(this);
+    }
+
+    public void notifyDBChanged(boolean refresh) {
+        try (Cursor c = repoDB.getRepoCursor()) {
+            fullList = new ArrayList<>(c.getCount());
+            while (c.moveToNext())
+                fullList.add(new Repo(c));
+        }
+        if (refresh)
+            updateLists();
+    }
+
+    @Override
+    public void onEvent(int event) {
+        moduleMap = Event.getResult(event);
+        updateLists();
+    }
+
+    @Override
+    public int[] getListeningEvents() {
+        return new int[] {Event.MODULE_LOAD_DONE};
+    }
+
+    @Override
+    public boolean onQueryTextSubmit(String query) {
+        return false;
+    }
+
+    @Override
+    public boolean onQueryTextChange(String s) {
+        List<Repo> updates = new ArrayList<>();
+        List<Repo> installed = new ArrayList<>();
+        List<Repo> others = new ArrayList<>();
+
+        StreamSupport.stream(fullList)
+                .filter(repo -> noCaseContain(repo.getName(), s)
+                        || noCaseContain(repo.getAuthor(), s)
+                        || noCaseContain(repo.getDescription(), s))
+                .forEach(repo -> {
+                    Module module = moduleMap.get(repo.getId());
+                    if (module != null) {
+                        if (repo.getVersionCode() > module.getVersionCode()) {
+                            // Updates
+                            updates.add(repo);
+                        } else {
+                            installed.add(repo);
+                        }
+                    } else {
+                        others.add(repo);
+                    }
+                });
+
+        repoPairs.clear();
+        if (!updates.isEmpty())
+            repoPairs.add(new Pair<>(UPDATES, updates));
+        if (!installed.isEmpty())
+            repoPairs.add(new Pair<>(INSTALLED, installed));
+        if (!others.isEmpty())
+            repoPairs.add(new Pair<>(OTHERS, others));
+
+        notifyDataSetChanged();
+        return false;
+    }
+
+    static class SectionHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.section_text) TextView sectionText;
+
+        SectionHolder(View itemView) {
+            super(itemView);
+            new ReposAdapter$SectionHolder_ViewBinding(this, itemView);
+        }
+    }
+
+    static class RepoHolder extends RecyclerView.ViewHolder {
+
+        @BindView(R.id.title) TextView title;
+        @BindView(R.id.version_name) TextView versionName;
+        @BindView(R.id.description) TextView description;
+        @BindView(R.id.author) TextView author;
+        @BindView(R.id.info_layout) View infoLayout;
+        @BindView(R.id.download) ImageView downloadImage;
+        @BindView(R.id.update_time) TextView updateTime;
+
+        RepoHolder(View itemView) {
+            super(itemView);
+            new ReposAdapter$RepoHolder_ViewBinding(this, itemView);
+        }
+
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/adapters/SectionedAdapter.java

@@ -1,15 +1,18 @@
-package com.topjohnwu.magisk.adapters;
+package com.topjohnwu.magisk.model.adapters;
 
-import android.support.v7.widget.RecyclerView;
 import android.view.ViewGroup;
 
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
 public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C extends RecyclerView.ViewHolder>
         extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
 
     private static final int SECTION_TYPE = Integer.MIN_VALUE;
 
+    @NonNull
     @Override
-    final public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
+    final public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
         if (viewType == SECTION_TYPE)
             return onCreateSectionViewHolder(parent);
         return onCreateItemViewHolder(parent, viewType);
@@ -17,7 +20,7 @@ public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C exte
 
     @Override
     @SuppressWarnings("unchecked")
-    final public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
+    final public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int position) {
         PositionInfo info = getPositionInfo(position);
         if (info.position == -1)
             onBindSectionViewHolder((S) holder, info.section);
@@ -41,7 +44,7 @@ public abstract class SectionedAdapter<S extends RecyclerView.ViewHolder, C exte
         if (info.position == -1)
             return SECTION_TYPE;
         else
-            return  getItemViewType(info.section, info.position);
+            return getItemViewType(info.section, info.position);
     }
 
     public int getItemViewType(int section, int position) {

app/src/main/java/com/topjohnwu/magisk/model/adapters/StringListAdapter.java

@@ -0,0 +1,103 @@
+package com.topjohnwu.magisk.model.adapters;
+
+import android.app.Activity;
+import android.util.DisplayMetrics;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import androidx.annotation.IdRes;
+import androidx.annotation.LayoutRes;
+import androidx.annotation.NonNull;
+import androidx.recyclerview.widget.RecyclerView;
+
+import java.util.List;
+
+public abstract class StringListAdapter<VH extends StringListAdapter.ViewHolder>
+        extends RecyclerView.Adapter<VH> {
+
+    private RecyclerView rv;
+    private boolean dynamic;
+    private int screenWidth;
+    private int txtWidth = -1;
+    private int padding;
+
+    protected List<String> mList;
+
+    public StringListAdapter(List<String> list) {
+        this(list, false);
+    }
+
+    public StringListAdapter(List<String> list, boolean isDynamic) {
+        mList = list;
+        dynamic = isDynamic;
+    }
+
+    @NonNull
+    @Override
+    public final VH onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
+        View v = LayoutInflater.from(parent.getContext()).inflate(itemLayoutRes(), parent, false);
+        VH vh = createViewHolder(v);
+        if (txtWidth < 0)
+            onUpdateTextWidth(vh);
+        return vh;
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull VH holder, int position) {
+        holder.txt.setText(mList.get(position));
+        holder.txt.getLayoutParams().width = txtWidth;
+        if (dynamic)
+            onUpdateTextWidth(holder);
+    }
+
+    protected void onUpdateTextWidth(VH vh) {
+        if (txtWidth < 0) {
+            txtWidth = screenWidth - padding;
+        } else {
+            vh.txt.measure(0, 0);
+            int width = vh.txt.getMeasuredWidth();
+            if (width > txtWidth) {
+                txtWidth = width;
+                vh.txt.getLayoutParams().width = txtWidth;
+            }
+        }
+        if (rv.getWidth() != txtWidth + padding)
+            rv.requestLayout();
+    }
+
+    @Override
+    public void onAttachedToRecyclerView(@NonNull RecyclerView rv) {
+        DisplayMetrics displayMetrics = new DisplayMetrics();
+        ((Activity) rv.getContext()).getWindowManager()
+                .getDefaultDisplay().getMetrics(displayMetrics);
+        screenWidth = displayMetrics.widthPixels;
+        padding = rv.getPaddingStart() + rv.getPaddingEnd();
+        this.rv = rv;
+    }
+
+    @Override
+    public final int getItemCount() {
+        return mList.size();
+    }
+
+    @LayoutRes
+    protected abstract int itemLayoutRes();
+
+    @NonNull
+    public abstract VH createViewHolder(@NonNull View v);
+
+    public static abstract class ViewHolder extends RecyclerView.ViewHolder {
+
+        public TextView txt;
+
+        public ViewHolder(@NonNull View itemView) {
+            super(itemView);
+            txt = itemView.findViewById(textViewResId());
+        }
+
+        @IdRes
+        protected abstract int textViewResId();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/adapters/SuLogAdapter.java

@@ -1,7 +1,6 @@
-package com.topjohnwu.magisk.adapters;
+package com.topjohnwu.magisk.model.adapters;
 
-import android.database.Cursor;
-import android.support.v7.widget.RecyclerView;
+import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -10,10 +9,12 @@ import android.view.animation.RotateAnimation;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import androidx.recyclerview.widget.RecyclerView;
+
 import com.topjohnwu.magisk.R;
-import com.topjohnwu.magisk.components.ExpandableView;
-import com.topjohnwu.magisk.container.SuLogEntry;
-import com.topjohnwu.magisk.database.SuDatabaseHelper;
+import com.topjohnwu.magisk.data.database.MagiskDB;
+import com.topjohnwu.magisk.model.entity.SuLogEntry;
+import com.topjohnwu.magisk.view.ExpandableViewHolder;
 
 import java.util.Collections;
 import java.util.HashSet;
@@ -21,30 +22,28 @@ import java.util.List;
 import java.util.Set;
 
 import butterknife.BindView;
-import butterknife.ButterKnife;
 
 public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, SuLogAdapter.LogViewHolder> {
 
-    private List<List<Integer>> logEntryList;
+    private List<List<SuLogEntry>> logEntries;
     private Set<Integer> itemExpanded, sectionExpanded;
-    private SuDatabaseHelper suDB;
-    private Cursor suLogCursor = null;
+    private MagiskDB suDB;
 
-    public SuLogAdapter(SuDatabaseHelper db) {
+    public SuLogAdapter(MagiskDB db) {
         suDB = db;
-        logEntryList = Collections.emptyList();
+        logEntries = Collections.emptyList();
         sectionExpanded = new HashSet<>();
         itemExpanded = new HashSet<>();
     }
 
     @Override
     public int getSectionCount() {
-        return logEntryList.size();
+        return logEntries.size();
     }
 
     @Override
     public int getItemCount(int section) {
-        return sectionExpanded.contains(section) ? logEntryList.get(section).size() : 0;
+        return sectionExpanded.contains(section) ? logEntries.get(section).size() : 0;
     }
 
     @Override
@@ -61,8 +60,7 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
     @Override
     public void onBindSectionViewHolder(SectionHolder holder, int section) {
-        suLogCursor.moveToPosition(logEntryList.get(section).get(0));
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
+        SuLogEntry entry = logEntries.get(section).get(0);
         holder.arrow.setRotation(sectionExpanded.contains(section) ? 180 : 0);
         holder.itemView.setOnClickListener(v -> {
             RotateAnimation rotate;
@@ -70,11 +68,11 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
                 holder.arrow.setRotation(0);
                 rotate = new RotateAnimation(180, 0, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
                 sectionExpanded.remove(section);
-                notifyItemRangeRemoved(getItemPosition(section, 0), logEntryList.get(section).size());
+                notifyItemRangeRemoved(getItemPosition(section, 0), logEntries.get(section).size());
             } else {
                 rotate = new RotateAnimation(0, 180, Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f);
                 sectionExpanded.add(section);
-                notifyItemRangeInserted(getItemPosition(section, 0), logEntryList.get(section).size());
+                notifyItemRangeInserted(getItemPosition(section, 0), logEntries.get(section).size());
             }
             rotate.setDuration(300);
             rotate.setFillAfter(true);
@@ -85,32 +83,29 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
     @Override
     public void onBindItemViewHolder(LogViewHolder holder, int section, int position) {
-        int sqlPosition = logEntryList.get(section).get(position);
-        suLogCursor.moveToPosition(sqlPosition);
-        SuLogEntry entry = new SuLogEntry(suLogCursor);
-        holder.setExpanded(itemExpanded.contains(sqlPosition));
+        SuLogEntry entry = logEntries.get(section).get(position);
+        int realIdx = getItemPosition(section, position);
+        holder.expandable.setExpanded(itemExpanded.contains(realIdx));
         holder.itemView.setOnClickListener(view -> {
-            if (holder.isExpanded()) {
-                holder.collapse();
-                itemExpanded.remove(sqlPosition);
+            if (holder.expandable.isExpanded()) {
+                holder.expandable.collapse();
+                itemExpanded.remove(realIdx);
             } else {
-                holder.expand();
-                itemExpanded.add(sqlPosition);
+                holder.expandable.expand();
+                itemExpanded.add(realIdx);
             }
         });
+        Context context = holder.itemView.getContext();
         holder.appName.setText(entry.appName);
         holder.action.setText(entry.action ? R.string.grant : R.string.deny);
-        holder.command.setText(entry.command);
-        holder.fromPid.setText(String.valueOf(entry.fromPid));
-        holder.toUid.setText(String.valueOf(entry.toUid));
+        holder.pid.setText(context.getString(R.string.pid, entry.fromPid));
+        holder.uid.setText(context.getString(R.string.target_uid, entry.toUid));
+        holder.command.setText(context.getString(R.string.command, entry.command));
         holder.time.setText(entry.getTimeString());
     }
 
     public void notifyDBChanged() {
-        if (suLogCursor != null)
-            suLogCursor.close();
-        suLogCursor = suDB.getLogCursor();
-        logEntryList = suDB.getLogStructure();
+        logEntries = suDB.getLogs();
         itemExpanded.clear();
         sectionExpanded.clear();
         sectionExpanded.add(0);
@@ -124,32 +119,26 @@ public class SuLogAdapter extends SectionedAdapter<SuLogAdapter.SectionHolder, S
 
         SectionHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
+            new SuLogAdapter$SectionHolder_ViewBinding(this, itemView);
         }
     }
 
-    static class LogViewHolder extends RecyclerView.ViewHolder implements ExpandableView {
+    static class LogViewHolder extends RecyclerView.ViewHolder {
 
         @BindView(R.id.app_name) TextView appName;
         @BindView(R.id.action) TextView action;
         @BindView(R.id.time) TextView time;
-        @BindView(R.id.fromPid) TextView fromPid;
-        @BindView(R.id.toUid) TextView toUid;
-        @BindView(R.id.command) TextView command;
+        @BindView(R.id.pid) TextView pid;
+        @BindView(R.id.uid) TextView uid;
+        @BindView(R.id.cmd) TextView command;
         @BindView(R.id.expand_layout) ViewGroup expandLayout;
 
-        private Container container = new Container();
+        ExpandableViewHolder expandable;
 
         LogViewHolder(View itemView) {
             super(itemView);
-            ButterKnife.bind(this, itemView);
-            container.expandLayout = expandLayout;
-            setupExpandable();
-        }
-
-        @Override
-        public Container getContainer() {
-            return container;
+            new SuLogAdapter$LogViewHolder_ViewBinding(this, itemView);
+            expandable = new ExpandableViewHolder(expandLayout);
         }
     }
 }

app/src/main/java/com/topjohnwu/magisk/model/adapters/TabFragmentAdapter.java

@@ -1,9 +1,9 @@
-package com.topjohnwu.magisk.adapters;
+package com.topjohnwu.magisk.model.adapters;
 
 
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentPagerAdapter;
+import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentPagerAdapter;
 
 import java.util.ArrayList;
 import java.util.List;

app/src/main/java/com/topjohnwu/magisk/model/download/DownloadModuleService.java

@@ -0,0 +1,156 @@
+package com.topjohnwu.magisk.model.download;
+
+import android.app.PendingIntent;
+import android.app.Service;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.IBinder;
+
+import androidx.annotation.Nullable;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.model.entity.Repo;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
+import com.topjohnwu.magisk.view.Notifications;
+import com.topjohnwu.magisk.view.ProgressNotification;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+import java.util.zip.ZipOutputStream;
+
+public class DownloadModuleService extends Service {
+
+    private List<ProgressNotification> notifications;
+
+    @Nullable
+    @Override
+    public IBinder onBind(Intent intent) {
+        return null;
+    }
+
+    @Override
+    public void onCreate() {
+        notifications = new ArrayList<>();
+    }
+
+    @Override
+    public int onStartCommand(Intent intent, int flags, int startId) {
+        Shell.EXECUTOR.execute(() -> {
+            Repo repo = intent.getParcelableExtra("repo");
+            boolean install = intent.getBooleanExtra("install", false);
+            dlProcessInstall(repo, install);
+        });
+        return START_REDELIVER_INTENT;
+    }
+
+    @Override
+    public synchronized void onTaskRemoved(Intent rootIntent) {
+        for (ProgressNotification n : notifications) {
+            Notifications.mgr.cancel(n.hashCode());
+        }
+        notifications.clear();
+    }
+
+    private synchronized void addNotification(ProgressNotification n) {
+        if (notifications.isEmpty()) {
+            // Start foreground
+            startForeground(n.hashCode(), n.getNotification());
+        }
+        notifications.add(n);
+    }
+
+    private synchronized void removeNotification(ProgressNotification n) {
+        notifications.remove(n);
+        if (notifications.isEmpty()) {
+            // No more tasks, stop service
+            stopForeground(true);
+            stopSelf();
+        } else {
+            // Pick another notification as our foreground notification
+            n = notifications.get(0);
+            startForeground(n.hashCode(), n.getNotification());
+        }
+    }
+
+    private void dlProcessInstall(Repo repo, boolean install) {
+        File output = new File(Const.EXTERNAL_PATH, repo.getDownloadFilename());
+        ProgressNotification progress = new ProgressNotification(output.getName());
+        addNotification(progress);
+        try {
+            InputStream in = Networking.get(repo.getZipUrl())
+                    .setDownloadProgressListener(progress)
+                    .execForInputStream().getResult();
+            OutputStream out = new BufferedOutputStream(new FileOutputStream(output));
+            processZip(in, out);
+            Intent intent = new Intent(this, ClassMap.get(FlashActivity.class));
+            intent.setData(Uri.fromFile(output))
+                    .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                    .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_ZIP);
+            synchronized (getApplication()) {
+                if (install && App.foreground() != null &&
+                        !(App.foreground() instanceof FlashActivity)) {
+                    /* Only start flashing if there is a foreground activity and the
+                     * user is not also flashing another module at the same time */
+                    App.foreground().startActivity(intent);
+                } else {
+                    /* Or else we preset a notification notifying that we are done */
+                    PendingIntent pi = PendingIntent.getActivity(this, progress.hashCode(), intent,
+                            PendingIntent.FLAG_UPDATE_CURRENT);
+                    progress.dlDone(pi);
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            progress.dlFail();
+        }
+        removeNotification(progress);
+    }
+
+    private void processZip(InputStream in, OutputStream out)
+            throws IOException {
+        try (ZipInputStream zin = new ZipInputStream(in);
+             ZipOutputStream zout = new ZipOutputStream(out)) {
+
+            // Inject latest module-installer.sh as update-binary
+            zout.putNextEntry(new ZipEntry("META-INF/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/android/"));
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/android/update-binary"));
+            try (InputStream update_bin = Networking.get(Const.Url.MODULE_INSTALLER)
+                    .execForInputStream().getResult()) {
+                ShellUtils.pump(update_bin, zout);
+            }
+            zout.putNextEntry(new ZipEntry("META-INF/com/google/android/updater-script"));
+            zout.write("#MAGISK\n".getBytes("UTF-8"));
+
+            int off = -1;
+            ZipEntry entry;
+            while ((entry = zin.getNextEntry()) != null) {
+                if (off < 0)
+                    off = entry.getName().indexOf('/') + 1;
+                String path = entry.getName().substring(off);
+                if (path.isEmpty())
+                    continue;
+                if (path.startsWith("META-INF"))
+                    continue;
+                zout.putNextEntry(new ZipEntry(path));
+                if (!entry.isDirectory())
+                    ShellUtils.pump(zin, zout);
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/BaseModule.java

@@ -1,27 +1,63 @@
-package com.topjohnwu.magisk.container;
-
+package com.topjohnwu.magisk.model.entity;
 
 import android.content.ContentValues;
 import android.database.Cursor;
-import android.support.annotation.NonNull;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import androidx.annotation.NonNull;
 
 import java.util.List;
 
-public abstract class BaseModule implements Comparable<BaseModule> {
+public abstract class BaseModule implements Comparable<BaseModule>, Parcelable {
 
-    private String mId = null, mName, mVersion, mAuthor, mDescription;
-    private int mVersionCode = -1, minMagiskVersion = -1;
+    private String mId, mName, mVersion, mAuthor, mDescription;
+    private int mVersionCode = -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"));
-        minMagiskVersion = c.getInt(c.getColumnIndex("minMagisk"));
+        mAuthor = nonNull(c.getString(c.getColumnIndex("author")));
+        mDescription = nonNull(c.getString(c.getColumnIndex("description")));
+    }
+
+    protected BaseModule(Parcel p) {
+        mId = p.readString();
+        mName = p.readString();
+        mVersion = p.readString();
+        mAuthor = p.readString();
+        mDescription = p.readString();
+        mVersionCode = p.readInt();
+    }
+
+    @Override
+    public int compareTo(@NonNull BaseModule module) {
+        return this.getName().toLowerCase().compareTo(module.getName().toLowerCase());
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        dest.writeString(mId);
+        dest.writeString(mName);
+        dest.writeString(mVersion);
+        dest.writeString(mAuthor);
+        dest.writeString(mDescription);
+        dest.writeInt(mVersionCode);
+    }
+
+    private String nonNull(String s) {
+        return s == null ? "" : s;
     }
 
     public ContentValues getContentValues() {
@@ -32,7 +68,6 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         values.put("versionCode", mVersionCode);
         values.put("author", mAuthor);
         values.put("description", mDescription);
-        values.put("minMagisk", minMagiskVersion);
         return values;
     }
 
@@ -45,31 +80,28 @@ 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];
-                    break;
-                case "minMagisk":
-                case "template":
-                    minMagiskVersion = Integer.parseInt(prop[1]);
+                    mDescription = value;
                     break;
                 default:
                     break;
@@ -109,12 +141,4 @@ public abstract class BaseModule implements Comparable<BaseModule> {
         return mVersionCode;
     }
 
-    public int getMinMagiskVersion() {
-        return minMagiskVersion;
-    }
-
-    @Override
-    public int compareTo(@NonNull BaseModule module) {
-        return this.getName().toLowerCase().compareTo(module.getName().toLowerCase());
-    }
 }

app/src/main/java/com/topjohnwu/magisk/model/entity/Module.java

@@ -1,10 +1,11 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
+
+import android.os.Parcel;
+import android.os.Parcelable;
 
 import com.topjohnwu.superuser.Shell;
 import com.topjohnwu.superuser.io.SuFile;
 
-import java.io.IOException;
-
 public class Module extends BaseModule {
 
     private SuFile mRemoveFile, mDisableFile, mUpdateFile;
@@ -13,19 +14,19 @@ public class Module extends BaseModule {
     public Module(String path) {
 
         try {
-            parseProps(Shell.Sync.su("cat " + path + "/module.prop"));
+            parseProps(Shell.su("dos2unix <  " + path + "/module.prop").exec().getOut());
         } catch (NumberFormatException ignored) {}
 
-        mRemoveFile = new SuFile(path + "/remove", true);
-        mDisableFile = new SuFile(path + "/disable", true);
-        mUpdateFile = new SuFile(path + "/update", true);
+        mRemoveFile = new SuFile(path, "remove");
+        mDisableFile = new SuFile(path, "disable");
+        mUpdateFile = new SuFile(path, "update");
 
-        if (getId() == null) {
+        if (getId().isEmpty()) {
             int sep = path.lastIndexOf('/');
             setId(path.substring(sep + 1));
         }
 
-        if (getName() == null) {
+        if (getName().isEmpty()) {
             setName(getId());
         }
 
@@ -34,16 +35,25 @@ public class Module extends BaseModule {
         mUpdated = mUpdateFile.exists();
     }
 
+    public static final Parcelable.Creator<Module> CREATOR = new Creator<Module>() {
+        /* It won't be used at any place */
+        @Override
+        public Module createFromParcel(Parcel source) {
+            return null;
+        }
+
+        @Override
+        public Module[] newArray(int size) {
+            return null;
+        }
+    };
+
     public void createDisableFile() {
-        mEnable = false;
-        try {
-            mDisableFile.createNewFile();
-        } catch (IOException ignored) {}
+        mEnable = !mDisableFile.createNewFile();
     }
 
     public void removeDisableFile() {
-        mEnable = true;
-        mDisableFile.delete();
+        mEnable = mDisableFile.delete();
     }
 
     public boolean isEnabled() {
@@ -51,15 +61,11 @@ public class Module extends BaseModule {
     }
 
     public void createRemoveFile() {
-        mRemove = true;
-        try {
-            mRemoveFile.createNewFile();
-        } catch (IOException ignored) {}
+        mRemove = mRemoveFile.createNewFile();
     }
 
     public void deleteRemoveFile() {
-        mRemove = false;
-        mRemoveFile.delete();
+        mRemove = !mRemoveFile.delete();
     }
 
     public boolean willBeRemoved() {
@@ -70,4 +76,4 @@ public class Module extends BaseModule {
         return mUpdated;
     }
 
-}
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/Policy.java

@@ -1,10 +1,12 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
 
 import android.content.ContentValues;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
-import android.database.Cursor;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+
+import com.topjohnwu.magisk.utils.Utils;
 
 
 public class Policy implements Comparable<Policy>{
@@ -20,24 +22,27 @@ public class Policy implements Comparable<Policy>{
 
     public Policy(int uid, PackageManager pm) throws PackageManager.NameNotFoundException {
         String[] pkgs = pm.getPackagesForUid(uid);
-        if (pkgs == null || pkgs.length == 0) throw new PackageManager.NameNotFoundException();
+        if (pkgs == null || pkgs.length == 0)
+            throw new PackageManager.NameNotFoundException();
         this.uid = uid;
         packageName = pkgs[0];
         info = pm.getApplicationInfo(packageName, 0);
+        appName = Utils.getAppLabel(info, pm);
+    }
+
+    public Policy(ContentValues values, PackageManager pm) throws PackageManager.NameNotFoundException {
+        uid = values.getAsInteger("uid");
+        packageName = values.getAsString("package_name");
+        policy = values.getAsInteger("policy");
+        until = values.getAsInteger("until");
+        logging = values.getAsInteger("logging") != 0;
+        notification = values.getAsInteger("notification") != 0;
+        info = pm.getApplicationInfo(packageName, 0);
+        if (info.uid != uid)
+            throw new PackageManager.NameNotFoundException();
         appName = info.loadLabel(pm).toString();
     }
 
-    public Policy(Cursor c, PackageManager pm) throws PackageManager.NameNotFoundException {
-        uid = c.getInt(c.getColumnIndex("uid"));
-        packageName = c.getString(c.getColumnIndex("package_name"));
-        policy = c.getInt(c.getColumnIndex("policy"));
-        until = c.getLong(c.getColumnIndex("until"));
-        logging = c.getInt(c.getColumnIndex("logging")) != 0;
-        notification = c.getInt(c.getColumnIndex("notification")) != 0;
-        info = pm.getApplicationInfo(packageName, 0);
-        appName = info.loadLabel(pm).toString();
-    }
-    
     public ContentValues getContentValues() {
         ContentValues values = new ContentValues();
         values.put("uid", uid);

app/src/main/java/com/topjohnwu/magisk/model/entity/Repo.java

@@ -0,0 +1,109 @@
+package com.topjohnwu.magisk.model.entity;
+
+import android.content.ContentValues;
+import android.database.Cursor;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Utils;
+
+import java.text.DateFormat;
+import java.util.Date;
+
+public class Repo extends BaseModule {
+
+    private Date mLastUpdate;
+
+    public Repo(String id) {
+        setId(id);
+    }
+
+    public Repo(Cursor c) {
+        super(c);
+        mLastUpdate = new Date(c.getLong(c.getColumnIndex("last_update")));
+    }
+
+    public Repo(Parcel p) {
+        super(p);
+        mLastUpdate = new Date(p.readLong());
+    }
+
+    public static final Parcelable.Creator<Repo> CREATOR = new Parcelable.Creator<Repo>() {
+
+        @Override
+        public Repo createFromParcel(Parcel source) {
+            return new Repo(source);
+        }
+
+        @Override
+        public Repo[] newArray(int size) {
+            return new Repo[size];
+        }
+    };
+
+    @Override
+    public void writeToParcel(Parcel dest, int flags) {
+        super.writeToParcel(dest, flags);
+        dest.writeLong(mLastUpdate.getTime());
+    }
+
+    public void update() throws IllegalRepoException {
+        String props[] = Utils.dlString(getPropUrl()).split("\\n");
+        try {
+            parseProps(props);
+        } catch (NumberFormatException e) {
+            throw new IllegalRepoException("Repo [" + getId() + "] parse error: " + e.getMessage());
+        }
+
+        if (getVersionCode() < 0) {
+            throw new IllegalRepoException("Repo [" + getId() + "] does not contain versionCode");
+        }
+    }
+
+    public void update(Date lastUpdate) throws IllegalRepoException {
+        mLastUpdate = lastUpdate;
+        update();
+    }
+
+    @Override
+    public ContentValues getContentValues() {
+        ContentValues values = super.getContentValues();
+        values.put("last_update", mLastUpdate.getTime());
+        return values;
+    }
+
+    public String getZipUrl() {
+        return String.format(Const.Url.ZIP_URL, getId());
+    }
+
+    public String getPropUrl() {
+        return getFileUrl("module.prop");
+    }
+
+    public String getDetailUrl() {
+        return getFileUrl("README.md");
+    }
+
+    public String getFileUrl(String file) {
+        return String.format(Const.Url.FILE_URL, getId(), file);
+    }
+
+    public String getLastUpdateString() {
+        return DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM).format(mLastUpdate);
+    }
+
+    public Date getLastUpdate() {
+        return mLastUpdate;
+    }
+
+    public String getDownloadFilename() {
+        return Utils.getLegalFilename(getName() + "-" + getVersion() + ".zip");
+    }
+
+    public class IllegalRepoException extends Exception {
+        IllegalRepoException(String message) {
+            super(message);
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/entity/SuLogEntry.java

@@ -1,9 +1,8 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.model.entity;
 
 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;
@@ -20,17 +19,18 @@ public class SuLogEntry {
         fromUid = policy.uid;
         packageName = policy.packageName;
         appName = policy.appName;
+        action = policy.policy == Policy.ALLOW;
     }
 
-    public SuLogEntry(Cursor c) {
-        fromUid = c.getInt(c.getColumnIndex("from_uid"));
-        fromPid = c.getInt(c.getColumnIndex("from_pid"));
-        toUid = c.getInt(c.getColumnIndex("to_uid"));
-        packageName = c.getString(c.getColumnIndex("package_name"));
-        appName = c.getString(c.getColumnIndex("app_name"));
-        command = c.getString(c.getColumnIndex("command"));
-        action = c.getInt(c.getColumnIndex("action")) != 0;
-        date = new Date(c.getLong(c.getColumnIndex("time")));
+    public SuLogEntry(ContentValues values) {
+        fromUid = values.getAsInteger("from_uid");
+        packageName = values.getAsString("package_name");
+        appName = values.getAsString("app_name");
+        fromPid = values.getAsInteger("from_pid");
+        command = values.getAsString("command");
+        toUid = values.getAsInteger("to_uid");
+        action = values.getAsInteger("action") != 0;
+        date = new Date(values.getAsLong("time"));
     }
 
     public ContentValues getContentValues() {
@@ -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/main/java/com/topjohnwu/magisk/model/receiver/GeneralReceiver.java

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.model.receiver;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.ui.surequest.SuRequestActivity;
+import com.topjohnwu.magisk.utils.DownloadApp;
+import com.topjohnwu.magisk.utils.SuLogger;
+import com.topjohnwu.magisk.view.Notifications;
+import com.topjohnwu.magisk.view.Shortcuts;
+import com.topjohnwu.superuser.Shell;
+
+public class GeneralReceiver extends BroadcastReceiver {
+
+    private String getPkg(Intent i) {
+        return i.getData() == null ? "" : i.getData().getEncodedSchemeSpecificPart();
+    }
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        App app = App.self;
+        if (intent == null)
+            return;
+        String action = intent.getAction();
+        if (action == null)
+            return;
+        switch (action) {
+            case Intent.ACTION_REBOOT:
+            case Intent.ACTION_BOOT_COMPLETED:
+                action = intent.getStringExtra("action");
+                if (action == null) {
+                    // Actual boot completed event
+                    Shell.su("mm_patch_dtbo").submit(result -> {
+                        if (result.isSuccess())
+                            Notifications.dtboPatched();
+                    });
+                    break;
+                }
+                switch (action) {
+                    case SuRequestActivity.REQUEST:
+                        Intent i = new Intent(app, ClassMap.get(SuRequestActivity.class))
+                                .setAction(action)
+                                .putExtra("socket", intent.getStringExtra("socket"))
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
+                        app.startActivity(i);
+                        break;
+                    case SuRequestActivity.LOG:
+                        SuLogger.handleLogs(intent);
+                        break;
+                    case SuRequestActivity.NOTIFY:
+                        SuLogger.handleNotify(intent);
+                        break;
+                }
+                break;
+            case Intent.ACTION_PACKAGE_REPLACED:
+                // This will only work pre-O
+                if (Config.get(Config.Key.SU_REAUTH)) {
+                    app.mDB.deletePolicy(getPkg(intent));
+                }
+                break;
+            case Intent.ACTION_PACKAGE_FULLY_REMOVED:
+                String pkg = getPkg(intent);
+                app.mDB.deletePolicy(pkg);
+                Shell.su("magiskhide --rm " + pkg).submit();
+                break;
+            case Intent.ACTION_LOCALE_CHANGED:
+                Shortcuts.setup(context);
+                break;
+            case Const.Key.BROADCAST_MANAGER_UPDATE:
+                Config.managerLink = intent.getStringExtra(Const.Key.INTENT_SET_LINK);
+                DownloadApp.upgrade(intent.getStringExtra(Const.Key.INTENT_SET_NAME));
+                break;
+            case Const.Key.BROADCAST_REBOOT:
+                Shell.su("/system/bin/reboot").submit();
+                break;
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/update/UpdateCheckService.java

@@ -0,0 +1,33 @@
+package com.topjohnwu.magisk.model.update;
+
+import androidx.annotation.NonNull;
+import androidx.work.ListenableWorker;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.model.worker.DelegateWorker;
+import com.topjohnwu.magisk.tasks.CheckUpdates;
+import com.topjohnwu.magisk.view.Notifications;
+import com.topjohnwu.superuser.Shell;
+
+public class UpdateCheckService extends DelegateWorker {
+
+    @NonNull
+    @Override
+    public ListenableWorker.Result doWork() {
+        if (App.foreground() == null) {
+            Shell.getShell();
+            CheckUpdates.check(this::onCheckDone);
+        }
+        return ListenableWorker.Result.success();
+    }
+
+    private void onCheckDone() {
+        if (BuildConfig.VERSION_CODE < Config.remoteManagerVersionCode) {
+            Notifications.managerUpdate();
+        } else if (Config.magiskVersionCode < Config.remoteMagiskVersionCode) {
+            Notifications.magiskUpdate();
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/model/worker/DelegateWorker.java

@@ -0,0 +1,84 @@
+package com.topjohnwu.magisk.model.worker;
+
+import android.content.Context;
+import android.net.Network;
+import android.net.Uri;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.RequiresApi;
+import androidx.work.Data;
+import androidx.work.ListenableWorker;
+
+import com.google.common.util.concurrent.ListenableFuture;
+
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+
+public abstract class DelegateWorker {
+
+    private ListenableWorker worker;
+
+    @NonNull
+    public abstract ListenableWorker.Result doWork();
+
+    public void onStopped() {}
+
+    public void setActualWorker(ListenableWorker w) {
+        worker = w;
+    }
+
+    @NonNull
+    public Context getApplicationContext() {
+        return worker.getApplicationContext();
+    }
+
+    @NonNull
+    public UUID getId() {
+        return worker.getId();
+    }
+
+    @NonNull
+    public Data getInputData() {
+        return worker.getInputData();
+    }
+
+    @NonNull
+    public Set<String> getTags() {
+        return worker.getTags();
+    }
+
+    @NonNull
+    @RequiresApi(24)
+    public List<Uri> getTriggeredContentUris() {
+        return worker.getTriggeredContentUris();
+    }
+
+    @NonNull
+    @RequiresApi(24)
+    public List<String> getTriggeredContentAuthorities() {
+        return worker.getTriggeredContentAuthorities();
+    }
+
+    @Nullable
+    @RequiresApi(28)
+    public Network getNetwork() {
+        return worker.getNetwork();
+    }
+
+    public int getRunAttemptCount() {
+        return worker.getRunAttemptCount();
+    }
+
+    @NonNull
+    @MainThread
+    public ListenableFuture<ListenableWorker.Result> startWork() {
+        return worker.startWork();
+    }
+
+    public boolean isStopped() {
+        return worker.isStopped();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/tasks/CheckUpdates.java

@@ -0,0 +1,132 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.os.SystemClock;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.net.Request;
+import com.topjohnwu.net.ResponseListener;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import org.json.JSONException;
+import org.json.JSONObject;
+
+public class CheckUpdates {
+
+    private static Request getRequest() {
+        String url;
+        switch ((int) Config.get(Config.Key.UPDATE_CHANNEL)) {
+            case Config.Value.BETA_CHANNEL:
+                url = Const.Url.BETA_URL;
+                break;
+            case Config.Value.CUSTOM_CHANNEL:
+                url = Config.get(Config.Key.CUSTOM_CHANNEL);
+                break;
+            case Config.Value.CANARY_CHANNEL:
+                url = Const.Url.CANARY_URL;
+                break;
+            case Config.Value.CANARY_DEBUG_CHANNEL:
+                url = Const.Url.CANARY_DEBUG_URL;
+                break;
+            default:
+                url = Const.Url.STABLE_URL;
+                break;
+        }
+        return Networking.get(url);
+    }
+
+    public static void check() {
+        check(null);
+    }
+
+    public static void check(Runnable cb) {
+        Request request = getRequest();
+        UpdateListener listener = new UpdateListener(cb);
+        if (ShellUtils.onMainThread()) {
+            request.getAsJSONObject(listener);
+        } else {
+            JSONObject json = request.execForJSONObject().getResult();
+            if (json != null)
+                listener.onResponse(json);
+        }
+    }
+
+    private static class UpdateListener implements ResponseListener<JSONObject> {
+
+        private Runnable cb;
+        private long start;
+
+        UpdateListener(Runnable callback) {
+            cb = callback;
+            start = SystemClock.uptimeMillis();
+        }
+
+        private int getInt(JSONObject json, String name, int defValue) {
+            if (json == null)
+                return defValue;
+            try {
+                return json.getInt(name);
+            } catch (JSONException e) {
+                return defValue;
+            }
+        }
+
+        private String getString(JSONObject json, String name, String defValue) {
+            if (json == null)
+                return defValue;
+            try {
+                return json.getString(name);
+            } catch (JSONException e) {
+                return defValue;
+            }
+        }
+
+        private JSONObject getJson(JSONObject json, String name) {
+            try {
+                return json.getJSONObject(name);
+            } catch (JSONException e) {
+                return null;
+            }
+        }
+
+        @Override
+        public void onResponse(JSONObject json) {
+            JSONObject magisk = getJson(json, "magisk");
+            Config.remoteMagiskVersionCode = getInt(magisk, "versionCode", -1);
+
+            if ((int) Config.get(Config.Key.UPDATE_CHANNEL) == Config.Value.DEFAULT_CHANNEL) {
+                if (Config.magiskVersionCode > Config.remoteMagiskVersionCode) {
+                    // If we are newer than current stable channel, switch to beta
+                    Config.set(Config.Key.UPDATE_CHANNEL, Config.Value.BETA_CHANNEL);
+                    check(cb);
+                    return;
+                } else {
+                    Config.set(Config.Key.UPDATE_CHANNEL, Config.Value.STABLE_CHANNEL);
+                }
+            }
+
+            Config.remoteMagiskVersionString = getString(magisk, "version", null);
+            Config.magiskLink = getString(magisk, "link", null);
+            Config.magiskNoteLink = getString(magisk, "note", null);
+            Config.magiskMD5 = getString(magisk, "md5", null);
+
+            JSONObject manager = getJson(json, "app");
+            Config.remoteManagerVersionString = getString(manager, "version", null);
+            Config.remoteManagerVersionCode = getInt(manager, "versionCode", -1);
+            Config.managerLink = getString(manager, "link", null);
+            Config.managerNoteLink = getString(manager, "note", null);
+
+            JSONObject uninstaller = getJson(json, "uninstaller");
+            Config.uninstallerLink = getString(uninstaller, "link", null);
+
+            UiThreadHandler.handler.postAtTime(() -> Event.trigger(Event.UPDATE_CHECK_DONE),
+                    start + 1000  /* Add artificial delay to let UI behave correctly */);
+
+            if (cb != null)
+                cb.run();
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/tasks/FlashZip.java

@@ -0,0 +1,85 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.net.Uri;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.utils.ZipUtils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.util.List;
+
+public abstract class FlashZip {
+
+    private Uri mUri;
+    private File tmpFile;
+    private List<String> console, logs;
+
+    public FlashZip(Uri uri, List<String> out, List<String> err) {
+        mUri = uri;
+        console = out;
+        logs = err;
+        tmpFile = new File(App.self.getCacheDir(), "install.zip");
+    }
+
+    private boolean unzipAndCheck() throws IOException {
+        ZipUtils.unzip(tmpFile, tmpFile.getParentFile(), "META-INF/com/google/android", true);
+        return Shell.su("grep -q '#MAGISK' " + new File(tmpFile.getParentFile(), "updater-script"))
+                .exec().isSuccess();
+    }
+
+    private boolean flash() throws IOException {
+        console.add("- Copying zip to temp directory");
+        try (InputStream in = App.self.getContentResolver().openInputStream(mUri);
+             OutputStream out = new BufferedOutputStream(new FileOutputStream(tmpFile))) {
+            if (in == null) throw new FileNotFoundException();
+            InputStream buf= new BufferedInputStream(in);
+            ShellUtils.pump(buf, out);
+        } catch (FileNotFoundException e) {
+            console.add("! Invalid Uri");
+            throw e;
+        } catch (IOException e) {
+            console.add("! Cannot copy to cache");
+            throw e;
+        }
+        try {
+            if (!unzipAndCheck()) {
+                console.add("! This zip is not a Magisk Module!");
+                return false;
+            }
+        } catch (IOException e) {
+            console.add("! Unzip error");
+            throw e;
+        }
+        console.add("- Installing " + Utils.getNameFromUri(App.self, mUri));
+        return Shell.su("cd " + tmpFile.getParent(),
+                "BOOTMODE=true sh update-binary dummy 1 " + tmpFile)
+                .to(console, logs)
+                .exec().isSuccess();
+    }
+
+    public void exec() {
+        App.THREAD_POOL.execute(() -> {
+            boolean success = false;
+            try {
+                success = flash();
+            } catch (IOException ignored) {}
+            Shell.su("cd /", "rm -rf " + tmpFile.getParent() + " " + Const.TMP_FOLDER_PATH).submit();
+            boolean finalSuccess = success;
+            UiThreadHandler.run(() -> onResult(finalSuccess));
+        });
+    }
+
+    protected abstract void onResult(boolean success);
+}

app/src/main/java/com/topjohnwu/magisk/tasks/MagiskInstaller.java

@@ -0,0 +1,380 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.net.Uri;
+import android.os.Build;
+import android.text.TextUtils;
+
+import androidx.annotation.MainThread;
+import androidx.annotation.WorkerThread;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.DownloadProgressListener;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.signing.SignBoot;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.internal.NOPList;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileInputStream;
+import com.topjohnwu.superuser.io.SuFileOutputStream;
+
+import org.kamranzafar.jtar.TarEntry;
+import org.kamranzafar.jtar.TarHeader;
+import org.kamranzafar.jtar.TarInputStream;
+import org.kamranzafar.jtar.TarOutputStream;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+public abstract class MagiskInstaller {
+
+    protected String srcBoot;
+    protected File destFile;
+    protected File installDir;
+
+    private List<String> console, logs;
+    private boolean isTar = false;
+
+    private class ProgressLog implements DownloadProgressListener {
+
+        private int prev = -1;
+        private int location;
+
+        @Override
+        public void onProgress(long bytesDownloaded, long totalBytes) {
+            if (prev < 0) {
+                location = console.size();
+                console.add("... 0%");
+            }
+            int curr = (int) (100 * bytesDownloaded / totalBytes);
+            if (prev != curr) {
+                prev = curr;
+                console.set(location, "... " + prev + "%");
+            }
+        }
+    }
+
+    protected MagiskInstaller() {
+        console = NOPList.getInstance();
+        logs = NOPList.getInstance();
+    }
+
+    public MagiskInstaller(List<String> out, List<String> err) {
+        console = out;
+        logs = err;
+        installDir = new File(App.deContext.getFilesDir().getParent(), "install");
+        Shell.sh("rm -rf " + installDir).exec();
+        installDir.mkdirs();
+    }
+
+    protected boolean findImage() {
+        srcBoot = ShellUtils.fastCmd("find_boot_image", "echo \"$BOOTIMAGE\"");
+        if (srcBoot.isEmpty()) {
+            console.add("! Unable to detect target image");
+            return false;
+        }
+        console.add("- Target image: " + srcBoot);
+        return true;
+    }
+
+    protected boolean findSecondaryImage() {
+        String slot = ShellUtils.fastCmd("echo $SLOT");
+        String target = (TextUtils.equals(slot, "_a") ? "_b" : "_a");
+        console.add("- Target slot: " + target);
+        srcBoot = ShellUtils.fastCmd(
+                "SLOT=" + target,
+                "find_boot_image",
+                "SLOT=" + slot,
+                "echo \"$BOOTIMAGE\""
+        );
+        if (srcBoot.isEmpty()) {
+            console.add("! Unable to detect target image");
+            return false;
+        }
+        console.add("- Target image: " + srcBoot);
+        return true;
+    }
+
+    protected boolean extractZip() {
+        String arch;
+        if (Build.VERSION.SDK_INT >= 21) {
+            List<String> abis = Arrays.asList(Build.SUPPORTED_ABIS);
+            arch = abis.contains("x86") ? "x86" : "arm";
+        } else {
+            arch = TextUtils.equals(Build.CPU_ABI, "x86") ? "x86" : "arm";
+        }
+
+        console.add("- Device platform: " + Build.CPU_ABI);
+
+        File zip = new File(App.self.getCacheDir(), "magisk.zip");
+
+        if (!ShellUtils.checkSum("MD5", zip, Config.magiskMD5)) {
+            console.add("- Downloading zip");
+            Networking.get(Config.magiskLink)
+                    .setDownloadProgressListener(new ProgressLog())
+                    .execForFile(zip);
+        } else {
+            console.add("- Existing zip found");
+        }
+
+        try {
+            ZipInputStream zi = new ZipInputStream(new BufferedInputStream(
+                    new FileInputStream(zip), (int) zip.length()));
+            ZipEntry ze;
+            while ((ze = zi.getNextEntry()) != null) {
+                if (ze.isDirectory())
+                    continue;
+                String name = null;
+                String[] names = { arch + "/", "common/", "META-INF/com/google/android/update-binary" };
+                for (String n : names) {
+                    if (ze.getName().startsWith(n)) {
+                        name = ze.getName().substring(ze.getName().lastIndexOf('/') + 1);
+                        break;
+                    }
+                }
+                if (name == null && ze.getName().startsWith("chromeos/"))
+                    name = ze.getName();
+                if (name == null)
+                    continue;
+                File dest = (installDir instanceof SuFile) ?
+                        new SuFile(installDir, name) :
+                        new File(installDir, name);
+                dest.getParentFile().mkdirs();
+                try (OutputStream out = new SuFileOutputStream(dest)) {
+                    ShellUtils.pump(zi, out);
+                }
+            }
+        } catch (IOException e) {
+            console.add("! Cannot unzip zip");
+            return false;
+        }
+
+        File init64 = SuFile.open(installDir, "magiskinit64");
+        if (Build.VERSION.SDK_INT >= 21 && Build.SUPPORTED_64_BIT_ABIS.length != 0) {
+            init64.renameTo(SuFile.open(installDir, "magiskinit"));
+        } else {
+            init64.delete();
+        }
+        Shell.sh("cd " + installDir, "chmod 755 *").exec();
+        return true;
+    }
+
+    private TarEntry newEntry(String name, long size) {
+        console.add("-- Writing: " + name);
+        return new TarEntry(TarHeader.createHeader(name, size, 0, false, 0644));
+    }
+
+    private void handleTar(InputStream in) throws IOException {
+        console.add("- Processing tar file");
+        boolean vbmeta = false;
+        try (TarInputStream tarIn = new TarInputStream(in);
+             TarOutputStream tarOut = new TarOutputStream(destFile)) {
+            TarEntry entry;
+            while ((entry = tarIn.getNextEntry()) != null) {
+                if (entry.getName().contains("boot.img")
+                        || entry.getName().contains("recovery.img")) {
+                    String name = entry.getName();
+                    console.add("-- Extracting: " + name);
+                    File extract = new File(installDir, name);
+                    try (FileOutputStream fout = new FileOutputStream(extract)) {
+                        ShellUtils.pump(tarIn, fout);
+                    }
+                    if (name.contains(".lz4")) {
+                        console.add("-- Decompressing: " + name);
+                        Shell.sh("./magiskboot --decompress " + extract).to(console).exec();
+                    }
+                } else if (entry.getName().contains("vbmeta.img")) {
+                    vbmeta = true;
+                    ByteBuffer buf = ByteBuffer.allocate(256);
+                    buf.put("AVB0".getBytes()); // magic
+                    buf.putInt(1);              // required_libavb_version_major
+                    buf.putInt(120, 2);         // flags
+                    buf.position(128);          // release_string
+                    buf.put("avbtool 1.1.0".getBytes());
+                    tarOut.putNextEntry(newEntry("vbmeta.img", 256));
+                    tarOut.write(buf.array());
+                } else {
+                    console.add("-- Writing: " + entry.getName());
+                    tarOut.putNextEntry(entry);
+                    ShellUtils.pump(tarIn, tarOut);
+                }
+            }
+            File boot = SuFile.open(installDir, "boot.img");
+            File recovery = SuFile.open(installDir, "recovery.img");
+            if (vbmeta && recovery.exists() && boot.exists()) {
+                // Install Magisk to recovery
+                srcBoot = recovery.getPath();
+                // Repack boot image to prevent restore
+                Shell.sh(
+                        "./magiskboot --unpack boot.img",
+                        "./magiskboot --repack boot.img",
+                        "./magiskboot --cleanup",
+                        "mv new-boot.img boot.img").exec();
+                try (InputStream sin = new SuFileInputStream(boot)) {
+                    tarOut.putNextEntry(newEntry("boot.img", boot.length()));
+                    ShellUtils.pump(sin, tarOut);
+                }
+                boot.delete();
+            } else {
+                if (!boot.exists()) {
+                    console.add("! No boot image found");
+                    throw new IOException();
+                }
+                srcBoot = boot.getPath();
+            }
+        }
+    }
+
+    protected boolean handleFile(Uri uri) {
+        try (InputStream in = new BufferedInputStream(App.self.getContentResolver().openInputStream(uri))) {
+            in.mark(500);
+            byte[] magic = new byte[5];
+            if (in.skip(257) != 257 || in.read(magic) != magic.length) {
+                console.add("! Invalid file");
+                return false;
+            }
+            in.reset();
+            if (Arrays.equals(magic, "ustar".getBytes())) {
+                isTar = true;
+                destFile = new File(Const.EXTERNAL_PATH, "magisk_patched.tar");
+                handleTar(in);
+            } else {
+                // Raw image
+                srcBoot = new File(installDir, "boot.img").getPath();
+                destFile = new File(Const.EXTERNAL_PATH, "magisk_patched.img");
+                console.add("- Copying image to cache");
+                try (OutputStream out = new FileOutputStream(srcBoot)) {
+                    ShellUtils.pump(in, out);
+                }
+            }
+        } catch (IOException e) {
+            console.add("! Process error");
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    protected boolean patchBoot() {
+        boolean isSigned;
+        try (InputStream in = new SuFileInputStream(srcBoot)) {
+            isSigned = SignBoot.verifySignature(in, null);
+            if (isSigned) {
+                console.add("- Boot image is signed with AVB 1.0");
+            }
+        } catch (IOException e) {
+            console.add("! Unable to check signature");
+            return false;
+        }
+
+        if (!Shell.sh(Utils.fmt(
+                "KEEPFORCEENCRYPT=%b KEEPVERITY=%b RECOVERYMODE=%b " +
+                "sh update-binary sh boot_patch.sh %s",
+                Config.keepEnc, Config.keepVerity, Config.recovery, srcBoot))
+                .to(console, logs).exec().isSuccess())
+            return false;
+
+        Shell.Job job = Shell.sh("./magiskboot --cleanup",
+                "mv bin/busybox busybox",
+                "rm -rf magisk.apk bin boot.img update-binary",
+                "cd /");
+
+        File patched = new File(installDir, "new-boot.img");
+        if (isSigned) {
+            console.add("- Signing boot image with test keys");
+            File signed = new File(installDir, "signed.img");
+            try (InputStream in = new SuFileInputStream(patched);
+                 OutputStream out = new BufferedOutputStream(new FileOutputStream(signed))) {
+                SignBoot.doSignature("/boot", in, out, null, null);
+            } catch (IOException e) {
+                return false;
+            }
+            job.add("mv -f " + signed + " " + patched);
+        }
+        job.exec();
+        return true;
+    }
+
+    protected boolean flashBoot() {
+        if (!Shell.su(Utils.fmt("direct_install %s %s", installDir, srcBoot))
+                .to(console, logs).exec().isSuccess())
+            return false;
+        if (!Config.keepVerity)
+            Shell.su("patch_dtbo_image").to(console, logs).exec();
+        return true;
+    }
+
+    protected boolean storeBoot() {
+        File patched = SuFile.open(installDir, "new-boot.img");
+        try {
+            OutputStream os;
+            if (isTar) {
+                os = new TarOutputStream(destFile, true);
+                ((TarOutputStream) os).putNextEntry(newEntry(
+                                srcBoot.contains("recovery") ? "recovery.img" : "boot.img",
+                                patched.length()));
+            } else {
+                os = new BufferedOutputStream(new FileOutputStream(destFile));
+            }
+            try (InputStream in = new SuFileInputStream(patched);
+                OutputStream out = os) {
+                ShellUtils.pump(in, out);
+            }
+        } catch (IOException e) {
+            console.add("! Failed to output to " + destFile);
+            e.printStackTrace();
+        }
+        patched.delete();
+        console.add("");
+        console.add("****************************");
+        console.add(" Output file is placed in ");
+        console.add(" " + destFile + " ");
+        console.add("****************************");
+        return true;
+    }
+
+    protected boolean postOTA() {
+        SuFile bootctl = new SuFile("/data/adb/bootctl");
+        try (InputStream in = Networking.get(Const.Url.BOOTCTL_URL).execForInputStream().getResult();
+             OutputStream out = new SuFileOutputStream(bootctl)) {
+            ShellUtils.pump(in, out);
+        } catch (IOException e) {
+            e.printStackTrace();
+            return false;
+        }
+        Shell.su("post_ota " + bootctl.getParent()).exec();
+        console.add("***************************************");
+        console.add(" Next reboot will boot to second slot!");
+        console.add("***************************************");
+        return true;
+    }
+
+    @WorkerThread
+    protected abstract boolean operations();
+
+    @MainThread
+    protected abstract void onResult(boolean success);
+
+    public void exec() {
+        App.THREAD_POOL.execute(() -> {
+            boolean b = operations();
+            UiThreadHandler.run(() -> onResult(b));
+        });
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/tasks/UpdateRepos.java

@@ -0,0 +1,176 @@
+package com.topjohnwu.magisk.tasks;
+
+import android.database.Cursor;
+import android.util.Pair;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.model.entity.Repo;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.utils.Logger;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.net.Request;
+
+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.Locale;
+import java.util.Queue;
+import java.util.Set;
+import java.util.TimeZone;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Future;
+
+public class UpdateRepos {
+    private static final DateFormat DATE_FORMAT;
+
+    private App app = App.self;
+    private Set<String> cached;
+    private Queue<Pair<String, Date>> moduleQueue;
+
+    static {
+        DATE_FORMAT = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss'Z'", Locale.US);
+        DATE_FORMAT.setTimeZone(TimeZone.getTimeZone("UTC"));
+    }
+
+    private void runTasks(Runnable task) {
+        Future[] futures = new Future[App.THREAD_POOL.getMaximumPoolSize() - 1];
+        for (int i = 0; i < futures.length; ++i) {
+            futures[i] = App.THREAD_POOL.submit(task);
+        }
+        for (Future f : futures) {
+            while (true) {
+                try {
+                    f.get();
+                } catch (InterruptedException e) {
+                    continue;
+                } catch (ExecutionException ignored) {}
+                break;
+            }
+        }
+    }
+
+    /* 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 parsePage(int page) {
+        Request req = Networking.get(Utils.fmt(Const.Url.REPO_URL, page + 1));
+        if (page == 0) {
+            String etag = Config.get(Config.Key.ETAG_KEY);
+            if (etag != null)
+                req.addHeaders(Const.Key.IF_NONE_MATCH, etag);
+        }
+        Request.Result<JSONArray> res = req.execForJSONArray();
+        // JSON not updated
+        if (res.getCode() == HttpURLConnection.HTTP_NOT_MODIFIED)
+            return false;
+        // Network error
+        if (res.getResult() == null) {
+            cached.clear();
+            return true;
+        }
+        // Current page is the last page
+        if (res.getResult().length() == 0)
+            return true;
+
+        try {
+            for (int i = 0; i < res.getResult().length(); i++) {
+                JSONObject rawRepo = res.getResult().getJSONObject(i);
+                String id = rawRepo.getString("name");
+                Date date = DATE_FORMAT.parse(rawRepo.getString("pushed_at"));
+                moduleQueue.offer(new Pair<>(id, date));
+            }
+        } catch (JSONException | ParseException e) {
+            // Should not happen, but if exception occurs, page load fails
+            return false;
+        }
+
+        // Update ETAG
+        if (page == 0) {
+            String etag = res.getConnection().getHeaderField(Config.Key.ETAG_KEY);
+            if (etag != null) {
+                etag = etag.substring(etag.indexOf('\"'), etag.lastIndexOf('\"') + 1);
+                Config.set(Config.Key.ETAG_KEY, etag);
+            }
+        }
+
+        String links = res.getConnection().getHeaderField(Const.Key.LINK_KEY);
+        return links == null || !links.contains("next") || parsePage(page + 1);
+    }
+
+    private boolean loadPages() {
+        if (!parsePage(0))
+            return false;
+        runTasks(() -> {
+            while (true) {
+                Pair<String, Date> pair = moduleQueue.poll();
+                if (pair == null)
+                    return;
+                Repo repo = app.repoDB.getRepo(pair.first);
+                try {
+                    if (repo == null)
+                        repo = new Repo(pair.first);
+                    else
+                        cached.remove(pair.first);
+                    repo.update(pair.second);
+                    app.repoDB.addRepo(repo);
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.debug(e.getMessage());
+                    app.repoDB.removeRepo(pair.first);
+                }
+            }
+        });
+        return true;
+    }
+
+    private void fullReload() {
+        Cursor c = app.repoDB.getRawCursor();
+        runTasks(() -> {
+            while (true) {
+                Repo repo;
+                synchronized (c) {
+                    if (!c.moveToNext())
+                        return;
+                    repo = new Repo(c);
+                }
+                try {
+                    repo.update();
+                    app.repoDB.addRepo(repo);
+                } catch (Repo.IllegalRepoException e) {
+                    Logger.debug(e.getMessage());
+                    app.repoDB.removeRepo(repo);
+                }
+            }
+        });
+    }
+
+    public void exec(boolean force) {
+        Event.reset(Event.REPO_LOAD_DONE);
+        App.THREAD_POOL.execute(() -> {
+            cached = Collections.synchronizedSet(app.repoDB.getRepoIDSet());
+            moduleQueue = new ConcurrentLinkedQueue<>();
+
+            if (loadPages()) {
+                // The leftover cached means they are removed from online repo
+                app.repoDB.removeRepo(cached);
+            } else if (force) {
+                fullReload();
+            }
+            Event.trigger(Event.REPO_LOAD_DONE);
+        });
+    }
+
+    public void exec() {
+        exec(false);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/MainActivity.java

@@ -0,0 +1,194 @@
+package com.topjohnwu.magisk.ui;
+
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.os.Handler;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+
+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 com.google.android.material.navigation.NavigationView;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.ui.hide.MagiskHideFragment;
+import com.topjohnwu.magisk.ui.home.MagiskFragment;
+import com.topjohnwu.magisk.ui.log.LogFragment;
+import com.topjohnwu.magisk.ui.module.ModulesFragment;
+import com.topjohnwu.magisk.ui.module.ReposFragment;
+import com.topjohnwu.magisk.ui.settings.SettingsFragment;
+import com.topjohnwu.magisk.ui.superuser.SuperuserFragment;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+import butterknife.BindView;
+
+public class MainActivity extends BaseActivity
+        implements NavigationView.OnNavigationItemSelectedListener {
+
+    private final Handler mDrawerHandler = new Handler();
+    private int mDrawerItem;
+    private static boolean fromShortcut = false;
+
+    @BindView(R.id.toolbar) public Toolbar toolbar;
+    @BindView(R.id.drawer_layout) DrawerLayout drawer;
+    @BindView(R.id.nav_view) NavigationView navigationView;
+
+    private float toolbarElevation;
+
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_Dark;
+    }
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        if (!SplashActivity.DONE) {
+            startActivity(new Intent(this, ClassMap.get(SplashActivity.class)));
+            finish();
+        }
+
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+        new MainActivity_ViewBinding(this);
+        checkHideSection();
+        setSupportActionBar(toolbar);
+
+        ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this, drawer, toolbar, R.string.magisk, R.string.magisk) {
+            @Override
+            public void onDrawerOpened(View drawerView) {
+                super.onDrawerOpened(drawerView);
+                super.onDrawerSlide(drawerView, 0); // this disables the arrow @ completed tate
+            }
+
+            @Override
+            public void onDrawerSlide(View drawerView, float slideOffset) {
+                super.onDrawerSlide(drawerView, 0); // this disables the animation
+            }
+        };
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            toolbarElevation = toolbar.getElevation();
+        }
+
+        drawer.addDrawerListener(toggle);
+        toggle.syncState();
+
+        if (savedInstanceState == null) {
+            String section = getIntent().getStringExtra(Const.Key.OPEN_SECTION);
+            fromShortcut = section != null;
+            navigate(section);
+        }
+
+        navigationView.setNavigationItemSelectedListener(this);
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (drawer.isDrawerOpen(navigationView)) {
+            drawer.closeDrawer(navigationView);
+        } else if (mDrawerItem != R.id.magisk && !fromShortcut) {
+            navigate(R.id.magisk);
+        } else {
+            finish();
+        }
+    }
+
+    @Override
+    public boolean onNavigationItemSelected(@NonNull final MenuItem menuItem) {
+        mDrawerHandler.removeCallbacksAndMessages(null);
+        mDrawerHandler.postDelayed(() -> navigate(menuItem.getItemId()), 250);
+        drawer.closeDrawer(navigationView);
+        return true;
+    }
+
+    public void checkHideSection() {
+        Menu menu = navigationView.getMenu();
+        menu.findItem(R.id.magiskhide).setVisible(Shell.rootAccess() &&
+                (boolean) Config.get(Config.Key.MAGISKHIDE));
+        menu.findItem(R.id.modules).setVisible(Shell.rootAccess() && Config.magiskVersionCode >= 0);
+        menu.findItem(R.id.downloads).setVisible(Networking.checkNetworkStatus(this)
+                && Shell.rootAccess() && Config.magiskVersionCode >= 0);
+        menu.findItem(R.id.log).setVisible(Shell.rootAccess());
+        menu.findItem(R.id.superuser).setVisible(Utils.showSuperUser());
+    }
+
+    public void navigate(String item) {
+        int itemId = R.id.magisk;
+        if (item != null) {
+            switch (item) {
+                case "superuser":
+                    itemId = R.id.superuser;
+                    break;
+                case "modules":
+                    itemId = R.id.modules;
+                    break;
+                case "downloads":
+                    itemId = R.id.downloads;
+                    break;
+                case "magiskhide":
+                    itemId = R.id.magiskhide;
+                    break;
+                case "log":
+                    itemId = R.id.log;
+                    break;
+                case "settings":
+                    itemId = R.id.settings;
+                    break;
+            }
+        }
+        navigate(itemId);
+    }
+
+    public void navigate(int itemId) {
+        mDrawerItem = itemId;
+        navigationView.setCheckedItem(itemId);
+        switch (itemId) {
+            case R.id.magisk:
+                fromShortcut = false;
+                displayFragment(new MagiskFragment(), true);
+                break;
+            case R.id.superuser:
+                displayFragment(new SuperuserFragment(), true);
+                break;
+            case R.id.modules:
+                displayFragment(new ModulesFragment(), true);
+                break;
+            case R.id.downloads:
+                displayFragment(new ReposFragment(), true);
+                break;
+            case R.id.magiskhide:
+                displayFragment(new MagiskHideFragment(), true);
+                break;
+            case R.id.log:
+                displayFragment(new LogFragment(), false);
+                break;
+            case R.id.settings:
+                displayFragment(new SettingsFragment(), true);
+                break;
+        }
+    }
+
+    private void displayFragment(@NonNull Fragment navFragment, boolean setElevation) {
+        supportInvalidateOptionsMenu();
+        getSupportFragmentManager()
+                .beginTransaction()
+                .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_OPEN)
+                .replace(R.id.content_frame, navFragment)
+                .commitNow();
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            toolbar.setElevation(setElevation ? toolbarElevation : 0);
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/SplashActivity.java

@@ -0,0 +1,97 @@
+package com.topjohnwu.magisk.ui;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.data.database.RepoDatabaseHelper;
+import com.topjohnwu.magisk.tasks.CheckUpdates;
+import com.topjohnwu.magisk.tasks.UpdateRepos;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.Notifications;
+import com.topjohnwu.magisk.view.Shortcuts;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+public class SplashActivity extends BaseActivity {
+
+    public static boolean DONE = false;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        Shell.getShell(shell -> {
+            if (Config.magiskVersionCode > 0 &&
+                    Config.magiskVersionCode < Const.MAGISK_VER.MIN_SUPPORT) {
+                new AlertDialog.Builder(this)
+                        .setTitle(R.string.unsupport_magisk_title)
+                        .setMessage(R.string.unsupport_magisk_message)
+                        .setNegativeButton(R.string.ok, null)
+                        .setOnDismissListener(dialog -> finish())
+                        .show();
+            } else {
+                initAndStart();
+            }
+        });
+    }
+
+    private void initAndStart() {
+        String pkg = Config.get(Config.Key.SU_MANAGER);
+        if (pkg != null && getPackageName().equals(BuildConfig.APPLICATION_ID)) {
+            Config.remove(Config.Key.SU_MANAGER);
+            Shell.su("pm uninstall " + pkg).submit();
+        }
+        if (TextUtils.equals(pkg, getPackageName())) {
+            try {
+                // We are the manager, remove com.topjohnwu.magisk as it could be malware
+                getPackageManager().getApplicationInfo(BuildConfig.APPLICATION_ID, 0);
+                Shell.su("pm uninstall " + BuildConfig.APPLICATION_ID).submit();
+            } catch (PackageManager.NameNotFoundException ignored) {}
+        }
+
+        // Dynamic detect all locales
+        LocaleManager.loadAvailableLocales(R.string.app_changelog);
+
+        // Set default configs
+        Config.initialize();
+
+        // Create notification channel on Android O
+        Notifications.setup(this);
+
+        // Schedule periodic update checks
+        Utils.scheduleUpdateCheck();
+        CheckUpdates.check();
+
+        // Setup shortcuts
+        Shortcuts.setup(this);
+
+        // Create repo database
+        app.repoDB = new RepoDatabaseHelper(this);
+
+        // Magisk working as expected
+        if (Shell.rootAccess() && Config.magiskVersionCode > 0) {
+            // Load modules
+            Utils.loadModules(false);
+            // Load repos
+            if (Networking.checkNetworkStatus(this))
+                new UpdateRepos().exec();
+        }
+
+        Intent intent = new Intent(this, ClassMap.get(MainActivity.class));
+        intent.putExtra(Const.Key.OPEN_SECTION, getIntent().getStringExtra(Const.Key.OPEN_SECTION));
+        DONE = true;
+        startActivity(intent);
+        finish();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/BaseActivity.java

@@ -0,0 +1,159 @@
+package com.topjohnwu.magisk.ui.base;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ActivityInfo;
+import android.content.pm.PackageManager;
+import android.os.Build;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.WindowManager;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.collection.SparseArrayCompat;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.utils.LocaleManager;
+
+public abstract class BaseActivity extends AppCompatActivity implements Event.AutoListener {
+
+    static int[] EMPTY_INT_ARRAY = new int[0];
+
+    private SparseArrayCompat<ActivityResultListener> resultListeners = new SparseArrayCompat<>();
+    public App app = App.self;
+
+    @Override
+    public int[] getListeningEvents() {
+        return EMPTY_INT_ARRAY;
+    }
+
+    @Override
+    public void onEvent(int event) {}
+
+    @StyleRes
+    public int getDarkTheme() {
+        return -1;
+    }
+
+    @Override
+    protected void attachBaseContext(Context base) {
+        super.attachBaseContext(LocaleManager.getLocaleContext(base, LocaleManager.locale));
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        Event.register(this);
+        if (getDarkTheme() != -1 && (boolean) Config.get(Config.Key.DARK_THEME)) {
+            setTheme(getDarkTheme());
+        }
+        super.onCreate(savedInstanceState);
+    }
+
+    @Override
+    protected void onDestroy() {
+        Event.unregister(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);
+        }
+    }
+
+    protected void lockOrientation() {
+        if (Build.VERSION.SDK_INT < 18)
+            setRequestedOrientation(getResources().getConfiguration().orientation);
+        else
+            setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LOCKED);
+    }
+
+    public void runWithExternalRW(Runnable callback) {
+        runWithPermissions(new String[] { Manifest.permission.WRITE_EXTERNAL_STORAGE }, callback);
+    }
+
+    public void runWithPermissions(String[] permissions, Runnable callback) {
+        runWithPermissions(this, permissions, callback);
+    }
+
+    public static void runWithPermissions(Context context, String[] permissions, Runnable callback) {
+        boolean granted = true;
+        for (String perm : permissions) {
+            if (ContextCompat.checkSelfPermission(context, perm) != PackageManager.PERMISSION_GRANTED)
+                granted = false;
+        }
+        if (granted) {
+            Const.EXTERNAL_PATH.mkdirs();
+            callback.run();
+        } else {
+            // Passed in context should be an activity if not granted, need to show dialog!
+            if (context instanceof BaseActivity) {
+                BaseActivity activity = (BaseActivity) context;
+                int code = callback.hashCode() & 0xFFFF;
+                activity.resultListeners.put(code, ((i, d) -> callback.run()));
+                ActivityCompat.requestPermissions(activity, permissions, code);
+            }
+        }
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, Intent data) {
+        onActivityResultListener(requestCode, resultCode, data);
+    }
+
+    private void onActivityResultListener(int requestCode, int resultCode, Intent data) {
+        ActivityResultListener listener = resultListeners.get(requestCode);
+        if (listener != null) {
+            resultListeners.remove(requestCode);
+            listener.onActivityResult(resultCode, data);
+        }
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode, ActivityResultListener listener) {
+        resultListeners.put(requestCode, listener);
+        super.startActivityForResult(intent, requestCode);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        boolean grant = true;
+        for (int result : grantResults) {
+            if (result != PackageManager.PERMISSION_GRANTED)
+                grant = false;
+        }
+        if (grant)
+            onActivityResultListener(requestCode, 0, null);
+        else
+            resultListeners.remove(requestCode);
+    }
+
+    public interface ActivityResultListener {
+        void onActivityResult(int resultCode, Intent data);
+    }
+
+    @Override
+    public SharedPreferences getSharedPreferences(String name, int mode) {
+        if (TextUtils.equals(name, getPackageName() + "_preferences"))
+            return app.prefs;
+        return super.getSharedPreferences(name, mode);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/BaseFragment.java

@@ -0,0 +1,58 @@
+package com.topjohnwu.magisk.ui.base;
+
+import android.content.Intent;
+
+import androidx.fragment.app.Fragment;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.utils.Event;
+
+import butterknife.Unbinder;
+
+public abstract class BaseFragment extends Fragment implements Event.AutoListener {
+
+    public App app = App.self;
+    protected Unbinder unbinder = null;
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        Event.register(this);
+    }
+
+    @Override
+    public void onPause() {
+        Event.unregister(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, (resultCode, data) ->
+                onActivityResult(requestCode, resultCode, data));
+    }
+
+    public void startActivityForResult(Intent intent, int requestCode,
+                                       BaseActivity.ActivityResultListener listener) {
+        ((BaseActivity) requireActivity()).startActivityForResult(intent, requestCode, listener);
+    }
+
+    protected void runWithExternalRW(Runnable callback) {
+        ((BaseActivity) requireActivity()).runWithExternalRW(callback);
+    }
+
+    @Override
+    public int[] getListeningEvents() {
+        return BaseActivity.EMPTY_INT_ARRAY;
+    }
+
+    @Override
+    public void onEvent(int event) {}
+}

app/src/main/java/com/topjohnwu/magisk/ui/base/BasePreferenceFragment.java

@@ -0,0 +1,81 @@
+package com.topjohnwu.magisk.ui.base;
+
+import android.annotation.SuppressLint;
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+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.recyclerview.widget.RecyclerView;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Event;
+
+public abstract class BasePreferenceFragment extends PreferenceFragmentCompat
+        implements SharedPreferences.OnSharedPreferenceChangeListener, Event.AutoListener {
+
+    public App app = App.self;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View v = super.onCreateView(inflater, container, savedInstanceState);
+        app.prefs.registerOnSharedPreferenceChangeListener(this);
+        Event.register(this);
+        return v;
+    }
+
+    @Override
+    public void onDestroyView() {
+        app.prefs.unregisterOnSharedPreferenceChangeListener(this);
+        Event.unregister(this);
+        super.onDestroyView();
+    }
+
+    @Override
+    public int[] getListeningEvents() {
+        return BaseActivity.EMPTY_INT_ARRAY;
+    }
+
+    @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/main/java/com/topjohnwu/magisk/ui/flash/FlashActivity.java

@@ -0,0 +1,274 @@
+package com.topjohnwu.magisk.ui.flash;
+
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.ActionBar;
+import androidx.appcompat.widget.Toolbar;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.StringListAdapter;
+import com.topjohnwu.magisk.tasks.FlashZip;
+import com.topjohnwu.magisk.tasks.MagiskInstaller;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.CallbackList;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
+
+import butterknife.BindColor;
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class FlashActivity extends BaseActivity {
+
+    @BindView(R.id.toolbar) Toolbar toolbar;
+    @BindView(R.id.button_panel) LinearLayout buttonPanel;
+    @BindView(R.id.reboot) Button reboot;
+    @BindView(R.id.recyclerView) RecyclerView rv;
+    @BindColor(android.R.color.white) int white;
+
+    private List<String> console, logs;
+
+    @OnClick(R.id.reboot)
+    void reboot() {
+        RootUtils.reboot();
+    }
+
+    @OnClick(R.id.save_logs)
+    void saveLogs() {
+        runWithExternalRW(() -> {
+            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, filename);
+            try (FileWriter writer = new FileWriter(logFile)) {
+                for (String s : logs) {
+                    writer.write(s);
+                    writer.write('\n');
+                }
+            } catch (IOException e) {
+                e.printStackTrace();
+                return;
+            }
+            Utils.toast(logFile.getPath(), Toast.LENGTH_LONG);
+        });
+    }
+
+    @OnClick(R.id.close)
+    public void close() {
+        finish();
+    }
+
+    @Override
+    public void onBackPressed() {
+        // Prevent user accidentally press back button
+    }
+
+    @Override
+    public int getDarkTheme() {
+        return R.style.AppTheme_NoDrawer_Dark;
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_flash);
+        new FlashActivity_ViewBinding(this);
+
+        setSupportActionBar(toolbar);
+        ActionBar ab = getSupportActionBar();
+        if (ab != null) {
+            ab.setTitle(R.string.flashing);
+        }
+        setFloating();
+        setFinishOnTouchOutside(false);
+        if (!Shell.rootAccess())
+            reboot.setVisibility(View.GONE);
+
+        logs = Collections.synchronizedList(new ArrayList<>());
+        console = new ConsoleList();
+        rv.setAdapter(new ConsoleAdapter());
+
+        Intent intent = getIntent();
+        Uri uri = intent.getData();
+
+        switch (intent.getStringExtra(Const.Key.FLASH_ACTION)) {
+            case Const.Value.FLASH_ZIP:
+                new FlashModule(uri).exec();
+                break;
+            case Const.Value.UNINSTALL:
+                new Uninstall(uri).exec();
+                break;
+            case Const.Value.FLASH_MAGISK:
+                new DirectInstall().exec();
+                break;
+            case Const.Value.FLASH_INACTIVE_SLOT:
+                new SecondSlot().exec();
+                break;
+            case Const.Value.PATCH_FILE:
+                new PatchFile(uri).exec();
+                break;
+        }
+    }
+
+    private class ConsoleAdapter extends StringListAdapter<ConsoleAdapter.ViewHolder> {
+
+        ConsoleAdapter() {
+            super(console, true);
+        }
+
+        @Override
+        protected int itemLayoutRes() {
+            return R.layout.list_item_console;
+        }
+
+        @NonNull
+        @Override
+        public ViewHolder createViewHolder(@NonNull View v) {
+            return new ViewHolder(v);
+        }
+
+        class ViewHolder extends StringListAdapter.ViewHolder {
+
+            public ViewHolder(@NonNull View itemView) {
+                super(itemView);
+                txt.setTextColor(white);
+            }
+
+            @Override
+            protected int textViewResId() {
+                return R.id.txt;
+            }
+        }
+    }
+
+    private class ConsoleList extends CallbackList<String> {
+
+        ConsoleList() {
+            super(new ArrayList<>());
+        }
+
+        private void updateUI() {
+            rv.getAdapter().notifyItemChanged(size() - 1);
+            rv.postDelayed(() -> rv.smoothScrollToPosition(size() - 1), 10);
+        }
+
+        @Override
+        public void onAddElement(String s) {
+            logs.add(s);
+            updateUI();
+        }
+
+        @Override
+        public String set(int i, String s) {
+            String ret = super.set(i, s);
+            UiThreadHandler.run(this::updateUI);
+            return ret;
+        }
+    }
+
+    private class FlashModule extends FlashZip {
+
+        FlashModule(Uri uri) {
+            super(uri, console, logs);
+        }
+
+        @Override
+        protected void onResult(boolean success) {
+            if (success) {
+                Utils.loadModules();
+            } else {
+                console.add("! Installation failed");
+                reboot.setVisibility(View.GONE);
+            }
+            buttonPanel.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private class Uninstall extends FlashModule {
+
+        Uninstall(Uri uri) {
+            super(uri);
+        }
+
+        @Override
+        protected void onResult(boolean success) {
+            if (success)
+                UiThreadHandler.handler.postDelayed(Shell.su("pm uninstall " + getPackageName())::exec, 3000);
+            else
+                super.onResult(false);
+        }
+    }
+
+    private abstract class BaseInstaller extends MagiskInstaller {
+        BaseInstaller() {
+            super(console, logs);
+        }
+
+        @Override
+        protected void onResult(boolean success) {
+            if (success) {
+                console.add("- All done!");
+            } else {
+                Shell.sh("rm -rf " + installDir).submit();
+                console.add("! Installation failed");
+                reboot.setVisibility(View.GONE);
+            }
+            buttonPanel.setVisibility(View.VISIBLE);
+        }
+    }
+
+    private class DirectInstall extends BaseInstaller {
+
+        @Override
+        protected boolean operations() {
+            return findImage() && extractZip() && patchBoot() && flashBoot();
+        }
+    }
+
+    private class SecondSlot extends BaseInstaller {
+
+        @Override
+        protected boolean operations() {
+            return findSecondaryImage() && extractZip() && patchBoot() && flashBoot() && postOTA();
+        }
+    }
+
+    private class PatchFile extends BaseInstaller {
+
+        private Uri uri;
+
+        PatchFile(Uri u) {
+            uri = u;
+        }
+
+        @Override
+        protected boolean operations() {
+            return extractZip() && handleFile(uri) && patchBoot() && storeBoot();
+        }
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/ui/hide/MagiskHideFragment.java

@@ -0,0 +1,101 @@
+package com.topjohnwu.magisk.ui.hide;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.SearchView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.ApplicationAdapter;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
+import com.topjohnwu.magisk.utils.Event;
+
+import butterknife.BindView;
+
+public class MagiskHideFragment extends BaseFragment {
+
+    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
+    @BindView(R.id.recyclerView) RecyclerView recyclerView;
+
+    private SearchView search;
+    private ApplicationAdapter adapter;
+    private SearchView.OnQueryTextListener searchListener;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_magisk_hide, container, false);
+        unbinder = new MagiskHideFragment_ViewBinding(this, view);
+
+        adapter = new ApplicationAdapter(requireActivity());
+        recyclerView.setAdapter(adapter);
+
+        mSwipeRefreshLayout.setRefreshing(true);
+        mSwipeRefreshLayout.setOnRefreshListener(adapter::refresh);
+
+        searchListener = new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                adapter.filter(query);
+                return false;
+            }
+
+            @Override
+            public boolean onQueryTextChange(String newText) {
+                adapter.filter(newText);
+                return false;
+            }
+        };
+
+        requireActivity().setTitle(R.string.magiskhide);
+
+        return view;
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_magiskhide, menu);
+        search = (SearchView) menu.findItem(R.id.app_search).getActionView();
+        search.setOnQueryTextListener(searchListener);
+        menu.findItem(R.id.show_system).setChecked(Config.get(Config.Key.SHOW_SYSTEM_APP));
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.show_system) {
+            boolean showSystem = !item.isChecked();
+            item.setChecked(showSystem);
+            Config.set(Config.Key.SHOW_SYSTEM_APP, showSystem);
+            adapter.setShowSystem(showSystem);
+            adapter.filter(search.getQuery().toString());
+        }
+        return true;
+    }
+
+    @Override
+    public int[] getListeningEvents() {
+        return new int[] {Event.MAGISK_HIDE_DONE};
+    }
+
+    @Override
+    public void onEvent(int event) {
+        mSwipeRefreshLayout.setRefreshing(false);
+        adapter.filter(search.getQuery().toString());
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/home/MagiskFragment.java

@@ -0,0 +1,333 @@
+package com.topjohnwu.magisk.ui.home;
+
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.cardview.widget.CardView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+import androidx.transition.ChangeBounds;
+import androidx.transition.Fade;
+import androidx.transition.Transition;
+import androidx.transition.TransitionManager;
+import androidx.transition.TransitionSet;
+
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.tasks.CheckUpdates;
+import com.topjohnwu.magisk.ui.MainActivity;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.ArrowExpandable;
+import com.topjohnwu.magisk.view.Expandable;
+import com.topjohnwu.magisk.view.ExpandableViewHolder;
+import com.topjohnwu.magisk.view.MarkDownWindow;
+import com.topjohnwu.magisk.view.SafetyNet;
+import com.topjohnwu.magisk.view.UpdateCardHolder;
+import com.topjohnwu.magisk.view.dialogs.EnvFixDialog;
+import com.topjohnwu.magisk.view.dialogs.MagiskInstallDialog;
+import com.topjohnwu.magisk.view.dialogs.ManagerInstallDialog;
+import com.topjohnwu.magisk.view.dialogs.UninstallDialog;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+import java.util.Locale;
+
+import butterknife.BindColor;
+import butterknife.BindView;
+import butterknife.OnClick;
+
+public class MagiskFragment extends BaseFragment implements SwipeRefreshLayout.OnRefreshListener {
+
+    private static boolean shownDialog = false;
+
+    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
+    @BindView(R.id.linearLayout) LinearLayout root;
+
+    @BindView(R.id.install_option_card) CardView installOptionCard;
+    @BindView(R.id.keep_force_enc) CheckBox keepEncChkbox;
+    @BindView(R.id.keep_verity) CheckBox keepVerityChkbox;
+    @BindView(R.id.install_option_expand) ViewGroup optionExpandLayout;
+    @BindView(R.id.arrow) ImageView arrow;
+
+    @BindView(R.id.uninstall_button) CardView uninstallButton;
+
+    @BindColor(R.color.red500) int colorBad;
+    @BindColor(R.color.green500) int colorOK;
+    @BindColor(R.color.yellow500) int colorWarn;
+    @BindColor(R.color.green500) int colorNeutral;
+    @BindColor(R.color.blue500) int colorInfo;
+
+    private UpdateCardHolder magisk;
+    private UpdateCardHolder manager;
+    private SafetyNet safetyNet;
+    private Transition transition;
+    private Expandable optionExpand;
+
+    private void magiskInstall(View v) {
+        // Show Manager update first
+        if (Config.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+            new ManagerInstallDialog(requireActivity()).show();
+            return;
+        }
+        new MagiskInstallDialog((BaseActivity) requireActivity()).show();
+    }
+
+    private void managerInstall(View v) {
+        new ManagerInstallDialog(requireActivity()).show();
+    }
+
+    private void openLink(String url) {
+        Utils.openLink(requireActivity(), Uri.parse(url));
+    }
+
+    @OnClick(R.id.paypal)
+    void paypal() {
+        openLink(Const.Url.PAYPAL_URL);
+    }
+
+    @OnClick(R.id.patreon)
+    void patreon() {
+        openLink(Const.Url.PATREON_URL);
+    }
+
+    @OnClick(R.id.twitter)
+    void twitter() {
+        openLink(Const.Url.TWITTER_URL);
+    }
+
+    @OnClick(R.id.github)
+    void github() {
+        openLink(Const.Url.SOURCE_CODE_URL);
+    }
+
+    @OnClick(R.id.xda)
+    void xda() {
+        openLink(Const.Url.XDA_THREAD);
+    }
+
+    @OnClick(R.id.uninstall_button)
+    void uninstall() {
+        new UninstallDialog(requireActivity()).show();
+    }
+
+    @OnClick(R.id.arrow)
+    void expandOptions() {
+        if (optionExpand.isExpanded())
+            optionExpand.collapse();
+        else optionExpand.expand();
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
+                             @Nullable Bundle savedInstanceState) {
+        View v = inflater.inflate(R.layout.fragment_magisk, container, false);
+        unbinder = new MagiskFragment_ViewBinding(this, v);
+        requireActivity().setTitle(R.string.magisk);
+
+        optionExpand = new ArrowExpandable(new ExpandableViewHolder(optionExpandLayout), arrow);
+        safetyNet = new SafetyNet(v);
+        magisk = new UpdateCardHolder(inflater, root);
+        manager = new UpdateCardHolder(inflater, root);
+        manager.setClickable(vv ->
+                MarkDownWindow.show(requireActivity(), null,
+                        getResources().openRawResource(R.raw.changelog)));
+        root.addView(magisk.itemView, 1);
+        root.addView(manager.itemView, 2);
+
+        keepVerityChkbox.setChecked(Config.keepVerity);
+        keepVerityChkbox.setOnCheckedChangeListener((view, checked) -> Config.keepVerity = checked);
+        keepEncChkbox.setChecked(Config.keepEnc);
+        keepEncChkbox.setOnCheckedChangeListener((view, checked) -> Config.keepEnc = checked);
+
+        mSwipeRefreshLayout.setOnRefreshListener(this);
+
+        magisk.install.setOnClickListener(this::magiskInstall);
+        manager.install.setOnClickListener(this::managerInstall);
+        if (Config.get(Config.Key.COREONLY)) {
+            magisk.additional.setText(R.string.core_only_enabled);
+            magisk.additional.setVisibility(View.VISIBLE);
+        }
+        if (!app.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
+            manager.additional.setText("(" + app.getPackageName() +  ")");
+            manager.additional.setVisibility(View.VISIBLE);
+        }
+
+        transition = new TransitionSet()
+                .setOrdering(TransitionSet.ORDERING_TOGETHER)
+                .addTransition(new Fade(Fade.OUT))
+                .addTransition(new ChangeBounds())
+                .addTransition(new Fade(Fade.IN));
+
+        updateUI();
+        return v;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        safetyNet.unbinder.unbind();
+        magisk.unbinder.unbind();
+        manager.unbinder.unbind();
+    }
+
+    @Override
+    public void onRefresh() {
+        mSwipeRefreshLayout.setRefreshing(false);
+        TransitionManager.beginDelayedTransition(root, transition);
+        safetyNet.reset();
+        magisk.reset();
+        manager.reset();
+
+        Config.loadMagiskInfo();
+        updateUI();
+
+        Event.reset(this);
+        Config.remoteMagiskVersionString = null;
+        Config.remoteMagiskVersionCode = -1;
+
+        shownDialog = false;
+
+        // Trigger state check
+        if (Networking.checkNetworkStatus(app)) {
+            CheckUpdates.check();
+        }
+    }
+
+    @Override
+    public int[] getListeningEvents() {
+        return new int[] {Event.UPDATE_CHECK_DONE};
+    }
+
+    @Override
+    public void onEvent(int event) {
+        updateCheckUI();
+    }
+
+    private void updateUI() {
+        ((MainActivity) requireActivity()).checkHideSection();
+        int image, color;
+        String status;
+        if (Config.magiskVersionCode < 0) {
+            color = colorBad;
+            image = R.drawable.ic_cancel;
+            status = getString(R.string.magisk_version_error);
+            magisk.status.setText(status);
+            magisk.currentVersion.setVisibility(View.GONE);
+        } else {
+            color = colorOK;
+            image = R.drawable.ic_check_circle;
+            status = getString(R.string.magisk);
+            magisk.currentVersion.setText(getString(R.string.current_installed,
+                    String.format(Locale.US, "v%s (%d)",
+                            Config.magiskVersionString, Config.magiskVersionCode)));
+        }
+        magisk.statusIcon.setColorFilter(color);
+        magisk.statusIcon.setImageResource(image);
+
+        manager.statusIcon.setColorFilter(colorOK);
+        manager.statusIcon.setImageResource(R.drawable.ic_check_circle);
+        manager.currentVersion.setText(getString(R.string.current_installed,
+                String.format(Locale.US, "v%s (%d)",
+                        BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)));
+
+        if (!Networking.checkNetworkStatus(app)) {
+            // No network, updateCheckUI will not be triggered
+            magisk.status.setText(status);
+            manager.status.setText(R.string.app_name);
+            magisk.setValid(false);
+            manager.setValid(false);
+        }
+    }
+
+    private void updateCheckUI() {
+        int image, color;
+        String status, button = "";
+
+        TransitionManager.beginDelayedTransition(root, transition);
+
+        if (Config.remoteMagiskVersionCode < 0) {
+            color = colorNeutral;
+            image = R.drawable.ic_help;
+            status = getString(R.string.invalid_update_channel);
+        } else {
+            magisk.latestVersion.setText(getString(R.string.latest_version,
+                    String.format(Locale.US, "v%s (%d)",
+                            Config.remoteMagiskVersionString, Config.remoteMagiskVersionCode)));
+            if (Config.remoteMagiskVersionCode > Config.magiskVersionCode) {
+                color = colorInfo;
+                image = R.drawable.ic_update;
+                status = getString(R.string.magisk_update_title);
+                button = getString(R.string.update);
+            } else {
+                color = colorOK;
+                image = R.drawable.ic_check_circle;
+                status = getString(R.string.magisk_up_to_date);
+                button = getString(R.string.install);
+            }
+        }
+        if (Config.magiskVersionCode > 0) {
+            // Only override status if Magisk is installed
+            magisk.statusIcon.setImageResource(image);
+            magisk.statusIcon.setColorFilter(color);
+            magisk.status.setText(status);
+            magisk.install.setText(button);
+        }
+
+        if (Config.remoteManagerVersionCode < 0) {
+            color = colorNeutral;
+            image = R.drawable.ic_help;
+            status = getString(R.string.invalid_update_channel);
+        } else {
+            manager.latestVersion.setText(getString(R.string.latest_version,
+                    String.format(Locale.US, "v%s (%d)",
+                            Config.remoteManagerVersionString, Config.remoteManagerVersionCode)));
+            if (Config.remoteManagerVersionCode > BuildConfig.VERSION_CODE) {
+                color = colorInfo;
+                image = R.drawable.ic_update;
+                status = getString(R.string.manager_update_title);
+                manager.install.setText(R.string.update);
+            } else {
+                color = colorOK;
+                image = R.drawable.ic_check_circle;
+                status = getString(R.string.manager_up_to_date);
+                manager.install.setText(R.string.install);
+            }
+        }
+        manager.statusIcon.setImageResource(image);
+        manager.statusIcon.setColorFilter(color);
+        manager.status.setText(status);
+
+        magisk.setValid(Config.remoteMagiskVersionCode > 0);
+        manager.setValid(Config.remoteManagerVersionCode > 0);
+
+        if (Config.remoteMagiskVersionCode < 0) {
+            // Hide install related components
+            installOptionCard.setVisibility(View.GONE);
+            uninstallButton.setVisibility(View.GONE);
+        } else {
+            // Show install related components
+            installOptionCard.setVisibility(View.VISIBLE);
+            uninstallButton.setVisibility(Shell.rootAccess() ? View.VISIBLE : View.GONE);
+        }
+
+        if (!shownDialog && Config.magiskVersionCode > 0 &&
+                !Shell.su("env_check").exec().isSuccess()) {
+            shownDialog = true;
+            new EnvFixDialog(requireActivity()).show();
+        }
+    }
+}
+

app/src/main/java/com/topjohnwu/magisk/ui/log/LogFragment.java

@@ -1,24 +1,23 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.ui.log;
 
 
+import android.os.Build;
 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.topjohnwu.magisk.adapters.TabFragmentAdapter;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.utils.Const;
+import androidx.viewpager.widget.ViewPager;
+
+import com.google.android.material.tabs.TabLayout;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.TabFragmentAdapter;
+import com.topjohnwu.magisk.ui.MainActivity;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
 
 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,15 +27,15 @@ 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);
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
+            ((MainActivity) requireActivity()).toolbar.setElevation(0);
+        }
 
         TabFragmentAdapter adapter = new TabFragmentAdapter(getChildFragmentManager());
 
-        if (!(Const.USER_ID > 0 && getApplication().multiuserMode == Const.Value.MULTIUSER_MODE_OWNER_MANAGED)) {
-            adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
-        }
+        adapter.addTab(new SuLogFragment(), getString(R.string.superuser));
         adapter.addTab(new MagiskLogFragment(), getString(R.string.magisk));
         tab.setupWithViewPager(viewPager);
         tab.setVisibility(View.VISIBLE);
@@ -45,11 +44,4 @@ public class LogFragment extends Fragment {
 
         return v;
     }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
-
 }

app/src/main/java/com/topjohnwu/magisk/ui/log/MagiskLogFragment.java

@@ -0,0 +1,157 @@
+package com.topjohnwu.magisk.ui.log;
+
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.StringListAdapter;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.SnackbarMaker;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.NOPList;
+
+import java.io.File;
+import java.io.IOException;
+import java.util.Calendar;
+import java.util.List;
+
+import butterknife.BindView;
+
+public class MagiskLogFragment extends BaseFragment {
+
+    @BindView(R.id.recyclerView) RecyclerView rv;
+
+    @Nullable
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_magisk_log, container, false);
+        unbinder = new MagiskLogFragment_ViewBinding(this, view);
+        setHasOptionsMenu(true);
+        return view;
+    }
+
+    @Override
+    public void onStart() {
+        super.onStart();
+        getActivity().setTitle(R.string.log);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        readLogs();
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_log, menu);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case R.id.menu_refresh:
+                readLogs();
+                return true;
+            case R.id.menu_save:
+                runWithExternalRW(this::saveLogs);
+                return true;
+            case R.id.menu_clear:
+                clearLogs();
+                rv.setAdapter(new MagiskLogAdapter(NOPList.getInstance()));
+                return true;
+            default:
+                return true;
+        }
+    }
+
+    private void readLogs() {
+        Shell.su("tail -n 5000 " + Const.MAGISK_LOG).submit(result -> {
+            rv.setAdapter(new MagiskLogAdapter(result.getOut()));
+        });
+    }
+
+    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 logFile = new File(Const.EXTERNAL_PATH, filename);
+        try {
+            logFile.createNewFile();
+        } catch (IOException e) {
+            return;
+        }
+        Shell.su("cat " + Const.MAGISK_LOG + " > " + logFile)
+                .submit(result ->
+                        SnackbarMaker.make(rv, logFile.getPath(), Snackbar.LENGTH_SHORT).show());
+    }
+
+    private void clearLogs() {
+        Shell.su("echo -n > " + Const.MAGISK_LOG).submit();
+        SnackbarMaker.make(rv, R.string.logs_cleared, Snackbar.LENGTH_SHORT).show();
+    }
+
+    private class MagiskLogAdapter extends StringListAdapter<MagiskLogAdapter.ViewHolder> {
+
+        MagiskLogAdapter(List<String> list) {
+            super(list);
+            if (mList.isEmpty())
+                mList.add(requireContext().getString(R.string.log_is_empty));
+        }
+
+        @Override
+        protected int itemLayoutRes() {
+            return R.layout.list_item_console;
+        }
+
+        @NonNull
+        @Override
+        public ViewHolder createViewHolder(@NonNull View v) {
+            return new ViewHolder(v);
+        }
+
+        @Override
+        protected void onUpdateTextWidth(ViewHolder holder) {
+            super.onUpdateTextWidth(holder);
+            // Find the longest string and update accordingly
+            int max = 0;
+            String maxStr = "";
+            for (String s : mList) {
+                int len = s.length();
+                if (len > max) {
+                    max = len;
+                    maxStr = s;
+                }
+            }
+            holder.txt.setText(maxStr);
+            super.onUpdateTextWidth(holder);
+        }
+
+        public class ViewHolder extends StringListAdapter.ViewHolder {
+
+            public ViewHolder(@NonNull View itemView) {
+                super(itemView);
+            }
+
+            @Override
+            protected int textViewResId() {
+                return R.id.txt;
+            }
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/log/SuLogFragment.java

@@ -1,8 +1,6 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.ui.log;
 
 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,20 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.adapters.SuLogAdapter;
-import com.topjohnwu.magisk.components.Fragment;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.SuLogAdapter;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
 
 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,9 +42,8 @@ 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();
-        adapter = new SuLogAdapter(mm.suDB);
+        unbinder = new SuLogFragment_ViewBinding(this, v);
+        adapter = new SuLogAdapter(app.mDB);
         recyclerView.setAdapter(adapter);
 
         updateList();
@@ -73,17 +70,11 @@ public class SuLogFragment extends Fragment {
                 updateList();
                 return true;
             case R.id.menu_clear:
-                mm.suDB.clearLogs();
+                app.mDB.clearLogs();
                 updateList();
                 return true;
             default:
                 return true;
         }
     }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
-    }
 }

app/src/main/java/com/topjohnwu/magisk/ui/module/ModulesFragment.java

@@ -1,12 +1,8 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.ui.module;
 
-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,32 +11,39 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
-import com.topjohnwu.magisk.adapters.ModulesAdapter;
-import com.topjohnwu.magisk.asyncs.LoadModules;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.container.Module;
-import com.topjohnwu.magisk.utils.Const;
-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 com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.ModulesAdapter;
+import com.topjohnwu.magisk.model.entity.Module;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.utils.RootUtils;
 import com.topjohnwu.magisk.utils.Utils;
 import com.topjohnwu.superuser.Shell;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 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 {
 
-    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() {
-        Utils.runWithPermission(getActivity(), Manifest.permission.WRITE_EXTERNAL_STORAGE, () -> {
+    void selectFile() {
+        runWithExternalRW(() -> {
             Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
             intent.setType("application/zip");
             startActivityForResult(intent, Const.ID.FETCH_ZIP);
@@ -51,14 +54,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() {
@@ -73,37 +76,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, Object result) {
-        updateUI();
+    public int[] getListeningEvents() {
+        return new int[] {Event.MODULE_LOAD_DONE};
     }
 
     @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { getApplication().moduleLoadDone };
+    public void onEvent(int event) {
+        updateUI(Event.getResult(event));
     }
 
     @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(), 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);
@@ -113,25 +110,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");
+                RootUtils.reboot();
                 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/main/java/com/topjohnwu/magisk/ui/module/ReposFragment.java

@@ -0,0 +1,102 @@
+package com.topjohnwu.magisk.ui.module;
+
+import android.app.AlertDialog;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.SearchView;
+import android.widget.TextView;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.swiperefreshlayout.widget.SwipeRefreshLayout;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.ReposAdapter;
+import com.topjohnwu.magisk.tasks.UpdateRepos;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
+import com.topjohnwu.magisk.utils.Event;
+
+import butterknife.BindView;
+
+public class ReposFragment extends BaseFragment {
+
+    @BindView(R.id.recyclerView) RecyclerView recyclerView;
+    @BindView(R.id.empty_rv) TextView emptyRv;
+    @BindView(R.id.swipeRefreshLayout) SwipeRefreshLayout mSwipeRefreshLayout;
+
+    private ReposAdapter adapter;
+
+    @Override
+    public void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setHasOptionsMenu(true);
+    }
+
+    @Nullable
+    @Override
+    public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.fragment_repos, container, false);
+        unbinder = new ReposFragment_ViewBinding(this, view);
+
+        mSwipeRefreshLayout.setRefreshing(true);
+        mSwipeRefreshLayout.setOnRefreshListener(() -> new UpdateRepos().exec(true));
+
+        adapter = new ReposAdapter();
+        recyclerView.setAdapter(adapter);
+        recyclerView.setVisibility(View.GONE);
+
+        requireActivity().setTitle(R.string.downloads);
+
+        return view;
+    }
+
+    @Override
+    public void onDestroyView() {
+        super.onDestroyView();
+        Event.unregister(adapter);
+    }
+
+    @Override
+    public int[] getListeningEvents() {
+        return new int[] {Event.REPO_LOAD_DONE};
+    }
+
+    @Override
+    public void onEvent(int event) {
+        adapter.notifyDBChanged(false);
+        Event.register(adapter);
+        mSwipeRefreshLayout.setRefreshing(false);
+        boolean empty = adapter.getItemCount() == 0;
+        recyclerView.setVisibility(empty ? View.GONE : View.VISIBLE);
+        emptyRv.setVisibility(empty ? View.VISIBLE : View.GONE);
+    }
+
+    @Override
+    public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
+        inflater.inflate(R.menu.menu_repo, menu);
+        SearchView search = (SearchView) menu.findItem(R.id.repo_search).getActionView();
+        adapter.setSearchView(search);
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        if (item.getItemId() == R.id.repo_sort) {
+            new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.sorting_order)
+                .setSingleChoiceItems(R.array.sorting_orders,
+                        Config.get(Config.Key.REPO_ORDER), (d, which) -> {
+                    Config.set(Config.Key.REPO_ORDER, which);
+                    adapter.notifyDBChanged(true);
+                    d.dismiss();
+                }).show();
+        }
+        return true;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/settings/SettingsFragment.java

@@ -0,0 +1,293 @@
+package com.topjohnwu.magisk.ui.settings;
+
+import android.content.SharedPreferences;
+import android.os.Build;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.EditText;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AlertDialog;
+import androidx.preference.ListPreference;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceCategory;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreferenceCompat;
+
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.tasks.CheckUpdates;
+import com.topjohnwu.magisk.ui.base.BasePreferenceFragment;
+import com.topjohnwu.magisk.utils.DownloadApp;
+import com.topjohnwu.magisk.utils.Event;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.LocaleManager;
+import com.topjohnwu.magisk.utils.PatchAPK;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.dialogs.FingerprintAuthDialog;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.Locale;
+
+public class SettingsFragment extends BasePreferenceFragment {
+
+    private ListPreference updateChannel, autoRes, suNotification,
+            requestTimeout, rootConfig, multiuserConfig, nsConfig;
+
+    @Override
+    public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
+        setPreferencesFromResource(R.xml.app_settings, rootKey);
+        requireActivity().setTitle(R.string.settings);
+
+        boolean showSuperuser = Utils.showSuperUser();
+        app.prefs.edit()
+                .putBoolean(Config.Key.SU_FINGERPRINT, FingerprintHelper.useFingerprint())
+                .apply();
+
+        PreferenceScreen prefScreen = getPreferenceScreen();
+
+        PreferenceCategory generalCatagory = (PreferenceCategory) findPreference("general");
+        PreferenceCategory magiskCategory = (PreferenceCategory) findPreference("magisk");
+        PreferenceCategory suCategory = (PreferenceCategory) findPreference("superuser");
+        Preference hideManager = findPreference("hide");
+        hideManager.setOnPreferenceClickListener(pref -> {
+            PatchAPK.hideManager();
+            return true;
+        });
+        Preference restoreManager = findPreference("restore");
+        restoreManager.setOnPreferenceClickListener(pref -> {
+            DownloadApp.restore();
+            return true;
+        });
+        findPreference("clear").setOnPreferenceClickListener(pref -> {
+            app.prefs.edit().remove(Config.Key.ETAG_KEY).apply();
+            app.repoDB.clearRepo();
+            Utils.toast(R.string.repo_cache_cleared, Toast.LENGTH_SHORT);
+            return true;
+        });
+        findPreference("hosts").setOnPreferenceClickListener(pref -> {
+            Shell.su("add_hosts_module").exec();
+            Utils.loadModules();
+            Utils.toast(R.string.settings_hosts_toast, Toast.LENGTH_SHORT);
+            return true;
+        });
+
+        updateChannel = (ListPreference) findPreference(Config.Key.UPDATE_CHANNEL);
+        rootConfig = (ListPreference) findPreference(Config.Key.ROOT_ACCESS);
+        autoRes = (ListPreference) findPreference(Config.Key.SU_AUTO_RESPONSE);
+        requestTimeout = (ListPreference) findPreference(Config.Key.SU_REQUEST_TIMEOUT);
+        suNotification = (ListPreference) findPreference(Config.Key.SU_NOTIFICATION);
+        multiuserConfig = (ListPreference) findPreference(Config.Key.SU_MULTIUSER_MODE);
+        nsConfig = (ListPreference) findPreference(Config.Key.SU_MNT_NS);
+        SwitchPreferenceCompat reauth = (SwitchPreferenceCompat) findPreference(Config.Key.SU_REAUTH);
+        SwitchPreferenceCompat fingerprint = (SwitchPreferenceCompat) findPreference(Config.Key.SU_FINGERPRINT);
+
+        updateChannel.setOnPreferenceChangeListener((p, o) -> {
+            int prev = Config.get(Config.Key.UPDATE_CHANNEL);
+            int channel = Integer.parseInt((String) o);
+            if (channel == Config.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(app.prefs.getString(Config.Key.CUSTOM_CHANNEL, ""));
+                new AlertDialog.Builder(requireActivity())
+                        .setTitle(R.string.settings_update_custom)
+                        .setView(v)
+                        .setPositiveButton(R.string.ok, (d, i) ->
+                               Config.set(Config.Key.CUSTOM_CHANNEL, url.getText().toString()))
+                        .setNegativeButton(R.string.close, (d, i) ->
+                                Config.set(Config.Key.UPDATE_CHANNEL, prev))
+                        .setOnCancelListener(d ->
+                                Config.set(Config.Key.UPDATE_CHANNEL, prev))
+                        .show();
+            }
+            return true;
+        });
+
+        /* We only show canary channels if user is already on canary channel
+         * or the user have already chosen canary channel */
+        if (!Utils.isCanary() &&
+                (int) Config.get(Config.Key.UPDATE_CHANNEL) < Config.Value.CANARY_CHANNEL) {
+            // Remove the last 2 entries
+            CharSequence[] entries = updateChannel.getEntries();
+            updateChannel.setEntries(Arrays.copyOf(entries, entries.length - 2));
+        }
+
+        setSummary();
+
+        // Disable dangerous settings in secondary user
+        if (Const.USER_ID > 0) {
+            suCategory.removePreference(multiuserConfig);
+        }
+
+        // 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() && Const.USER_ID == 0) {
+            if (app.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
+                generalCatagory.removePreference(restoreManager);
+            } else {
+                if (!Networking.checkNetworkStatus(app))
+                    generalCatagory.removePreference(restoreManager);
+                generalCatagory.removePreference(hideManager);
+            }
+        } else {
+            generalCatagory.removePreference(restoreManager);
+            generalCatagory.removePreference(hideManager);
+        }
+
+        if (!showSuperuser) {
+            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++] = LocaleManager.toLanguageTag(locale);
+        }
+        lp.setEntries(entries);
+        lp.setEntryValues(entryValues);
+        lp.setSummary(LocaleManager.locale.getDisplayName(LocaleManager.locale));
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(SharedPreferences prefs, String key) {
+        switch (key) {
+            case Config.Key.ROOT_ACCESS:
+            case Config.Key.SU_MULTIUSER_MODE:
+            case Config.Key.SU_MNT_NS:
+                app.mDB.setSettings(key, Utils.getPrefsInt(prefs, key));
+                break;
+            case Config.Key.DARK_THEME:
+                requireActivity().recreate();
+                break;
+            case Config.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 Config.Key.MAGISKHIDE:
+                if (prefs.getBoolean(key, false)) {
+                    Shell.su("magiskhide --enable").submit();
+                } else {
+                    Shell.su("magiskhide --disable").submit();
+                }
+                break;
+            case Config.Key.LOCALE:
+                LocaleManager.setLocale(app);
+                requireActivity().recreate();
+                break;
+            case Config.Key.UPDATE_CHANNEL:
+            case Config.Key.CUSTOM_CHANNEL:
+                CheckUpdates.check();
+                break;
+            case Config.Key.CHECK_UPDATES:
+                Utils.scheduleUpdateCheck();
+                break;
+        }
+        setSummary(key);
+    }
+
+    @Override
+    public boolean onPreferenceTreeClick(Preference preference) {
+        String key = preference.getKey();
+        switch (key) {
+            case Config.Key.SU_FINGERPRINT:
+                boolean checked = ((SwitchPreferenceCompat) preference).isChecked();
+                ((SwitchPreferenceCompat) preference).setChecked(!checked);
+                new FingerprintAuthDialog(requireActivity(), () -> {
+                    ((SwitchPreferenceCompat) preference).setChecked(checked);
+                    Config.set(key, checked);
+                }).show();
+                break;
+        }
+        return true;
+    }
+
+    private void setSummary(String key) {
+        switch (key) {
+            case Config.Key.UPDATE_CHANNEL:
+                int ch = Config.get(key);
+                ch = ch < 0 ? Config.Value.STABLE_CHANNEL : ch;
+                updateChannel.setSummary(getResources()
+                        .getStringArray(R.array.update_channel)[ch]);
+                break;
+            case Config.Key.ROOT_ACCESS:
+                rootConfig.setSummary(getResources()
+                        .getStringArray(R.array.su_access)[(int)Config.get(key)]);
+                break;
+            case Config.Key.SU_AUTO_RESPONSE:
+                autoRes.setSummary(getResources()
+                        .getStringArray(R.array.auto_response)[(int)Config.get(key)]);
+                break;
+            case Config.Key.SU_NOTIFICATION:
+                suNotification.setSummary(getResources()
+                        .getStringArray(R.array.su_notification)[(int)Config.get(key)]);
+                break;
+            case Config.Key.SU_REQUEST_TIMEOUT:
+                requestTimeout.setSummary(
+                        getString(R.string.request_timeout_summary, (int)Config.get(key)));
+                break;
+            case Config.Key.SU_MULTIUSER_MODE:
+                multiuserConfig.setSummary(getResources()
+                        .getStringArray(R.array.multiuser_summary)[(int)Config.get(key)]);
+                break;
+            case Config.Key.SU_MNT_NS:
+                nsConfig.setSummary(getResources()
+                        .getStringArray(R.array.namespace_summary)[(int)Config.get(key)]);
+                break;
+        }
+    }
+
+    private void setSummary() {
+        setSummary(Config.Key.UPDATE_CHANNEL);
+        setSummary(Config.Key.ROOT_ACCESS);
+        setSummary(Config.Key.SU_AUTO_RESPONSE);
+        setSummary(Config.Key.SU_NOTIFICATION);
+        setSummary(Config.Key.SU_REQUEST_TIMEOUT);
+        setSummary(Config.Key.SU_MULTIUSER_MODE);
+        setSummary(Config.Key.SU_MNT_NS);
+    }
+
+    @Override
+    public void onEvent(int event) {
+        setLocalePreference((ListPreference) findPreference(Config.Key.LOCALE));
+    }
+
+    @Override
+    public int[] getListeningEvents() {
+        return new int[] {Event.LOCALE_FETCH_DONE};
+    }
+}

app/src/main/java/com/topjohnwu/magisk/ui/superuser/SuperuserFragment.java

@@ -1,63 +1,64 @@
-package com.topjohnwu.magisk;
+package com.topjohnwu.magisk.ui.superuser;
 
 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.adapters.PolicyAdapter;
-import com.topjohnwu.magisk.components.Fragment;
-import com.topjohnwu.magisk.container.Policy;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.adapters.PolicyAdapter;
+import com.topjohnwu.magisk.model.entity.Policy;
+import com.topjohnwu.magisk.ui.base.BaseFragment;
 
 import java.util.List;
 
 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);
-
-        PackageManager pm = getActivity().getPackageManager();
-        MagiskManager mm = getApplication();
-
-        List<Policy> policyList = mm.suDB.getPolicyList(pm);
-
-        if (policyList.size() == 0) {
-            emptyRv.setVisibility(View.VISIBLE);
-            recyclerView.setVisibility(View.GONE);
-        } else {
-            recyclerView.setAdapter(new PolicyAdapter(policyList, mm.suDB, pm));
-            emptyRv.setVisibility(View.GONE);
-            recyclerView.setVisibility(View.VISIBLE);
-        }
+        unbinder = new SuperuserFragment_ViewBinding(this, view);
 
+        pm = requireActivity().getPackageManager();
         return view;
     }
 
     @Override
     public void onStart() {
         super.onStart();
-        getActivity().setTitle(getString(R.string.superuser));
+        requireActivity().setTitle(getString(R.string.superuser));
     }
 
     @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder.unbind();
+    public void onResume() {
+        super.onResume();
+        displayPolicyList();
+    }
+
+    private void displayPolicyList() {
+        List<Policy> policyList = app.mDB.getPolicyList();
+
+        if (policyList.size() == 0) {
+            emptyRv.setVisibility(View.VISIBLE);
+            recyclerView.setVisibility(View.GONE);
+        } else {
+            recyclerView.setAdapter(new PolicyAdapter(policyList, app.mDB, pm));
+            emptyRv.setVisibility(View.GONE);
+            recyclerView.setVisibility(View.VISIBLE);
+        }
     }
 
 }

app/src/main/java/com/topjohnwu/magisk/ui/surequest/SuRequestActivity.java

@@ -0,0 +1,287 @@
+package com.topjohnwu.magisk.ui.surequest;
+
+import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
+import android.hardware.fingerprint.FingerprintManager;
+import android.os.Bundle;
+import android.os.CountDownTimer;
+import android.text.TextUtils;
+import android.view.View;
+import android.view.Window;
+import android.widget.ArrayAdapter;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.Spinner;
+import android.widget.TextView;
+
+import androidx.annotation.Nullable;
+import androidx.appcompat.content.res.AppCompatResources;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.entity.Policy;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.SuConnector;
+import com.topjohnwu.magisk.utils.SuLogger;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+
+import butterknife.BindView;
+import java9.lang.Iterables;
+
+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;
+    @BindView(R.id.app_name) TextView appNameView;
+    @BindView(R.id.package_name) TextView packageNameView;
+    @BindView(R.id.grant_btn) Button grant_btn;
+    @BindView(R.id.deny_btn) Button deny_btn;
+    @BindView(R.id.fingerprint) ImageView fingerprintImg;
+    @BindView(R.id.warning) TextView warning;
+
+    private ActionHandler handler;
+    private Policy policy;
+    private SharedPreferences timeoutPrefs;
+
+    public static final String REQUEST = "request";
+    public static final String LOG = "log";
+    public static final String NOTIFY = "notify";
+
+    @Override
+    public int getDarkTheme() {
+        return R.style.SuRequest_Dark;
+    }
+
+    @Override
+    public void onBackPressed() {
+        handler.handleAction(Policy.DENY, -1);
+    }
+
+    @Override
+    protected void onCreate(@Nullable Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        lockOrientation();
+        supportRequestWindowFeature(Window.FEATURE_NO_TITLE);
+
+        timeoutPrefs = App.deContext.getSharedPreferences("su_timeout", 0);
+        Intent intent = getIntent();
+
+        String action = intent.getAction();
+
+        if (TextUtils.equals(action, REQUEST)) {
+            if (!handleRequest())
+                finish();
+            return;
+        }
+
+        if (TextUtils.equals(action, LOG))
+            SuLogger.handleLogs(intent);
+        else if (TextUtils.equals(action, NOTIFY))
+            SuLogger.handleNotify(intent);
+
+        finish();
+    }
+
+    private boolean handleRequest() {
+        String socketName = getIntent().getStringExtra("socket");
+
+        if (socketName == null)
+            return false;
+
+        SuConnector connector;
+        try {
+            connector = new SuConnector(socketName) {
+                @Override
+                protected void onResponse() throws IOException {
+                    out.writeInt(policy.policy);
+                }
+            };
+            Bundle bundle = connector.readSocketInput();
+            int uid = Integer.parseInt(bundle.getString("uid"));
+            app.mDB.clearOutdated();
+            policy = app.mDB.getPolicy(uid);
+            if (policy == null) {
+                policy = new Policy(uid, getPackageManager());
+            }
+        } catch (IOException | PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+            return false;
+        }
+        handler = new ActionHandler() {
+            @Override
+            void handleAction() {
+                connector.response();
+                done();
+            }
+
+            @Override
+            void handleAction(int action) {
+                int pos = timeout.getSelectedItemPosition();
+                timeoutPrefs.edit().putInt(policy.packageName, pos).apply();
+                handleAction(action, Config.Value.TIMEOUT_LIST[pos]);
+            }
+
+            @Override
+            void handleAction(int action, int time) {
+                policy.policy = action;
+                if (time >= 0) {
+                    policy.until = (time == 0) ? 0
+                            : (System.currentTimeMillis() / 1000 + time * 60);
+                    app.mDB.updatePolicy(policy);
+                }
+                handleAction();
+            }
+        };
+
+        // Never allow com.topjohnwu.magisk (could be malware)
+        if (TextUtils.equals(policy.packageName, BuildConfig.APPLICATION_ID))
+            return false;
+
+        // If not interactive, response directly
+        if (policy.policy != Policy.INTERACTIVE) {
+            handler.handleAction();
+            return true;
+        }
+
+        switch ((int) Config.get(Config.Key.SU_AUTO_RESPONSE)) {
+            case Config.Value.SU_AUTO_DENY:
+                handler.handleAction(Policy.DENY, 0);
+                return true;
+            case Config.Value.SU_AUTO_ALLOW:
+                handler.handleAction(Policy.ALLOW, 0);
+                return true;
+        }
+
+        showUI();
+        return true;
+    }
+
+    @SuppressLint("ClickableViewAccessibility")
+    private void showUI() {
+        setContentView(R.layout.activity_request);
+        new SuRequestActivity_ViewBinding(this);
+
+        appIcon.setImageDrawable(policy.info.loadIcon(getPackageManager()));
+        appNameView.setText(policy.appName);
+        packageNameView.setText(policy.packageName);
+        warning.setCompoundDrawablesRelativeWithIntrinsicBounds(
+                AppCompatResources.getDrawable(this, R.drawable.ic_warning), null, null, null);
+
+        ArrayAdapter<CharSequence> adapter = ArrayAdapter.createFromResource(this,
+                R.array.allow_timeout, android.R.layout.simple_spinner_item);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        timeout.setAdapter(adapter);
+        timeout.setSelection(timeoutPrefs.getInt(policy.packageName, 0));
+
+        CountDownTimer timer = new CountDownTimer(
+                (int) Config.get(Config.Key.SU_REQUEST_TIMEOUT) * 1000, 1000) {
+            @Override
+            public void onTick(long remains) {
+                deny_btn.setText(getString(R.string.deny) + "(" + remains / 1000 + ")");
+            }
+            @Override
+            public void onFinish() {
+                deny_btn.setText(getString(R.string.deny));
+                handler.handleAction(Policy.DENY);
+            }
+        };
+        timer.start();
+        Runnable cancelTimer = () -> {
+            timer.cancel();
+            deny_btn.setText(getString(R.string.deny));
+        };
+        handler.addCancel(cancelTimer);
+
+        boolean useFP = FingerprintHelper.useFingerprint();
+
+        if (useFP) try {
+            FingerprintHelper helper = new SuFingerprint();
+            helper.authenticate();
+            handler.addCancel(helper::cancel);
+        } catch (Exception e) {
+            e.printStackTrace();
+            useFP = false;
+        }
+
+        if (!useFP) {
+            grant_btn.setOnClickListener(v -> {
+                handler.handleAction(Policy.ALLOW);
+                timer.cancel();
+            });
+            grant_btn.requestFocus();
+        }
+
+        grant_btn.setVisibility(useFP ? View.GONE : View.VISIBLE);
+        fingerprintImg.setVisibility(useFP ? View.VISIBLE : View.GONE);
+
+        deny_btn.setOnClickListener(v -> {
+            handler.handleAction(Policy.DENY);
+            timer.cancel();
+        });
+        suPopup.setOnClickListener(v -> cancelTimer.run());
+        timeout.setOnTouchListener((v, event) -> {
+            cancelTimer.run();
+            return false;
+        });
+    }
+
+    private class SuFingerprint extends FingerprintHelper {
+
+        SuFingerprint() throws Exception {}
+
+        @Override
+        public void onAuthenticationError(int errorCode, CharSequence errString) {
+            warning.setText(errString);
+        }
+
+        @Override
+        public void onAuthenticationHelp(int helpCode, CharSequence helpString) {
+            warning.setText(helpString);
+        }
+
+        @Override
+        public void onAuthenticationSucceeded(FingerprintManager.AuthenticationResult result) {
+            handler.handleAction(Policy.ALLOW);
+        }
+
+        @Override
+        public void onAuthenticationFailed() {
+            warning.setText(R.string.auth_fail);
+        }
+    }
+
+    private class ActionHandler {
+        private List<Runnable> cancelTasks = new ArrayList<>();
+
+        void handleAction() {
+            done();
+        }
+
+        void handleAction(int action) {
+            done();
+        }
+
+        void handleAction(int action, int time) {
+            done();
+        }
+
+        void addCancel(Runnable r) {
+            cancelTasks.add(r);
+        }
+
+        void done() {
+            Iterables.forEach(cancelTasks, Runnable::run);
+            finish();
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/DownloadApp.java

@@ -0,0 +1,98 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.ComponentName;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.ui.SplashActivity;
+import com.topjohnwu.magisk.view.ProgressNotification;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.net.ResponseListener;
+import com.topjohnwu.superuser.Shell;
+
+import java.io.File;
+
+import dalvik.system.DexClassLoader;
+
+public class DownloadApp {
+
+    public static void upgrade(String name) {
+        dlInstall(name, new PatchPackageName());
+    }
+
+    public static void restore() {
+        String name = Utils.fmt("MagiskManager v%s(%d)",
+                Config.remoteManagerVersionString, Config.remoteManagerVersionCode);
+        dlInstall(name, new RestoreManager());
+    }
+
+    private static void dlInstall(String name, ManagerDownloadListener listener) {
+        File apk = new File(App.self.getCacheDir(), "manager.apk");
+        ProgressNotification progress = new ProgressNotification(name);
+        listener.progress = progress;
+        Networking.get(Config.managerLink)
+                .setExecutor(App.THREAD_POOL)
+                .setDownloadProgressListener(progress)
+                .setErrorHandler((conn, e) -> progress.dlFail())
+                .getAsFile(apk, listener);
+    }
+
+    private abstract static class ManagerDownloadListener implements ResponseListener<File> {
+        ProgressNotification progress;
+    }
+
+    private static class PatchPackageName extends ManagerDownloadListener {
+
+        @Override
+        public void onResponse(File apk) {
+            File patched = apk;
+            App app = App.self;
+            if (!app.getPackageName().equals(BuildConfig.APPLICATION_ID)) {
+                progress.getNotificationBuilder()
+                        .setProgress(0, 0, true)
+                        .setContentTitle(app.getString(R.string.hide_manager_title))
+                        .setContentText("");
+                progress.update();
+                patched = new File(apk.getParent(), "patched.apk");
+                try {
+                    // Try using the new APK to patch itself
+                    ClassLoader loader = new DexClassLoader(apk.getPath(),
+                            apk.getParent(), null, ClassLoader.getSystemClassLoader());
+                    loader.loadClass("a.a")
+                            .getMethod("patchAPK", String.class, String.class, String.class)
+                            .invoke(null, apk.getPath(), patched.getPath(), app.getPackageName());
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    // Fallback to use the current implementation
+                    PatchAPK.patch(apk.getPath(), patched.getPath(), app.getPackageName());
+                }
+            }
+            APKInstall.install(app, patched);
+            progress.dismiss();
+        }
+    }
+
+    private static class RestoreManager extends ManagerDownloadListener {
+
+        @Override
+        public void onResponse(File apk) {
+            App app = App.self;
+            progress.getNotificationBuilder()
+                    .setProgress(0, 0, true)
+                    .setContentTitle(app.getString(R.string.restore_img_msg))
+                    .setContentText("");
+            progress.update();
+            Config.export();
+            // Make it world readable
+            apk.setReadable(true, false);
+            if (Shell.su("pm install " + apk).exec().isSuccess())
+                RootUtils.rmAndLaunch(app.getPackageName(),
+                        new ComponentName(BuildConfig.APPLICATION_ID,
+                                ClassMap.get(SplashActivity.class).getName()));
+            progress.dismiss();
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/Event.java

@@ -0,0 +1,123 @@
+package com.topjohnwu.magisk.utils;
+
+import androidx.annotation.IntDef;
+import androidx.collection.ArraySet;
+
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.util.Set;
+
+public class Event {
+
+    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 LOCALE_FETCH_DONE = 4;
+
+    @IntDef({MAGISK_HIDE_DONE, MODULE_LOAD_DONE, REPO_LOAD_DONE,
+            UPDATE_CHECK_DONE, LOCALE_FETCH_DONE})
+    @Retention(RetentionPolicy.SOURCE)
+    public @interface EventID {}
+
+    // We will not dynamically add topics, so use arrays instead of hash tables
+    private static Store[] eventList = new Store[5];
+
+    public static void register(Listener listener, @EventID int... events) {
+        for (int event : events) {
+            if (eventList[event] == null)
+                eventList[event] = new Store();
+            eventList[event].listeners.add(listener);
+            if (eventList[event].triggered) {
+                listener.onEvent(event);
+            }
+        }
+    }
+
+    public static void register(AutoListener listener) {
+        register(listener, listener.getListeningEvents());
+    }
+
+    public static void unregister(Listener listener, @EventID int... events) {
+        for (int event : events) {
+            if (eventList[event] == null)
+                continue;
+            eventList[event].listeners.remove(listener);
+        }
+    }
+
+    public static void unregister(AutoListener listener) {
+        unregister(listener, listener.getListeningEvents());
+    }
+
+    public static void trigger(@EventID int event) {
+        trigger(true, event, null);
+    }
+
+    public static void trigger(@EventID int event, Object result) {
+        trigger(true, event, result);
+    }
+
+    public static void trigger(boolean perm, @EventID int event) {
+        trigger(perm, event, null);
+    }
+
+    public static void trigger(boolean perm, @EventID int event, Object result) {
+        if (eventList[event] == null)
+            eventList[event] = new Store();
+        if (perm) {
+            eventList[event].result = result;
+            eventList[event].triggered = true;
+        }
+        for (Listener sub : eventList[event].listeners) {
+            UiThreadHandler.run(() -> sub.onEvent(event));
+        }
+    }
+
+    public static void reset(@EventID int event) {
+        if (eventList[event] == null)
+            return;
+        eventList[event].triggered = false;
+        eventList[event].result = null;
+    }
+
+    public static void reset(AutoListener listener) {
+        for (int event : listener.getListeningEvents())
+            reset(event);
+    }
+
+    public static boolean isTriggered(@EventID int event) {
+        if (eventList[event] == null)
+            return false;
+        return eventList[event].triggered;
+    }
+
+    public static boolean isTriggered(AutoListener listener) {
+        for (int event : listener.getListeningEvents()) {
+            if (!isTriggered(event))
+                return false;
+        }
+        return true;
+    }
+
+    public static <T> T getResult(@EventID int event) {
+        return (T) eventList[event].result;
+    }
+
+    private static class Store {
+        boolean triggered = false;
+        Set<Listener> listeners = new ArraySet<>();
+        Object result;
+    }
+
+    public interface Listener {
+        void onEvent(int event);
+    }
+
+    public interface AutoListener extends Listener {
+        @EventID
+        int[] getListeningEvents();
+    }
+}

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

@@ -9,7 +9,9 @@ import android.security.keystore.KeyGenParameterSpec;
 import android.security.keystore.KeyPermanentlyInvalidatedException;
 import android.security.keystore.KeyProperties;
 
-import com.topjohnwu.magisk.MagiskManager;
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
 
 import java.security.KeyStore;
 
@@ -24,19 +26,26 @@ public abstract class FingerprintHelper {
     private Cipher cipher;
     private CancellationSignal cancel;
 
+    public static boolean useFingerprint() {
+        boolean fp = Config.get(Config.Key.SU_FINGERPRINT);
+        if (fp && !canUseFingerprint()) {
+            Config.set(Config.Key.SU_FINGERPRINT, false);
+            fp = false;
+        }
+        return fp;
+    }
+
     public static boolean canUseFingerprint() {
         if (Build.VERSION.SDK_INT < Build.VERSION_CODES.M)
             return false;
-        MagiskManager mm = MagiskManager.get();
-        KeyguardManager km = mm.getSystemService(KeyguardManager.class);
-        FingerprintManager fm = mm.getSystemService(FingerprintManager.class);
+        KeyguardManager km = App.self.getSystemService(KeyguardManager.class);
+        FingerprintManager fm = App.self.getSystemService(FingerprintManager.class);
         return km.isKeyguardSecure() && fm != null && fm.isHardwareDetected() && fm.hasEnrolledFingerprints();
     }
 
     protected FingerprintHelper() throws Exception {
-        MagiskManager mm = MagiskManager.get();
         KeyStore keyStore = KeyStore.getInstance("AndroidKeyStore");
-        manager = mm.getSystemService(FingerprintManager.class);
+        manager = App.self.getSystemService(FingerprintManager.class);
         cipher = Cipher.getInstance(KeyProperties.KEY_ALGORITHM_AES + "/"
                 + KeyProperties.BLOCK_MODE_CBC + "/"
                 + KeyProperties.ENCRYPTION_PADDING_PKCS7);
@@ -62,30 +71,10 @@ public abstract class FingerprintHelper {
 
     public abstract void onAuthenticationFailed();
 
-    public void startAuth() {
+    public void authenticate() {
         cancel = new CancellationSignal();
         FingerprintManager.CryptoObject cryptoObject = new FingerprintManager.CryptoObject(cipher);
-        manager.authenticate(cryptoObject, cancel, 0, new 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();
-            }
-        }, null);
+        manager.authenticate(cryptoObject, cancel, 0, new Callback(), null);
     }
 
     public void cancel() {
@@ -109,4 +98,26 @@ public abstract class FingerprintHelper {
         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/main/java/com/topjohnwu/magisk/utils/ISafetyNetHelper.java

@@ -0,0 +1,18 @@
+package com.topjohnwu.magisk.utils;
+
+public interface ISafetyNetHelper {
+
+    int RESPONSE_ERR = 0x01;
+    int CONNECTION_FAIL = 0x02;
+
+    int BASIC_PASS = 0x10;
+    int CTS_PASS = 0x20;
+
+    void attest();
+
+    int getVersion();
+
+    interface Callback {
+        void onResponse(int responseCode);
+    }
+}

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

@@ -0,0 +1,147 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Context;
+import android.content.ContextWrapper;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.os.Build;
+import android.text.TextUtils;
+
+import androidx.annotation.StringRes;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.InternalUtils;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Locale;
+
+public class LocaleManager {
+    public static Locale locale = Locale.getDefault();
+    public final static Locale defaultLocale = Locale.getDefault();
+    public static List<Locale> locales;
+
+    public static Locale forLanguageTag(String tag) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return Locale.forLanguageTag(tag);
+        } else {
+            String[] tok = tag.split("-");
+            if (tok.length == 0) {
+                return new Locale("");
+            }
+            String language;
+            switch (tok[0]) {
+                case "und":
+                    language = ""; // Undefined
+                    break;
+                case "fil":
+                    language = "tl"; // Filipino
+                    break;
+                default:
+                    language = tok[0];
+            }
+            if ((language.length() != 2 && language.length() != 3))
+                return new Locale("");
+            if (tok.length == 1)
+                return new Locale(language);
+            String country = tok[1];
+            if (country.length() != 2 && country.length() != 3)
+                return new Locale(language);
+            return new Locale(language, country);
+        }
+    }
+
+    public static String toLanguageTag(Locale loc) {
+        if (Build.VERSION.SDK_INT >= 21) {
+            return loc.toLanguageTag();
+        } else {
+            String language = loc.getLanguage();
+            String country = loc.getCountry();
+            String variant = loc.getVariant();
+            if (language.isEmpty() || !language.matches("\\p{Alpha}{2,8}")) {
+                language = "und";       // Follow the Locale#toLanguageTag() implementation
+            } else if (language.equals("iw")) {
+                language = "he";        // correct deprecated "Hebrew"
+            } else if (language.equals("in")) {
+                language = "id";        // correct deprecated "Indonesian"
+            } else if (language.equals("ji")) {
+                language = "yi";        // correct deprecated "Yiddish"
+            }
+            // ensure valid country code, if not well formed, it's omitted
+            if (!country.matches("\\p{Alpha}{2}|\\p{Digit}{3}")) {
+                country = "";
+            }
+
+            // variant subtags that begin with a letter must be at least 5 characters long
+            if (!variant.matches("\\p{Alnum}{5,8}|\\p{Digit}\\p{Alnum}{3}")) {
+                variant = "";
+            }
+            StringBuilder tag = new StringBuilder(language);
+            if (!country.isEmpty())
+                tag.append('-').append(country);
+            if (!variant.isEmpty())
+                tag.append('-').append(variant);
+            return tag.toString();
+        }
+    }
+
+    public static void setLocale(ContextWrapper wrapper) {
+        String localeConfig = Config.get(Config.Key.LOCALE);
+        if (TextUtils.isEmpty(localeConfig)) {
+            locale = defaultLocale;
+        } else {
+            locale = forLanguageTag(localeConfig);
+        }
+        Locale.setDefault(locale);
+        InternalUtils.replaceBaseContext(wrapper, getLocaleContext(locale));
+    }
+
+    public static Context getLocaleContext(Context context, Locale locale) {
+        Configuration config = new Configuration(context.getResources().getConfiguration());
+        config.setLocale(locale);
+        return context.createConfigurationContext(config);
+    }
+
+    public static Context getLocaleContext(Locale locale) {
+        return getLocaleContext(App.self.getBaseContext(), locale);
+    }
+
+    public static String getString(Locale locale, @StringRes int id) {
+        return getLocaleContext(locale).getString(id);
+    }
+
+    public static void loadAvailableLocales(@StringRes int compareId) {
+        Shell.EXECUTOR.execute(() -> {
+            locales = new ArrayList<>();
+            HashSet<String> set = new HashSet<>();
+            Resources res = App.self.getResources();
+            Locale locale;
+
+            // 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 = forLanguageTag(s);
+                if (set.add(getString(locale, compareId))) {
+                    locales.add(locale);
+                }
+            }
+
+            Collections.sort(locales, (a, b) -> a.getDisplayName(a).compareTo(b.getDisplayName(b)));
+            Event.trigger(Event.LOCALE_FETCH_DONE);
+        });
+    }
+}

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

@@ -0,0 +1,26 @@
+package com.topjohnwu.magisk.utils;
+
+import android.util.Log;
+
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.Const;
+
+public class Logger {
+
+    public static void debug(String line) {
+        if (BuildConfig.DEBUG)
+            Log.d(Const.DEBUG_TAG, "DEBUG: " + line);
+    }
+
+    public static void debug(String fmt, Object... args) {
+        debug(Utils.fmt(fmt, args));
+    }
+
+    public static void error(String line) {
+        Log.e(Const.DEBUG_TAG, "ERROR: " + line);
+    }
+
+    public static void error(String fmt, Object... args) {
+        error(Utils.fmt(fmt, args));
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/PatchAPK.java

@@ -0,0 +1,152 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.ComponentName;
+import android.widget.Toast;
+
+import androidx.core.app.NotificationCompat;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.ui.SplashActivity;
+import com.topjohnwu.magisk.view.Notifications;
+import com.topjohnwu.signing.JarMap;
+import com.topjohnwu.signing.SignAPK;
+import com.topjohnwu.superuser.Shell;
+
+import java.io.BufferedOutputStream;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.ByteBuffer;
+import java.nio.ByteOrder;
+import java.nio.CharBuffer;
+import java.nio.IntBuffer;
+import java.security.SecureRandom;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.jar.JarEntry;
+
+public class PatchAPK {
+
+    public static final String LOWERALPHA = "abcdefghijklmnopqrstuvwxyz";
+    public static final String UPPERALPHA = LOWERALPHA.toUpperCase();
+    public static final String ALPHA = LOWERALPHA + UPPERALPHA;
+    public static final String DIGITS = "0123456789";
+    public static final String ALPHANUM = ALPHA + DIGITS;
+    public static final String ALPHANUMDOTS = ALPHANUM + "............";
+
+    private static String genPackageName(String prefix, int length) {
+        StringBuilder builder = new StringBuilder(length);
+        builder.append(prefix);
+        length -= prefix.length();
+        SecureRandom random = new SecureRandom();
+        char next, prev = prefix.charAt(prefix.length() - 1);
+        for (int i = 0; i < length; ++i) {
+            if (prev == '.' || i == length - 1) {
+                next = ALPHA.charAt(random.nextInt(ALPHA.length()));
+            } else {
+                next = ALPHANUMDOTS.charAt(random.nextInt(ALPHANUMDOTS.length()));
+            }
+            builder.append(next);
+            prev = next;
+        }
+        return builder.toString();
+    }
+
+    private static boolean findAndPatch(byte xml[], String from, String to) {
+        if (from.length() != to.length())
+            return false;
+        CharBuffer buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asCharBuffer();
+        List<Integer> offList = new ArrayList<>();
+        for (int i = 0; i < buf.length() - from.length(); ++i) {
+            boolean match = true;
+            for (int j = 0; j < from.length(); ++j) {
+                if (buf.get(i + j) != from.charAt(j)) {
+                    match = false;
+                    break;
+                }
+            }
+            if (match) {
+                offList.add(i);
+                i += from.length();
+            }
+        }
+        if (offList.isEmpty())
+            return false;
+        for (int off : offList) {
+            buf.position(off);
+            buf.put(to);
+        }
+        return true;
+    }
+
+    private static boolean findAndPatch(byte xml[], int a, int b) {
+        IntBuffer buf = ByteBuffer.wrap(xml).order(ByteOrder.LITTLE_ENDIAN).asIntBuffer();
+        int len = xml.length / 4;
+        for (int i = 0; i < len; ++i) {
+            if (buf.get(i) == a) {
+                buf.put(i, b);
+                return true;
+            }
+        }
+        return false;
+    }
+
+    private static boolean patchAndHide() {
+        App app = App.self;
+
+        // Generate a new app with random package name
+        File repack = new File(app.getFilesDir(), "patched.apk");
+        String pkg = genPackageName("com.", BuildConfig.APPLICATION_ID.length());
+
+        if (!patch(app.getPackageCodePath(), repack.getPath(), pkg))
+            return false;
+
+        // Install the application
+        repack.setReadable(true, false);
+        if (!Shell.su("pm install " + repack).exec().isSuccess())
+            return false;
+
+        Config.set(Config.Key.SU_MANAGER, pkg);
+        Config.export();
+        RootUtils.rmAndLaunch(BuildConfig.APPLICATION_ID,
+                new ComponentName(pkg, ClassMap.get(SplashActivity.class).getName()));
+
+        return true;
+    }
+
+    public static boolean patch(String in, String out, String pkg) {
+        try {
+            JarMap jar = new JarMap(in);
+            JarEntry je = jar.getJarEntry(Const.ANDROID_MANIFEST);
+            byte xml[] = jar.getRawData(je);
+
+            if (!findAndPatch(xml, BuildConfig.APPLICATION_ID, pkg) ||
+                    !findAndPatch(xml, R.string.app_name, R.string.re_app_name))
+                return false;
+
+            // Write in changes
+            jar.getOutputStream(je).write(xml);
+            SignAPK.sign(jar, new BufferedOutputStream(new FileOutputStream(out)));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return true;
+    }
+
+    public static void hideManager() {
+        App.THREAD_POOL.execute(() -> {
+            App app = App.self;
+            NotificationCompat.Builder progress =
+                    Notifications.progress(app.getString(R.string.hide_manager_title));
+            Notifications.mgr.notify(Const.ID.HIDE_MANAGER_NOTIFICATION_ID, progress.build());
+            if(!patchAndHide())
+                Utils.toast(R.string.hide_manager_fail_toast, Toast.LENGTH_LONG);
+            Notifications.mgr.cancel(Const.ID.HIDE_MANAGER_NOTIFICATION_ID);
+        });
+    }
+}

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

@@ -0,0 +1,149 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.ShellUtils;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.io.InputStream;
+import java.lang.reflect.Array;
+import java.util.ArrayList;
+import java.util.List;
+
+public class RootUtils extends Shell.Initializer {
+
+    public static void rmAndLaunch(String rm, ComponentName component) {
+        Shell.su(Utils.fmt("(rm_launch %s %s)&", rm, component.flattenToString())).exec();
+    }
+
+    public static void reboot() {
+        Shell.su("/system/bin/reboot" + (Config.recovery ? " recovery" : "")).submit();
+    }
+
+    public static void startActivity(Intent intent) {
+        if (intent.getComponent() == null)
+            return;
+        List<String> args = new ArrayList<>();
+        args.add("am");
+        args.add("start");
+        intentToCommand(intent, args);
+        Shell.su(Utils.argsToCommand(args)).exec();
+    }
+
+    public static void intentToCommand(Intent intent, List<String> args) {
+        if (intent.getAction() != null) {
+            args.add("-a");
+            args.add(intent.getAction());
+        }
+        if (intent.getComponent() != null) {
+            args.add("-n");
+            args.add(intent.getComponent().flattenToString());
+        }
+        if (intent.getData() != null) {
+            args.add("-d");
+            args.add(intent.getDataString());
+        }
+        if (intent.getCategories() != null) {
+            for (String cat : intent.getCategories()) {
+                args.add("-c");
+                args.add(cat);
+            }
+        }
+        if (intent.getType() != null) {
+            args.add("-t");
+            args.add(intent.getType());
+        }
+        Bundle extras = intent.getExtras();
+        if (extras != null) {
+            for (String key : extras.keySet()) {
+                Object val = extras.get(key);
+                if (val == null)
+                    continue;
+                Object value = val;
+                String arg;
+                if (val instanceof String)          arg = "--es";
+                else if (val instanceof Boolean)    arg = "--ez";
+                else if (val instanceof Integer)    arg = "--ei";
+                else if (val instanceof Long)       arg = "--el";
+                else if (val instanceof Float)      arg = "--ef";
+                else if (val instanceof Uri)        arg = "--eu";
+                else if (val instanceof ComponentName) {
+                    arg = "--ecn";
+                    value = ((ComponentName) val).flattenToString();
+                } else if (val instanceof ArrayList) {
+                    ArrayList arr = (ArrayList) val;
+                    if (arr.size() <= 0)
+                    /* Impossible to know the type due to type erasure */
+                        continue;
+
+                    if (arr.get(0) instanceof Integer)      arg = "--eial";
+                    else if (arr.get(0) instanceof Long)    arg = "--elal";
+                    else if (arr.get(0) instanceof Float)   arg = "--efal";
+                    else if (arr.get(0) instanceof String)  arg = "--esal";
+                    else                                    continue;  /* Unsupported */
+                    StringBuilder sb = new StringBuilder();
+                    for (Object o : arr) {
+                        sb.append(o.toString().replace(",", "\\,"));
+                        sb.append(',');
+                    }
+                    // Remove trailing comma
+                    sb.deleteCharAt(sb.length() - 1);
+                    value = sb;
+                } else if (val.getClass().isArray()) {
+                    if (val instanceof int[])           arg = "--eia";
+                    else if (val instanceof long[])     arg = "--ela";
+                    else if (val instanceof float[])    arg = "--efa";
+                    else if (val instanceof String[])   arg = "--esa";
+                    else                                continue;  /* Unsupported */
+                    StringBuilder sb = new StringBuilder();
+                    int len = Array.getLength(val);
+                    for (int i = 0; i < len; ++i) {
+                        sb.append(Array.get(val, i).toString().replace(",", "\\,"));
+                        sb.append(',');
+                    }
+                    // Remove trailing comma
+                    sb.deleteCharAt(sb.length() - 1);
+                    value = sb;
+                }
+                else continue;  /* Unsupported */
+
+                args.add(arg);
+                args.add(key);
+                args.add(value.toString());
+            }
+        }
+        args.add("-f");
+        args.add(String.valueOf(intent.getFlags()));
+    }
+
+    @Override
+    public boolean onInit(Context context, @NonNull Shell shell) {
+        Shell.Job job = shell.newJob();
+        if (shell.isRoot()) {
+            job.add(context.getResources().openRawResource(R.raw.util_functions))
+                .add(context.getResources().openRawResource(R.raw.utils));
+            Const.MAGISK_DISABLE_FILE = new SuFile("/cache/.disable_magisk");
+            Config.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();
+
+        Config.keepVerity = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPVERITY"));
+        Config.keepEnc = Boolean.parseBoolean(ShellUtils.fastCmd("echo $KEEPFORCEENCRYPT"));
+        Config.recovery = Boolean.parseBoolean(ShellUtils.fastCmd("echo $RECOVERYMODE"));
+        return true;
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.topjohnwu.magisk.utils;
+
+import android.net.LocalSocket;
+import android.net.LocalSocketAddress;
+import android.os.Bundle;
+import android.text.TextUtils;
+
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+
+public abstract class SuConnector {
+
+    private LocalSocket socket;
+    protected DataOutputStream out;
+    protected DataInputStream in;
+
+    protected SuConnector(String name) throws IOException {
+        socket = new LocalSocket();
+        socket.connect(new LocalSocketAddress(name, LocalSocketAddress.Namespace.ABSTRACT));
+        out = new DataOutputStream(new BufferedOutputStream(socket.getOutputStream()));
+        in = new DataInputStream(new BufferedInputStream(socket.getInputStream()));
+    }
+
+    private String readString() throws IOException {
+        int len = in.readInt();
+        byte[] buf = new byte[len];
+        in.readFully(buf);
+        return new String(buf, "UTF-8");
+    }
+
+    public Bundle readSocketInput() throws IOException {
+        Bundle bundle = new Bundle();
+        while (true) {
+            String name = readString();
+            if (TextUtils.equals(name, "eof"))
+                break;
+            bundle.putString(name, readString());
+        }
+        return bundle;
+    }
+
+    public void response() {
+        try {
+            onResponse();
+            out.flush();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        try {
+            in.close();
+            out.close();
+            socket.close();
+        } catch (IOException ignored) { }
+    }
+
+    protected abstract void onResponse() throws IOException;
+
+}

app/src/main/java/com/topjohnwu/magisk/utils/SuLogger.java

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.os.Process;
+import android.widget.Toast;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.entity.Policy;
+import com.topjohnwu.magisk.model.entity.SuLogEntry;
+
+import java.util.Date;
+
+public class SuLogger {
+
+    public static void handleLogs(Intent intent) {
+
+        int fromUid = intent.getIntExtra("from.uid", -1);
+        if (fromUid < 0) return;
+        if (fromUid == Process.myUid()) return;
+
+        App app = App.self;
+        PackageManager pm = app.getPackageManager();
+        Policy policy;
+
+        boolean notify;
+        Bundle data = intent.getExtras();
+        if (data.containsKey("notify")) {
+            notify = data.getBoolean("notify");
+            try {
+                policy = new Policy(fromUid, pm);
+            } catch (PackageManager.NameNotFoundException e) {
+                return;
+            }
+        } else {
+            // Doesn't report whether notify or not, check database ourselves
+            policy = app.mDB.getPolicy(fromUid);
+            if (policy == null)
+                return;
+            notify = policy.notification;
+        }
+
+        policy.policy = data.getInt("policy", -1);
+        if (policy.policy < 0)
+            return;
+
+        if (notify)
+            handleNotify(policy);
+
+        SuLogEntry log = new SuLogEntry(policy);
+
+        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();
+        app.mDB.addLog(log);
+    }
+
+    private static void handleNotify(Policy policy) {
+        if (policy.notification &&
+                (int) Config.get(Config.Key.SU_NOTIFICATION) == Config.Value.NOTIFICATION_TOAST) {
+            Utils.toast(App.self.getString(policy.policy == Policy.ALLOW ?
+                    R.string.su_allow_toast : R.string.su_deny_toast, policy.appName),
+                    Toast.LENGTH_SHORT);
+        }
+    }
+
+    public static void handleNotify(Intent intent) {
+        int fromUid = intent.getIntExtra("from.uid", -1);
+        if (fromUid < 0) return;
+        if (fromUid == Process.myUid()) return;
+        try {
+            Policy policy = new Policy(fromUid, App.self.getPackageManager());
+            policy.policy = intent.getIntExtra("policy", -1);
+            if (policy.policy >= 0)
+                handleNotify(policy);
+        } catch (PackageManager.NameNotFoundException ignored) {}
+    }
+}

app/src/main/java/com/topjohnwu/magisk/utils/Utils.java

@@ -0,0 +1,183 @@
+package com.topjohnwu.magisk.utils;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.SharedPreferences;
+import android.content.pm.ApplicationInfo;
+import android.content.pm.PackageManager;
+import android.content.res.Configuration;
+import android.content.res.Resources;
+import android.database.Cursor;
+import android.net.Uri;
+import android.provider.OpenableColumns;
+import android.widget.Toast;
+
+import androidx.work.Constraints;
+import androidx.work.ExistingPeriodicWorkPolicy;
+import androidx.work.NetworkType;
+import androidx.work.PeriodicWorkRequest;
+import androidx.work.WorkManager;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.BuildConfig;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.entity.Module;
+import com.topjohnwu.magisk.model.update.UpdateCheckService;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+import com.topjohnwu.superuser.io.SuFile;
+
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+
+public class Utils {
+
+    public static void toast(CharSequence msg, int duration) {
+        UiThreadHandler.run(() -> Toast.makeText(App.self, msg, duration).show());
+    }
+
+    public static void toast(int resId, int duration) {
+        UiThreadHandler.run(() -> Toast.makeText(App.self, resId, duration).show());
+    }
+
+    public static String dlString(String url) {
+        String s = Networking.get(url).execForString().getResult();
+        return s == null ? "" : s;
+    }
+
+    public static int getPrefsInt(SharedPreferences prefs, String key, int def) {
+        return Integer.parseInt(prefs.getString(key, String.valueOf(def)));
+    }
+
+    public static int getPrefsInt(SharedPreferences prefs, String key) {
+        return getPrefsInt(prefs, key, 0);
+    }
+
+    public static String getNameFromUri(Context context, Uri uri) {
+        String name = null;
+        try (Cursor c = context.getContentResolver().query(uri, null, null, null, null)) {
+            if (c != null) {
+                int nameIndex = c.getColumnIndex(OpenableColumns.DISPLAY_NAME);
+                if (nameIndex != -1) {
+                    c.moveToFirst();
+                    name = c.getString(nameIndex);
+                }
+            }
+        }
+        if (name == null) {
+            int idx = uri.getPath().lastIndexOf('/');
+            name = uri.getPath().substring(idx + 1);
+        }
+        return name;
+    }
+
+    public static int dpInPx(int dp) {
+        float scale = App.self.getResources().getDisplayMetrics().density;
+        return (int) (dp * scale + 0.5);
+    }
+
+    public static String fmt(String fmt, Object... args) {
+        return String.format(Locale.US, fmt, args);
+    }
+
+    public static String getAppLabel(ApplicationInfo info, PackageManager pm) {
+        try {
+            if (info.labelRes > 0) {
+                Resources res = pm.getResourcesForApplication(info);
+                Configuration config = new Configuration();
+                config.setLocale(LocaleManager.locale);
+                res.updateConfiguration(config, res.getDisplayMetrics());
+                return res.getString(info.labelRes);
+            }
+        } catch (Exception ignored) {}
+        return info.loadLabel(pm).toString();
+    }
+
+    public static String getLegalFilename(CharSequence filename) {
+        return filename.toString().replace(" ", "_").replace("'", "").replace("\"", "")
+                .replace("$", "").replace("`", "").replace("*", "").replace("/", "_")
+                .replace("#", "").replace("@", "").replace("\\", "_");
+    }
+
+    public static void loadModules() {
+        loadModules(true);
+    }
+
+    public static void loadModules(boolean async) {
+        Event.reset(Event.MODULE_LOAD_DONE);
+        Runnable run = () -> {
+            Map<String, Module> moduleMap = new ValueSortedMap<>();
+            SuFile path = new SuFile(Const.MAGISK_PATH);
+            SuFile[] modules = path.listFiles(
+                    (file, name) -> !name.equals("lost+found") && !name.equals(".core"));
+            for (SuFile file : modules) {
+                if (file.isFile()) continue;
+                Module module = new Module(Const.MAGISK_PATH + "/" + file.getName());
+                moduleMap.put(module.getId(), module);
+            }
+            Event.trigger(Event.MODULE_LOAD_DONE, moduleMap);
+        };
+        if (async)
+            App.THREAD_POOL.execute(run);
+        else
+            run.run();
+    }
+
+    public static boolean showSuperUser() {
+        return Shell.rootAccess() && (Const.USER_ID == 0 ||
+                (int) Config.get(Config.Key.SU_MULTIUSER_MODE) !=
+                        Config.Value.MULTIUSER_MODE_OWNER_MANAGED);
+    }
+
+    public static boolean isCanary() {
+        return BuildConfig.VERSION_NAME.contains("-");
+    }
+
+    public static void scheduleUpdateCheck() {
+        if (Config.get(Config.Key.CHECK_UPDATES)) {
+            Constraints constraints = new Constraints.Builder()
+                    .setRequiredNetworkType(NetworkType.CONNECTED)
+                    .build();
+            PeriodicWorkRequest request = new PeriodicWorkRequest
+                    .Builder(ClassMap.get(UpdateCheckService.class), 12, TimeUnit.HOURS)
+                    .setConstraints(constraints)
+                    .build();
+            WorkManager.getInstance().enqueueUniquePeriodicWork(
+                    Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID,
+                    ExistingPeriodicWorkPolicy.REPLACE, request);
+        } else {
+            WorkManager.getInstance().cancelUniqueWork(Const.ID.CHECK_MAGISK_UPDATE_WORKER_ID);
+        }
+    }
+
+    public static void openLink(Context context, Uri link) {
+        Intent intent = new Intent(Intent.ACTION_VIEW, link);
+        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+        if (intent.resolveActivity(context.getPackageManager()) != null) {
+            context.startActivity(intent);
+        } else {
+            toast(R.string.open_link_failed_toast, Toast.LENGTH_SHORT);
+        }
+    }
+
+    public static String argsToCommand(List<String> args) {
+        StringBuilder sb = new StringBuilder();
+        for (String s : args) {
+            if (s.contains(" ")) {
+                sb.append('"').append(s).append('"');
+            } else {
+                sb.append(s);
+            }
+            sb.append(' ');
+        }
+        sb.deleteCharAt(sb.length() - 1);
+        return sb.toString();
+    }
+
+}

app/src/main/java/com/topjohnwu/magisk/utils/ValueSortedMap.java

@@ -1,6 +1,6 @@
-package com.topjohnwu.magisk.container;
+package com.topjohnwu.magisk.utils;
 
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
 
 import java.util.ArrayList;
 import java.util.Collection;

app/src/main/java/com/topjohnwu/magisk/utils/ZipUtils.java

@@ -1,14 +1,17 @@
 package com.topjohnwu.magisk.utils;
 
+import com.topjohnwu.signing.JarMap;
+import com.topjohnwu.signing.SignAPK;
 import com.topjohnwu.superuser.ShellUtils;
-import com.topjohnwu.utils.JarMap;
-import com.topjohnwu.utils.SignAPK;
+import com.topjohnwu.superuser.io.SuFile;
+import com.topjohnwu.superuser.io.SuFileOutputStream;
 
 import java.io.BufferedInputStream;
 import java.io.BufferedOutputStream;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.zip.ZipEntry;
@@ -16,13 +19,13 @@ import java.util.zip.ZipInputStream;
 
 public class ZipUtils {
 
-    public static void unzip(File zip, File folder, String path, boolean junkPath) throws Exception {
+    public static void unzip(File zip, File folder, String path, boolean junkPath) throws IOException {
         InputStream in = new BufferedInputStream(new FileInputStream(zip));
         unzip(in, folder, path, junkPath);
         in.close();
     }
 
-    public static void unzip(InputStream zip, File folder, String path, boolean junkPath) throws Exception {
+    public static void unzip(InputStream zip, File folder, String path, boolean junkPath) throws IOException {
         try {
             ZipInputStream zipfile = new ZipInputStream(zip);
             ZipEntry entry;
@@ -38,36 +41,25 @@ public class ZipUtils {
                     name = entry.getName();
                 }
                 File dest = new File(folder, name);
-                dest.getParentFile().mkdirs();
-                try (FileOutputStream out = new FileOutputStream(dest)) {
+                if (!dest.getParentFile().exists() && !dest.getParentFile().mkdirs()) {
+                    dest = new SuFile(folder, name);
+                    dest.getParentFile().mkdirs();
+                }
+                try (OutputStream out = new SuFileOutputStream(dest)) {
                     ShellUtils.pump(zipfile, out);
                 }
             }
-        } catch(Exception e) {
+        }
+        catch(IOException e) {
             e.printStackTrace();
             throw e;
         }
     }
 
-    public static void signZip(InputStream is, File output) throws Exception {
-        try (JarMap map = new JarMap(is, false)) {
-            signZip(map, output);
-        }
-    }
-
     public static void signZip(File input, File output) throws Exception {
-        try (JarMap map = new JarMap(input, false)) {
-            signZip(map, output);
+        try (JarMap map = new JarMap(input, false);
+             BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(output))) {
+            SignAPK.sign(map, out);
         }
     }
-
-    public static void signZip(JarMap input, File output) throws Exception {
-        try (BufferedOutputStream out = new BufferedOutputStream(new FileOutputStream(output))) {
-            signZip(input, out);
-        }
-    }
-
-    public static void signZip(JarMap input, OutputStream output) throws Exception {
-        SignAPK.signZip(null, null, input, output);
-    }
 }

app/src/main/java/com/topjohnwu/magisk/view/ArrowExpandable.java

@@ -0,0 +1,42 @@
+package com.topjohnwu.magisk.view;
+
+import android.view.View;
+import android.view.animation.Animation;
+import android.view.animation.RotateAnimation;
+
+public class ArrowExpandable extends Expandable {
+    protected Expandable mBase;
+    private View arrow;
+
+    public ArrowExpandable(Expandable base, View arrow) {
+        mBase = base;
+        this.arrow = arrow;
+    }
+
+    @Override
+    public void onExpand() {
+        mBase.onExpand();
+        setRotate(new RotateAnimation(0, 180,
+                Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f));
+    }
+
+    @Override
+    public void onCollapse() {
+        mBase.onCollapse();
+        setRotate(new RotateAnimation(180, 0,
+                Animation.RELATIVE_TO_SELF, 0.5f, Animation.RELATIVE_TO_SELF, 0.5f));
+    }
+
+    @Override
+    public void onSetExpanded(boolean expanded) {
+        mBase.onSetExpanded(expanded);
+        if (arrow != null)
+            arrow.setRotation(expanded ? 180 : 0);
+    }
+
+    private void setRotate(RotateAnimation rotate) {
+        rotate.setDuration(300);
+        rotate.setFillAfter(true);
+        arrow.startAnimation(rotate);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/Expandable.java

@@ -0,0 +1,40 @@
+package com.topjohnwu.magisk.view;
+
+public abstract class Expandable {
+
+    private boolean mExpanded = false;
+
+    public final boolean isExpanded() {
+        return mExpanded;
+    }
+
+    public final void setExpanded(boolean expanded) {
+        mExpanded = expanded;
+        onSetExpanded(expanded);
+    }
+
+    public final void expand() {
+        if (mExpanded)
+            return;
+        onExpand();
+        mExpanded = true;
+    }
+
+    public final void collapse() {
+        if (!mExpanded)
+            return;
+        onCollapse();
+        mExpanded = false;
+    }
+
+    protected abstract void onExpand();
+
+    protected abstract void onCollapse();
+
+    protected void onSetExpanded(boolean expanded) {
+        if (expanded)
+            onExpand();
+        else
+            onCollapse();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/ExpandableViewHolder.java

@@ -0,0 +1,65 @@
+package com.topjohnwu.magisk.view;
+
+import android.animation.ValueAnimator;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewTreeObserver;
+
+public class ExpandableViewHolder extends Expandable {
+
+    private ViewGroup expandLayout;
+    private ValueAnimator expandAnimator, collapseAnimator;
+    private int expandHeight = 0;
+
+    public ExpandableViewHolder(ViewGroup viewGroup) {
+        expandLayout = viewGroup;
+        setExpanded(false);
+        expandLayout.getViewTreeObserver().addOnPreDrawListener(
+                new ViewTreeObserver.OnPreDrawListener() {
+
+                    @Override
+                    public boolean onPreDraw() {
+                        if (expandHeight == 0) {
+                            expandLayout.measure(0, 0);
+                            expandHeight = expandLayout.getMeasuredHeight();
+                        }
+
+                        expandLayout.getViewTreeObserver().removeOnPreDrawListener(this);
+                        expandAnimator = slideAnimator(0, expandHeight);
+                        collapseAnimator = slideAnimator(expandHeight, 0);
+                        return true;
+                    }
+
+                });
+    }
+
+    @Override
+    protected void onExpand() {
+        expandLayout.setVisibility(View.VISIBLE);
+        expandAnimator.start();
+    }
+
+    @Override
+    protected void onCollapse() {
+        collapseAnimator.start();
+    }
+
+    @Override
+    protected void onSetExpanded(boolean expanded) {
+        ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
+        layoutParams.height = expanded ? expandHeight : 0;
+        expandLayout.setLayoutParams(layoutParams);
+    }
+
+    private ValueAnimator slideAnimator(int start, int end) {
+        ValueAnimator animator = ValueAnimator.ofInt(start, end);
+
+        animator.addUpdateListener(valueAnimator -> {
+            int value = (Integer) valueAnimator.getAnimatedValue();
+            ViewGroup.LayoutParams layoutParams = expandLayout.getLayoutParams();
+            layoutParams.height = value;
+            expandLayout.setLayoutParams(layoutParams);
+        });
+        return animator;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/MarkDownWindow.java

@@ -0,0 +1,60 @@
+package com.topjohnwu.magisk.view;
+
+import android.app.Activity;
+import android.view.LayoutInflater;
+import android.view.View;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.net.ResponseListener;
+
+import java.io.InputStream;
+import java.util.Scanner;
+
+import ru.noties.markwon.Markwon;
+import ru.noties.markwon.html.HtmlPlugin;
+import ru.noties.markwon.image.ImagesPlugin;
+import ru.noties.markwon.image.svg.SvgPlugin;
+
+public class MarkDownWindow {
+
+    public static void show(Activity activity, String title, String url) {
+        Networking.get(url).getAsString(new Listener(activity, title));
+    }
+
+    public static void show (Activity activity, String title, InputStream is) {
+        try (Scanner s = new Scanner(is, "UTF-8")) {
+            s.useDelimiter("\\A");
+            new Listener(activity, title).onResponse(s.next());
+        }
+    }
+
+    static class Listener implements ResponseListener<String> {
+
+        Activity activity;
+        String title;
+
+        Listener(Activity a, String t) {
+            activity = a;
+            title = t;
+        }
+
+        @Override
+        public void onResponse(String md) {
+            Markwon markwon = Markwon.builder(activity)
+                    .usePlugin(HtmlPlugin.create())
+                    .usePlugin(ImagesPlugin.create(activity))
+                    .usePlugin(SvgPlugin.create(activity.getResources()))
+                    .build();
+            AlertDialog.Builder alert = new AlertDialog.Builder(activity);
+            alert.setTitle(title);
+            View mv = LayoutInflater.from(activity).inflate(R.layout.markdown_window, null);
+            markwon.setMarkdown(mv.findViewById(R.id.md_txt), md);
+            alert.setView(mv);
+            alert.setNegativeButton(R.string.close, (dialog, id) -> dialog.dismiss());
+            alert.show();
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/Notifications.java

@@ -0,0 +1,114 @@
+package com.topjohnwu.magisk.view;
+
+import android.app.NotificationChannel;
+import android.app.NotificationManager;
+import android.app.PendingIntent;
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+
+import androidx.core.app.NotificationCompat;
+import androidx.core.app.NotificationManagerCompat;
+import androidx.core.app.TaskStackBuilder;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.model.receiver.GeneralReceiver;
+import com.topjohnwu.magisk.ui.SplashActivity;
+import com.topjohnwu.magisk.utils.Utils;
+
+public class Notifications {
+
+    public static NotificationManagerCompat mgr = NotificationManagerCompat.from(App.self);
+
+    public static void setup(Context c) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
+            NotificationManager mgr = c.getSystemService(NotificationManager.class);
+            mgr.deleteNotificationChannel("magisk_notification");
+            NotificationChannel channel =
+                    new NotificationChannel(Const.ID.UPDATE_NOTIFICATION_CHANNEL,
+                    c.getString(R.string.update_channel), NotificationManager.IMPORTANCE_DEFAULT);
+            mgr.createNotificationChannel(channel);
+            channel = new NotificationChannel(Const.ID.PROGRESS_NOTIFICATION_CHANNEL,
+                    c.getString(R.string.progress_channel), NotificationManager.IMPORTANCE_LOW);
+            mgr.createNotificationChannel(channel);
+        }
+    }
+
+    public static void magiskUpdate() {
+        App app = App.self;
+
+        Intent intent = new Intent(app, ClassMap.get(SplashActivity.class));
+        intent.putExtra(Const.Key.OPEN_SECTION, "magisk");
+        TaskStackBuilder stackBuilder = TaskStackBuilder.create(app);
+        stackBuilder.addParentStack(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(app, Const.ID.UPDATE_NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk_outline)
+                .setContentTitle(app.getString(R.string.magisk_update_title))
+                .setContentText(app.getString(R.string.manager_download_install))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        mgr.notify(Const.ID.MAGISK_UPDATE_NOTIFICATION_ID, builder.build());
+    }
+
+    public static void managerUpdate() {
+        App app = App.self;
+        String name = Utils.fmt("MagiskManager v%s(%d)",
+                Config.remoteManagerVersionString, Config.remoteManagerVersionCode);
+
+        Intent intent = new Intent(app, ClassMap.get(GeneralReceiver.class));
+        intent.setAction(Const.Key.BROADCAST_MANAGER_UPDATE);
+        intent.putExtra(Const.Key.INTENT_SET_LINK, Config.managerLink);
+        intent.putExtra(Const.Key.INTENT_SET_NAME, name);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(app,
+                Const.ID.APK_UPDATE_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(app, Const.ID.UPDATE_NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk_outline)
+                .setContentTitle(app.getString(R.string.manager_update_title))
+                .setContentText(app.getString(R.string.manager_download_install))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .setAutoCancel(true)
+                .setContentIntent(pendingIntent);
+
+        mgr.notify(Const.ID.APK_UPDATE_NOTIFICATION_ID, builder.build());
+    }
+
+    public static void dtboPatched() {
+        App app = App.self;
+
+        Intent intent = new Intent(app, ClassMap.get(GeneralReceiver.class))
+                .setAction(Const.Key.BROADCAST_REBOOT);
+        PendingIntent pendingIntent = PendingIntent.getBroadcast(app,
+                Const.ID.DTBO_NOTIFICATION_ID, intent, PendingIntent.FLAG_UPDATE_CURRENT);
+
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(app, Const.ID.UPDATE_NOTIFICATION_CHANNEL);
+        builder.setSmallIcon(R.drawable.ic_magisk_outline)
+                .setContentTitle(app.getString(R.string.dtbo_patched_title))
+                .setContentText(app.getString(R.string.dtbo_patched_reboot))
+                .setVibrate(new long[]{0, 100, 100, 100})
+                .addAction(R.drawable.ic_refresh, app.getString(R.string.reboot), pendingIntent);
+
+        mgr.notify(Const.ID.DTBO_NOTIFICATION_ID, builder.build());
+    }
+
+    public static NotificationCompat.Builder progress(String title) {
+        App app = App.self;
+        NotificationCompat.Builder builder = new NotificationCompat.Builder(app, Const.ID.PROGRESS_NOTIFICATION_CHANNEL);
+        builder.setPriority(NotificationCompat.PRIORITY_LOW)
+                .setSmallIcon(android.R.drawable.stat_sys_download)
+                .setContentTitle(title)
+                .setProgress(0, 0, true)
+                .setOngoing(true);
+        return builder;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/ProgressNotification.java

@@ -0,0 +1,85 @@
+package com.topjohnwu.magisk.view;
+
+import android.app.Notification;
+import android.app.PendingIntent;
+import android.content.Intent;
+import android.widget.Toast;
+
+import androidx.core.app.NotificationCompat;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.net.DownloadProgressListener;
+
+public class ProgressNotification implements DownloadProgressListener {
+
+    private NotificationCompat.Builder builder;
+    private Notification notification;
+    private long prevTime;
+
+    public ProgressNotification(String title) {
+        builder = Notifications.progress(title);
+        prevTime = System.currentTimeMillis();
+        update();
+        Utils.toast(App.self.getString(R.string.downloading_toast, title), Toast.LENGTH_SHORT);
+    }
+
+    @Override
+    public void onProgress(long bytesDownloaded, long totalBytes) {
+        long cur = System.currentTimeMillis();
+        if (cur - prevTime >= 1000) {
+            prevTime = cur;
+            int progress = (int) (bytesDownloaded * 100 / totalBytes);
+            builder.setProgress(100, progress, false);
+            builder.setContentText(progress + "%");
+            update();
+        }
+    }
+
+    public NotificationCompat.Builder getNotificationBuilder() {
+        return builder;
+    }
+
+    public Notification getNotification() {
+        return notification;
+    }
+
+    public void update() {
+        notification = builder.build();
+        Notifications.mgr.notify(hashCode(), notification);
+    }
+
+    private void lastUpdate() {
+        notification = builder.build();
+        Notifications.mgr.cancel(hashCode());
+        Notifications.mgr.notify(notification.hashCode(), notification);
+    }
+
+    public void dlDone() {
+        dlDone(PendingIntent.getActivity(App.self, hashCode(),
+                new Intent(), PendingIntent.FLAG_UPDATE_CURRENT));
+    }
+
+    public void dlDone(PendingIntent intent) {
+        builder.setProgress(0, 0, false)
+                .setContentText(App.self.getString(R.string.download_complete))
+                .setSmallIcon(android.R.drawable.stat_sys_download_done)
+                .setContentIntent(intent)
+                .setOngoing(false)
+                .setAutoCancel(true);
+        lastUpdate();
+    }
+
+    public void dlFail() {
+        builder.setProgress(0, 0, false)
+                .setContentText(App.self.getString(R.string.download_file_error))
+                .setSmallIcon(android.R.drawable.stat_notify_error)
+                .setOngoing(false);
+        lastUpdate();
+    }
+
+    public void dismiss() {
+        Notifications.mgr.cancel(hashCode());
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/SafetyNet.java

@@ -0,0 +1,162 @@
+package com.topjohnwu.magisk.view;
+
+import android.app.Activity;
+import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import androidx.annotation.StringRes;
+import androidx.cardview.widget.CardView;
+
+import com.topjohnwu.magisk.App;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.ISafetyNetHelper;
+import com.topjohnwu.magisk.view.dialogs.CustomAlertDialog;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+import java.io.File;
+
+import butterknife.BindColor;
+import butterknife.BindView;
+import butterknife.OnClick;
+import butterknife.Unbinder;
+import dalvik.system.DexClassLoader;
+
+public class SafetyNet implements ISafetyNetHelper.Callback {
+
+    private static final File EXT_APK =
+            new File(App.self.getFilesDir().getParent() + "/snet", "snet.apk");
+
+    @BindView(R.id.safetyNet_card) CardView safetyNetCard;
+    @BindView(R.id.safetyNet_refresh) ImageView safetyNetRefreshIcon;
+    @BindView(R.id.safetyNet_status) TextView safetyNetStatusText;
+    @BindView(R.id.safetyNet_check_progress) ProgressBar safetyNetProgress;
+    @BindView(R.id.safetyNet_expand) ViewGroup expandLayout;
+    @BindView(R.id.cts_status_icon) ImageView ctsStatusIcon;
+    @BindView(R.id.cts_status) TextView ctsStatusText;
+    @BindView(R.id.basic_status_icon) ImageView basicStatusIcon;
+    @BindView(R.id.basic_status) TextView basicStatusText;
+
+    @BindColor(R.color.red500) int colorBad;
+    @BindColor(R.color.green500) int colorOK;
+
+    public Unbinder unbinder;
+    private ExpandableViewHolder expandable;
+
+    public SafetyNet(View v) {
+        unbinder = new SafetyNet_ViewBinding(this, v);
+        expandable = new ExpandableViewHolder(expandLayout);
+        Context context = v.getContext();
+        safetyNetCard.setVisibility(hasGms(context) && Networking.checkNetworkStatus(context) ?
+                View.VISIBLE : View.GONE);
+    }
+
+    @OnClick(R.id.safetyNet_refresh)
+    void safetyNet(View v) {
+        Runnable task = () -> {
+            safetyNetProgress.setVisibility(View.VISIBLE);
+            safetyNetRefreshIcon.setVisibility(View.INVISIBLE);
+            safetyNetStatusText.setText(R.string.checking_safetyNet_status);
+            check((Activity) v.getContext());
+            expandable.collapse();
+        };
+        if (!SafetyNet.EXT_APK.exists()) {
+            // Show dialog
+            new CustomAlertDialog((Activity) v.getContext())
+                    .setTitle(R.string.proprietary_title)
+                    .setMessage(R.string.proprietary_notice)
+                    .setCancelable(true)
+                    .setPositiveButton(R.string.yes, (d, i) -> task.run())
+                    .setNegativeButton(R.string.no_thanks, null)
+                    .show();
+        } else {
+            task.run();
+        }
+    }
+
+    public void reset() {
+        safetyNetStatusText.setText(R.string.safetyNet_check_text);
+        expandable.setExpanded(false);
+    }
+
+    @Override
+    public void onResponse(int response) {
+        safetyNetProgress.setVisibility(View.GONE);
+        safetyNetRefreshIcon.setVisibility(View.VISIBLE);
+        if ((response & 0x0F) == 0) {
+            safetyNetStatusText.setText(R.string.safetyNet_check_success);
+
+            boolean b;
+            b = (response & ISafetyNetHelper.CTS_PASS) != 0;
+            ctsStatusText.setText("ctsProfile: " + b);
+            ctsStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
+            ctsStatusIcon.setColorFilter(b ? colorOK : colorBad);
+
+            b = (response & ISafetyNetHelper.BASIC_PASS) != 0;
+            basicStatusText.setText("basicIntegrity: " + b);
+            basicStatusIcon.setImageResource(b ? R.drawable.ic_check_circle : R.drawable.ic_cancel);
+            basicStatusIcon.setColorFilter(b ? colorOK : colorBad);
+
+            expandable.expand();
+        } else {
+            @StringRes int resid;
+            switch (response) {
+                case ISafetyNetHelper.RESPONSE_ERR:
+                    resid = R.string.safetyNet_res_invalid;
+                    break;
+                case ISafetyNetHelper.CONNECTION_FAIL:
+                default:
+                    resid = R.string.safetyNet_api_error;
+                    break;
+            }
+            safetyNetStatusText.setText(resid);
+        }
+    }
+
+    private void dyRun(Activity activity) throws Exception {
+        DexClassLoader loader = new DexClassLoader(EXT_APK.getPath(), EXT_APK.getParent(),
+                null, ISafetyNetHelper.class.getClassLoader());
+        Class<?> clazz = loader.loadClass("com.topjohnwu.snet.Snet");
+        ISafetyNetHelper helper = (ISafetyNetHelper) clazz.getMethod("newHelper",
+                Class.class, String.class, Activity.class, Object.class)
+                .invoke(null, ISafetyNetHelper.class, EXT_APK.getPath(), activity, this);
+        if (helper.getVersion() < Const.SNET_EXT_VER)
+            throw new Exception();
+        helper.attest();
+    }
+
+    private void check(Activity activity) {
+        try {
+            dyRun(activity);
+        } catch (Exception ignored) {
+            Shell.sh("rm -rf " + EXT_APK.getParent()).exec();
+            EXT_APK.getParentFile().mkdir();
+            Networking.get(Const.Url.SNET_URL).getAsFile(EXT_APK, f -> {
+                try {
+                    dyRun(activity);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    onResponse(-1);
+                }
+            });
+        }
+    }
+
+    private boolean hasGms(Context context) {
+        PackageManager pm = context.getPackageManager();
+        PackageInfo info;
+        try {
+            info = pm.getPackageInfo("com.google.android.gms", 0);
+        } catch (PackageManager.NameNotFoundException e) {
+            return false;
+        }
+        return info.applicationInfo.enabled;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/Shortcuts.java

@@ -0,0 +1,79 @@
+package com.topjohnwu.magisk.view;
+
+import android.content.Context;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.drawable.Icon;
+import android.os.Build;
+
+import androidx.annotation.RequiresApi;
+
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.ui.SplashActivity;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+
+import java.util.ArrayList;
+
+public class Shortcuts {
+
+    public static void setup(Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) {
+            ShortcutManager manager = context.getSystemService(ShortcutManager.class);
+            manager.setDynamicShortcuts(getShortCuts(context));
+        }
+    }
+
+    @RequiresApi(api = Build.VERSION_CODES.N_MR1)
+    private static ArrayList<ShortcutInfo> getShortCuts(Context context) {
+        ArrayList<ShortcutInfo> shortCuts = new ArrayList<>();
+        boolean root = Shell.rootAccess();
+        if (Utils.showSuperUser()) {
+            shortCuts.add(new ShortcutInfo.Builder(context, "superuser")
+                    .setShortLabel(context.getString(R.string.superuser))
+                    .setIntent(new Intent(context, ClassMap.get(SplashActivity.class))
+                            .putExtra(Const.Key.OPEN_SECTION, "superuser")
+                            .setAction(Intent.ACTION_VIEW)
+                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
+                    .setIcon(Icon.createWithResource(context, R.drawable.sc_superuser))
+                    .setRank(0)
+                    .build());
+        }
+        if (root && (boolean) Config.get(Config.Key.MAGISKHIDE)) {
+            shortCuts.add(new ShortcutInfo.Builder(context, "magiskhide")
+                    .setShortLabel(context.getString(R.string.magiskhide))
+                    .setIntent(new Intent(context, ClassMap.get(SplashActivity.class))
+                            .putExtra(Const.Key.OPEN_SECTION, "magiskhide")
+                            .setAction(Intent.ACTION_VIEW)
+                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
+                    .setIcon(Icon.createWithResource(context, R.drawable.sc_magiskhide))
+                    .setRank(1)
+                    .build());
+        }
+        if (!(boolean) Config.get(Config.Key.COREONLY) && root && Config.magiskVersionCode >= 0) {
+            shortCuts.add(new ShortcutInfo.Builder(context, "modules")
+                    .setShortLabel(context.getString(R.string.modules))
+                    .setIntent(new Intent(context, ClassMap.get(SplashActivity.class))
+                            .putExtra(Const.Key.OPEN_SECTION, "modules")
+                            .setAction(Intent.ACTION_VIEW)
+                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
+                    .setIcon(Icon.createWithResource(context, R.drawable.sc_extension))
+                    .setRank(3)
+                    .build());
+            shortCuts.add(new ShortcutInfo.Builder(context, "downloads")
+                    .setShortLabel(context.getString(R.string.downloads))
+                    .setIntent(new Intent(context, ClassMap.get(SplashActivity.class))
+                            .putExtra(Const.Key.OPEN_SECTION, "downloads")
+                            .setAction(Intent.ACTION_VIEW)
+                            .addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK))
+                    .setIcon(Icon.createWithResource(context, R.drawable.sc_cloud_download))
+                    .setRank(2)
+                    .build());
+        }
+        return shortCuts;
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/SnackbarMaker.java

@@ -1,11 +1,16 @@
-package com.topjohnwu.magisk.components;
+package com.topjohnwu.magisk.view;
 
 import android.app.Activity;
-import android.support.annotation.StringRes;
-import android.support.design.widget.Snackbar;
+import android.net.Uri;
 import android.view.View;
 import android.widget.TextView;
 
+import androidx.annotation.StringRes;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.Utils;
+
 public class SnackbarMaker {
 
     public static Snackbar make(Activity activity, CharSequence text, int duration) {
@@ -30,8 +35,14 @@ 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,
+                "/Download/" + Utils.getNameFromUri(activity, uri)),
+                Snackbar.LENGTH_LONG)
+                .setAction(R.string.ok, (v)->{}).show();
+    }
 }

app/src/main/java/com/topjohnwu/magisk/view/UpdateCardHolder.java

@@ -0,0 +1,59 @@
+package com.topjohnwu.magisk.view;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.ProgressBar;
+import android.widget.TextView;
+
+import com.topjohnwu.magisk.R;
+
+import butterknife.BindView;
+import butterknife.Unbinder;
+
+public class UpdateCardHolder {
+
+    @BindView(R.id.status_icon) public ImageView statusIcon;
+    @BindView(R.id.progress) public ProgressBar progress;
+    @BindView(R.id.status) public TextView status;
+    @BindView(R.id.current_version) public TextView currentVersion;
+    @BindView(R.id.latest_version) public TextView latestVersion;
+    @BindView(R.id.additional) public TextView additional;
+    @BindView(R.id.install) public Button install;
+
+    public View itemView;
+    public Unbinder unbinder;
+
+    public UpdateCardHolder(LayoutInflater inflater, ViewGroup root) {
+        itemView = inflater.inflate(R.layout.update_card, root, false);
+        unbinder = new UpdateCardHolder_ViewBinding(this, itemView);
+    }
+
+    public void setClickable(View.OnClickListener listener) {
+        itemView.setClickable(true);
+        itemView.setFocusable(true);
+        itemView.setOnClickListener(listener);
+    }
+
+    public void setValid(boolean valid) {
+        progress.setVisibility(View.GONE);
+        statusIcon.setVisibility(View.VISIBLE);
+        if (valid) {
+            install.setVisibility(View.VISIBLE);
+            latestVersion.setVisibility(View.VISIBLE);
+        } else {
+            install.setVisibility(View.GONE);
+            latestVersion.setVisibility(View.GONE);
+        }
+    }
+
+    public void reset() {
+        progress.setVisibility(View.VISIBLE);
+        statusIcon.setVisibility(View.INVISIBLE);
+        latestVersion.setVisibility(View.GONE);
+        install.setVisibility(View.GONE);
+        status.setText(R.string.checking_for_updates);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/dialogs/CustomAlertDialog.java

@@ -0,0 +1,162 @@
+package com.topjohnwu.magisk.view.dialogs;
+
+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 androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.StringRes;
+import androidx.annotation.StyleRes;
+import androidx.appcompat.app.AlertDialog;
+
+import com.topjohnwu.magisk.R;
+
+import butterknife.BindView;
+
+public class CustomAlertDialog extends AlertDialog.Builder {
+
+    private DialogInterface.OnClickListener positiveListener;
+    private DialogInterface.OnClickListener negativeListener;
+    private DialogInterface.OnClickListener neutralListener;
+
+    protected AlertDialog dialog;
+    protected 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/main/java/com/topjohnwu/magisk/view/dialogs/EnvFixDialog.java

@@ -0,0 +1,47 @@
+package com.topjohnwu.magisk.view.dialogs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.tasks.MagiskInstaller;
+import com.topjohnwu.magisk.utils.RootUtils;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.superuser.Shell;
+import com.topjohnwu.superuser.internal.UiThreadHandler;
+import com.topjohnwu.superuser.io.SuFile;
+
+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) -> {
+            ProgressDialog pd = ProgressDialog.show(activity,
+                    activity.getString(R.string.setup_title),
+                    activity.getString(R.string.setup_msg));
+            new MagiskInstaller() {
+                @Override
+                protected boolean operations() {
+                    installDir = new SuFile("/data/adb/magisk");
+                    Shell.su("rm -rf /data/adb/magisk/*").exec();
+                    return extractZip() && Shell.su("fix_env").exec().isSuccess();
+                }
+
+                @Override
+                protected void onResult(boolean success) {
+                    pd.dismiss();
+                    Utils.toast(success ? R.string.reboot_delay_toast : R.string.setup_fail, Toast.LENGTH_LONG);
+                    if (success)
+                        UiThreadHandler.handler.postDelayed(RootUtils::reboot, 5000);
+                }
+            }.exec();
+        });
+        setNegativeButton(R.string.no_thanks, null);
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/dialogs/FingerprintAuthDialog.java

@@ -0,0 +1,88 @@
+package com.topjohnwu.magisk.view.dialogs;
+
+import android.annotation.TargetApi;
+import android.app.Activity;
+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.view.Gravity;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
+
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.FingerprintHelper;
+import com.topjohnwu.magisk.utils.Utils;
+
+@TargetApi(Build.VERSION_CODES.M)
+public class FingerprintAuthDialog extends CustomAlertDialog {
+
+    private Runnable callback;
+    private DialogFingerprintHelper helper;
+
+    public FingerprintAuthDialog(@NonNull Activity activity, Runnable onSuccess) {
+        super(activity);
+        callback = onSuccess;
+        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);
+        setMessage(R.string.auth_fingerprint);
+        setNegativeButton(R.string.close, (d, w) -> helper.cancel());
+        setOnCancelListener(d -> helper.cancel());
+        try {
+            helper = new DialogFingerprintHelper();
+        } catch (Exception ignored) {}
+    }
+
+    @Override
+    public AlertDialog show() {
+        create();
+        if (helper == null) {
+            dialog.dismiss();
+            Utils.toast(R.string.auth_fail, Toast.LENGTH_SHORT);
+        } else {
+            helper.authenticate();
+            dialog.show();
+        }
+        return dialog;
+    }
+
+    class DialogFingerprintHelper extends FingerprintHelper {
+
+        DialogFingerprintHelper() throws Exception {}
+
+        @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) {
+            dismiss();
+            callback.run();
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/dialogs/InstallMethodDialog.java

@@ -0,0 +1,100 @@
+package com.topjohnwu.magisk.view.dialogs;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AlertDialog;
+
+import com.google.android.material.snackbar.Snackbar;
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.ProgressNotification;
+import com.topjohnwu.magisk.view.SnackbarMaker;
+import com.topjohnwu.net.Networking;
+
+import java.io.File;
+import java.util.List;
+
+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:
+                    patchBoot(activity);
+                    break;
+                case 0:
+                    downloadOnly(activity);
+                    break;
+                case 2:
+                    intent = new Intent(activity, ClassMap.get(FlashActivity.class))
+                            .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_MAGISK);
+                    activity.startActivity(intent);
+                    break;
+                case 3:
+                    installInactiveSlot(activity);
+                    break;
+                default:
+            }
+        });
+    }
+
+    private void patchBoot(BaseActivity activity) {
+        activity.runWithExternalRW(() -> {
+            Utils.toast(R.string.patch_file_msg, Toast.LENGTH_LONG);
+            Intent intent = new Intent(Intent.ACTION_GET_CONTENT)
+                    .setType("*/*")
+                    .addCategory(Intent.CATEGORY_OPENABLE);
+            activity.startActivityForResult(intent, Const.ID.SELECT_BOOT,
+                    (resultCode, data) -> {
+                        if (resultCode == Activity.RESULT_OK && data != null) {
+                            Intent i = new Intent(activity, ClassMap.get(FlashActivity.class))
+                                    .setData(data.getData())
+                                    .putExtra(Const.Key.FLASH_ACTION, Const.Value.PATCH_FILE);
+                            activity.startActivity(i);
+                        }
+                    });
+        });
+    }
+
+    private void downloadOnly(BaseActivity activity) {
+        activity.runWithExternalRW(() -> {
+            String filename = Utils.fmt("Magisk-v%s(%d).zip",
+                    Config.remoteMagiskVersionString, Config.remoteMagiskVersionCode);
+            File zip = new File(Const.EXTERNAL_PATH, filename);
+            ProgressNotification progress = new ProgressNotification(filename);
+            Networking.get(Config.magiskLink)
+                    .setDownloadProgressListener(progress)
+                    .setErrorHandler(((conn, e) -> progress.dlFail()))
+                    .getAsFile(zip, f -> {
+                        progress.dlDone();
+                        SnackbarMaker.make(activity,
+                                activity.getString(R.string.internal_storage, "/Download/" + filename),
+                                Snackbar.LENGTH_LONG).show();
+                    });
+        });
+    }
+
+    private void installInactiveSlot(BaseActivity activity) {
+        new CustomAlertDialog(activity)
+                .setTitle(R.string.warning)
+                .setMessage(R.string.install_inactive_slot_msg)
+                .setCancelable(true)
+                .setPositiveButton(R.string.yes, (d, i) -> {
+                    Intent intent = new Intent(activity, ClassMap.get(FlashActivity.class))
+                            .putExtra(Const.Key.FLASH_ACTION, Const.Value.FLASH_INACTIVE_SLOT);
+                    activity.startActivity(intent);
+                })
+                .setNegativeButton(R.string.no_thanks, null)
+                .show();
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/dialogs/MagiskInstallDialog.java

@@ -0,0 +1,49 @@
+package com.topjohnwu.magisk.view.dialogs;
+
+import android.net.Uri;
+import android.text.TextUtils;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.ui.base.BaseActivity;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.MarkDownWindow;
+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 a) {
+        super(a);
+        String filename = Utils.fmt("Magisk-v%s(%d).zip",
+                Config.remoteMagiskVersionString, Config.remoteMagiskVersionCode);
+        setTitle(a.getString(R.string.repo_install_title, a.getString(R.string.magisk)));
+        setMessage(a.getString(R.string.repo_install_msg, filename));
+        setCancelable(true);
+        setPositiveButton(R.string.install, (d, i) -> {
+            List<String> options = new ArrayList<>();
+            options.add(a.getString(R.string.download_zip_only));
+            options.add(a.getString(R.string.select_patch_file));
+            if (Shell.rootAccess()) {
+                options.add(a.getString(R.string.direct_install));
+                String s = ShellUtils.fastCmd("grep_prop ro.build.ab_update");
+                if (!s.isEmpty() && Boolean.parseBoolean(s)) {
+                    options.add(a.getString(R.string.install_inactive_slot));
+                }
+            }
+            new InstallMethodDialog(a, options).show();
+        });
+        if (!TextUtils.isEmpty(Config.magiskNoteLink)) {
+            setNeutralButton(R.string.release_notes, (d, i) -> {
+                if (Config.magiskNoteLink.contains("forum.xda-developers")) {
+                    // Open forum links in browser
+                    Utils.openLink(a, Uri.parse(Config.magiskNoteLink));
+                } else {
+                    MarkDownWindow.show(a, null, Config.magiskNoteLink);
+                }
+            });
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/dialogs/ManagerInstallDialog.java

@@ -0,0 +1,28 @@
+package com.topjohnwu.magisk.view.dialogs;
+
+import android.app.Activity;
+import android.text.TextUtils;
+
+import androidx.annotation.NonNull;
+
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.utils.DownloadApp;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.MarkDownWindow;
+
+public class ManagerInstallDialog extends CustomAlertDialog {
+
+    public ManagerInstallDialog(@NonNull Activity a) {
+        super(a);
+        String name = Utils.fmt("MagiskManager v%s(%d)",
+                Config.remoteManagerVersionString, Config.remoteManagerVersionCode);
+        setTitle(a.getString(R.string.repo_install_title, a.getString(R.string.app_name)));
+        setMessage(a.getString(R.string.repo_install_msg, name));
+        setCancelable(true);
+        setPositiveButton(R.string.install, (d, i) -> DownloadApp.upgrade(name));
+        if (!TextUtils.isEmpty(Config.managerNoteLink)) {
+            setNeutralButton(R.string.app_changelog, (d, i) -> MarkDownWindow.show(a, null, Config.managerNoteLink));
+        }
+    }
+}

app/src/main/java/com/topjohnwu/magisk/view/dialogs/UninstallDialog.java

@@ -0,0 +1,61 @@
+package com.topjohnwu.magisk.view.dialogs;
+
+import android.app.Activity;
+import android.app.ProgressDialog;
+import android.content.Intent;
+import android.net.Uri;
+import android.text.TextUtils;
+import android.widget.Toast;
+
+import androidx.annotation.NonNull;
+
+import com.topjohnwu.magisk.ClassMap;
+import com.topjohnwu.magisk.Config;
+import com.topjohnwu.magisk.Const;
+import com.topjohnwu.magisk.R;
+import com.topjohnwu.magisk.ui.flash.FlashActivity;
+import com.topjohnwu.magisk.utils.Utils;
+import com.topjohnwu.magisk.view.ProgressNotification;
+import com.topjohnwu.net.Networking;
+import com.topjohnwu.superuser.Shell;
+
+import java.io.File;
+
+public class UninstallDialog extends CustomAlertDialog {
+
+    public UninstallDialog(@NonNull Activity activity) {
+        super(activity);
+        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(Config.uninstallerLink)) {
+            setPositiveButton(R.string.complete_uninstall, (d, i) -> {
+                File zip = new File(activity.getFilesDir(), "uninstaller.zip");
+                ProgressNotification progress = new ProgressNotification(zip.getName());
+                Networking.get(Config.uninstallerLink)
+                    .setDownloadProgressListener(progress)
+                    .setErrorHandler(((conn, e) -> progress.dlFail()))
+                    .getAsFile(zip, f -> {
+                        progress.dismiss();
+                        Intent intent = new Intent(activity, ClassMap.get(FlashActivity.class))
+                                .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
+                                .setData(Uri.fromFile(f))
+                                .putExtra(Const.Key.FLASH_ACTION, Const.Value.UNINSTALL);
+                        activity.startActivity(intent);
+                    });
+            });
+        }
+    }
+}

app/src/main/res/drawable-anydpi-v21/ic_magisk_outline.xml

@@ -0,0 +1,18 @@
+<vector android:height="48dp" android:viewportHeight="720"
+    android:viewportWidth="720" android:width="48dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#ffffff" android:pathData="M332.48,421.18c0,0 3.77,22.45 -0.82,71.95c-5.76,62.06 23.64,160.64 23.64,160.64c0,0 40.1,-98.78 33.1,-162.59c-5.75,-52.45 2.6,-70.79 0.82,-68.33c-30.81,42.57 -56.75,-1.67 -56.75,-1.67z"/>
+    <path android:fillColor="#ffffff" android:pathData="M407.6,474.45c5.01,38.77 -0.57,60.01 -7.81,101.51c-3.66,20.99 74.78,-63.1 104.86,-113.23c5.02,-8.36 -28.77,32.6 -62.19,3.35c-23.18,-20.28 -27.16,-26.44 -45.18,-44.06c-6.08,-5.94 6.74,24.72 10.32,52.43z"/>
+    <path android:fillColor="#ffffff" android:pathData="M321.99,425.09c-18.02,17.62 -22,23.78 -45.18,44.06c-33.42,29.25 -67.21,-11.71 -62.19,-3.35c30.08,50.13 108.52,134.22 104.86,113.23c-7.24,-41.5 -12.82,-62.74 -7.81,-101.51c3.58,-27.71 16.4,-58.37 10.32,-52.43z"/>
+    <path android:fillColor="#ffffff" android:pathData="M399.15,355.87c36.67,10.57 50.89,61.5 87.91,67.8c7.65,1.3 16.27,3.6 26.31,3.12c18.77,-0.9 42.51,-11.51 74.22,-56.5c9.38,-13.3 -23.27,85.66 -105.13,86.86c-59.96,0.88 -66.97,-58.7 -106.93,-60.51c-14.43,-0.65 -15.34,-28.17 -15.34,-28.17c0,0 17.22,-18.86 38.96,-12.6z"/>
+    <path android:fillColor="#ffffff" android:pathData="M321.51,355.59c-36.67,10.57 -50.89,61.5 -87.91,67.8c-7.65,1.3 -16.27,3.6 -26.31,3.12c-18.77,-0.9 -42.51,-11.51 -74.22,-56.5c-9.38,-13.3 23.27,85.66 105.13,86.86c59.96,0.88 66.97,-58.7 106.93,-60.51c14.43,-0.65 15.34,-28.17 15.34,-28.17c0,0 -17.22,-18.86 -38.96,-12.6z"/>
+    <path android:fillColor="#ffffff" android:pathData="M458.64,355.09c36.87,27.94 25.88,58.7 46.57,49.92c69.7,-29.55 57.51,-181.21 51.87,-162.87c-31.77,103.41 -100.99,109.2 -167.61,61.63c-13.01,-9.29 48.38,35.57 69.16,51.31z"/>
+    <path android:fillColor="#ffffff" android:pathData="M330.91,303.77c-66.62,47.56 -135.84,41.78 -167.61,-61.63c-5.63,-18.34 -17.82,133.31 51.87,162.87c20.7,8.78 9.7,-21.98 46.57,-49.92c20.78,-15.75 82.17,-60.6 69.16,-51.31z"/>
+    <path android:fillColor="#ffffff" android:pathData="M465.61,318c80.43,-3.32 95.29,-135.17 88.96,-119.08c-28.39,72.22 -135.86,45.05 -146.13,90.64c-2.02,8.94 18.2,30.06 57.17,28.45z"/>
+    <path android:fillColor="#ffffff" android:pathData="M311.95,289.55c-10.27,-45.59 -117.75,-18.41 -146.13,-90.64c-6.32,-16.09 8.53,115.76 88.96,119.08c38.97,1.61 59.19,-19.5 57.17,-28.45z"/>
+    <path android:fillColor="#ffffff" android:pathData="M403.42,269.47c0,0 43.73,-23.5 81.16,-33.74c34.99,-9.58 61.22,-33.13 64.14,-58.01c2.18,-18.53 -27.05,-53.55 -27.05,-53.55c0,0 -20.51,56.9 -47.41,85.34c-29.28,30.96 -18.15,26.78 -70.84,59.96z"/>
+    <path android:fillColor="#ffffff" android:pathData="M246.13,209.51c-26.9,-28.44 -47.41,-85.34 -47.41,-85.34c0,0 -29.23,35.01 -27.05,53.55c2.93,24.88 29.16,48.43 64.14,58.01c37.43,10.25 81.16,33.74 81.16,33.74c-52.69,-33.18 -41.55,-29 -70.84,-59.96z"/>
+    <path android:fillColor="#ffffff" android:pathData="M398.12,265.85c47.36,-38.85 72.53,-89.54 113.51,-145.02c7.73,-10.46 -34.58,-35.7 -51.31,-37.37c-16.73,-1.67 -30.77,59.79 -32.35,95.94c-1.44,33.01 -36.21,91.68 -29.84,86.45z"/>
+    <path android:fillColor="#ffffff" android:pathData="M292.42,179.39c-1.58,-36.15 -15.62,-97.61 -32.35,-95.94c-16.73,1.67 -59.04,26.91 -51.31,37.37c40.98,55.48 66.14,106.17 113.51,145.02c6.37,5.22 -28.4,-53.45 -29.84,-86.45z"/>
+    <path android:fillColor="#ffffff" android:pathData="M402.86,140.35c3.34,-26.76 15.37,-46.32 39.32,-62.75c-21.17,-7.08 -38.77,-12.83 -47.97,-5.3c-9.2,7.53 -34.2,32.7 -30.85,73.68c3.34,40.98 0.18,194.09 7.43,191.25c3.9,-104.87 37.09,-135 32.07,-196.89z"/>
+    <path android:fillColor="#ffffff" android:pathData="M349.59,337.24c7.24,2.83 4.08,-150.27 7.43,-191.25c3.34,-40.98 -21.65,-66.16 -30.85,-73.68c-9.2,-7.53 -26.8,-1.78 -47.97,5.3c23.95,16.43 35.98,35.98 39.32,62.75c-5.02,61.89 28.17,92.02 32.07,196.89z"/>
+</vector>

app/src/main/res/drawable-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+    <foreground android:drawable="@drawable/ic_magisk_padded" />
 </adaptive-icon>