Bump version

Fix fast scroller in per-app config
Update licenses, close #1059
2017-01-07 11:03:06 +08:00 · 2017-01-07 09:49:22 +08:00 · 2017-01-07 08:56:19 +08:00 · 2017-01-07 04:05:02 +08:00 · 2017-01-07 03:54:01 +08:00 · 2017-01-07 02:52:25 +08:00
179 changed files with 29673 additions and 12787 deletions
@@ -0,0 +1,48 @@
+### Troubleshooting
+
+Cannot connect to server:
+
+1. Stop battery saver if it's active;
+2. If an upgrade breaks anything, do a manual reset first by pressing Reset at the end of the list;
+3. Check your config;
+4. Wipe app data.
+
+Crash: [Submit an issue](https://github.com/shadowsocks/shadowsocks-android/issues/new) with logcat attached, or submit a crash report to Google Play. Then, try wiping app data.
+
+### UI tips
+
+* Tap the number to enter the port you wish to use; (if the keyboard doesn't pop up automatically for some reason)
+* Use Tasker integration to create a desktop widget.
+
+### Why is NAT mode deprecated?
+
+1. Requiring ROOT permission;
+2. No IPv6 support;
+3. No UDP relay support.
+
+### How to remove the exclamation mark when using VPN mode?
+
+The exclamation mark in the Wi-Fi/cellular icon appears because the system fails to connect to portal server (defaults to `clients3.google.com`) without VPN connection. To remove it, follow the instructions in [this article](https://www.noisyfox.cn/45.html). (in Simplified Chinese)
+
+### Why are MIUI, EMUI and other AOSPs in China not officially supported?
+
+1. Broken VPNService implementation, especially for IPv6;
+2. Aggressive (or called broken) background service killing policy.
+
+Fixes for MIUI: [#772](https://github.com/shadowsocks/shadowsocks-android/issues/772)
+
+### How to pause Shadowsocks service?
+
+* For Android 7.0+: Use quick switch tile in Quick Settings;
+* Use Tasker integration;
+* Add a profile with per-app proxy enabled for Shadowsocks only, bypass mode off.
+
+### Why does Shadowsocks consume so much battery on Android 5.0+?
+
+As Shadowsocks takes over the whole device network, any battery used by network activities from other apps are also counted as those from Shadowsocks. So, the battery usage of Shadowsocks equals to the sum of all the network activities of your device. Shadowsocks itself is a totally I/O bound application on modern Android devices, which is expected not to consume any notable battery.
+
+So if you notice a significant increase in battery usage after you use Shadowsocks, it's most likely caused by other apps. For example, Google Play services can consume more battery after being able to connecting to Google, etc.
+
+### It works fine under Wi-Fi but can't connect through cellular data?
+
+Allow this app to consume background data in app settings.
@@ -1,10 +1,38 @@
-Please answer these questions before submitting your issue. Thanks!
+Please read FAQ then answer these questions before submitting your issue. Thanks!

-### What version of Shadowsocks are you using?
+### Environment

+* Android version: *e.g. "7.0.0_r14", more detailed description is preferred*
+* Device: *e.g. Google Pixel XL*
+* Shadowsocks version: *version code "v3.0.0" or commit ID "a073f85"*
+* Last version that did not exhibit the issue (if applicable):

-### What Android OS version and device are you using?
+### Configuration

+_Put an `x` inside the [ ] that applies._
+
+* [ ] IPv4 server address
+* [ ] IPv6 server address
+* [ ] Client IPv4 availability
+* [ ] Client IPv6 availability
+* Local port: 1080
+* Encrypt method:
+* [ ] One-time authentication
+* Route
+  * [ ] All
+  * [ ] Bypass LAN
+  * [ ] Bypass China
+  * [ ] Bypass LAN & China
+  * [ ] GFW List
+  * [ ] China List
+* [ ] IPv6 route
+* [ ] Per-App Proxy
+  * [ ] Bypass mode
+* [ ] UDP Forwarding
+* KCP Parameters: (leave blank if not enabled)
+* [ ] Auto Connect
+* [ ] TCP Fast Open
+* [ ] NAT mode

 ### What did you do?

@@ -14,5 +42,3 @@ Please answer these questions before submitting your issue. Thanks!

 ### What did you see instead?

-
-### What is your config in detail (with all sensitive info masked)?
@@ -0,0 +1,14 @@
+### Type of changes
+
+_Put an `x` inside the [ ] that applies._
+
+* [ ] Bugfix
+* [ ] New feature
+* [ ] Translation
+* [ ] General refinement
+* Other:
+
+### Details
+
+Please provide more details about changes if necessary.
+
@@ -0,0 +1,2 @@
+# Scala source
+".*\\.scala"    -> frame open:"/*" line:"*" close:"*/"
@@ -27,7 +27,7 @@ cache:
 android:
    components:
        - tools
-        - build-tools-24.0.1
+        - build-tools-25.0.2
        - extra-android-m2repository
        - extra-google-m2repository

@@ -1,674 +1,17 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007

- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+Copyright (C) 2016 by Max Lv <max.c.lv@gmail.com>
+Copyright (C) 2016 by Mygod Studio <contact-shadowsocks-android@mygod.be>

-                            Preamble
+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.

-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
+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.

-  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.
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.

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

@@ -24,7 +24,6 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.
 * Set environment variable `ANDROID_NDK_HOME` to `/path/to/android-ndk`
 * Set environment variable `GOROOT_BOOTSTRAP` to `/path/to/go`
 * Create your key following the instructions at https://developer.android.com/studio/publish/app-signing.html
-* Put your key in ~/.keystore
 * Create `local.properties` from `local.properties.example` with your own key information
 * Invoke the building like this

@@ -37,19 +36,24 @@ A [shadowsocks](http://shadowsocks.org) client for Android, written in Scala.

 ## OPEN SOURCE LICENSES

-* shadowsocks-libev: [GPLv3](https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE)
-* tun2socks: [BSD](https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING)
-* redsocks: [APL 2.0](https://github.com/shadowsocks/redsocks/blob/master/README)
-* OpenSSL: [OpenSSL](https://github.com/shadowsocks/openssl-android/blob/master/NOTICE)
-* pdnsd: [GPLv3](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING)
-* libev: [GPLv2](https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libev/LICENSE)
-* libevent: [BSD](https://github.com/shadowsocks/libevent/blob/master/LICENSE)
-* kcptun: [MIT](https://github.com/xtaci/kcptun)
+<ul>
+    <li>redsocks: <a href="https://github.com/shadowsocks/redsocks/blob/shadowsocks-android/README">APL 2.0</a></li>
+    <li>mbed TLS: <a href="https://github.com/ARMmbed/mbedtls/blob/development/LICENSE">APL 2.0</a></li>
+    <li>libevent: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libevent/LICENSE">BSD</a></li>
+    <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a></li>
+    <li>pcre: <a href="https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE">BSD</a></li>
+    <li>libancillary: <a href="https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING">BSD</a></li>
+    <li>shadowsocks-libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE">GPLv3</a></li>
+    <li>pdnsd: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING">GPLv3</a></li>
+    <li>libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/libev/LICENSE">GPLv2</a></li>
+    <li>kcptun: <a href="https://github.com/xtaci/kcptun/commits/master/LICENSE.md">MIT</a></li>
+    <li>libsodium: <a href="https://github.com/jedisct1/libsodium/blob/master/LICENSE">ISC</a></li>
+</ul>

 ### LICENSE

 Copyright (C) 2016 by Max Lv <<max.c.lv@gmail.com>>  
-Copyright (C) 2016 by Mygod Studio <<mygodstudio@gmail.com>>
+Copyright (C) 2016 by Mygod Studio <<contact-shadowsocks-android@mygod.be>>

 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
@@ -1,64 +1,62 @@
-import android.Keys._
+scalaVersion := "2.11.8"
+dexMaxHeap := "4g"

-android.Plugin.androidBuild
-
-platformTarget in Android := "android-24"
+enablePlugins(AndroidApp)
+android.useSupportVectors

 name := "shadowsocks"
+version := "3.4.1"
+versionCode := Some(173)

-scalaVersion := "2.11.8"
+platformTarget := "android-25"

-compileOrder in Compile := CompileOrder.JavaThenScala
+compileOrder := CompileOrder.JavaThenScala
+javacOptions ++= "-source" :: "1.7" :: "-target" :: "1.7" :: Nil
+scalacOptions ++= "-target:jvm-1.7" :: "-Xexperimental" :: Nil
+ndkJavah := Seq()
+ndkBuild := Seq()

-javacOptions ++= Seq("-source", "1.7", "-target", "1.7")
+proguardVersion := "5.3.2"
+proguardCache := Seq()
+proguardOptions ++=
+  "-keep class com.github.shadowsocks.System { *; }" ::
+  "-dontwarn com.google.android.gms.internal.**" ::
+  "-dontwarn com.j256.ormlite.**" ::
+  "-dontwarn okio.**" ::
+  "-dontwarn org.xbill.**" ::
+  Nil

-scalacOptions ++= Seq("-target:jvm-1.7", "-Xexperimental")
-
-ndkJavah in Android := List()
-
-ndkBuild in Android := List()
-
-shrinkResources in Android := true
-
-typedResources in Android := false
-
-resConfigs in Android := Seq("ru", "zh", "zh-rCN")
-
-dexMaxHeap in Android := "4g"
+shrinkResources := true
+typedResources := false
+resConfigs := Seq("ja", "ru", "zh-rCN", "zh-rTW")

 resolvers += Resolver.jcenterRepo
-
-useSupportVectors
-
-libraryDependencies ++= Seq(
-  "com.android.support" % "design" % "24.2.1",
-  "com.android.support" % "gridlayout-v7" % "24.2.1",
-  "com.android.support" % "preference-v14" % "24.2.1",
-  "com.github.clans" % "fab" % "1.6.4",
-  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
-  "com.github.kevinsawicki" % "http-request" % "6.0",
-  "com.google.android.gms" % "play-services-ads" % "9.6.0",
-  "com.google.android.gms" % "play-services-analytics" % "9.6.0",
-  "com.j256.ormlite" % "ormlite-android" % "5.0",
-  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
-  "dnsjava" % "dnsjava" % "2.1.7",
-  "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809",
-  "me.dm7.barcodescanner" % "zxing" % "1.9",
-  "net.glxn.qrgen" % "android" % "2.0"
-)
-
-proguardVersion in Android := "5.2.1"
-
-proguardCache in Android := Seq()
-
-proguardOptions in Android ++= Seq(
-  "-keep class com.github.shadowsocks.System { *; }",
-  "-dontwarn com.google.android.gms.internal.**",
-  "-dontwarn com.j256.ormlite.**",
-  "-dontwarn org.xbill.**")
+libraryDependencies ++=
+  "com.android.support" % "cardview-v7" % "25.1.0" ::
+  "com.android.support" % "customtabs" % "25.1.0" ::
+  "com.android.support" % "design" % "25.1.0" ::
+  "com.android.support" % "gridlayout-v7" % "25.1.0" ::
+  "com.android.support" % "preference-v14" % "25.1.0" ::
+  "com.futuremind.recyclerfastscroll" % "fastscroll" % "0.2.5" ::
+  "com.evernote" % "android-job" % "1.1.4" ::
+  "com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01" ::
+  "com.google.android.gms" % "play-services-ads" % "10.0.1" ::
+  "com.google.android.gms" % "play-services-analytics" % "10.0.1" ::
+  "com.google.android.gms" % "play-services-gcm" % "10.0.1" ::
+  "com.j256.ormlite" % "ormlite-android" % "5.0" ::
+  "com.mikepenz" % "crossfader" % "1.5.0" ::
+  "com.mikepenz" % "fastadapter" % "2.1.5" ::
+  "com.mikepenz" % "iconics-core" % "2.8.2" ::
+  "com.mikepenz" % "materialdrawer" % "5.8.1" ::
+  "com.mikepenz" % "materialize" % "1.0.0" ::
+  "com.squareup.okhttp3" % "okhttp" % "3.5.0" ::
+  "com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2" ::
+  "dnsjava" % "dnsjava" % "2.1.7" ::
+  "eu.chainfire" % "libsuperuser" % "1.0.0.201608240809" ::
+  "net.glxn.qrgen" % "android" % "2.0" ::
+  Nil

 lazy val nativeBuild = TaskKey[Unit]("native-build", "Build native executables")
-
 nativeBuild := {
  val logger = streams.value.log
  Process("./build.sh") ! logger match {
@@ -0,0 +1,3 @@
+<issue id="NewApi">
+  <ignore path="src/main/res/drawable"/>
+</issue>
@@ -1,4 +1,4 @@
-addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.18")
+addSbtPlugin("org.scala-android" % "sbt-android" % "1.7.2")

 addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")

@@ -1,18 +1,13 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks"
-          android:versionCode="158"
-          android:versionName="3.1.6">
+          xmlns:tools="http://schemas.android.com/tools" package="com.github.shadowsocks">

    <uses-permission android:name="android.permission.INTERNET"/>
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>
    <uses-permission android:name="android.permission.NFC" />
-    <uses-permission android:name="android.permission.CAMERA" />

    <uses-feature android:name="android.hardware.touchscreen"
                  android:required="false"/>
-    <uses-feature android:name="android.hardware.camera"
-                  android:required="false"/>
    <uses-feature android:name="android.hardware.nfc"
                  android:required="false"/>
    <uses-feature android:name="android.software.leanback"
@@ -20,13 +15,15 @@

    <uses-sdk
            android:minSdkVersion="19"
-            android:targetSdkVersion="24"/>
+            android:targetSdkVersion="25"/>

    <application
            android:allowBackup="true"
+            android:extractNativeLibs="false"
            android:name=".ShadowsocksApplication"
            android:hardwareAccelerated="true"
-            android:icon="@drawable/ic_launcher"
+            android:icon="@mipmap/ic_launcher"
+            android:roundIcon="@mipmap/ic_launcher"
            android:backupAgent=".ShadowsocksBackupAgent"
            android:label="@string/app_name"
            android:theme="@style/Theme.Material"
@@ -38,11 +35,7 @@
                   android:value="AEdPqrEAAAAI_zVxZthz2HDuz9toTvkYvL0L5GA-OjeUIfBeXg"/>

        <activity
-                android:name="com.google.android.gms.ads.AdActivity"
-                android:configChanges="keyboard|keyboardHidden|orientation|screenLayout|uiMode|screenSize|smallestScreenSize"/>
-
-        <activity
-                android:name=".Shadowsocks"
+                android:name=".MainActivity"
                android:label="@string/app_name"
                android:launchMode="singleTask">
            <intent-filter>
@@ -51,26 +44,7 @@
                <category android:name="android.intent.category.LEANBACK_LAUNCHER"/>
            </intent-filter>
            <intent-filter>
-                <action android:name="android.service.quicksettings.action.QS_TILE" />
-            </intent-filter>
-        </activity>
-
-        <activity
-                android:name=".ShadowsocksRunnerActivity"
-                android:theme="@android:style/Theme.NoDisplay"
-                android:excludeFromRecents="true"
-                android:launchMode="singleTask">
-        </activity>
-
-        <activity
-                android:name=".ProfileManagerActivity"
-                android:label="@string/profiles"
-                android:parentActivityName=".Shadowsocks"
-                android:excludeFromRecents="true"
-                android:launchMode="singleTask">
-            <intent-filter>
-                <action android:name="com.github.shadowsocks.ProfileManagerActivity"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.service.quicksettings.action.QS_TILE_PREFERENCES" />
            </intent-filter>
            <intent-filter>
                <action android:name="android.intent.action.VIEW"/>
@@ -83,36 +57,46 @@
                <category android:name="android.intent.category.DEFAULT"/>
                <data android:scheme="ss" />
            </intent-filter>
+            <meta-data android:name="android.app.shortcuts"
+                       android:resource="@xml/shortcuts"/>
        </activity>

        <activity
-                android:name=".ScannerActivity"
-                android:label="@string/add_profile_methods_scan_qr_code"
-                android:parentActivityName=".ProfileManagerActivity"
-                android:excludeFromRecents="true"/>
+                android:name=".ProfileConfigActivity"
+                android:excludeFromRecents="true"
+                android:label="@string/profile_config"
+                android:launchMode="singleTask"/>
+
+        <activity
+                android:name=".ShadowsocksRunnerActivity"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                android:excludeFromRecents="true"
+		        android:taskAffinity=""
+                android:launchMode="singleTask"/>

        <activity
                android:name=".AppManager"
                android:label="@string/proxied_apps"
-                android:parentActivityName=".Shadowsocks"
+                android:parentActivityName=".ProfileConfigActivity"
                android:excludeFromRecents="true"
                android:launchMode="singleTask"/>

        <activity android:name=".TaskerActivity"
-                  android:icon="@drawable/ic_launcher">
+                  android:icon="@mipmap/ic_launcher">
            <intent-filter>
                <action android:name="com.twofortyfouram.locale.intent.action.EDIT_SETTING" />
            </intent-filter>
        </activity>

-        <activity android:name=".ShadowsocksQuickSwitchActivity"
-                  android:launchMode="singleInstance"
-                  android:excludeFromRecents="true"
-                  android:taskAffinity=""
-                  android:theme="@style/Theme.Material.Dialog">
+        <activity
+                android:name=".QuickToggleShortcut"
+                android:label="@string/quick_toggle"
+                android:theme="@android:style/Theme.Translucent.NoTitleBar"
+                android:excludeFromRecents="true"
+		android:taskAffinity=""
+                android:launchMode="singleTask">
            <intent-filter>
-                <action android:name="com.github.shadowsocks.QUICK_SWITCH" />
-                <category android:name="android.intent.category.DEFAULT"/>
+                <action android:name="android.intent.action.CREATE_SHORTCUT" />
            </intent-filter>
        </activity>

@@ -158,6 +142,21 @@
                <action android:name="com.twofortyfouram.locale.intent.action.FIRE_SETTING"/>
            </intent-filter>
        </receiver>
+
+        <!-- android-job components -->
+        <service android:name="com.evernote.android.job.v21.PlatformJobService"
+                 android:process=":bg"/>
+        <service android:name="com.evernote.android.job.v14.PlatformAlarmService"
+                 android:process=":bg"/>
+        <service android:name="com.evernote.android.job.gcm.PlatformGcmService"
+                 android:process=":bg"/>
+        <receiver android:name="com.evernote.android.job.v14.PlatformAlarmReceiver"
+                  android:process=":bg"/>
+        <receiver android:name="com.evernote.android.job.JobBootReceiver"
+                  android:process=":bg"/>
+
+        <!-- Strip useless components -->
+        <activity android:name="com.google.android.gms.ads.purchase.InAppPurchaseActivity" tools:node="remove"/>
    </application>

 </manifest>
@@ -7,6 +7,8 @@ interface IShadowsocksService {
  String getProfileName();

  oneway void registerCallback(IShadowsocksServiceCallback cb);
+  oneway void startListeningForBandwidth(IShadowsocksServiceCallback cb);
+  oneway void stopListeningForBandwidth(IShadowsocksServiceCallback cb);
  oneway void unregisterCallback(IShadowsocksServiceCallback cb);

  oneway void use(in int profileId);
@@ -2,5 +2,7 @@ package com.github.shadowsocks.aidl;

 interface IShadowsocksServiceCallback {
  oneway void stateChanged(int state, String profileName, String msg);
-  oneway void trafficUpdated(long txRate, long rxRate, long txTotal, long rxTotal);
+  oneway void trafficUpdated(int profileId, long txRate, long rxRate, long txTotal, long rxTotal);
+  // Traffic data has persisted to database, listener should refetch their data from database
+  oneway void trafficPersisted(int profileId);
 }
@@ -0,0 +1,14 @@
+0.0.0.0/8
+10.0.0.0/8
+100.64.0.0/10
+127.0.0.0/8
+169.254.0.0/16
+172.16.0.0/12
+192.0.0.0/29
+192.0.2.0/24
+192.88.99.0/24
+192.168.0.0/16
+198.18.0.0/15
+198.51.100.0/24
+203.0.113.0/24
+224.0.0.0/3
@@ -274,8 +274,8 @@ img {
 </head>
 <body>
 <p>A <a href="http://shadowsocks.org">Shadowsocks</a> client for Android, written in Scala.</p>
-<p>Copyright (C) 2016 by Max Lv <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x6d;&#97;x&#46;&#99;.&#108;&#118;&#x40;&#103;&#109;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;">&#x6d;&#97;&#x78;.&#x63;&#x2e;&#108;v&#64;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#109;</a></p>
-<p>Copyright (C) 2016 by Mygod Studio <a href="mygodstudio@gmail.com">mygodstudio@gmail.com</a></p>
+<p>Copyright (C) 2017 by Max Lv <a href="&#x6d;&#97;&#x69;&#108;&#116;&#111;&#x3a;&#x6d;&#97;x&#46;&#99;.&#108;&#118;&#x40;&#103;&#109;&#97;&#x69;&#108;&#46;&#x63;&#x6f;&#109;">&#x6d;&#97;&#x78;.&#x63;&#x2e;&#108;v&#64;&#x67;&#109;&#x61;&#x69;&#108;&#x2e;&#99;&#111;&#109;</a></p>
+<p>Copyright (C) 2017 by Mygod Studio <a href="contact-shadowsocks-android@mygod.be">contact-shadowsocks-android@mygod.be</a></p>
 <p>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
@@ -289,14 +289,17 @@ along with this program. If not, see <a href="http://www.gnu.org/licenses/">http

 <h3>Open Source Licenses</h3>
 <ul>
-    <li>shadowsocks-libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE">GPLv3</a></li>
-    <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a></li>
    <li>redsocks: <a href="https://github.com/shadowsocks/redsocks/blob/shadowsocks-android/README">APL 2.0</a></li>
-    <li>OpenSSL: <a href="https://github.com/shadowsocks/openssl-android/blob/master/NOTICE">OpenSSL</a></li>
-    <li>pdnsd: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING">GPLv3</a></li>
-    <li>libev: <a href="https://github.com/shadowsocks/libevent/blob/shadowsocks-android/LICENSE">GPLv2</a></li>
+    <li>mbed TLS: <a href="https://github.com/ARMmbed/mbedtls/blob/development/LICENSE">APL 2.0</a></li>
    <li>libevent: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/libevent/LICENSE">BSD</a></li>
+    <li>tun2socks: <a href="https://github.com/shadowsocks/badvpn/blob/shadowsocks-android/COPYING">BSD</a></li>
+    <li>pcre: <a href="https://android.googlesource.com/platform/external/pcre/+/master/dist2/LICENCE">BSD</a></li>
+    <li>libancillary: <a href="https://github.com/shadowsocks/libancillary/blob/shadowsocks-android/COPYING">BSD</a></li>
+    <li>shadowsocks-libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/LICENSE">GPLv3</a></li>
+    <li>pdnsd: <a href="https://github.com/shadowsocks/shadowsocks-android/blob/master/src/main/jni/pdnsd/COPYING">GPLv3</a></li>
+    <li>libev: <a href="https://github.com/shadowsocks/shadowsocks-libev/blob/master/libev/LICENSE">GPLv2</a></li>
    <li>kcptun: <a href="https://github.com/xtaci/kcptun/commits/master/LICENSE.md">MIT</a></li>
+    <li>libsodium: <a href="https://github.com/jedisct1/libsodium/blob/master/LICENSE">ISC</a></li>
 </ul>

 </body>
@@ -0,0 +1,15 @@
+package com.github.shadowsocks;
+
+import android.app.Activity;
+
+/**
+ * This helper class is used to solve Java-Scala interop problem. Use onAttach(Context) and remove this class
+ * when minSdkVersion >= 23.
+ *
+ * @author Mygod
+ */
+public class DialogFragment extends android.app.DialogFragment {
+    protected void superOnAttach(Activity activity) {
+        super.onAttach(activity);
+    }
+}
@@ -385,6 +385,7 @@ include $(CLEAR_VARS)

 SHADOWSOCKS_SOURCES := local.c cache.c udprelay.c encrypt.c \
 	utils.c netutils.c json.c jconf.c acl.c http.c tls.c rule.c \
+	obfs_http.c obfs_tls.c base64.c \
 	android.c

 LOCAL_MODULE    := ss-local
@@ -417,7 +418,7 @@ include $(BUILD_EXECUTABLE)

 include $(CLEAR_VARS)

-SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c android.c
+SHADOWSOCKS_SOURCES := tunnel.c cache.c udprelay.c encrypt.c utils.c netutils.c json.c jconf.c android.c obfs_http.c obfs_tls.c base64.c

 LOCAL_MODULE    := ss-tunnel
 LOCAL_SRC_FILES := $(addprefix shadowsocks-libev/src/, $(SHADOWSOCKS_SOURCES))
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android" android:color="?android:colorControlHighlight">
+    <item>
+        <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+                  android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+            <item android:state_selected="true">
+                <color android:color="@color/material_primary_100"/>
+            </item>
+        </selector>
+    </item>
+</ripple>
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <selector android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+                  android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+            <item android:state_selected="true">
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/material_green_700" />
+                    <corners android:radius="4dp"/>
+                </shape>
+            </item>
+            <item>
+                <shape android:shape="rectangle">
+                    <solid android:color="@color/material_primary_300" />
+                    <corners android:radius="4dp"/>
+                </shape>
+            </item>
+        </selector>
+    </item>
+    <item android:left="8dp">
+        <shape android:shape="rectangle">
+            <solid android:color="@android:color/white" />
+            <corners android:bottomRightRadius="4dp" android:topRightRadius="4dp"/>
+        </shape>
+    </item>
+</layer-list>
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android"
+          android:enterFadeDuration="@android:integer/config_mediumAnimTime"
+          android:exitFadeDuration="@android:integer/config_mediumAnimTime">
+    <item android:state_selected="true">
+        <color android:color="@color/material_primary_100"/>
+    </item>
+</selector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19,3h-4.18C14.4,1.84 13.3,1 12,1c-1.3,0 -2.4,0.84 -2.82,2L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,3c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM14,17L7,17v-2h7v2zM17,13L7,13v-2h10v2zM17,9L7,9L7,7h10v2z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10.08,10.86c0.05,-0.33 0.16,-0.62 0.3,-0.87s0.34,-0.46 0.59,-0.62c0.24,-0.15 0.54,-0.22 0.91,-0.23 0.23,0.01 0.44,0.05 0.63,0.13 0.2,0.09 0.38,0.21 0.52,0.36s0.25,0.33 0.34,0.53 0.13,0.42 0.14,0.64h1.79c-0.02,-0.47 -0.11,-0.9 -0.28,-1.29s-0.4,-0.73 -0.7,-1.01 -0.66,-0.5 -1.08,-0.66 -0.88,-0.23 -1.39,-0.23c-0.65,0 -1.22,0.11 -1.7,0.34s-0.88,0.53 -1.2,0.92 -0.56,0.84 -0.71,1.36S8,11.29 8,11.87v0.27c0,0.58 0.08,1.12 0.23,1.64s0.39,0.97 0.71,1.35 0.72,0.69 1.2,0.91 1.05,0.34 1.7,0.34c0.47,0 0.91,-0.08 1.32,-0.23s0.77,-0.36 1.08,-0.63 0.56,-0.58 0.74,-0.94 0.29,-0.74 0.3,-1.15h-1.79c-0.01,0.21 -0.06,0.4 -0.15,0.58s-0.21,0.33 -0.36,0.46 -0.32,0.23 -0.52,0.3c-0.19,0.07 -0.39,0.09 -0.6,0.1 -0.36,-0.01 -0.66,-0.08 -0.89,-0.23 -0.25,-0.16 -0.45,-0.37 -0.59,-0.62s-0.25,-0.55 -0.3,-0.88 -0.08,-0.67 -0.08,-1v-0.27c0,-0.35 0.03,-0.68 0.08,-1.01zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2V7H6v12zM19,4h-3.5l-1,-1h-5l-1,1H5v2h14V4z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,18L8,18v-2h8v2zM16,14L8,14v-2h8v2zM13,9L13,3.5L18.5,9L13,9z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+            android:fillColor="#FFFFFFFF"
+            android:pathData="M9,16.2L4.8,12l-1.4,1.4L9,19 21,7l-1.4,-1.4L9,16.2z"/>
+</vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M11,18h2v-2h-2v2zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM12,6c-2.21,0 -4,1.79 -4,4h2c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,2 -3,1.75 -3,5h2c0,-2.25 3,-2.5 3,-5 0,-2.21 -1.79,-4 -4,-4z"/>
+</vector>
@@ -1,4 +1,3 @@
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -6,5 +5,5 @@
        android:viewportHeight="24.0">
    <path
        android:fillColor="#FFFFFFFF"
-        android:pathData="M18,7l-1.41,-1.41 -6.34,6.34 1.41,1.41L18,7zM22.24,5.59L11.66,16.17 7.48,12l-1.41,1.41L11.66,19l12,-12 -1.42,-1.41zM0.41,13.41L6,19l1.41,-1.41L1.83,12 0.41,13.41z"/>
+        android:pathData="M14,2L6,2c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2L18,22c1.1,0 2,-0.9 2,-2L20,8l-6,-6zM16,16h-3v3h-2v-3L8,16v-2h3v-3h2v3h3v2zM13,9L13,3.5L18.5,9L13,9z"/>
 </vector>
@@ -4,6 +4,6 @@
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FF000000"
        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
 </vector>
@@ -1,10 +0,0 @@
-<!--suppress NewApi -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M7,10l5,5 5,-5z"/>
-</vector>
@@ -1,4 +1,3 @@
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -6,5 +5,5 @@
        android:viewportHeight="24.0">
    <path
        android:fillColor="#FFFFFFFF"
-        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+        android:pathData="M14,10L2,10v2h12v-2zM14,6L2,6v2h12L14,6zM18,14v-4h-2v4h-4v2h4v4h2v-4h4v-2h-4zM2,16h8v-2L2,14v2z"/>
 </vector>
@@ -1,4 +1,3 @@
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,4 +1,3 @@
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,10 +0,0 @@
-<!--suppress NewApi -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M20,2L4,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM20,20L4,20L4,4h16v16zM18,6h-5c-1.1,0 -2,0.9 -2,2v2.28c-0.6,0.35 -1,0.98 -1,1.72 0,1.1 0.9,2 2,2s2,-0.9 2,-2c0,-0.74 -0.4,-1.38 -1,-1.72L13,8h3v8L8,16L8,8h2L10,6L6,6v12h12L18,6z"/>
-</vector>
@@ -1,13 +0,0 @@
-<!--suppress NewApi -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
-</vector>
@@ -1,10 +1,9 @@
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
        android:viewportWidth="24.0"
        android:viewportHeight="24.0">
    <path
-        android:fillColor="#FFFFFFFF"
+        android:fillColor="#FF000000"
        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
+</vector>
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#f5f5f5"
+        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M24,21.8 C25.7673,21.8,27.2,23.2327,27.2,25 C27.2,26.7673,25.7673,28.2,24,28.2
+C22.2327,28.2,20.8,26.7673,20.8,25 C20.8,23.2327,22.2327,21.8,24,21.8 Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M21,15 L19.17,17 L16,17 A2,2,0,0,0,14,19 L14,31 A2,2,0,0,0,16,33 L32,33
+A2,2,0,0,0,34,31 L34,19 A2,2,0,0,0,32,17 L28.83,17 L27,15 Z M24,30
+A5,5,0,1,1,29,25 A5,5,0,0,1,24,30 Z" />
+</vector>
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#f5f5f5"
+        android:pathData="M24,24m-22,0a22,22 0,1 1,44 0a22,22 0,1 1,-44 0Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M34,14.72 L30.52,30.04 L22.72,27.53 L29.61,19.31 L20.43,27.04 L14,24.62
+L34,14.72 Z" />
+    <path
+        android:fillColor="#546e7a"
+        android:pathData="M22.89,29.1 L25.38,29.9 L22.9,33.28 L22.89,29.1 Z" />
+</vector>
@@ -1,4 +1,3 @@
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
        android:width="24dp"
        android:height="24dp"
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
@@ -1,5 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--suppress NewApi -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
    android:width="24dp"
    android:height="24dp"
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <Spinner android:id="@+id/template_selector"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content"
+             android:entries="@array/acl_rule_templates"/>
+    <EditText android:id="@+id/content"
+              android:layout_width="match_parent"
+              android:layout_height="wrap_content"
+              android:lines="1"/>
+</LinearLayout>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <include layout="@layout/toolbar_light_dark"/>
+    <WebView android:id="@+id/web_view"
+             android:layout_width="match_parent"
+             android:layout_height="0dp"
+             android:layout_weight="1"/>
+</LinearLayout>
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="fill_parent"
    android:layout_height="fill_parent"
@@ -19,24 +20,22 @@
            android:textSize="18sp"
            android:textColor="?android:attr/textColorSecondary"
            android:paddingStart="60dp"
-            android:paddingEnd="8dp"
+            android:paddingEnd="16dp"
            android:paddingTop="12dp"
            android:paddingBottom="12dp"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="RtlHardcoded"/>
+            android:layout_height="wrap_content"/>
    <Switch android:checked="true"
            android:id="@+id/bypassSwitch"
            android:text="@string/bypass_apps"
            android:textSize="18sp"
            android:textColor="?android:attr/textColorSecondary"
            android:paddingStart="60dp"
-            android:paddingEnd="8dp"
+            android:paddingEnd="16dp"
            android:paddingTop="12dp"
            android:paddingBottom="12dp"
            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            tools:ignore="RtlHardcoded"/>
+            android:layout_height="wrap_content"/>
  </LinearLayout>
  <FrameLayout android:layout_width="fill_parent"
               android:layout_height="0dp"
@@ -48,7 +47,19 @@
    <android.support.v7.widget.RecyclerView
            android:layout_width="fill_parent"
            android:layout_height="fill_parent"
-            android:id="@+id/applistview"
+            android:id="@+id/list"
            android:visibility="gone"/>
+    <com.futuremind.recyclerviewfastscroll.FastScroller
+            android:id="@+id/fastscroller"
+            android:orientation="vertical"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="end"
+            android:layout_marginTop="8dp"
+            android:layout_marginBottom="8dp"
+            android:visibility="gone"
+            app:fastscroll__handleColor="@color/material_primary_500"
+            app:fastscroll__bubbleColor="@color/material_primary_500"
+            app:fastscroll__bubbleTextAppearance="@style/StyledScrollerTextAppearance"/>
  </FrameLayout>
 </LinearLayout>
@@ -28,6 +28,6 @@
        android:focusable="false"
        android:focusableInTouchMode="false"
        android:clickable="false"
-        android:layout_marginEnd="8dp"/>
+        android:layout_marginEnd="16dp"/>

 </LinearLayout>
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:app="http://schemas.android.com/apk/res-auto"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <include layout="@layout/toolbar_light_dark"/>
+    <FrameLayout android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1">
+        <android.support.v7.widget.RecyclerView android:id="@+id/list"
+                                                android:layout_width="match_parent"
+                                                android:layout_height="match_parent"
+                                                android:paddingBottom="32dp"
+                                                android:clipToPadding="false"/>
+        <com.futuremind.recyclerviewfastscroll.FastScroller
+                android:id="@+id/fastscroller"
+                android:orientation="vertical"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:layout_gravity="end"
+                android:layout_marginTop="8dp"
+                android:layout_marginBottom="32dp"
+                app:fastscroll__handleColor="@color/material_primary_500"
+                app:fastscroll__bubbleColor="@color/material_primary_500"
+                app:fastscroll__bubbleTextAppearance="@style/StyledScrollerTextAppearance"/>
+    </FrameLayout>
+</LinearLayout>
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <include layout="@layout/toolbar_light_dark" />
+    <FrameLayout android:id="@+id/content"
+                 android:layout_width="match_parent"
+                 android:layout_height="0dp"
+                 android:layout_weight="1"/>
+</LinearLayout>
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+    <ImageView android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        android:adjustViewBounds="true"
+        android:scaleType="centerCrop"
+        android:src="@drawable/background_header"/>
+
+    <TextView xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/drawer_title"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:text="shadowsocks"
+        android:gravity="center"
+        android:textSize="32sp"
+        android:textColor="@android:color/white"/>
+</RelativeLayout>
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical">
+    <include layout="@layout/toolbar_light_dark"/>
+    <android.support.v7.widget.RecyclerView android:id="@+id/list"
+                                            android:layout_width="match_parent"
+                                            android:layout_height="0dp"
+                                            android:layout_weight="1"
+                                            android:paddingBottom="32dp"
+                                            android:scrollbars="vertical"
+                                            android:clipChildren="false"
+                                            android:clipToPadding="false"/>
+</LinearLayout>
@@ -3,87 +3,89 @@
                xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools"
                android:layout_width="match_parent" android:layout_height="match_parent"
                tools:ignore="UnknownIdInLayout" android:clipChildren="false">
-    <LinearLayout android:id="@+id/title_bar" android:layout_width="match_parent" android:layout_height="wrap_content"
-                  android:orientation="vertical" android:layout_below="@+id/toolbar"
-                  android:animateLayoutChanges="true">
-        <include layout="@layout/toolbar_light_dark" />
-        <LinearLayout android:id="@+id/stat" android:elevation="4dp" android:visibility="gone"
-                      android:layout_width="match_parent" android:layout_height="wrap_content"
-                      android:minHeight="?android:attr/listPreferredItemHeight" android:gravity="center_vertical"
-                      android:paddingStart="16dip" android:paddingEnd="16dip" android:focusable="true"
-                      android:paddingTop="16dip" android:paddingBottom="16dip"
-                      android:background="@drawable/background_stat" android:orientation="vertical"
-                      android:nextFocusRight="@+id/fab">
-            <LinearLayout android:layout_width="match_parent"
-                          android:layout_height="wrap_content">
-                <TextView android:text="@string/stat"
-                          android:textSize="16sp"
-                          android:textColor="?android:attr/textColorPrimary"
-                          android:ellipsize="marquee"
-                          android:layout_width="wrap_content"
-                          android:layout_height="wrap_content"/>
-                <TextView android:id="@+id/connection_test"
-                          android:gravity="end"
-                          android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary"
-                          android:layout_width="0dp"
-                          android:layout_height="wrap_content"
-                          android:layout_weight="1"/>
-            </LinearLayout>
-            <android.support.v7.widget.GridLayout android:layout_width="match_parent"
-                                                  android:layout_height="wrap_content"
-                                                  android:paddingEnd="72dip"
-                                                  app:columnCount="4">
-                <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
-                          android:ellipsize="marquee" android:text="@string/sent"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content"
-                          android:layout_marginEnd="24dp"
-                          android:gravity="end"/>
-                <TextView app:layout_column="1" android:id="@+id/tx" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content"
-                          app:layout_columnWeight="1" app:layout_gravity="fill_horizontal"/>
-                <TextView app:layout_column="2" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary"
-                          android:ellipsize="marquee" android:text="▲"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content"/>
-                <TextView app:layout_column="3" android:id="@+id/txRate" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
-                          app:layout_gravity="fill_horizontal" android:gravity="end"/>
-                <TextView app:layout_row="1" app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content"
-                          android:layout_marginEnd="24dp"
-                          android:gravity="end"
-                          android:ellipsize="marquee" android:text="@string/received"/>
-                <TextView app:layout_row="1" app:layout_column="1" android:id="@+id/rx" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
-                          app:layout_gravity="fill_horizontal" />
-                <TextView app:layout_row="1" app:layout_column="2" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="▼"/>
-                <TextView app:layout_row="1" app:layout_column="3" android:id="@+id/rxRate" android:textSize="14sp"
-                          android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
-                          android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
-                          app:layout_gravity="fill_horizontal" android:gravity="end"/>
-            </android.support.v7.widget.GridLayout>
-        </LinearLayout>
+    <FrameLayout android:id="@+id/fragment_holder"
+                 android:layout_width="match_parent"
+                 android:layout_height="match_parent"
+                 android:layout_above="@+id/stat"/>
+    <LinearLayout android:id="@+id/stat"
+                  android:layout_width="match_parent"
+                  android:layout_height="wrap_content"
+                  android:elevation="4dp"
+                  android:paddingStart="16dip"
+                  android:paddingEnd="16dip"
+                  android:paddingTop="16dip"
+                  android:paddingBottom="16dip"
+                  android:focusable="true"
+                  android:background="@drawable/background_stat"
+                  android:orientation="vertical"
+                  android:nextFocusRight="@+id/fab"
+                  android:layout_above="@+id/snackbar">
+        <TextView android:id="@+id/status"
+                  android:textSize="16sp"
+                  android:textColor="?android:attr/textColorPrimary"
+                  android:ellipsize="marquee"
+                  android:paddingEnd="72dip"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"/>
+        <com.github.shadowsocks.widget.BoundedGridLayout android:layout_width="match_parent"
+                                                         android:layout_height="wrap_content"
+                                                         app:bounded_width="288dp"
+                                                         app:columnCount="4">
+            <TextView app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
+                      android:ellipsize="marquee" android:text="@string/sent"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content"
+                      android:layout_marginEnd="24dp"
+                      android:gravity="end"/>
+            <TextView app:layout_column="1" android:id="@+id/tx" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content"
+                      app:layout_columnWeight="1" app:layout_gravity="fill_horizontal"/>
+            <TextView app:layout_column="2" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary"
+                      android:ellipsize="marquee" android:text="▲"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content"/>
+            <TextView app:layout_column="3" android:id="@+id/txRate" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
+                      app:layout_gravity="fill_horizontal" android:gravity="end"/>
+            <TextView app:layout_row="1" app:layout_column="0" style="@style/TextAppearance.AppCompat.Body2"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content"
+                      android:layout_marginEnd="24dp"
+                      android:gravity="end"
+                      android:ellipsize="marquee" android:text="@string/received"/>
+            <TextView app:layout_row="1" app:layout_column="1" android:id="@+id/rx" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
+                      app:layout_gravity="fill_horizontal" />
+            <TextView app:layout_row="1" app:layout_column="2" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="▼"/>
+            <TextView app:layout_row="1" app:layout_column="3" android:id="@+id/rxRate" android:textSize="14sp"
+                      android:textColor="?android:attr/textColorSecondary" android:ellipsize="marquee"
+                      android:layout_width="0dp" android:layout_height="wrap_content" app:layout_columnWeight="1"
+                      app:layout_gravity="fill_horizontal" android:gravity="end"/>
+        </com.github.shadowsocks.widget.BoundedGridLayout>
    </LinearLayout>
-    <fragment android:name="com.github.shadowsocks.ShadowsocksSettings"
-              android:id="@android:id/content" android:layout_below="@+id/title_bar"
-              android:layout_width="match_parent" android:layout_height="match_parent"/>
-    <com.github.jorgecastilloprz.FABProgressCircle android:id="@+id/fabProgressCircle" app:reusable="true"
+    <com.github.jorgecastilloprz.FABProgressCircle android:id="@+id/fabProgressCircle"
+                                                   app:reusable="true"
                                                   android:layout_width="wrap_content"
-                                                   android:layout_height="wrap_content" android:elevation="6dp"
-                                                   android:layout_alignBottom="@+id/title_bar"
+                                                   android:layout_height="wrap_content"
+                                                   android:elevation="6dp"
+                                                   android:layout_alignTop="@+id/stat"
                                                   android:layout_alignParentEnd="true"
                                                   android:layout_marginEnd="16dp"
-                                                   android:layout_marginBottom="@dimen/fab_margin_bottom">
-        <android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content"
+                                                   android:layout_marginTop="@dimen/fab_margin_top">
+        <android.support.design.widget.FloatingActionButton android:id="@+id/fab"
+                                                            android:layout_width="wrap_content"
                                                            android:layout_height="wrap_content"
-                                                            app:backgroundTint="@color/material_blue_grey_700"
+                                                            app:backgroundTint="@color/material_primary_500"
                                                            app:srcCompat="@drawable/ic_start_idle"
-                                                            app:pressedTranslationZ="6dp" app:borderWidth="0dp" />
+                                                            app:pressedTranslationZ="6dp"
+                                                            app:borderWidth="0dp"/>
    </com.github.jorgecastilloprz.FABProgressCircle>
+    <android.support.design.widget.CoordinatorLayout
+        android:id="@+id/snackbar"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_alignParentBottom="true" />
 </RelativeLayout>
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Based on: https://github.com/android/platform_frameworks_base/blob/505e3ab/core/res/res/layout/simple_list_item_2.xml -->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+             xmlns:app="http://schemas.android.com/apk/res-auto"
+             android:layout_width="match_parent"
+             android:layout_height="wrap_content">
+    <com.github.shadowsocks.widget.BoundedCardView android:layout_width="match_parent"
+                                                   android:layout_height="wrap_content"
+                                                   android:layout_marginTop="8dp"
+                                                   android:layout_marginStart="8dp"
+                                                   android:layout_marginEnd="8dp"
+                                                   android:layout_gravity="center_horizontal"
+                                                   app:bounded_width="@dimen/profile_item_max_width"
+                                                   android:id="@+id/indicator">
+        <LinearLayout android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:padding="8dp"
+            android:focusable="true"
+            android:nextFocusRight="@+id/edit"
+            android:id="@+id/content"
+            android:background="?android:attr/selectableItemBackground">
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:id="@+id/container">
+                <TextView android:id="@+id/title"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_weight="1"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:textColor="?android:attr/textColorPrimary"
+                    android:gravity="center_vertical"
+                    android:maxLines="2"
+                    android:ellipsize="end"/>
+                <android.support.v7.widget.AppCompatImageView android:id="@+id/share"
+                                                              android:layout_width="wrap_content"
+                                                              android:layout_height="wrap_content"
+                                                              android:padding="4dp"
+                                                              android:layout_gravity="top"
+                                                              app:srcCompat="@drawable/ic_social_share"
+                                                              android:background="?attr/selectableItemBackgroundBorderless"
+                                                              android:contentDescription="@string/share"
+                                                              android:focusable="true"
+                                                              android:nextFocusLeft="@+id/container"/>
+                <android.support.v7.widget.AppCompatImageView android:id="@+id/edit"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:padding="4dp"
+                    android:layout_gravity="top"
+                    app:srcCompat="@drawable/ic_image_edit"
+                    android:background="?attr/selectableItemBackgroundBorderless"
+                    android:contentDescription="@string/edit"
+                    android:focusable="true"/>
+            </LinearLayout>
+            <LinearLayout android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="8dp"
+                android:layout_marginTop="4dp"
+                android:id="@+id/details">
+                <TextView android:id="@+id/address"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:maxLines="2"
+                    android:ellipsize="end"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondary"/>
+                <TextView android:id="@+id/traffic"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="bottom"
+                    android:ellipsize="end"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:textColor="?android:attr/textColorSecondary"/>
+            </LinearLayout>
+        </LinearLayout>
+    </com.github.shadowsocks.widget.BoundedCardView>
+</FrameLayout>
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+    <include layout="@layout/toolbar_light_dark" />
+    <fragment android:id="@+id/content"
+              class="com.github.shadowsocks.ProfileConfigFragment"
+              android:layout_width="match_parent"
+              android:layout_height="0dp"
+              android:layout_weight="1"/>
+</LinearLayout>
@@ -1,68 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:orientation="vertical"
-              android:layout_height="match_parent">
-    <include layout="@layout/toolbar_light_dark" />
-    <android.support.design.widget.CoordinatorLayout android:layout_width="match_parent"
-                                                     android:layout_height="0dp" android:layout_weight="1">
-        <android.support.v7.widget.RecyclerView android:id="@+id/profilesList"
-                                                android:layout_width="match_parent"
-                                                android:layout_height="match_parent"/>
-        <com.github.clans.fab.FloatingActionMenu
-            android:id="@+id/menu"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_gravity="bottom|end"
-            android:layout_marginBottom="16dp"
-            android:layout_marginEnd="16dp"
-            app:menu_colorNormal="@color/material_primary_500"
-            app:menu_colorPressed="@color/material_primary_700"
-            app:fab_colorRipple="@android:color/white"
-            app:layout_behavior="com.github.shadowsocks.widget.FloatingActionMenuBehavior">
-
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_manual_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_primary_500"
-                app:fab_colorPressed="@color/material_primary_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="@string/add_profile_methods_manual_settings"
-                />
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_qrcode_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_primary_500"
-                app:fab_colorPressed="@color/material_primary_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="@string/add_profile_methods_scan_qr_code"
-                />
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_nfc_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_primary_500"
-                app:fab_colorPressed="@color/material_primary_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="NFC"
-                />
-            <com.github.clans.fab.FloatingActionButton
-                android:id="@+id/fab_import_add"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                app:fab_colorNormal="@color/material_primary_500"
-                app:fab_colorPressed="@color/material_primary_700"
-                app:fab_colorRipple="@android:color/white"
-                app:fab_size="mini"
-                app:fab_label="@string/action_import"
-                />
-        </com.github.clans.fab.FloatingActionMenu>
-    </android.support.design.widget.CoordinatorLayout>
-
-</LinearLayout>
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Based on: https://github.com/android/platform_frameworks_base/blob/master/core/res/res/layout/select_dialog_singlechoice_material.xml -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-              xmlns:app="http://schemas.android.com/apk/res-auto"
-              android:layout_width="match_parent"
-              android:layout_height="wrap_content"
-              android:id="@+id/container"
-              android:background="?android:attr/selectableItemBackground"
-              android:paddingStart="20dp"
-              android:paddingEnd="?attr/dialogPreferredPadding"
-              android:focusable="true"
-              android:nextFocusRight="@+id/share">
-    <CheckedTextView xmlns:android="http://schemas.android.com/apk/res/android"
-                     android:id="@android:id/text1"
-                     android:layout_width="0dp"
-                     android:layout_height="wrap_content"
-                     android:layout_gravity="center_vertical"
-                     android:layout_weight="1"
-                     android:minHeight="?android:attr/listPreferredItemHeightSmall"
-                     android:textAppearance="?android:attr/textAppearanceMedium"
-                     android:textColor="?android:attr/textColorAlertDialogListItem"
-                     android:gravity="center_vertical"
-                     android:drawableStart="?android:attr/listChoiceIndicatorSingle"
-                     android:drawablePadding="20dp"
-                     android:maxLines="4"
-                     android:scrollHorizontally="false" />
-    <ImageView android:id="@+id/share"
-               android:layout_width="wrap_content"
-               android:layout_height="wrap_content"
-               android:padding="5dp"
-               android:layout_gravity="center_vertical"
-               app:srcCompat="@drawable/ic_social_share"
-               android:background="?attr/selectableItemBackgroundBorderless"
-               android:contentDescription="@string/share"
-               android:focusable="true"
-               android:nextFocusLeft="@+id/container"/>
-</LinearLayout>
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:orientation="vertical"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content">
-
-    <include layout="@layout/toolbar_light_dark"/>
-
-    <android.support.v7.widget.RecyclerView
-            android:id="@+id/profilesList"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-</LinearLayout>
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <FrameLayout
-        android:id="@+id/content_frame"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <include layout="@layout/toolbar_light_dark" />
-</FrameLayout>
@@ -15,7 +15,8 @@
                android:textSize="18sp"
                android:padding="16dp"/>
    </FrameLayout>
-    <android.support.v7.widget.RecyclerView android:id="@+id/profilesList"
+    <android.support.v7.widget.RecyclerView android:id="@+id/list"
                                            android:layout_width="match_parent"
-                                            android:layout_height="match_parent" />
+                                            android:layout_height="match_parent"
+                                            android:scrollbars="vertical"/>
 </LinearLayout>
@@ -2,10 +2,9 @@
      xmlns:app="http://schemas.android.com/apk/res-auto">
    <item android:id="@+id/action_apply_all"
          android:title="@string/action_apply_all"
-          android:icon="@drawable/ic_done_all"
          android:alphabeticShortcut="a"
          android:numericShortcut="1"
-          app:showAsAction="always"/>
+          app:showAsAction="never"/>
    <item android:id="@+id/action_export"
          android:title="@string/action_export"
          android:icon="@drawable/ic_content_copy"
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/selection"
+          android:title="@string/action_selection"
+          android:icon="@drawable/abc_ic_menu_selectall_mtrl_alpha"
+          android:alphabeticShortcut="s"
+          android:numericShortcut="0"
+          android:visible="false"
+          app:showAsAction="always">
+        <menu>
+            <item android:id="@+id/action_select_all"
+                  android:title="@android:string/selectAll"
+                  android:alphabeticShortcut="a"
+                  android:numericShortcut="1"
+                  app:showAsAction="always"/>
+            <item android:id="@+id/action_cut"
+                  android:title="@android:string/cut"
+                  android:alphabeticShortcut="t"
+                  android:numericShortcut="2"
+                  app:showAsAction="always"/>
+            <item android:id="@+id/action_copy"
+                  android:title="@android:string/copy"
+                  android:alphabeticShortcut="c"
+                  android:numericShortcut="3"
+                  app:showAsAction="always"/>
+            <item android:id="@+id/action_delete"
+                  android:title="@string/delete"
+                  android:alphabeticShortcut="d"
+                  android:numericShortcut="4"
+                  app:showAsAction="always"/>
+        </menu>
+    </item>
+    <item android:title="@string/action_add_rule"
+          android:icon="@drawable/ic_av_playlist_add"
+          android:alphabeticShortcut="a"
+          android:numericShortcut="1"
+          app:showAsAction="always">
+        <menu>
+            <item android:id="@+id/action_manual_settings"
+                  android:title="@string/add_profile_methods_manual_settings"
+                  android:alphabeticShortcut="m"
+                  android:numericShortcut="1"/>
+            <item android:id="@+id/action_import"
+                  android:title="@string/action_import"
+                  android:alphabeticShortcut="i"
+                  android:numericShortcut="2"/>
+            <item android:id="@+id/action_import_gfwlist"
+                  android:title="@string/route_entry_gfwlist"
+                  android:alphabeticShortcut="g"
+                  android:numericShortcut="3"/>
+        </menu>
+    </item>
+</menu>
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:id="@+id/action_delete"
+          android:title="@string/delete"
+          android:icon="@drawable/ic_action_delete"
+          android:alphabeticShortcut="d"
+          android:numericShortcut="2"
+          app:showAsAction="always"/>
+    <item android:id="@+id/action_apply"
+          android:title="@string/apply"
+          android:icon="@drawable/ic_action_done"
+          android:alphabeticShortcut="a"
+          android:numericShortcut="3"
+          app:showAsAction="always"/>
+</menu>
@@ -1,6 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
      xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item android:title="@string/add_profile"
+          android:icon="@drawable/ic_action_note_add"
+          android:alphabeticShortcut="a"
+          android:numericShortcut="0"
+          app:showAsAction="always">
+        <menu>
+            <item android:id="@+id/action_scan_qr_code"
+                  android:title="@string/add_profile_methods_scan_qr_code"
+                  android:alphabeticShortcut="s"
+                  android:numericShortcut="1"/>
+            <item android:id="@+id/action_import"
+                  android:title="@string/action_import"
+                  android:alphabeticShortcut="i"
+                  android:numericShortcut="2"/>
+            <item android:id="@+id/action_manual_settings"
+                  android:title="@string/add_profile_methods_manual_settings"
+                  android:alphabeticShortcut="m"
+                  android:numericShortcut="3"/>
+        </menu>
+    </item>
    <item android:id="@+id/action_export"
          android:title="@string/action_export"
          android:alphabeticShortcut="e"
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:id="@+id/action_qr_code_nfc"
+          android:title="@string/share_qr_nfc"
+          android:alphabeticShortcut="q"
+          android:numericShortcut="1"/>
+    <item android:id="@+id/action_export"
+          android:title="@string/action_export"
+          android:alphabeticShortcut="e"
+          android:numericShortcut="2"/>
+</menu>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="proxied_apps_summary">選択したアプリにプロキシを設定する</string>
+</resources>
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="app_name">シャドーソックス</string>
+  <string name="quick_toggle">スイッチ</string>
+
+  <string name="misc_cat">その他</string>
+  <string name="proxy_cat">サーバー設定</string>
+  <string name="profile_name">サーバー名</string>
+  <string name="profile">プロファイル</string>
+  <string name="profile_summary">新規作成または既存ファイルを開く</string>
+  <string name="proxy">サーバーアドレス</string>
+  <string name="remote_port">リモートポート</string>
+  <string name="port">ローカルポート</string>
+  <string name="sitekey">パスワード</string>
+  <string name="enc_method">暗号化方式</string>
+  <string name="feature_cat">ファンクション設定</string>
+  <string name="http_proxy">HTTP プロキシサーバー</string>
+  <string name="http_proxy_summary">ローカル HTTP プロキシ</string>
+  <string name="dns_proxy">DNS プロキシ</string>
+  <string name="dns_proxy_summary">DNS解析をリモートサーバーにリダイレクト</string>
+  <string name="auto_set_gfwlist">CHN Route</string>
+  <string name="auto_set_gfwlist_summary">中国本土のサイトをすべて迂回する</string>
+  <string name="route_list">プロキシ方式</string>
+  <string name="proxied_apps">アプリ別のプロキシを使用</string>
+  <string name="proxied_apps_summary">アプリ別でプロキシを指定、Android 4.x では必ずNATモードを使用して下さい</string>
+  <string name="on">ON</string>
+  <string name="bypass_apps">バイパスモード（迂回モード）</string>
+  <string name="bypass_apps_summary">このモードを選択した場合、指定したアプリのパケットはプロキシを経由しない</string>
+  <string name="auto_connect">自動接続</string>
+  <string name="auto_connect_summary">システム起動時にバックグラウンドで本サービスを開始</string>
+  <string name="tcp_fastopen_summary">使用するにはROOT権限が必要</string>
+  <string name="tcp_fastopen_summary_unsupported">ご利用のカーネルバージョンはサポートしておりません：%s &lt; 3.7.1</string>
+  <string name="forward_success">バックグラウンドでサービスを開始しました</string>
+  <string name="service_failed">リモートサーバーに接続できません</string>
+  <string name="invalid_server">サーバーが無効です</string>
+  <string name="method_unsafe">注意：現在の暗号化方式は安全ではありません</string>
+  <string name="nat_deprecated">注意：Android 5.0及びそれ以降のバージョンではNATモードの使用はお勧めしません</string>
+  <string name="nat_no_root">NATモードはROOT権限が必要です</string>
+  <string name="switch_to_vpn">VPNモードに切り替える</string>
+  <string name="stop">中止</string>
+  <string name="stopping">停止中……</string>
+  <string name="vpn_error">バックグランドサービスの起動に失敗しました：%s</string>
+  <string name="reboot_required">VPNサービスの起動に失敗しました、デバイスの再起動を試みて下さい</string>
+  <string name="close">閉じる</string>
+  <string name="proxy_empty">サーバアドレスやパスワードの入力が必要です</string>
+  <string name="connect">接続</string>
+  <string name="initializing">初期化中……</string>
+  <string name="recovering">リセット中……</string>
+  <string name="loading">読み込み中……</string>
+  <string name="profiles">プロファイル</string>
+  <string name="settings">オプション設定</string>
+  <string name="remove_profile">このプロファイルを削除「%s」?</string>
+  <string name="recovery">リセット</string>
+  <string name="about">本アプリについて</string>
+  <string name="about_title">シャドーソックス（shadowsocks）%s</string>
+  <string name="flush_dnscache">DNS キャッシュをリフレッシュ</string>
+  <string name="flush_dnscache_summary">NATモードの場合のみ使用、ROOT権限が必要です</string>
+  <string name="flush_dnscache_no_root">ROOT権限がない場合はDNSキャッシュをリフレッシュできません</string>
+  <string name="flushing">リフレッシュ中……</string>
+  <string name="share">共有</string>
+  <string name="add_profile">プロファイルを追加</string>
+
+  <string name="nat">NAT モード (デバックのみ)</string>
+  <string name="nat_summary">VPNモードからNATモードに切り替えるにはROOT権限が必要です</string>
+  <string name="remote_dns">リモートDNS</string>
+
+  <string name="udp_dns">UDP転送</string>
+  <string name="udp_dns_summary">UDPプロトコルでリモードサーバーにパケットを転送</string>
+
+  <string name="onetime_auth">ワンタイム認証</string>
+  <string name="onetime_auth_summary">ワンタイム認証を使用する</string>
+
+  <string name="ipv6">IPv6プロキシ</string>
+  <string name="ipv6_summary">リモートサーバーにIPv6パケットを転送</string>
+
+  <string name="stat_summary">送信済み: \t%3$s\t↑\t%1$s/s\n受信済み: \t%4$s\t↓\t%2$s/s</string>
+
+  <string name="connection_test_pending">接続状況確認</string>
+  <string name="connection_test_testing">テスト中...</string>
+  <string name="connection_test_available">成功: %dmsの遅延</string>
+  <string name="connection_test_fail">インターネット利用不可</string>
+  <string name="connection_test_error">失敗しました：%s</string>
+  <string name="connection_test_error_status_code">ステータスコード無効（#%d）</string>
+
+  <!-- profile -->
+  <string name="add_profile_dialog">シャドーソックスにプロファイルを追加しますか</string>
+  <string name="add_profile_methods_scan_qr_code">QRコードを読み取る</string>
+  <string name="add_profile_methods_manual_settings">手動でセットアップ</string>
+
+  <string name="route_entry_gfwlist">中国本土からアクセス不可なアドレス以外を迂回する</string>
+  <string-array name="route_entry">
+    <item>すべて</item>
+    <item>LANアドレスを迂回する</item>
+    <item>中国本土のアドレスを迂回する</item>
+    <item>LAN及び中国本土のアドレスを迂回する</item>
+    <item>@string/route_entry_gfwlist</item>
+    <item>中国本土のアドレス以外を迂回する</item>
+    <item>@string/custom_rules</item>
+  </string-array>
+
+  <string name="action_apply_all">設定をすべてのプロファイルに適応する</string>
+  <string name="action_export">クリップボードに出力</string>
+  <string name="action_import">クリップボードからインポート</string>
+  <string name="action_export_msg">クリップボードの出力に成功しました</string>
+  <string name="action_export_err">クリップボードの出力に失敗しました</string>
+  <string name="action_import_msg">インポートは成功しました</string>
+  <string name="action_import_err">インポートは失敗しました</string>
+
+  <plurals name="removed">
+    <item quantity="one">削除済み</item>
+    <item quantity="other">%d を削除しました</item>
+  </plurals>
+  <string name="undo">戻る</string>
+  <string name="toggle_service_state">サービスを開始</string>
+  <string name="start_service_default">現在のサーバーに接続する</string>
+  <string name="start_service">%s に接続</string>
+  <string name="stop_service">%s に切り替え</string>
+  <string name="profile_default">現在のプロファイルを使用する</string>
+
+  <!-- status -->
+  <string name="sent">送信済み:</string>
+  <string name="received">受信済み:</string>
+
+  <!-- kcp -->
+  <string name="kcp_summary">KCP プロトコル を有効にする</string>
+  <string name="kcp_port">KCP ポート</string>
+  <string name="kcp_port_summary">%d（リモート KCPTUN サーバーのポート番号）</string>
+  <string name="kcpcli">KCP パラメータ</string>
+
+</resources>
@@ -9,7 +9,6 @@
  <string name="profile_summary">Переключить на другой профиль или добавить новые</string>
  <string name="nat">Режим NAT (не рекомендуется)</string>
  <string name="nat_summary">Использовать режим NAT вместо VPN. Требует ROOT прав.</string>
-  <string name="stat">Сетевая Активность</string>
  <string name="stat_summary">Отправлено: \t\t\t\t\t%3$s\t↑\t%1$s/s\nПолучено: \t%4$s\t↓\t%2$s/s</string>
  <string name="stat_profiles">\n%1$s↑\t%2$s↓</string>
  <string name="traffic_summary">%1$s/s↑\t%2$s/s↓</string>
@@ -42,13 +41,15 @@
  <string name="auto_set_gfwlist">CHN Маршрут</string>
  <string name="auto_set_gfwlist_summary">Игнорировать все сайты находящиеся в Китае</string>
  <string name="route_list">Маршрут</string>
+  <string name="route_entry_gfwlist">Список GFW</string>
  <string-array name="route_entry">
    <item>Все</item>
    <item>Обход LAN</item>
    <item>Обходной Китай</item>
    <item>Обход LAN и Китай</item>
-    <item>Список GFW</item>
+    <item>@string/route_entry_gfwlist</item>
    <item>Список Китай</item>
+    <item>@string/custom_rules</item>
  </string-array>
  <string name="proxied_apps">Прокси для выбранных приложений</string>
  <string name="proxied_apps_summary">Установить прокси для выбранных приложений, требует режим NAT под Android 4.x</string>
@@ -74,7 +75,6 @@
  <string name="stopping">Останавливается…</string>
  <string name="vpn_error">%s</string>
  <string name="reboot_required">Сбой запуска VPN сервиса. Требуется перезагрузка Вашего устройства.</string>
-  <string name="quick_switch">Переключить</string>

  <!-- alert category -->
  <string name="close">Закрыть</string>
@@ -89,14 +89,9 @@
  <string name="profiles">Профили</string>
  <string name="settings">Настройки</string>
  <string name="recovery">Сброс</string>
-  <string name="recovery_summary">Сброс всех фоновых задач</string>
  <string name="about">О приложении</string>
  <string name="about_title">Shadowsocks %s</string>
  <string name="share">Поделиться</string>
-  <string name="share_message">Сканировать QR код или использовать Android Beam (NFC)</string>
-  <string name="share_message_without_nfc">Сканировать QR код</string>
-  <string name="share_message_nfc_disabled">Сканировать QR код\nAndroid Beam отключен</string>
-  <string name="turn_on_nfc">Включить NFC &amp; Android Beam</string>
  <string name="flush_dnscache">Очистить кэш DNS</string>
  <string name="flush_dnscache_summary">Работает только в режиме NAT. Требует наличия ROOT прав.</string>
  <string name="flush_dnscache_no_root">Очистка кэша DNS не работает без налиичя ROOT прав</string>
@@ -112,17 +107,9 @@
  <string name="action_import_err">Сбой импорта.</string>

  <!-- profile -->
-  <string name="profile_manager_dialog">Profiles</string>
-  <string name="profile_manager_dialog_content">&#8226; Нажмите для выбора профиля;\n&#8226; Сдвиньте влево/вправо или нажмите влево
-    чтобы удалить;\n&#8226; Подержите чтобы изменить порядок профилей.</string>
-  <string name="gotcha">Gotcha!</string>
  <string name="add_profile_dialog">Добавить этот Профиль Shadowsocks?</string>
  <string name="add_profile_methods_scan_qr_code">Сканировать QR код</string>
  <string name="add_profile_methods_manual_settings">Настройка вручную</string>
-  <string name="add_profile_nfc_hint_title">Использовать Android Beam (NFC) для добавления профиля</string>
-  <string name="add_profile_nfc_hint">Оставьте экран включённым на обоих устройствах, на втором устойстве нажмите кнопку профиля "поделиться", поднисите устройства друг к другу (тыльными сторонами).\nТак же Вы можете сканировать nfc метку.</string>
-  <string name="add_profile_scanner_permission_required">Разрешение камеры требуется для сканирования QR код.</string>
-  <string name="copy_url">Копировать URL</string>
  <plurals name="removed">
    <item quantity="one">Удалён</item>
    <item quantity="other">%d элементы удалены</item>
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="fab_margin_bottom">-28dp</dimen>
+    <dimen name="fab_margin_top">-28dp</dimen>
 </resources>
@@ -38,11 +38,13 @@
  <string name="nat_no_root">NAT 模式需要 ROOT 权限</string>
  <string name="switch_to_vpn">切换到 VPN 模式</string>
  <string name="stop">停止</string>
-  <string name="quick_switch">切换</string>
  <string name="stopping">正在关闭……</string>
  <string name="vpn_error">后台服务启动失败：%s</string>
  <string name="reboot_required">VPN 服务启动失败。你可能需要重启设备。</string>
+  <string name="yes">是</string>
+  <string name="no">否</string>
  <string name="close">关闭</string>
+  <string name="profile_empty">请选择配置文件</string>
  <string name="proxy_empty">代理服务器地址及密码不能为空</string>
  <string name="connect">连接</string>
  <string name="initializing">正在初始化……</string>
@@ -51,23 +53,21 @@
  <string name="profiles">配置文件</string>
  <string name="settings">设置选项</string>
  <string name="remove_profile">删除此配置文件「%s」?</string>
+  <string name="faq">常见问题</string>
  <string name="recovery">重置</string>
-  <string name="recovery_summary">重置所有后台服务</string>
  <string name="about">关于</string>
  <string name="about_title">影梭（shadowsocks）%s</string>
  <string name="flush_dnscache">刷新 DNS 缓存</string>
  <string name="flush_dnscache_summary">只需在 NAT 模式下使用，需要 ROOT 权限</string>
  <string name="flush_dnscache_no_root">在没有 ROOT 权限的情况下无法刷新 DNS 缓存</string>
  <string name="flushing">刷新中……</string>
+  <string name="edit">编辑</string>
  <string name="share">分享</string>
-  <string name="share_message">扫描二维码或使用 Android Beam (NFC)</string>
-  <string name="share_message_without_nfc">扫描二维码</string>
-  <string name="share_message_nfc_disabled">扫描二维码\nAndroid Beam 被禁用</string>
-  <string name="turn_on_nfc">打开 NFC &amp; Android Beam</string>
  <string name="add_profile">添加配置文件</string>

  <string name="nat">NAT 模式 (仅限调试)</string>
  <string name="nat_summary">从 VPN 模式切换为 NAT 模式，需要 ROOT 权限</string>
+  <string name="remote_dns">远程 DNS</string>

  <string name="udp_dns">UDP 转发</string>
  <string name="udp_dns_summary">由远程服务器转发 UDP 协议的数据包</string>
@@ -78,7 +78,6 @@
  <string name="ipv6">IPv6 路由</string>
  <string name="ipv6_summary">向远程服务器转发 IPv6 流量</string>

-  <string name="stat">网络流量</string>
  <string name="stat_summary">发送: \t%3$s\t↑\t%1$s/s\n接收: \t%4$s\t↓\t%2$s/s</string>

  <string name="connection_test_pending">检查网络连接</string>
@@ -89,25 +88,26 @@
  <string name="connection_test_error_status_code">状态码无效（#%d）</string>

  <!-- profile -->
-  <string name="profile_manager_dialog">配置文件</string>
-  <string name="profile_manager_dialog_content">&#8226; 点击选择配置文件；\n&#8226; 向左/右滑动或按左删除；\n&#8226;
-    长按拖动改变顺序。</string>
-  <string name="gotcha">好的</string>
-  <string name="copy_url">复制 URL</string>
+  <string name="profile_config">配置文件设置</string>
+  <string name="unsaved_changes_prompt">保存修改吗？</string>
+  <string name="apply">应用</string>
+  <string name="delete">删除</string>
+  <string name="delete_confirm_prompt">你是否确定要删除这个配置文件？</string>
+  <string name="share_qr_nfc">二维码 / NFC</string>
  <string name="add_profile_dialog">为影梭添加此配置文件？</string>
  <string name="add_profile_methods_scan_qr_code">扫描二维码</string>
  <string name="add_profile_methods_manual_settings">手动设置</string>
-  <string name="add_profile_nfc_hint_title">使用 Android Beam (NFC) 来添加配置</string>
-  <string name="add_profile_nfc_hint">保持两台设备的屏幕亮起，在另外一台设备上，点击配置文件的分享按钮，将它们靠在一起（背靠背）。\n你也可以扫描 NFC 标签。</string>
-  <string name="add_profile_scanner_permission_required">扫描二维码需要相机权限。</string>
+  <string name="add_profile_scanner_not_installed">请安装任意兼容 ZXing 的二维码扫描应用。</string>

+  <string name="route_entry_gfwlist">仅代理中国大陆无法访问的地址</string>
  <string-array name="route_entry">
    <item>全局</item>
    <item>绕过局域网地址</item>
    <item>绕过中国大陆地址</item>
    <item>绕过局域网及中国大陆地址</item>
-    <item>仅代理中国大陆无法访问的地址</item>
+    <item>@string/route_entry_gfwlist</item>
    <item>仅代理中国大陆地址</item>
+    <item>@string/custom_rules</item>
  </string-array>

  <string name="action_apply_all">应用设置到所有配置文件</string>
@@ -132,6 +132,10 @@
  <!-- status -->
  <string name="sent">发送:</string>
  <string name="received">接收:</string>
+  <string name="connecting">连接中…</string>
+  <string name="vpn_connected">已连接, 轻触以检查连接状态</string>
+  <string name="nat_connected">已连接</string>
+  <string name="not_connected">未连接</string>

  <!-- kcp -->
  <string name="kcp_summary">启用 KCP 协议</string>
@@ -139,4 +143,14 @@
  <string name="kcp_port_summary">%d（远端 KCPTUN 服务器的端口号）</string>
  <string name="kcpcli">KCP 参数</string>

+  <!-- acl -->
+  <string name="custom_rules">自定义规则</string>
+  <string name="action_selection">选择…</string>
+  <string name="action_add_rule">添加规则…</string>
+  <string-array name="acl_rule_templates">
+    <item>子网/域名 PCRE 正则表达式</item>
+    <item>域名及其子域名</item>
+  </string-array>
+  <string name="edit_rule">编辑规则</string>
+
 </resources>
@@ -39,11 +39,13 @@
  <string name="nat_no_root">NAT 模式需要 ROOT 權限</string>
  <string name="switch_to_vpn">切換至 VPN 模式</string>
  <string name="stop">停止</string>
-  <string name="quick_switch">切換</string>
  <string name="stopping">關閉中……</string>
  <string name="vpn_error">%s</string>
  <string name="reboot_required">VPN 服務啟動失敗。您或許需要重新啟動您的裝置。</string>
+  <string name="yes">是</string>
+  <string name="no">否</string>
  <string name="close">關閉</string>
+  <string name="profile_empty">請選擇設定檔</string>
  <string name="proxy_empty">Proxy 或密碼不可以空白</string>
  <string name="connect">連線</string>
  <string name="initializing">起始中……</string>
@@ -52,23 +54,21 @@
  <string name="profiles">設定檔</string>
  <string name="settings">設定</string>
  <string name="remove_profile">移除此設定檔 "%s"?</string>
+  <string name="faq">常問問題</string>
  <string name="recovery">重設</string>
-  <string name="recovery_summary">重設一切背景服務</string>
  <string name="about">關於</string>
  <string name="about_title">Shadowsocks %s</string>
  <string name="flush_dnscache">清除 DNS 快取</string>
  <string name="flush_dnscache_summary">僅在 NAT 模式可用，需要 ROOT 權限</string>
  <string name="flush_dnscache_no_root">在無 ROOT 權限時清除 DNS 快取無法進行</string>
  <string name="flushing">清除中……</string>
+  <string name="edit">編輯</string>
  <string name="share">分享</string>
-  <string name="share_message">掃描 QR 碼或者使用 Android Beam (NFC)</string>
-  <string name="share_message_without_nfc">掃描 QR 碼</string>
-  <string name="share_message_nfc_disabled">掃描 QR 碼\nAndroid Beam 被停用</string>
-  <string name="turn_on_nfc">啟用 NFC &amp; Android Beam</string>
  <string name="add_profile">新增設定檔</string>

  <string name="nat">NAT 模式 (已過時)</string>
  <string name="nat_summary">使用 NAT 模式代替 VPN 模式，需要 ROOT 權限</string>
+  <string name="remote_dns">遠程 DNS</string>

  <string name="udp_dns">UDP 轉送</string>
  <string name="udp_dns_summary">向遠端轉送 UDP 封包</string>
@@ -79,7 +79,6 @@
  <string name="ipv6">IPv6 路由</string>
  <string name="ipv6_summary">向遠端重新導向 IPv6 流量</string>

-  <string name="stat">網路流量</string>
  <string name="stat_summary">傳送: \t%3$s\t↑\t%1$s/s\n接收: \t%4$s\t↓\t%2$s/s</string>

  <string name="connection_test_pending">檢查連線能力</string>
@@ -90,26 +89,26 @@
  <string name="connection_test_error_status_code">錯誤碼: #%d</string>

  <!-- profile -->
-  <string name="profile_manager_dialog">設定檔</string>
-  <string name="profile_manager_dialog_content">&#8226; 輕觸選擇一個設定檔；\n&#8226; 向左/右撥動或按左移除；\n&#8226;
-    按住後上下撥動設定檔重新排序。</string>
-  <string name="gotcha">我懂了！</string>
-  <string name="copy_url">複製 URL</string>
+  <string name="profile_config">設定檔配置</string>
+  <string name="unsaved_changes_prompt">要保存更改嗎？</string>
+  <string name="apply">應用</string>
+  <string name="delete">刪除</string>
+  <string name="delete_confirm_prompt">您確定要移除這個設定檔嗎？</string>
+  <string name="share_qr_nfc">QR 碼 / NFC</string>
  <string name="add_profile_dialog">為 Shadowsocks 新增此設定檔？</string>
  <string name="add_profile_methods_scan_qr_code">掃描 QR 碼</string>
  <string name="add_profile_methods_manual_settings">手動設定</string>
-  <string name="add_profile_nfc_hint_title">使用 Android Beam (NFC) 來新增設定檔</string>
-  <string name="add_profile_nfc_hint">
-    保持兩台設備的屏幕亮起，在另外一台設備上，點擊設定檔的分享按鈕，將它們靠在一起（背靠背）。\n你也可以掃描 NFC 標籤。</string>
-  <string name="add_profile_scanner_permission_required">掃描 QR 碼需要相機權限。</string>
+  <string name="add_profile_scanner_not_installed">請安裝任何兼容 ZXing 的 QR 碼掃描應用程式。</string>

+  <string name="route_entry_gfwlist">GFW List</string>
  <string-array name="route_entry">
    <item>全域</item>
    <item>略過區域網路位址</item>
    <item>略過中國大陸位址</item>
    <item>略過區域網路及中國大陸位址</item>
-    <item>僅代理大陸屏蔽位址</item>
+    <item>@string/route_entry_gfwlist</item>
    <item>僅代理大陸位址</item>
+    <item>@string/custom_rules</item>
  </string-array>

  <string name="action_apply_all">應用設置到所有配置文件</string>
@@ -134,6 +133,10 @@
  <!-- status -->
  <string name="sent">傳送:</string>
  <string name="received">接收:</string>
+  <string name="connecting">連線中…</string>
+  <string name="vpn_connected">已連線, 輕觸以檢查連線能力</string>
+  <string name="nat_connected">已連線</string>
+  <string name="not_connected">未連線</string>

  <!-- kcp -->
  <string name="kcp_summary">啟用 KCP 協定</string>
@@ -141,4 +144,14 @@
  <string name="kcp_port_summary">%d（遠端 KCPTUN 伺服器的連接埠號碼）</string>
  <string name="kcpcli">KCP 參數</string>

+  <!-- acl -->
+  <string name="custom_rules">自定義規則</string>
+  <string name="action_selection">選擇…</string>
+  <string name="action_add_rule">添加規則…</string>
+  <string-array name="acl_rule_templates">
+    <item>子網/主機名 PCRE 正則表達式</item>
+    <item>域名及其所有子域名</item>
+  </string-array>
+  <string name="edit_rule">編輯規則</string>
+
 </resources>
@@ -45,23 +45,7 @@
        <item>bypass-lan-china</item>
        <item>gfwlist</item>
        <item>china-list</item>
-    </string-array>
-
-    <string-array name="private_route">
-        <item>0.0.0.0/8</item>
-        <item>10.0.0.0/8</item>
-        <item>100.64.0.0/10</item>
-        <item>127.0.0.0/8</item>
-        <item>169.254.0.0/16</item>
-        <item>172.16.0.0/12</item>
-        <item>192.0.0.0/29</item>
-        <item>192.0.2.0/24</item>
-        <item>192.88.99.0/24</item>
-        <item>192.168.0.0/16</item>
-        <item>198.18.0.0/15</item>
-        <item>198.51.100.0/24</item>
-        <item>203.0.113.0/24</item>
-        <item>224.0.0.0/3</item>
+        <item>custom-rules</item>
    </string-array>

    <string-array name="bypass_private_route">
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <declare-styleable name="BoundedView">
+        <attr name="bounded_width" format="dimension" />
+        <attr name="bounded_height" format="dimension" />
+    </declare-styleable>
    <declare-styleable name="NumberPickerPreference">
        <attr name="max" format="integer" />
        <attr name="min" format="integer" />
@@ -3,12 +3,15 @@
 <resources>

  <color name="material_green_700">#388E3C</color>
+  <color name="material_green_a700">#00C853</color>
+  <color name="material_blue_grey_100">#CFD8DC</color>
  <color name="material_blue_grey_300">#90A4AE</color>
  <color name="material_blue_grey_500">#607D8B</color>
  <color name="material_blue_grey_700">#455A64</color>
+  <color name="material_primary_100">@color/material_blue_grey_100</color>
  <color name="material_primary_300">@color/material_blue_grey_300</color>
  <color name="material_primary_500">@color/material_blue_grey_500</color>
  <color name="material_primary_700">@color/material_blue_grey_700</color>
-  <color name="material_accent_200">@color/material_blue_grey_500</color>
+  <color name="material_accent_200">@color/material_green_a700</color>

 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Max Lv	f4026e5a86	Bump version	2017-01-07 11:03:06 +08:00
Max Lv	fb98b3e4a1	Fix fast scroller in per-app config	2017-01-07 09:49:22 +08:00
Max Lv	f629c432b0	Update licenses, close #1059	2017-01-07 08:56:19 +08:00
Mygod	4c15d27a99	Update dependencies	2017-01-07 04:05:02 +08:00
Mygod	341c85049b	Add fast scroller to custom rules and per-app proxy config	2017-01-07 03:54:01 +08:00
Mygod	35d7611524	Add state check before sending initial trafficUpdated event	2017-01-07 02:52:25 +08:00
Mygod	d10acf52ec	Fix remoteDns not used in NAT with UDP disabled	2017-01-06 17:13:31 +08:00
Max Lv	0234acbf5f	Merge pull request #1056 from Mygod/custom-rules Implement custom rules	2017-01-06 02:59:32 -06:00
Mygod	292c76b227	Fix remove snackbar	2017-01-06 16:46:54 +08:00
Mygod	a67c29314e	Fix deprecation warning in UndoSnackbarManager	2017-01-06 16:43:37 +08:00
Mygod	0fc9c6fb8a	Remove unused copy_url	2017-01-06 16:38:40 +08:00
Mygod	82a3e429d1	Prevent syncing custom-rules	2017-01-06 16:30:41 +08:00
Mygod	b4425e3b06	Fix NullReferenceException	2017-01-06 16:29:37 +08:00
Mygod	ac2b668a4b	Implement custom rules Fix #1009 finally!	2017-01-06 16:20:26 +08:00
Mygod	8374a8cdcc	Fix building	2017-01-06 13:00:50 +08:00
Mygod	7feb049f4b	Update gfwlist	2017-01-06 12:29:42 +08:00
Mygod	5bc7c9f8cc	Fix bandwidth display in ProfilesFragment when hot swapping profiles	2017-01-05 22:08:37 +08:00
Mygod	115fbcb2fe	Add a fading when switching profiles	2017-01-05 21:25:59 +08:00
Mygod	69d2bc1ee5	Set card background using StateListDrawable	2017-01-05 21:21:51 +08:00
Mygod	af9e8c786d	Bugfix for layout gravity	2017-01-05 20:51:51 +08:00
Max Lv	5ca3baac95	Update licenses #1043	2016-12-31 16:10:02 +08:00
Mygod	878c53ee30	Refine profile bandwidth gravity	2016-12-31 00:14:01 +08:00
Mygod	eb7e608d0b	Use custom tabs in AboutFragment	2016-12-30 22:22:06 +08:00
Mygod	ef6a9e7727	Remove obsolete tools:ignore	2016-12-30 22:10:47 +08:00
Mygod	2edc14a695	Refine database package	2016-12-30 22:10:47 +08:00
Max Lv	bc94adef38	Use centerCrop	2016-12-30 20:43:15 +08:00
Max Lv	dd8031519c	Revert "Replace image with gradient color" This reverts commit `b0412b4f1f`.	2016-12-30 20:42:04 +08:00
Max Lv	b0412b4f1f	Replace image with gradient color	2016-12-30 18:33:36 +08:00
Mygod	7e94e25d49	Refine #1034	2016-12-29 17:51:44 +08:00
Mygod	068906cd0f	Remove obsolete items in FAQ	2016-12-29 16:21:53 +08:00
Mygod	e24c2256af	Hide circle onResume	2016-12-29 16:20:37 +08:00
Mygod	d78e823ce2	Allow user to use any QR code scanner and remove unused resources	2016-12-29 16:16:56 +08:00
Mygod	8e46be5900	Allow user to use any QR code scanner	2016-12-29 16:01:32 +08:00
Mygod	2e73741825	Fix excess unsaved prompt AppManager's sub-activity should maintain dirty flags by themselves. Fix #1032.	2016-12-29 15:34:54 +08:00
Mygod	022b6da9c9	Refine issue template	2016-12-29 01:29:36 -06:00
Mygod	622cef048c	Add an FAQ section in drawer	2016-12-29 01:29:36 -06:00
Max Lv	8dd6027790	Bump version	2016-12-29 13:29:39 +08:00
Max Lv	f05524810e	Remove internal QR Scanner. #1021 Report to @Mygod if you have any question. :)	2016-12-29 13:12:31 +08:00
Max Lv	1ffd132651	Use internal scanner as fallback	2016-12-29 12:43:10 +08:00
Max Lv	4ddebb7ca6	Merge pull request #1027 from shadowsocks/drawer New UI with drawer (#762)	2016-12-28 20:02:05 -06:00
Mygod	8cb0d0d771	Remove duplicate string entry shutting_down	2016-12-29 01:32:18 +08:00
Mygod	77ddc3ac77	Merge branch 'master' into drawer	2016-12-29 01:22:04 +08:00
Mygod	346f0c7269	Remove unused resources	2016-12-29 01:20:12 +08:00
Mygod	2377e48a9e	Change colorAccent	2016-12-29 00:54:16 +08:00
Mygod	b83eac0056	Localize more strings	2016-12-29 00:49:48 +08:00
Mygod	9a4b66b22f	Add shadow to minidrawer	2016-12-29 00:34:42 +08:00
Mygod	2d8257d3de	Localize new strings in drawer	2016-12-29 00:21:03 +08:00
Mygod	3da6994704	Use FrameLayout instead of LinearLayout	2016-12-29 00:04:11 +08:00
Max Lv	4f4123185c	Update localizations	2016-12-28 17:13:22 +08:00
Mygod	3ce7f7e9eb	Add minidrawer for large screens	2016-12-28 05:08:34 +08:00
Mygod	da8a65993a	Fix another naming conflict in @+id/content	2016-12-28 05:05:19 +08:00
Mygod	b069b3e003	Don't setToolbar in minidrawer mode	2016-12-28 05:01:03 +08:00
Mygod	dfe469e1e6	Prevent bandwidth and border flashing in ProfilesFragment	2016-12-28 04:51:43 +08:00
Mygod	f96f58f30a	Refine proguard rules	2016-12-28 04:27:27 +08:00
Mygod	0732dd5981	Broken minidrawer draft	2016-12-28 04:13:31 +08:00
Mygod	c3102d4b54	Add savedInstanceState to drawer	2016-12-28 04:12:37 +08:00
Mygod	f828268e3b	Disable editing for ProfilesFragment depending on service state	2016-12-28 03:06:11 +08:00
Mygod	b636d6b85a	Fix a naming conflict	2016-12-28 02:17:27 +08:00
Mygod	13c01f3ae4	Update total traffic after service stopped	2016-12-28 02:15:54 +08:00
Mygod	f1a9fd5ba5	Refine ProfilesFragment	2016-12-28 02:14:53 +08:00
Mygod	bc7c29c3e3	Refine drawer item ids	2016-12-28 01:50:18 +08:00
Mygod	c1c15f5361	Refine connection test feature	2016-12-28 01:48:24 +08:00
Mygod	e33adc4f66	Seriously clean up Shadowsocks MainActivity This activity contains lots of obsolete code and it's time to do a cleanup.	2016-12-28 01:45:23 +08:00
Mygod	418ae2151c	Refrain from unregistering stateChanged callbacks too aggressively This commit adds `startListeningForBandwidth` and `stopListeningForBandwidth` to save battery as well as keeping the listener for state changing alive.	2016-12-28 00:49:18 +08:00
Mygod	fdd8a1127c	Sort dependencies in build.sbt	2016-12-27 23:55:24 +08:00
Mygod	e2d080b830	Refine "Fix issues on Android 4.4"	2016-12-27 23:54:14 +08:00
Mygod	654b627747	Use VectorDrawable for ic_navigation_close on API 21+	2016-12-27 23:39:02 +08:00
Mygod	a4f326157d	Refine "Replace HttpRequest with OkHttp3"	2016-12-27 23:36:30 +08:00
Max Lv	e782a4c777	Update ACL	2016-12-27 16:01:47 +08:00
Max Lv	f7924a2767	Update GFWList	2016-12-27 15:58:46 +08:00
Max Lv	5596b8ac49	Update GFWList	2016-12-27 15:58:20 +08:00
Mygod	ad25b149e0	Update ACL URL	2016-12-27 15:56:30 +08:00
Max Lv	a865ee8308	Replace HttpRequest with OkHttp3	2016-12-27 12:49:26 +08:00
Max Lv	5419b4b567	Fix issues on Android 4.4	2016-12-26 17:50:15 +08:00
Max Lv	2852309183	Move snackbar to the bottom	2016-12-26 12:52:13 +08:00
Max Lv	62e2d636ba	Avoid overlapping snackbar	2016-12-26 12:16:08 +08:00
Max Lv	ed0dba8fb3	Revert "Prevent snackbar overlapping with bottom bar" This reverts commit `806f4e13bd`.	2016-12-26 12:16:01 +08:00
Mygod	a18eb32b59	Promote global settings to main drawer	2016-12-26 00:40:39 +08:00
Mygod	915a0efff4	Decrease profile name text size	2016-12-25 15:01:03 +08:00
Max Lv	ab326dc238	Update header background	2016-12-25 11:32:33 +08:00
Max Lv	5c8f6189ee	Update licenses	2016-12-25 11:31:38 +08:00
Mygod	72e137bab3	Update ACL URL	2016-12-24 12:53:52 -06:00
Mygod	806f4e13bd	Prevent snackbar overlapping with bottom bar	2016-12-25 02:14:33 +08:00
Mygod	2ca8d50eb0	Refine layout for wide screens	2016-12-25 00:37:44 +08:00
Mygod	3a66bbba88	Move share functionality to ProfilesFragment	2016-12-24 23:42:09 +08:00
Mygod	5898d29177	Fix a bug in serializing profile	2016-12-24 23:25:23 +08:00
Mygod	c429978aee	Refine drawer selection color	2016-12-24 23:22:37 +08:00
Mygod	64f32a644b	Refine connection test layout	2016-12-24 23:07:29 +08:00
Mygod	7de4a01db2	Refine back navigation for main activity	2016-12-24 22:49:34 +08:00
Mygod	cceb4ad9d7	Move about to fragment	2016-12-24 22:47:40 +08:00
Mygod	48a1abeeba	Add missing drawable	2016-12-24 22:47:24 +08:00
Mygod	0bc50bbe10	Merge branch 'drawer' of github.com:shadowsocks/shadowsocks-android into drawer	2016-12-24 22:33:48 +08:00
Mygod	719d8eaa94	Move reset functionality to drawer	2016-12-24 22:33:22 +08:00
Max Lv	97f8ad0987	Refine AdSize	2016-12-24 16:43:18 +08:00
Mygod	34fe03c9e5	Add icon tinting to drawer drawables	2016-12-24 16:03:29 +08:00
Mygod	a78c8aa526	Refine add profile icon	2016-12-24 13:56:58 +08:00
Mygod	2e902a1109	Refine drawer icons	2016-12-24 13:54:21 +08:00
Mygod	f01cbe15b7	Prompt to save changes when exiting profile config	2016-12-24 13:46:49 +08:00
Mygod	f9e504b092	Refine profile name display	2016-12-24 13:38:13 +08:00
Max Lv	eae97bc192	Update the drawer header and icons	2016-12-24 13:21:32 +08:00
Max Lv	91e5223a53	Refine AdView	2016-12-24 10:44:24 +08:00
Mygod	93d468c581	Refine no selected profile case again	2016-12-24 02:37:58 +08:00
Mygod	2be75d0b9a	Refine adview	2016-12-24 02:25:53 +08:00
Mygod	3ffca24908	Handle error msg for no profile	2016-12-24 02:25:45 +08:00
Mygod	c38e37c06b	Start configuring right after manual config was selected	2016-12-24 02:21:26 +08:00
Mygod	8eed34dc9b	Create default profile when creating new profiles	2016-12-24 02:18:08 +08:00
Mygod	0fe62e256b	Prevent crash when removing current profile	2016-12-24 02:11:40 +08:00
Mygod	68992ea535	Refine profiles layout	2016-12-24 02:02:42 +08:00
Mygod	f095a38894	Move adView construction to code	2016-12-24 01:52:52 +08:00
Mygod	e4df378967	Fix back press crash	2016-12-24 01:43:43 +08:00
Mygod	25b6a307de	Layout bugfixes	2016-12-24 01:40:55 +08:00
Mygod	5217b1d1fa	Remove redundant Typefaces	2016-12-24 01:27:54 +08:00
Mygod	015fefe3db	Fix corner radius for background	2016-12-24 01:26:49 +08:00
Mygod	5e9be12d50	Reorder build.sbt	2016-12-24 01:15:35 +08:00
Max Lv	e5db0f630f	Add a header layout	2016-12-23 21:21:13 +08:00
Max Lv	aa1e052b91	Add native adview	2016-12-21 15:21:32 +08:00
Max Lv	7564ba5184	Fix a bug of profile serializing	2016-12-20 18:15:09 +08:00
Max Lv	406661e346	Refine the layout	2016-12-20 13:54:17 +08:00
Max Lv	c87930b261	Refine the profile item layout	2016-12-20 13:34:49 +08:00
Max Lv	436119e0ab	Disable profile switching when connected	2016-12-18 15:31:10 +08:00
Max Lv	e8ff469eac	Add indicator for profile items	2016-12-18 15:11:57 +08:00
Mygod	e7d2dec952	Don't navigate up if scanning was cancelled	2016-12-18 00:03:26 +08:00
Mygod	cd25dcdc13	Add a confirm dialog before discarding changes	2016-12-17 23:58:23 +08:00
Mygod	859ef5307b	Move callback method to ToolbarFragment	2016-12-17 23:38:00 +08:00
Max Lv	d0c4384cc7	Avoid attach/detach service in the fragment	2016-12-17 16:28:09 +08:00
sunsysjp	d1e914ce85	Update Japanese translation Alter the wording 20:15 16/12/2016	2016-12-17 01:04:09 -06:00
Max Lv	0c930b3650	Refine regex	2016-12-17 07:27:16 +08:00
Mygod	02513418c8	Remove the no longer needed quick switch	2016-12-16 23:23:49 +08:00
Mygod	59c5d01c8d	Fix ImageView app:srcCompat	2016-12-16 23:17:54 +08:00
Mygod	ae4e57abc0	Fix profile selection	2016-12-16 23:14:34 +08:00
Mygod	dbb137c5d8	Initial redesign draft for #762	2016-12-16 23:02:33 +08:00
Max Lv	325e28f562	Refine #1014 again	2016-12-16 20:25:27 +08:00
Max Lv	c6b88cf73d	Refine #1014	2016-12-16 20:09:33 +08:00
Max Lv	4aea4a1db5	Fix #1014	2016-12-16 15:21:16 +08:00
Max Lv	ef707e4383	Refine ACL	2016-12-15 20:54:22 +08:00
Max Lv	7eddf8be78	Revert "Use symlink for gfwlist.acl"	2016-12-15 05:27:05 -06:00
Mygod	ba894b1b40	Use symlink for gfwlist.acl	2016-12-15 05:22:02 -06:00
Mygod	9b211d7151	Update Android Support library	2016-12-15 19:21:08 +08:00
sunsysjp	1383a151af	Update strings.xml correct some translation mistakes 7:27 AM 13.12.2016	2016-12-13 19:02:16 -06:00
Max Lv	828b72dfdb	Fix #1007	2016-12-14 08:54:49 +08:00
Mygod	139ea388b0	Update build tools	2016-12-13 20:10:30 +08:00
Syrone Wong	4400a6b81c	acl: add telegram IPs	2016-12-13 03:50:34 -06:00
sunsysjp	12a2781f8a	Update strings.xml 当前版本的日语翻译已完成，请xida也检查一下吧	2016-12-12 16:41:32 -06:00
yyxida	abd8099c0f	Revise translation (#999 ) * add/Revise translation add “Remote DNS” translation Revise translation by @sunsysjp * Update strings.xml * Update strings.xml * Update strings.xml * Update strings.xml * Update strings.xml	2016-12-11 17:14:57 -06:00
Mygod	a5df60ae03	Refine code style	2016-12-09 16:42:20 +08:00
Mygod	c9b404faad	Update dependencies	2016-12-08 18:47:13 +08:00
Max Lv	b00aa3a564	Bump version	2016-12-07 13:28:51 +08:00
Max Lv	933b7f4964	Refine #997	2016-12-06 16:12:36 +08:00
Max Lv	b8d70fe12f	Fix #997	2016-12-06 14:43:57 +08:00
Mygod	7dbae18d10	Update dependencies	2016-11-30 17:32:55 +08:00
Mygod	357130cda0	Refine #989	2016-11-30 16:54:20 +08:00
Max Lv	d197ec2fc5	Add remote DNS setting #991	2016-11-30 15:26:49 +08:00
Max Lv	a7c729883e	Fix #989	2016-11-30 15:26:19 +08:00
Max Lv	df9f0ad52a	Update LICENSE	2016-11-30 10:36:47 +08:00
Max Lv	a33fcc6930	Bump version	2016-11-24 16:56:56 +08:00
Max Lv	d82539b198	Drop the table if the database upgrading failed. #987	2016-11-23 12:22:43 +08:00
Max Lv	7922159e5e	Bump version	2016-11-23 09:13:54 +08:00
yyxida	fabab2854f	completed Japanese translation (The vast majority) (#986 ) completed Japanese translation (The vast majority) 日本語の翻訳は完成した（大多数）	2016-11-20 00:06:34 -06:00
Eva Kane	6a9464e08d	Fix Japanese translation again (#983 )	2016-11-19 20:11:05 +08:00
Mygod	f70e905bce	Fix Japanese translation	2016-11-19 17:31:12 +08:00
Max Lv	90b5780d91	Fix #982	2016-11-19 09:22:08 +08:00
Max Lv	d189044808	Bump version	2016-11-19 09:22:08 +08:00
yyxida	5a03f52545	Update strings.xml (#981 ) Change some words	2016-11-18 07:08:49 -06:00
yyxida	2d4d6737ff	Add Japanese translation (#978 )	2016-11-18 01:20:47 -06:00
Max Lv	80fdc07bdd	Fix #968	2016-11-12 10:24:47 +08:00
Mygod	5ca3a8e9fd	Suppress NewApi in lint.xml	2016-11-11 17:58:05 +08:00
Mygod	f3a458161a	Remove useless components in ads	2016-11-11 11:30:16 +08:00
Mygod	e067c6fae2	Update dependency	2016-11-11 11:15:41 +08:00
Mygod	f48ad61220	Refine #964	2016-11-04 14:02:44 +08:00
Max Lv	27f9992447	Fix #964	2016-11-04 13:59:06 +08:00
Mygod	546a5d010d	Refine design for preference package	2016-11-03 21:20:04 +08:00
Mygod	cbb839ec11	Fix up navigation	2016-11-03 20:50:53 +08:00
Mygod	179e5456f8	Refine shortcuts on Android 7.1	2016-11-03 19:18:25 +08:00
Mygod	30700facd3	Remove unused private_route	2016-11-01 13:10:35 +08:00
Max Lv	82103d286d	Fix #961	2016-10-31 09:26:13 +08:00
Mygod	a9ca3c049d	Revert "Revert "Refine Travis rules"" This reverts commit `d0b4819dc5`.	2016-10-25 20:16:23 +08:00
Mygod	0433704d87	Revert "Force to update Android SDK" This reverts commit `c1dd21e0c3`.	2016-10-25 20:16:12 +08:00
Max Lv	2f23462c84	Fix the build	2016-10-25 13:11:38 +08:00
Max Lv	c1dd21e0c3	Force to update Android SDK	2016-10-25 12:50:42 +08:00
Max Lv	d0b4819dc5	Revert "Refine Travis rules" This reverts commit `0fdbd19bff`.	2016-10-25 12:19:00 +08:00
Mygod	d99757f1a3	Fix a deprecation in build.sbt	2016-10-24 16:44:26 +08:00
Mygod	8ed71d1707	Add quick switch to shortcuts	2016-10-24 16:04:34 +08:00
Mygod	ffdb6f84e3	Refine shortcuts.xml	2016-10-24 15:49:27 +08:00
Mygod	094b307254	Add taskAffinity to invisible activities	2016-10-24 15:40:57 +08:00
Mygod	bd5fff100d	Update proguard	2016-10-24 15:27:04 +08:00
Mygod	479e697e6d	Experimental support for demo users TODO: Untested code. Need to find out how to activate demo users. Fix #950 nevertheless.	2016-10-23 15:39:06 +08:00
Mygod	e98dadf0a2	Fix a minor UI issue	2016-10-23 14:35:33 +08:00
Mygod	4cfab40ec2	Fix wrong activity launched when long pressing QS tile	2016-10-23 14:32:57 +08:00
Mygod	0fdbd19bff	Refine Travis rules	2016-10-23 14:30:16 +08:00
Mygod	913ec3c06b	Fix #949	2016-10-23 14:29:26 +08:00
Mygod	617c6dac1b	Fix crashing on Android 6.0+	2016-10-23 14:22:02 +08:00
Mygod	244c2ecdfd	Add quick toggle shortcut (#950 ) Mainly for Android 7.1, also backward compatible.	2016-10-23 14:16:56 +08:00
Mygod	54c696d00a	Merge branch 'master' of github.com:shadowsocks/shadowsocks-android	2016-10-23 13:13:44 +08:00
Mygod	c4d9edc224	Recreate round launcher icon with Android Studio (#950 ) The icon was created using shadow.png.	2016-10-23 13:12:32 +08:00
Max Lv	7a7cbf5803	Update travis-ci	2016-10-23 12:07:04 +08:00
Max Lv	f53936421d	Fix #951	2016-10-23 11:54:39 +08:00
Mygod	5ef2849c4a	Update build target to Android 7.1 Developer Preview	2016-10-23 00:30:20 +08:00
Mygod	e1f58bfd0c	Update dependencies Disabling `android:extractNativeLib` will reduce apk install size and reduce install time.	2016-10-23 00:24:59 +08:00
Max Lv	7098e57893	Bump version	2016-10-18 15:14:29 +08:00
Max Lv	a4c5fc4919	Fix building error	2016-10-18 09:23:44 +08:00
Max Lv	3c69b23a5b	Refine ACLs #941	2016-10-15 18:56:47 +08:00
Mygod	738febbac7	Always show stop button for now Fix #940.	2016-10-15 13:47:29 +08:00
Max Lv	ed91010b18	Update shadowsocks-libev	2016-10-14 19:27:33 +08:00
Mygod	8f4d7db797	Remove manual input handling in NumberPickerPreferenceDialogFragment	2016-10-14 00:27:32 +08:00
Mygod	52ead0a02c	Fix NullPointerException in NumberPickerPreferenceDialogFragment	2016-10-14 00:18:28 +08:00
Mygod	7d099b1faf	Fix IllegalStateException in PreferenceFragment	2016-10-14 00:17:02 +08:00
Mygod	89b9914f15	Fix ETXTBSY in copyAssets	2016-10-14 00:03:30 +08:00
Mygod	809b81a332	Update build tools to 24.0.3 for Travis	2016-10-13 12:23:08 +08:00
Mygod	395c07a0f6	Add last version that doesn't exhibit the issue to issue_template	2016-10-13 12:14:24 +08:00
Mygod	cb61c290a4	Refine issue_template	2016-10-13 12:10:40 +08:00
Mygod	9ccf2bc436	Update sbt-android to 1.7.0	2016-10-13 12:08:53 +08:00
Mygod	674d493c2d	Refine #937	2016-10-13 10:43:37 +08:00
Max Lv	17382a1002	Bump version	2016-10-13 09:40:15 +08:00
Max Lv	7370b6a0b8	Fix #937	2016-10-13 08:45:10 +08:00
Max Lv	158afb1d9f	Bump version	2016-10-12 20:31:46 +08:00
Mygod	085c6dbebf	Fix job rescheduling	2016-10-12 18:12:11 +08:00
Mygod	c401d7eb3a	Extend execution window from 10 seconds to 4 weeks	2016-10-12 15:17:59 +08:00
Mygod	118cea9f7a	Add play-services-gcm This is needed so that Android-Job will use GcmNetworkManager if GCM is installed on user's device. (for KitKat only)	2016-10-12 15:04:01 +08:00
Mygod	5b1ae13faa	Clean up extraneous files	2016-10-12 15:03:28 +08:00
Mygod	b5f655beb5	Boring bugfix don't look	2016-10-12 14:56:50 +08:00
Mygod	9a3ed94fe0	Refine error handling in services	2016-10-12 14:54:17 +08:00
Mygod	0191d1d0fc	Download acl files from GitHub	2016-10-12 14:30:02 +08:00
Mygod	6a56704f52	Refine copyAssets	2016-10-12 11:30:48 +08:00
Mygod	a95308d283	Fix a deprecation	2016-10-12 11:26:44 +08:00
Mygod	6acbae0c7e	Move copyAssets to BaseService Fix #926.	2016-10-12 11:24:21 +08:00
Max Lv	97d31cb927	Fix #930	2016-10-10 15:45:25 +08:00
Mygod	7474269f6b	Fix crash on 4.4	2016-10-10 13:00:54 +08:00
Mygod	40447ce1d2	Refine fetching ACL from cloud	2016-10-10 09:44:48 +08:00
Max Lv	4162057a22	Add missing files	2016-10-09 15:27:35 +08:00
Max Lv	0f24d7c0bc	Add cloud based ACL updating	2016-10-09 10:51:08 +08:00
Mygod	bbf614484d	Refine unexpected cases for Chinese locales	2016-10-09 00:21:38 +08:00
Mygod	396d31a0a7	Fix Chinese locales once and for all (up to Nougat) Seriously fix #927. From now on it will work even in Hong Kong (`/^zh-Han[st]-HK$/`) where for some reason people use Simplified Chinese and Traditional Chinese at the same time.	2016-10-09 00:08:06 +08:00
Mygod	812dc6769a	Refine pref_all.xml	2016-10-07 23:09:22 +08:00
Max Lv	8feb587ebe	Fix #923	2016-10-07 16:54:25 +08:00
Max Lv	89f073cc49	Merge pull request #922 from Mygod/master Refine GitHub templates	2016-10-06 10:00:36 -05:00
Max Lv	07ac8fb839	Bump version	2016-10-06 22:58:01 +08:00
Mygod	57b75ad971	Refine GitHub templates	2016-10-06 21:59:39 +08:00
Mygod	1d6a0b0f2b	Use styling to fix #910	2016-10-05 23:12:25 +08:00
Mygod	abcbc98ce3	Refine MyNumberPicker	2016-10-05 22:58:18 +08:00
Mygod	2722b1aa78	Rename package	2016-10-05 22:47:56 +08:00
Mygod	4bfc5ee070	Update email	2016-10-05 13:39:51 +08:00
Max Lv	c842f7fd41	Bump version	2016-10-03 19:47:53 +08:00
Max Lv	c2f02994f8	Refine DNS server with China List	2016-10-02 19:36:53 +08:00
Max Lv	54247d6b2b	Update DNS	2016-09-30 20:48:20 +08:00
Max Lv	e7fbfd668d	Update config name	2016-09-30 19:43:30 +08:00
Max Lv	b6d0af1ec3	Fix #910	2016-09-30 19:28:03 +08:00
Max Lv	f58301b80b	Bump version	2016-09-30 13:49:16 +08:00
Max Lv	792870b289	Update ACL	2016-09-29 11:53:40 +08:00
Max Lv	3b6eff6d9d	Fix #905	2016-09-28 14:36:36 +08:00
Max Lv	528fea136d	Clean up	2016-09-28 10:40:16 +08:00
Mygod	5d7e88310b	Update dependencies	2016-09-26 19:51:38 +08:00
Max Lv	8c4508843b	Refine DNS resolution	2016-09-26 13:54:34 +08:00
Max Lv	79acf14069	Reduce the timeout of default DNS server	2016-09-26 09:48:42 +08:00
Max Lv	5f43500b9f	Fix auto-start again	2016-09-26 07:51:54 +08:00
Max Lv	8b4a8a92f2	Bump version	2016-09-25 18:29:41 +08:00
Max Lv	7887d18f6f	Clean up	2016-09-25 17:40:53 +08:00
Max Lv	fb960d0664	Fix #900	2016-09-25 17:32:16 +08:00
Max Lv	9ed320d33b	Fix #901	2016-09-25 17:29:27 +08:00
Max Lv	2599e88a81	Add fake demographics	2016-09-24 11:34:08 +08:00
Max Lv	ac0a8c7600	Bump version	2016-09-24 10:59:24 +08:00