optimize libbyedpi

This reverts commit ef04471a

.github/workflows/workflow.yml

@@ -28,12 +28,28 @@ jobs:
         distribution: 'temurin'
         cache: gradle
 
+    - name: Setup Git submodules
+      run: git submodule update --init --recursive
+
     - name: Grant execute permission for gradlew
       run: chmod +x gradlew
 
     - name: Set up Android SDK
       uses: android-actions/setup-android@v2
 
+    - name: Setup NDK
+      run: sdkmanager "ndk;27.0.12077973" "cmake;3.22.1"
+        
+    - name: Install toolchain
+      run: |
+        rustup default stable
+        rustup update stable
+        cargo install cargo-ndk
+        rustup target add armv7-linux-androideabi
+        rustup target add aarch64-linux-android
+        rustup target add i686-linux-android
+        rustup target add x86_64-linux-android
+
     - name: Build APK
       run: ./gradlew assembleRelease
 

.gitmodules

@@ -0,0 +1,6 @@
+[submodule "rust/byedpi"]
+	path = rust/byedpi
+	url = https://github.com/hufrea/byedpi
+[submodule "app/src/main/jni/hev-socks5-tunnel"]
+	path = app/src/main/jni/hev-socks5-tunnel
+	url = https://github.com/heiher/hev-socks5-tunnel

.idea/appInsightsSettings.xml

@@ -2,5 +2,26 @@
 <project version="4">
   <component name="AppInsightsSettings">
     <option name="selectedTabId" value="Android Vitals" />
+    <option name="tabSettings">
+      <map>
+        <entry key="Firebase Crashlytics">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="com.cherret.zaprett" />
+                  <option name="mobileSdkAppId" value="1:1005804036856:android:e7db5546b8bb4daf91510d" />
+                  <option name="projectId" value="zaprett-app" />
+                  <option name="projectNumber" value="1005804036856" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="THIRTY_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
+      </map>
+    </option>
   </component>
 </project>

.idea/deploymentTargetSelector.xml

@@ -4,10 +4,10 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-03-24T08:57:47.584581613Z">
+        <DropdownSelection timestamp="2025-10-03T07:21:08.712998131Z">
           <Target type="DEFAULT_BOOT">
             <handle>
-              <DeviceId pluginId="LocalEmulator" identifier="path=/home/dimap/.var/app/com.google.AndroidStudio/config/.android/avd/Medium_Phone.avd" />
+              <DeviceId pluginId="LocalEmulator" identifier="path=/home/dimap/.android/avd/Medium_Phone.avd" />
             </handle>
           </Target>
         </DropdownSelection>

.idea/deviceManager.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DeviceTable">
+    <option name="columnSorters">
+      <list>
+        <ColumnSorterState>
+          <option name="column" value="Name" />
+          <option name="order" value="ASCENDING" />
+        </ColumnSorterState>
+      </list>
+    </option>
+  </component>
+</project>

.idea/vcs.xml

@@ -2,11 +2,11 @@
 <project version="4">
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/app/src/main/cpp/byedpi" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/src/main/jni/hev-socks5-tunnel" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/src/main/jni/hev-socks5-tunnel/src/core" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/src/main/jni/hev-socks5-tunnel/third-part/hev-task-system" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/src/main/jni/hev-socks5-tunnel/third-part/lwip" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/app/src/main/jni/hev-socks5-tunnel/third-part/yaml" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/rust/byedpi" vcs="Git" />
   </component>
 </project>

LICENSE

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

README.md

@@ -1,18 +1,42 @@
 # zaprett
 ## О приложении
+
+![GitHub Downloads (all assets, all releases)](https://img.shields.io/github/downloads/CherretGit/zaprett-app/total)
+![GitHub Downloads (all assets, latest release)](https://img.shields.io/github/downloads/CherretGit/zaprett-app/latest/total)
+![GitHub Actions Workflow Status](https://img.shields.io/github/actions/workflow/status/CherretGit/zaprett-app/workflow.yml)
+
 Приложение разработано для работы с модулем [zaprett](https://github.com/egor-white/zaprett)
-### [Официальный Telegram-канал приложения](https://t.me/zaprett_module)
+> [!IMPORTANT]
-## ВНИМАНИЕ приложение работает только с root правами
+> 📢 [Официальный Telegram-канал приложения](https://t.me/zaprett_module)
+
+> [!CAUTION]
+> ⚠️ Для корректной работы приложения **желательны root-права**, однако предусмотрен режим без root на основе **byedpi**
+
+---
+
 На данный момент приложение умеет:
-* Запускать, останавливать и перезапускать модуль
+* Запускать, останавливать и перезапускать сервис
 * Работа с листами (добавление, включение и выключение, загрузка из репозитория)
 * Работа с стратегиями (добавление, выбор, загрузка из репозитория)
 * Авто обновление приложения
 
+---
+
 ## [Репозиторий с хостами и стратегиями](https://github.com/CherretGit/zaprett-hosts-repo)
 
+---
+
 #### Данное приложение является ремейком [приложения](https://github.com/egor-white/zaprett-app) от [egor-white](https://github.com/egor-white), разработка которого была прекращена в пользу этого приложения
 
+---
+
 ## Скриншоты:
-<img src="images/1.png" width="300"><img src="images/2.png" width="300"><img src="images/3.png" width="300"><img src="images/4.png" width="300"><img src="images/5.png" width="300">
+<p align="center">
-<img src="images/6.png" width="300">
+  <img src="images/1.png" width="180">
+  <img src="images/2.png" width="180">
+  <img src="images/3.png" width="180"><br>
+  <img src="images/4.png" width="180">
+  <img src="images/5.png" width="180">
+  <img src="images/6.png" width="180"><br>
+  <img src="images/7.png" width="180">
+</p>

app/build.gradle.kts

@@ -5,29 +5,21 @@ plugins {
     id("com.google.gms.google-services")
     id("com.google.firebase.crashlytics")
     kotlin("plugin.serialization") version "2.1.20"
+    id("org.mozilla.rust-android-gradle.rust-android") version "0.9.6"
 }
 
 android {
     namespace = "com.cherret.zaprett"
-    compileSdk = 35
+    compileSdk = 36
 
     defaultConfig {
         applicationId = "com.cherret.zaprett"
-        minSdk = 30
+        minSdk = 29
         targetSdk = 35
-        versionCode = 12
+        versionCode = 25
-        versionName = "2.0"
+        versionName = "2.13"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
-        ndk {
-            abiFilters += listOf("armeabi-v7a", "arm64-v8a", "x86", "x86_64")
-        }
-    }
-    externalNativeBuild {
-        cmake {
-            path = file("src/main/cpp/CMakeLists.txt")
-            version = "3.22.1"
-        }
     }
     buildTypes {
         release {
@@ -37,6 +29,12 @@ android {
                 getDefaultProguardFile("proguard-android-optimize.txt"),
                 "proguard-rules.pro"
             )
+            buildConfigField("boolean", "send_firebase_analytics", "true")
+            buildConfigField("boolean", "auto_update", "true")
+        }
+        debug {
+            buildConfigField("boolean", "send_firebase_analytics", "false")
+            buildConfigField("boolean", "auto_update", "false")
         }
     }
     compileOptions {
@@ -75,19 +73,42 @@ tasks.preBuild {
     dependsOn("runNdkBuild")
 }
 
+cargo {
+    module  = "../rust"
+    libname = "byedpi"
+    targets = listOf("arm", "arm64", "x86", "x86_64")
+    profile = "release"
+}
+
+tasks.preBuild {
+    dependsOn("cargoBuild")
+}
+
+tasks.register<Exec>("cargoClean") {
+    workingDir = file("../rust")
+    commandLine("cargo", "clean")
+    group = "build"
+}
+
+tasks.named("clean") {
+    dependsOn("cargoClean")
+}
+
 dependencies {
-    implementation("androidx.compose.material3:material3:1.3.1")
+    implementation(libs.compose.material3)
-    implementation("androidx.compose.material3:material3-window-size-class:1.3.1")
+    implementation(libs.compose.material3.window.size)
-    implementation("androidx.compose.material3:material3-adaptive-navigation-suite:1.4.0-alpha10")
+    implementation(libs.compose.material3.adaptive.nav)
-    implementation("androidx.navigation:navigation-compose:2.8.9")
+    implementation(libs.navigation.compose)
-    implementation("androidx.compose.material:material-icons-extended:1.7.8")
+    implementation(libs.compose.icons)
-    implementation ("com.github.topjohnwu.libsu:core:6.0.0")
+    implementation(libs.libsu.core)
-    implementation("com.squareup.okhttp3:okhttp:5.0.0-alpha.14")
+    implementation(libs.okhttp)
-    implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0")
+    implementation(libs.serialization.json)
-    implementation(platform("com.google.firebase:firebase-bom:33.12.0"))
+    implementation(platform(libs.firebase.bom))
-    implementation("com.google.firebase:firebase-analytics")
+    implementation(libs.firebase.analytics)
-    implementation("com.google.firebase:firebase-crashlytics")
+    implementation(libs.firebase.crashlytics)
-    implementation("androidx.fragment:fragment-compose:1.8.8")
+    implementation(libs.fragment.compose)
+    implementation(libs.coil.compose)
+    implementation(libs.compose.markdown)
     implementation(libs.androidx.core.ktx)
     implementation(libs.androidx.lifecycle.runtime.ktx)
     implementation(libs.androidx.activity.compose)

app/proguard-rules.pro

@@ -20,7 +20,7 @@
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
 
--keep class com.cherret.zaprett.TProxyService {
+-keep class com.cherret.zaprett.byedpi.TProxyService {
     native long[] TProxyGetStats();
     native void TProxyStartService(java.lang.String, int);
     native void TProxyStopService();

app/src/main/AndroidManifest.xml

@@ -13,7 +13,10 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE" />
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE_SPECIAL_USE" />
+    <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
+        tools:ignore="QueryAllPackagesPermission" />
     <application
+        android:requestLegacyExternalStorage="true"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -40,12 +43,16 @@
             android:theme="@style/Theme.Zaprett">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES"/>
+                <category android:name="android.intent.category.DEFAULT"/>
+            </intent-filter>
+
         </activity>
         <service
-            android:name=".QSTileService"
+            android:name=".utils.QSTileService"
             android:exported="true"
             android:label="@string/qs_name"
         android:icon="@drawable/ic_launcher_monochrome"
@@ -55,7 +62,7 @@
         </intent-filter>
     </service>
         <service
-            android:name=".ByeDpiVpnService"
+            android:name=".byedpi.ByeDpiVpnService"
             android:exported="true"
             android:permission="android.permission.BIND_VPN_SERVICE"
             android:foregroundServiceType="specialUse">

app/src/main/cpp/main.h

@@ -1,83 +0,0 @@
-#define VERSION "17.1"
-union sockaddr_u;
-
-int get_default_ttl(void);
-
-int get_addr(const char *str, union sockaddr_u *addr);
-
-void *add(void **root, int *n, size_t ss);
-
-void clear_params(void);
-
-char *ftob(const char *str, ssize_t *sl);
-
-char *data_from_str(const char *str, ssize_t *size);
-
-size_t parse_cform(char *buffer, size_t blen, const char *str, size_t slen);
-
-struct mphdr *parse_hosts(char *buffer, size_t size);
-
-struct mphdr *parse_ipset(char *buffer, size_t size);
-
-int parse_offset(struct part *part, const char *str);
-
-static const char help_text[] = {
-        "    -i, --ip, <ip>            Listening IP, default 0.0.0.0\n"
-        "    -p, --port <num>          Listening port, default 1080\n"
-        #ifdef DAEMON
-        "    -D, --daemon              Daemonize\n"
-    "    -w, --pidfile <filename>  Write PID to file\n"
-        #endif
-        #ifdef __linux__
-        "    -E, --transparent         Transparent proxy mode\n"
-        #endif
-        "    -c, --max-conn <count>    Connection count limit, default 512\n"
-        "    -N, --no-domain           Deny domain resolving\n"
-        "    -U, --no-udp              Deny UDP association\n"
-        "    -I  --conn-ip <ip>        Connection binded IP, default ::\n"
-        "    -b, --buf-size <size>     Buffer size, default 16384\n"
-        "    -x, --debug <level>       Print logs, 0, 1 or 2\n"
-        "    -g, --def-ttl <num>       TTL for all outgoing connections\n"
-        // desync options
-        #ifdef TCP_FASTOPEN_CONNECT
-        "    -F, --tfo                 Enable TCP Fast Open\n"
-        #endif
-        "    -A, --auto <t,r,s,n>      Try desync params after this option\n"
-        "                              Detect: torst,redirect,ssl_err,none\n"
-        "    -L, --auto-mode <0-3>     Mode: 1 - post_resp, 2 - sort, 3 - 1+2\n"
-        "    -u, --cache-ttl <sec>     Lifetime of cached desync params for IP\n"
-        "    -y, --cache-dump <file|-> Dump cache to file or stdout\n"
-        #ifdef TIMEOUT_SUPPORT
-        "    -T, --timeout <sec>       Timeout waiting for response, after which trigger auto\n"
-        #endif
-        "    -K, --proto <t,h,u,i>     Protocol whitelist: tls,http,udp,ipv4\n"
-        "    -H, --hosts <file|:str>   Hosts whitelist, filename or :string\n"
-        "    -j, --ipset <file|:str>   IP whitelist\n"
-        "    -V, --pf <port[-portr]>   Ports range whitelist\n"
-        "    -R, --round <num[-numr]>  Number of request to which desync will be applied\n"
-        "    -s, --split <pos_t>       Position format: offset[:repeats:skip][+flag1[flag2]]\n"
-        "                              Flags: +s - SNI offset, +h - HTTP host offset, +n - null\n"
-        "                              Additional flags: +e - end, +m - middle\n"
-        "    -d, --disorder <pos_t>    Split and send reverse order\n"
-        "    -o, --oob <pos_t>         Split and send as OOB data\n"
-        "    -q, --disoob <pos_t>      Split and send reverse order as OOB data\n"
-        #ifdef FAKE_SUPPORT
-        "    -f, --fake <pos_t>        Split and send fake packet\n"
-        #ifdef __linux__
-        "    -S, --md5sig              Add MD5 Signature option for fake packets\n"
-        #endif
-        "    -n, --fake-sni <str>      Change SNI in fake\n"
-        "                              Replaced: ? - rand let, # - rand num, * - rand let/num\n"
-        #endif
-        "    -t, --ttl <num>           TTL of fake packets, default 8\n"
-        "    -O, --fake-offset <pos_t> Fake data start offset\n"
-        "    -l, --fake-data <f|:str>  Set custom fake packet\n"
-        "    -Q, --fake-tls-mod <r,o>  Modify fake TLS CH: rand,orig\n"
-        "    -e, --oob-data <char>     Set custom OOB data\n"
-        "    -M, --mod-http <h,d,r>    Modify HTTP: hcsmix,dcsmix,rmspace\n"
-        "    -r, --tlsrec <pos_t>      Make TLS record at position\n"
-        "    -a, --udp-fake <count>    UDP fakes count, default 0\n"
-        #ifdef __linux__
-        "    -Y, --drop-sack           Drop packets with SACK extension\n"
-#endif
-};

app/src/main/cpp/native-lib.c

@@ -1,100 +0,0 @@
-#include <string.h>
-
-#include <jni.h>
-#include <android/log.h>
-#include <malloc.h>
-
-#include "byedpi/error.h"
-#include "byedpi/proxy.h"
-#include "utils.h"
-
-static int g_proxy_fd = -1;
-
-JNIEXPORT jint JNI_OnLoad(
-        __attribute__((unused)) JavaVM *vm,
-        __attribute__((unused)) void *reserved) {
-    default_params = params;
-    return JNI_VERSION_1_6;
-}
-
-JNIEXPORT jint JNICALL
-Java_com_cherret_zaprett_NativeBridge_jniCreateSocket(
-        JNIEnv *env,
-        __attribute__((unused)) jobject thiz,
-        jobjectArray args) {
-
-    if (g_proxy_fd != -1) {
-        LOG(LOG_S, "proxy already running, fd: %d", g_proxy_fd);
-        return -1;
-    }
-
-    int argc = (*env)->GetArrayLength(env, args);
-    char *argv[argc];
-    for (int i = 0; i < argc; i++) {
-        jstring arg = (jstring) (*env)->GetObjectArrayElement(env, args, i);
-        const char *arg_str = (*env)->GetStringUTFChars(env, arg, 0);
-        argv[i] = strdup(arg_str);
-        (*env)->ReleaseStringUTFChars(env, arg, arg_str);
-    }
-
-    int res = parse_args(argc, argv);
-
-    if (res < 0) {
-        uniperror("parse_args");
-        return -1;
-    }
-
-    int fd = listen_socket((union sockaddr_u *)&params.laddr);
-
-    for (int i = 0; i < argc; i++) {
-        free(argv[i]);
-    }
-
-    if (fd < 0) {
-        uniperror("listen_socket");
-        return -1;
-    }
-
-    g_proxy_fd = fd;
-    LOG(LOG_S, "listen_socket, fd: %d", fd);
-    return fd;
-}
-
-JNIEXPORT jint JNICALL
-Java_com_cherret_zaprett_NativeBridge_jniStartProxy(
-        __attribute__((unused)) JNIEnv *env,
-        __attribute__((unused)) jobject thiz) {
-
-    LOG(LOG_S, "start_proxy, fd: %d", g_proxy_fd);
-
-    if (start_event_loop(g_proxy_fd) < 0) {
-        uniperror("event_loop");
-        return get_e();
-    }
-
-    return 0;
-}
-
-JNIEXPORT jint JNICALL
-Java_com_cherret_zaprett_NativeBridge_jniStopProxy(
-        __attribute__((unused)) JNIEnv *env,
-        __attribute__((unused)) jobject thiz) {
-
-    LOG(LOG_S, "stop_proxy, fd: %d", g_proxy_fd);
-
-    if (g_proxy_fd < 0) {
-        LOG(LOG_S, "proxy is not running, fd: %d", g_proxy_fd);
-        return 0;
-    }
-
-    reset_params();
-    int res = shutdown(g_proxy_fd, SHUT_RDWR);
-    g_proxy_fd = -1;
-
-    if (res < 0) {
-        uniperror("shutdown");
-        return get_e();
-    }
-
-    return 0;
-}

app/src/main/cpp/utils.c

@@ -1,594 +0,0 @@
-#include <getopt.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "byedpi/params.h"
-#include "error.h"
-#include "main.h"
-#include "packets.h"
-#include "utils.h"
-
-struct params default_params;
-extern const struct option options[46];
-
-void reset_params(void) {
-    clear_params();
-    params = default_params;
-}
-
-static struct desync_params *add_group(struct desync_params *prev)
-{
-    struct desync_params *dp = calloc(1, sizeof(*prev));
-    if (!dp) {
-        return 0;
-    }
-    if (prev) {
-        dp->prev = prev;
-        prev->next = dp;
-    }
-    params.dp_n++;
-    return dp;
-}
-
-int parse_args(int argc, char **argv)
-{
-    int optc = sizeof(options)/sizeof(*options);
-    for (int i = 0, e = optc; i < e; i++)
-        optc += options[i].has_arg;
-
-    char opt[optc + 1];
-    opt[optc] = 0;
-
-    for (int i = 0, o = 0; o < optc; i++, o++) {
-        opt[o] = options[i].val;
-        for (int c = options[i].has_arg; c; c--) {
-            o++;
-            opt[o] = ':';
-        }
-    }
-    //
-    params.laddr.in.sin_port = htons(1080);
-    if (!ipv6_support()) {
-        params.baddr.sa.sa_family = AF_INET;
-    }
-
-    const char *pid_file = 0;
-    bool daemonize = 0;
-
-    int rez;
-    int invalid = 0;
-
-    long val = 0;
-    char *end = 0;
-    bool all_limited = 1;
-
-    int curr_optind = 1;
-
-    struct desync_params *dp = add_group(0);
-    if (!dp) {
-        reset_params();
-        return -1;
-    }
-    params.dp = dp;
-
-    while (!invalid && (rez = getopt_long(
-            argc, argv, opt, options, 0)) != -1) {
-        switch (rez) {
-
-            case 'N':
-                params.resolve = 0;
-                break;
-            case 'X':
-                params.ipv6 = 0;
-                break;
-            case 'U':
-                params.udp = 0;
-                break;
-            case 'G':
-                params.http_connect = 1;
-                break;
-#ifdef __linux__
-            case 'E':
-                params.transparent = 1;
-                break;
-#endif
-
-#ifdef DAEMON
-                case 'D':
-            daemonize = 1;
-            break;
-            
-        case 'w':
-            pid_file = optarg;
-            break;
-#endif
-            case 'h':
-                printf("%s", help_text);
-                reset_params();
-                return 0;
-            case 'v':
-                printf("%s\n", VERSION);
-                reset_params();
-                return 0;
-
-            case 'i':
-                if (get_addr(optarg, &params.laddr) < 0)
-                    invalid = 1;
-                break;
-
-            case 'p':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || val > 0xffff || *end)
-                    invalid = 1;
-                else
-                    params.laddr.in.sin_port = htons(val);
-                break;
-
-            case 'I':
-                if (get_addr(optarg, &params.baddr) < 0)
-                    invalid = 1;
-                break;
-
-            case 'b':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || val > INT_MAX/4 || *end)
-                    invalid = 1;
-                else
-                    params.bfsize = val;
-                break;
-
-            case 'c':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || val >= (0xffff/2) || *end)
-                    invalid = 1;
-                else
-                    params.max_open = val;
-                break;
-
-            case 'x': //
-                params.debug = strtol(optarg, 0, 0);
-                if (params.debug < 0)
-                    invalid = 1;
-                break;
-
-            case 'y': //
-                params.cache_file = optarg;
-                break;
-
-                // desync options
-
-            case 'F':
-                params.tfo = 1;
-                break;
-
-            case 'L':
-                end = optarg;
-                while (end && !invalid) {
-                    switch (*end) {
-                        case '0':
-                            break;
-                        case '1':
-                        case 'p':
-                            params.auto_level |= AUTO_POST;
-                            break;
-                        case '2':
-                        case 's':
-                            params.auto_level |= AUTO_SORT;
-                            break;
-                        case 'r':
-                            params.auto_level = 0;
-                            break;
-                        case '3':
-                            params.auto_level |= (AUTO_POST | AUTO_SORT);
-                            break;
-                        default:
-                            invalid = 1;
-                            continue;
-                    }
-                    end = strchr(end, ',');
-                    if (end) end++;
-                }
-                break;
-
-            case 'A':
-                if (optind < curr_optind) {
-                    optind = curr_optind;
-                    continue;
-                }
-                if (!(dp->hosts || dp->proto || dp->pf[0] || dp->detect || dp->ipset)) {
-                    all_limited = 0;
-                }
-                dp = add_group(dp);
-                if (!dp) {
-                    reset_params();
-                    return -1;
-                }
-                end = optarg;
-                while (end && !invalid) {
-                    switch (*end) {
-                        case 't':
-                            dp->detect |= DETECT_TORST;
-                            break;
-                        case 'r':
-                            dp->detect |= DETECT_HTTP_LOCAT;
-                            break;
-                        case 'a':
-                        case 's':
-                            dp->detect |= DETECT_TLS_ERR;
-                            break;
-                        case 'n':
-                            break;
-                        default:
-                            invalid = 1;
-                            continue;
-                    }
-                    end = strchr(end, ',');
-                    if (end) end++;
-                }
-                if (dp->detect) {
-                    params.auto_level |= AUTO_RECONN;
-                }
-                dp->_optind = optind;
-                break;
-
-            case 'B':
-                if (optind < curr_optind) {
-                    continue;
-                }
-                if (*optarg == 'i') {
-                    dp->pf[0] = htons(1);
-                    continue;
-                }
-                val = strtol(optarg, &end, 0);
-                struct desync_params *itdp = params.dp;
-
-                while (itdp && itdp->id != val - 1) {
-                    itdp = itdp->next;
-                }
-                if (!itdp)
-                    invalid = 1;
-                else {
-                    curr_optind = optind;
-                    optind = itdp->_optind;
-                }
-                break;
-
-            case 'u':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || *end)
-                    invalid = 1;
-                else
-                    params.cache_ttl = val;
-                break;
-
-            case 'T':;
-#ifdef __linux__
-                float f = strtof(optarg, &end);
-                val = (long)(f * 1000);
-#else
-                val = strtol(optarg, &end, 0);
-#endif
-                if (val <= 0 || (unsigned long)val > UINT_MAX || *end)
-                    invalid = 1;
-                else
-                    params.timeout = val;
-                break;
-
-            case 'K':
-                end = optarg;
-                while (end && !invalid) {
-                    switch (*end) {
-                        case 't':
-                            dp->proto |= IS_TCP | IS_HTTPS;
-                            break;
-                        case 'h':
-                            dp->proto |= IS_TCP | IS_HTTP;
-                            break;
-                        case 'u':
-                            dp->proto |= IS_UDP;
-                            break;
-                        case 'i':
-                            dp->proto |= IS_IPV4;
-                            break;
-                        default:
-                            invalid = 1;
-                            continue;
-                    }
-                    end = strchr(end, ',');
-                    if (end) end++;
-                }
-                break;
-
-            case 'H':;
-                if (dp->file_ptr) {
-                    continue;
-                }
-                dp->file_ptr = ftob(optarg, &dp->file_size);
-                if (!dp->file_ptr) {
-                    uniperror("read/parse");
-                    invalid = 1;
-                    continue;
-                }
-                dp->hosts = parse_hosts(dp->file_ptr, dp->file_size);
-                if (!dp->hosts) {
-                    uniperror("parse_hosts");
-                    reset_params();
-                    return -1;
-                }
-                break;
-
-            case 'j':;
-                if (dp->ipset) {
-                    continue;
-                }
-                ssize_t size;
-                char *data = ftob(optarg, &size);
-                if (!data) {
-                    uniperror("read/parse");
-                    invalid = 1;
-                    continue;
-                }
-                dp->ipset = parse_ipset(data, size);
-                if (!dp->ipset) {
-                    uniperror("parse_ipset");
-                    invalid = 1;
-                }
-                free(data);
-                break;
-
-            case 's':
-            case 'd':
-            case 'o':
-            case 'q':
-            case 'f':
-                ;
-                struct part *part = add((void *)&dp->parts,
-                                        &dp->parts_n, sizeof(struct part));
-                if (!part) {
-                    reset_params();
-                    return -1;
-                }
-                if (parse_offset(part, optarg)) {
-                    invalid = 1;
-                    break;
-                }
-                switch (rez) {
-                    case 's': part->m = DESYNC_SPLIT;
-                        break;
-                    case 'd': part->m = DESYNC_DISORDER;
-                        break;
-                    case 'o': part->m = DESYNC_OOB;
-                        break;
-                    case 'q': part->m = DESYNC_DISOOB;
-                        break;
-                    case 'f': part->m = DESYNC_FAKE;
-                }
-                break;
-
-            case 't':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || val > 255 || *end)
-                    invalid = 1;
-                else
-                    dp->ttl = val;
-                break;
-
-            case 'S':
-                dp->md5sig = 1;
-                break;
-
-            case 'O':
-                if (parse_offset(&dp->fake_offset, optarg)) {
-                    invalid = 1;
-                    break;
-                } else dp->fake_offset.m = 1;
-                break;
-
-            case 'Q':
-                end = optarg;
-                while (end && !invalid) {
-                    switch (*end) {
-                        case 'r':
-                            dp->fake_mod |= FM_RAND;
-                            break;
-                        case 'o':
-                            dp->fake_mod |= FM_ORIG;
-                            break;
-                        default:
-                            invalid = 1;
-                            continue;
-                    }
-                    end = strchr(end, ',');
-                    if (end) end++;
-                }
-                break;
-
-            case 'n':;
-                const char **p = add((void *)&dp->fake_sni_list,
-                                     &dp->fake_sni_count, sizeof(optarg));
-                if (!p) {
-                    invalid = 1;
-                    continue;
-                }
-                *p = optarg;
-                break;
-
-            case 'l':
-                if (dp->fake_data.data) {
-                    continue;
-                }
-                dp->fake_data.data = ftob(optarg, &dp->fake_data.size);
-                if (!dp->fake_data.data) {
-                    uniperror("read/parse");
-                    invalid = 1;
-                }
-                break;
-
-            case 'e':
-                val = parse_cform(dp->oob_char, 1, optarg, strlen(optarg));
-                if (val != 1) {
-                    invalid = 1;
-                }
-                else dp->oob_char[1] = 1;
-                break;
-
-            case 'M':
-                end = optarg;
-                while (end && !invalid) {
-                    switch (*end) {
-                        case 'r':
-                            dp->mod_http |= MH_SPACE;
-                            break;
-                        case 'h':
-                            dp->mod_http |= MH_HMIX;
-                            break;
-                        case 'd':
-                            dp->mod_http |= MH_DMIX;
-                            break;
-                        default:
-                            invalid = 1;
-                            continue;
-                    }
-                    end = strchr(end, ',');
-                    if (end) end++;
-                }
-                break;
-
-            case 'r':
-                part = add((void *)&dp->tlsrec,
-                           &dp->tlsrec_n, sizeof(struct part));
-                if (!part) {
-                    reset_params();
-                    return -1;
-                }
-                if (parse_offset(part, optarg)
-                    || part->pos > 0xffff) {
-                    invalid = 1;
-                    break;
-                }
-                break;
-
-            case 'a':
-                val = strtol(optarg, &end, 0);
-                if (val < 0 || val > INT_MAX || *end)
-                    invalid = 1;
-                else
-                    dp->udp_fake_count = val;
-                break;
-
-            case 'V':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || val > USHRT_MAX)
-                    invalid = 1;
-                else {
-                    dp->pf[0] = htons(val);
-                    if (*end == '-') {
-                        val = strtol(end + 1, &end, 0);
-                        if (val <= 0 || val > USHRT_MAX)
-                            invalid = 1;
-                    }
-                    if (*end)
-                        invalid = 1;
-                    else
-                        dp->pf[1] = htons(val);
-                }
-                break;
-
-            case 'R':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || val > INT_MAX)
-                    invalid = 1;
-                else {
-                    dp->rounds[0] = val;
-                    if (*end == '-') {
-                        val = strtol(end + 1, &end, 0);
-                        if (val <= 0 || val > INT_MAX)
-                            invalid = 1;
-                    }
-                    if (*end)
-                        invalid = 1;
-                    else
-                        dp->rounds[1] = val;
-                }
-                break;
-
-            case 'g':
-                val = strtol(optarg, &end, 0);
-                if (val <= 0 || val > 255 || *end)
-                    invalid = 1;
-                else {
-                    params.def_ttl = val;
-                    params.custom_ttl = 1;
-                }
-                break;
-
-            case 'Y':
-                dp->drop_sack = 1;
-                break;
-
-            case 'Z':
-                params.wait_send = 1;
-                break;
-
-            case 'W':
-                params.await_int = atoi(optarg);
-                break;
-
-            case 'C':
-                if (get_addr(optarg, &dp->custom_dst_addr) < 0)
-                    invalid = 1;
-                else
-                    dp->custom_dst = 1;
-                break;
-
-#ifdef __linux__
-            case 'P':
-                params.protect_path = optarg;
-                break;
-#endif
-            case 0:
-                break;
-
-            case '?':
-                reset_params();
-                return -1;
-
-            default:
-                printf("?: %c\n", rez);
-                reset_params();
-                return -1;
-        }
-    }
-    if (invalid) {
-        fprintf(stderr, "invalid value: -%c %s\n", rez, optarg);
-        reset_params();
-        return -1;
-    }
-    if (all_limited) {
-        dp = add_group(dp);
-        if (!dp) {
-            reset_params();
-            return -1;
-        }
-    }
-    if ((size_t )params.dp_n > sizeof(dp->bit) * 8) {
-        LOG(LOG_E, "too many groups!\n");
-    }
-    if (params.baddr.sa.sa_family != AF_INET6) {
-        params.ipv6 = 0;
-    }
-    if (!params.def_ttl) {
-        if ((params.def_ttl = get_default_ttl()) < 1) {
-            reset_params();
-            return -1;
-        }
-    }
-    params.mempool = mem_pool(MF_EXTRA, CMP_BYTES);
-    if (!params.mempool) {
-        uniperror("mem_pool");
-        reset_params();
-        return -1;
-    }
-    srand((unsigned int)time(0));
-    return 0;
-}

app/src/main/cpp/utils.h

@@ -1,5 +0,0 @@
-extern struct params default_params;
-
-void reset_params(void);
-int parse_args(int argc, char **argv);
-bool ipv6_support(void);

app/src/main/java/com/cherret/zaprett/ByeDpiVpnService.kt

@@ -1,194 +0,0 @@
-package com.cherret.zaprett
-
-import android.annotation.SuppressLint
-import android.app.Notification
-import android.app.NotificationChannel
-import android.app.NotificationManager
-import android.app.PendingIntent
-import android.content.Context
-import android.content.Intent
-import android.content.SharedPreferences
-import android.net.VpnService
-import android.os.ParcelFileDescriptor
-import android.util.Log
-import android.widget.Toast
-import androidx.core.app.NotificationCompat
-import kotlinx.coroutines.CoroutineScope
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
-
-class ByeDpiVpnService : VpnService() {
-    private var vpnInterface: ParcelFileDescriptor? = null
-    private lateinit var sharedPreferences: SharedPreferences
-    companion object {
-        private const val CHANNEL_ID = "zaprett_vpn_channel"
-        private const val NOTIFICATION_ID = 1
-        var status: ServiceStatus = ServiceStatus.Disconnected
-    }
-
-    @SuppressLint("ForegroundServiceType")
-    override fun onCreate() {
-        super.onCreate()
-        sharedPreferences = getSharedPreferences("settings", Context.MODE_PRIVATE)
-        createNotificationChannel()
-    }
-
-    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
-        super.onStartCommand(intent, flags, startId)
-        return when (intent?.action) {
-            "START_VPN" -> {
-                setupProxy()
-                START_STICKY
-            }
-            "STOP_VPN" -> {
-                stopProxy()
-                stopSelf()
-                START_NOT_STICKY
-            }
-            else -> {
-                START_NOT_STICKY
-            }
-        }
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        vpnInterface?.close()
-    }
-
-    private fun createNotificationChannel() {
-        val channel = NotificationChannel(
-            CHANNEL_ID,
-            getString(R.string.notification_zaprett_proxy),
-            NotificationManager.IMPORTANCE_LOW
-        ).apply {
-            description = getString(R.string.notification_zaprett_description)
-        }
-        val manager = getSystemService(NotificationManager::class.java)
-        manager?.createNotificationChannel(channel)
-    }
-
-    private fun createNotification(): Notification {
-        val notificationIntent = Intent(this, MainActivity::class.java)
-        val pendingIntent = PendingIntent.getActivity(
-            this,
-            0,
-            notificationIntent,
-            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
-        )
-        return NotificationCompat.Builder(this, CHANNEL_ID)
-            .setContentTitle(getString(R.string.notification_zaprett_proxy))
-            .setContentText(getString(R.string.notification_zaprett_description))
-            .setSmallIcon(R.drawable.ic_launcher_monochrome)
-            .setContentIntent(pendingIntent)
-            .addAction(0, getString(R.string.btn_stop_service),
-                PendingIntent.getService(
-                    this,
-                    0,
-                    Intent(this, ByeDpiVpnService::class.java).setAction("STOP_VPN"),
-                    PendingIntent.FLAG_IMMUTABLE,
-                )
-            )
-            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
-            .setOngoing(true)
-            .build()
-    }
-
-    private fun setupProxy() {
-        if (getActiveStrategy(sharedPreferences).isNotEmpty()) {
-            startForeground(NOTIFICATION_ID, createNotification())
-            try {
-                startSocksProxy()
-                startByeDpi()
-                status = ServiceStatus.Connected
-            } catch (e: Exception) {
-                Log.e("proxy", "Failed to start")
-                status = ServiceStatus.Failed
-            }
-        }
-        else {
-            Toast.makeText(
-                this@ByeDpiVpnService,
-                getString(R.string.toast_no_strategy_selected),
-                Toast.LENGTH_SHORT
-            ).show()
-        }
-    }
-
-    private fun startSocksProxy() {
-        val dns = sharedPreferences.getString("dns", "8.8.8.8")?: "8.8.8.8"
-        val ipv6 = sharedPreferences.getBoolean("ipv6", false)
-        val socksIp = sharedPreferences.getString("ip", "127.0.0.1")?: "127.0.0.1"
-        val socksPort = sharedPreferences.getString("port", "1080")?: "1080"
-        val builder = Builder()
-        builder.setSession(getString(R.string.notification_zaprett_proxy))
-            .setMtu(1500)
-            .addAddress("10.10.10.10", 32)
-            .addDnsServer(dns)
-            .addRoute("0.0.0.0", 0)
-            .setMetered(false)
-            .addDisallowedApplication(applicationContext.packageName)
-        if (ipv6) {
-            builder.addAddress("fd00::1", 128)
-                .addRoute("::", 0)
-        }
-        vpnInterface = builder.establish()
-        val tun2socksConfig = """
-        | misc:
-        |   task-stack-size: 81920
-        | socks5:
-        |   mtu: 8500
-        |   address: $socksIp
-        |   port: $socksPort
-        |   udp: udp
-        """.trimMargin("| ")
-        val configPath = File.createTempFile("config", "tmp", cacheDir).apply {
-            writeText(tun2socksConfig)
-            deleteOnExit()
-        }
-        vpnInterface?.fd?.let { fd ->
-            TProxyService.TProxyStartService(configPath.absolutePath, fd)
-        }
-    }
-
-    private fun stopProxy() {
-        try {
-            vpnInterface?.close()
-            NativeBridge().stopProxy()
-            TProxyService.TProxyStopService()
-            status = ServiceStatus.Disconnected
-        } catch (e: Exception) {
-            Log.e("proxy", "error stop proxy")
-        }
-    }
-
-    private fun startByeDpi() {
-        val socksIp = sharedPreferences.getString("ip", "127.0.0.1")?: "127.0.0.1"
-        val socksPort = sharedPreferences.getString("port", "1080")?: "1080"
-        val listSet = sharedPreferences.getStringSet("lists", emptySet())?: emptySet()
-        CoroutineScope(Dispatchers.IO).launch {
-            val args = parseArgs(socksIp, socksPort, getActiveStrategy(sharedPreferences), listSet)
-            val result = NativeBridge().startProxy(args)
-            if (result < 0) {
-                println("Failed to start byedpi proxy")
-            } else {
-                println("Byedpi proxy started successfully")
-            }
-        }
-    }
-
-    fun parseArgs(ip: String, port: String, rawArgs: List<String>, listSet: Set<String>): Array<String> {
-        val regex = Regex("""--?\S+(?:=(?:[^"'\s]+|"[^"]*"|'[^']*'))?|[^\s]+""")
-        val parsedArgs = rawArgs
-            .flatMap { args -> regex.findAll(args).map { it.value } }
-            .toMutableList()
-        if (listSet.isNotEmpty()) {
-            for (path in listSet) {
-                parsedArgs.add("--hosts")
-                parsedArgs.add(path)
-            }
-        }
-        return arrayOf("ciadpi", "--ip", ip, "--port", port) + parsedArgs
-    }
-}

app/src/main/java/com/cherret/zaprett/MainActivity.kt

@@ -1,7 +1,7 @@
 package com.cherret.zaprett
 
-
 import android.Manifest
+import android.content.Context
 import android.content.Intent
 import android.content.pm.PackageManager
 import android.net.Uri
@@ -18,10 +18,11 @@ import androidx.activity.viewModels
 import androidx.annotation.StringRes
 import androidx.compose.foundation.layout.padding
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.filled.Dashboard
-import androidx.compose.material.icons.filled.Dns
 import androidx.compose.material.icons.filled.Home
+import androidx.compose.material.icons.filled.Lan
+import androidx.compose.material.icons.filled.MultipleStop
 import androidx.compose.material.icons.filled.Settings
+import androidx.compose.material.icons.filled.SettingsInputComposite
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.Icon
 import androidx.compose.material3.NavigationBar
@@ -30,13 +31,13 @@ import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
-import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
@@ -46,27 +47,34 @@ import androidx.navigation.compose.composable
 import androidx.navigation.compose.currentBackStackEntryAsState
 import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navArgument
+import com.cherret.zaprett.ui.screen.DebugScreen
 import com.cherret.zaprett.ui.screen.HomeScreen
-import com.cherret.zaprett.ui.screen.RepoScreen
 import com.cherret.zaprett.ui.screen.HostsScreen
+import com.cherret.zaprett.ui.screen.IpsetsScreen
+import com.cherret.zaprett.ui.screen.RepoScreen
 import com.cherret.zaprett.ui.screen.SettingsScreen
 import com.cherret.zaprett.ui.screen.StrategyScreen
+import com.cherret.zaprett.ui.screen.StrategySelectionScreen
 import com.cherret.zaprett.ui.theme.ZaprettTheme
 import com.cherret.zaprett.ui.viewmodel.HomeViewModel
 import com.cherret.zaprett.ui.viewmodel.HostRepoViewModel
+import com.cherret.zaprett.ui.viewmodel.IpsetRepoViewModel
 import com.cherret.zaprett.ui.viewmodel.StrategyRepoViewModel
+import com.cherret.zaprett.utils.checkModuleInstallation
+import com.cherret.zaprett.utils.checkStoragePermission
 import com.google.firebase.Firebase
 import com.google.firebase.analytics.FirebaseAnalytics
 import com.google.firebase.analytics.analytics
 
 sealed class Screen(val route: String, @StringRes val nameResId: Int, val icon: ImageVector) {
     object home : Screen("home", R.string.title_home, Icons.Default.Home)
-    object hosts : Screen("hosts", R.string.title_hosts, Icons.Default.Dashboard)
+    object hosts : Screen("hosts", R.string.title_hosts, Icons.Default.Lan)
-    object strategies : Screen("strategies", R.string.title_strategies, Icons.Default.Dns)
+    object strategies : Screen("strategies", R.string.title_strategies, Icons.Default.MultipleStop)
+    object ipsets : Screen("ipsets", R.string.title_ipset, Icons.Default.SettingsInputComposite)
     object settings : Screen("settings", R.string.title_settings, Icons.Default.Settings)
 }
-val topLevelRoutes = listOf(Screen.home, Screen.hosts, Screen.strategies, Screen.settings)
+val topLevelRoutes = listOf(Screen.home, Screen.hosts, Screen.strategies, Screen.ipsets, Screen.settings)
-val hideNavBar = listOf("repo?source={source}")
+val hideNavBar = listOf("repo?source={source}", "debugScreen", "selectionScreen")
 class MainActivity : ComponentActivity() {
     private val viewModel: HomeViewModel by viewModels()
     private lateinit var notificationPermissionLauncher: ActivityResultLauncher<String>
@@ -86,7 +94,25 @@ class MainActivity : ComponentActivity() {
         setContent {
             ZaprettTheme {
                 val sharedPreferences = remember { getSharedPreferences("settings", MODE_PRIVATE) }
-                var showStoragePermissionDialog by remember { mutableStateOf(!Environment.isExternalStorageManager()) }
+                LaunchedEffect(Unit) {
+                    if (sharedPreferences.getBoolean("use_module", false)) {
+                        checkModuleInstallation { result ->
+                            if (getSharedPreferences(
+                                    "settings",
+                                    Context.MODE_PRIVATE
+                                ).getBoolean("use_module", false) && !result
+                            ) sharedPreferences.edit {
+                                putBoolean(
+                                    "use_module",
+                                    false
+                                )
+                            }
+                        }
+                    }
+                }
+                var showStoragePermissionDialog by remember {
+                    mutableStateOf(!checkStoragePermission(this))
+                }
                 var showNotificationPermissionDialog by remember {
                     mutableStateOf(
                         Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU &&
@@ -94,17 +120,27 @@ class MainActivity : ComponentActivity() {
                     )
                 }
                 var showWelcomeDialog by remember { mutableStateOf(sharedPreferences.getBoolean("welcome_dialog", true)) }
-                firebaseAnalytics.setAnalyticsCollectionEnabled(sharedPreferences.getBoolean("send_firebase_analytics", true))
+                firebaseAnalytics.setAnalyticsCollectionEnabled(sharedPreferences.getBoolean("send_firebase_analytics", BuildConfig.send_firebase_analytics))
                 BottomBar()
                 if (showStoragePermissionDialog) {
                     PermissionDialog(
                         title = stringResource(R.string.error_no_storage_title),
                         message = stringResource(R.string.error_no_storage_message),
                         onConfirm = {
-                            val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
+                            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-                            val uri = Uri.fromParts("package", packageName, null)
+                                val intent = Intent(Settings.ACTION_MANAGE_APP_ALL_FILES_ACCESS_PERMISSION)
-                            intent.data = uri
+                                val uri = Uri.fromParts("package", packageName, null)
-                            startActivity(intent)
+                                intent.data = uri
+                                startActivity(intent)
+                            } else {
+                                requestPermissions(
+                                    arrayOf(
+                                        Manifest.permission.READ_EXTERNAL_STORAGE,
+                                        Manifest.permission.WRITE_EXTERNAL_STORAGE
+                                    ),
+                                    100
+                                )
+                            }
                             showStoragePermissionDialog = false
                         },
                         onDismiss = { showStoragePermissionDialog = false }
@@ -133,6 +169,7 @@ class MainActivity : ComponentActivity() {
         }
     }
 
+
     @Composable
     fun BottomBar() {
         val navController = rememberNavController()
@@ -150,7 +187,7 @@ class MainActivity : ComponentActivity() {
                                         contentDescription = stringResource(id = topLevelRoute.nameResId)
                                     )
                                 },
-                                label = { Text(text = stringResource(id = topLevelRoute.nameResId)) },
+                                label = { Text(text = stringResource(id = topLevelRoute.nameResId)) }, alwaysShowLabel = false,
                                 selected = currentDestination?.route == topLevelRoute.route,
                                 onClick = {
                                     navController.navigate(topLevelRoute.route) {
@@ -172,10 +209,11 @@ class MainActivity : ComponentActivity() {
                 startDestination = Screen.home.route,
                 Modifier.padding(innerPadding)
             ) {
-                composable(Screen.home.route) { HomeScreen(viewModel = viewModel, vpnPermissionLauncher) }
+                composable(Screen.home.route) { HomeScreen(viewModel = viewModel,vpnPermissionLauncher) }
                 composable(Screen.hosts.route) { HostsScreen(navController) }
                 composable(Screen.strategies.route) { StrategyScreen(navController) }
-                composable(Screen.settings.route) { SettingsScreen() }
+                composable(Screen.ipsets.route) { IpsetsScreen(navController) }
+                composable(Screen.settings.route) { SettingsScreen(navController) }
                 composable(route = "repo?source={source}",arguments = listOf(navArgument("source") {})) { backStackEntry ->
                     val source = backStackEntry.arguments?.getString("source")
                     when (source) {
@@ -183,12 +221,18 @@ class MainActivity : ComponentActivity() {
                             val viewModel: HostRepoViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
                             RepoScreen(navController, viewModel)
                         }
+                        "ipsets" -> {
+                            val viewModel: IpsetRepoViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
+                            RepoScreen(navController, viewModel)
+                        }
                         "strategies" -> {
                             val viewModel: StrategyRepoViewModel = androidx.lifecycle.viewmodel.compose.viewModel()
                             RepoScreen(navController, viewModel)
                         }
                     }
                 }
+                composable("debugScreen") { DebugScreen(navController) }
+                composable("selectionScreen") { StrategySelectionScreen(navController, vpnPermissionLauncher) }
             }
         }
     }
@@ -220,5 +264,4 @@ class MainActivity : ComponentActivity() {
             }
         )
     }
-
 }

app/src/main/java/com/cherret/zaprett/Module.kt

@@ -1,331 +0,0 @@
-package com.cherret.zaprett
-
-import android.content.SharedPreferences
-import android.os.Environment
-import android.util.Log
-import com.topjohnwu.superuser.Shell
-import java.io.File
-import java.io.FileInputStream
-import java.io.FileOutputStream
-import java.io.IOException
-import java.util.Properties
-import androidx.core.content.edit
-
-fun checkRoot(callback: (Boolean) -> Unit) {
-    Shell.cmd("ls /").submit { result ->
-        callback(result.isSuccess)
-    }
-}
-
-fun checkModuleInstallation(callback: (Boolean) -> Unit) {
-    Shell.cmd("zaprett").submit { result ->
-        callback(result.out.toString().contains("zaprett"))
-    }
-}
-
-fun getStatus(callback: (Boolean) -> Unit) {
-    Shell.cmd("zaprett status").submit { result ->
-        callback(result.out.toString().contains("working"))
-    }
-}
-
-fun startService(callback: (Boolean) -> Unit) {
-    Shell.cmd("zaprett start").submit { result ->
-        callback(result.isSuccess)
-    }
-}
-
-fun stopService(callback: (Boolean) -> Unit) {
-    Shell.cmd("zaprett stop").submit { result ->
-        callback(result.isSuccess)
-    }
-}
-
-fun restartService(callback: (Boolean) -> Unit) {
-    Shell.cmd("zaprett restart").submit { result ->
-        callback(result.isSuccess)
-    }
-}
-
-fun getModuleVersion(callback: (String) -> Unit) {
-    Shell.cmd("zaprett module-ver").submit { result ->
-        if (result.out.isNotEmpty()) callback(result.out.first()) else "undefined"
-    }
-}
-
-fun getBinVersion(callback: (String) -> Unit) {
-    Shell.cmd("zaprett bin-ver").submit { result ->
-        if (result.out.isNotEmpty()) callback(result.out.first()) else "undefined"
-    }
-}
-
-fun getConfigFile(): File {
-    return File(Environment.getExternalStorageDirectory(), "zaprett/config")
-}
-
-fun setStartOnBoot(startOnBoot: Boolean) {
-    val configFile = getConfigFile()
-    if (configFile.exists()) {
-        val props = Properties()
-        try {
-            FileInputStream(configFile).use { input ->
-                props.load(input)
-            }
-            props.setProperty("autorestart", startOnBoot.toString())
-            FileOutputStream(configFile).use { output ->
-                props.store(output, "Don't place '/' in end of directory! Example: /sdcard")
-            }
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-}
-
-fun getStartOnBoot(): Boolean {
-    val configFile = getConfigFile()
-    val props = Properties()
-    return try {
-        if (configFile.exists()) {
-            FileInputStream(configFile).use { input ->
-                props.load(input)
-            }
-            props.getProperty("autorestart", "false").toBoolean()
-        } else {
-            false
-        }
-    } catch (_: IOException) {
-        false
-    }
-}
-
-fun getZaprettPath(): String {
-    val props = Properties()
-    val configFile = getConfigFile()
-    if (configFile.exists()) {
-        return try {
-            FileInputStream(configFile).use { input ->
-                props.load(input)
-            }
-            props.getProperty("zaprettdir", Environment.getExternalStorageDirectory().path + "/zaprett")
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-    return Environment.getExternalStorageDirectory().path + "/zaprett"
-}
-
-fun getAllLists(): Array<String> {
-    val listsDir = File("${getZaprettPath()}/lists/")
-    if (listsDir.exists() && listsDir.isDirectory) {
-        val onlyNames = listsDir.list() ?: return emptyArray()
-        return onlyNames.map { "$listsDir/$it" }.toTypedArray()
-    }
-    return emptyArray()
-}
-
-fun getAllNfqwsStrategies(): Array<String> {
-    val listsDir = File("${getZaprettPath()}/strategies/nfqws")
-    if (listsDir.exists() && listsDir.isDirectory) {
-        val onlyNames = listsDir.list() ?: return emptyArray()
-        return onlyNames.map { "$listsDir/$it" }.toTypedArray()
-    }
-    return emptyArray()
-}
-
-fun getAllByeDPIStrategies(): Array<String> {
-    val listsDir = File("${getZaprettPath()}/strategies/byedpi")
-    if (listsDir.exists() && listsDir.isDirectory) {
-        val onlyNames = listsDir.list() ?: return emptyArray()
-        return onlyNames.map { "$listsDir/$it" }.toTypedArray()
-    }
-    return emptyArray()
-}
-
-fun getActiveLists(sharedPreferences: SharedPreferences): Array<String> {
-    if (sharedPreferences.getBoolean("use_module", false)) {
-        val configFile = File("${getZaprettPath()}/config")
-        if (configFile.exists()) {
-            val props = Properties()
-            return try {
-                FileInputStream(configFile).use { input ->
-                    props.load(input)
-                }
-                val activeLists = props.getProperty("activelists", "")
-                Log.d("Active lists", activeLists)
-                if (activeLists.isNotEmpty()) activeLists.split(",")
-                    .toTypedArray() else emptyArray()
-            } catch (e: IOException) {
-                throw RuntimeException(e)
-            }
-        }
-        return emptyArray()
-    }
-    else {
-        return sharedPreferences.getStringSet("lists", emptySet())?.toTypedArray() ?: emptyArray()
-    }
-}
-
-fun getActiveNfqwsStrategies(): Array<String> {
-    val configFile = File("${getZaprettPath()}/config")
-    if (configFile.exists()) {
-        val props = Properties()
-        return try {
-            FileInputStream(configFile).use { input ->
-                props.load(input)
-            }
-            val activeStrategies = props.getProperty("strategy", "")
-            Log.d("Active strategies", activeStrategies)
-            if (activeStrategies.isNotEmpty()) activeStrategies.split(",").toTypedArray() else emptyArray()
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-    return emptyArray()
-}
-
-fun getActiveByeDPIStrategies(sharedPreferences: SharedPreferences): Array<String> {
-    val path = sharedPreferences.getString("active_strategy", "")
-    if (!path.isNullOrBlank() && File(path).exists()) {
-        return arrayOf(path)
-    }
-    return emptyArray()
-}
-
-fun getActiveStrategy(sharedPreferences: SharedPreferences): List<String> {
-    val path = sharedPreferences.getString("active_strategy", "")
-    if (!path.isNullOrBlank() && File(path).exists()) {
-        return File(path).readLines()
-    }
-    return emptyList()
-}
-
-fun enableList(path: String, sharedPreferences: SharedPreferences) {
-    if (sharedPreferences.getBoolean("use-module", false)) {
-        val props = Properties()
-        val configFile = getConfigFile()
-        try {
-            if (configFile.exists()) {
-                FileInputStream(configFile).use { input ->
-                    props.load(input)
-                }
-            }
-            val activeLists = props.getProperty("activelists", "")
-                .split(",")
-                .filter { it.isNotBlank() }
-                .toMutableList()
-            if (path !in activeLists) {
-                activeLists.add(path)
-            }
-            props.setProperty("activelists", activeLists.joinToString(","))
-            FileOutputStream(configFile).use { output ->
-                props.store(output, "Don't place '/' in end of directory! Example: /sdcard")
-            }
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-    else {
-        val currentSet = sharedPreferences.getStringSet("lists", emptySet())?.toMutableSet() ?: mutableSetOf()
-        if (path !in currentSet) {
-            currentSet.add(path)
-            sharedPreferences.edit { putStringSet("lists", currentSet) }
-        }
-    }
-}
-
-fun enableStrategy(path: String, sharedPreferences: SharedPreferences) {
-    if (sharedPreferences.getBoolean("use_module", false)) {
-        val props = Properties()
-        val configFile = getConfigFile()
-        try {
-            if (configFile.exists()) {
-                FileInputStream(configFile).use { input ->
-                    props.load(input)
-                }
-            }
-            val activeStrategies = props.getProperty("strategy", "")
-                .split(",")
-                .filter { it.isNotBlank() }
-                .toMutableList()
-            if (path !in activeStrategies) {
-                activeStrategies.add(path)
-            }
-            props.setProperty("strategy", activeStrategies.joinToString(","))
-            FileOutputStream(configFile).use { output ->
-                props.store(output, "Don't place '/' in end of directory! Example: /sdcard")
-            }
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-    else {
-        sharedPreferences.edit { putString("active_strategy", path) }
-    }
-}
-
-fun disableList(path: String, sharedPreferences: SharedPreferences) {
-    if (sharedPreferences.getBoolean("use-module", false)) {
-        val props = Properties()
-        val configFile = getConfigFile()
-        try {
-            if (configFile.exists()) {
-                FileInputStream(configFile).use { input ->
-                    props.load(input)
-                }
-            }
-            val activeLists = props.getProperty("activelists", "")
-                .split(",")
-                .filter { it.isNotBlank() }
-                .toMutableList()
-            if (path in activeLists) {
-                activeLists.remove(path)
-            }
-            props.setProperty("activelists", activeLists.joinToString(","))
-            FileOutputStream(configFile).use { output ->
-                props.store(output, "Don't place '/' in end of directory! Example: /sdcard")
-            }
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-    else {
-        val currentSet = sharedPreferences.getStringSet("lists", emptySet())?.toMutableSet() ?: mutableSetOf()
-        if (path in currentSet) {
-            currentSet.remove(path)
-            sharedPreferences.edit { putStringSet("lists", currentSet) }
-        }
-        if (currentSet.isEmpty()) {
-            sharedPreferences.edit { remove("lists") }
-        }
-    }
-}
-
-fun disableStrategy(path: String, sharedPreferences: SharedPreferences) {
-    if (sharedPreferences.getBoolean("use_module", false)) {
-        val props = Properties()
-        val configFile = getConfigFile()
-        try {
-            if (configFile.exists()) {
-                FileInputStream(configFile).use { input ->
-                    props.load(input)
-                }
-            }
-            val activeStrategies = props.getProperty("strategy", "")
-                .split(",")
-                .filter { it.isNotBlank() }
-                .toMutableList()
-            if (path in activeStrategies) {
-                activeStrategies.remove(path)
-            }
-            props.setProperty("strategy", activeStrategies.joinToString(","))
-            FileOutputStream(configFile).use { output ->
-                props.store(output, "Don't place '/' in end of directory! Example: /sdcard")
-            }
-        } catch (e: IOException) {
-            throw RuntimeException(e)
-        }
-    }
-    else {
-        sharedPreferences.edit { remove("active_strategy") }
-    }
-}

app/src/main/java/com/cherret/zaprett/NativeBridge.kt

@@ -1,21 +0,0 @@
-package com.cherret.zaprett
-
-class NativeBridge {
-    companion object {
-        init {
-            System.loadLibrary("byedpi")
-        }
-    }
-    fun startProxy(args: Array<String>): Int {
-        jniCreateSocket(args)
-        return jniStartProxy()
-    }
-
-    fun stopProxy(): Int {
-        return jniStopProxy()
-    }
-
-    private external fun jniCreateSocket(args: Array<String>): Int
-    private external fun jniStartProxy(): Int
-    private external fun jniStopProxy(): Int
-}

app/src/main/java/com/cherret/zaprett/QSTileService.kt

@@ -1,57 +0,0 @@
-package com.cherret.zaprett
-
-import android.service.quicksettings.Tile
-import android.service.quicksettings.TileService
-
-class QSTileService: TileService() {
-    override fun onTileAdded() {
-        super.onTileAdded()
-        updateStatus()
-    }
-
-    override fun onStartListening() {
-        super.onStartListening()
-        updateStatus()
-    }
-
-    override fun onClick() {
-        super.onClick()
-        if (qsTile.state == Tile.STATE_INACTIVE) {
-            qsTile.subtitle = getString(R.string.qs_starting)
-            qsTile.state = Tile.STATE_UNAVAILABLE
-            qsTile.updateTile()
-            startService {}
-        }
-        else {
-            qsTile.subtitle = getString(R.string.qs_stopping)
-            qsTile.state = Tile.STATE_UNAVAILABLE
-            qsTile.updateTile()
-            stopService {}
-        }
-        updateStatus()
-    }
-
-    private fun updateStatus() {
-        if (getSharedPreferences("settings", MODE_PRIVATE).getBoolean("use_module", false)) {
-            getStatus {
-                if (it) {
-                    qsTile.label = getString(R.string.qs_name)
-                    qsTile.subtitle = getString(R.string.qs_working)
-                    qsTile.state = Tile.STATE_ACTIVE
-                    qsTile.updateTile()
-                } else {
-                    qsTile.label = getString(R.string.qs_name)
-                    qsTile.subtitle = getString(R.string.qs_not_working)
-                    qsTile.state = Tile.STATE_INACTIVE
-                    qsTile.updateTile()
-                }
-            }
-        }
-        else {
-            qsTile.label = getString(R.string.qs_name)
-            qsTile.subtitle = getString(R.string.qs_not_available)
-            qsTile.state = Tile.STATE_UNAVAILABLE
-            qsTile.updateTile()
-        }
-    }
-}

app/src/main/java/com/cherret/zaprett/RepositoryDownloader.kt

@@ -1,119 +0,0 @@
-package com.cherret.zaprett
-
-import android.annotation.SuppressLint
-import android.app.DownloadManager
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
-import android.content.SharedPreferences
-import android.net.Uri
-import android.os.Build
-import androidx.core.content.ContextCompat
-import androidx.core.net.toUri
-import kotlinx.serialization.Serializable
-import kotlinx.serialization.json.Json
-import okhttp3.Call
-import okhttp3.Callback
-import okhttp3.OkHttpClient
-import okhttp3.Request
-import okhttp3.Response
-import okio.IOException
-import java.io.File
-import java.security.MessageDigest
-
-private val client = OkHttpClient()
-private val json = Json { ignoreUnknownKeys = true }
-
-fun getHostList(sharedPreferences: SharedPreferences, callback: (List<RepoItemInfo>?) -> Unit) {
-    val request = Request.Builder().url(sharedPreferences.getString("hosts_repo_url","https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/hosts.json")?: "https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/hosts.json").build()
-    client.newCall(request).enqueue(object : Callback {
-        override fun onFailure(call: Call, e: IOException) {
-            e.printStackTrace()
-            callback(null)
-        }
-        override fun onResponse(call: Call, response: Response) {
-            response.use {
-                if (!response.isSuccessful) {
-                    callback(null)
-                }
-                val jsonString = response.body.string()
-                val hostsInfo = json.decodeFromString<List<RepoItemInfo>>(jsonString)
-                callback(hostsInfo)
-            }
-        }
-    })
-}
-
-fun getStrategiesList(sharedPreferences: SharedPreferences, callback: (List<RepoItemInfo>?) -> Unit) {
-    val request = Request.Builder().url(sharedPreferences.getString("strategies_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/strategies.json")?: "https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/strategies.json").build()
-    client.newCall(request).enqueue(object : Callback {
-        override fun onFailure(call: Call, e: IOException) {
-            e.printStackTrace()
-            callback(null)
-        }
-        override fun onResponse(call: Call, response: Response) {
-            response.use {
-                if (!response.isSuccessful) {
-                    callback(null)
-                }
-                val jsonString = response.body.string()
-                val strategiesInfo = json.decodeFromString<List<RepoItemInfo>>(jsonString)
-                callback(strategiesInfo)
-            }
-        }
-    })
-}
-
-fun registerDownloadListenerHost(context: Context, downloadId: Long, onDownloaded: (Uri) -> Unit) {// AI Generated
-    val receiver = object : BroadcastReceiver() {
-        @SuppressLint("Range")
-        override fun onReceive(context: Context?, intent: Intent?) {
-            if (intent?.action != DownloadManager.ACTION_DOWNLOAD_COMPLETE) return
-            if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadId) return
-            val dm = context?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager ?: return
-            val query = DownloadManager.Query().setFilterById(downloadId)
-            dm.query(query)?.use { cursor ->
-                if (cursor.moveToFirst()) {
-                    val status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS))
-                    if (status == DownloadManager.STATUS_SUCCESSFUL) {
-                        val uriString = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI))
-                        if (uriString != null) {
-                            val uri = uriString.toUri()
-                            context.unregisterReceiver(this)
-                            onDownloaded(uri)
-                        }
-                    }
-                }
-            }
-        }
-    }
-    val intentFilter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        context.registerReceiver(receiver, intentFilter, Context.RECEIVER_EXPORTED)
-    } else {
-        ContextCompat.registerReceiver(context, receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), ContextCompat.RECEIVER_EXPORTED)
-    }
-}
-
-fun getFileSha256(file: File): String {
-    val digest = MessageDigest.getInstance("SHA-256")
-    file.inputStream().use { input ->
-        val buffer = ByteArray(1024)
-        var bytesRead: Int
-        while (input.read(buffer).also { bytesRead = it } != -1) {
-            digest.update(buffer, 0, bytesRead)
-        }
-    }
-    return digest.digest().joinToString("") { "%02x".format(it) }
-}
-
-@Serializable
-data class RepoItemInfo(
-    val name: String,
-    val author: String,
-    val description: String,
-    val type: String? = null,
-    val hash: String,
-    val url: String
-)

app/src/main/java/com/cherret/zaprett/byedpi/ByeDpiVpnService.kt

@@ -0,0 +1,287 @@
+package com.cherret.zaprett.byedpi
+
+import android.annotation.SuppressLint
+import android.app.Notification
+import android.app.NotificationChannel
+import android.app.NotificationManager
+import android.app.PendingIntent
+import android.content.Intent
+import android.content.SharedPreferences
+import android.net.VpnService
+import android.os.ParcelFileDescriptor
+import android.util.Log
+import androidx.core.app.NotificationCompat
+import com.cherret.zaprett.MainActivity
+import com.cherret.zaprett.R
+import com.cherret.zaprett.data.ServiceStatus
+import com.cherret.zaprett.utils.disableList
+import com.cherret.zaprett.utils.getActiveByeDPIStrategyContent
+import com.cherret.zaprett.utils.getActiveExcludeIpsets
+import com.cherret.zaprett.utils.getActiveExcludeLists
+import com.cherret.zaprett.utils.getActiveIpsets
+import com.cherret.zaprett.utils.getActiveLists
+import com.cherret.zaprett.utils.getActiveStrategy
+import com.cherret.zaprett.utils.getAppsListMode
+import com.cherret.zaprett.utils.getHostListMode
+import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
+import java.io.File
+
+class ByeDpiVpnService : VpnService() {
+    private var vpnInterface: ParcelFileDescriptor? = null
+    private lateinit var sharedPreferences: SharedPreferences
+    companion object {
+        private const val CHANNEL_ID = "zaprett_vpn_channel"
+        private const val NOTIFICATION_ID = 1
+        var status: ServiceStatus = ServiceStatus.Disconnected
+    }
+
+    @SuppressLint("ForegroundServiceType")
+    override fun onCreate() {
+        super.onCreate()
+        sharedPreferences = getSharedPreferences("settings", MODE_PRIVATE)
+        createNotificationChannel()
+    }
+
+    override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
+        super.onStartCommand(intent, flags, startId)
+        return when (intent?.action) {
+            "START_VPN" -> {
+                startForeground(NOTIFICATION_ID, createNotification())
+                setupProxy()
+                START_STICKY
+            }
+            "STOP_VPN" -> {
+                stopProxy()
+                stopSelf()
+                START_NOT_STICKY
+            }
+            else -> {
+                START_NOT_STICKY
+            }
+        }
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        vpnInterface?.close()
+    }
+
+    private fun createNotificationChannel() {
+        val channel = NotificationChannel(
+            CHANNEL_ID,
+            getString(R.string.notification_zaprett_proxy),
+            NotificationManager.IMPORTANCE_LOW
+        ).apply {
+            description = getString(R.string.notification_zaprett_description)
+        }
+        val manager = getSystemService(NotificationManager::class.java)
+        manager?.createNotificationChannel(channel)
+    }
+
+    private fun createNotification(): Notification {
+        val notificationIntent = Intent(this, MainActivity::class.java)
+        val pendingIntent = PendingIntent.getActivity(
+            this,
+            0,
+            notificationIntent,
+            PendingIntent.FLAG_IMMUTABLE or PendingIntent.FLAG_UPDATE_CURRENT
+        )
+        return NotificationCompat.Builder(this, CHANNEL_ID)
+            .setContentTitle(getString(R.string.notification_zaprett_proxy))
+            .setContentText(getString(R.string.notification_zaprett_description))
+            .setSmallIcon(R.drawable.ic_launcher_monochrome)
+            .setContentIntent(pendingIntent)
+            .addAction(0, getString(R.string.btn_stop_service),
+                PendingIntent.getService(
+                    this,
+                    0,
+                    Intent(this, ByeDpiVpnService::class.java).setAction("STOP_VPN"),
+                    PendingIntent.FLAG_IMMUTABLE,
+                )
+            )
+            .setPriority(NotificationCompat.PRIORITY_DEFAULT)
+            .setOngoing(true)
+            .build()
+    }
+
+    private fun setupProxy() {
+        try {
+            startSocksProxy()
+            startByeDpi()
+            status = ServiceStatus.Connected
+        } catch (e: Exception) {
+            Log.e("proxy", "Failed to start")
+            status = ServiceStatus.Failed
+            stopSelf()
+        }
+    }
+
+    private fun startSocksProxy() {
+        val dns = sharedPreferences.getString("dns", "8.8.8.8")?: "8.8.8.8"
+        val ipv6 = sharedPreferences.getBoolean("ipv6", false)
+        val socksIp = sharedPreferences.getString("ip", "127.0.0.1")?: "127.0.0.1"
+        val socksPort = sharedPreferences.getString("port", "1080")?: "1080"
+        val builder = Builder()
+        builder.setSession(getString(R.string.notification_zaprett_proxy))
+            .setMtu(1500)
+            .addAddress("10.10.10.10", 32)
+            .addDnsServer(dns)
+            .addRoute("0.0.0.0", 0)
+            .setMetered(false)
+        if (ipv6) {
+            builder.addAddress("fd00::1", 128)
+                .addRoute("::", 0)
+        }
+        val appList = getAppsListMode(sharedPreferences)
+        when (appList) {
+            "blacklist" -> {
+                builder.addDisallowedApplication(applicationContext.packageName)
+                val blacklist = sharedPreferences.getStringSet("blacklist", emptySet())?: emptySet()
+                blacklist.forEach {
+                    builder.addDisallowedApplication(it)
+                }
+            }
+            "whitelist" -> {
+                val whitelist = sharedPreferences.getStringSet("whitelist", emptySet())?: emptySet()
+                whitelist.forEach {
+                    builder.addAllowedApplication(it)
+                }
+            }
+            else -> {
+                builder.addDisallowedApplication(applicationContext.packageName)
+            }
+        }
+        Log.d("builder", builder.toString())
+        vpnInterface = builder.establish()
+        val tun2socksConfig = """
+        | misc:
+        |   task-stack-size: 81920
+        | socks5:
+        |   mtu: 8500
+        |   address: $socksIp
+        |   port: $socksPort
+        |   udp: udp
+        """.trimMargin("| ")
+        val configPath = File.createTempFile("config", "tmp", cacheDir).apply {
+            writeText(tun2socksConfig)
+            deleteOnExit()
+        }
+        vpnInterface?.fd?.let { fd ->
+            TProxyService.TProxyStartService(configPath.absolutePath, fd)
+        }
+    }
+
+    private fun stopProxy() {
+        try {
+            vpnInterface?.close()
+            vpnInterface = null
+            NativeBridge().jniStopProxy()
+            TProxyService.TProxyStopService()
+            status = ServiceStatus.Disconnected
+        } catch (e: Exception) {
+            Log.e("proxy", "error stop proxy")
+        }
+    }
+
+    private fun startByeDpi() {
+        val socksIp = sharedPreferences.getString("ip", "127.0.0.1")?: "127.0.0.1"
+        val socksPort = sharedPreferences.getString("port", "1080")?: "1080"
+        val listSet = if (getHostListMode(sharedPreferences) == "whitelist") getActiveLists(sharedPreferences) else getActiveExcludeLists(sharedPreferences)
+        val ipsetSet = if (getHostListMode(sharedPreferences) == "whitelist") getActiveIpsets(sharedPreferences) else getActiveExcludeIpsets(sharedPreferences)
+        CoroutineScope(Dispatchers.IO).launch {
+            val args = parseArgs(
+                socksIp,
+                socksPort,
+                getActiveByeDPIStrategyContent(sharedPreferences),
+                prepareList(listSet),
+                prepareIpset(ipsetSet),
+                sharedPreferences)
+            val result = NativeBridge().jniStartProxy(args)
+            if (result < 0) {
+                Log.d("proxy","Failed to start byedpi proxy")
+            } else {
+                Log.d("proxy", "Byedpi proxy started successfully")
+            }
+        }
+    }
+    private suspend fun prepareList(actlists: Array<String>): String {
+        if (actlists.isNotEmpty()) {
+            val lists: Array<File> = actlists.map { File(it) }.toTypedArray()
+            val hostlist = withContext(Dispatchers.IO) {
+                File.createTempFile("hostlist", ".txt", cacheDir)
+            }.apply { deleteOnExit() }
+            withContext(Dispatchers.IO) {
+                hostlist.printWriter().use { out ->
+                    lists.forEach {
+                        if (it.exists()) {
+                            it.bufferedReader().useLines {
+                                it.forEach {
+                                    out.println(it)
+                                }
+                            }
+                        } else {
+                            disableList(it.name, sharedPreferences)
+                        }
+                    }
+                }
+            }
+            return hostlist.absolutePath
+        }
+        return ""
+    }
+
+    private suspend fun prepareIpset(actsets: Array<String>): String {
+        if (actsets.isNotEmpty()) {
+            val lists: Array<File> = actsets.map { File(it) }.toTypedArray()
+            val hostlist = withContext(Dispatchers.IO) {
+                File.createTempFile("ipset", ".txt", cacheDir)
+            }.apply { deleteOnExit() }
+            withContext(Dispatchers.IO) {
+                hostlist.printWriter().use { out ->
+                    lists.forEach {
+                        if (it.exists()) {
+                            it.bufferedReader().useLines {
+                                it.forEach {
+                                    out.println(it)
+                                }
+                            }
+                        } else {
+                            disableList(it.name, sharedPreferences)
+                        }
+                    }
+                }
+            }
+            return hostlist.absolutePath
+        }
+        return ""
+    }
+
+    private fun parseArgs(ip: String, port: String, rawArgs: List<String>, list : String, ipset : String, sharedPreferences: SharedPreferences): Array<String> {
+        val regex = Regex("""--?\S+(?:=(?:[^"'\s]+|"[^"]*"|'[^']*'))?|[^\s]+""")
+        val parsedArgs = rawArgs
+            .flatMap { args -> regex.findAll(args).map { it.value } }
+            .flatMap { arg ->
+                if (getHostListMode(sharedPreferences) == "whitelist") {
+                    when {
+                        arg == "\$hostlist" && list.isNotEmpty() -> listOf("--hosts", list)
+                        arg == "\$hostlist" && list.isEmpty() -> emptyList()
+                        arg == "\$ipset" && list.isNotEmpty() -> listOf("--ipset", list)
+                        arg == "\$ipset" && list.isEmpty() -> emptyList()
+                        else -> listOf(arg)
+                    }
+                } else {
+                    when {
+                        arg == "\$hostlist" && list.isNotEmpty() -> listOf("--hosts", list, "-An", list)
+                        arg == "\$ipset" && ipset.isNotEmpty() -> listOf("--ipset", ipset, "-An", ipset)
+                        arg == "\$hostlist" || arg == "\$ipset" -> emptyList()
+                        else -> listOf(arg)
+                    }
+                }
+            }
+            .toMutableList()
+        return arrayOf("ciadpi", "--ip", ip, "--port", port) + parsedArgs
+    }
+}

app/src/main/java/com/cherret/zaprett/byedpi/NativeBridge.kt

@@ -0,0 +1,12 @@
+package com.cherret.zaprett.byedpi
+
+class NativeBridge {
+    companion object {
+        init {
+            System.loadLibrary("byedpi")
+        }
+    }
+
+    external fun jniStartProxy(args: Array<String>): Int
+    external fun jniStopProxy(): Int
+}

app/src/main/java/com/cherret/zaprett/byedpi/TProxyService.kt

@@ -1,4 +1,4 @@
-package com.cherret.zaprett
+package com.cherret.zaprett.byedpi
 
 object TProxyService {
     init {

app/src/main/java/com/cherret/zaprett/data/AppListType.kt

@@ -0,0 +1,5 @@
+package com.cherret.zaprett.data;
+enum class AppListType {
+    Blacklist,
+    Whitelist
+}

app/src/main/java/com/cherret/zaprett/data/ItemType.kt

@@ -0,0 +1,5 @@
+package com.cherret.zaprett.data
+
+enum class ItemType {
+    byedpi, nfqws, list, list_exclude, ipset, ipset_exclude
+}

app/src/main/java/com/cherret/zaprett/data/ServiceStatus.kt

@@ -1,4 +1,4 @@
-package com.cherret.zaprett
+package com.cherret.zaprett.data
 
 enum class ServiceStatus {
     Disconnected,

app/src/main/java/com/cherret/zaprett/data/ServiceStatusUI.kt

@@ -0,0 +1,11 @@
+package com.cherret.zaprett.data
+
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.Help
+import androidx.compose.ui.graphics.vector.ImageVector
+import com.cherret.zaprett.R
+
+data class ServiceStatusUI(
+    val textRes: Int = R.string.status_not_availible,
+    val icon: ImageVector = Icons.AutoMirrored.Filled.Help
+)

app/src/main/java/com/cherret/zaprett/data/Setting.kt

@@ -0,0 +1,7 @@
+package com.cherret.zaprett.data
+
+sealed class Setting {
+    data class Toggle(val title: String, val checked: Boolean, val onToggle: (Boolean) -> Unit) : Setting()
+    data class Action(val title: String, val onClick: () -> Unit) : Setting()
+    data class Section(val title: String) : Setting()
+}

app/src/main/java/com/cherret/zaprett/data/StrategyCheckResult.kt

@@ -0,0 +1,8 @@
+package com.cherret.zaprett.data
+
+data class StrategyCheckResult (
+    val path : String,
+    val progress : Float,
+    var domains: List<String>,
+    val status : StrategyTestingStatus,
+)

app/src/main/java/com/cherret/zaprett/data/StrategyTestingStatus.kt

@@ -0,0 +1,7 @@
+package com.cherret.zaprett.data
+
+import com.cherret.zaprett.R
+
+enum class StrategyTestingStatus(val resId: Int) {
+    Waiting(R.string.strategy_status_waiting), Testing(R.string.strategy_status_testing), Completed(R.string.strategy_status_tested)
+}

app/src/main/java/com/cherret/zaprett/data/ZaprettConfig.kt

@@ -0,0 +1,26 @@
+package com.cherret.zaprett.data
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class ZaprettConfig(
+    @SerialName("active_lists")
+    val activeLists: List<String> = emptyList(),
+    @SerialName("active_ipsets")
+    val activeIpsets: List<String> = emptyList(),
+    @SerialName("active_exclude_lists")
+    val activeExcludeLists: List<String> = emptyList(),
+    @SerialName("active_exclude_ipsets")
+    val activeExcludeIpsets: List<String> = emptyList(),
+    @SerialName("list_type")
+    val listType: String = "whitelist",
+    @SerialName("strategy")
+    val strategy: String = "",
+    @SerialName("app_list")
+    val appList: String = "none",
+    @SerialName("whitelist")
+    val whitelist: List<String> = emptyList(),
+    @SerialName("blacklist")
+    val blacklist: List<String> = emptyList()
+)

app/src/main/java/com/cherret/zaprett/ui/component/ListItems.kt

@@ -0,0 +1,308 @@
+package com.cherret.zaprett.ui.component
+
+import android.content.Context
+import android.content.SharedPreferences
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.expandVertically
+import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.InstallMobile
+import androidx.compose.material.icons.filled.Update
+import androidx.compose.material3.Card
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.FilledTonalIconButton
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.LinearProgressIndicator
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ProgressIndicatorDefaults
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.Dp
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.cherret.zaprett.R
+import com.cherret.zaprett.data.StrategyCheckResult
+import com.cherret.zaprett.data.StrategyTestingStatus
+import com.cherret.zaprett.ui.viewmodel.BaseRepoViewModel
+import com.cherret.zaprett.utils.RepoItemInfo
+import com.cherret.zaprett.utils.disableStrategy
+import com.cherret.zaprett.utils.enableStrategy
+import com.cherret.zaprett.utils.getActiveStrategy
+import kotlinx.coroutines.launch
+
+@Composable
+fun ListSwitchItem(item: String, isChecked: Boolean, onCheckedChange: (Boolean) -> Unit, onDeleteClick: () -> Unit) {
+    ElevatedCard(
+        elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 10.dp, top = 25.dp, end = 10.dp)
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp)
+        ) {
+            Text(text = item, modifier = Modifier.weight(1f))
+            Switch(checked = isChecked, onCheckedChange = onCheckedChange)
+        }
+        HorizontalDivider(thickness = Dp.Hairline)
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.End
+        ) {
+            FilledTonalButton(
+                onClick = onDeleteClick,
+                modifier = Modifier.padding(horizontal = 5.dp)
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Delete,
+                    contentDescription = stringResource(R.string.btn_remove_host),
+                    modifier = Modifier.size(20.dp)
+                )
+                Text(stringResource(R.string.btn_remove_host))
+            }
+        }
+    }
+}
+
+@Composable
+fun RepoItem(
+    item: RepoItemInfo,
+    viewModel: BaseRepoViewModel,
+    isInstalling: Map<String, Boolean>,
+    isUpdateInstalling: Map<String, Boolean>,
+    isUpdate: Map<String, Boolean>,
+    modifier: Modifier = Modifier
+) {
+    val isInstalled = viewModel.isItemInstalled(item)
+    val installing = isInstalling[item.name] == true
+    val updating = isUpdateInstalling[item.name] == true
+
+    ElevatedCard(
+        elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(start = 10.dp, top = 25.dp, end = 10.dp)
+    ) {
+        Column(Modifier.fillMaxWidth()) {
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp)
+            ) {
+                Text(text = item.name, modifier = Modifier.weight(1f))
+            }
+
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 16.dp)
+            ) {
+                Text(
+                    text = stringResource(R.string.title_author, item.author),
+                    modifier = Modifier.weight(1f)
+                )
+            }
+
+            Row(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(start = 16.dp)
+            ) {
+                Text(
+                    text = item.description,
+                    modifier = Modifier.weight(1f)
+                )
+            }
+
+            HorizontalDivider(thickness = Dp.Hairline)
+
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.End
+            ) {
+                if (isUpdate[item.name] == true && isInstalled) {
+                    FilledTonalButton(
+                        onClick = { viewModel.update(item) },
+                        enabled = !updating,
+                        modifier = Modifier.padding(horizontal = 5.dp)
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Update,
+                            contentDescription = stringResource(R.string.btn_remove_host),
+                            modifier = Modifier.size(20.dp)
+                        )
+                        Text(
+                            if (updating) stringResource(R.string.btn_updating_host)
+                            else stringResource(R.string.btn_update_host)
+                        )
+                    }
+                }
+
+                FilledTonalButton(
+                    onClick = { viewModel.install(item) },
+                    enabled = !installing && !isInstalled,
+                    modifier = Modifier.padding(horizontal = 5.dp)
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.InstallMobile,
+                        contentDescription = stringResource(R.string.btn_remove_host),
+                        modifier = Modifier.size(20.dp)
+                    )
+                    Text(
+                        when {
+                            installing -> stringResource(R.string.btn_installing_host)
+                            isInstalled -> stringResource(R.string.btn_installed_host)
+                            else -> stringResource(R.string.btn_install_host)
+                        }
+                    )
+                }
+            }
+        }
+    }
+}
+
+
+@Composable
+fun StrategySelectionItem(strategy : StrategyCheckResult, prefs : SharedPreferences, context : Context, snackbarHostState : SnackbarHostState) {
+    val scope = rememberCoroutineScope()
+    var expanded by remember { mutableStateOf(false) }
+    ElevatedCard (
+        elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+        onClick = {
+            if (strategy.status == StrategyTestingStatus.Completed && strategy.domains.isNotEmpty()) {
+                expanded = !expanded
+            }
+        },
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(start = 10.dp, end = 10.dp, top = 25.dp, bottom = 0.dp)
+    ) {
+        Column (
+            Modifier
+                .fillMaxWidth()
+                .padding(16.dp)
+        )
+        {
+            Row {
+                Text(
+                    text = strategy.path,
+                    modifier = Modifier
+                       .weight(1f)
+                )
+                FilledTonalIconButton(
+                    onClick = {
+                        if (getActiveStrategy(prefs).isNotEmpty()) disableStrategy(getActiveStrategy(prefs)[0], prefs)
+                        enableStrategy(strategy.path, prefs)
+                        scope.launch {
+                            snackbarHostState.showSnackbar(
+                                message = context.getString(R.string.strategy_applied)
+                            )
+                        }
+                    },
+                    enabled = strategy.status == StrategyTestingStatus.Completed
+                ) {
+                    Icon(
+                        imageVector = Icons.Default.Check,
+                        contentDescription = "apply"
+                    )
+                }
+            }
+            Row {
+                Text(
+                    text = stringResource(strategy.status.resId),
+                    modifier = Modifier
+                        .weight(1f),
+                    fontSize = 12.sp,
+                )
+            }
+            Row (
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(top = 8.dp),
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.End
+            ) {
+                LinearProgressIndicator(
+                    modifier = Modifier
+                        .weight(1f),
+
+                    progress = {
+                        strategy.progress
+                    },
+                    color = ProgressIndicatorDefaults.linearColor,
+                    trackColor = ProgressIndicatorDefaults.linearTrackColor,
+                    strokeCap = ProgressIndicatorDefaults.LinearStrokeCap,
+                )
+                Text(
+                    text = "${(strategy.progress*100).toInt()}%",
+                    modifier = Modifier
+                        .padding(start = 16.dp),
+
+                )
+            }
+        }
+        AnimatedVisibility(
+            visible = expanded,
+            enter = expandVertically(),
+            exit = shrinkVertically()
+        ) {
+            Card (
+                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+                modifier = Modifier
+                    .padding(horizontal = 8.dp)
+                    .fillMaxWidth()
+            ) {
+                Text(
+                    text = stringResource(R.string.selection_available_domains)
+                )
+                LazyColumn(modifier = Modifier.heightIn(max = 300.dp)) {
+                    items(strategy.domains) { item ->
+                        Card(
+                            elevation = CardDefaults.cardElevation(4.dp),
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .padding(vertical = 4.dp)
+                        ) {
+                            Text(
+                                text = item,
+                                modifier = Modifier.padding(16.dp),
+                                style = MaterialTheme.typography.bodyLarge
+                            )
+                        }
+                    }
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/cherret/zaprett/ui/component/SettingsComponents.kt

@@ -0,0 +1,146 @@
+package com.cherret.zaprett.ui.component
+
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowForward
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.ElevatedCard
+import androidx.compose.material3.Icon
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TextField
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.cherret.zaprett.R
+
+@Composable
+fun SettingsItem(title: String, checked: Boolean, onToggle: (Boolean) -> Unit, onCheckedChange: (Boolean) -> Unit) {
+    ElevatedCard(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(80.dp),
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
+        onClick = { onToggle(!checked) },
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant)
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(16.dp)
+        ) {
+            Text(
+                text = title,
+                modifier = Modifier.weight(1f)
+            )
+            Switch(
+                checked = checked,
+                onCheckedChange = onCheckedChange
+            )
+        }
+    }
+}
+
+@Composable
+fun SettingsActionItem(title: String, onClick: () -> Unit) {
+    ElevatedCard(
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(80.dp),
+        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
+        onClick = { onClick() },
+        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant)
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            modifier = Modifier
+                .fillMaxSize()
+                .padding(16.dp)
+        ) {
+            Text(
+                text = title,
+                modifier = Modifier.weight(1f)
+            )
+            Icon(imageVector = Icons.AutoMirrored.Default.ArrowForward, contentDescription = null)
+        }
+    }
+}
+
+@Composable
+fun SettingsSection(title: String) {
+    Text(
+        text = title,
+        fontSize = 20.sp,
+        fontWeight = FontWeight.Bold,
+        modifier = Modifier.padding(vertical = 8.dp, horizontal = 4.dp)
+    )
+}
+
+@Composable
+fun InfoDialog(title: String, message: String, onDismiss: () -> Unit) {
+    AlertDialog(
+        title = { Text(text = title) },
+        text = { Text(text = message) },
+        onDismissRequest = onDismiss,
+        confirmButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.btn_continue))
+            }
+        }
+    )
+}
+
+@Composable
+fun TextDialog(title: String, message: String, initialText: String, onConfirm: (String) -> Unit, onDismiss: () -> Unit) {
+    var inputText by remember { mutableStateOf(initialText) }
+    AlertDialog(
+        title = { Text(text = title) },
+        text = {
+            TextField(
+                value = inputText,
+                onValueChange = { inputText = it },
+                placeholder = { Text(message) },
+                singleLine = true,
+                modifier = Modifier.fillMaxWidth()
+            )},
+        onDismissRequest = onDismiss,
+        confirmButton = {
+            TextButton(onClick = {
+                if (inputText.isNotEmpty()) {
+                    onConfirm(inputText)
+                    onDismiss()
+                }
+                else {
+                    onDismiss()
+                }
+            }
+            ) {
+                Text(stringResource(R.string.btn_continue))
+            }
+        },
+        dismissButton = {
+            TextButton(
+                onClick = { onDismiss() }
+            ) {
+                Text(stringResource(R.string.btn_dismiss))
+            }
+        }
+    )
+}

app/src/main/java/com/cherret/zaprett/ui/screen/DebugScreen.kt

@@ -0,0 +1,155 @@
+package com.cherret.zaprett.ui.screen
+
+import android.app.Activity
+import android.content.Context
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.MoreVert
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.navigation.NavController
+import com.cherret.zaprett.R
+import com.cherret.zaprett.data.Setting
+import com.cherret.zaprett.ui.component.SettingsActionItem
+import com.cherret.zaprett.ui.component.SettingsItem
+import com.cherret.zaprett.ui.component.SettingsSection
+import com.cherret.zaprett.ui.component.TextDialog
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun DebugScreen(navController: NavController) {
+    val context = LocalContext.current
+    val sharedPreferences = remember { context.getSharedPreferences("settings", Context.MODE_PRIVATE) }
+    val editor = remember { sharedPreferences.edit() }
+    val showUpdateUrlDialog = remember { mutableStateOf(false) }
+    val textDialogValue = remember { mutableStateOf("") }
+    val showResetSettingsDialog = remember { mutableStateOf(false) }
+    val settingsList = listOf(
+        Setting.Action(
+            title = stringResource(R.string.btn_update_repository_url),
+            onClick = {
+                textDialogValue.value = sharedPreferences.getString("update_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-app/refs/heads/main/update.json")?: "https://raw.githubusercontent.com/CherretGit/zaprett-app/refs/heads/main/update.json"
+                showUpdateUrlDialog.value = true
+            }
+        ),
+        Setting.Action(
+            title = stringResource(R.string.reset_settings_title),
+            onClick = {
+                showResetSettingsDialog.value = true
+            }
+        )
+    )
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = stringResource(R.string.title_debug),
+                        fontSize = 40.sp,
+                        fontFamily = FontFamily(Font(R.font.unbounded, FontWeight.Normal))
+                    )
+                },
+                navigationIcon = {
+                    IconButton(onClick = { navController.popBackStack() }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = stringResource(R.string.btn_back)
+                        )
+                    }
+                },
+                windowInsets = WindowInsets(0)
+            )
+        },
+        content = { paddingValues ->
+            LazyColumn(
+                modifier = Modifier
+                    .padding(paddingValues)
+                    .fillMaxSize(),
+                contentPadding = PaddingValues(horizontal = 10.dp, vertical = 25.dp),
+                verticalArrangement = Arrangement.spacedBy(8.dp)
+            ) {
+                items(settingsList) { setting ->
+                    when (setting) {
+                        is Setting.Toggle -> {
+                            SettingsItem(
+                                title = setting.title,
+                                onToggle = setting.onToggle,
+                                checked = setting.checked,
+                                onCheckedChange = setting.onToggle
+                            )
+                        }
+                        is Setting.Action -> {
+                            SettingsActionItem(
+                                title = setting.title,
+                                setting.onClick
+                            )
+                        }
+                        is Setting.Section -> {
+                            SettingsSection(setting.title)
+                        }
+                    }
+                }
+            }
+        }
+    )
+    if (showUpdateUrlDialog.value) {
+        TextDialog(stringResource(R.string.btn_update_repository_url), stringResource(R.string.hint_enter_update_repository_url), textDialogValue.value, onConfirm = {
+            editor.putString("update_repo_url", it).apply()
+        }, onDismiss = { showUpdateUrlDialog.value = false })
+    }
+
+    if (showResetSettingsDialog.value) {
+        AlertDialog(title = { Text(text = stringResource(R.string.reset_settings_title)) },
+            text = { Text(text = stringResource(R.string.reset_settings_message)) },
+            onDismissRequest = {
+            showResetSettingsDialog.value = false
+        },
+            dismissButton = {
+                TextButton(onClick = {
+                    showResetSettingsDialog.value = false
+                }) {
+                    Text(stringResource(R.string.btn_dismiss))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    context.deleteSharedPreferences("settings")
+                    showResetSettingsDialog.value = false
+                    val activity = context as Activity
+                    val intent = activity.intent
+                    activity.finish()
+                    activity.startActivity(intent)
+                }) {
+                    Text(text = stringResource(R.string.btn_continue))
+                }
+            })
+    }
+}

app/src/main/java/com/cherret/zaprett/ui/screen/HomeScreen.kt

@@ -1,23 +1,32 @@
 package com.cherret.zaprett.ui.screen
 
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
 import android.content.SharedPreferences
 import android.net.VpnService
+import android.os.Build
+import android.widget.Toast
 import androidx.activity.result.ActivityResultLauncher
 import androidx.compose.animation.AnimatedVisibility
 import androidx.compose.animation.expandVertically
 import androidx.compose.animation.fadeIn
 import androidx.compose.animation.fadeOut
 import androidx.compose.animation.shrinkVertically
+import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.verticalScroll
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Build
 import androidx.compose.material.icons.filled.Dangerous
@@ -47,6 +56,7 @@ import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.graphics.vector.rememberVectorPainter
@@ -59,10 +69,15 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
 import com.cherret.zaprett.BuildConfig
 import com.cherret.zaprett.R
+import com.cherret.zaprett.data.ServiceStatusUI
 import com.cherret.zaprett.ui.viewmodel.HomeViewModel
+import dev.jeziellago.compose.markdowntext.MarkdownText
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.serialization.SerializationException
+import java.io.IOException
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -72,7 +87,7 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), vpnLauncher: ActivityResu
     val requestVpnPermission by viewModel.requestVpnPermission.collectAsState()
     val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
-    val cardText = viewModel.cardText
+    val status by viewModel.serviceStatus.collectAsState()
     val changeLog = viewModel.changeLog
     val newVersion = viewModel.newVersion
     val updateAvailable = viewModel.updateAvailable
@@ -81,6 +96,7 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), vpnLauncher: ActivityResu
     val nfqwsVer = viewModel.nfqwsVer;
     val byedpiVer = viewModel.byedpiVer;
     val serviceMode = viewModel.serviceMode
+    val error by viewModel.errorFlow.collectAsState()
     LaunchedEffect(Unit) {
         viewModel.checkForUpdate()
         viewModel.checkServiceStatus()
@@ -99,6 +115,37 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), vpnLauncher: ActivityResu
         }
     }
 
+    if (error.isNotEmpty()) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.clearError()
+            },
+            title = { Text(stringResource(R.string.error_text)) },
+            text = {
+                Text(stringResource(R.string.error_unknown))
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    val clip: ClipData = ClipData.newPlainText("Error log", error)
+                    clipboard.setPrimaryClip(clip)
+                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+                        Toast.makeText(context, context.getString(R.string.log_copied), Toast.LENGTH_SHORT).show()
+                    }
+                }) {
+                    Text(stringResource(R.string.btn_copy_log))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.clearError()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
     Scaffold(
         topBar = {
             TopAppBar(
@@ -114,8 +161,10 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), vpnLauncher: ActivityResu
         },
         snackbarHost = { SnackbarHost(snackbarHostState) },
         content = { paddingValues ->
-            Column(modifier = Modifier.padding(paddingValues)) {
+            Column(modifier = Modifier
-                ServiceStatusCard(viewModel, cardText, snackbarHostState, scope)
+                .padding(paddingValues)
+                .verticalScroll(rememberScrollState())) {
+                ServiceStatusCard(viewModel, status, snackbarHostState, scope)
                 UpdateCard(updateAvailable) { viewModel.showUpdateDialog() }
                 if (showUpdateDialog) {
                     UpdateDialog(viewModel, changeLog.value.orEmpty(), newVersion) { viewModel.dismissUpdateDialog() }
@@ -133,25 +182,44 @@ fun HomeScreen(viewModel: HomeViewModel = viewModel(), vpnLauncher: ActivityResu
 }
 
 @Composable
-private fun ServiceStatusCard(viewModel: HomeViewModel, cardText: MutableState<Int>, snackbarHostState: SnackbarHostState, scope: CoroutineScope) {
+private fun ServiceStatusCard(viewModel: HomeViewModel, status: ServiceStatusUI, snackbarHostState: SnackbarHostState, scope: CoroutineScope) {
     ElevatedCard(
         elevation = CardDefaults.cardElevation(6.dp),
         colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.primary),
         modifier = Modifier
             .fillMaxWidth()
             .padding(start = 10.dp, top = 25.dp, end = 10.dp)
-            .width(240.dp)
+            //.height(150.dp)
-            .height(150.dp),
+            .wrapContentHeight(),
         onClick = { viewModel.onCardClick() }
     ) {
-        Text(
+        Row (
-            text = stringResource(cardText.value),
-            fontFamily = FontFamily(Font(R.font.unbounded, FontWeight.Normal)),
             modifier = Modifier
-                .fillMaxWidth()
+                .fillMaxSize()
                 .padding(16.dp),
-            textAlign = TextAlign.Center
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.SpaceBetween
         )
+        {
+            Icon(
+                painter = rememberVectorPainter(status.icon),
+                modifier = Modifier
+                    .width(60.dp)
+                    .height(60.dp),
+                contentDescription = "icon"
+            )
+            Text(
+                text = stringResource(status.textRes),
+                fontFamily = FontFamily(Font(R.font.unbounded, FontWeight.Normal)),
+                fontSize = 16.sp,
+                //maxLines = 3,
+                //overflow = TextOverflow.Ellipsis,
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                textAlign = TextAlign.Center
+            )
+        }
     }
 }
 
@@ -167,9 +235,7 @@ private fun UpdateCard(updateAvailable: MutableState<Boolean>, onClick: () -> Un
             colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant),
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(start = 10.dp, top = 10.dp, end = 10.dp)
+                .padding(start = 10.dp, top = 10.dp, end = 10.dp),
-                .width(140.dp)
-                .height(70.dp),
             onClick = onClick
         ) {
             Text(
@@ -293,8 +359,8 @@ fun UpdateDialog(viewModel: HomeViewModel, changeLog: String, newVersion: Mutabl
     AlertDialog(
         title = { Text(text = stringResource(R.string.update_available)) },
         text = {
-            Text(
+            MarkdownText(
-                text = stringResource(R.string.alert_version, BuildConfig.VERSION_NAME, newVersion.value.toString(), changeLog)
+                markdown = stringResource(R.string.alert_version, BuildConfig.VERSION_NAME, newVersion.value.toString(), changeLog)
             )
         },
         onDismissRequest = onDismiss,

app/src/main/java/com/cherret/zaprett/ui/screen/HostsScreen.kt

@@ -1,42 +1,48 @@
 package com.cherret.zaprett.ui.screen
 
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Build
+import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.UploadFile
-import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.SingleChoiceSegmentedButtonRow
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -50,33 +56,70 @@ import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.cherret.zaprett.R
+import com.cherret.zaprett.ui.component.ListSwitchItem
 import com.cherret.zaprett.ui.viewmodel.HostsViewModel
+import com.cherret.zaprett.utils.getHostListMode
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
 fun HostsScreen(navController: NavController, viewModel: HostsViewModel = viewModel()) {
     val context = LocalContext.current
+    val prefs = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
     val scope = rememberCoroutineScope()
     val snackbarHostState = remember { SnackbarHostState() }
     val allLists = viewModel.allItems
     val checked = viewModel.checked
     val isRefreshing = viewModel.isRefreshing
+    val showPermissionDialog by viewModel.showNoPermissionDialog.collectAsState()
     val filePickerLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.OpenDocument()
     ) { uri ->
-        uri?.let { viewModel.copySelectedFile(context, "/lists", it) }
+        uri?.let {
+            if (getHostListMode(prefs) == "whitelist") viewModel.copySelectedFile(context, "/lists/include", it)
+            else viewModel.copySelectedFile(context, "/lists/exclude", it) }
     }
+    val error by viewModel.errorFlow.collectAsState()
 
     LaunchedEffect(Unit) {
         viewModel.refresh()
     }
 
+    if (error.isNotEmpty()) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.clearError()
+            },
+            title = { Text(stringResource(R.string.error_text)) },
+            text = {
+                Text(stringResource(R.string.error_unknown))
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    val clip: ClipData = ClipData.newPlainText("Error log", error)
+                    clipboard.setPrimaryClip(clip)
+                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+                        Toast.makeText(context, context.getString(R.string.log_copied), Toast.LENGTH_SHORT).show()
+                    }
+                }) {
+                    Text(stringResource(R.string.btn_copy_log))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.clearError()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
     Scaffold(
         topBar = {
             TopAppBar(
@@ -99,9 +142,15 @@ fun HostsScreen(navController: NavController, viewModel: HostsViewModel = viewMo
                 modifier = Modifier.fillMaxSize()
             ) {
                 LazyColumn(
-                    contentPadding = paddingValues,
+                    contentPadding = PaddingValues(
-                    modifier = Modifier.fillMaxSize()
+                        top = paddingValues.calculateTopPadding(),
+                        bottom = paddingValues.calculateBottomPadding() + 80.dp
+                    ),
+                    modifier = Modifier.navigationBarsPadding().fillMaxSize()
                 ) {
+                    item {
+                        ListTypeChoose(viewModel, prefs)
+                    }
                     when {
                         allLists.isEmpty() -> {
                             item {
@@ -118,7 +167,7 @@ fun HostsScreen(navController: NavController, viewModel: HostsViewModel = viewMo
                         }
                         else -> {
                             items(allLists) { item ->
-                                HostItem (
+                                ListSwitchItem (
                                     item = item,
                                     isChecked = checked[item] == true,
                                     onCheckedChange = { isChecked ->
@@ -139,43 +188,23 @@ fun HostsScreen(navController: NavController, viewModel: HostsViewModel = viewMo
         },
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) }
     )
-}
+    if (showPermissionDialog) {
-
+        AlertDialog(
-@Composable
+            title = { Text(text = stringResource(R.string.error_no_storage_title)) },
-private fun HostItem(item: String, isChecked: Boolean, onCheckedChange: (Boolean) -> Unit, onDeleteClick: () -> Unit) {
+            text = { Text(text = stringResource(R.string.no_storage_permission_message)) },
-    ElevatedCard(
+            onDismissRequest = {
-        elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
+                viewModel.hideNoPermissionDialog()
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+                navController.popBackStack()
-        modifier = Modifier
+            },
-            .fillMaxWidth()
+            confirmButton = {
-            .padding(start = 10.dp, top = 25.dp, end = 10.dp)
+                TextButton(onClick = {
-    ) {
+                    viewModel.hideNoPermissionDialog()
-        Row(
+                    navController.popBackStack()
-            verticalAlignment = Alignment.CenterVertically,
+                }) {
-            modifier = Modifier
+                    Text(stringResource(R.string.btn_continue))
-                .fillMaxWidth()
+                }
-                .padding(16.dp)
-        ) {
-            Text(text = item, modifier = Modifier.weight(1f))
-            Switch(checked = isChecked, onCheckedChange = onCheckedChange)
-        }
-        HorizontalDivider(thickness = Dp.Hairline)
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.End
-        ) {
-            FilledTonalButton(
-                onClick = onDeleteClick,
-                modifier = Modifier.padding(horizontal = 5.dp)
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Delete,
-                    contentDescription = stringResource(R.string.btn_remove_host),
-                    modifier = Modifier.size(20.dp)
-                )
-                Text(stringResource(R.string.btn_remove_host))
             }
-        }
+        )
     }
 }
 
@@ -215,6 +244,38 @@ private fun FloatingMenu(navController: NavController, launcher: ActivityResultL
     }
 }
 
+
+@Composable
+fun ListTypeChoose(viewModel: HostsViewModel, prefs : SharedPreferences) {
+    val listType = remember { mutableStateOf(getHostListMode(prefs))}
+    val options = listOf(stringResource(R.string.title_whitelist), stringResource(R.string.title_blacklist))
+    val selectedIndex = if (listType.value == "whitelist") 0 else 1
+
+    SingleChoiceSegmentedButtonRow (
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp)
+    ) {
+        options.forEachIndexed { index, label ->
+            SegmentedButton(
+                shape = SegmentedButtonDefaults.itemShape(
+                    index = index,
+                    count = options.size
+                ),
+                onClick = {
+                    listType.value = if (index == 0) "whitelist" else "blacklist"
+                    viewModel.setListType(listType.value)
+                          },
+                selected = index == selectedIndex,
+                label = {
+                    Text(
+                        label
+                    )
+                }
+            )
+        }
+    }
+}
 private fun addHost(launcher: ActivityResultLauncher<Array<String>>) {
     launcher.launch(arrayOf("text/plain"))
 }

app/src/main/java/com/cherret/zaprett/ui/screen/IpsetsScreen.kt

@@ -0,0 +1,279 @@
+package com.cherret.zaprett.ui.screen
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.SharedPreferences
+import android.os.Build
+import android.widget.Toast
+import androidx.activity.compose.rememberLauncherForActivityResult
+import androidx.activity.result.ActivityResultLauncher
+import androidx.activity.result.contract.ActivityResultContracts
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Add
+import androidx.compose.material.icons.filled.Download
+import androidx.compose.material.icons.filled.UploadFile
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FloatingActionButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SegmentedButton
+import androidx.compose.material3.SegmentedButtonDefaults
+import androidx.compose.material3.SingleChoiceSegmentedButtonRow
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.rememberCoroutineScope
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import com.cherret.zaprett.R
+import com.cherret.zaprett.ui.component.ListSwitchItem
+import com.cherret.zaprett.ui.viewmodel.HostsViewModel
+import com.cherret.zaprett.ui.viewmodel.IpsetViewModel
+import com.cherret.zaprett.utils.getHostListMode
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun IpsetsScreen(navController: NavController, viewModel: IpsetViewModel = viewModel()) {
+    val context = LocalContext.current
+    val prefs = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
+    val scope = rememberCoroutineScope()
+    val snackbarHostState = remember { SnackbarHostState() }
+    val allLists = viewModel.allItems
+    val checked = viewModel.checked
+    val isRefreshing = viewModel.isRefreshing
+    val showPermissionDialog by viewModel.showNoPermissionDialog.collectAsState()
+    val filePickerLauncher = rememberLauncherForActivityResult(
+        contract = ActivityResultContracts.OpenDocument()
+    ) { uri ->
+        uri?.let {
+            if (getHostListMode(prefs) == "whitelist") viewModel.copySelectedFile(context, "/ipset/include", it)
+            else viewModel.copySelectedFile(context, "/ipset/exclude", it) }
+    }
+    val error by viewModel.errorFlow.collectAsState()
+
+    LaunchedEffect(Unit) {
+        viewModel.refresh()
+    }
+
+    if (error.isNotEmpty()) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.clearError()
+            },
+            title = { Text(stringResource(R.string.error_text)) },
+            text = {
+                Text(stringResource(R.string.error_unknown))
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    val clip: ClipData = ClipData.newPlainText("Error log", error)
+                    clipboard.setPrimaryClip(clip)
+                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+                        Toast.makeText(context, context.getString(R.string.log_copied), Toast.LENGTH_SHORT).show()
+                    }
+                }) {
+                    Text(stringResource(R.string.btn_copy_log))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.clearError()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = stringResource(R.string.title_ipset),
+                        fontSize = 40.sp,
+                        fontFamily = FontFamily(Font(R.font.unbounded, FontWeight.Normal))
+                    )
+                },
+                windowInsets = WindowInsets(0)
+            )
+        },
+        content = { paddingValues ->
+            PullToRefreshBox(
+                isRefreshing = isRefreshing,
+                onRefresh = {
+                    viewModel.refresh()
+                },
+                modifier = Modifier.fillMaxSize()
+            ) {
+                LazyColumn(
+                    contentPadding = PaddingValues(
+                        top = paddingValues.calculateTopPadding(),
+                        bottom = paddingValues.calculateBottomPadding() + 80.dp
+                    ),
+                    modifier = Modifier.navigationBarsPadding().fillMaxSize()
+                ) {
+                    item {
+                        IpsetTypeChoose(viewModel, prefs)
+                    }
+                    when {
+                        allLists.isEmpty() -> {
+                            item {
+                                Box(
+                                    modifier = Modifier.fillParentMaxSize(),
+                                    contentAlignment = Alignment.Center
+                                ) {
+                                    Text(
+                                        stringResource(R.string.empty_list),
+                                        textAlign = TextAlign.Center
+                                    )
+                                }
+                            }
+                        }
+                        else -> {
+                            items(allLists) { item ->
+                                ListSwitchItem (
+                                    item = item,
+                                    isChecked = checked[item] == true,
+                                    onCheckedChange = { isChecked ->
+                                        viewModel.onCheckedChange(item, isChecked, snackbarHostState, scope)
+                                    },
+                                    onDeleteClick = {
+                                        viewModel.deleteItem(item, snackbarHostState, scope)
+                                    }
+                                )
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        floatingActionButton = {
+            FloatingMenu(navController, filePickerLauncher)
+        },
+        snackbarHost = { SnackbarHost(hostState = snackbarHostState) }
+    )
+    if (showPermissionDialog) {
+        AlertDialog(
+            title = { Text(text = stringResource(R.string.error_no_storage_title)) },
+            text = { Text(text = stringResource(R.string.no_storage_permission_message)) },
+            onDismissRequest = {
+                viewModel.hideNoPermissionDialog()
+                navController.popBackStack()
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.hideNoPermissionDialog()
+                    navController.popBackStack()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+}
+
+@Composable
+private fun FloatingMenu(navController: NavController, launcher: ActivityResultLauncher<Array<String>>) {
+    var expanded by remember { mutableStateOf(false) }
+    FloatingActionButton(
+        modifier = Modifier.size(80.dp),
+        onClick = { expanded = !expanded }
+    ) {
+        Icon(Icons.Default.Add, contentDescription = stringResource(R.string.btn_add_host))
+    }
+    DropdownMenu(
+        expanded = expanded,
+        onDismissRequest = { expanded = false }
+    ) {
+        DropdownMenuItem(
+            text = { Text(stringResource(R.string.btn_download_host)) },
+            onClick = {
+                expanded = false
+                navController.navigate("repo?source=ipsets") { launchSingleTop = true }
+            },
+            leadingIcon = {
+                Icon(Icons.Default.Download, contentDescription = stringResource(R.string.btn_download_host))
+            }
+        )
+        DropdownMenuItem(
+            text = { Text(stringResource(R.string.btn_add_host)) },
+            onClick = {
+                expanded = false
+                addHost(launcher)
+            },
+            leadingIcon = {
+                Icon(Icons.Default.UploadFile, contentDescription = stringResource(R.string.btn_add_host))
+            }
+        )
+    }
+}
+@Composable
+fun IpsetTypeChoose(viewModel: IpsetViewModel, prefs : SharedPreferences) {
+    val listType = remember { mutableStateOf(getHostListMode(prefs))}
+    val options = listOf(stringResource(R.string.title_whitelist), stringResource(R.string.title_blacklist))
+    val selectedIndex = if (listType.value == "whitelist") 0 else 1
+
+    SingleChoiceSegmentedButtonRow (
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(horizontal = 16.dp)
+    ) {
+        options.forEachIndexed { index, label ->
+            SegmentedButton(
+                shape = SegmentedButtonDefaults.itemShape(
+                    index = index,
+                    count = options.size
+                ),
+                onClick = {
+                    listType.value = if (index == 0) "whitelist" else "blacklist"
+                    viewModel.setListType(listType.value)
+                },
+                selected = index == selectedIndex,
+                label = {
+                    Text(
+                        label
+                    )
+                }
+            )
+        }
+    }
+}
+private fun addHost(launcher: ActivityResultLauncher<Array<String>>) {
+    launcher.launch(arrayOf("text/plain"))
+}

app/src/main/java/com/cherret/zaprett/ui/screen/RepoScreen.kt

@@ -1,36 +1,33 @@
 package com.cherret.zaprett.ui.screen
 
-import androidx.compose.foundation.layout.Arrangement
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.os.Build
+import android.widget.Toast
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
-import androidx.compose.material.icons.filled.InstallMobile
+import androidx.compose.material3.AlertDialog
-import androidx.compose.material.icons.filled.Update
-import androidx.compose.material3.CardDefaults
-import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FilledTonalButton
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
@@ -40,12 +37,13 @@ import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
-import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavController
 import com.cherret.zaprett.R
+import com.cherret.zaprett.ui.component.RepoItem
 import com.cherret.zaprett.ui.viewmodel.BaseRepoViewModel
+import kotlinx.serialization.SerializationException
+import java.io.IOException
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
@@ -57,11 +55,102 @@ fun RepoScreen(navController: NavController, viewModel: BaseRepoViewModel) {
     val isUpdateInstalling = viewModel.isUpdateInstalling
     val isRefreshing = viewModel.isRefreshing.value
     val snackbarHostState = remember { SnackbarHostState() }
-
+    val error by viewModel.errorFlow.collectAsState()
+    val downloadError by viewModel.downloadErrorFlow.collectAsState()
+    val showPermissionDialog by viewModel.showPermissionDialog.collectAsState()
     LaunchedEffect(Unit) {
         viewModel.refresh()
     }
 
+    if (error != null) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.clearError()
+                navController.popBackStack()
+            },
+            title = { Text(stringResource(R.string.error_text)) },
+            text = {
+                Text(
+                    when (error) {
+                        is IOException -> stringResource(R.string.error_server_data)
+                        is SerializationException -> stringResource(R.string.error_processing_data)
+                        else -> stringResource(R.string.error_unknown)
+                    }
+                )
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    val clip: ClipData = ClipData.newPlainText("Error log", error?.message)
+                    clipboard.setPrimaryClip(clip)
+                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+                        Toast.makeText(context, context.getString(R.string.log_copied), Toast.LENGTH_SHORT).show()
+                    }
+                }) {
+                    Text(stringResource(R.string.btn_copy_log))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.clearError()
+                    navController.popBackStack()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
+    if (downloadError != null) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.clearDownloadError()
+            },
+            title = { Text(stringResource(R.string.error_text)) },
+            text = {
+                Text(stringResource(R.string.download_error))
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    val clip: ClipData = ClipData.newPlainText("Error log", downloadError)
+                    clipboard.setPrimaryClip(clip)
+                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+                        Toast.makeText(context, context.getString(R.string.log_copied), Toast.LENGTH_SHORT).show()
+                    }
+                }) {
+                    Text(stringResource(R.string.btn_copy_log))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.clearDownloadError()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
+    if (showPermissionDialog) {
+        AlertDialog(
+            title = { Text(text = stringResource(R.string.error_no_storage_title)) },
+            text = { Text(text = stringResource(R.string.no_storage_permission_message)) },
+            onDismissRequest = {
+                viewModel.hideNoPermissionDialog()
+                navController.popBackStack()
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.hideNoPermissionDialog()
+                    navController.popBackStack()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
     Scaffold(
         topBar = {
             TopAppBar(
@@ -91,7 +180,7 @@ fun RepoScreen(navController: NavController, viewModel: BaseRepoViewModel) {
             ) {
                 LazyColumn(
                     contentPadding = paddingValues,
-                    modifier = Modifier.fillMaxSize()
+                    modifier = Modifier.navigationBarsPadding().fillMaxSize()
                 ) {
                     if (hostLists.isEmpty()) {
                         item {
@@ -107,94 +196,13 @@ fun RepoScreen(navController: NavController, viewModel: BaseRepoViewModel) {
                         }
                     } else {
                         items(hostLists) { item ->
-                            val isInstalled = viewModel.isItemInstalled(item)
+                            RepoItem(
-                            val installing = isInstalling[item.name] == true
+                                item = item,
-                            val updating = isUpdateInstalling[item.name] == true
+                                viewModel = viewModel,
-
+                                isInstalling = isInstalling,
-                            ElevatedCard(
+                                isUpdateInstalling = isUpdateInstalling,
-                                elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
+                                isUpdate = isUpdate
-                                colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+                            )
-                                modifier = Modifier
-                                    .fillMaxWidth()
-                                    .padding(start = 10.dp, top = 25.dp, end = 10.dp)
-                            ) {
-                                Column(Modifier.fillMaxWidth()) {
-                                    Row(
-                                        verticalAlignment = Alignment.CenterVertically,
-                                        modifier = Modifier
-                                            .fillMaxWidth()
-                                            .padding(16.dp)
-                                    ) {
-                                        Text(text = item.name, modifier = Modifier.weight(1f))
-                                    }
-
-                                    Row(
-                                        modifier = Modifier
-                                            .fillMaxWidth()
-                                            .padding(start = 16.dp)
-                                    ) {
-                                        Text(
-                                            text = stringResource(R.string.title_author, item.author),
-                                            modifier = Modifier.weight(1f)
-                                        )
-                                    }
-
-                                    Row(
-                                        modifier = Modifier
-                                            .fillMaxWidth()
-                                            .padding(start = 16.dp)
-                                    ) {
-                                        Text(
-                                            text = item.description,
-                                            modifier = Modifier.weight(1f)
-                                        )
-                                    }
-
-                                    HorizontalDivider(thickness = Dp.Hairline)
-
-                                    Row(
-                                        modifier = Modifier.fillMaxWidth(),
-                                        horizontalArrangement = Arrangement.End
-                                    ) {
-                                        if (isUpdate[item.name] == true && isInstalled) {
-                                            FilledTonalButton(
-                                                onClick = { viewModel.update(item) },
-                                                enabled = !updating,
-                                                modifier = Modifier.padding(horizontal = 5.dp)
-                                            ) {
-                                                Icon(
-                                                    imageVector = Icons.Default.Update,
-                                                    contentDescription = stringResource(R.string.btn_remove_host),
-                                                    modifier = Modifier.size(20.dp)
-                                                )
-                                                Text(
-                                                    if (updating) stringResource(R.string.btn_updating_host)
-                                                    else stringResource(R.string.btn_update_host)
-                                                )
-                                            }
-                                        }
-
-                                        FilledTonalButton(
-                                            onClick = { viewModel.install(item) },
-                                            enabled = !installing && !isInstalled,
-                                            modifier = Modifier.padding(horizontal = 5.dp)
-                                        ) {
-                                            Icon(
-                                                imageVector = Icons.Default.InstallMobile,
-                                                contentDescription = stringResource(R.string.btn_remove_host),
-                                                modifier = Modifier.size(20.dp)
-                                            )
-                                            Text(
-                                                when {
-                                                    installing -> stringResource(R.string.btn_installing_host)
-                                                    isInstalled -> stringResource(R.string.btn_installed_host)
-                                                    else -> stringResource(R.string.btn_install_host)
-                                                }
-                                            )
-                                        }
-                                    }
-                                }
-                            }
                         }
                     }
                 }

app/src/main/java/com/cherret/zaprett/ui/screen/SettingsScreen.kt

@@ -2,56 +2,122 @@ package com.cherret.zaprett.ui.screen
 
 import android.content.Context
 import android.content.Intent
+import android.content.SharedPreferences
+import android.graphics.drawable.Drawable
 import androidx.compose.foundation.clickable
-import androidx.compose.foundation.layout.*
+import androidx.compose.foundation.interaction.MutableInteractionSource
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.wrapContentHeight
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
+import androidx.compose.foundation.selection.selectable
+import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.automirrored.filled.ArrowForward
+import androidx.compose.material.icons.filled.AttachMoney
 import androidx.compose.material.icons.filled.MoreVert
-import androidx.compose.material3.*
+import androidx.compose.material3.AlertDialog
-import androidx.compose.runtime.*
+import androidx.compose.material3.Card
+import androidx.compose.material3.Checkbox
+import androidx.compose.material3.DropdownMenu
+import androidx.compose.material3.DropdownMenuItem
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.OutlinedTextField
+import androidx.compose.material3.RadioButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Switch
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableIntStateOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.semantics.Role
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import androidx.compose.ui.window.Dialog
+import androidx.core.content.edit
+import androidx.core.net.toUri
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import coil3.compose.AsyncImage
 import com.cherret.zaprett.BuildConfig
-import com.cherret.zaprett.ByeDpiVpnService
 import com.cherret.zaprett.R
-import com.cherret.zaprett.ServiceStatus
+import com.cherret.zaprett.byedpi.ByeDpiVpnService
-import com.cherret.zaprett.checkModuleInstallation
+import com.cherret.zaprett.ui.component.SettingsActionItem
-import com.cherret.zaprett.checkRoot
+import com.cherret.zaprett.ui.component.SettingsItem
-import com.cherret.zaprett.getStartOnBoot
+import com.cherret.zaprett.ui.component.SettingsSection
-import com.cherret.zaprett.setStartOnBoot
+import com.cherret.zaprett.data.AppListType
+import com.cherret.zaprett.data.ServiceStatus
+import com.cherret.zaprett.ui.component.InfoDialog
+import com.cherret.zaprett.data.Setting
+import com.cherret.zaprett.ui.component.TextDialog
+import com.cherret.zaprett.ui.viewmodel.SettingsViewModel
+import com.cherret.zaprett.utils.checkModuleInstallation
+import com.cherret.zaprett.utils.checkRoot
+import com.cherret.zaprett.utils.getAppsListMode
+import com.cherret.zaprett.utils.getStartOnBoot
+import com.cherret.zaprett.utils.setAppsListMode
+import com.cherret.zaprett.utils.setStartOnBoot
+import com.cherret.zaprett.utils.stopService
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable
-fun SettingsScreen() {
+fun SettingsScreen(navController: NavController, viewModel : SettingsViewModel = viewModel()) {
     val context = LocalContext.current
     val sharedPreferences = remember { context.getSharedPreferences("settings", Context.MODE_PRIVATE) }
     val editor = remember { sharedPreferences.edit() }
-
+    val useModule = viewModel.useModule.collectAsState()
-    val useModule = remember { mutableStateOf(sharedPreferences.getBoolean("use_module", false)) }
+    val updateOnBoot = remember { mutableStateOf(sharedPreferences.getBoolean("update_on_boot", true)) }
-    val updateOnBoot = remember { mutableStateOf(sharedPreferences.getBoolean("update_on_boot", false)) }
+    val autoRestart = viewModel.autoRestart.collectAsState()
-    val autoRestart = remember { mutableStateOf(getStartOnBoot()) }
+    val autoUpdate = remember { mutableStateOf(sharedPreferences.getBoolean("auto_update", BuildConfig.auto_update)) }
-    val autoUpdate = remember { mutableStateOf(sharedPreferences.getBoolean("auto_update", true)) }
+    val sendFirebaseAnalytics = remember { mutableStateOf(sharedPreferences.getBoolean("send_firebase_analytics", BuildConfig.send_firebase_analytics)) }
-    val sendFirebaseAnalytics = remember { mutableStateOf(sharedPreferences.getBoolean("send_firebase_analytics", true)) }
     val ipv6 = remember { mutableStateOf(sharedPreferences.getBoolean("ipv6",false)) }
     val openNoRootDialog = remember { mutableStateOf(false) }
     val openNoModuleDialog = remember { mutableStateOf(false) }
     val showAboutDialog = remember { mutableStateOf(false) }
     val showHostsRepoUrlDialog = remember { mutableStateOf(false) }
+    val showIpsetRepoUrlDialog = remember { mutableStateOf(false) }
     val showStrategyRepoUrlDialog = remember { mutableStateOf(false) }
     val showIPDialog = remember { mutableStateOf(false) }
     val showPortDialog = remember { mutableStateOf(false) }
     val showDNSDialog = remember { mutableStateOf(false) }
     val textDialogValue = remember { mutableStateOf("") }
+    val showWhiteDialog = remember { mutableStateOf(false) }
+    val showBlackDialog = remember { mutableStateOf(false) }
+    val showAppsListsSheet = remember { mutableStateOf(false) }
+    val showSystemApps = remember { mutableStateOf(sharedPreferences.getBoolean("show_system_apps", false)) }
+    val showChangeProbeTimeout = remember { mutableStateOf(false) }
 
     val settingsList = listOf(
         Setting.Section(stringResource(R.string.general_section)),
@@ -59,15 +125,11 @@ fun SettingsScreen() {
             title = stringResource(R.string.btn_use_root),
             checked = useModule.value,
             onToggle = { isChecked ->
-                useModule(
+                viewModel.useModule(
                     context = context,
                     checked = isChecked,
-                    updateOnBoot = updateOnBoot,
                     openNoRootDialog = openNoRootDialog,
-                    openNoModuleDialog = openNoModuleDialog
+                    openNoModuleDialog = openNoModuleDialog)
-                ) { success ->
-                    if (success) useModule.value = isChecked
-                }
             }
         ),
         Setting.Toggle(
@@ -78,13 +140,6 @@ fun SettingsScreen() {
                 editor.putBoolean("update_on_boot", it).apply()
             }
         ),
-        Setting.Toggle(
-            title = stringResource(R.string.btn_autorestart),
-            checked = autoRestart.value,
-            onToggle = {
-                if (handleAutoRestart(context, it)) autoRestart.value = it
-            }
-        ),
         Setting.Toggle(
             title = stringResource(R.string.btn_autoupdate),
             checked = autoUpdate.value,
@@ -104,17 +159,57 @@ fun SettingsScreen() {
         Setting.Action(
             title = stringResource(R.string.btn_repository_url_lists),
             onClick = {
-                textDialogValue.value = sharedPreferences.getString("hosts_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/hosts.json") ?: "https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/hosts.json"
+                textDialogValue.value = sharedPreferences.getString("hosts_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/hosts.json") ?: "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/hosts.json"
                 showHostsRepoUrlDialog.value = true
             }
         ),
+        Setting.Action(
+            title = stringResource(R.string.ipset_repo_url),
+            onClick = {
+                textDialogValue.value = sharedPreferences.getString("ipset_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/ipsets.json") ?: "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/ipsets.json"
+                showIpsetRepoUrlDialog.value = true
+            }
+        ),
         Setting.Action(
             title = stringResource(R.string.btn_repository_url_strategies),
             onClick = {
-                textDialogValue.value = sharedPreferences.getString("strategy_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/strategies.json") ?: "https://raw.githubusercontent.com/CherretGit/zaprett-hosts-repo/refs/heads/main/strategies.json"
+                textDialogValue.value = sharedPreferences.getString("strategy_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/strategies.json") ?: "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/strategies.json"
                 showStrategyRepoUrlDialog.value = true
             }
         ),
+        Setting.Section(title = stringResource(R.string.shared_section)),
+        Setting.Action(
+            title = stringResource(R.string.btn_applist),
+            onClick = {
+                showAppsListsSheet.value = true
+            }
+        ),
+        Setting.Action(
+            title = stringResource(R.string.btn_whitelist),
+            onClick = {
+                showWhiteDialog.value = true
+            }
+        ),
+        Setting.Action(
+            title = stringResource(R.string.btn_blacklist),
+            onClick = {
+                showBlackDialog.value = true
+            }
+        ),
+        Setting.Section(stringResource(R.string.title_selection)),
+        Setting.Action(
+            title = stringResource(R.string.begin_selection),
+            onClick = {
+                navController.navigate("selectionScreen")
+            }
+        ),
+        Setting.Action(
+            title = stringResource(R.string.change_probe_timeout),
+            onClick = {
+                textDialogValue.value = sharedPreferences.getLong("probe_timeout", 1000L).toString()
+                showChangeProbeTimeout.value = true
+            }
+        ),
         Setting.Section(stringResource(R.string.byedpi_section)),
         Setting.Toggle(
             title = stringResource(R.string.btn_ipv6),
@@ -144,6 +239,14 @@ fun SettingsScreen() {
                 textDialogValue.value = sharedPreferences.getString("dns", "8.8.8.8") ?: "8.8.8.8"
                 showDNSDialog.value = true
             }
+        ),
+        Setting.Section(title = stringResource(R.string.zapret_section)),
+        Setting.Toggle(
+            title = stringResource(R.string.btn_autorestart),
+            checked = autoRestart.value,
+            onToggle = {
+                viewModel.handleAutoRestart(context)
+            }
         )
     )
 
@@ -164,7 +267,7 @@ fun SettingsScreen() {
     }
 
     if (showAboutDialog.value) {
-        AboutDialog(onDismiss = { showAboutDialog.value = false })
+        AboutDialog(navController, onDismiss = { showAboutDialog.value = false })
     }
 
     if (showHostsRepoUrlDialog.value) {
@@ -172,10 +275,15 @@ fun SettingsScreen() {
             editor.putString("hosts_repo_url", it).apply()
         }, onDismiss = { showHostsRepoUrlDialog.value = false })
     }
+    if (showIpsetRepoUrlDialog.value) {
+        TextDialog(stringResource(R.string.btn_repository_url_ipsets), stringResource(R.string.hint_enter_repository_url_ipsets), textDialogValue.value, onConfirm = {
+            editor.putString("ipsets_repo_url", it).apply()
+        }, onDismiss = { showIpsetRepoUrlDialog.value = false })
+    }
 
     if (showStrategyRepoUrlDialog.value) {
         TextDialog(stringResource(R.string.btn_repository_url_strategies), stringResource(R.string.hint_enter_repository_url_strategies), textDialogValue.value, onConfirm = {
-            editor.putString("strategy_repo_url", it).apply()
+            editor.putString("strategies_repo_url", it).apply()
         }, onDismiss = { showStrategyRepoUrlDialog.value = false })
     }
 
@@ -197,6 +305,48 @@ fun SettingsScreen() {
         }, onDismiss = { showDNSDialog.value = false })
     }
 
+    if (showWhiteDialog.value) {
+        ChooseAppsDialog(
+            onDismissRequest = {
+                showWhiteDialog.value = false
+                viewModel.clearList()
+            },
+            viewModel = viewModel,
+            listType = AppListType.Whitelist,
+            sharedPreferences,
+            showSystemApps
+        )
+    }
+
+    if (showBlackDialog.value) {
+        ChooseAppsDialog(
+            onDismissRequest = {
+                showBlackDialog.value = false
+                viewModel.clearList()
+            },
+            viewModel = viewModel,
+            listType = AppListType.Blacklist,
+            sharedPreferences,
+            showSystemApps
+        )
+    }
+
+    if (showAppsListsSheet.value) {
+        ListBottomSheet(
+            onDismissRequest = {
+                showAppsListsSheet.value = false
+            },
+            prefs = sharedPreferences,
+            context
+        )
+    }
+
+    if (showChangeProbeTimeout.value) {
+        TextDialog(stringResource(R.string.probe_timeout), stringResource(R.string.hint_enter_probe_timeout), textDialogValue.value, onConfirm = {
+            editor.putLong("probe_timeout", it.toLong()).apply()
+        }, onDismiss = { showChangeProbeTimeout.value = false })
+    }
+
     Scaffold(
         topBar = {
             TopAppBar(
@@ -247,7 +397,7 @@ fun SettingsScreen() {
                             )
                         }
                         is Setting.Action -> {
-                            SettingsTextItem(
+                            SettingsActionItem(
                                 title = setting.title,
                                 setting.onClick
                             )
@@ -262,182 +412,300 @@ fun SettingsScreen() {
     )
 }
 
+@OptIn(ExperimentalMaterial3Api::class)
 @Composable
-private fun SettingsItem(title: String, checked: Boolean, onToggle: (Boolean) -> Unit, onCheckedChange: (Boolean) -> Unit) {
+private fun ListBottomSheet(
-    ElevatedCard(
+    onDismissRequest: () -> Unit,
-        modifier = Modifier
+    prefs : SharedPreferences,
-            .fillMaxWidth()
+    context: Context
-            .height(80.dp)
+){
-            .clickable { onToggle(!checked) },
+    val selectedOption = remember { mutableStateOf(getAppsListMode(prefs)) }
-        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
+    ModalBottomSheet(
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant)
+        onDismissRequest = { onDismissRequest() }
     ) {
-        Row(
+        Column(
-            verticalAlignment = Alignment.CenterVertically,
             modifier = Modifier
                 .fillMaxWidth()
-                .padding(16.dp)
+                .height(200.dp),
+            horizontalAlignment = Alignment.CenterHorizontally,
+            verticalArrangement = Arrangement.Center
         ) {
-            Text(
+            Row(
-                text = title,
+                Modifier
-                modifier = Modifier.weight(1f)
+                    .fillMaxWidth()
-            )
+                    .padding(8.dp)
-            Switch(
+                    .selectable(
-                checked = checked,
+                        selected = selectedOption.value=="none",
-                onCheckedChange = onCheckedChange
+                        onClick = {
-            )
+                            setAppsListMode(prefs, "none")
-        }
+                            selectedOption.value = "none"
-    }
+                        },
-}
+                        role = Role.RadioButton
-
+                    ),
-@Composable
+                verticalAlignment = Alignment.CenterVertically
-private fun SettingsTextItem(title: String, onClick: () -> Unit) {
-    ElevatedCard(
-        modifier = Modifier
-            .fillMaxWidth()
-            .height(80.dp)
-            .clickable { onClick() },
-        elevation = CardDefaults.cardElevation(defaultElevation = 4.dp),
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceVariant)
-    ) {
-        Row(
-            verticalAlignment = Alignment.CenterVertically,
-            modifier = Modifier
-                .fillMaxSize()
-                .padding(16.dp)
-        ) {
-            Text(
-                text = title,
-                modifier = Modifier.weight(1f)
-            )
-            Icon(imageVector = Icons.AutoMirrored.Default.ArrowForward, contentDescription = "test")
-        }
-    }
-}
-
-@Composable
-private fun SettingsSection(title: String) {
-    Text(
-        text = title,
-        fontSize = 20.sp,
-        fontWeight = FontWeight.Bold,
-        modifier = Modifier.padding(vertical = 8.dp, horizontal = 4.dp)
-    )
-}
-
-private fun useModule(context: Context, checked: Boolean, updateOnBoot: MutableState<Boolean>, openNoRootDialog: MutableState<Boolean>, openNoModuleDialog: MutableState<Boolean>, callback: (Boolean) -> Unit) {
-    val sharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
-    val editor = sharedPreferences.edit()
-    if (checked) {
-        checkRoot { hasRoot ->
-            if (hasRoot) {
-                checkModuleInstallation { hasModule ->
-                    if (hasModule) {
-                        editor.putBoolean("use_module", true)
-                            .putBoolean("update_on_boot", true)
-                            .apply()
-                        if (ByeDpiVpnService.status == ServiceStatus.Connected) {
-                            context.startService(Intent(context, ByeDpiVpnService::class.java).apply {
-                                action = "STOP_VPN"
-                            })
-                        }
-                        editor.remove("lists").apply()
-                        editor.remove("active_strategy").apply()
-                        updateOnBoot.value = true
-                        callback(true)
-                    } else {
-                        openNoModuleDialog.value = true
-                    }
-                }
-            } else {
-                openNoRootDialog.value = true
-            }
-        }
-    } else {
-        editor.putBoolean("use_module", false)
-            .putBoolean("update_on_boot", false)
-            .apply()
-        updateOnBoot.value = false
-        callback(true)
-    }
-}
-
-private fun handleAutoRestart(context: Context, checked: Boolean): Boolean {
-    val sharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
-    return if (sharedPreferences.getBoolean("use_module", false)) {
-        setStartOnBoot(checked)
-        true
-    } else {
-        false
-    }
-}
-
-@Composable
-private fun InfoDialog(title: String, message: String, onDismiss: () -> Unit) {
-    AlertDialog(
-        title = { Text(text = title) },
-        text = { Text(text = message) },
-        onDismissRequest = onDismiss,
-        confirmButton = {
-            TextButton(onClick = onDismiss) {
-                Text(stringResource(R.string.btn_continue))
-            }
-        }
-    )
-}
-
-@Composable
-private fun TextDialog(title: String, message: String, initialText: String, onConfirm: (String) -> Unit, onDismiss: () -> Unit) {
-    var inputText by remember { mutableStateOf(initialText) }
-    AlertDialog(
-        title = { Text(text = title) },
-        text = {
-            TextField(
-                value = inputText,
-                onValueChange = { inputText = it },
-                placeholder = { Text(message) },
-                singleLine = true,
-                modifier = Modifier.fillMaxWidth()
-            )},
-        onDismissRequest = onDismiss,
-        confirmButton = {
-            TextButton(onClick = {
-                if (inputText.isNotEmpty()) {
-                    onConfirm(inputText)
-                    onDismiss()
-                }
-                else {
-                    onDismiss()
-                }
-            }
             ) {
-                Text(stringResource(R.string.btn_continue))
+                RadioButton(
+                    selected = selectedOption.value.equals("none"),
+                    onClick = null
+                )
+                Text(stringResource(R.string.radio_disabed), modifier = Modifier.padding(start = 8.dp))
             }
-        },
+            Row(
-        dismissButton = {
+                Modifier
-            TextButton(
+                    .fillMaxWidth()
-                onClick = { onDismiss() }
+                    .padding(8.dp)
+                    .selectable(
+                        selected = selectedOption.value=="whitelist",
+                        onClick = {
+                            setAppsListMode(prefs, "whitelist")
+                            selectedOption.value = "whitelist"
+                        },
+                        role = Role.RadioButton
+                    ),
+                verticalAlignment = Alignment.CenterVertically
             ) {
-                Text(stringResource(R.string.btn_dismiss))
+                RadioButton(
+                    selected = selectedOption.value.equals("whitelist"),
+                    onClick = null
+                )
+                Text(stringResource(R.string.title_whitelist), modifier = Modifier.padding(start = 8.dp))
+            }
+            Row(
+                Modifier
+                    .fillMaxWidth()
+                    .padding(8.dp)
+                    .selectable(
+                        selected = selectedOption.value=="blacklist",
+                        onClick = {
+                            setAppsListMode(prefs, "blacklist")
+                            selectedOption.value = "blacklist"
+                        },
+                        role = Role.RadioButton
+                    ),
+                verticalAlignment = Alignment.CenterVertically
+            ) {
+                RadioButton(
+                    selected = selectedOption.value.equals("blacklist"),
+                    onClick = null
+                )
+                Text(stringResource(R.string.title_blacklist), modifier = Modifier.padding(start = 8.dp))
             }
         }
-    )
+    }
 }
 
+
+
 @Composable
-private fun AboutDialog(onDismiss: () -> Unit) {
+private fun AboutDialog(navController: NavController, onDismiss: () -> Unit) {
+    val context = LocalContext.current
+    val interactionSource = remember { MutableInteractionSource() }
+    var clickCount by remember { mutableIntStateOf(0) }
     AlertDialog(
         title = { Text(text = stringResource(R.string.about_title)) },
         icon = {Icon(painterResource(R.drawable.ic_launcher_monochrome), contentDescription = stringResource(R.string.app_name), modifier = Modifier
             .size(64.dp))},
-        text = { Text(text = stringResource(R.string.about_text, BuildConfig.VERSION_NAME)) },
+        text = {
+            Column(
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Text(text = stringResource(R.string.about_text, BuildConfig.VERSION_NAME), modifier = Modifier.clickable(interactionSource = interactionSource, null) {
+                    clickCount++
+                    if (clickCount == 7) {
+                        onDismiss()
+                        navController.navigate("debugScreen") { launchSingleTop = true }
+                    }
+                })
+                Row(
+                    horizontalArrangement = Arrangement.SpaceEvenly,
+                    verticalAlignment = Alignment.CenterVertically,
+                    modifier = Modifier.fillMaxWidth()
+                ) {
+                    IconButton(onClick = {
+                        val intent = Intent(Intent.ACTION_VIEW,
+                            "https://github.com/CherretGit/zaprett-app".toUri())
+                        context.startActivity(intent)
+                    }) {
+                        Icon(painterResource(R.drawable.github), "GitHub")
+                    }
+                    IconButton(onClick = {
+                        val intent = Intent(Intent.ACTION_VIEW,
+                            "https://t.me/zaprett_module".toUri())
+                        context.startActivity(intent)
+                    }) {
+                        Icon(painterResource(R.drawable.telegram), "Telegram")
+                    }
+                    IconButton(onClick = {
+                        val intent = Intent(Intent.ACTION_VIEW,
+                            "https://matrix.to/#/#zaprett-group:matrix.cherret.ru".toUri())
+                        context.startActivity(intent)
+                    }) {
+                        Icon(painterResource(R.drawable.matrix), "Matrix")
+                    }
+                    IconButton(onClick = {
+                        val intent = Intent(Intent.ACTION_VIEW,
+                            "https://pay.cloudtips.ru/p/672192fd".toUri())
+                        context.startActivity(intent)
+                    }) {
+                        Icon(Icons.Default.AttachMoney, "Donate")
+                    }
+                }
+            }
+        },
         onDismissRequest = onDismiss,
         confirmButton = { }
     )
 }
 
-sealed class Setting {
+@Composable
-    data class Toggle(val title: String, val checked: Boolean, val onToggle: (Boolean) -> Unit) : Setting()
+private fun ChooseAppsDialog(
-    data class Action(val title: String, val onClick: () -> Unit) : Setting()
+    onDismissRequest: () -> Unit,
-    data class Section(val title: String) : Setting()
+    viewModel: SettingsViewModel,
+    listType: AppListType,
+    prefs: SharedPreferences,
+    showSystemApps : MutableState<Boolean>
+) {
+    val appsList by viewModel.appsList.collectAsState()
+    val selectedPackages by viewModel.selectedPackages.collectAsState()
+    var searchQuery by remember { mutableStateOf("") }
+    val filteredList = remember(searchQuery, appsList) {
+        if (searchQuery.isBlank()) appsList
+        else appsList.filter { it.contains(searchQuery, ignoreCase = true) }
+    }
+    var expanded by remember { mutableStateOf(false) }
+    val title = if (listType == AppListType.Whitelist) stringResource(R.string.title_whitelist) else stringResource(R.string.title_blacklist)
+    LaunchedEffect(listType) {
+        viewModel.setListType(listType)
+    }
+    Dialog(onDismissRequest = onDismissRequest) {
+        Card(
+            modifier = Modifier
+                .wrapContentHeight()
+                .padding(16.dp),
+            shape = RoundedCornerShape(16.dp),
+        ) {
+            Column(
+                modifier = Modifier
+                    .wrapContentHeight()
+                    .fillMaxWidth()) {
+                Row(modifier = Modifier
+                    .fillMaxWidth()
+                    .padding(16.dp),
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    Text(
+                        text = title,
+                        modifier = Modifier.weight(1f),
+                        fontWeight = FontWeight.Bold,
+                        fontSize = 24.sp
+                    )
+                    Box {
+                        IconButton(onClick = { expanded = !expanded }) {
+                            Icon(Icons.Default.MoreVert, contentDescription = "More options")
+                        }
+                        DropdownMenu(
+                            expanded = expanded,
+                            onDismissRequest = { expanded = false }
+                        ) {
+                            DropdownMenuItem(
+                                text = {
+                                    Row(
+                                        verticalAlignment = Alignment.CenterVertically
+                                    ) {
+                                        Text(
+                                            text = stringResource(R.string.btn_show_system_apps),
+                                            fontSize = 12.sp,
+                                            textAlign = TextAlign.Center
+                                        )
+                                        Checkbox(
+                                            checked = showSystemApps.value,
+                                            onCheckedChange = null
+                                        )
+                                    }
+                                },
+                                onClick = {
+                                    prefs.edit { putBoolean("show_system_apps", !showSystemApps.value) }
+                                    showSystemApps.value = !showSystemApps.value
+                                    viewModel.refreshApplications()
+                                    expanded = false
+                                }
+                            )
+                        }
+                    }
+                }
+                Row {
+                    OutlinedTextField(
+                        value = searchQuery,
+                        onValueChange = { searchQuery = it },
+                        placeholder = { Text(stringResource(R.string.search_field)) },
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(8.dp)
+                    )
+                }
+                LazyColumn(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .heightIn(max = 400.dp),
+                    horizontalAlignment = Alignment.CenterHorizontally,
+                ) {
+                    items(filteredList) {
+                        AppItem(viewModel(), it, selectedPackages.contains(it), { isChecked ->
+                            if (isChecked){ viewModel.addToList(listType, it) }
+                            else { viewModel.removeFromList(listType, it) }
+                            }
+                        )
+                    }
+                }
+                Row(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .padding(bottom = 8.dp, end = 8.dp),
+                    horizontalArrangement = Arrangement.End,
+                    verticalAlignment = Alignment.CenterVertically
+                ) {
+                    TextButton(
+                        onClick = { onDismissRequest() },
+                        modifier = Modifier.padding(8.dp, top = 4.dp),
+                    ) {
+                        Text(text = stringResource(R.string.btn_continue))
+                    }
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun AppItem(viewModel: SettingsViewModel, packageName : String, enabled : Boolean, onCheckedChange: (Boolean) -> Unit) {
+    var bitmap by remember { mutableStateOf<Drawable?>(null) }
+    LaunchedEffect(packageName) {
+        bitmap = viewModel.getAppIconBitmap(packageName)
+    }
+    Row (
+        modifier = Modifier
+            .fillMaxWidth()
+            .height(48.dp)
+            .padding(horizontal = 8.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        AsyncImage(
+            model = bitmap,
+            contentDescription = null,
+            modifier = Modifier
+                .padding(4.dp)
+        )
+        Text(
+            text = viewModel.getApplicationName(packageName) ?: "unknown",
+            modifier = Modifier
+                .weight(1f),
+            maxLines = 1,
+            overflow = TextOverflow.Ellipsis,
+            fontSize = 18.sp
+        )
+        Switch(
+                checked = enabled,
+                onCheckedChange = onCheckedChange
+        )
+    }
 }

app/src/main/java/com/cherret/zaprett/ui/screen/StrategyScreen.kt

@@ -1,43 +1,41 @@
 package com.cherret.zaprett.ui.screen
 
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
+import android.os.Build
+import android.widget.Toast
 import androidx.activity.compose.rememberLauncherForActivityResult
 import androidx.activity.result.ActivityResultLauncher
 import androidx.activity.result.contract.ActivityResultContracts
-import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
-import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.WindowInsets
 import androidx.compose.foundation.layout.fillMaxSize
-import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.lazy.LazyColumn
 import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Add
-import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.filled.Download
 import androidx.compose.material.icons.filled.UploadFile
-import androidx.compose.material3.CardDefaults
+import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.DropdownMenu
 import androidx.compose.material3.DropdownMenuItem
-import androidx.compose.material3.ElevatedCard
 import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
-import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.SnackbarHost
 import androidx.compose.material3.SnackbarHostState
-import androidx.compose.material3.Switch
 import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
 import androidx.compose.material3.TopAppBar
 import androidx.compose.material3.pulltorefresh.PullToRefreshBox
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
@@ -51,12 +49,12 @@ import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.text.style.TextAlign
-import androidx.compose.ui.unit.Dp
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.viewmodel.compose.viewModel
 import androidx.navigation.NavController
 import com.cherret.zaprett.R
+import com.cherret.zaprett.ui.component.ListSwitchItem
 import com.cherret.zaprett.ui.viewmodel.StrategyViewModel
 
 @OptIn(ExperimentalMaterial3Api::class)
@@ -69,6 +67,7 @@ fun StrategyScreen(navController: NavController, viewModel: StrategyViewModel =
     val allLists = viewModel.allItems
     val checked = viewModel.checked
     val isRefreshing = viewModel.isRefreshing
+    val showPermissionDialog by viewModel.showNoPermissionDialog.collectAsState()
     val filePickerLauncher = rememberLauncherForActivityResult(
         contract = ActivityResultContracts.OpenDocument()
     ) { uri ->
@@ -78,11 +77,43 @@ fun StrategyScreen(navController: NavController, viewModel: StrategyViewModel =
             it
         ) }
     }
+    val error by viewModel.errorFlow.collectAsState()
 
     LaunchedEffect(Unit) {
         viewModel.refresh()
     }
 
+    if (error.isNotEmpty()) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.clearError()
+            },
+            title = { Text(stringResource(R.string.error_text)) },
+            text = {
+                Text(stringResource(R.string.error_unknown))
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    val clip: ClipData = ClipData.newPlainText("Error log", error)
+                    clipboard.setPrimaryClip(clip)
+                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+                        Toast.makeText(context, context.getString(R.string.log_copied), Toast.LENGTH_SHORT).show()
+                    }
+                }) {
+                    Text(stringResource(R.string.btn_copy_log))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.clearError()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
     Scaffold(
         topBar = {
             TopAppBar(
@@ -105,8 +136,11 @@ fun StrategyScreen(navController: NavController, viewModel: StrategyViewModel =
                 modifier = Modifier.fillMaxSize()
             ) {
                 LazyColumn(
-                    contentPadding = paddingValues,
+                    contentPadding = PaddingValues(
-                    modifier = Modifier.fillMaxSize()
+                        top = paddingValues.calculateTopPadding(),
+                        bottom = paddingValues.calculateBottomPadding() + 80.dp
+                    ),
+                    modifier = Modifier.navigationBarsPadding().fillMaxSize()
                 ) {
                     when {
                         allLists.isEmpty() -> {
@@ -124,7 +158,7 @@ fun StrategyScreen(navController: NavController, viewModel: StrategyViewModel =
                         }
                         else -> {
                             items(allLists) { item ->
-                                StrategyItem(
+                                ListSwitchItem(
                                     item = item,
                                     isChecked = checked[item] == true,
                                     onCheckedChange = { isChecked ->
@@ -145,43 +179,23 @@ fun StrategyScreen(navController: NavController, viewModel: StrategyViewModel =
         },
         snackbarHost = { SnackbarHost(hostState = snackbarHostState) }
     )
-}
+    if (showPermissionDialog) {
-
+        AlertDialog(
-@Composable
+            title = { Text(text = stringResource(R.string.error_no_storage_title)) },
-private fun StrategyItem(item: String, isChecked: Boolean, onCheckedChange: (Boolean) -> Unit, onDeleteClick: () -> Unit) {
+            text = { Text(text = stringResource(R.string.no_storage_permission_message)) },
-    ElevatedCard(
+            onDismissRequest = {
-        elevation = CardDefaults.cardElevation(defaultElevation = 6.dp),
+                viewModel.hideNoPermissionDialog()
-        colors = CardDefaults.cardColors(containerColor = MaterialTheme.colorScheme.surfaceContainer),
+                navController.popBackStack()
-        modifier = Modifier
+            },
-            .fillMaxWidth()
+            confirmButton = {
-            .padding(start = 10.dp, top = 25.dp, end = 10.dp)
+                TextButton(onClick = {
-    ) {
+                    viewModel.hideNoPermissionDialog()
-        Row(
+                    navController.popBackStack()
-            verticalAlignment = Alignment.CenterVertically,
+                }) {
-            modifier = Modifier
+                    Text(stringResource(R.string.btn_continue))
-                .fillMaxWidth()
+                }
-                .padding(16.dp)
-        ) {
-            Text(text = item, modifier = Modifier.weight(1f))
-            Switch(checked = isChecked, onCheckedChange = onCheckedChange)
-        }
-        HorizontalDivider(thickness = Dp.Hairline)
-        Row(
-            modifier = Modifier.fillMaxWidth(),
-            horizontalArrangement = Arrangement.End
-        ) {
-            FilledTonalButton(
-                onClick = onDeleteClick,
-                modifier = Modifier.padding(horizontal = 5.dp)
-            ) {
-                Icon(
-                    imageVector = Icons.Default.Delete,
-                    contentDescription = stringResource(R.string.btn_remove_host),
-                    modifier = Modifier.size(20.dp)
-                )
-                Text(stringResource(R.string.btn_remove_host))
             }
-        }
+        )
     }
 }
 

app/src/main/java/com/cherret/zaprett/ui/screen/StrategySelectionScreen.kt

@@ -0,0 +1,238 @@
+package com.cherret.zaprett.ui.screen
+
+import android.content.ClipData
+import android.content.ClipboardManager
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+import android.content.Intent
+import android.net.VpnService
+import android.os.Build
+import android.widget.Toast
+import androidx.activity.result.ActivityResultLauncher
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.navigationBarsPadding
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.items
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.ArrowBack
+import androidx.compose.material.icons.filled.Info
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.FilledTonalButton
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.SnackbarHost
+import androidx.compose.material3.SnackbarHostState
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TopAppBar
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.MutableState
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
+import androidx.navigation.NavController
+import com.cherret.zaprett.R
+import com.cherret.zaprett.ui.component.StrategySelectionItem
+import com.cherret.zaprett.ui.viewmodel.StrategySelectionViewModel
+import kotlinx.coroutines.launch
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun StrategySelectionScreen(navController: NavController, vpnLauncher: ActivityResultLauncher<Intent>, viewModel : StrategySelectionViewModel = viewModel()){
+    val snackbarHostState = remember { SnackbarHostState() }
+    val strategyStates = viewModel.strategyStates
+    val context = LocalContext.current
+    val prefs = context.getSharedPreferences("settings", MODE_PRIVATE)
+    var showDialog = remember { mutableStateOf(false) }
+    val requestVpnPermission by viewModel.requestVpnPermission.collectAsState()
+    val error by viewModel.errorFlow.collectAsState()
+
+    if (showDialog.value) {
+        InfoAlert { showDialog.value = false }
+    }
+
+    LaunchedEffect(requestVpnPermission) {
+        if (requestVpnPermission) {
+            val intent = VpnService.prepare(context)
+            if (intent != null) {
+                vpnLauncher.launch(intent)
+            } else {
+                viewModel.startVpn()
+                viewModel.clearVpnPermissionRequest()
+            }
+        }
+    }
+
+    if (error.isNotEmpty()) {
+        AlertDialog(
+            onDismissRequest = {
+                viewModel.clearError()
+            },
+            title = { Text(stringResource(R.string.error_text)) },
+            text = {
+                Text(stringResource(R.string.error_unknown))
+            },
+            dismissButton = {
+                TextButton(onClick = {
+                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+                    val clip: ClipData = ClipData.newPlainText("Error log", error)
+                    clipboard.setPrimaryClip(clip)
+                    if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.S) {
+                        Toast.makeText(context, context.getString(R.string.log_copied), Toast.LENGTH_SHORT).show()
+                    }
+                }) {
+                    Text(stringResource(R.string.btn_copy_log))
+                }
+            },
+            confirmButton = {
+                TextButton(onClick = {
+                    viewModel.clearError()
+                }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+
+    Scaffold(
+        topBar = {
+            TopAppBar(
+                title = {
+                    Text(
+                        text = stringResource(R.string.title_selection),
+                        fontSize = 30.sp,
+                        fontFamily = FontFamily(Font(R.font.unbounded, FontWeight.Normal))
+                    )
+                },
+                navigationIcon = {
+                    IconButton(onClick = { navController.popBackStack() }) {
+                        Icon(
+                            imageVector = Icons.AutoMirrored.Filled.ArrowBack,
+                            contentDescription = stringResource(R.string.btn_back)
+                        )
+                    }
+                },
+                actions = {
+                    IconButton(
+                        onClick = {
+                            showDialog.value = true
+                        }
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Info,
+                            contentDescription = "info"
+                        )
+                    }
+                },
+                windowInsets = WindowInsets(0)
+            )
+        },
+        snackbarHost = { SnackbarHost(snackbarHostState) },
+        content = { paddingValues ->
+            LazyColumn (
+                contentPadding = PaddingValues(
+                    top = paddingValues.calculateTopPadding(),
+                    bottom = paddingValues.calculateBottomPadding() + 40.dp
+                ),
+                modifier = Modifier.fillMaxSize()
+            ) {
+                item {
+                    Row (
+                        modifier = Modifier
+                            .fillMaxWidth(),
+                        horizontalArrangement = Arrangement.Center
+                    )
+                    {
+                        NoHostsCard(viewModel.noHostsCard)
+                        FilledTonalButton(
+                            onClick = {
+                                viewModel.viewModelScope.launch {
+                                    snackbarHostState.showSnackbar(
+                                        context.getString(R.string.begin_selection_snack)
+                                    )
+                                    viewModel.performTest()
+                                }
+                            }
+                        ) {
+                            Text(stringResource(R.string.begin_selection))
+                        }
+                    }
+                }
+                when {
+                    strategyStates.isEmpty() -> {
+                        item {
+                            Box(
+                                modifier = Modifier.fillParentMaxSize(),
+                                contentAlignment = Alignment.Center
+                            ) {
+                                Text(
+                                    stringResource(R.string.empty_list),
+                                    textAlign = TextAlign.Center
+                                )
+                            }
+                        }
+                    }
+                    else -> {
+                        items(strategyStates, key = { it.path }) { item ->
+                            StrategySelectionItem(item, prefs, context, snackbarHostState)
+                        }
+                    }
+                }
+            }
+        }
+    )
+}
+
+@Composable
+fun InfoAlert(onDismiss: () -> Unit) {
+    AlertDialog(
+        title = { Text(text = stringResource(R.string.strategy_selection_info_title)) },
+        text = { Text(text = stringResource(R.string.strategy_selection_info_msg)) },
+        onDismissRequest = onDismiss,
+        confirmButton = {
+            TextButton(onClick = onDismiss) {
+                Text(stringResource(R.string.btn_continue))
+            }
+        }
+    )
+}
+
+@Composable
+private fun NoHostsCard(noHostsCard: MutableState<Boolean>) {
+    if (noHostsCard.value) {
+        AlertDialog(
+            title = { Text(text = stringResource(R.string.selection_no_hosts_title)) },
+            text = { Text(text = stringResource(R.string.selection_no_hosts_message)) },
+            onDismissRequest = {
+                noHostsCard.value = false
+            },
+            confirmButton = {
+                TextButton(onClick = { noHostsCard.value = false }) {
+                    Text(stringResource(R.string.btn_continue))
+                }
+            }
+        )
+    }
+}

app/src/main/java/com/cherret/zaprett/ui/viewmodel/BaseListsViewModel.kt

@@ -2,7 +2,9 @@ package com.cherret.zaprett.ui.viewmodel
 
 import android.app.Application
 import android.content.Context
+import android.content.pm.PackageManager
 import android.net.Uri
+import android.os.Build
 import android.os.Environment
 import android.provider.OpenableColumns
 import androidx.compose.material3.SnackbarHostState
@@ -11,11 +13,16 @@ import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
+import androidx.core.content.ContextCompat
 import androidx.lifecycle.AndroidViewModel
 import com.cherret.zaprett.R
-import com.cherret.zaprett.getZaprettPath
+import com.cherret.zaprett.utils.checkStoragePermission
-import com.cherret.zaprett.restartService
+import com.cherret.zaprett.utils.getZaprettPath
+import com.cherret.zaprett.utils.restartService
 import kotlinx.coroutines.CoroutineScope
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 import java.io.File
 import java.io.FileOutputStream
@@ -31,20 +38,35 @@ abstract class BaseListsViewModel(application: Application) : AndroidViewModel(a
     var isRefreshing by mutableStateOf(false)
         private set
 
+    private val _errorFlow = MutableStateFlow("")
+    val errorFlow = _errorFlow.asStateFlow()
+
+    private var _showNoPermissionDialog = MutableStateFlow(false)
+    val showNoPermissionDialog: StateFlow<Boolean> = _showNoPermissionDialog
+
     abstract fun loadAllItems(): Array<String>
     abstract fun loadActiveItems(): Array<String>
     abstract fun onCheckedChange(item: String, isChecked: Boolean, snackbarHostState: SnackbarHostState, scope: CoroutineScope)
     abstract fun deleteItem(item: String, snackbarHostState: SnackbarHostState, scope: CoroutineScope)
 
     fun refresh() {
-        isRefreshing = true
+        when (checkStoragePermission(context)) {
-        allItems = loadAllItems().toList()
+            true -> {
-        activeItems = loadActiveItems().toList()
+                isRefreshing = true
-        checked.clear()
+                allItems = loadAllItems().toList()
-        allItems.forEach { list ->
+                activeItems = loadActiveItems().toList()
-            checked[list] = activeItems.contains(list)
+                checked.clear()
+                allItems.forEach { list ->
+                    checked[list] = activeItems.contains(list)
+                }
+                isRefreshing = false
+            }
+            false -> _showNoPermissionDialog.value = true
         }
-        isRefreshing = false
+    }
+
+    fun hideNoPermissionDialog() {
+        _showNoPermissionDialog.value = false
     }
     
     fun showRestartSnackbar(context: Context, snackbarHostState: SnackbarHostState, scope: CoroutineScope) {
@@ -54,14 +76,24 @@ abstract class BaseListsViewModel(application: Application) : AndroidViewModel(a
                 actionLabel = context.getString(R.string.btn_restart_service)
             )
             if (result == SnackbarResult.ActionPerformed) {
-                restartService {}
+                restartService { error ->
+                    _errorFlow.value = error
+                }
                 snackbarHostState.showSnackbar(context.getString(R.string.snack_reload))
             }
         }
     }
 
+    fun clearError() {
+        _errorFlow.value = ""
+    }
+
     fun copySelectedFile(context: Context, path: String, uri: Uri) {
-        if (!Environment.isExternalStorageManager()) return
+        //if (!Environment.isExternalStorageManager()) return
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R){
+            if (!Environment.isExternalStorageManager()) return
+        }
+        else if (ContextCompat.checkSelfPermission(context, android.Manifest.permission.READ_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED || ContextCompat.checkSelfPermission(context, android.Manifest.permission.WRITE_EXTERNAL_STORAGE)!= PackageManager.PERMISSION_GRANTED) return
         val contentResolver = context.contentResolver
         val fileName = contentResolver.query(uri, null, null, null, null)?.use { cursor ->
             val nameIndex = cursor.getColumnIndex(OpenableColumns.DISPLAY_NAME)
@@ -72,9 +104,29 @@ abstract class BaseListsViewModel(application: Application) : AndroidViewModel(a
         if (!directory.exists()) {
             directory.mkdirs()
         }
-        val outputFile = File(getZaprettPath() + path, fileName)
 
         try {
+            val outputFile = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+                if (Environment.isExternalStorageManager()) {
+                    val outputDir = File(getZaprettPath() + path)
+                    if (!outputDir.exists()) {
+                        outputDir.mkdirs()
+                    }
+                    File(outputDir, fileName)
+                } else {
+                    val outputDir = File(context.filesDir, path)
+                    if (!outputDir.exists()) {
+                        outputDir.mkdirs()
+                    }
+                    File(outputDir, fileName)
+                }
+            } else {
+                val outputDir = File(context.filesDir, path)
+                if (!outputDir.exists()) {
+                    outputDir.mkdirs()
+                }
+                File(outputDir, fileName)
+            }
             contentResolver.openInputStream(uri)?.use { inputStream ->
                 FileOutputStream(outputFile).use { outputStream ->
                     inputStream.copyTo(outputStream)

app/src/main/java/com/cherret/zaprett/ui/viewmodel/BaseRepoViewModel.kt

@@ -1,5 +1,6 @@
 package com.cherret.zaprett.ui.viewmodel
 
+import android.annotation.SuppressLint
 import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
@@ -9,21 +10,35 @@ import androidx.compose.runtime.mutableStateMapOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.lifecycle.AndroidViewModel
 import androidx.lifecycle.viewModelScope
-import com.cherret.zaprett.RepoItemInfo
+import com.cherret.zaprett.utils.RepoItemInfo
 import com.cherret.zaprett.R
-import com.cherret.zaprett.download
+import com.cherret.zaprett.data.ItemType
-import com.cherret.zaprett.getFileSha256
+import com.cherret.zaprett.utils.checkStoragePermission
-import com.cherret.zaprett.getZaprettPath
+import com.cherret.zaprett.utils.download
-import com.cherret.zaprett.registerDownloadListenerHost
+import com.cherret.zaprett.utils.getFileSha256
-import com.cherret.zaprett.restartService
+import com.cherret.zaprett.utils.getHostListMode
+import com.cherret.zaprett.utils.getZaprettPath
+import com.cherret.zaprett.utils.registerDownloadListener
+import com.cherret.zaprett.utils.restartService
 import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.launch
 import java.io.File
 
-
 abstract class BaseRepoViewModel(application: Application) : AndroidViewModel(application) {
-    val context = application.applicationContext
+    @SuppressLint("StaticFieldLeak")
+    val context: Context = application.applicationContext
     val sharedPreferences: SharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
+    private val _errorFlow = MutableStateFlow<Throwable?>(null)
+    val errorFlow: StateFlow<Throwable?> = _errorFlow
+
+    private val _downloadErrorFlow = MutableStateFlow<String?>(null)
+
+    val downloadErrorFlow: StateFlow<String?> = _downloadErrorFlow
+
+    private var _showPermissionDialog = MutableStateFlow(false)
+    val showPermissionDialog: StateFlow<Boolean> = _showPermissionDialog
 
     var hostLists = mutableStateOf<List<RepoItemInfo>>(emptyList())
         protected set
@@ -36,76 +51,123 @@ abstract class BaseRepoViewModel(application: Application) : AndroidViewModel(ap
     val isUpdateInstalling = mutableStateMapOf<String, Boolean>()
 
     abstract fun getInstalledLists(): Array<String>
-    abstract fun getRepoList(callback: (List<RepoItemInfo>?) -> Unit)
+    abstract fun getRepoList(callback: (Result<List<RepoItemInfo>>) -> Unit)
 
     fun refresh() {
         isRefreshing.value = true
-        getRepoList { list ->
+        getRepoList { result ->
             viewModelScope.launch(Dispatchers.IO) {
-                val safeList = list ?: emptyList()
+                result
-                val useModule = sharedPreferences.getBoolean("use_module", false)
+                    .onSuccess { safeList ->
-                val filteredList = safeList.filter { item ->
+                        val useModule = sharedPreferences.getBoolean("use_module", false)
-                    when (item.type) {
+                        val listType = getHostListMode(sharedPreferences)
-                        "list" -> true
+                        val filteredList = safeList.filter { item ->
-                        "nfqws" -> useModule
+                            when (item.type) {
-                        "byedpi" -> !useModule
+                                ItemType.list -> listType == "whitelist"
-                        else -> false
+                                ItemType.list_exclude -> listType == "blacklist"
+                                ItemType.ipset -> listType == "whitelist"
+                                ItemType.ipset_exclude -> listType == "blacklist"
+                                ItemType.nfqws -> useModule
+                                ItemType.byedpi -> !useModule
+                            }
+                        }
+                        hostLists.value = filteredList
+                        isUpdate.clear()
+                        val existingHashes = getInstalledLists().map { getFileSha256(File(it)) }
+                        for (item in filteredList) {
+                            isUpdate[item.name] = item.hash !in existingHashes
+                        }
+                    }
+                    .onFailure { e ->
+                        _errorFlow.value = e
                     }
-                }
-                hostLists.value = filteredList
-                isUpdate.clear()
-                val existingHashes = getInstalledLists().map { getFileSha256(File(it)) }
-                for (item in filteredList) {
-                    isUpdate[item.name] = item.hash !in existingHashes
-                }
-                isRefreshing.value = false
             }
+            isRefreshing.value = false
         }
     }
 
+    fun clearError() {
+        _errorFlow.value = null
+    }
+
+    fun clearDownloadError() {
+        _downloadErrorFlow.value = null
+    }
+
     fun isItemInstalled(item: RepoItemInfo): Boolean {
         return getInstalledLists().any { File(it).name == item.name }
     }
 
     fun install(item: RepoItemInfo) {
-        isInstalling[item.name] = true
+        when (checkStoragePermission(context)) {
-        val downloadId = download(context, item.url)
+            true -> {
-        registerDownloadListenerHost(context, downloadId) { uri ->
+                isInstalling[item.name] = true
-            viewModelScope.launch(Dispatchers.IO) {
+                val downloadId = download(context, item.url)
-                val sourceFile = File(uri.path!!)
+                registerDownloadListener(context, downloadId, { uri ->
-                val targetDir = when (item.type) {
+                    viewModelScope.launch(Dispatchers.IO) {
-                    "byedpi" -> File(getZaprettPath(), "strategies/byedpi")
+                        val sourceFile = File(uri.path!!)
-                    "nfqws" -> File(getZaprettPath(), "strategies/nfqws")
+                        val targetDir = when (item.type) {
-                    else -> File(getZaprettPath(), "lists")
+                            ItemType.byedpi -> File(getZaprettPath(), "strategies/byedpi")
-                }
+                            ItemType.nfqws -> File(getZaprettPath(), "strategies/nfqws")
-                val targetFile = File(targetDir, uri.lastPathSegment!!)
+                            ItemType.list -> File(getZaprettPath(), "lists/include")
-                sourceFile.copyTo(targetFile, overwrite = true)
+                            ItemType.list_exclude -> File(getZaprettPath(), "lists/exclude")
-                sourceFile.delete()
+                            ItemType.ipset -> File(getZaprettPath(), "ipset/include")
-                isInstalling[item.name] = false
+                            ItemType.ipset_exclude -> File(getZaprettPath(), "ipset/exclude")
-                isUpdate[item.name] = false
+                        }
-                refresh()
+                        val targetFile = File(targetDir, uri.lastPathSegment!!)
+                        sourceFile.copyTo(targetFile, overwrite = true)
+                        sourceFile.delete()
+                        isInstalling[item.name] = false
+                        isUpdate[item.name] = false
+                        refresh()
+                    }
+                }, onError = {
+                    isInstalling[item.name] = false
+                    isUpdate[item.name] = false
+                    refresh()
+                    _downloadErrorFlow.value = it
+                })
             }
+            false -> _showPermissionDialog.value = true
         }
     }
+
+    fun hideNoPermissionDialog() {
+        _showPermissionDialog.value = false
+    }
+
     fun update(item: RepoItemInfo) {
         isUpdateInstalling[item.name] = true
         val downloadId = download(context, item.url)
-        registerDownloadListenerHost(context, downloadId) { uri ->
+        registerDownloadListener(
-            viewModelScope.launch(Dispatchers.IO) {
+            context,
-                val sourceFile = File(uri.path!!)
+            downloadId,
-                val targetDir = when (item.type) {
+            onDownloaded = { uri ->
-                    "byedpi" -> File(getZaprettPath(), "strategies/byedpi")
+                viewModelScope.launch(Dispatchers.IO) {
-                    "nfqws" -> File(getZaprettPath(), "strategies/nfqws")
+                    val sourceFile = File(uri.path!!)
-                    else -> File(getZaprettPath(), "lists")
+                    val targetDir = when (item.type) {
+                        ItemType.byedpi -> File(getZaprettPath(), "strategies/byedpi")
+                        ItemType.nfqws -> File(getZaprettPath(), "strategies/nfqws")
+                        ItemType.list -> File(getZaprettPath(), "lists/include")
+                        ItemType.list_exclude -> File(getZaprettPath(), "lists/exclude")
+                        ItemType.ipset -> File(getZaprettPath(), "ipset/include")
+                        ItemType.ipset_exclude -> File(getZaprettPath(), "ipset/exclude")
+                    }
+                    val targetFile = File(targetDir, uri.lastPathSegment!!)
+                    sourceFile.copyTo(targetFile, overwrite = true)
+                    sourceFile.delete()
+                    isUpdateInstalling[item.name] = false
+                    isUpdate[item.name] = false
+                    refresh()
                 }
-                val targetFile = File(targetDir, uri.lastPathSegment!!)
+            },
-                sourceFile.copyTo(targetFile, overwrite = true)
+            onError = { error ->
-                sourceFile.delete()
                 isUpdateInstalling[item.name] = false
                 isUpdate[item.name] = false
                 refresh()
+                _downloadErrorFlow.value = error
             }
-        }
+        )
     }
 
     fun showRestartSnackbar(snackbarHostState: SnackbarHostState) {

app/src/main/java/com/cherret/zaprett/ui/viewmodel/HomeViewModel.kt

@@ -3,27 +3,37 @@ package com.cherret.zaprett.ui.viewmodel
 import android.app.Application
 import android.content.Context
 import android.content.Intent
+import android.net.Uri
+import android.provider.Settings
+import android.widget.Toast
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Cancel
+import androidx.compose.material.icons.filled.CheckCircle
 import androidx.compose.material3.SnackbarHostState
 import androidx.compose.runtime.mutableIntStateOf
 import androidx.compose.runtime.mutableStateOf
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.AndroidViewModel
-import com.cherret.zaprett.ByeDpiVpnService
+import com.cherret.zaprett.BuildConfig
 import com.cherret.zaprett.R
-import com.cherret.zaprett.ServiceStatus
+import com.cherret.zaprett.byedpi.ByeDpiVpnService
-import com.cherret.zaprett.download
+import com.cherret.zaprett.data.ServiceStatus
-import com.cherret.zaprett.getBinVersion
+import com.cherret.zaprett.data.ServiceStatusUI
-import com.cherret.zaprett.getChangelog
+import com.cherret.zaprett.utils.download
-import com.cherret.zaprett.getModuleVersion
+import com.cherret.zaprett.utils.getActiveStrategy
-import com.cherret.zaprett.getStatus
+import com.cherret.zaprett.utils.getBinVersion
-import com.cherret.zaprett.getUpdate
+import com.cherret.zaprett.utils.getChangelog
-import com.cherret.zaprett.installApk
+import com.cherret.zaprett.utils.getModuleVersion
-import com.cherret.zaprett.registerDownloadListener
+import com.cherret.zaprett.utils.getStatus
-import com.cherret.zaprett.restartService
+import com.cherret.zaprett.utils.getUpdate
-import com.cherret.zaprett.startService
+import com.cherret.zaprett.utils.installApk
-import com.cherret.zaprett.stopService
+import com.cherret.zaprett.utils.registerDownloadListener
+import com.cherret.zaprett.utils.restartService
+import com.cherret.zaprett.utils.startService
+import com.cherret.zaprett.utils.stopService
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.launch
 
@@ -32,8 +42,11 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
     private val prefs = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
     private val _requestVpnPermission = MutableStateFlow(false)
     val requestVpnPermission = _requestVpnPermission.asStateFlow()
-    var cardText = mutableIntStateOf(R.string.status_not_availible) // MVP temporarily(maybe)
+    private val _serviceStatus = MutableStateFlow(ServiceStatusUI())
-        private set
+    val serviceStatus: StateFlow<ServiceStatusUI> = _serviceStatus.asStateFlow()
+
+    private val _errorFlow = MutableStateFlow("")
+    val errorFlow = _errorFlow.asStateFlow()
 
     var moduleVer = mutableStateOf(context.getString(R.string.unknown_text))
         private set
@@ -41,7 +54,7 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
     var nfqwsVer = mutableStateOf(context.getString(R.string.unknown_text))
         private set
 
-    var byedpiVer = mutableStateOf(context.getString(R.string.unknown_text))
+    var byedpiVer = mutableStateOf("0.17.3")
         private set
 
     var serviceMode = mutableIntStateOf(R.string.service_mode_ciadpi)
@@ -62,8 +75,8 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
     var showUpdateDialog = mutableStateOf(false)
 
     fun checkForUpdate() {
-        if (prefs.getBoolean("auto_update", true)) {
+        if (prefs.getBoolean("auto_update", BuildConfig.auto_update)) {
-            getUpdate {
+            getUpdate(prefs) {
                 if (it != null) {
                     downloadUrl.value = it.downloadUrl.toString()
                     getChangelog(it.changelogUrl.toString()) { log -> changeLog.value = log }
@@ -74,25 +87,35 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
         }
     }
 
-    fun checkServiceStatus() {
+    private fun updateServiceStatus(useModule: Boolean) {
-        if (prefs.getBoolean("use_module", false) && prefs.getBoolean("update_on_boot", false)) {
+        if (useModule) {
             getStatus { isEnabled ->
-                cardText.intValue = if (isEnabled) R.string.status_enabled else R.string.status_disabled
+                _serviceStatus.value = if (isEnabled) {
+                    ServiceStatusUI(R.string.status_enabled, Icons.Filled.CheckCircle)
+                } else {
+                    ServiceStatusUI(R.string.status_disabled, Icons.Filled.Cancel)
+                }
+            }
+        } else {
+            _serviceStatus.value = if (ByeDpiVpnService.status == ServiceStatus.Connected) {
+                ServiceStatusUI(R.string.status_enabled, Icons.Filled.CheckCircle)
+            } else {
+                ServiceStatusUI(R.string.status_disabled, Icons.Filled.Cancel)
             }
         }
-        else {
+    }
-            cardText.value = if (ByeDpiVpnService.status == ServiceStatus.Connected) R.string.status_enabled else R.string.status_disabled
+
+    fun checkServiceStatus() {
+        val updateOnBoot = prefs.getBoolean("update_on_boot", true)
+        if (updateOnBoot) {
+            val useModule = prefs.getBoolean("use_module", false)
+            updateServiceStatus(useModule)
         }
     }
 
     fun onCardClick() {
-        if (prefs.getBoolean("use_module", false)) {
+        val useModule = prefs.getBoolean("use_module", false)
-            getStatus { isEnabled ->
+        updateServiceStatus(useModule)
-                cardText.value = if (isEnabled) R.string.status_enabled else R.string.status_disabled
-            }
-        } else {
-            cardText.value = if (ByeDpiVpnService.status == ServiceStatus.Connected) R.string.status_enabled else R.string.status_disabled
-        }
     }
 
     fun startVpn() {
@@ -109,14 +132,26 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
                         )
                     )
                 }
-                if (!isEnabled) startService {}
+                if (!isEnabled) startService { error ->
+                    _errorFlow.value = error
+                    onCardClick()
+                }
             }
         } else {
             if (ByeDpiVpnService.status == ServiceStatus.Disconnected || ByeDpiVpnService.status == ServiceStatus.Failed) {
-                scope.launch {
+                if (getActiveStrategy(prefs).isNotEmpty()) {
-                    snackbarHostState.showSnackbar(context.getString(R.string.snack_starting_service))
+                    scope.launch {
+                        snackbarHostState.showSnackbar(context.getString(R.string.snack_starting_service))
+                    }
+                    _requestVpnPermission.value = true
+                }
+                else {
+                    Toast.makeText(
+                        context,
+                        context.getString(R.string.toast_no_strategy_selected),
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
-                _requestVpnPermission.value = true
             }
             else {
                 scope.launch {
@@ -140,7 +175,10 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
                         )
                     )
                 }
-                if (isEnabled) stopService {}
+                if (isEnabled) stopService { error ->
+                    _errorFlow.value = error
+                    onCardClick()
+                }
             }
         } else {
             if (ByeDpiVpnService.status == ServiceStatus.Connected) {
@@ -163,7 +201,10 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
 
     fun onBtnRestart(snackbarHostState: SnackbarHostState, scope: CoroutineScope) {
         if (prefs.getBoolean("use_module", false)) {
-            restartService {}
+            restartService { error ->
+                _errorFlow.value = error
+                onCardClick()
+            }
             scope.launch {
                 snackbarHostState.showSnackbar(context.getString(R.string.snack_reload))
             }
@@ -196,9 +237,32 @@ class HomeViewModel(application: Application) : AndroidViewModel(application) {
 
     fun onUpdateConfirm() {
         showUpdateDialog.value = false
-        val id = download(context, downloadUrl.value.orEmpty())
+        if (context.packageManager.canRequestPackageInstalls()){
-        registerDownloadListener(context, id) { uri ->
+            val id = download(context, downloadUrl.value.orEmpty())
-            installApk(context, uri)
+            registerDownloadListener(context, id, { uri ->
+                installApk(context, uri)
+                },
+                onError = {
+
+                })
+        }
+        else {
+            val packageUri = Uri.fromParts("package", context.packageName, null)
+            val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageUri).addFlags(
+                Intent.FLAG_ACTIVITY_NEW_TASK)
+            context.startActivity(intent)
         }
     }
+
+    // unused?
+    fun parseArgs(ip: String, port: String, lines: List<String>): Array<String> {
+        val regex = Regex("""--?\S+(?:=(?:[^"'\s]+|"[^"]*"|'[^']*'))?|[^\s]+""")
+        val parsedArgs = lines
+            .flatMap { line -> regex.findAll(line).map { it.value } }
+        return arrayOf("ciadpi", "--ip", ip, "--port", port) + parsedArgs
+    }
+
+    fun clearError() {
+        _errorFlow.value = ""
+    }
 }

app/src/main/java/com/cherret/zaprett/ui/viewmodel/HostRepoViewModel.kt

@@ -1,18 +1,11 @@
 package com.cherret.zaprett.ui.viewmodel
 
 import android.app.Application
-import androidx.lifecycle.viewModelScope
+import com.cherret.zaprett.utils.RepoItemInfo
-import com.cherret.zaprett.RepoItemInfo
+import com.cherret.zaprett.utils.getAllLists
-import com.cherret.zaprett.download
+import com.cherret.zaprett.utils.getHostList
-import com.cherret.zaprett.getAllLists
-import com.cherret.zaprett.getHostList
-import com.cherret.zaprett.getZaprettPath
-import com.cherret.zaprett.registerDownloadListenerHost
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.launch
-import java.io.File
 
 class HostRepoViewModel(application: Application): BaseRepoViewModel(application) {
     override fun getInstalledLists(): Array<String> = getAllLists()
-    override fun getRepoList(callback: (List<RepoItemInfo>?) -> Unit) = getHostList(sharedPreferences, callback)
+    override fun getRepoList(callback: (Result<List<RepoItemInfo>>) -> Unit) = getHostList(sharedPreferences, callback)
 }

app/src/main/java/com/cherret/zaprett/ui/viewmodel/HostsViewModel.kt

@@ -3,18 +3,26 @@ package com.cherret.zaprett.ui.viewmodel
 import android.app.Application
 import android.content.Context
 import androidx.compose.material3.SnackbarHostState
-import com.cherret.zaprett.disableList
+import com.cherret.zaprett.utils.disableList
-import com.cherret.zaprett.enableList
+import com.cherret.zaprett.utils.enableList
-import com.cherret.zaprett.getActiveLists
+import com.cherret.zaprett.utils.getActiveExcludeLists
-import com.cherret.zaprett.getAllLists
+import com.cherret.zaprett.utils.getActiveLists
-import com.cherret.zaprett.getStatus
+import com.cherret.zaprett.utils.getAllExcludeLists
+import com.cherret.zaprett.utils.getAllLists
+import com.cherret.zaprett.utils.getHostListMode
+import com.cherret.zaprett.utils.getStatus
+import com.cherret.zaprett.utils.setHostListMode
 import kotlinx.coroutines.CoroutineScope
 import java.io.File
 
 class HostsViewModel(application: Application): BaseListsViewModel(application) {
     private val sharedPreferences = application.getSharedPreferences("settings", Context.MODE_PRIVATE)
-    override fun loadAllItems(): Array<String> = getAllLists()
+    override fun loadAllItems(): Array<String> =
-    override fun loadActiveItems(): Array<String> = getActiveLists(sharedPreferences)
+        if (getHostListMode(sharedPreferences) == "whitelist") getAllLists()
+        else getAllExcludeLists()
+    override fun loadActiveItems(): Array<String> =
+        if (getHostListMode(sharedPreferences) == "whitelist") getActiveLists(sharedPreferences)
+        else getActiveExcludeLists(sharedPreferences)
 
     override fun deleteItem(item: String, snackbarHostState: SnackbarHostState, scope: CoroutineScope) {
         val wasChecked = checked[item] == true
@@ -24,6 +32,7 @@ class HostsViewModel(application: Application): BaseListsViewModel(application)
         if (sharedPreferences.getBoolean("use_module", false)) {
             getStatus { isEnabled ->
                 if (isEnabled && wasChecked) {
+                    snackbarHostState.currentSnackbarData?.dismiss()
                     showRestartSnackbar(context, snackbarHostState, scope)
                 }
             }
@@ -36,6 +45,7 @@ class HostsViewModel(application: Application): BaseListsViewModel(application)
         if (sharedPreferences.getBoolean("use_module", false)) {
             getStatus { isEnabled ->
                 if (isEnabled) {
+                    snackbarHostState.currentSnackbarData?.dismiss()
                     showRestartSnackbar(
                         context,
                         snackbarHostState,
@@ -45,4 +55,9 @@ class HostsViewModel(application: Application): BaseListsViewModel(application)
             }
         }
     }
+    fun setListType(type : String) {
+        setHostListMode(sharedPreferences, type)
+        refresh()
+    }
+
 }

app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetRepoViewModel.kt

@@ -0,0 +1,14 @@
+package com.cherret.zaprett.ui.viewmodel
+
+import android.app.Application
+import com.cherret.zaprett.utils.RepoItemInfo
+import com.cherret.zaprett.utils.getAllIpsets
+import com.cherret.zaprett.utils.getAllLists
+import com.cherret.zaprett.utils.getHostList
+import com.cherret.zaprett.utils.getIpsetList
+
+class IpsetRepoViewModel(application: Application): BaseRepoViewModel(application) {
+    override fun getInstalledLists(): Array<String> = getAllIpsets()
+    override fun getRepoList(callback: (Result<List<RepoItemInfo>>) -> Unit) =
+        getIpsetList(sharedPreferences, callback)
+}

app/src/main/java/com/cherret/zaprett/ui/viewmodel/IpsetViewModel.kt

@@ -0,0 +1,65 @@
+package com.cherret.zaprett.ui.viewmodel
+
+import android.app.Application
+import android.content.Context
+import androidx.compose.material3.SnackbarHostState
+import com.cherret.zaprett.utils.disableIpset
+import com.cherret.zaprett.utils.disableList
+import com.cherret.zaprett.utils.enableIpset
+import com.cherret.zaprett.utils.enableList
+import com.cherret.zaprett.utils.getActiveExcludeIpsets
+import com.cherret.zaprett.utils.getActiveExcludeLists
+import com.cherret.zaprett.utils.getActiveIpsets
+import com.cherret.zaprett.utils.getAllExcludeIpsets
+import com.cherret.zaprett.utils.getAllIpsets
+import com.cherret.zaprett.utils.getHostListMode
+import com.cherret.zaprett.utils.getStatus
+import com.cherret.zaprett.utils.setHostListMode
+import kotlinx.coroutines.CoroutineScope
+import java.io.File
+
+class IpsetViewModel(application: Application): BaseListsViewModel(application) {
+    private val sharedPreferences = application.getSharedPreferences("settings", Context.MODE_PRIVATE)
+    override fun loadAllItems(): Array<String> =
+        if (getHostListMode(sharedPreferences) == "whitelist") getAllIpsets()
+        else getAllExcludeIpsets()
+    override fun loadActiveItems(): Array<String> =
+        if (getHostListMode(sharedPreferences) == "whitelist") getActiveIpsets(sharedPreferences)
+        else getActiveExcludeIpsets(sharedPreferences)
+
+    override fun deleteItem(item: String, snackbarHostState: SnackbarHostState, scope: CoroutineScope) {
+        val wasChecked = checked[item] == true
+        disableIpset(item, sharedPreferences)
+        val success = File(item).delete()
+        if (success) refresh()
+        if (sharedPreferences.getBoolean("use_module", false)) {
+            getStatus { isEnabled ->
+                if (isEnabled && wasChecked) {
+                    snackbarHostState.currentSnackbarData?.dismiss()
+                    showRestartSnackbar(context, snackbarHostState, scope)
+                }
+            }
+        }
+    }
+
+    override fun onCheckedChange(item: String, isChecked: Boolean, snackbarHostState: SnackbarHostState, scope: CoroutineScope) {
+        checked[item] = isChecked
+        if (isChecked) enableIpset(item, sharedPreferences) else disableIpset(item, sharedPreferences)
+        if (sharedPreferences.getBoolean("use_module", false)) {
+            getStatus { isEnabled ->
+                if (isEnabled) {
+                    snackbarHostState.currentSnackbarData?.dismiss()
+                    showRestartSnackbar(
+                        context,
+                        snackbarHostState,
+                        scope
+                    )
+                }
+            }
+        }
+    }
+    fun setListType(type : String) {
+        setHostListMode(sharedPreferences, type)
+        refresh()
+    }
+}

app/src/main/java/com/cherret/zaprett/ui/viewmodel/SettingsViewModel.kt

@@ -0,0 +1,163 @@
+package com.cherret.zaprett.ui.viewmodel
+
+import android.app.Application
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+import android.content.Intent
+import android.content.pm.ApplicationInfo
+import android.content.pm.PackageManager
+import android.graphics.drawable.Drawable
+import androidx.compose.runtime.MutableState
+import androidx.lifecycle.AndroidViewModel
+import com.cherret.zaprett.byedpi.ByeDpiVpnService
+import com.cherret.zaprett.data.AppListType
+import com.cherret.zaprett.data.ServiceStatus
+import com.cherret.zaprett.utils.addPackageToList
+import com.cherret.zaprett.utils.checkModuleInstallation
+import com.cherret.zaprett.utils.checkRoot
+import com.cherret.zaprett.utils.getAppList
+import com.cherret.zaprett.utils.getStartOnBoot
+import com.cherret.zaprett.utils.removePackageFromList
+import com.cherret.zaprett.utils.setStartOnBoot
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.withContext
+
+class SettingsViewModel(application: Application) : AndroidViewModel(application) {
+    private val context = application
+    private val prefs = context.getSharedPreferences("settings", MODE_PRIVATE)
+    private val _appsList = MutableStateFlow<List<String>>(emptyList())
+    val appsList: StateFlow<List<String>> = _appsList
+    private val _selectedPackages = MutableStateFlow<Set<String>>(emptySet())
+    val selectedPackages: StateFlow<Set<String>> = _selectedPackages.asStateFlow()
+    private val _currentListType = MutableStateFlow(AppListType.Whitelist)
+    private val _useModule = MutableStateFlow(false)
+    val useModule: StateFlow<Boolean> = _useModule
+
+    private val _autoRestart = MutableStateFlow(false)
+    val autoRestart: StateFlow<Boolean> = _autoRestart
+
+    init {
+        refreshApplications()
+        _useModule.value = context.getSharedPreferences("settings", MODE_PRIVATE).getBoolean("use_module", false)
+        getStartOnBoot(prefs) { value ->
+            _autoRestart.value = value
+        }
+    }
+
+    suspend fun getAppIconBitmap(packageName: String): Drawable? = withContext(Dispatchers.IO) {
+        val pm: PackageManager = context.packageManager
+        val drawable: Drawable = try {
+            pm.getApplicationIcon(packageName)
+        } catch (e: PackageManager.NameNotFoundException) {
+            return@withContext null
+        }
+        return@withContext drawable
+    }
+
+    fun getApplicationName(packageName: String) : String? {
+        val pm: PackageManager = context.packageManager
+        return try {
+            val applicationInfo = pm.getApplicationInfo(packageName, 0)
+            pm.getApplicationLabel(applicationInfo).toString()
+        } catch (e: PackageManager.NameNotFoundException) {
+            null
+        }
+    }
+
+    fun setListType(type: AppListType) {
+        _currentListType.value = type
+        refreshApplications()
+    }
+
+    fun clearList() {
+        _appsList.value = emptyList()
+        _selectedPackages.value = emptySet()
+    }
+
+    fun refreshApplications() {
+        val packages = if (prefs.getBoolean("show_system_apps", false)){
+            context.packageManager.getInstalledPackages(PackageManager.GET_META_DATA)
+        }
+        else {
+            context.packageManager.getInstalledPackages(PackageManager.GET_META_DATA).filter { pkgInfo ->
+                (pkgInfo.applicationInfo!!.flags and ApplicationInfo.FLAG_SYSTEM) == 0
+            }
+        }
+        val allPackages = packages.map { it.packageName }
+        val listType = _currentListType.value
+
+        val result = when (listType) {
+            AppListType.Whitelist -> {
+                val whitelistSet = getAppList(AppListType.Whitelist, prefs, context)
+                val (whitelisted, others) = allPackages.partition { it in whitelistSet }
+                _selectedPackages.value = whitelistSet
+                (whitelisted + others).filter { it != context.packageName }
+            }
+            AppListType.Blacklist -> {
+                val blacklistSet = getAppList(AppListType.Blacklist, prefs, context)
+                val (blacklisted, others) = allPackages.partition { it in blacklistSet }
+                _selectedPackages.value = blacklistSet
+                (blacklisted + others).filter { it != context.packageName }
+            }
+        }
+        _appsList.value = result
+    }
+
+    fun addToList(listType: AppListType, packageName: String) {
+        addPackageToList(listType, packageName, prefs, context)
+        selectedPackages.value.plus(packageName)
+        refreshApplications()
+    }
+
+    fun removeFromList(listType: AppListType, packageName: String) {
+        removePackageFromList(listType, packageName, prefs, context)
+        selectedPackages.value.minus(packageName)
+        refreshApplications()
+    }
+
+    fun useModule(context: Context, checked: Boolean, openNoRootDialog: MutableState<Boolean>, openNoModuleDialog: MutableState<Boolean>) {
+        val sharedPreferences = context.getSharedPreferences("settings", Context.MODE_PRIVATE)
+        val editor = sharedPreferences.edit()
+        if (checked) {
+            checkRoot { hasRoot ->
+                if (hasRoot) {
+                    checkModuleInstallation { hasModule ->
+                        if (hasModule) {
+                            editor.putBoolean("use_module", true).apply()
+                            if (ByeDpiVpnService.status == ServiceStatus.Connected) {
+                                context.startService(Intent(context, ByeDpiVpnService::class.java).apply {
+                                    action = "STOP_VPN"
+                                })
+                            }
+                            editor.remove("lists").apply()
+                            editor.remove("active_strategy").apply()
+                            editor.remove("applist").apply()
+                            editor.remove("whitelist").apply()
+                            editor.remove("blacklist").apply()
+                            _useModule.value = true
+                        } else {
+                            openNoModuleDialog.value = true
+                        }
+                    }
+                } else {
+                    openNoRootDialog.value = true
+                }
+            }
+        } else {
+            editor.putBoolean("use_module", false).apply()
+            _useModule.value = false
+        }
+    }
+
+    fun handleAutoRestart(context: Context) {
+        val sharedPreferences = context.getSharedPreferences("settings", MODE_PRIVATE)
+        if (sharedPreferences.getBoolean("use_module", false)) {
+            setStartOnBoot(prefs) { value ->
+                _autoRestart.value = value
+            }
+        }
+    }
+}

app/src/main/java/com/cherret/zaprett/ui/viewmodel/StrategyRepoViewModel.kt

@@ -1,10 +1,10 @@
 package com.cherret.zaprett.ui.viewmodel
 
 import android.app.Application
-import com.cherret.zaprett.RepoItemInfo
+import com.cherret.zaprett.utils.RepoItemInfo
-import com.cherret.zaprett.getAllByeDPIStrategies
+import com.cherret.zaprett.utils.getAllByeDPIStrategies
-import com.cherret.zaprett.getAllNfqwsStrategies
+import com.cherret.zaprett.utils.getAllNfqwsStrategies
-import com.cherret.zaprett.getStrategiesList
+import com.cherret.zaprett.utils.getStrategiesList
 
 class StrategyRepoViewModel(application: Application): BaseRepoViewModel(application) {
     override fun getInstalledLists(): Array<String> =
@@ -13,5 +13,5 @@ class StrategyRepoViewModel(application: Application): BaseRepoViewModel(applica
         } else {
             getAllByeDPIStrategies()
         }
-    override fun getRepoList(callback: (List<RepoItemInfo>?) -> Unit) = getStrategiesList(sharedPreferences, callback)
+    override fun getRepoList(callback: (Result<List<RepoItemInfo>>) -> Unit) = getStrategiesList(sharedPreferences, callback)
 }

app/src/main/java/com/cherret/zaprett/ui/viewmodel/StrategySelectionViewModel.kt

@@ -0,0 +1,208 @@
+package com.cherret.zaprett.ui.viewmodel
+
+import android.app.Application
+import android.content.Context.MODE_PRIVATE
+import android.content.Intent
+import android.util.Log
+import androidx.compose.runtime.mutableStateListOf
+import androidx.compose.runtime.mutableStateOf
+import androidx.core.content.ContextCompat
+import androidx.lifecycle.AndroidViewModel
+import com.cherret.zaprett.R
+import com.cherret.zaprett.byedpi.ByeDpiVpnService
+import com.cherret.zaprett.data.ServiceStatus
+import com.cherret.zaprett.data.StrategyCheckResult
+import com.cherret.zaprett.data.StrategyTestingStatus
+import com.cherret.zaprett.utils.disableStrategy
+import com.cherret.zaprett.utils.enableStrategy
+import com.cherret.zaprett.utils.getActiveLists
+import com.cherret.zaprett.utils.getActiveStrategy
+import com.cherret.zaprett.utils.getAllStrategies
+import com.cherret.zaprett.utils.getStatus
+import com.cherret.zaprett.utils.startService
+import com.cherret.zaprett.utils.stopService
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.async
+import kotlinx.coroutines.awaitAll
+import kotlinx.coroutines.coroutineScope
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.withContext
+import kotlinx.coroutines.withTimeoutOrNull
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import java.io.File
+import java.net.InetSocketAddress
+import java.net.Proxy
+import java.util.concurrent.TimeUnit
+
+class StrategySelectionViewModel(application: Application) : AndroidViewModel(application) {
+    val prefs = application.getSharedPreferences("settings", MODE_PRIVATE)
+    val context = application
+    private val _requestVpnPermission = MutableStateFlow(false)
+    val requestVpnPermission = _requestVpnPermission.asStateFlow()
+    private val _errorFlow = MutableStateFlow("")
+    val errorFlow = _errorFlow.asStateFlow()
+    val strategyStates = mutableStateListOf<StrategyCheckResult>()
+    var noHostsCard = mutableStateOf(false)
+        private set
+
+    init {
+        loadStrategies()
+        checkHosts()
+    }
+
+    fun buildHttpClient(): OkHttpClient {
+        val builder = OkHttpClient.Builder()
+            .callTimeout(prefs.getLong("probe_timeout", 1000L), TimeUnit.MILLISECONDS)
+            .followRedirects(true)
+            .followSslRedirects(true)
+        if (!prefs.getBoolean("use_module", false)) {
+            val ip = prefs.getString("ip", "127.0.0.1") ?: "127.0.0.1"
+            val port = prefs.getString("port", "1080")?.toIntOrNull() ?: 1080
+            val proxy = Proxy(Proxy.Type.SOCKS, InetSocketAddress(ip, port))
+            builder.proxy(proxy)
+        }
+        return builder.build()
+    }
+
+    fun loadStrategies() {
+        val strategyList = getAllStrategies(prefs)
+        strategyStates.clear()
+        strategyList.forEach { name ->
+            strategyStates += StrategyCheckResult(
+                path = name,
+                status = StrategyTestingStatus.Waiting,
+                progress = 0f,
+                domains = emptyList()
+            )
+        }
+    }
+
+    suspend fun testDomain(domain : String) : Boolean  = withContext(Dispatchers.IO) {
+        val request = Request.Builder()
+            .url("https://${domain}")
+            .build()
+        try {
+            buildHttpClient().newCall(request).execute().use { response ->
+                val body = response.body.byteStream().readBytes()
+                val contentLength = response.body.contentLength()
+                contentLength <= 0 || body.size.toLong() >= contentLength
+            }
+        } catch (e: Exception) {
+            false
+        }
+    }
+
+    suspend fun countReachable(index: Int, urls: List<String>): Float = coroutineScope {
+        if (urls.isEmpty()) return@coroutineScope 0f
+        val results: List<String> = urls.map { url ->
+            async { if (testDomain(url)) url else null }
+        }.awaitAll().filterNotNull()
+        strategyStates[index].domains = results
+        (results.size.toFloat() / urls.size.toFloat()).coerceIn(0f, 1f)
+    }
+
+    suspend fun readActiveListsLines(): List<String> = withContext(Dispatchers.IO) {
+        val result = mutableListOf<String>()
+        getActiveLists(prefs).forEach { path ->
+            runCatching {
+                File(path).useLines { lines ->
+                    lines.forEach { line ->
+                        result += line
+                    }
+                }
+            }.onFailure {
+                Log.e("Error", "Occured error when creating list for check")
+            }
+        }
+        result
+    }
+    suspend fun performTest() {
+        val targets = readActiveListsLines()
+        var stopTest : Boolean = false;
+        for (index in strategyStates.indices) {
+            val current = strategyStates[index]
+            if (stopTest) break
+            strategyStates[index] = current.copy(status = StrategyTestingStatus.Testing)
+            enableStrategy(current.path, prefs)
+            if (prefs.getBoolean("use_module", false)) {
+                getStatus { if (it) stopService { error ->
+                    _errorFlow.value = error
+                    if (error.isNotEmpty()) stopTest = true
+                } }
+                startService { error ->
+                    _errorFlow.value = error
+                    if (error.isNotEmpty()) stopTest = true
+                }
+                try {
+                    val progress = countReachable(index, targets)
+                    val old = strategyStates[index]
+                    strategyStates[index] = old.copy(
+                        progress = progress,
+                        status = StrategyTestingStatus.Completed
+                    )
+                } finally {
+                    stopService { error ->
+                        _errorFlow.value = error
+                        if (error.isNotEmpty()) stopTest = true
+                    }
+                    disableStrategy(current.path, prefs)
+                }
+            }
+            else {
+                if (ByeDpiVpnService.status == ServiceStatus.Connected) {
+                    context.startService(Intent(context, ByeDpiVpnService::class.java).apply {
+                        action = "STOP_VPN"
+                    })
+                    delay(300L)
+                }
+                _requestVpnPermission.value = true
+                /*context.startService(Intent(context, ByeDpiVpnService::class.java).apply {
+                    action = "START_VPN"
+                })*/
+                val connected = withTimeoutOrNull(10_000L) {
+                    while (ByeDpiVpnService.status != ServiceStatus.Connected) {
+                        delay(100L)
+                    }
+                    true
+                } ?: false
+                if (connected) delay(150L)
+                try {
+                    val progress = countReachable(index,targets)
+                    val old = strategyStates[index]
+
+                    strategyStates[index] = old.copy(
+                        progress = progress,
+                        status = StrategyTestingStatus.Completed
+                    )
+                } finally {
+                    context.startService(Intent(context, ByeDpiVpnService::class.java).apply {
+                        action = "STOP_VPN"
+                    })
+                    delay(200L)
+                    disableStrategy(current.path, prefs)
+                }
+            }
+        }
+        val sorted = strategyStates.sortedByDescending { it.progress }
+        strategyStates.clear()
+        strategyStates.addAll(sorted)
+    }
+
+    fun checkHosts() {
+        if (getActiveLists(prefs).isEmpty() || getAllStrategies(prefs).isEmpty()) noHostsCard.value = true
+        Log.d("getActiveLists.isEmpty || getAllStrategies.isEmpty", getActiveLists(prefs).isEmpty().toString())
+    }
+    fun startVpn() {
+        ContextCompat.startForegroundService(context, Intent(context, ByeDpiVpnService::class.java).apply { action = "START_VPN" })
+    }
+    fun clearVpnPermissionRequest() {
+        _requestVpnPermission.value = false
+    }
+    fun clearError() {
+        _errorFlow.value = ""
+    }
+}

app/src/main/java/com/cherret/zaprett/ui/viewmodel/StrategyViewModel.kt

@@ -4,26 +4,26 @@ import android.app.Application
 import android.content.Context
 import android.content.SharedPreferences
 import androidx.compose.material3.SnackbarHostState
-import com.cherret.zaprett.ByeDpiVpnService
+import com.cherret.zaprett.byedpi.ByeDpiVpnService
-import com.cherret.zaprett.ServiceStatus
+import com.cherret.zaprett.data.ServiceStatus
-import com.cherret.zaprett.disableStrategy
+import com.cherret.zaprett.utils.disableStrategy
-import com.cherret.zaprett.enableStrategy
+import com.cherret.zaprett.utils.enableStrategy
-import com.cherret.zaprett.getActiveByeDPIStrategies
+import com.cherret.zaprett.utils.getActiveByeDPIStrategy
-import com.cherret.zaprett.getActiveNfqwsStrategies
+import com.cherret.zaprett.utils.getActiveNfqwsStrategy
-import com.cherret.zaprett.getAllByeDPIStrategies
+import com.cherret.zaprett.utils.getAllByeDPIStrategies
-import com.cherret.zaprett.getAllNfqwsStrategies
+import com.cherret.zaprett.utils.getAllNfqwsStrategies
-import com.cherret.zaprett.getStatus
+import com.cherret.zaprett.utils.getStatus
 import kotlinx.coroutines.CoroutineScope
 import java.io.File
 
 class StrategyViewModel(application: Application): BaseListsViewModel(application) {
     private val sharedPreferences = application.getSharedPreferences("settings", Context.MODE_PRIVATE)
-    private val useModule = sharedPreferences.getBoolean("use_module", false)
+    private val strategyProvider: StrategyProvider
-    private val strategyProvider: StrategyProvider = if (useModule) {
+        get() = if (sharedPreferences.getBoolean("use_module", false)) {
-        NfqwsStrategyProvider()
+            NfqwsStrategyProvider()
-    } else {
+        } else {
-        ByeDPIStrategyProvider(sharedPreferences)
+            ByeDPIStrategyProvider(sharedPreferences)
-    }
+        }
 
     override fun loadAllItems(): Array<String> = strategyProvider.getAll()
     override fun loadActiveItems(): Array<String> = strategyProvider.getActive()
@@ -36,6 +36,7 @@ class StrategyViewModel(application: Application): BaseListsViewModel(applicatio
         if (sharedPreferences.getBoolean("use_module", false)) {
             getStatus { isEnabled ->
                 if (isEnabled && wasChecked) {
+                    snackbarHostState.currentSnackbarData?.dismiss()
                     showRestartSnackbar(context, snackbarHostState, scope)
                 }
             }
@@ -64,6 +65,7 @@ class StrategyViewModel(application: Application): BaseListsViewModel(applicatio
         if (sharedPreferences.getBoolean("use_module", false)) {
             getStatus { isEnabled ->
                 if (isEnabled) {
+                    snackbarHostState.currentSnackbarData?.dismiss()
                     showRestartSnackbar(
                         context,
                         snackbarHostState,
@@ -82,10 +84,10 @@ interface StrategyProvider {
 
 class NfqwsStrategyProvider : StrategyProvider {
     override fun getAll() = getAllNfqwsStrategies()
-    override fun getActive() = getActiveNfqwsStrategies()
+    override fun getActive() = getActiveNfqwsStrategy()
 }
 
 class ByeDPIStrategyProvider(private val sharedPreferences: SharedPreferences) : StrategyProvider {
     override fun getAll() = getAllByeDPIStrategies()
-    override fun getActive() = getActiveByeDPIStrategies(sharedPreferences)
+    override fun getActive() = getActiveByeDPIStrategy(sharedPreferences)
 }

app/src/main/java/com/cherret/zaprett/utils/QSTileService.kt

@@ -0,0 +1,86 @@
+package com.cherret.zaprett.utils
+
+import android.content.Intent
+import android.content.SharedPreferences
+import android.service.quicksettings.Tile
+import android.service.quicksettings.TileService
+import androidx.core.content.ContextCompat
+import com.cherret.zaprett.R
+import com.cherret.zaprett.byedpi.ByeDpiVpnService
+import com.cherret.zaprett.data.ServiceStatus
+
+class QSTileService: TileService() {
+    private lateinit var prefs: SharedPreferences
+    override fun onCreate() {
+        super.onCreate()
+        prefs = applicationContext.getSharedPreferences("settings", MODE_PRIVATE)
+    }
+
+    override fun onTileAdded() {
+        super.onTileAdded()
+        updateStatus()
+    }
+
+    override fun onStartListening() {
+        super.onStartListening()
+        updateStatus()
+    }
+
+    override fun onClick() {
+        super.onClick()
+        if (qsTile.state == Tile.STATE_INACTIVE) {
+            qsTile.subtitle = getString(R.string.qs_starting)
+            qsTile.state = Tile.STATE_UNAVAILABLE
+            qsTile.updateTile()
+            if (prefs.getBoolean("use_module", false)){
+                startService {}
+            }
+            else {
+                ContextCompat.startForegroundService(applicationContext, Intent(applicationContext, ByeDpiVpnService::class.java).apply { action = "START_VPN" })
+            }
+        }
+        else {
+            qsTile.subtitle = getString(R.string.qs_stopping)
+            qsTile.state = Tile.STATE_UNAVAILABLE
+            qsTile.updateTile()
+            if (prefs.getBoolean("use_module", false)){
+                stopService {}
+            }
+            else {
+                applicationContext.startService(Intent(applicationContext, ByeDpiVpnService::class.java).apply { action = "STOP_VPN" })
+            }
+        }
+        updateStatus()
+    }
+
+    private fun updateStatus() {
+        if (prefs.getBoolean("use_module", false)) {
+            getStatus {
+                if (it) {
+                    qsTile.label = getString(R.string.qs_name)
+                    qsTile.subtitle = getString(R.string.qs_working)
+                    qsTile.state = Tile.STATE_ACTIVE
+                    qsTile.updateTile()
+                } else {
+                    qsTile.label = getString(R.string.qs_name)
+                    qsTile.subtitle = getString(R.string.qs_not_working)
+                    qsTile.state = Tile.STATE_INACTIVE
+                    qsTile.updateTile()
+                }
+            }
+        }
+        else {
+            if (ByeDpiVpnService.status == ServiceStatus.Connected) {
+                qsTile.label = getString(R.string.qs_name)
+                qsTile.subtitle = getString(R.string.qs_working)
+                qsTile.state = Tile.STATE_ACTIVE
+                qsTile.updateTile()
+            } else {
+                qsTile.label = getString(R.string.qs_name)
+                qsTile.subtitle = getString(R.string.qs_not_working)
+                qsTile.state = Tile.STATE_INACTIVE
+                qsTile.updateTile()
+            }
+        }
+    }
+}

app/src/main/java/com/cherret/zaprett/utils/RepositoryDownloader.kt

@@ -0,0 +1,153 @@
+package com.cherret.zaprett.utils
+
+import android.annotation.SuppressLint
+import android.app.DownloadManager
+import android.content.BroadcastReceiver
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
+import android.content.SharedPreferences
+import android.net.Uri
+import android.os.Build
+import androidx.core.content.ContextCompat
+import androidx.core.net.toUri
+import com.cherret.zaprett.data.ItemType
+import kotlinx.serialization.Serializable
+import kotlinx.serialization.json.Json
+import okhttp3.Call
+import okhttp3.Callback
+import okhttp3.OkHttpClient
+import okhttp3.Request
+import okhttp3.Response
+import okio.IOException
+import java.io.File
+import java.security.MessageDigest
+
+private val client = OkHttpClient()
+private val json = Json { ignoreUnknownKeys = true }
+
+fun getHostList(sharedPreferences: SharedPreferences, callback: (Result<List<RepoItemInfo>>) -> Unit) {
+    getRepo(
+        sharedPreferences.getString(
+            "hosts_repo_url",
+            "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/hosts.json"
+        ) ?: "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/hosts.json",
+        callback
+    )
+}
+
+fun getIpsetList(sharedPreferences: SharedPreferences, callback: (Result<List<RepoItemInfo>>) -> Unit) {
+    getRepo(
+        sharedPreferences.getString(
+            "ipset_repo_url",
+            "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/ipsets.json"
+        ) ?: "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/ipsets.json",
+        callback
+    )
+}
+
+fun getStrategiesList(sharedPreferences: SharedPreferences, callback: (Result<List<RepoItemInfo>>) -> Unit) {
+    getRepo(
+        sharedPreferences.getString(
+            "strategies_repo_url",
+            "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/strategies.json"
+        ) ?: "https://raw.githubusercontent.com/CherretGit/zaprett-repo/refs/heads/main/strategies.json",
+        callback
+    )
+}
+
+fun getRepo(url: String, callback: (Result<List<RepoItemInfo>>) -> Unit) {
+    val request = Request.Builder().url(url).build()
+    client.newCall(request).enqueue(object : Callback {
+        override fun onFailure(call: Call, e: IOException) {
+            e.printStackTrace()
+            callback(Result.failure(e))
+        }
+        override fun onResponse(call: Call, response: Response) {
+            response.use {
+                if (!response.isSuccessful) {
+                    callback(Result.failure(IOException("Unexpected HTTP code ${response.code}")))
+                    return
+                }
+                val jsonString = response.body.string()
+                val result = runCatching {
+                    json.decodeFromString<List<RepoItemInfo>>(jsonString)
+                }
+                callback(result)
+            }
+        }
+    })
+}
+
+fun registerDownloadListener(context: Context, downloadId: Long, onDownloaded: (Uri) -> Unit, onError: (String) -> Unit) {// AI Generated
+    val receiver = object : BroadcastReceiver() {
+        @SuppressLint("Range")
+        override fun onReceive(context: Context?, intent: Intent?) {
+            if (intent?.action != DownloadManager.ACTION_DOWNLOAD_COMPLETE) return
+            if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadId) return
+            val dm = context?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager ?: return
+            val query = DownloadManager.Query().setFilterById(downloadId)
+            dm.query(query)?.use { cursor ->
+                if (cursor.moveToFirst()) {
+                    val status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS))
+                    val reason = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_REASON))
+                    when (status) {
+                        DownloadManager.STATUS_SUCCESSFUL -> {
+                            val uriString = cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI))
+                            if (uriString != null) {
+                                val uri = uriString.toUri()
+                                context.unregisterReceiver(this)
+                                onDownloaded(uri)
+                            }
+                        }
+
+                        DownloadManager.STATUS_FAILED -> {
+                            context.unregisterReceiver(this)
+                            val errorMessage = when (reason) {
+                                DownloadManager.ERROR_CANNOT_RESUME -> "Cannot resume download"
+                                DownloadManager.ERROR_DEVICE_NOT_FOUND -> "Device not found"
+                                DownloadManager.ERROR_FILE_ALREADY_EXISTS -> "File already exists"
+                                DownloadManager.ERROR_FILE_ERROR -> "File error"
+                                DownloadManager.ERROR_HTTP_DATA_ERROR -> "HTTP data error"
+                                DownloadManager.ERROR_INSUFFICIENT_SPACE -> "Insufficient space"
+                                DownloadManager.ERROR_TOO_MANY_REDIRECTS -> "Too many redirects"
+                                DownloadManager.ERROR_UNHANDLED_HTTP_CODE -> "Unhandled HTTP code"
+                                DownloadManager.ERROR_UNKNOWN -> "Unknown error"
+                                else -> "Download failed: reason=$reason"
+                            }
+                            onError(errorMessage)
+                        }
+                    }
+                }
+            }
+        }
+    }
+    val intentFilter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
+    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
+        context.registerReceiver(receiver, intentFilter, Context.RECEIVER_EXPORTED)
+    } else {
+        ContextCompat.registerReceiver(context, receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), ContextCompat.RECEIVER_EXPORTED)
+    }
+}
+
+fun getFileSha256(file: File): String {
+    val digest = MessageDigest.getInstance("SHA-256")
+    file.inputStream().use { input ->
+        val buffer = ByteArray(1024)
+        var bytesRead: Int
+        while (input.read(buffer).also { bytesRead = it } != -1) {
+            digest.update(buffer, 0, bytesRead)
+        }
+    }
+    return digest.digest().joinToString("") { "%02x".format(it) }
+}
+
+@Serializable
+data class RepoItemInfo(
+    val name: String,
+    val author: String,
+    val description: String,
+    val type: ItemType,
+    val hash: String,
+    val url: String
+)

app/src/main/java/com/cherret/zaprett/utils/Updater.kt

@@ -1,4 +1,4 @@
-package com.cherret.zaprett
+package com.cherret.zaprett.utils
 
 import android.annotation.SuppressLint
 import android.app.DownloadManager
@@ -6,13 +6,14 @@ import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
+import android.content.SharedPreferences
 import android.net.Uri
 import android.os.Build
 import android.os.Environment
-import android.provider.Settings
 import androidx.core.content.ContextCompat
 import androidx.core.content.FileProvider
 import androidx.core.net.toUri
+import com.cherret.zaprett.BuildConfig
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.json.Json
 import okhttp3.Call
@@ -25,9 +26,9 @@ import java.io.File
 
 private val client = OkHttpClient()
 private val json = Json { ignoreUnknownKeys = true }
-
+// PLS EGOR-WHITE REFACTOR THIS
-fun getUpdate(callback: (UpdateInfo?) -> Unit) {
+fun getUpdate(sharedPreferences: SharedPreferences, callback: (UpdateInfo?) -> Unit) {
-    val request = Request.Builder().url("https://raw.githubusercontent.com/CherretGit/zaprett-app/refs/heads/main/update.json").build()
+    val request = Request.Builder().url(sharedPreferences.getString("update_repo_url", "https://raw.githubusercontent.com/CherretGit/zaprett-app/refs/heads/main/update.json")?: "https://raw.githubusercontent.com/CherretGit/zaprett-app/refs/heads/main/update.json").build()
     client.newCall(request).enqueue(object : Callback {
         override fun onFailure(call: Call, e: IOException) {
             e.printStackTrace()
@@ -93,36 +94,7 @@ fun installApk(context: Context, uri: Uri) {
         }
         context.startActivity(intent)
     }
-    else {
-        val packageUri = Uri.fromParts("package", context.packageName, null)
-        val intent = Intent(Settings.ACTION_MANAGE_UNKNOWN_APP_SOURCES, packageUri)
-        context.startActivity(intent)
-    }
 }
-
-fun registerDownloadListener(context: Context, downloadId: Long, onDownloaded: (Uri) -> Unit) {// AI Generated
-    val receiver = object : BroadcastReceiver() {
-        @SuppressLint("Range")
-        override fun onReceive(context: Context?, intent: Intent?) {
-            if (intent?.action != DownloadManager.ACTION_DOWNLOAD_COMPLETE) return
-            if (intent.getLongExtra(DownloadManager.EXTRA_DOWNLOAD_ID, -1) != downloadId) return
-            val downloadManager = context?.getSystemService(Context.DOWNLOAD_SERVICE) as? DownloadManager ?: return
-            downloadManager.query(DownloadManager.Query().setFilterById(downloadId)).use { cursor ->
-                if (cursor.moveToFirst() && cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS)) == DownloadManager.STATUS_SUCCESSFUL) {
-                    context.unregisterReceiver(this)
-                    onDownloaded(cursor.getString(cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)).toUri())
-                }
-            }
-        }
-    }
-    val intentFilter = IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE)
-    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.TIRAMISU) {
-        context.registerReceiver(receiver, intentFilter, Context.RECEIVER_EXPORTED)
-    } else {
-        ContextCompat.registerReceiver(context, receiver, IntentFilter(DownloadManager.ACTION_DOWNLOAD_COMPLETE), ContextCompat.RECEIVER_EXPORTED)
-    }
-}
-
 @Serializable
 data class UpdateInfo(
     val version: String?,

app/src/main/java/com/cherret/zaprett/utils/ZaprettManager.kt

@@ -0,0 +1,504 @@
+package com.cherret.zaprett.utils
+
+import android.Manifest
+import android.content.Context
+import android.content.Context.MODE_PRIVATE
+import android.content.SharedPreferences
+import android.content.pm.PackageManager
+import android.os.Build
+import android.os.Environment
+import android.util.Log
+import androidx.core.content.ContextCompat
+import androidx.core.content.edit
+import com.cherret.zaprett.data.AppListType
+import com.cherret.zaprett.data.ZaprettConfig
+import com.topjohnwu.superuser.Shell
+import kotlinx.serialization.json.Json
+import java.io.File
+
+private val json = Json {
+    prettyPrint = true
+    ignoreUnknownKeys = true
+    coerceInputValues = true
+    encodeDefaults = true
+}
+
+private fun readConfig(): ZaprettConfig {
+    val configFile = getConfigFile()
+    if (!configFile.exists()) {
+        return ZaprettConfig()
+    }
+    return try {
+        val content = configFile.readText()
+        if (content.isBlank()) ZaprettConfig() else json.decodeFromString<ZaprettConfig>(content)
+    } catch (e: Exception) {
+        Log.e("ZaprettManager", "Error reading config, returning defaults", e)
+        ZaprettConfig()
+    }
+}
+
+private fun writeConfig(config: ZaprettConfig) {
+    val configFile = getConfigFile()
+    try {
+        configFile.parentFile?.mkdirs()
+        val content = json.encodeToString(config)
+        configFile.writeText(content)
+    } catch (e: Exception) {
+        Log.e("ZaprettManager", "Error writing config", e)
+    }
+}
+
+fun checkStoragePermission(context: Context): Boolean {
+    return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
+        Environment.isExternalStorageManager()
+    } else {
+        ContextCompat.checkSelfPermission(
+            context,
+            Manifest.permission.WRITE_EXTERNAL_STORAGE
+        ) == PackageManager.PERMISSION_GRANTED
+    }
+}
+
+fun checkRoot(callback: (Boolean) -> Unit) {
+    Shell.getShell().isRoot.let { callback(it) }
+}
+
+fun checkModuleInstallation(callback: (Boolean) -> Unit) {
+    Shell.cmd("zaprett").submit { result ->
+        callback(result.out.toString().contains("zaprett"))
+    }
+}
+
+fun getStatus(callback: (Boolean) -> Unit) {
+    Shell.cmd("zaprett status").submit { result ->
+        callback(result.out.toString().contains("working"))
+    }
+}
+
+fun startService(callback: (String) -> Unit) {
+    Shell.cmd("zaprett start 2>&1").submit { result ->
+        callback(
+            if (result.isSuccess) ""
+            else result.out.joinToString("\n")
+        )
+    }
+}
+
+
+fun stopService(callback: (String) -> Unit) {
+    Shell.cmd("zaprett stop 2>&1").submit { result ->
+        callback(
+            if (result.isSuccess) ""
+            else result.out.joinToString("\n")
+        )
+    }
+}
+
+fun restartService(callback: (String) -> Unit) {
+    Shell.cmd("zaprett restart 2>&1").submit { result ->
+        callback(
+            if (result.isSuccess) ""
+            else result.out.joinToString("\n")
+        )
+    }
+}
+
+fun getModuleVersion(callback: (String) -> Unit) {
+    Shell.cmd("zaprett module-version").submit { result ->
+        if (result.out.isNotEmpty()) callback(result.out.first()) else "undefined"
+    }
+}
+
+fun getBinVersion(callback: (String) -> Unit) {
+    Shell.cmd("zaprett binary-version").submit { result ->
+        if (result.out.isNotEmpty()) callback(result.out.first()) else "undefined"
+    }
+}
+
+fun getConfigFile(): File {
+    return File(Environment.getExternalStorageDirectory(), "zaprett/config.json")
+}
+
+fun setStartOnBoot(prefs: SharedPreferences, callback: (Boolean) -> Unit) {
+    if (prefs.getBoolean("use_module", false)) {
+        Shell.cmd("zaprett set-autostart").submit { result ->
+            if (result.out.isNotEmpty() && result.out.toString().contains("true")) callback(true) else callback(false)
+        }
+    }
+}
+
+fun getStartOnBoot(prefs: SharedPreferences, callback: (Boolean) -> Unit) {
+    if (prefs.getBoolean("use_module", false)) {
+        Shell.cmd("zaprett get-autostart").submit { result ->
+            if (result.out.isNotEmpty() && result.out.toString().contains("true")) callback(true) else callback(false)
+        }
+    } else {
+        callback(false)
+    }
+}
+
+fun getZaprettPath(): String {
+    return Environment.getExternalStorageDirectory().path + "/zaprett"
+}
+
+fun getAllLists(): Array<String> {
+    val listsDir = File("${getZaprettPath()}/lists/include")
+    return listsDir.listFiles { file -> file.isFile && file.extension.lowercase() == "txt" }
+        ?.map { it.absolutePath }
+        ?.toTypedArray()
+        ?: emptyArray()
+}
+
+fun getAllIpsets(): Array<String> {
+    val listsDir = File("${getZaprettPath()}/ipset/include")
+    return listsDir.listFiles { file -> file.isFile && file.extension.lowercase() == "txt" }
+        ?.map { it.absolutePath }
+        ?.toTypedArray()
+        ?: emptyArray()
+}
+
+fun getAllExcludeLists(): Array<String> {
+    val listsDir = File("${getZaprettPath()}/lists/exclude/")
+    return listsDir.listFiles { file -> file.isFile && file.extension.lowercase() == "txt" }
+        ?.map { it.absolutePath }
+        ?.toTypedArray()
+        ?: emptyArray()
+}
+
+fun getAllExcludeIpsets(): Array<String> {
+    val listsDir = File("${getZaprettPath()}/ipset/exclude/")
+    return listsDir.listFiles { file -> file.isFile && file.extension.lowercase() == "txt" }
+        ?.map { it.absolutePath }
+        ?.toTypedArray()
+        ?: emptyArray()
+}
+
+fun getAllNfqwsStrategies(): Array<String> {
+    val listsDir = File("${getZaprettPath()}/strategies/nfqws")
+    return listsDir.listFiles { file -> file.isFile && file.extension.lowercase() == "txt" }
+        ?.map { it.absolutePath }
+        ?.toTypedArray()
+        ?: emptyArray()
+}
+
+fun getAllByeDPIStrategies(): Array<String> {
+    val listsDir = File("${getZaprettPath()}/strategies/byedpi")
+    return listsDir.listFiles { file -> file.isFile && file.extension.lowercase() == "txt" }
+        ?.map { it.absolutePath }
+        ?.toTypedArray()
+        ?: emptyArray()
+}
+
+fun getAllStrategies(sharedPreferences: SharedPreferences): Array<String> {
+    return if (sharedPreferences.getBoolean("use_module", false)) getAllNfqwsStrategies()
+    else getAllByeDPIStrategies()
+}
+
+fun getActiveLists(sharedPreferences: SharedPreferences): Array<String> {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        return readConfig().activeLists.toTypedArray()
+    } else {
+        return sharedPreferences.getStringSet("lists", emptySet())?.toTypedArray() ?: emptyArray()
+    }
+}
+
+fun getActiveIpsets(sharedPreferences: SharedPreferences): Array<String> {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        return readConfig().activeIpsets.toTypedArray()
+    } else return sharedPreferences.getStringSet("ipsets", emptySet())?.toTypedArray() ?: emptyArray()
+}
+
+fun getActiveExcludeLists(sharedPreferences: SharedPreferences): Array<String> {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        return readConfig().activeExcludeLists.toTypedArray()
+    } else {
+        return sharedPreferences.getStringSet("exclude_lists", emptySet())?.toTypedArray() ?: emptyArray()
+    }
+}
+
+fun getActiveExcludeIpsets(sharedPreferences: SharedPreferences): Array<String> {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        return readConfig().activeExcludeIpsets.toTypedArray()
+    } else return sharedPreferences.getStringSet("exclude_ipsets", emptySet())?.toTypedArray() ?: emptyArray()
+}
+
+fun getActiveNfqwsStrategy(): Array<String> {
+    val strategy = readConfig().strategy
+    return if (strategy.isNotBlank()) arrayOf(strategy) else emptyArray()
+}
+
+fun getActiveByeDPIStrategy(sharedPreferences: SharedPreferences): Array<String> {
+    val path = sharedPreferences.getString("active_strategy", "")
+    if (!path.isNullOrBlank() && File(path).exists()) {
+        return arrayOf(path)
+    }
+    return emptyArray()
+}
+
+fun getActiveByeDPIStrategyContent(sharedPreferences: SharedPreferences): List<String> {
+    val path = sharedPreferences.getString("active_strategy", "")
+    if (!path.isNullOrBlank() && File(path).exists()) {
+        return File(path).readLines()
+    }
+    return emptyList()
+}
+
+fun getActiveStrategy(sharedPreferences: SharedPreferences): Array<String> {
+    return if (sharedPreferences.getBoolean("use_module", false)) getActiveNfqwsStrategy()
+    else getActiveByeDPIStrategy(sharedPreferences)
+}
+
+fun enableList(path: String, sharedPreferences: SharedPreferences) {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        val config = readConfig()
+        val isWhitelist = getHostListMode(sharedPreferences) == "whitelist"
+        val currentLists = if (isWhitelist) config.activeLists else config.activeExcludeLists
+        if (path !in currentLists) {
+            val updatedLists = currentLists + path
+            val newConfig = if (isWhitelist) {
+                config.copy(activeLists = updatedLists)
+            } else {
+                config.copy(activeExcludeLists = updatedLists)
+            }
+            writeConfig(newConfig)
+        }
+    } else {
+        val key = if (getHostListMode(sharedPreferences) == "whitelist") "lists" else "exclude_lists"
+        val currentSet = sharedPreferences.getStringSet(key, emptySet())?.toMutableSet() ?: mutableSetOf()
+        if (path !in currentSet) {
+            currentSet.add(path)
+            sharedPreferences.edit { putStringSet(key, currentSet) }
+        }
+    }
+}
+
+fun enableIpset(path: String, sharedPreferences: SharedPreferences) {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        val config = readConfig()
+        val isWhitelist = getHostListMode(sharedPreferences) == "whitelist"
+        val currentIpsets = if (isWhitelist) config.activeIpsets else config.activeExcludeIpsets
+        if (path !in currentIpsets) {
+            val updatedIpsets = currentIpsets + path
+            val newConfig = if (isWhitelist) {
+                config.copy(activeIpsets = updatedIpsets)
+            } else {
+                config.copy(activeExcludeIpsets = updatedIpsets)
+            }
+            writeConfig(newConfig)
+        }
+    } else {
+        val key = if (getHostListMode(sharedPreferences) == "whitelist") "ipsets" else "exclude_ipsets"
+        val currentSet = sharedPreferences.getStringSet(key, emptySet())?.toMutableSet() ?: mutableSetOf()
+        if (path !in currentSet) {
+            currentSet.add(path)
+            sharedPreferences.edit { putStringSet(key, currentSet) }
+        }
+    }
+}
+
+fun enableStrategy(path: String, sharedPreferences: SharedPreferences) {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        val config = readConfig()
+        if (config.strategy != path) {
+            writeConfig(config.copy(strategy = path))
+        }
+    } else {
+        sharedPreferences.edit { putString("active_strategy", path) }
+    }
+}
+
+fun disableList(path: String, sharedPreferences: SharedPreferences) {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        val config = readConfig()
+        val isWhitelist = getHostListMode(sharedPreferences) == "whitelist"
+        val currentLists = if (isWhitelist) config.activeLists else config.activeExcludeLists
+        if (path in currentLists) {
+            val updatedLists = currentLists.filter { it != path }
+            val newConfig = if (isWhitelist) {
+                config.copy(activeLists = updatedLists)
+            } else {
+                config.copy(activeExcludeLists = updatedLists)
+            }
+            writeConfig(newConfig)
+        }
+    } else {
+        val key = if (getHostListMode(sharedPreferences) == "whitelist") "lists" else "exclude_lists"
+        val currentSet = sharedPreferences.getStringSet(key, emptySet())?.toMutableSet() ?: mutableSetOf()
+        if (path in currentSet) {
+            currentSet.remove(path)
+            sharedPreferences.edit { putStringSet(key, currentSet) }
+        }
+        if (currentSet.isEmpty()) {
+            sharedPreferences.edit { remove(key) }
+        }
+    }
+}
+
+fun disableIpset(path: String, sharedPreferences: SharedPreferences) {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        val config = readConfig()
+        val isWhitelist = getHostListMode(sharedPreferences) == "whitelist"
+        val currentIpsets = if (isWhitelist) config.activeIpsets else config.activeExcludeIpsets
+        if (path in currentIpsets) {
+            val updatedIpsets = currentIpsets.filter { it != path }
+            val newConfig = if (isWhitelist) {
+                config.copy(activeIpsets = updatedIpsets)
+            } else {
+                config.copy(activeExcludeIpsets = updatedIpsets)
+            }
+            writeConfig(newConfig)
+        }
+    } else {
+        val key = if (getHostListMode(sharedPreferences) == "whitelist") "ipsets" else "exclude_ipsets"
+        val currentSet = sharedPreferences.getStringSet(key, emptySet())?.toMutableSet() ?: mutableSetOf()
+        if (path in currentSet) {
+            currentSet.remove(path)
+            sharedPreferences.edit { putStringSet(key, currentSet) }
+        }
+        if (currentSet.isEmpty()) {
+            sharedPreferences.edit { remove(key) }
+        }
+    }
+}
+
+fun disableStrategy(path: String, sharedPreferences: SharedPreferences) {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        val config = readConfig()
+        if (config.strategy == path) {
+            writeConfig(config.copy(strategy = ""))
+        }
+    } else {
+        sharedPreferences.edit { remove("active_strategy") }
+    }
+}
+
+fun addPackageToList(listType: AppListType, packageName: String, prefs: SharedPreferences, context: Context) {
+    if (prefs.getBoolean("use_module", false)) {
+        val config = readConfig()
+        if (listType == AppListType.Whitelist) {
+            if (packageName !in config.whitelist) {
+                writeConfig(config.copy(whitelist = config.whitelist + packageName))
+            }
+        } else if (listType == AppListType.Blacklist) {
+            if (packageName !in config.blacklist) {
+                writeConfig(config.copy(blacklist = config.blacklist + packageName))
+            }
+        }
+    } else {
+        val prefs = context.getSharedPreferences("settings", MODE_PRIVATE)
+        if (listType == AppListType.Whitelist) {
+            val set = prefs.getStringSet("whitelist", emptySet())?.toMutableSet() ?: mutableSetOf()
+            set.add(packageName)
+            prefs.edit().putStringSet("whitelist", set).apply()
+        }
+        if (listType == AppListType.Blacklist) {
+            val set = prefs.getStringSet("blacklist", emptySet())?.toMutableSet() ?: mutableSetOf()
+            set.add(packageName)
+            prefs.edit().putStringSet("blacklist", set).apply()
+        }
+    }
+}
+
+fun removePackageFromList(listType: AppListType, packageName: String, prefs: SharedPreferences, context: Context) {
+    if (prefs.getBoolean("use_module", false)) {
+        val config = readConfig()
+        if (listType == AppListType.Whitelist) {
+            if (packageName in config.whitelist) {
+                writeConfig(config.copy(whitelist = config.whitelist.filter { it != packageName }))
+            }
+        } else if (listType == AppListType.Blacklist) {
+            if (packageName in config.blacklist) {
+                writeConfig(config.copy(blacklist = config.blacklist.filter { it != packageName }))
+            }
+        }
+    } else {
+        val prefs = context.getSharedPreferences("settings", MODE_PRIVATE)
+        if (listType == AppListType.Whitelist) {
+            val set = prefs.getStringSet("whitelist", emptySet())?.toMutableSet() ?: mutableSetOf()
+            set.remove(packageName)
+            prefs.edit().putStringSet("whitelist", set).apply()
+        }
+        if (listType == AppListType.Blacklist) {
+            val set = prefs.getStringSet("blacklist", emptySet())?.toMutableSet() ?: mutableSetOf()
+            set.remove(packageName)
+            prefs.edit().putStringSet("blacklist", set).apply()
+        }
+    }
+}
+
+fun isInList(listType: AppListType, packageName: String, prefs: SharedPreferences, context: Context): Boolean {
+    if (prefs.getBoolean("use_module", false)) {
+        val config = readConfig()
+        return if (listType == AppListType.Whitelist) {
+            packageName in config.whitelist
+        } else {
+            packageName in config.blacklist
+        }
+    } else {
+        val prefs = context.getSharedPreferences("settings", MODE_PRIVATE)
+        if (listType == AppListType.Whitelist) {
+            val whitelist = prefs.getStringSet("whitelist", emptySet()) ?: emptySet()
+            return packageName in whitelist
+        } else {
+            val blacklist = prefs.getStringSet("blacklist", emptySet()) ?: emptySet()
+            return packageName in blacklist
+        }
+    }
+}
+
+fun getAppList(listType: AppListType, sharedPreferences: SharedPreferences, context: Context): Set<String> {
+    if (sharedPreferences.getBoolean("use_module", false)) {
+        val config = readConfig()
+        return if (listType == AppListType.Whitelist) {
+            config.whitelist.toSet()
+        } else {
+            config.blacklist.toSet()
+        }
+    } else {
+        return if (listType == AppListType.Whitelist) context.getSharedPreferences("settings", MODE_PRIVATE)
+            .getStringSet("whitelist", emptySet()) ?: emptySet()
+        else context.getSharedPreferences("settings", MODE_PRIVATE)
+            .getStringSet("blacklist", emptySet()) ?: emptySet()
+    }
+}
+
+fun getAppsListMode(prefs: SharedPreferences): String {
+    if (prefs.getBoolean("use_module", false)) {
+        val applist = readConfig().appList
+        Log.d("App list", "Equals to $applist")
+        return if (applist == "whitelist" || applist == "blacklist" || applist == "none") applist
+        else "none"
+    } else {
+        return prefs.getString("app_list", "none")!!
+    }
+}
+
+fun setAppsListMode(prefs: SharedPreferences, mode: String) {
+    if (prefs.getBoolean("use_module", false)) {
+        val config = readConfig()
+        writeConfig(config.copy(appList = mode))
+    } else {
+        prefs.edit { putString("app_list", mode) }
+    }
+    Log.d("App List", "Changed to $mode")
+}
+
+fun setHostListMode(prefs: SharedPreferences, mode: String) {
+    if (prefs.getBoolean("use_module", false)) {
+        val config = readConfig()
+        writeConfig(config.copy(listType = mode))
+    } else {
+        prefs.edit { putString("list_type", mode) }
+    }
+    Log.d("App List", "Changed to $mode")
+}
+
+fun getHostListMode(prefs: SharedPreferences): String {
+    if (prefs.getBoolean("use_module", false)) {
+        val hostlist = readConfig().listType
+        return if (hostlist == "whitelist" || hostlist == "blacklist") hostlist
+        else "whitelist"
+    } else {
+        return prefs.getString("list_type", "whitelist")!!
+    }
+}

app/src/main/jni/Application.mk

@@ -16,6 +16,6 @@
 APP_OPTIM := release
 APP_PLATFORM := android-21
 APP_ABI := armeabi-v7a arm64-v8a x86 x86_64
-APP_CFLAGS := -O3 -DPKGNAME=com/cherret/zaprett
+APP_CFLAGS := -O3 -DPKGNAME=com/cherret/zaprett/byedpi
 APP_CPPFLAGS := -O3 -std=c++11
 NDK_TOOLCHAIN_VERSION := clang

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M12,0.297c-6.63,0 -12,5.373 -12,12 0,5.303 3.438,9.8 8.205,11.385 0.6,0.113 0.82,-0.258 0.82,-0.577 0,-0.285 -0.01,-1.04 -0.015,-2.04 -3.338,0.724 -4.042,-1.61 -4.042,-1.61C4.422,18.07 3.633,17.7 3.633,17.7c-1.087,-0.744 0.084,-0.729 0.084,-0.729 1.205,0.084 1.838,1.236 1.838,1.236 1.07,1.835 2.809,1.305 3.495,0.998 0.108,-0.776 0.417,-1.305 0.76,-1.605 -2.665,-0.3 -5.466,-1.332 -5.466,-5.93 0,-1.31 0.465,-2.38 1.235,-3.22 -0.135,-0.303 -0.54,-1.523 0.105,-3.176 0,0 1.005,-0.322 3.3,1.23 0.96,-0.267 1.98,-0.399 3,-0.405 1.02,0.006 2.04,0.138 3,0.405 2.28,-1.552 3.285,-1.23 3.285,-1.23 0.645,1.653 0.24,2.873 0.12,3.176 0.765,0.84 1.23,1.91 1.23,3.22 0,4.61 -2.805,5.625 -5.475,5.92 0.42,0.36 0.81,1.096 0.81,2.22 0,1.606 -0.015,2.896 -0.015,3.286 0,0.315 0.21,0.69 0.825,0.57C20.565,22.092 24,17.592 24,12.297c0,-6.627 -5.373,-12 -12,-12"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M0.632,0.55v22.9L2.28,23.45L2.28,24L0,24L0,0h2.28v0.55zM7.675,7.81v1.157h0.033c0.309,-0.443 0.683,-0.784 1.117,-1.024 0.433,-0.245 0.936,-0.365 1.5,-0.365 0.54,0 1.033,0.107 1.481,0.314 0.448,0.208 0.785,0.582 1.02,1.108 0.254,-0.374 0.6,-0.706 1.034,-0.992 0.434,-0.287 0.95,-0.43 1.546,-0.43 0.453,0 0.872,0.056 1.26,0.167 0.388,0.11 0.716,0.286 0.993,0.53 0.276,0.245 0.489,0.559 0.646,0.951 0.152,0.392 0.23,0.863 0.23,1.417v5.728h-2.349L16.186,11.52c0,-0.286 -0.01,-0.559 -0.032,-0.812a1.755,1.755 0,0 0,-0.18 -0.66,1.106 1.106,0 0,0 -0.438,-0.448c-0.194,-0.11 -0.457,-0.166 -0.785,-0.166 -0.332,0 -0.6,0.064 -0.803,0.189a1.38,1.38 0,0 0,-0.48 0.499,1.946 1.946,0 0,0 -0.231,0.696 5.56,5.56 0,0 0,-0.06 0.785v4.768h-2.35v-4.8c0,-0.254 -0.004,-0.503 -0.018,-0.752a2.074,2.074 0,0 0,-0.143 -0.688,1.052 1.052,0 0,0 -0.415,-0.503c-0.194,-0.125 -0.476,-0.19 -0.854,-0.19 -0.111,0 -0.259,0.024 -0.439,0.074 -0.18,0.051 -0.36,0.143 -0.53,0.282 -0.171,0.138 -0.319,0.337 -0.439,0.595 -0.12,0.259 -0.18,0.6 -0.18,1.02v4.966L5.46,16.375L5.46,7.81zM23.368,23.45L23.368,0.55L21.72,0.55L21.72,0L24,0v24h-2.28v-0.55z"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M11.944,0A12,12 0,0 0,0 12a12,12 0,0 0,12 12,12 12,0 0,0 12,-12A12,12 0,0 0,12 0a12,12 0,0 0,-0.056 0zM16.906,7.224c0.1,-0.002 0.321,0.023 0.465,0.14a0.506,0.506 0,0 1,0.171 0.325c0.016,0.093 0.036,0.306 0.02,0.472 -0.18,1.898 -0.962,6.502 -1.36,8.627 -0.168,0.9 -0.499,1.201 -0.82,1.23 -0.696,0.065 -1.225,-0.46 -1.9,-0.902 -1.056,-0.693 -1.653,-1.124 -2.678,-1.8 -1.185,-0.78 -0.417,-1.21 0.258,-1.91 0.177,-0.184 3.247,-2.977 3.307,-3.23 0.007,-0.032 0.014,-0.15 -0.056,-0.212s-0.174,-0.041 -0.249,-0.024c-0.106,0.024 -1.793,1.14 -5.061,3.345 -0.48,0.33 -0.913,0.49 -1.302,0.48 -0.428,-0.008 -1.252,-0.241 -1.865,-0.44 -0.752,-0.245 -1.349,-0.374 -1.297,-0.789 0.027,-0.216 0.325,-0.437 0.893,-0.663 3.498,-1.524 5.83,-2.529 6.998,-3.014 3.332,-1.386 4.025,-1.627 4.476,-1.635z"/>
+</vector>

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

@@ -5,12 +5,13 @@
     <string name="title_strategies">Стратегии</string>
     <string name="title_repo">Репозиторий</string>
     <string name="title_settings">Настройки</string>
+    <string name="title_debug">Отладка</string>
     <string name="general_section">Основные настройки</string>
     <string name="byedpi_section">Настройки ByeDPI</string>
     <string name="btn_continue">Продолжить</string>
     <string name="btn_update">Обновить</string>
     <string name="btn_dismiss">Отмена</string>
-    <string name="text_welcome">Привет в zaprett! Это приложение предназначено для обхода цензуры и иных блокировок. Для полноценной работоспособности необходимо установить Magisk модуль.</string>
+    <string name="text_welcome">Добро пожаловать в zaprett! Это приложение предназначено для обхода цензуры и иных блокировок. Для полноценной работоспособности необходимо установить Magisk модуль.</string>
     <string name="btn_use_root">Использовать модуль</string>
     <string name="error_root_title">Root не получен</string>
     <string name="error_root_message">Не получилось получить root доступ. Дайте права root для использования модуля Magisk</string>
@@ -23,7 +24,7 @@
     <string name="status_enabled">Сервис zaprett работает. Нажми для обновления состояния</string>
     <string name="status_disabled">Сервис zaprett не работает. Нажми для обновления состояния</string>
     <string name="status_crashed">Сервис zaprett вероятно крашнулся. Нажмите кнопку перезапуска ниже</string>
-    <string name="update_available">Доступно новое обновление!</string>
+    <string name="update_available">Доступно обновление</string>
     <string name="btn_update_on_boot">Обновлять статус при запуске Главной страницы</string>
     <string name="btn_start_service">Запустить сервис</string>
     <string name="btn_stop_service">Остановить сервис</string>
@@ -40,14 +41,16 @@
     <string name="btn_update_host">Обновить</string>
     <string name="btn_installing_host">Установка</string>
     <string name="btn_updating_host">Обновление</string>
-    <string name="btn_installed_host">Установленно</string>
+    <string name="btn_installed_host">Установлено</string>
-    <string name="btn_autorestart">Переодически перезапускать сервис</string>
+    <string name="btn_autorestart">Периодически перезапускать сервис</string>
-    <string name="btn_autoupdate">Авто обновление</string>
+    <string name="btn_autoupdate">Автообновление</string>
     <string name="btn_send_firebase_analytics">Отправлять аналитику Firebase</string>
     <string name="btn_repository_url_lists">URL репозитория хостов</string>
     <string name="hint_enter_repository_url_lists">Введите URL репозитория хостов</string>
     <string name="btn_repository_url_strategies">URL репозитория стратегий</string>
     <string name="hint_enter_repository_url_strategies">Введите URL репозитория стратегий</string>
+    <string name="btn_update_repository_url">URL репозитория обновлений</string>
+    <string name="hint_enter_update_repository_url">Введите URL репозитория обновлений</string>
     <string name="btn_ipv6">IPv6</string>
     <string name="btn_ip">IP-адрес</string>
     <string name="hint_ip">Введите IP-адрес</string>
@@ -67,17 +70,54 @@
     <string name="btn_show_full_path">Показывать полный путь к листу</string>
     <string name="pls_reboot_snack">Перезагрузите устройство для вступления изменений в силу</string>
     <string name="pls_restart_snack">Перезапустите zaprett для вступления изменений в силу</string>
-    <string name="qs_name">Zaprett</string>
     <string name="qs_starting">Запуск…</string>
     <string name="qs_stopping">Остановка…</string>
     <string name="module_version">Версия модуля</string>
     <string name="nfqws_version">Версия nfqws</string>
-    <string name="ciadpi_version">Версия ciadpi 0.17.1</string>
+    <string name="ciadpi_version">Версия ciadpi</string>
     <string name="unknown_text">неизвестно</string>
     <string name="service_mode">Режим работы</string>
     <string name="qs_not_available">Не доступно</string>
     <string name="qs_working">Работает</string>
     <string name="qs_not_working">Не работает</string>
     <string name="about_title">О приложении</string>
-    <string name="about_text">Zaprett app от Cherret, egor-white\nВерсия: %1$s</string>
+    <string name="about_text">zaprett app от Cherret, egor-white\nВерсия: %1$s</string>
+    <string name="btn_whitelist">Белый список приложений</string>
+    <string name="btn_blacklist">Чёрный список приложений</string>
+    <string name="shared_section">Общие настройки</string>
+    <string name="zapret_section">Настройки zapret</string>
+    <string name="title_whitelist">Белый список</string>
+    <string name="title_blacklist">Чёрный список</string>
+    <string name="btn_applist">Списки приложений</string>
+    <string name="radio_disabed">Выключено</string>
+    <string name="btn_show_system_apps">Показывать системные приложения</string>
+    <string name="search_field">Поиск…</string>
+    <string name="error_text">Ошибка</string>
+    <string name="error_server_data">Ошибка получения данных с сервера, пожалуйста проверьте интернет соединение</string>
+    <string name="error_processing_data">Ошибка при обработке данных</string>
+    <string name="error_unknown">Неизвестная ошибка</string>
+    <string name="btn_copy_log">Скопировать лог</string>
+    <string name="log_copied">Лог скопирован</string>
+    <string name="download_error">Произошла ошибка скачивания, пожалуйста, сообщите о ней разработчикам</string>
+    <string name="ipset_repo_url">URL репозитория ipset</string>
+    <string name="title_selection">Подбор стратегии</string>
+    <string name="btn_repository_url_ipsets">URL репозитория ipset</string>
+    <string name="hint_enter_repository_url_ipsets">Введите URL репозитория ipset</string>
+    <string name="strategy_status_waiting">ожидание...</string>
+    <string name="strategy_status_testing">проверка...</string>
+    <string name="strategy_status_tested">проверка завершена</string>
+    <string name="strategy_applied">Стратегия применена</string>
+    <string name="begin_selection">Начать подбор</string>
+    <string name="begin_selection_snack">Начат подбор стратегии. Не закрывайте эту вкладку</string>
+    <string name="change_probe_timeout">Изменить таймаут пробы</string>
+    <string name="probe_timeout">Таймаут пробы</string>
+    <string name="hint_enter_probe_timeout">Введите таймаут пробы</string>
+    <string name="strategy_selection_info_title">Информация</string>
+    <string name="strategy_selection_info_msg">"В этом разделе настроек приложения представлен перебор стратегий\n Подбор проходит среди скачанных стратегий, поэтому заранее скачайте из репозитория или добавьте из файловой системы интересующие вас стратегии для сравнения. \n Перед началом так же выберете один или несколько листов доменов на вкладке \"Листы\", затем нажмите на \"Начать подбор\". Не используйте для перебора списки с большим количеством доменов."</string>
+    <string name="selection_no_hosts_title">Нет включенных листов/стратегий</string>
+    <string name="selection_no_hosts_message">Не обнаружено активных списков хостов, либо доступных стратегий. Включите один или несколько, или скачайте стратегии для проверки, иначе подбор не сработает</string>
+    <string name="selection_available_domains">Доступные домены</string>
+    <string name="no_storage_permission_message">Нет разрешения на доступ к файлам</string>
+    <string name="reset_settings_title">Сброс настроек</string>
+    <string name="reset_settings_message">Вы действительно хотите сбросить настройки?</string>
 </resources>

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

@@ -5,12 +5,13 @@
     <string name="title_strategies">Strategies</string>
     <string name="title_repo">Repository</string>
     <string name="title_settings">Settings</string>
+    <string name="title_debug">Debug</string>
     <string name="general_section">General settings</string>
     <string name="byedpi_section">ByeDPI settings</string>
     <string name="btn_continue">Continue</string>
     <string name="btn_update">Update</string>
     <string name="btn_dismiss">Dismiss</string>
-    <string name="text_welcome">Hello to zaprett! This application is designed to bypass censorship and other blockages. For full functionality you need to install Magisk module.</string>
+    <string name="text_welcome">Welcome to zaprett! This application is designed to bypass censorship and other blockages. For full functionality you need to install Magisk module.</string>
     <string name="btn_use_root">Use module</string>
     <string name="error_root_title">Can\'t get root</string>
     <string name="error_root_message">Couldn\'t get root access. Give root access to use the Magisk module</string>
@@ -23,7 +24,7 @@
     <string name="status_enabled">zaprett service is working. Tap to update</string>
     <string name="status_disabled">zaprett service disabled.</string>
     <string name="status_crashed">zaprett service crashed. Tap restart button below</string>
-    <string name="update_available">New update available!</string>
+    <string name="update_available">Update available</string>
     <string name="btn_update_on_boot">Update the status when the Home page is launched</string>
     <string name="btn_start_service">Start service</string>
     <string name="btn_stop_service">Stop service</string>
@@ -49,6 +50,8 @@
     <string name="hint_enter_repository_url_lists">Enter hosts repository URL</string>
     <string name="btn_repository_url_strategies">Strategies repository URL</string>
     <string name="hint_enter_repository_url_strategies">Enter strategies repository URL</string>
+    <string name="btn_update_repository_url">Update repository URL</string>
+    <string name="hint_enter_update_repository_url">Enter update repository URL</string>
     <string name="btn_ipv6">IPv6</string>
     <string name="btn_ip">IP address</string>
     <string name="hint_ip">Enter IP address</string>
@@ -68,12 +71,12 @@
     <string name="btn_show_full_path">Show full list\'s path</string>
     <string name="pls_reboot_snack">Reboot your device for the changes to take effect</string>
     <string name="pls_restart_snack">Restart zaprett service for the changes to take effects</string>
-    <string name="qs_name">Zaprett</string>
+    <string name="qs_name" translatable="false">zaprett</string>
     <string name="qs_starting">Starting…</string>
     <string name="qs_stopping">Stopping…</string>
     <string name="module_version">Module version</string>
     <string name="nfqws_version">nfqws version</string>
-    <string name="ciadpi_version">ciadpi version 0.17.1</string>
+    <string name="ciadpi_version">ciadpi version</string>
     <string name="unknown_text">unknown</string>
     <string name="service_mode">Service mode</string>
     <string name="service_mode_nfqws" translatable="false">nfqws</string>
@@ -82,5 +85,44 @@
     <string name="qs_working">Working</string>
     <string name="qs_not_working">Not working</string>
     <string name="about_title">About app</string>
-    <string name="about_text">Zaprett App by Cherret, egor-white\nVersion: %1$s</string>
+    <string name="about_text">zaprett app by Cherret, egor-white\nVersion: %1$s</string>
+    <string name="btn_whitelist">App white list</string>
+    <string name="btn_blacklist">App black list</string>
+    <string name="shared_section">Shared settings</string>
+    <string name="zapret_section">zapret settings</string>
+    <string name="title_whitelist">White list</string>
+    <string name="title_blacklist">Black list</string>
+    <string name="btn_applist">Apps lists</string>
+    <string name="radio_disabed">Disabled</string>
+    <string name="btn_show_system_apps">Show system apps</string>
+    <string name="search_field">Search…</string>
+    <string name="error_text">Error</string>
+    <string name="error_server_data">Error retrieving data from the server, please check your internet connection</string>
+    <string name="error_processing_data">Error processing data</string>
+    <string name="error_unknown">Unknown error</string>
+    <string name="btn_copy_log">Copy log</string>
+    <string name="log_copied">Log copied</string>
+    <string name="download_error">Occurred a file download error, please report to developers</string>
+    <string name="ipset_repo_url">Ipset repository URL</string>
+    <string name="title_ipset" translatable="false">Ipset</string>
+    <string name="title_selection">Strategy selection</string>
+    <string name="btn_repository_url_ipsets">Ipsets repository url</string>
+    <string name="hint_enter_repository_url_ipsets">Enter ipsets repository URL</string>
+    <string name="strategy_status_waiting">waiting...</string>
+    <string name="strategy_status_testing">testing...</string>
+    <string name="strategy_status_tested">testing ended</string>
+    <string name="strategy_applied">Strategy applied</string>
+    <string name="begin_selection">Begin selection</string>
+    <string name="begin_selection_snack">Strategy selection has begun. Please keep this tab open.</string>
+    <string name="change_probe_timeout">Change probe timeout</string>
+    <string name="probe_timeout">Probe timeout</string>
+    <string name="hint_enter_probe_timeout">Enter probe timeout</string>
+    <string name="strategy_selection_info_title">Tip</string>
+    <string name="strategy_selection_info_msg">This section of the application settings allows you to iterate through strategies.\n The selection is based on downloaded strategies, so download the strategies you\'re interested in from the repository or add them from the file system for comparison.\n Before starting, select one or more domain lists in the \"Lists\" tab, then click \"Start selection\". Avoid using lists with a large number of domains.</string>
+    <string name="selection_no_hosts_title">No active hosts/strategies</string>
+    <string name="selection_no_hosts_message">No active host lists or available strategies were found. Please enable one or more, or download strategies for testing, otherwise the selection will not work.</string>
+    <string name="selection_available_domains">Available domains</string>
+    <string name="no_storage_permission_message">Missing permission to access files</string>
+    <string name="reset_settings_title">Reset settings</string>
+    <string name="reset_settings_message">Are you sure you want to reset the settings?</string>
 </resources>

changelog.md

@@ -1 +1,3 @@
-Добавлена вкладка "Стратегии"
+1. Изменения под новую версию модуля
+2. Исправление работы ipset с byedpi
+3. Исправление вылетов

gradle/libs.versions.toml

@@ -1,14 +1,24 @@
 [versions]
-agp = "8.10.1"
+agp = "8.13.1"
-kotlin = "2.0.21"
+kotlin = "2.2.10"
-coreKtx = "1.10.1"
+coreKtx = "1.17.0"
 junit = "4.13.2"
-junitVersion = "1.1.5"
+junitVersion = "1.3.0"
-espressoCore = "3.5.1"
+espressoCore = "3.7.0"
-lifecycleRuntimeKtx = "2.6.1"
+lifecycleRuntimeKtx = "2.9.2"
-activityCompose = "1.8.0"
+activityCompose = "1.10.1"
-composeBom = "2024.09.00"
+composeBom = "2025.08.00"
-lifecycleService = "2.9.1"
+compose-material3 = "1.3.2"
+compose-material3-adaptive = "1.4.0-beta02"
+navigation = "2.9.3"
+compose-icons = "1.7.8"
+libsu = "6.0.0"
+okhttp = "5.1.0"
+serialization = "1.9.0"
+firebase-bom = "34.1.0"
+fragment-compose = "1.8.9"
+coil3 = "3.3.0"
+compose-markdown = "0.5.7"
 
 [libraries]
 androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "coreKtx" }
@@ -25,7 +35,21 @@ androidx-ui-tooling-preview = { group = "androidx.compose.ui", name = "ui-toolin
 androidx-ui-test-manifest = { group = "androidx.compose.ui", name = "ui-test-manifest" }
 androidx-ui-test-junit4 = { group = "androidx.compose.ui", name = "ui-test-junit4" }
 androidx-material3 = { group = "androidx.compose.material3", name = "material3" }
-androidx-lifecycle-service = { group = "androidx.lifecycle", name = "lifecycle-service", version.ref = "lifecycleService" }
+compose-material3 = { group = "androidx.compose.material3", name = "material3", version.ref = "compose-material3" }
+compose-material3-window-size = { group = "androidx.compose.material3", name = "material3-window-size-class", version.ref = "compose-material3" }
+compose-material3-adaptive-nav = { group = "androidx.compose.material3", name = "material3-adaptive-navigation-suite", version.ref = "compose-material3-adaptive" }
+navigation-compose = { group = "androidx.navigation", name = "navigation-compose", version.ref = "navigation" }
+compose-icons = { group = "androidx.compose.material", name = "material-icons-extended", version.ref = "compose-icons" }
+libsu-core = { group = "com.github.topjohnwu.libsu", name = "core", version.ref = "libsu" }
+okhttp = { group = "com.squareup.okhttp3", name = "okhttp", version.ref = "okhttp" }
+serialization-json = { group = "org.jetbrains.kotlinx", name = "kotlinx-serialization-json", version.ref = "serialization" }
+firebase-bom = { group = "com.google.firebase", name = "firebase-bom", version.ref = "firebase-bom" }
+firebase-analytics = { group = "com.google.firebase", name = "firebase-analytics" }
+firebase-crashlytics = { group = "com.google.firebase", name = "firebase-crashlytics" }
+fragment-compose = { group = "androidx.fragment", name = "fragment-compose", version.ref = "fragment-compose" }
+coil-compose = { group = "io.coil-kt.coil3", name = "coil-compose", version.ref = "coil3" }
+compose-markdown = { module = "com.github.jeziellago:compose-markdown", version.ref = "compose-markdown" }
+
 
 [plugins]
 android-application = { id = "com.android.application", version.ref = "agp" }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 #Sat Mar 22 14:00:49 GMT+07:00 2025
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

rust/CMakeLists.txt

@@ -5,7 +5,7 @@ project(byedpi_native)
 file(GLOB BYE_DPI_SRC byedpi/*.c)
 list(REMOVE_ITEM BYE_DPI_SRC ${CMAKE_CURRENT_SOURCE_DIR}/byedpi/win_service.c)
 
-add_library(byedpi SHARED ${BYE_DPI_SRC} native-lib.c utils.c)
+add_library(byedpi STATIC ${BYE_DPI_SRC})
 target_include_directories(byedpi PRIVATE byedpi)
 
 target_compile_options(byedpi PRIVATE -std=c99 -O2 -Wall -Wno-unused -Wextra -Wno-unused-parameter -pedantic)

rust/Cargo.lock

@@ -0,0 +1,349 @@
+# This file is automatically @generated by Cargo.
+# It is not intended for manual editing.
+version = 4
+
+[[package]]
+name = "aho-corasick"
+version = "1.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e60d3430d3a69478ad0993f19238d2df97c507009a52b3c10addcd7f6bcb916"
+dependencies = [
+ "memchr",
+]
+
+[[package]]
+name = "android_log-sys"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "84521a3cf562bc62942e294181d9eef17eb38ceb8c68677bc49f144e4c3d4f8d"
+
+[[package]]
+name = "android_logger"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dbb4e440d04be07da1f1bf44fb4495ebd58669372fe0cffa6e48595ac5bd88a3"
+dependencies = [
+ "android_log-sys",
+ "env_filter",
+ "log",
+]
+
+[[package]]
+name = "byedpi"
+version = "0.1.0"
+dependencies = [
+ "android_logger",
+ "cmake",
+ "jni",
+ "libc",
+ "log",
+ "once_cell",
+]
+
+[[package]]
+name = "bytes"
+version = "1.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71b6127be86fdcfddb610f7182ac57211d4b18a3e9c82eb2d17662f2227ad6a"
+
+[[package]]
+name = "cc"
+version = "1.2.40"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d05d92f4b1fd76aad469d46cdd858ca761576082cd37df81416691e50199fb"
+dependencies = [
+ "find-msvc-tools",
+ "shlex",
+]
+
+[[package]]
+name = "cesu8"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d43a04d8753f35258c91f8ec639f792891f748a1edbd759cf1dcea3382ad83c"
+
+[[package]]
+name = "cfg-if"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2fd1289c04a9ea8cb22300a459a72a385d7c73d3259e2ed7dcb2af674838cfa9"
+
+[[package]]
+name = "cmake"
+version = "0.1.54"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
+name = "env_filter"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "186e05a59d4c50738528153b83b0b0194d3a29507dfec16eccd4b342903397d0"
+dependencies = [
+ "log",
+ "regex",
+]
+
+[[package]]
+name = "find-msvc-tools"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3"
+
+[[package]]
+name = "jni"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1a87aa2bb7d2af34197c04845522473242e1aa17c12f4935d5856491a7fb8c97"
+dependencies = [
+ "cesu8",
+ "cfg-if",
+ "combine",
+ "jni-sys",
+ "log",
+ "thiserror",
+ "walkdir",
+ "windows-sys 0.45.0",
+]
+
+[[package]]
+name = "jni-sys"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
+
+[[package]]
+name = "libc"
+version = "0.2.176"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "58f929b4d672ea937a23a1ab494143d968337a5f47e56d0815df1e0890ddf174"
+
+[[package]]
+name = "log"
+version = "0.4.28"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "34080505efa8e45a4b816c349525ebe327ceaa8559756f0356cba97ef3bf7432"
+
+[[package]]
+name = "memchr"
+version = "2.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52b00d39961fc5b2736ea853c9cc86238e165017a493d1d5c8eac6bdc4cc273"
+
+[[package]]
+name = "once_cell"
+version = "1.21.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
+
+[[package]]
+name = "proc-macro2"
+version = "1.0.101"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "89ae43fd86e4158d6db51ad8e2b80f313af9cc74f5c0e03ccb87de09998732de"
+dependencies = [
+ "unicode-ident",
+]
+
+[[package]]
+name = "quote"
+version = "1.0.41"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ce25767e7b499d1b604768e7cde645d14cc8584231ea6b295e9c9eb22c02e1d1"
+dependencies = [
+ "proc-macro2",
+]
+
+[[package]]
+name = "regex"
+version = "1.11.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-automata",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-automata"
+version = "0.4.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
+dependencies = [
+ "aho-corasick",
+ "memchr",
+ "regex-syntax",
+]
+
+[[package]]
+name = "regex-syntax"
+version = "0.8.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
+
+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
+[[package]]
+name = "shlex"
+version = "1.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
+
+[[package]]
+name = "syn"
+version = "2.0.106"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ede7c438028d4436d71104916910f5bb611972c5cfd7f89b8300a8186e6fada6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "unicode-ident",
+]
+
+[[package]]
+name = "thiserror"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52"
+dependencies = [
+ "thiserror-impl",
+]
+
+[[package]]
+name = "thiserror-impl"
+version = "1.0.69"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "unicode-ident"
+version = "1.0.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f63a545481291138910575129486daeaf8ac54aee4387fe7906919f7830c7d9d"
+
+[[package]]
+name = "walkdir"
+version = "2.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29790946404f91d9c5d06f9874efddea1dc06c5efe94541a7d6863108e3a5e4b"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
+[[package]]
+name = "winapi-util"
+version = "0.1.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22"
+dependencies = [
+ "windows-sys 0.61.1",
+]
+
+[[package]]
+name = "windows-link"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "45e46c0661abb7180e7b9c281db115305d49ca1709ab8242adf09666d2173c65"
+
+[[package]]
+name = "windows-sys"
+version = "0.45.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0"
+dependencies = [
+ "windows-targets",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.61.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6f109e41dd4a3c848907eb83d5a42ea98b3769495597450cf6d153507b166f0f"
+dependencies = [
+ "windows-link",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5180c00cd44c9b1c88adb3693291f1cd93605ded80c250a75d472756b4d071"
+dependencies = [
+ "windows_aarch64_gnullvm",
+ "windows_aarch64_msvc",
+ "windows_i686_gnu",
+ "windows_i686_msvc",
+ "windows_x86_64_gnu",
+ "windows_x86_64_gnullvm",
+ "windows_x86_64_msvc",
+]
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"

rust/Cargo.toml

@@ -0,0 +1,23 @@
+[package]
+name = "byedpi"
+version = "0.1.0"
+edition = "2024"
+
+[dependencies]
+jni = "0.21.1"
+libc = "0.2.0"
+android_logger = "0.15.1"
+log = "0.4"
+once_cell = "1.21.3"
+
+[lib]
+crate-type = ["cdylib"]
+
+[build-dependencies]
+cmake = "0.1.49"
+
+[profile.release]
+opt-level = "z"
+lto = true
+strip = true
+codegen-units = 1

rust/build.rs

@@ -0,0 +1,8 @@
+use cmake::Config;
+
+fn main() {
+    let dst = Config::new(".").build_target("byedpi").build();
+    let lib_path = dst.join("build");
+    println!("cargo:rustc-link-search=native={}", lib_path.display());
+    println!("cargo:rustc-link-lib=static=byedpi");
+}

rust/src/lib.rs

@@ -0,0 +1,74 @@
+use android_logger::Config;
+use jni::JNIEnv;
+use jni::objects::{JClass, JObjectArray, JString};
+use jni::sys::jint;
+use libc::{SHUT_RDWR, shutdown};
+use log::{LevelFilter, info};
+use std::ffi::CString;
+use std::os::raw::c_char;
+use std::sync::atomic::{AtomicBool, Ordering};
+
+static PROXY_RUNNING: AtomicBool = AtomicBool::new(false);
+
+#[link(name = "byedpi", kind = "static")]
+unsafe extern "C" {
+    static mut server_fd: i32;
+    static mut optind: i32;
+    static mut optreset: i32;
+    fn main(argc: libc::c_int, argv: *const *const c_char) -> libc::c_int;
+    fn clear_params();
+}
+
+fn init_logger() {
+    android_logger::init_once(Config::default().with_max_level(LevelFilter::Info));
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "system" fn Java_com_cherret_zaprett_byedpi_NativeBridge_jniStartProxy(
+    mut env: JNIEnv,
+    _class: JClass,
+    args: JObjectArray,
+) -> jint {
+    init_logger();
+    if PROXY_RUNNING.swap(true, Ordering::SeqCst) {
+        info!("proxy already running");
+        return -1;
+    }
+    let argc = env.get_array_length(&args).unwrap_or(0) as usize;
+    let mut cstrings: Vec<CString> = Vec::with_capacity(argc);
+    for i in 0..argc {
+        let jstr: JString = env
+            .get_object_array_element(&args, i as i32)
+            .unwrap()
+            .into();
+        let rust_str: String = env.get_string(&jstr).unwrap().into();
+        cstrings.push(CString::new(rust_str).unwrap());
+    }
+    let mut argv: Vec<*const c_char> = cstrings.iter().map(|s| s.as_ptr()).collect();
+    argv.push(std::ptr::null());
+    info!("starting proxy");
+    unsafe {
+        optind = 1;
+        optreset = 1;
+        clear_params();
+    }
+    PROXY_RUNNING.store(true, Ordering::SeqCst);
+    let ret = unsafe { main(argc as i32, argv.as_ptr()) };
+    PROXY_RUNNING.store(false, Ordering::SeqCst);
+    ret as jint
+}
+
+#[unsafe(no_mangle)]
+pub unsafe extern "system" fn Java_com_cherret_zaprett_byedpi_NativeBridge_jniStopProxy(
+    _env: JNIEnv,
+    _class: JClass,
+) -> jint {
+    init_logger();
+    if !PROXY_RUNNING.load(Ordering::SeqCst) {
+        info!("failed to stop proxy");
+        return -1;
+    }
+    info!("stopping proxy");
+    let ret = unsafe { shutdown(server_fd, SHUT_RDWR) };
+    ret as jint
+}

update.json

@@ -1,6 +1,6 @@
 {
-	"version": "1.10",
+	"version": "2.12",
-	"versionCode": 11,
+	"versionCode": 24,
-	"downloadUrl": "https://github.com/CherretGit/zaprett-app/releases/download/1_10_0/app-release.apk",
+	"downloadUrl": "https://github.com/CherretGit/zaprett-app/releases/download/2.12.0/app-release.apk",
 	"changelogUrl": "https://raw.githubusercontent.com/CherretGit/zaprett-app/refs/heads/main/changelog.md"
 }