Another bump for misbuild

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
Version bump
2026-07-03 14:05:13 +02:00 · 2018-07-06 21:13:36 +02:00 · 2018-07-06 18:17:58 +02:00 · 2018-07-06 18:17:58 +02:00 · 2018-07-06 18:17:58 +02:00 · 2018-07-06 18:17:58 +02:00
113 changed files with 3371 additions and 1002 deletions
@@ -13,3 +13,5 @@ build/
 *.class
 *.dex
 *.iml
+*.jks
+keystore.properties
@@ -1,6 +1,6 @@
 <component name="CopyrightManager">
  <copyright>
-    <option name="notice" value="Copyright © &amp;#36;today.year Firstname Lastname &lt;email@example.org&gt;&#10;SPDX-License-Identifier:" />
+    <option name="notice" value="Copyright © &amp;#36;today.year Firstname Lastname &lt;email@example.org&gt;&#10;SPDX-License-Identifier: Apache-2.0
    <option name="myName" value="Default" />
  </copyright>
 </component>
@@ -1,6 +0,0 @@
-<component name="CopyrightManager">
-  <copyright>
-    <option name="myName" value="GPL-2.0-or-later" />
-    <option name="notice" value="Copyright © &amp;#36;today.year Firstname Lastname &lt;email@example.com&gt;&#10;SPDX-License-Identifier: GPL-2.0-or-later" />
-  </copyright>
-</component>
@@ -150,7 +150,6 @@
    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FieldMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FieldMustBeInitialized" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="FieldNotUsedInToString" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FinalMethodInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FloatingPointEquality" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ForLoopReplaceableByWhile" enabled="true" level="WARNING" enabled_by_default="true">
@@ -1,338 +1,202 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991

- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/

-                            Preamble
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
+   1. Definitions.

-  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
-this service 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.
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.

-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.

-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  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.
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.

-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.

-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.

-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.

-  The precise terms and conditions for copying, distribution and
-modification follow.
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).

-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.

-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."

-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.

-  1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.

-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.

-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:

-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and

-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and

-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and

-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.

-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.

-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.

-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.

-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.

-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.

-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.

-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
+   END OF TERMS AND CONDITIONS

-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
+   APPENDIX: How to apply the Apache License to your work.

-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.

-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
+   Copyright [yyyy] [name of copyright owner]

-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at

-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-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
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
+       http://www.apache.org/licenses/LICENSE-2.0

-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the 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 a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE 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.
-
-                     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
-convey 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 version 2
-    as published by the Free Software Foundation.
-
-    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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision 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, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This 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.
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
@@ -13,19 +13,3 @@ $ git submodule init
 $ git submodule update
 $ ./gradlew assembleRelease
 ```
-
-## License
-
-    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 2
-    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, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
@@ -1,27 +1,45 @@
 apply plugin: 'com.android.application'

+// Create a variable called keystorePropertiesFile, and initialize it to your
+// keystore.properties file, in the rootProject folder.
+final def keystorePropertiesFile = rootProject.file("keystore.properties")
+
 android {
-    buildToolsVersion '27.0.3'
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
+    buildToolsVersion '28.0.0'
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
    compileSdkVersion 27
-    dataBinding {
-        enabled true
-    }
+    dataBinding.enabled true
    defaultConfig {
        applicationId 'com.wireguard.android'
        minSdkVersion 21
        targetSdkVersion 27
-        versionCode 417
-        versionName '0.0.20180526'
+        versionCode 429
+        versionName '0.0.20180706'
+    }
+    // If the keystore file exists
+    if (keystorePropertiesFile.exists()) {
+        // Initialize a new Properties() object called keystoreProperties.
+        final def keystoreProperties = new Properties()
+
+        // Load your keystore.properties file into the keystoreProperties object.
+        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
+        signingConfigs {
+            release {
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+            }
+        }
+    }
+    buildTypes {
+        release {
+            if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
+        }
    }
    externalNativeBuild {
        cmake {
@@ -29,24 +47,25 @@ android {
        }
    }
 }
+
 ext {
-    databindingVersion = '3.1.2'
+    databindingVersion = '3.1.3'
    supportLibsVersion = '27.1.1'
-    daggerVersion = '2.14.1'
-    fabLibVersion = '1.10.1'
    streamsupportVersion = '1.6.0'
 }

 dependencies {
-    annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
    implementation "com.android.databinding:library:$databindingVersion"
    implementation "com.android.support:appcompat-v7:$supportLibsVersion"
    implementation "com.android.support:cardview-v7:$supportLibsVersion"
    implementation "com.android.support:design:$supportLibsVersion"
    implementation "com.android.support:preference-v14:$supportLibsVersion"
    implementation "com.android.support:support-annotations:$supportLibsVersion"
-    implementation "com.getbase:floatingactionbutton:$fabLibVersion"
-    implementation "com.google.dagger:dagger:$daggerVersion"
    implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
    implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
 }
+
+tasks.withType(JavaCompile) {
+    options.compilerArgs << '-Xlint:unchecked'
+    options.deprecation = true
+}
@@ -1,26 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /opt/android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
-dontwarn sun.misc.Unsafe
@@ -8,6 +8,13 @@
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

+    <permission
+        android:name="com.wireguard.android.permission.CONTROL_TUNNELS"
+        android:protectionLevel="dangerous"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/permission_label"
+        android:description="@string/permission_description" />
+
    <application
        android:name=".Application"
        android:allowBackup="false"
@@ -50,9 +57,13 @@
            </intent-filter>
        </receiver>

-        <receiver android:name=".backend.WgQuickBackend$WgQuickChangeReceiver">
+        <receiver
+            android:name=".model.TunnelManager$IntentReceiver"
+            android:permission="com.wireguard.android.permission.CONTROL_TUNNELS">
            <intent-filter>
-                <action android:name="com.wireguard.android.WGQUICK_CHANGE" />
+                <action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
+                <action android:name="com.wireguard.android.action.SET_TUNNEL_UP" />
+                <action android:name="com.wireguard.android.action.SET_TUNNEL_DOWN" />
            </intent-filter>
        </receiver>

@@ -62,9 +73,6 @@
            <intent-filter>
                <action android:name="android.net.VpnService" />
            </intent-filter>
-            <meta-data
-                android:name="android.net.VpnService.SUPPORTS_ALWAYS_ON"
-                android:value="false" />
        </service>

        <service
@@ -1,17 +1,16 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android;

-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
+import android.support.v7.app.AppCompatDelegate;

 import com.wireguard.android.backend.Backend;
 import com.wireguard.android.backend.GoBackend;
@@ -24,118 +23,107 @@ import com.wireguard.android.util.RootShell;
 import com.wireguard.android.util.ToolsInstaller;

 import java.io.File;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executor;

-import javax.inject.Qualifier;
-import javax.inject.Scope;
-
-import dagger.Component;
-import dagger.Module;
-import dagger.Provides;
-
-/**
- * Base context for the WireGuard Android application. This class (instantiated once during the
- * application lifecycle) maintains and mediates access to the global state of the application.
- */
-
 public class Application extends android.app.Application {
-    private static ApplicationComponent component;
+    private static WeakReference<Application> weakSelf;
+    private AsyncWorker asyncWorker;
+    private Backend backend;
+    private RootShell rootShell;
+    private SharedPreferences sharedPreferences;
+    private ToolsInstaller toolsInstaller;
+    private TunnelManager tunnelManager;
+    private Handler handler;
+    private List<BackendCallback> haveBackendCallbacks = new ArrayList<>();
+    private final Object haveBackendCallbacksLock = new Object();

-    public static ApplicationComponent getComponent() {
-        if (component == null)
-            throw new IllegalStateException("Application instance not yet created");
-        return component;
+    public Application() {
+        weakSelf = new WeakReference<>(this);
+    }
+
+    public static Application get() {
+        return weakSelf.get();
+    }
+
+    public static AsyncWorker getAsyncWorker() {
+        return get().asyncWorker;
+    }
+
+    public static Backend getBackend() {
+        final Application app = get();
+        synchronized (app) {
+            if (app.backend == null) {
+                if (new File("/sys/module/wireguard").exists()) {
+                    try {
+                        app.rootShell.start();
+                        app.backend = new WgQuickBackend(app.getApplicationContext());
+                    } catch (final Exception ignored) { }
+                }
+                if (app.backend == null)
+                    app.backend = new GoBackend(app.getApplicationContext());
+                synchronized (app.haveBackendCallbacksLock) {
+                    for (final BackendCallback callback : app.haveBackendCallbacks)
+                        app.handler.post(() -> callback.callback(app.backend));
+                    app.haveBackendCallbacks = null;
+                }
+            }
+            return app.backend;
+        }
+    }
+
+    @FunctionalInterface
+    public interface BackendCallback {
+        void callback(final Backend backend);
+    }
+
+    public static void onHaveBackend(final BackendCallback callback) {
+        final Application app = get();
+        synchronized (app.haveBackendCallbacksLock) {
+            if (app.haveBackendCallbacks == null)
+                callback.callback(app.backend);
+            else
+                app.haveBackendCallbacks.add(callback);
+        }
+    }
+
+    public static RootShell getRootShell() {
+        return get().rootShell;
+    }
+
+    public static SharedPreferences getSharedPreferences() {
+        return get().sharedPreferences;
+    }
+
+    public static ToolsInstaller getToolsInstaller() {
+        return get().toolsInstaller;
+    }
+
+    public static TunnelManager getTunnelManager() {
+        return get().tunnelManager;
    }

    @Override
    public void onCreate() {
        super.onCreate();
-        component = DaggerApplication_ApplicationComponent.builder()
-                .applicationModule(new ApplicationModule(this))
-                .build();
-        component.getTunnelManager().onCreate();
-    }

-    @ApplicationScope
-    @Component(modules = ApplicationModule.class)
-    public interface ApplicationComponent {
-        AsyncWorker getAsyncWorker();
+        handler = new Handler(Looper.getMainLooper());
+        final Executor executor = AsyncTask.SERIAL_EXECUTOR;
+        final ConfigStore configStore = new FileConfigStore(getApplicationContext());

-        Class getBackendType();
+        asyncWorker = new AsyncWorker(executor, handler);
+        rootShell = new RootShell(getApplicationContext());
+        toolsInstaller = new ToolsInstaller(getApplicationContext());

-        ToolsInstaller getToolsInstaller();
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
+        AppCompatDelegate.setDefaultNightMode(
+                sharedPreferences.getBoolean("dark_theme", false) ?
+                        AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);

-        TunnelManager getTunnelManager();
-    }
-
-    @Qualifier
-    public @interface ApplicationContext {
-    }
-
-    @Qualifier
-    public @interface ApplicationHandler {
-    }
-
-    @Scope
-    public @interface ApplicationScope {
-    }
-
-    @Module
-    public static final class ApplicationModule {
-        private final Context context;
-
-        private ApplicationModule(final Application application) {
-            context = application.getApplicationContext();
-        }
-
-        @ApplicationScope
-        @Provides
-        public static Backend getBackend(@ApplicationContext final Context context,
-                                         final RootShell rootShell,
-                                         final ToolsInstaller toolsInstaller) {
-            if (new File("/sys/module/wireguard").exists())
-                return new WgQuickBackend(context, rootShell, toolsInstaller);
-            else
-                return new GoBackend(context);
-        }
-
-        @ApplicationScope
-        @Provides
-        public static Class getBackendType(final Backend backend) {
-            return backend.getClass();
-        }
-
-        @ApplicationScope
-        @Provides
-        public static ConfigStore getConfigStore(@ApplicationContext final Context context) {
-            return new FileConfigStore(context);
-        }
-
-
-        @ApplicationScope
-        @Provides
-        public static Executor getExecutor() {
-            return AsyncTask.SERIAL_EXECUTOR;
-        }
-
-        @ApplicationHandler
-        @ApplicationScope
-        @Provides
-        public static Handler getHandler() {
-            return new Handler(Looper.getMainLooper());
-        }
-
-        @ApplicationScope
-        @Provides
-        public static SharedPreferences getPreferences(@ApplicationContext final Context context) {
-            return PreferenceManager.getDefaultSharedPreferences(context);
-        }
-
-        @ApplicationContext
-        @ApplicationScope
-        @Provides
-        public Context getContext() {
-            return context;
-        }
+        tunnelManager = new TunnelManager(configStore);
+        asyncWorker.runAsync(Application::getBackend);
+        tunnelManager.onCreate();
    }
 }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android;
@@ -11,6 +11,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;

+import com.wireguard.android.backend.WgQuickBackend;
 import com.wireguard.android.model.TunnelManager;
 import com.wireguard.android.util.ExceptionLoggers;

@@ -19,16 +20,20 @@ public class BootShutdownReceiver extends BroadcastReceiver {

    @Override
    public void onReceive(final Context context, final Intent intent) {
-        final String action = intent.getAction();
-        if (action == null)
-            return;
-        final TunnelManager tunnelManager = Application.getComponent().getTunnelManager();
-        if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
-            Log.i(TAG, "Broadcast receiver restoring state (boot)");
-            tunnelManager.restoreState().whenComplete(ExceptionLoggers.D);
-        } else if (Intent.ACTION_SHUTDOWN.equals(action)) {
-            Log.i(TAG, "Broadcast receiver saving state (shutdown)");
-            tunnelManager.saveState();
-        }
+        Application.onHaveBackend(backend -> {
+            if (backend.getClass() != WgQuickBackend.class)
+                return;
+            final String action = intent.getAction();
+            if (action == null)
+                return;
+            final TunnelManager tunnelManager = Application.getTunnelManager();
+            if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
+                Log.i(TAG, "Broadcast receiver restoring state (boot)");
+                tunnelManager.restoreState(false).whenComplete(ExceptionLoggers.D);
+            } else if (Intent.ACTION_SHUTDOWN.equals(action)) {
+                Log.i(TAG, "Broadcast receiver saving state (shutdown)");
+                tunnelManager.saveState();
+            }
+        });
    }
 }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android;
@@ -20,7 +20,6 @@ import android.widget.Toast;
 import com.wireguard.android.activity.MainActivity;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.Tunnel.State;
-import com.wireguard.android.model.TunnelManager;
 import com.wireguard.android.util.ExceptionLoggers;

 import java.util.Objects;
@@ -38,7 +37,6 @@ public class QuickTileService extends TileService {
    private final OnStateChangedCallback onStateChangedCallback = new OnStateChangedCallback();
    private final OnTunnelChangedCallback onTunnelChangedCallback = new OnTunnelChangedCallback();
    private Tunnel tunnel;
-    private TunnelManager tunnelManager;

    @Override
    public void onClick() {
@@ -51,15 +49,9 @@ public class QuickTileService extends TileService {
        }
    }

-    @Override
-    public void onCreate() {
-        super.onCreate();
-        tunnelManager = Application.getComponent().getTunnelManager();
-    }
-
    @Override
    public void onStartListening() {
-        tunnelManager.addOnPropertyChangedCallback(onTunnelChangedCallback);
+        Application.getTunnelManager().addOnPropertyChangedCallback(onTunnelChangedCallback);
        if (tunnel != null)
            tunnel.addOnPropertyChangedCallback(onStateChangedCallback);
        updateTile();
@@ -69,7 +61,7 @@ public class QuickTileService extends TileService {
    public void onStopListening() {
        if (tunnel != null)
            tunnel.removeOnPropertyChangedCallback(onStateChangedCallback);
-        tunnelManager.removeOnPropertyChangedCallback(onTunnelChangedCallback);
+        Application.getTunnelManager().removeOnPropertyChangedCallback(onTunnelChangedCallback);
    }

    private void onToggleFinished(@SuppressWarnings("unused") final State state,
@@ -84,7 +76,7 @@ public class QuickTileService extends TileService {

    private void updateTile() {
        // Update the tunnel.
-        final Tunnel newTunnel = tunnelManager.getLastUsedTunnel();
+        final Tunnel newTunnel = Application.getTunnelManager().getLastUsedTunnel();
        if (newTunnel != tunnel) {
            if (tunnel != null)
                tunnel.removeOnPropertyChangedCallback(onStateChangedCallback);
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.activity;
@@ -10,7 +10,6 @@ import android.content.Intent;
 import android.databinding.CallbackRegistry;
 import android.databinding.CallbackRegistry.NotifierCallback;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;

 import com.wireguard.android.Application;
 import com.wireguard.android.backend.GoBackend;
@@ -23,7 +22,7 @@ import java.util.Objects;
 * Base class for activities that need to remember the currently-selected tunnel.
 */

-public abstract class BaseActivity extends AppCompatActivity {
+public abstract class BaseActivity extends ThemeChangeAwareActivity {
    private static final String KEY_SELECTED_TUNNEL = "selected_tunnel";

    private final SelectionChangeRegistry selectionChangeRegistry = new SelectionChangeRegistry();
@@ -47,19 +46,20 @@ public abstract class BaseActivity extends AppCompatActivity {
        else if (getIntent() != null)
            savedTunnelName = getIntent().getStringExtra(KEY_SELECTED_TUNNEL);
        if (savedTunnelName != null) {
-            final TunnelManager tunnelManager = Application.getComponent().getTunnelManager();
+            final TunnelManager tunnelManager = Application.getTunnelManager();
            selectedTunnel = tunnelManager.getTunnels().get(savedTunnelName);
        }

        // The selected tunnel must be set before the superclass method recreates fragments.
        super.onCreate(savedInstanceState);

-        if (Application.getComponent().getBackendType() == GoBackend.class) {
-            final Intent intent = GoBackend.VpnService.prepare(this);
-            if (intent != null) {
-                startActivityForResult(intent, 0);
+        Application.onHaveBackend(backend -> {
+            if (backend.getClass() == GoBackend.class) {
+                final Intent intent = GoBackend.VpnService.prepare(this);
+                if (intent != null)
+                    startActivityForResult(intent, 0);
            }
-        }
+        });
    }

    @Override
@@ -1,11 +1,12 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.activity;

+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -71,17 +72,17 @@ public class MainActivity extends BaseActivity {
    public void onBackPressed() {
        TunnelListFragment fragment = null;
        try {
-            fragment =
-                    ((TunnelListFragment)
-                            getSupportFragmentManager().getFragments().get(0));
-        } catch (final ClassCastException ignored) {
-        }
-        if (fragment == null || !(fragment.collapseActionMenu())) {
+            fragment = ((TunnelListFragment) getSupportFragmentManager().getFragments().get(0));
+        } catch (final ClassCastException ignored) { }
+        if (fragment == null || !fragment.collapseActionMenu()) {
            if (!moveToState(State.ofLayer(state.layer - 1)))
                super.onBackPressed();
        }
    }

+    // We use onTouchListener here to avoid the UI click sound, hence
+    // calling View#performClick defeats the purpose of it.
+    @SuppressLint("ClickableViewAccessibility")
    @Override
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
@@ -95,6 +96,15 @@ public class MainActivity extends BaseActivity {
            moveToState(initialState);
        }
        updateActionBar();
+        final int actionBarId = getResources().getIdentifier("action_bar", "id", getPackageName());
+        if (actionBarId != 0 && findViewById(actionBarId) != null) {
+            findViewById(actionBarId).setOnTouchListener((v, e) -> {
+                try {
+                    ((TunnelListFragment) getSupportFragmentManager().getFragments().get(0)).collapseActionMenu();
+                } catch (final ClassCastException ignored) { }
+                return false;
+            });
+        }
    }

    @Override
@@ -131,7 +141,6 @@ public class MainActivity extends BaseActivity {
        super.onSaveInstanceState(outState);
    }

-
    @Override
    protected void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
        moveToState(newTunnel != null ? State.DETAIL : State.LIST);
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.activity;
@@ -11,9 +11,9 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.preference.PreferenceScreen;
 import android.view.MenuItem;

 import com.wireguard.android.Application;
@@ -30,7 +30,7 @@ import java.util.Map;
 * Interface for changing application-global persistent settings.
 */

-public class SettingsActivity extends AppCompatActivity {
+public class SettingsActivity extends ThemeChangeAwareActivity {
    private final Map<Integer, PermissionRequestCallback> permissionRequestCallbacks = new HashMap<>();
    private int permissionRequestCounter;

@@ -93,11 +93,21 @@ public class SettingsActivity extends AppCompatActivity {
        @Override
        public void onCreatePreferences(final Bundle savedInstanceState, final String key) {
            addPreferencesFromResource(R.xml.preferences);
-            if (Application.getComponent().getBackendType() != WgQuickBackend.class) {
-                final Preference toolsInstaller =
-                        getPreferenceManager().findPreference("tools_installer");
-                getPreferenceScreen().removePreference(toolsInstaller);
-            }
+            final Preference wgQuickOnlyPrefs[] = {
+                getPreferenceManager().findPreference("tools_installer"),
+                getPreferenceManager().findPreference("restore_on_boot")
+            };
+            for (final Preference pref : wgQuickOnlyPrefs)
+                pref.setVisible(false);
+            final PreferenceScreen screen = getPreferenceScreen();
+            Application.onHaveBackend(backend -> {
+                for (final Preference pref : wgQuickOnlyPrefs) {
+                    if (backend.getClass() == WgQuickBackend.class)
+                        pref.setVisible(true);
+                    else
+                        screen.removePreference(pref);
+                }
+            });
        }
    }
 }
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.activity;
+
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
+import android.util.Log;
+
+import com.wireguard.android.Application;
+
+import java.lang.reflect.Field;
+
+public abstract class ThemeChangeAwareActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+    private static final String TAG = "WireGuard/" + ThemeChangeAwareActivity.class.getSimpleName();
+
+    private static Resources lastResources;
+    private static boolean lastDarkMode;
+    private static synchronized void invalidateDrawableCache(final Resources resources, final boolean darkMode) {
+        if (resources == lastResources && darkMode == lastDarkMode)
+            return;
+
+        try {
+            Field f;
+            Object o = resources;
+            try {
+                f = o.getClass().getDeclaredField("mResourcesImpl");
+                f.setAccessible(true);
+                o = f.get(o);
+            } catch (final Exception ignored) { }
+            f = o.getClass().getDeclaredField("mDrawableCache");
+            f.setAccessible(true);
+            o = f.get(o);
+            try {
+                o.getClass().getMethod("onConfigurationChange", int.class).invoke(o, -1);
+            } catch (final Exception ignored) {
+                o.getClass().getMethod("clear").invoke(o);
+            }
+        } catch (final Exception e) {
+            Log.e(TAG, "Failed to flush drawable cache", e);
+        }
+
+        lastResources = resources;
+        lastDarkMode = darkMode;
+    }
+
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Application.getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        Application.getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key) {
+        if ("dark_theme".equals(key)) {
+            final boolean darkMode = sharedPreferences.getBoolean(key, false);
+            AppCompatDelegate.setDefaultNightMode(
+                    sharedPreferences.getBoolean(key, false) ?
+                            AppCompatDelegate.MODE_NIGHT_YES :
+                            AppCompatDelegate.MODE_NIGHT_NO);
+            invalidateDrawableCache(getResources(), darkMode);
+            recreate();
+        }
+    }
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.activity;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.backend;
@@ -62,4 +62,19 @@ public interface Backend {
     * @return The updated state of the tunnel.
     */
    State setState(Tunnel tunnel, State state) throws Exception;
+
+    /**
+     * Determine version of underlying backend.
+     *
+     * @return The version of the backend.
+     * @throws Exception
+     */
+    String getVersion() throws Exception;
+
+    /**
+     * Determine type name of underlying backend.
+     *
+     * @return Type name
+     */
+    String getTypeName();
 }
@@ -1,11 +1,12 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.backend;

+import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.ParcelFileDescriptor;
@@ -13,11 +14,14 @@ import android.support.v4.util.ArraySet;
 import android.util.Log;

 import com.wireguard.android.Application;
+import com.wireguard.android.activity.MainActivity;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.Tunnel.State;
 import com.wireguard.android.model.Tunnel.Statistics;
+import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.SharedLibraryLoader;
 import com.wireguard.config.Config;
-import com.wireguard.config.IPCidr;
+import com.wireguard.config.InetNetwork;
 import com.wireguard.config.Interface;
 import com.wireguard.config.Peer;
 import com.wireguard.crypto.KeyEncoding;
@@ -35,15 +39,12 @@ public final class GoBackend implements Backend {
    private static final String TAG = "WireGuard/" + GoBackend.class.getSimpleName();
    private static CompletableFuture<VpnService> vpnService = new CompletableFuture<>();

-    static {
-        System.loadLibrary("wg-go");
-    }
-
    private final Context context;
    private Tunnel currentTunnel;
    private int currentTunnelHandle = -1;

    public GoBackend(final Context context) {
+        SharedLibraryLoader.loadSharedLibrary(context, "wg-go");
        this.context = context;
    }

@@ -55,6 +56,14 @@ public final class GoBackend implements Backend {

    private static native int wgTurnOn(String ifName, int tunFd, String settings);

+    private static native String wgVersion();
+
+    @Override
+    public String getVersion() { return wgVersion(); }
+
+    @Override
+    public String getTypeName() { return "Go userspace"; }
+
    @Override
    public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
        if (tunnel.getState() == State.UP) {
@@ -132,7 +141,7 @@ public final class GoBackend implements Backend {
            // Build config
            final Interface iface = config.getInterface();
            final String goConfig;
-            try (Formatter fmt = new Formatter(new StringBuilder())) {
+            try (final Formatter fmt = new Formatter(new StringBuilder())) {
                fmt.format("replace_peers=true\n");
                if (iface.getPrivateKey() != null)
                    fmt.format("private_key=%s\n", KeyEncoding.keyToHex(KeyEncoding.keyFromBase64(iface.getPrivateKey())));
@@ -147,7 +156,7 @@ public final class GoBackend implements Backend {
                        fmt.format("endpoint=%s\n", peer.getResolvedEndpointString());
                    if (peer.getPersistentKeepalive() != 0)
                        fmt.format("persistent_keepalive_interval=%d\n", peer.getPersistentKeepalive());
-                    for (final IPCidr addr : peer.getAllowedIPs()) {
+                    for (final InetNetwork addr : peer.getAllowedIPs()) {
                        fmt.format("allowed_ip=%s\n", addr.toString());
                    }
                }
@@ -158,15 +167,22 @@ public final class GoBackend implements Backend {
            final VpnService.Builder builder = service.getBuilder();
            builder.setSession(tunnel.getName());

-            for (final IPCidr addr : config.getInterface().getAddresses())
-                builder.addAddress(addr.getAddress(), addr.getCidr());
+            final Intent configureIntent = new Intent(context, MainActivity.class);
+            configureIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            builder.setConfigureIntent(PendingIntent.getActivity(context, 0, configureIntent, 0));
+
+            for (final String excludedApplication : config.getInterface().getExcludedApplications())
+                builder.addDisallowedApplication(excludedApplication);
+
+            for (final InetNetwork addr : config.getInterface().getAddresses())
+                builder.addAddress(addr.getAddress(), addr.getMask());

            for (final InetAddress addr : config.getInterface().getDnses())
                builder.addDnsServer(addr.getHostAddress());

            for (final Peer peer : config.getPeers()) {
-                for (final IPCidr addr : peer.getAllowedIPs())
-                    builder.addRoute(addr.getAddress(), addr.getCidr());
+                for (final InetNetwork addr : peer.getAllowedIPs())
+                    builder.addRoute(addr.getAddress(), addr.getMask());
            }

            int mtu = config.getInterface().getMtu();
@@ -175,11 +191,12 @@ public final class GoBackend implements Backend {
            builder.setMtu(mtu);

            builder.setBlocking(true);
-            final ParcelFileDescriptor tun = builder.establish();
-            if (tun == null)
-                throw new Exception("Unable to create tun device");
-
-            currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig);
+            try (final ParcelFileDescriptor tun = builder.establish()) {
+                if (tun == null)
+                    throw new Exception("Unable to create tun device");
+                Log.d(TAG, "Go backend v" + wgVersion());
+                currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig);
+            }
            if (currentTunnelHandle < 0)
                throw new Exception("Unable to turn tunnel on (wgTurnOn return " + currentTunnelHandle + ')');

@@ -202,6 +219,7 @@ public final class GoBackend implements Backend {
    }

    private void startVpnService() {
+        Log.d(TAG, "Requesting to start VpnService");
        context.startService(new Intent(context, VpnService.class));
    }

@@ -218,12 +236,23 @@ public final class GoBackend implements Backend {

        @Override
        public void onDestroy() {
-            for (final Tunnel tunnel : Application.getComponent().getTunnelManager().getTunnels()) {
+            for (final Tunnel tunnel : Application.getTunnelManager().getTunnels()) {
                if (tunnel != null && tunnel.getState() != State.DOWN)
                    tunnel.setState(State.DOWN);
            }
            vpnService = vpnService.newIncompleteFuture();
            super.onDestroy();
        }
+
+        @Override
+        public int onStartCommand(final Intent intent, final int flags, final int startId) {
+            vpnService.complete(this);
+            if (intent == null || intent.getComponent() == null || !intent.getComponent().getPackageName().equals(getPackageName())) {
+                Log.d(TAG, "Service started by Always-on VPN feature");
+                Application.getTunnelManager().restoreState(true).whenComplete(ExceptionLoggers.D);
+            }
+            return super.onStartCommand(intent, flags, startId);
+        }
+
    }
 }
@@ -1,22 +1,18 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.backend;

-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
 import android.util.Log;

 import com.wireguard.android.Application;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.Tunnel.State;
 import com.wireguard.android.model.Tunnel.Statistics;
-import com.wireguard.android.util.RootShell;
-import com.wireguard.android.util.ToolsInstaller;
 import com.wireguard.config.Config;

 import java.io.File;
@@ -38,16 +34,23 @@ public final class WgQuickBackend implements Backend {
    private static final String TAG = "WireGuard/" + WgQuickBackend.class.getSimpleName();

    private final File localTemporaryDir;
-    private final RootShell rootShell;
-    private final ToolsInstaller toolsInstaller;

-    public WgQuickBackend(final Context context, final RootShell rootShell,
-                          final ToolsInstaller toolsInstaller) {
+    public WgQuickBackend(final Context context) {
        localTemporaryDir = new File(context.getCacheDir(), "tmp");
-        this.rootShell = rootShell;
-        this.toolsInstaller = toolsInstaller;
    }

+    @Override
+    public String getVersion() throws Exception {
+        final List<String> output = new ArrayList<>();
+        if (Application.getRootShell()
+                .run(output, "cat /sys/module/wireguard/version") != 0 || output.isEmpty())
+            throw new Exception("Unable to determine kernel module version");
+        return output.get(0);
+    }
+
+    @Override
+    public String getTypeName() { return "Kernel module"; }
+
    @Override
    public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
        if (tunnel.getState() == State.UP) {
@@ -69,8 +72,8 @@ public final class WgQuickBackend implements Backend {
        final List<String> output = new ArrayList<>();
        // Don't throw an exception here or nothing will show up in the UI.
        try {
-            toolsInstaller.ensureToolsAvailable();
-            if (rootShell.run(output, "wg show interfaces") != 0 || output.isEmpty())
+            Application.getToolsInstaller().ensureToolsAvailable();
+            if (Application.getRootShell().run(output, "wg show interfaces") != 0 || output.isEmpty())
                return Collections.emptySet();
        } catch (final Exception e) {
            Log.w(TAG, "Unable to enumerate running tunnels", e);
@@ -98,7 +101,7 @@ public final class WgQuickBackend implements Backend {
        if (state == originalState)
            return originalState;
        Log.d(TAG, "Changing tunnel " + tunnel.getName() + " to state " + state);
-        toolsInstaller.ensureToolsAvailable();
+        Application.getToolsInstaller().ensureToolsAvailable();
        setStateInternal(tunnel, tunnel.getConfig(), state);
        return getState(tunnel);
    }
@@ -106,23 +109,17 @@ public final class WgQuickBackend implements Backend {
    private void setStateInternal(final Tunnel tunnel, final Config config, final State state)
            throws Exception {
        final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf");
-        try (FileOutputStream stream = new FileOutputStream(tempFile, false)) {
+        try (final FileOutputStream stream = new FileOutputStream(tempFile, false)) {
            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
        }
-        final String command = String.format("wg-quick %s '%s'",
+        String command = String.format("wg-quick %s '%s'",
                state.toString().toLowerCase(), tempFile.getAbsolutePath());
-        final int result = rootShell.run(null, command);
+        if (state == State.UP)
+            command = "cat /sys/module/wireguard/version && " + command;
+        final int result = Application.getRootShell().run(null, command);
        // noinspection ResultOfMethodCallIgnored
        tempFile.delete();
        if (result != 0)
            throw new Exception("Unable to configure tunnel (wg-quick returned " + result + ')');
    }
-
-    public static final class WgQuickChangeReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(final Context context, final Intent intent) {
-            Log.d(TAG, "Refreshing tunnel states");
-            Application.getComponent().getTunnelManager().refreshTunnelStates();
-        }
-    }
 }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.configStore;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.configStore;
@@ -9,7 +9,6 @@ package com.wireguard.android.configStore;
 import android.content.Context;
 import android.util.Log;

-import com.wireguard.android.Application.ApplicationContext;
 import com.wireguard.config.Config;

 import java.io.File;
@@ -32,7 +31,7 @@ public final class FileConfigStore implements ConfigStore {

    private final Context context;

-    public FileConfigStore(@ApplicationContext final Context context) {
+    public FileConfigStore(final Context context) {
        this.context = context;
    }

@@ -42,7 +41,7 @@ public final class FileConfigStore implements ConfigStore {
        final File file = fileFor(name);
        if (!file.createNewFile())
            throw new IOException("Configuration file " + file.getName() + " already exists");
-        try (FileOutputStream stream = new FileOutputStream(file, false)) {
+        try (final FileOutputStream stream = new FileOutputStream(file, false)) {
            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
        }
        return config;
@@ -70,7 +69,7 @@ public final class FileConfigStore implements ConfigStore {

    @Override
    public Config load(final String name) throws IOException {
-        try (FileInputStream stream = new FileInputStream(fileFor(name))) {
+        try (final FileInputStream stream = new FileInputStream(fileFor(name))) {
            return Config.from(stream);
        }
    }
@@ -95,7 +94,7 @@ public final class FileConfigStore implements ConfigStore {
        final File file = fileFor(name);
        if (!file.isFile())
            throw new FileNotFoundException("Configuration file " + file.getName() + " not found");
-        try (FileOutputStream stream = new FileOutputStream(file, false)) {
+        try (final FileOutputStream stream = new FileOutputStream(file, false)) {
            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
        }
        return config;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.databinding;
@@ -9,16 +9,18 @@ package com.wireguard.android.databinding;
 import android.databinding.BindingAdapter;
 import android.databinding.ObservableList;
 import android.databinding.adapters.ListenerUtil;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
 import android.text.InputFilter;
 import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.TextView;

 import com.wireguard.android.R;
-import com.wireguard.android.util.Keyed;
 import com.wireguard.android.util.ObservableKeyedList;
 import com.wireguard.android.widget.ToggleSwitch;
 import com.wireguard.android.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
+import com.wireguard.util.Keyed;

 /**
 * Static methods for use by generated code in the Android data binding library.
@@ -91,9 +93,39 @@ public final class BindingAdapters {
        adapter.setList(newList);
    }

+    @BindingAdapter({"items", "layout"})
+    public static <K, E extends Keyed<? extends K>>
+    void setItems(final RecyclerView view,
+                  final ObservableKeyedList<K, E> oldList, final int oldLayoutId,
+                  final ObservableKeyedList<K, E> newList, final int newLayoutId) {
+        if (view.getLayoutManager() == null)
+            view.setLayoutManager(new LinearLayoutManager(view.getContext(), RecyclerView.VERTICAL, false));
+
+        if (oldList == newList && oldLayoutId == newLayoutId)
+            return;
+        // The ListAdapter interface is not generic, so this cannot be checked.
+        @SuppressWarnings("unchecked") ObservableKeyedRecyclerViewAdapter<K, E> adapter =
+                (ObservableKeyedRecyclerViewAdapter<K, E>) view.getAdapter();
+        // If the layout changes, any existing adapter must be replaced.
+        if (adapter != null && oldList != null && oldLayoutId != newLayoutId) {
+            adapter.setList(null);
+            adapter = null;
+        }
+        // Avoid setting an adapter when there is no new list or layout.
+        if (newList == null || newLayoutId == 0)
+            return;
+        if (adapter == null) {
+            adapter = new ObservableKeyedRecyclerViewAdapter<>(view.getContext(), newLayoutId, newList);
+            view.setAdapter(adapter);
+        }
+        // Either the list changed, or this is an entirely new listener because the layout changed.
+        adapter.setList(newList);
+    }
+
    @BindingAdapter("onBeforeCheckedChanged")
    public static void setOnBeforeCheckedChanged(final ToggleSwitch view,
                                                 final OnBeforeCheckedChangeListener listener) {
        view.setOnBeforeCheckedChangeListener(listener);
    }
+
 }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.databinding;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.databinding;
@@ -16,7 +16,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;

 import com.wireguard.android.BR;
-import com.wireguard.android.util.Keyed;
+import com.wireguard.util.Keyed;
 import com.wireguard.android.util.ObservableKeyedList;

 import java.lang.ref.WeakReference;
@@ -0,0 +1,141 @@
+/*
+ * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.databinding;
+
+import android.content.Context;
+import android.databinding.DataBindingUtil;
+import android.databinding.ObservableList;
+import android.databinding.ViewDataBinding;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.RecyclerView.Adapter;
+import android.view.LayoutInflater;
+import android.view.ViewGroup;
+
+import com.wireguard.android.BR;
+import com.wireguard.android.util.ObservableKeyedList;
+import com.wireguard.util.Keyed;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * A generic {@code RecyclerView.Adapter} backed by a {@code ObservableKeyedList}.
+ */
+
+class ObservableKeyedRecyclerViewAdapter<K, E extends Keyed<? extends K>> extends Adapter<ObservableKeyedRecyclerViewAdapter.ViewHolder> {
+
+    private final OnListChangedCallback<E> callback = new OnListChangedCallback<>(this);
+    private final int layoutId;
+    private final LayoutInflater layoutInflater;
+    private ObservableKeyedList<K, E> list;
+
+    ObservableKeyedRecyclerViewAdapter(final Context context, final int layoutId,
+                                       final ObservableKeyedList<K, E> list) {
+        this.layoutId = layoutId;
+        layoutInflater = LayoutInflater.from(context);
+        setList(list);
+    }
+
+    @Override
+    public int getItemCount() {
+        return list != null ? list.size() : 0;
+    }
+
+    private E getItem(final int position) {
+        if (list == null || position < 0 || position >= list.size())
+            return null;
+        return list.get(position);
+    }
+
+    @Override
+    public long getItemId(final int position) {
+        final K key = getKey(position);
+        return key != null ? key.hashCode() : -1;
+    }
+
+    private K getKey(final int position) {
+        final E item = getItem(position);
+        return item != null ? item.getKey() : null;
+    }
+
+    @NonNull @Override
+    public ViewHolder onCreateViewHolder(@NonNull final ViewGroup parent, final int viewType) {
+        return new ViewHolder(DataBindingUtil.inflate(layoutInflater, layoutId, parent, false));
+    }
+
+    @Override
+    public void onBindViewHolder(@NonNull final ViewHolder holder, final int position) {
+        holder.binding.setVariable(BR.collection, list);
+        holder.binding.setVariable(BR.key, getKey(position));
+        holder.binding.setVariable(BR.item, getItem(position));
+        holder.binding.executePendingBindings();
+    }
+
+    void setList(final ObservableKeyedList<K, E> newList) {
+        if (list != null)
+            list.removeOnListChangedCallback(callback);
+        list = newList;
+        if (list != null) {
+            list.addOnListChangedCallback(callback);
+        }
+        notifyDataSetChanged();
+    }
+
+    private static final class OnListChangedCallback<E extends Keyed<?>>
+            extends ObservableList.OnListChangedCallback<ObservableList<E>> {
+
+        private final WeakReference<ObservableKeyedRecyclerViewAdapter<?, E>> weakAdapter;
+
+        private OnListChangedCallback(final ObservableKeyedRecyclerViewAdapter<?, E> adapter) {
+            weakAdapter = new WeakReference<>(adapter);
+        }
+
+        @Override
+        public void onChanged(final ObservableList<E> sender) {
+            final ObservableKeyedRecyclerViewAdapter adapter = weakAdapter.get();
+            if (adapter != null)
+                adapter.notifyDataSetChanged();
+            else
+                sender.removeOnListChangedCallback(this);
+        }
+
+        @Override
+        public void onItemRangeChanged(final ObservableList<E> sender, final int positionStart,
+                                       final int itemCount) {
+            onChanged(sender);
+        }
+
+        @Override
+        public void onItemRangeInserted(final ObservableList<E> sender, final int positionStart,
+                                        final int itemCount) {
+            onChanged(sender);
+        }
+
+        @Override
+        public void onItemRangeMoved(final ObservableList<E> sender, final int fromPosition,
+                                     final int toPosition, final int itemCount) {
+            onChanged(sender);
+        }
+
+        @Override
+        public void onItemRangeRemoved(final ObservableList<E> sender, final int positionStart,
+                                       final int itemCount) {
+            onChanged(sender);
+        }
+    }
+
+    public static class ViewHolder extends RecyclerView.ViewHolder {
+        final ViewDataBinding binding;
+
+        public ViewHolder(final ViewDataBinding binding) {
+            super(binding.getRoot());
+
+            this.binding = binding;
+        }
+    }
+
+}
@@ -0,0 +1,141 @@
+/*
+ * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.fragment;
+
+import android.app.Activity;
+import android.app.Dialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.content.pm.ResolveInfo;
+import android.os.Bundle;
+import android.support.annotation.Nullable;
+import android.support.v4.app.DialogFragment;
+import android.support.v4.app.Fragment;
+import android.support.v7.app.AlertDialog;
+import android.widget.Toast;
+
+import com.wireguard.android.Application;
+import com.wireguard.android.R;
+import com.wireguard.android.activity.BaseActivity;
+import com.wireguard.android.databinding.AppListDialogFragmentBinding;
+import com.wireguard.android.model.ApplicationData;
+import com.wireguard.android.model.Tunnel;
+import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.ObservableKeyedArrayList;
+import com.wireguard.android.util.ObservableKeyedList;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class AppListDialogFragment extends DialogFragment {
+
+    private static final String KEY_EXCLUDED_APPS = "excludedApps";
+
+    private List<String> currentlyExcludedApps;
+    private final ObservableKeyedList<String, ApplicationData> appData = new ObservableKeyedArrayList<>();
+
+    public static <T extends Fragment & AppExclusionListener> AppListDialogFragment newInstance(final String[] excludedApps, final T target) {
+        final Bundle extras = new Bundle();
+        extras.putStringArray(KEY_EXCLUDED_APPS, excludedApps);
+        final AppListDialogFragment fragment = new AppListDialogFragment();
+        fragment.setTargetFragment(target, 0);
+        fragment.setArguments(extras);
+        return fragment;
+    }
+
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        currentlyExcludedApps = Arrays.asList(getArguments().getStringArray(KEY_EXCLUDED_APPS));
+    }
+
+    @Override
+    public void onAttach(final Context context) {
+        super.onAttach(context);
+    }
+
+    @Override
+    public Dialog onCreateDialog(final Bundle savedInstanceState) {
+        final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
+        alertDialogBuilder.setTitle(R.string.excluded_applications);
+
+        AppListDialogFragmentBinding binding = AppListDialogFragmentBinding.inflate(getActivity().getLayoutInflater(), null, false);
+        binding.executePendingBindings();
+        alertDialogBuilder.setView(binding.getRoot());
+
+        alertDialogBuilder.setPositiveButton(R.string.set_exclusions, (dialog, which) -> setExclusionsAndDismiss());
+        alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+        alertDialogBuilder.setNeutralButton(R.string.deselect_all, (dialog, which) -> { });
+
+        binding.setFragment(this);
+        binding.setAppData(appData);
+
+        loadData();
+
+        final AlertDialog dialog = alertDialogBuilder.create();
+        dialog.setOnShowListener(d -> dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(view -> {
+                for (final ApplicationData app : appData)
+                    app.setExcludedFromTunnel(false);
+        }));
+        return dialog;
+    }
+
+    private void loadData() {
+        final Activity activity = getActivity();
+        if (activity == null) {
+            return;
+        }
+
+        final PackageManager pm = activity.getPackageManager();
+        Application.getAsyncWorker().supplyAsync(() -> {
+            final Intent launcherIntent = new Intent(Intent.ACTION_MAIN, null);
+            launcherIntent.addCategory(Intent.CATEGORY_LAUNCHER);
+            final List<ResolveInfo> resolveInfos = pm.queryIntentActivities(launcherIntent, 0);
+
+            final List<ApplicationData> appData = new ArrayList<>();
+            for (ResolveInfo resolveInfo : resolveInfos) {
+                String packageName = resolveInfo.activityInfo.packageName;
+                appData.add(new ApplicationData(resolveInfo.loadIcon(pm), resolveInfo.loadLabel(pm).toString(), packageName, currentlyExcludedApps.contains(packageName)));
+            }
+
+            Collections.sort(appData, (lhs, rhs) -> lhs.getName().toLowerCase().compareTo(rhs.getName().toLowerCase()));
+            return appData;
+        }).whenComplete(((data, throwable) -> {
+            if (data != null) {
+                appData.clear();
+                appData.addAll(data);
+            } else {
+                final String error = throwable != null ? ExceptionLoggers.unwrapMessage(throwable) : "Unknown";
+                final String message = activity.getString(R.string.error_fetching_apps, error);
+                Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
+                dismissAllowingStateLoss();
+            }
+        }));
+    }
+
+    void setExclusionsAndDismiss() {
+        final List<String> excludedApps = new ArrayList<>();
+        for (final ApplicationData data : appData) {
+            if (data.isExcludedFromTunnel()) {
+                excludedApps.add(data.getPackageName());
+            }
+        }
+
+        ((AppExclusionListener) getTargetFragment()).onExcludedAppsSelected(excludedApps);
+        dismiss();
+    }
+
+    public interface AppExclusionListener {
+        void onExcludedAppsSelected(List<String> excludedApps);
+    }
+
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.fragment;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.fragment;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.fragment;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.fragment;
@@ -11,6 +11,7 @@ import android.content.Context;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.Snackbar;
+import android.support.v4.app.FragmentManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -24,16 +25,20 @@ import android.widget.Toast;
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.databinding.TunnelEditorFragmentBinding;
+import com.wireguard.android.fragment.AppListDialogFragment.AppExclusionListener;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.TunnelManager;
 import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.config.Attribute;
 import com.wireguard.config.Config;

+import java.util.List;
+
 /**
 * Fragment for editing a WireGuard configuration.
 */

-public class TunnelEditorFragment extends BaseFragment {
+public class TunnelEditorFragment extends BaseFragment implements AppExclusionListener {
    private static final String KEY_LOCAL_CONFIG = "local_config";
    private static final String KEY_ORIGINAL_NAME = "original_name";
    private static final String TAG = "WireGuard/" + TunnelEditorFragment.class.getSimpleName();
@@ -128,7 +133,7 @@ public class TunnelEditorFragment extends BaseFragment {
                }
                if (tunnel == null) {
                    Log.d(TAG, "Attempting to create new tunnel " + binding.getConfig().getName());
-                    final TunnelManager manager = Application.getComponent().getTunnelManager();
+                    final TunnelManager manager = Application.getTunnelManager();
                    manager.create(binding.getConfig().getName(), newConfig)
                            .whenComplete(this::onTunnelCreated);
                } else if (!tunnel.getName().equals(binding.getConfig().getName())) {
@@ -169,6 +174,7 @@ public class TunnelEditorFragment extends BaseFragment {
            tunnel = newTunnel;
            message = getString(R.string.tunnel_create_success, tunnel.getName());
            Log.d(TAG, message);
+            Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
            onFinished();
        } else {
            final String error = ExceptionLoggers.unwrapMessage(throwable);
@@ -201,6 +207,8 @@ public class TunnelEditorFragment extends BaseFragment {

    @Override
    public void onViewStateRestored(final Bundle savedInstanceState) {
+        binding.setFragment(this);
+
        if (savedInstanceState == null) {
            onSelectedTunnelChanged(null, getSelectedTunnel());
        } else {
@@ -215,4 +223,19 @@ public class TunnelEditorFragment extends BaseFragment {

        super.onViewStateRestored(savedInstanceState);
    }
+
+    public void onRequestSetExcludedApplications(@SuppressWarnings("unused") final View view) {
+        final FragmentManager fragmentManager = getFragmentManager();
+        if (fragmentManager != null) {
+            final String[] excludedApps = Attribute.stringToList(binding.getConfig().getInterfaceSection().getExcludedApplications());
+            final AppListDialogFragment fragment = AppListDialogFragment.newInstance(excludedApps, this);
+            fragment.show(getFragmentManager(), null);
+        }
+    }
+
+    @Override
+    public void onExcludedAppsSelected(final List<String> excludedApps) {
+        binding.getConfig().getInterfaceSection().setExcludedApplications(Attribute.iterableToString(excludedApps));
+    }
+
 }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.fragment;
@@ -34,13 +34,10 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;

 import com.wireguard.android.Application;
-import com.wireguard.android.Application.ApplicationComponent;
 import com.wireguard.android.R;
 import com.wireguard.android.activity.TunnelCreatorActivity;
 import com.wireguard.android.databinding.TunnelListFragmentBinding;
 import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.ExceptionLoggers;
 import com.wireguard.config.Config;

@@ -70,9 +67,7 @@ public class TunnelListFragment extends BaseFragment {
    private final MultiChoiceModeListener actionModeListener = new ActionModeListener();
    private final ListViewCallbacks listViewCallbacks = new ListViewCallbacks();
    private ActionMode actionMode;
-    private AsyncWorker asyncWorker;
    private TunnelListFragmentBinding binding;
-    private TunnelManager tunnelManager;

    public boolean collapseActionMenu() {
        if (binding.createMenu.isExpanded()) {
@@ -90,7 +85,7 @@ public class TunnelListFragment extends BaseFragment {

        final Collection<CompletableFuture<Tunnel>> futureTunnels = new ArrayList<>();
        final List<Throwable> throwables = new ArrayList<>();
-        asyncWorker.supplyAsync(() -> {
+        Application.getAsyncWorker().supplyAsync(() -> {
            final String[] columns = {OpenableColumns.DISPLAY_NAME};
            String name = null;
            try (Cursor cursor = contentResolver.query(uri, columns,
@@ -137,11 +132,11 @@ public class TunnelListFragment extends BaseFragment {
                            throwables.add(e);
                        }
                        if (config != null)
-                            futureTunnels.add(tunnelManager.create(name, config).toCompletableFuture());
+                            futureTunnels.add(Application.getTunnelManager().create(name, config).toCompletableFuture());
                    }
                }
            } else {
-                futureTunnels.add(tunnelManager.create(name,
+                futureTunnels.add(Application.getTunnelManager().create(name,
                        Config.from(contentResolver.openInputStream(uri))).toCompletableFuture());
            }

@@ -190,9 +185,6 @@ public class TunnelListFragment extends BaseFragment {
    @Override
    public void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        final ApplicationComponent applicationComponent = Application.getComponent();
-        asyncWorker = applicationComponent.getAsyncWorker();
-        tunnelManager = applicationComponent.getTunnelManager();
    }

    @Override
@@ -229,6 +221,12 @@ public class TunnelListFragment extends BaseFragment {
            binding.createMenu.collapse();
    }

+    @Override
+    public void onPause() {
+        binding.createMenu.collapse();
+        super.onPause();
+    }
+
    @Override
    public void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
        // Do nothing.
@@ -269,16 +267,15 @@ public class TunnelListFragment extends BaseFragment {
                    tunnels.size() + throwables.size(),
                    tunnels.size(), tunnels.size() + throwables.size());

-        if (binding != null) {
+        if (binding != null)
            Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
-        }
    }

    @Override
    public void onViewStateRestored(final Bundle savedInstanceState) {
        super.onViewStateRestored(savedInstanceState);
        binding.setFragment(this);
-        binding.setTunnels(tunnelManager.getTunnels());
+        binding.setTunnels(Application.getTunnelManager().getTunnels());
    }

    private final class ActionModeListener implements MultiChoiceModeListener {
@@ -308,6 +305,10 @@ public class TunnelListFragment extends BaseFragment {
                            .whenComplete(TunnelListFragment.this::onTunnelDeletionFinished);
                    mode.finish();
                    return true;
+                case R.id.menu_action_select_all:
+                    for (int i = 0; i < tunnelList.getAdapter().getCount(); ++i)
+                        tunnelList.setItemChecked(i, true);
+                    return true;
                default:
                    return false;
            }
@@ -343,7 +344,11 @@ public class TunnelListFragment extends BaseFragment {

        private void updateTitle(final ActionMode mode) {
            final int count = (int) getCheckedPositions().count();
-            mode.setTitle(resources.getQuantityString(R.plurals.delete_title, count, count));
+            if (count == 0) {
+                mode.setTitle("");
+            } else {
+                mode.setTitle(resources.getQuantityString(R.plurals.delete_title, count, count));
+            }
        }
    }

@@ -0,0 +1,60 @@
+/*
+ * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.model;
+
+import android.databinding.BaseObservable;
+import android.databinding.Bindable;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
+
+import com.wireguard.android.BR;
+import com.wireguard.util.Keyed;
+
+public class ApplicationData extends BaseObservable implements Keyed<String> {
+
+    @NonNull private final Drawable icon;
+    @NonNull private final String name;
+    @NonNull private final String packageName;
+    private boolean excludedFromTunnel;
+
+    public ApplicationData(@NonNull final Drawable icon, @NonNull final String name, @NonNull final String packageName, final boolean excludedFromTunnel) {
+        this.icon = icon;
+        this.name = name;
+        this.packageName = packageName;
+        this.excludedFromTunnel = excludedFromTunnel;
+    }
+
+    @NonNull
+    public Drawable getIcon() {
+        return icon;
+    }
+
+    @NonNull
+    public String getName() {
+        return name;
+    }
+
+    @NonNull
+    public String getPackageName() {
+        return packageName;
+    }
+
+    @Bindable
+    public boolean isExcludedFromTunnel() {
+        return excludedFromTunnel;
+    }
+
+    public void setExcludedFromTunnel(final boolean excludedFromTunnel) {
+        this.excludedFromTunnel = excludedFromTunnel;
+        notifyPropertyChanged(BR.excludedFromTunnel);
+    }
+
+    @Override
+    public String getKey() {
+        return name;
+    }
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.model;
@@ -13,7 +13,7 @@ import android.support.annotation.Nullable;

 import com.wireguard.android.BR;
 import com.wireguard.android.util.ExceptionLoggers;
-import com.wireguard.android.util.Keyed;
+import com.wireguard.util.Keyed;
 import com.wireguard.config.Config;

 import java.util.regex.Pattern;
@@ -80,21 +80,21 @@ public class Tunnel extends BaseObservable implements Keyed<String> {
    }

    public CompletionStage<State> getStateAsync() {
-        return manager.getTunnelState(this);
+        return TunnelManager.getTunnelState(this);
    }

    @Bindable
    public Statistics getStatistics() {
        // FIXME: Check age of statistics.
        if (statistics == null)
-            manager.getTunnelStatistics(this).whenComplete(ExceptionLoggers.E);
+            TunnelManager.getTunnelStatistics(this).whenComplete(ExceptionLoggers.E);
        return statistics;
    }

    public CompletionStage<Statistics> getStatisticsAsync() {
        // FIXME: Check age of statistics.
        if (statistics == null)
-            return manager.getTunnelStatistics(this);
+            return TunnelManager.getTunnelStatistics(this);
        return CompletableFuture.completedFuture(statistics);
    }

@@ -1,35 +1,34 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.model;

-import android.content.SharedPreferences;
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
 import android.databinding.BaseObservable;
 import android.databinding.Bindable;
 import android.support.annotation.NonNull;

-import com.wireguard.android.Application.ApplicationScope;
+import com.wireguard.android.Application;
 import com.wireguard.android.BR;
-import com.wireguard.android.backend.Backend;
 import com.wireguard.android.configStore.ConfigStore;
 import com.wireguard.android.model.Tunnel.State;
 import com.wireguard.android.model.Tunnel.Statistics;
-import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.ExceptionLoggers;
 import com.wireguard.android.util.ObservableKeyedList;
 import com.wireguard.android.util.ObservableSortedKeyedArrayList;
 import com.wireguard.android.util.ObservableSortedKeyedList;
 import com.wireguard.config.Config;

+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Set;

-import javax.inject.Inject;
-
 import java9.util.Comparators;
 import java9.util.concurrent.CompletableFuture;
 import java9.util.concurrent.CompletionStage;
@@ -40,7 +39,6 @@ import java9.util.stream.StreamSupport;
 * Maintains and mediates changes to the set of available WireGuard tunnels,
 */

-@ApplicationScope
 public final class TunnelManager extends BaseObservable {
    private static final Comparator<String> COMPARATOR = Comparators.<String>thenComparing(
            String.CASE_INSENSITIVE_ORDER, Comparators.naturalOrder());
@@ -48,21 +46,15 @@ public final class TunnelManager extends BaseObservable {
    private static final String KEY_RESTORE_ON_BOOT = "restore_on_boot";
    private static final String KEY_RUNNING_TUNNELS = "enabled_configs";

-    private final AsyncWorker asyncWorker;
-    private final Backend backend;
    private final ConfigStore configStore;
-    private final SharedPreferences preferences;
    private final ObservableSortedKeyedList<String, Tunnel> tunnels =
            new ObservableSortedKeyedArrayList<>(COMPARATOR);
    private Tunnel lastUsedTunnel;
+    private boolean haveLoaded;
+    private final ArrayList<CompletableFuture<Void>> delayedLoadRestoreTunnels = new ArrayList<>();

-    @Inject
-    public TunnelManager(final AsyncWorker asyncWorker, final Backend backend,
-                         final ConfigStore configStore, final SharedPreferences preferences) {
-        this.asyncWorker = asyncWorker;
-        this.backend = backend;
+    public TunnelManager(final ConfigStore configStore) {
        this.configStore = configStore;
-        this.preferences = preferences;
    }

    private Tunnel addToList(final String name, final Config config, final State state) {
@@ -78,7 +70,7 @@ public final class TunnelManager extends BaseObservable {
            final String message = "Tunnel " + name + " already exists";
            return CompletableFuture.failedFuture(new IllegalArgumentException(message));
        }
-        return asyncWorker.supplyAsync(() -> configStore.create(name, config))
+        return Application.getAsyncWorker().supplyAsync(() -> configStore.create(name, config))
                .thenApply(savedConfig -> addToList(name, savedConfig, State.DOWN));
    }

@@ -89,14 +81,14 @@ public final class TunnelManager extends BaseObservable {
        if (wasLastUsed)
            setLastUsedTunnel(null);
        tunnels.remove(tunnel);
-        return asyncWorker.runAsync(() -> {
+        return Application.getAsyncWorker().runAsync(() -> {
            if (originalState == State.UP)
-                backend.setState(tunnel, State.DOWN);
+                Application.getBackend().setState(tunnel, State.DOWN);
            try {
                configStore.delete(tunnel.getName());
            } catch (final Exception e) {
                if (originalState == State.UP)
-                    backend.setState(tunnel, State.UP);
+                    Application.getBackend().setState(tunnel, State.UP);
                // Re-throw the exception to fail the completion.
                throw e;
            }
@@ -116,17 +108,17 @@ public final class TunnelManager extends BaseObservable {
    }

    CompletionStage<Config> getTunnelConfig(final Tunnel tunnel) {
-        return asyncWorker.supplyAsync(() -> configStore.load(tunnel.getName()))
+        return Application.getAsyncWorker().supplyAsync(() -> configStore.load(tunnel.getName()))
                .thenApply(tunnel::onConfigChanged);
    }

-    CompletionStage<State> getTunnelState(final Tunnel tunnel) {
-        return asyncWorker.supplyAsync(() -> backend.getState(tunnel))
+    static CompletionStage<State> getTunnelState(final Tunnel tunnel) {
+        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getState(tunnel))
                .thenApply(tunnel::onStateChanged);
    }

-    CompletionStage<Statistics> getTunnelStatistics(final Tunnel tunnel) {
-        return asyncWorker.supplyAsync(() -> backend.getStatistics(tunnel))
+    static CompletionStage<Statistics> getTunnelStatistics(final Tunnel tunnel) {
+        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getStatistics(tunnel))
                .thenApply(tunnel::onStatisticsChanged);
    }

@@ -135,21 +127,36 @@ public final class TunnelManager extends BaseObservable {
    }

    public void onCreate() {
-        asyncWorker.supplyAsync(configStore::enumerate)
-                .thenAcceptBoth(asyncWorker.supplyAsync(backend::enumerate), this::onTunnelsLoaded)
+        Application.getAsyncWorker().supplyAsync(configStore::enumerate)
+                .thenAcceptBoth(Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().enumerate()), this::onTunnelsLoaded)
                .whenComplete(ExceptionLoggers.E);
    }

+    @SuppressWarnings("unchecked")
    private void onTunnelsLoaded(final Iterable<String> present, final Collection<String> running) {
        for (final String name : present)
            addToList(name, null, running.contains(name) ? State.UP : State.DOWN);
-        final String lastUsedName = preferences.getString(KEY_LAST_USED_TUNNEL, null);
+        final String lastUsedName = Application.getSharedPreferences().getString(KEY_LAST_USED_TUNNEL, null);
        if (lastUsedName != null)
            setLastUsedTunnel(tunnels.get(lastUsedName));
+        final CompletableFuture<Void>[] toComplete;
+        synchronized (delayedLoadRestoreTunnels) {
+            haveLoaded = true;
+            toComplete = delayedLoadRestoreTunnels.toArray(new CompletableFuture[delayedLoadRestoreTunnels.size()]);
+            delayedLoadRestoreTunnels.clear();
+        }
+        restoreState(true).whenComplete((v, t) -> {
+            for (final CompletableFuture<Void> f : toComplete) {
+                if (t == null)
+                    f.complete(v);
+                else
+                    f.completeExceptionally(t);
+            }
+        });
    }

    public void refreshTunnelStates() {
-        asyncWorker.supplyAsync(backend::enumerate)
+        Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().enumerate())
                .thenAccept(running -> {
                    for (final Tunnel tunnel : tunnels)
                        tunnel.onStateChanged(running.contains(tunnel.getName()) ? State.UP : State.DOWN);
@@ -157,10 +164,17 @@ public final class TunnelManager extends BaseObservable {
                .whenComplete(ExceptionLoggers.E);
    }

-    public CompletionStage<Void> restoreState() {
-        if (!preferences.getBoolean(KEY_RESTORE_ON_BOOT, false))
+    public CompletionStage<Void> restoreState(final boolean force) {
+        if (!force && !Application.getSharedPreferences().getBoolean(KEY_RESTORE_ON_BOOT, false))
            return CompletableFuture.completedFuture(null);
-        final Set<String> previouslyRunning = preferences.getStringSet(KEY_RUNNING_TUNNELS, null);
+        synchronized (delayedLoadRestoreTunnels) {
+            if (!haveLoaded) {
+                final CompletableFuture<Void> f = new CompletableFuture<>();
+                delayedLoadRestoreTunnels.add(f);
+                return f;
+            }
+        }
+        final Set<String> previouslyRunning = Application.getSharedPreferences().getStringSet(KEY_RUNNING_TUNNELS, null);
        if (previouslyRunning == null)
            return CompletableFuture.completedFuture(null);
        return CompletableFuture.allOf(StreamSupport.stream(tunnels)
@@ -174,7 +188,7 @@ public final class TunnelManager extends BaseObservable {
                .filter(tunnel -> tunnel.getState() == State.UP)
                .map(Tunnel::getName)
                .collect(Collectors.toUnmodifiableSet());
-        preferences.edit().putStringSet(KEY_RUNNING_TUNNELS, runningTunnels).apply();
+        Application.getSharedPreferences().edit().putStringSet(KEY_RUNNING_TUNNELS, runningTunnels).apply();
    }

    private void setLastUsedTunnel(final Tunnel tunnel) {
@@ -183,14 +197,14 @@ public final class TunnelManager extends BaseObservable {
        lastUsedTunnel = tunnel;
        notifyPropertyChanged(BR.lastUsedTunnel);
        if (tunnel != null)
-            preferences.edit().putString(KEY_LAST_USED_TUNNEL, tunnel.getName()).apply();
+            Application.getSharedPreferences().edit().putString(KEY_LAST_USED_TUNNEL, tunnel.getName()).apply();
        else
-            preferences.edit().remove(KEY_LAST_USED_TUNNEL).apply();
+            Application.getSharedPreferences().edit().remove(KEY_LAST_USED_TUNNEL).apply();
    }

    CompletionStage<Config> setTunnelConfig(final Tunnel tunnel, final Config config) {
-        return asyncWorker.supplyAsync(() -> {
-            final Config appliedConfig = backend.applyConfig(tunnel, config);
+        return Application.getAsyncWorker().supplyAsync(() -> {
+            final Config appliedConfig = Application.getBackend().applyConfig(tunnel, config);
            return configStore.save(tunnel.getName(), appliedConfig);
        }).thenApply(tunnel::onConfigChanged);
    }
@@ -208,13 +222,13 @@ public final class TunnelManager extends BaseObservable {
        if (wasLastUsed)
            setLastUsedTunnel(null);
        tunnels.remove(tunnel);
-        return asyncWorker.supplyAsync(() -> {
+        return Application.getAsyncWorker().supplyAsync(() -> {
            if (originalState == State.UP)
-                backend.setState(tunnel, State.DOWN);
+                Application.getBackend().setState(tunnel, State.DOWN);
            configStore.rename(tunnel.getName(), name);
            final String newName = tunnel.onNameChanged(name);
            if (originalState == State.UP)
-                backend.setState(tunnel, State.UP);
+                Application.getBackend().setState(tunnel, State.UP);
            return newName;
        }).whenComplete((newName, e) -> {
            // On failure, we don't know what state the tunnel might be in. Fix that.
@@ -230,12 +244,52 @@ public final class TunnelManager extends BaseObservable {
    CompletionStage<State> setTunnelState(final Tunnel tunnel, final State state) {
        // Ensure the configuration is loaded before trying to use it.
        return tunnel.getConfigAsync().thenCompose(x ->
-                asyncWorker.supplyAsync(() -> backend.setState(tunnel, state))
+                Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().setState(tunnel, state))
        ).whenComplete((newState, e) -> {
            // Ensure onStateChanged is always called (failure or not), and with the correct state.
            tunnel.onStateChanged(e == null ? newState : tunnel.getState());
            if (e == null && newState == State.UP)
                setLastUsedTunnel(tunnel);
+            saveState();
        });
    }
+
+    public static final class IntentReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(final Context context, final Intent intent) {
+            final TunnelManager manager = Application.getTunnelManager();
+            if (intent == null)
+                return;
+            final String action = intent.getAction();
+            if (action == null)
+                return;
+
+            if ("com.wireguard.android.action.REFRESH_TUNNEL_STATES".equals(action)) {
+                manager.refreshTunnelStates();
+                return;
+            }
+
+            /* We disable the below, for now, as the security model of allowing this
+             * might take a bit more consideration.
+             */
+            if (true)
+                return;
+
+            final State state;
+            if ("com.wireguard.android.action.SET_TUNNEL_UP".equals(action))
+                state = State.UP;
+            else if ("com.wireguard.android.action.SET_TUNNEL_DOWN".equals(action))
+                state = State.DOWN;
+            else
+                return;
+
+            final String tunnelName = intent.getStringExtra("tunnel");
+            if (tunnelName == null)
+                return;
+            final Tunnel tunnel = manager.getTunnels().get(tunnelName);
+            if (tunnel == null)
+                return;
+            manager.setTunnelState(tunnel, state);
+        }
+    }
 }
@@ -0,0 +1,115 @@
+/*
+ * Copyright © 2018 Samuel Holland <samuel@sholland.org>
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.preference;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Environment;
+import android.support.design.widget.Snackbar;
+import android.support.v7.preference.Preference;
+import android.util.AttributeSet;
+import android.util.Log;
+
+import com.wireguard.android.Application;
+import com.wireguard.android.R;
+import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.FragmentUtils;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Preference implementing a button that asynchronously exports logs.
+ */
+
+public class LogExporterPreference extends Preference {
+    private static final String TAG = "WireGuard/" + LogExporterPreference.class.getSimpleName();
+
+    private String exportedFilePath;
+
+    public LogExporterPreference(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    private void exportLog() {
+        Application.getAsyncWorker().supplyAsync(() -> {
+            final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+            final File file = new File(path, "wireguard-log.txt");
+            if (!path.isDirectory() && !path.mkdirs())
+                throw new IOException("Cannot create output directory");
+
+            /* We would like to simply run `builder.redirectOutput(file);`, but this is API 26.
+             * Instead we have to do this dance, since logcat appends.
+             */
+            new FileOutputStream(file).close();
+
+            try {
+                final Process process = Runtime.getRuntime().exec(new String[]{
+                        "logcat", "-b", "all", "-d", "-v", "threadtime", "-f", file.getAbsolutePath(), "*:V"});
+                if (process.waitFor() != 0) {
+                    try (final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+                        final StringBuilder errors = new StringBuilder();
+                        errors.append("Unable to run logcat: ");
+                        String line;
+                        while ((line = reader.readLine()) != null)
+                            errors.append(line);
+                        throw new Exception(errors.toString());
+                    }
+                }
+            } catch (final Exception e) {
+                // noinspection ResultOfMethodCallIgnored
+                file.delete();
+                throw e;
+            }
+            return file.getAbsolutePath();
+        }).whenComplete(this::exportLogComplete);
+    }
+
+    private void exportLogComplete(final String filePath, final Throwable throwable) {
+        if (throwable != null) {
+            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String message = getContext().getString(R.string.log_export_error, error);
+            Log.e(TAG, message, throwable);
+            Snackbar.make(
+                    FragmentUtils.getPrefActivity(this).findViewById(android.R.id.content),
+                    message, Snackbar.LENGTH_LONG).show();
+            setEnabled(true);
+        } else {
+            exportedFilePath = filePath;
+            notifyChanged();
+        }
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return exportedFilePath == null ?
+                getContext().getString(R.string.log_export_summary) :
+                getContext().getString(R.string.log_export_success, exportedFilePath);
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return getContext().getString(R.string.log_exporter_title);
+    }
+
+    @Override
+    protected void onClick() {
+        FragmentUtils.getPrefActivity(this).ensurePermissions(
+                new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                (permissions, granted) -> {
+                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED) {
+                        setEnabled(false);
+                        exportLog();
+                    }
+                });
+    }
+
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.preference;
@@ -9,13 +9,10 @@ package com.wireguard.android.preference;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.preference.Preference;
-import android.system.OsConstants;
 import android.util.AttributeSet;

 import com.wireguard.android.Application;
-import com.wireguard.android.Application.ApplicationComponent;
 import com.wireguard.android.R;
-import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.ToolsInstaller;

 /**
@@ -24,16 +21,10 @@ import com.wireguard.android.util.ToolsInstaller;
 */

 public class ToolsInstallerPreference extends Preference {
-    private final AsyncWorker asyncWorker;
-    private final ToolsInstaller toolsInstaller;
    private State state = State.INITIAL;

-    @SuppressWarnings({"SameParameterValue", "WeakerAccess"})
    public ToolsInstallerPreference(final Context context, final AttributeSet attrs) {
        super(context, attrs);
-        final ApplicationComponent applicationComponent = Application.getComponent();
-        asyncWorker = applicationComponent.getAsyncWorker();
-        toolsInstaller = applicationComponent.getToolsInstaller();
    }

    @Override
@@ -49,31 +40,37 @@ public class ToolsInstallerPreference extends Preference {
    @Override
    public void onAttached() {
        super.onAttached();
-        asyncWorker.supplyAsync(toolsInstaller::areInstalled).whenComplete(this::onCheckResult);
+        Application.getAsyncWorker().supplyAsync(Application.getToolsInstaller()::areInstalled).whenComplete(this::onCheckResult);
    }

-    private void onCheckResult(final Integer result, final Throwable throwable) {
-        setState(throwable == null && result == OsConstants.EALREADY ?
-                State.ALREADY : State.INITIAL);
+    private void onCheckResult(final int state, final Throwable throwable) {
+        if (throwable != null || state == ToolsInstaller.ERROR)
+            setState(State.INITIAL);
+        else if ((state & ToolsInstaller.YES) == ToolsInstaller.YES)
+            setState(State.ALREADY);
+        else if ((state & (ToolsInstaller.MAGISK | ToolsInstaller.NO)) == (ToolsInstaller.MAGISK | ToolsInstaller.NO))
+            setState(State.INITIAL_MAGISK);
+        else if ((state & (ToolsInstaller.SYSTEM | ToolsInstaller.NO)) == (ToolsInstaller.SYSTEM | ToolsInstaller.NO))
+            setState(State.INITIAL_SYSTEM);
+        else
+            setState(State.INITIAL);
    }

    @Override
    protected void onClick() {
        setState(State.WORKING);
-        asyncWorker.supplyAsync(toolsInstaller::install).whenComplete(this::onInstallResult);
+        Application.getAsyncWorker().supplyAsync(Application.getToolsInstaller()::install).whenComplete(this::onInstallResult);
    }

    private void onInstallResult(final Integer result, final Throwable throwable) {
-        final State nextState;
        if (throwable != null)
-            nextState = State.FAILURE;
-        else if (result == OsConstants.EXIT_SUCCESS)
-            nextState = State.SUCCESS;
-        else if (result == OsConstants.EALREADY)
-            nextState = State.ALREADY;
+            setState(State.FAILURE);
+        else if ((result & (ToolsInstaller.YES | ToolsInstaller.MAGISK)) == (ToolsInstaller.YES | ToolsInstaller.MAGISK))
+            setState(State.SUCCESS_MAGISK);
+        else if ((result & (ToolsInstaller.YES | ToolsInstaller.SYSTEM)) == (ToolsInstaller.YES | ToolsInstaller.SYSTEM))
+            setState(State.SUCCESS_SYSTEM);
        else
-            nextState = State.FAILURE;
-        setState(nextState);
+            setState(State.FAILURE);
    }

    private void setState(@NonNull final State state) {
@@ -86,11 +83,14 @@ public class ToolsInstallerPreference extends Preference {
    }

    private enum State {
+        INITIAL(R.string.tools_installer_initial, true),
        ALREADY(R.string.tools_installer_already, false),
        FAILURE(R.string.tools_installer_failure, true),
-        INITIAL(R.string.tools_installer_initial, true),
-        SUCCESS(R.string.tools_installer_success, false),
-        WORKING(R.string.tools_installer_working, false);
+        WORKING(R.string.tools_installer_working, false),
+        INITIAL_SYSTEM(R.string.tools_installer_initial_system, true),
+        SUCCESS_SYSTEM(R.string.tools_installer_success_system, false),
+        INITIAL_MAGISK(R.string.tools_installer_initial_magisk, true),
+        SUCCESS_MAGISK(R.string.tools_installer_success_magisk, false);

        private final int messageResourceId;
        private final boolean shouldEnableView;
@@ -0,0 +1,55 @@
+/*
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.preference;
+
+import android.content.ActivityNotFoundException;
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.support.v7.preference.Preference;
+import android.util.AttributeSet;
+
+import com.wireguard.android.Application;
+import com.wireguard.android.BuildConfig;
+import com.wireguard.android.R;
+
+public class VersionPreference extends Preference {
+    private String versionSummary;
+
+    public VersionPreference(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+
+        Application.onHaveBackend(backend -> {
+            versionSummary = getContext().getString(R.string.version_summary_checking, backend.getTypeName().toLowerCase());
+            Application.getAsyncWorker().supplyAsync(backend::getVersion).whenComplete((version, exception) -> {
+                versionSummary = exception == null
+                        ? getContext().getString(R.string.version_summary, backend.getTypeName(), version)
+                        : getContext().getString(R.string.version_summary_unknown, backend.getTypeName().toLowerCase());
+                notifyChanged();
+            });
+        });
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return versionSummary;
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return getContext().getString(R.string.version_title, BuildConfig.VERSION_NAME);
+    }
+
+    @Override
+    protected void onClick() {
+        final Intent intent = new Intent(Intent.ACTION_VIEW);
+        intent.setData(Uri.parse("https://www.wireguard.com/"));
+        try {
+            getContext().startActivity(intent);
+        } catch (final ActivityNotFoundException ignored) { }
+    }
+
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.preference;
@@ -14,16 +14,12 @@ import android.support.design.widget.Snackbar;
 import android.support.v7.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.ContextThemeWrapper;

 import com.wireguard.android.Application;
-import com.wireguard.android.Application.ApplicationComponent;
 import com.wireguard.android.R;
-import com.wireguard.android.activity.SettingsActivity;
 import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.FragmentUtils;
 import com.wireguard.config.Config;

 import java.io.File;
@@ -44,30 +40,14 @@ import java9.util.concurrent.CompletableFuture;
 public class ZipExporterPreference extends Preference {
    private static final String TAG = "WireGuard/" + ZipExporterPreference.class.getSimpleName();

-    private final AsyncWorker asyncWorker;
-    private final TunnelManager tunnelManager;
    private String exportedFilePath;

-    @SuppressWarnings({"SameParameterValue", "WeakerAccess"})
    public ZipExporterPreference(final Context context, final AttributeSet attrs) {
        super(context, attrs);
-        final ApplicationComponent applicationComponent = Application.getComponent();
-        asyncWorker = applicationComponent.getAsyncWorker();
-        tunnelManager = applicationComponent.getTunnelManager();
-    }
-
-    private static SettingsActivity getPrefActivity(final Preference preference) {
-        final Context context = preference.getContext();
-        if (context instanceof ContextThemeWrapper) {
-            if (((ContextThemeWrapper) context).getBaseContext() instanceof SettingsActivity) {
-                return ((SettingsActivity) ((ContextThemeWrapper) context).getBaseContext());
-            }
-        }
-        return null;
    }

    private void exportZip() {
-        final List<Tunnel> tunnels = new ArrayList<>(tunnelManager.getTunnels());
+        final List<Tunnel> tunnels = new ArrayList<>(Application.getTunnelManager().getTunnels());
        final List<CompletableFuture<Config>> futureConfigs = new ArrayList<>(tunnels.size());
        for (final Tunnel tunnel : tunnels)
            futureConfigs.add(tunnel.getConfigAsync().toCompletableFuture());
@@ -76,7 +56,7 @@ public class ZipExporterPreference extends Preference {
            return;
        }
        CompletableFuture.allOf(futureConfigs.toArray(new CompletableFuture[futureConfigs.size()]))
-                .whenComplete((ignored1, exception) -> asyncWorker.supplyAsync(() -> {
+                .whenComplete((ignored1, exception) -> Application.getAsyncWorker().supplyAsync(() -> {
                    if (exception != null)
                        throw exception;
                    final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
@@ -90,8 +70,7 @@ public class ZipExporterPreference extends Preference {
                                    toString().getBytes(StandardCharsets.UTF_8));
                        }
                        zip.closeEntry();
-                        zip.close();
-                    } catch (Exception e) {
+                    } catch (final Exception e) {
                        // noinspection ResultOfMethodCallIgnored
                        file.delete();
                        throw e;
@@ -103,14 +82,14 @@ public class ZipExporterPreference extends Preference {
    private void exportZipComplete(final String filePath, final Throwable throwable) {
        if (throwable != null) {
            final String error = ExceptionLoggers.unwrapMessage(throwable);
-            final String message = getContext().getString(R.string.export_error, error);
+            final String message = getContext().getString(R.string.zip_export_error, error);
            Log.e(TAG, message, throwable);
            Snackbar.make(
-                    getPrefActivity(this).findViewById(android.R.id.content),
+                    FragmentUtils.getPrefActivity(this).findViewById(android.R.id.content),
                    message, Snackbar.LENGTH_LONG).show();
+            setEnabled(true);
        } else {
            exportedFilePath = filePath;
-            setEnabled(false);
            notifyChanged();
        }
    }
@@ -118,8 +97,8 @@ public class ZipExporterPreference extends Preference {
    @Override
    public CharSequence getSummary() {
        return exportedFilePath == null ?
-                getContext().getString(R.string.export_summary) :
-                getContext().getString(R.string.export_success, exportedFilePath);
+                getContext().getString(R.string.zip_export_summary) :
+                getContext().getString(R.string.zip_export_success, exportedFilePath);
    }

    @Override
@@ -129,11 +108,13 @@ public class ZipExporterPreference extends Preference {

    @Override
    protected void onClick() {
-        getPrefActivity(this).ensurePermissions(
+        FragmentUtils.getPrefActivity(this).ensurePermissions(
                new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
                (permissions, granted) -> {
-                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED)
+                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED) {
+                        setEnabled(false);
                        exportZip();
+                    }
                });
    }

@@ -1,20 +1,15 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;

 import android.os.Handler;

-import com.wireguard.android.Application.ApplicationHandler;
-import com.wireguard.android.Application.ApplicationScope;
-
 import java.util.concurrent.Executor;

-import javax.inject.Inject;
-
 import java9.util.concurrent.CompletableFuture;
 import java9.util.concurrent.CompletionStage;

@@ -22,13 +17,11 @@ import java9.util.concurrent.CompletionStage;
 * Helper class for running asynchronous tasks and ensuring they are completed on the main thread.
 */

-@ApplicationScope
 public class AsyncWorker {
    private final Executor executor;
    private final Handler handler;

-    @Inject
-    AsyncWorker(final Executor executor, @ApplicationHandler final Handler handler) {
+    public AsyncWorker(final Executor executor, final Handler handler) {
        this.executor = executor;
        this.handler = handler;
    }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2018 Harsh Shandilya <msfjarvis@gmail.com>
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+package com.wireguard.android.util;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.view.ContextThemeWrapper;
+
+import com.wireguard.android.activity.SettingsActivity;
+
+public class FragmentUtils {
+
+    public static SettingsActivity getPrefActivity(final Preference preference) {
+        final Context context = preference.getContext();
+        if (context instanceof ContextThemeWrapper) {
+            if (((ContextThemeWrapper) context).getBaseContext() instanceof SettingsActivity) {
+                return ((SettingsActivity) ((ContextThemeWrapper) context).getBaseContext());
+            }
+        }
+        return null;
+    }
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;
@@ -9,6 +9,8 @@ package com.wireguard.android.util;
 import android.databinding.ObservableArrayList;
 import android.support.annotation.NonNull;

+import com.wireguard.util.Keyed;
+
 import java.util.Collection;
 import java.util.ListIterator;
 import java.util.Objects;
@@ -1,13 +1,16 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;

 import android.databinding.ObservableList;

+import com.wireguard.util.Keyed;
+import com.wireguard.util.KeyedList;
+
 /**
 * A list that is both keyed and observable.
 */
@@ -1,13 +1,16 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;

 import android.support.annotation.NonNull;

+import com.wireguard.util.Keyed;
+import com.wireguard.util.SortedKeyedList;
+
 import java.util.AbstractList;
 import java.util.Collection;
 import java.util.Collections;
@@ -1,11 +1,14 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;

+import com.wireguard.util.Keyed;
+import com.wireguard.util.SortedKeyedList;
+
 /**
 * A list that is both sorted/keyed and observable.
 */
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;
@@ -9,8 +9,6 @@ package com.wireguard.android.util;
 import android.content.Context;
 import android.util.Log;

-import com.wireguard.android.Application.ApplicationContext;
-import com.wireguard.android.Application.ApplicationScope;
 import com.wireguard.android.R;

 import java.io.BufferedReader;
@@ -23,13 +21,10 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.UUID;

-import javax.inject.Inject;
-
 /**
 * Helper class for running commands as root.
 */

-@ApplicationScope
 public class RootShell {
    private static final String SU = "su";
    private static final String TAG = "WireGuard/" + RootShell.class.getSimpleName();
@@ -44,8 +39,7 @@ public class RootShell {
    private OutputStreamWriter stdin;
    private BufferedReader stdout;

-    @Inject
-    public RootShell(@ApplicationContext final Context context) {
+    public RootShell(final Context context) {
        deviceNotRootedMessage = context.getString(R.string.error_root);
        final File cacheDir = context.getCacheDir();
        localBinaryDir = new File(cacheDir, "bin");
@@ -0,0 +1,75 @@
+/*
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.util;
+
+import android.content.Context;
+import android.os.Build;
+import android.util.Log;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+public final class SharedLibraryLoader {
+    private static final String TAG = "WireGuard/" + SharedLibraryLoader.class.getSimpleName();
+
+    private SharedLibraryLoader() {
+    }
+
+    public static void loadSharedLibrary(final Context context, final String libName) {
+        Throwable noAbiException;
+        try {
+            System.loadLibrary(libName);
+            return;
+        } catch (final UnsatisfiedLinkError e) {
+            Log.d(TAG, "Failed to load library normally, so attempting to extract from apk", e);
+            noAbiException = e;
+        }
+
+        final ZipFile zipFile;
+        try {
+            zipFile = new ZipFile(new File(context.getApplicationInfo().sourceDir), ZipFile.OPEN_READ);
+        } catch (final IOException e) {
+            throw new RuntimeException(e);
+        }
+
+        final String mappedLibName = System.mapLibraryName(libName);
+        final byte[] buffer = new byte[1024 * 32];
+        for (final String abi : Build.SUPPORTED_ABIS) {
+            final String libZipPath = "lib" + File.separatorChar + abi + File.separatorChar + mappedLibName;
+            final ZipEntry zipEntry = zipFile.getEntry(libZipPath);
+            if (zipEntry == null)
+                continue;
+            File f = null;
+            try {
+                f = File.createTempFile("lib", ".so", context.getCacheDir());
+                Log.d(TAG, "Extracting apk:/" + libZipPath + " to " + f.getAbsolutePath() + " and loading");
+                try (final FileOutputStream out = new FileOutputStream(f);
+                     final InputStream in = zipFile.getInputStream(zipEntry)) {
+                    int len;
+                    while ((len = in.read(buffer)) != -1) {
+                        out.write(buffer, 0, len);
+                    }
+                }
+                System.load(f.getAbsolutePath());
+                return;
+            } catch (final Exception e) {
+                Log.d(TAG, "Failed to load library apk:/" + libZipPath, e);
+                noAbiException = e;
+            } finally {
+                if (f != null)
+                    // noinspection ResultOfMethodCallIgnored
+                    f.delete();
+            }
+        }
+        if (noAbiException instanceof RuntimeException)
+            throw (RuntimeException) noAbiException;
+        throw new RuntimeException(noAbiException);
+    }
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;
@@ -10,8 +10,8 @@ import android.content.Context;
 import android.system.OsConstants;
 import android.util.Log;

-import com.wireguard.android.Application.ApplicationContext;
-import com.wireguard.android.Application.ApplicationScope;
+import com.wireguard.android.Application;
+import com.wireguard.android.BuildConfig;
 import com.wireguard.android.util.RootShell.NoRootException;

 import java.io.File;
@@ -20,14 +20,17 @@ import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;

-import javax.inject.Inject;
-
 /**
 * Helper to install WireGuard tools to the system partition.
 */

-@ApplicationScope
 public final class ToolsInstaller {
+    public static final int ERROR = 0x0;
+    public static final int YES = 0x1;
+    public static final int NO = 0x2;
+    public static final int MAGISK = 0x4;
+    public static final int SYSTEM = 0x8;
+
    private static final String[][] EXECUTABLES = {
            {"libwg.so", "wg"},
            {"libwg-quick.so", "wg-quick"},
@@ -42,14 +45,12 @@ public final class ToolsInstaller {
    private final File localBinaryDir;
    private final Object lock = new Object();
    private final File nativeLibraryDir;
-    private final RootShell rootShell;
    private Boolean areToolsAvailable;
+    private Boolean installAsMagiskModule;

-    @Inject
-    public ToolsInstaller(@ApplicationContext final Context context, final RootShell rootShell) {
+    public ToolsInstaller(final Context context) {
        localBinaryDir = new File(context.getCacheDir(), "bin");
        nativeLibraryDir = new File(context.getApplicationInfo().nativeLibraryDir);
-        this.rootShell = rootShell;
    }

    private static File getInstallDir() {
@@ -57,15 +58,16 @@ public final class ToolsInstaller {
        if (path == null)
            return INSTALL_DIRS[0];
        final List<String> paths = Arrays.asList(path.split(":"));
-        for (final File dir : INSTALL_DIRS)
+        for (final File dir : INSTALL_DIRS) {
            if (paths.contains(dir.getPath()) && dir.isDirectory())
                return dir;
+        }
        return null;
    }

    public int areInstalled() throws NoRootException {
        if (INSTALL_DIR == null)
-            return OsConstants.ENOENT;
+            return ERROR;
        final StringBuilder script = new StringBuilder();
        for (final String[] names : EXECUTABLES) {
            script.append(String.format("cmp -s '%s' '%s' && ",
@@ -74,9 +76,13 @@ public final class ToolsInstaller {
        }
        script.append("exit ").append(OsConstants.EALREADY).append(';');
        try {
-            return rootShell.run(null, script.toString());
+            final int ret = Application.getRootShell().run(null, script.toString());
+            if (ret == OsConstants.EALREADY)
+                return willInstallAsMagiskModule() ? YES | MAGISK : YES | SYSTEM;
+            else
+                return willInstallAsMagiskModule() ? NO | MAGISK : NO | SYSTEM;
        } catch (final IOException ignored) {
-            return OsConstants.EXIT_FAILURE;
+            return ERROR;
        }
    }

@@ -100,7 +106,20 @@ public final class ToolsInstaller {
        }
    }

-    public int install() throws NoRootException {
+    private boolean willInstallAsMagiskModule() {
+        synchronized (lock) {
+            if (installAsMagiskModule == null) {
+                try {
+                    installAsMagiskModule = Application.getRootShell().run(null, "[ -d /sbin/.core/mirror -a -d /sbin/.core/img -a ! -f /cache/.disable_magisk ]") == OsConstants.EXIT_SUCCESS;
+                } catch (final Exception ignored) {
+                    installAsMagiskModule = false;
+                }
+            }
+            return installAsMagiskModule;
+        }
+    }
+
+    private int installSystem() throws NoRootException {
        if (INSTALL_DIR == null)
            return OsConstants.ENOENT;
        final StringBuilder script = new StringBuilder("set -ex; ");
@@ -111,12 +130,37 @@ public final class ToolsInstaller {
                    new File(nativeLibraryDir, names[0]), destination, destination, destination));
        }
        try {
-            return rootShell.run(null, script.toString());
+            return Application.getRootShell().run(null, script.toString()) == 0 ? YES | SYSTEM : ERROR;
        } catch (final IOException ignored) {
-            return OsConstants.EXIT_FAILURE;
+            return ERROR;
        }
    }

+    private int installMagisk() throws NoRootException {
+        final StringBuilder script = new StringBuilder("set -ex; ");
+
+        script.append("trap 'rm -rf /sbin/.core/img/wireguard' INT TERM EXIT; ");
+        script.append(String.format("rm -rf /sbin/.core/img/wireguard/; mkdir -p /sbin/.core/img/wireguard%s; ", INSTALL_DIR));
+        script.append(String.format("printf 'name=WireGuard Command Line Tools\nversion=%s\nversionCode=%s\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.core/img/wireguard/module.prop; ", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
+        script.append("touch /sbin/.core/img/wireguard/auto_mount; ");
+        for (final String[] names : EXECUTABLES) {
+            final File destination = new File("/sbin/.core/img/wireguard" + INSTALL_DIR, names[1]);
+            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; restorecon '%s' || true; ",
+                    new File(nativeLibraryDir, names[0]), destination, destination, destination));
+        }
+        script.append("trap - INT TERM EXIT;");
+
+        try {
+            return Application.getRootShell().run(null, script.toString()) == 0 ? YES | MAGISK : ERROR;
+        } catch (final IOException ignored) {
+            return ERROR;
+        }
+    }
+
+    public int install() throws NoRootException {
+        return willInstallAsMagiskModule() ? installMagisk() : installSystem();
+    }
+
    public int symlink() throws NoRootException {
        final StringBuilder script = new StringBuilder("set -x; ");
        for (final String[] names : EXECUTABLES) {
@@ -134,7 +178,7 @@ public final class ToolsInstaller {
        script.append("exit ").append(OsConstants.EXIT_SUCCESS).append(';');

        try {
-            return rootShell.run(null, script.toString());
+            return Application.getRootShell().run(null, script.toString());
        } catch (final IOException ignored) {
            return OsConstants.EXIT_FAILURE;
        }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.widget;
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.widget;
@@ -0,0 +1,97 @@
+/*
+ * Copyright © 2014 Jerzy Chalupski
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.widget.fab;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.shapes.Shape;
+import android.support.annotation.ColorRes;
+import android.support.annotation.DrawableRes;
+import android.support.v4.content.ContextCompat;
+import android.util.AttributeSet;
+
+import com.wireguard.android.R;
+
+public class AddFloatingActionButton extends FloatingActionButton {
+    int mPlusColor;
+
+    public AddFloatingActionButton(final Context context) {
+        this(context, null);
+    }
+
+    public AddFloatingActionButton(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public AddFloatingActionButton(final Context context, final AttributeSet attrs, final int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    void init(final Context context, final AttributeSet attributeSet) {
+        final TypedArray attr = context.obtainStyledAttributes(attributeSet, R.styleable.AddFloatingActionButton, 0, 0);
+        mPlusColor = attr.getColor(R.styleable.AddFloatingActionButton_fab_plusIconColor, FloatingActionButton.getColorFromTheme(context, android.R.attr.colorBackground, android.R.color.white));
+        attr.recycle();
+
+        super.init(context, attributeSet);
+    }
+
+    /**
+     * @return the current Color of plus icon.
+     */
+    public int getPlusColor() {
+        return mPlusColor;
+    }
+
+    public void setPlusColor(final int color) {
+        if (mPlusColor != color) {
+            mPlusColor = color;
+            updateBackground();
+        }
+    }
+
+    public void setPlusColorResId(@ColorRes final int plusColor) {
+        setPlusColor(ContextCompat.getColor(getContext(), plusColor));
+    }
+
+    @Override
+    public void setIcon(@DrawableRes final int icon) {
+        throw new UnsupportedOperationException("Use FloatingActionButton if you want to use custom icon");
+    }
+
+    @Override
+    Drawable getIconDrawable() {
+        final float iconSize = getDimension(R.dimen.fab_icon_size);
+        final float iconHalfSize = iconSize / 2f;
+
+        final float plusSize = getDimension(R.dimen.fab_plus_icon_size);
+        final float plusHalfStroke = getDimension(R.dimen.fab_plus_icon_stroke) / 2f;
+        final float plusOffset = (iconSize - plusSize) / 2f;
+
+        final Shape shape = new Shape() {
+            @Override
+            public void draw(final Canvas canvas, final Paint paint) {
+                canvas.drawRect(plusOffset, iconHalfSize - plusHalfStroke, iconSize - plusOffset, iconHalfSize + plusHalfStroke, paint);
+                canvas.drawRect(iconHalfSize - plusHalfStroke, plusOffset, iconHalfSize + plusHalfStroke, iconSize - plusOffset, paint);
+            }
+        };
+
+        final ShapeDrawable drawable = new ShapeDrawable(shape);
+
+        final Paint paint = drawable.getPaint();
+        paint.setColor(mPlusColor);
+        paint.setStyle(Style.FILL);
+        paint.setAntiAlias(true);
+
+        return drawable;
+    }
+}
@@ -0,0 +1,446 @@
+/*
+ * Copyright © 2014 Jerzy Chalupski
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.widget.fab;
+
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
+import android.graphics.Paint.Style;
+import android.graphics.Rect;
+import android.graphics.Shader;
+import android.graphics.Shader.TileMode;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.ShapeDrawable;
+import android.graphics.drawable.ShapeDrawable.ShaderFactory;
+import android.graphics.drawable.StateListDrawable;
+import android.graphics.drawable.shapes.OvalShape;
+import android.support.annotation.ColorRes;
+import android.support.annotation.DimenRes;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.AppCompatImageButton;
+import android.util.AttributeSet;
+import android.widget.TextView;
+
+import com.wireguard.android.R;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+
+public class FloatingActionButton extends AppCompatImageButton {
+
+    public static final int SIZE_NORMAL = 0;
+    public static final int SIZE_MINI = 1;
+    int mColorNormal;
+    int mColorPressed;
+    int mColorDisabled;
+    String mTitle;
+    boolean mStrokeVisible;
+    @DrawableRes
+    private int mIcon;
+    private Drawable mIconDrawable;
+    private int mSize;
+
+    private float mCircleSize;
+    private float mShadowRadius;
+    private float mShadowOffset;
+    private int mDrawableSize;
+    public FloatingActionButton(final Context context) {
+        this(context, null);
+    }
+
+    public FloatingActionButton(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public FloatingActionButton(final Context context, final AttributeSet attrs, final int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    public static int getColorFromTheme(final Context context, final int themeResource, @ColorRes final int fallback) {
+        final TypedArray a = context.obtainStyledAttributes(new int[]{themeResource});
+        try {
+            return a.getColor(0, ContextCompat.getColor(context, fallback));
+        } finally {
+            a.recycle();
+        }
+    }
+
+    void init(final Context context, final AttributeSet attributeSet) {
+        final TypedArray attr = context.obtainStyledAttributes(attributeSet,
+                R.styleable.FloatingActionButton, 0, 0);
+        mColorNormal = attr.getColor(R.styleable.FloatingActionButton_fab_colorNormal,
+                getColorFromTheme(context, android.R.attr.colorAccent, android.R.color.holo_blue_bright));
+        mColorPressed = attr.getColor(R.styleable.FloatingActionButton_fab_colorPressed,
+                darkenOrLightenColor(mColorNormal)); //TODO(msf): use getColorForState on the accent color from theme instead to get darker states
+        mColorDisabled = attr.getColor(R.styleable.FloatingActionButton_fab_colorDisabled,
+                ContextCompat.getColor(context, android.R.color.darker_gray)); //TODO(msf): load from theme
+        mSize = attr.getInt(R.styleable.FloatingActionButton_fab_size, SIZE_NORMAL);
+        mIcon = attr.getResourceId(R.styleable.FloatingActionButton_fab_icon, 0);
+        mTitle = attr.getString(R.styleable.FloatingActionButton_fab_title);
+        mStrokeVisible = attr.getBoolean(R.styleable.FloatingActionButton_fab_stroke_visible, true);
+        attr.recycle();
+
+        updateCircleSize();
+        mShadowRadius = getDimension(R.dimen.fab_shadow_radius);
+        mShadowOffset = getDimension(R.dimen.fab_shadow_offset);
+        updateDrawableSize();
+
+        updateBackground();
+    }
+
+    private void updateDrawableSize() {
+        mDrawableSize = (int) (mCircleSize + 2 * mShadowRadius);
+    }
+
+    private void updateCircleSize() {
+        mCircleSize = getDimension(mSize == SIZE_NORMAL ? R.dimen.fab_size_normal : R.dimen.fab_size_mini);
+    }
+
+    @FAB_SIZE
+    public int getSize() {
+        return mSize;
+    }
+
+    public void setSize(@FAB_SIZE final int size) {
+        if (size != SIZE_MINI && size != SIZE_NORMAL) {
+            throw new IllegalArgumentException("Use @FAB_SIZE constants only!");
+        }
+
+        if (mSize != size) {
+            mSize = size;
+            updateCircleSize();
+            updateDrawableSize();
+            updateBackground();
+        }
+    }
+
+    public void setIcon(@DrawableRes final int icon) {
+        if (mIcon != icon) {
+            mIcon = icon;
+            mIconDrawable = null;
+            updateBackground();
+        }
+    }
+
+    /**
+     * @return the current Color for normal state.
+     */
+    public int getColorNormal() {
+        return mColorNormal;
+    }
+
+    public void setColorNormal(final int color) {
+        if (mColorNormal != color) {
+            mColorNormal = color;
+            updateBackground();
+        }
+    }
+
+    public void setColorNormalResId(@ColorRes final int colorNormal) {
+        setColorNormal(ContextCompat.getColor(getContext(), colorNormal));
+    }
+
+    /**
+     * @return the current color for pressed state.
+     */
+    public int getColorPressed() {
+        return mColorPressed;
+    }
+
+    public void setColorPressed(final int color) {
+        if (mColorPressed != color) {
+            mColorPressed = color;
+            updateBackground();
+        }
+    }
+
+    public void setColorPressedResId(@ColorRes final int colorPressed) {
+        setColorPressed(ContextCompat.getColor(getContext(), colorPressed));
+    }
+
+    /**
+     * @return the current color for disabled state.
+     */
+    public int getColorDisabled() {
+        return mColorDisabled;
+    }
+
+    public void setColorDisabled(final int color) {
+        if (mColorDisabled != color) {
+            mColorDisabled = color;
+            updateBackground();
+        }
+    }
+
+    public void setColorDisabledResId(@ColorRes final int colorDisabled) {
+        setColorDisabled(ContextCompat.getColor(getContext(), colorDisabled));
+    }
+
+    public boolean isStrokeVisible() {
+        return mStrokeVisible;
+    }
+
+    public void setStrokeVisible(final boolean visible) {
+        if (mStrokeVisible != visible) {
+            mStrokeVisible = visible;
+            updateBackground();
+        }
+    }
+
+    float getDimension(@DimenRes final int id) {
+        return getResources().getDimension(id);
+    }
+
+    TextView getLabelView() {
+        return (TextView) getTag(R.id.fab_label);
+    }
+
+    public String getTitle() {
+        return mTitle;
+    }
+
+    public void setTitle(final String title) {
+        mTitle = title;
+        final TextView label = getLabelView();
+        if (label != null) {
+            label.setText(title);
+        }
+    }
+
+    @Override
+    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+        setMeasuredDimension(mDrawableSize, mDrawableSize);
+    }
+
+    void updateBackground() {
+        final float strokeWidth = getDimension(R.dimen.fab_stroke_width);
+        final float halfStrokeWidth = strokeWidth / 2f;
+
+        final LayerDrawable layerDrawable = new LayerDrawable(
+                new Drawable[]{
+                        //TODO(msf); replace these pngs with programatic elevation
+                        getResources().getDrawable(mSize == SIZE_NORMAL ? R.drawable.fab_bg_normal : R.drawable.fab_bg_mini, null),
+                        createFillDrawable(strokeWidth),
+                        createOuterStrokeDrawable(strokeWidth),
+                        getIconDrawable()
+                });
+
+        final int iconOffset = (int) (mCircleSize - getDimension(R.dimen.fab_icon_size)) / 2;
+
+        final int circleInsetHorizontal = (int) (mShadowRadius);
+        final int circleInsetTop = (int) (mShadowRadius - mShadowOffset);
+        final int circleInsetBottom = (int) (mShadowRadius + mShadowOffset);
+
+        layerDrawable.setLayerInset(1,
+                circleInsetHorizontal,
+                circleInsetTop,
+                circleInsetHorizontal,
+                circleInsetBottom);
+
+        layerDrawable.setLayerInset(2,
+                (int) (circleInsetHorizontal - halfStrokeWidth),
+                (int) (circleInsetTop - halfStrokeWidth),
+                (int) (circleInsetHorizontal - halfStrokeWidth),
+                (int) (circleInsetBottom - halfStrokeWidth));
+
+        layerDrawable.setLayerInset(3,
+                circleInsetHorizontal + iconOffset,
+                circleInsetTop + iconOffset,
+                circleInsetHorizontal + iconOffset,
+                circleInsetBottom + iconOffset);
+
+        setBackground(layerDrawable);
+    }
+
+    Drawable getIconDrawable() {
+        if (mIconDrawable != null) {
+            return mIconDrawable;
+        } else if (mIcon != 0) {
+            return ContextCompat.getDrawable(getContext(), mIcon);
+        } else {
+            return new ColorDrawable(Color.TRANSPARENT);
+        }
+    }
+
+    public void setIconDrawable(@NonNull final Drawable iconDrawable) {
+        if (mIconDrawable != iconDrawable) {
+            mIcon = 0;
+            mIconDrawable = iconDrawable;
+            updateBackground();
+        }
+    }
+
+    private StateListDrawable createFillDrawable(final float strokeWidth) {
+        final StateListDrawable drawable = new StateListDrawable();
+        drawable.addState(new int[]{-android.R.attr.state_enabled}, createCircleDrawable(mColorDisabled, strokeWidth));
+        drawable.addState(new int[]{android.R.attr.state_pressed}, createCircleDrawable(mColorPressed, strokeWidth));
+        drawable.addState(new int[]{}, createCircleDrawable(mColorNormal, strokeWidth));
+        return drawable;
+    }
+
+    private Drawable createCircleDrawable(final int color, final float strokeWidth) {
+        final int alpha = Color.alpha(color);
+        final int opaqueColor = opaque(color);
+
+        final ShapeDrawable fillDrawable = new ShapeDrawable(new OvalShape());
+
+        final Paint paint = fillDrawable.getPaint();
+        paint.setAntiAlias(true);
+        paint.setColor(opaqueColor);
+
+        final Drawable[] layers = {
+                fillDrawable,
+                createInnerStrokesDrawable(opaqueColor, strokeWidth)
+        };
+
+        final LayerDrawable drawable = alpha == 255 || !mStrokeVisible
+                ? new LayerDrawable(layers)
+                : new TranslucentLayerDrawable(alpha, layers);
+
+        final int halfStrokeWidth = (int) (strokeWidth / 2f);
+        drawable.setLayerInset(1, halfStrokeWidth, halfStrokeWidth, halfStrokeWidth, halfStrokeWidth);
+
+        return drawable;
+    }
+
+    private static Drawable createOuterStrokeDrawable(final float strokeWidth) {
+        final ShapeDrawable shapeDrawable = new ShapeDrawable(new OvalShape());
+
+        final Paint paint = shapeDrawable.getPaint();
+        paint.setAntiAlias(true);
+        paint.setStrokeWidth(strokeWidth);
+        paint.setStyle(Style.STROKE);
+        paint.setColor(Color.BLACK);
+        paint.setAlpha(opacityToAlpha(0.02f));
+
+        return shapeDrawable;
+    }
+
+    private static int opacityToAlpha(final float opacity) {
+        return (int) (255f * opacity);
+    }
+
+    private static int darkenColor(final int argb) {
+        return adjustColorBrightness(argb, 0.9f);
+    }
+
+    private static int lightenColor(final int argb) {
+        return adjustColorBrightness(argb, 1.1f);
+    }
+
+    public static int darkenOrLightenColor(final int argb) {
+        final float[] hsv = new float[3];
+        Color.colorToHSV(argb, hsv);
+        final float factor;
+        if (hsv[2] < 0.2)
+            factor = 1.2f;
+        else
+            factor = 0.8f;
+
+        hsv[2] = Math.min(hsv[2] * factor, 1f);
+        return Color.HSVToColor(Color.alpha(argb), hsv);
+    }
+
+    private static int adjustColorBrightness(final int argb, final float factor) {
+        final float[] hsv = new float[3];
+        Color.colorToHSV(argb, hsv);
+
+        hsv[2] = Math.min(hsv[2] * factor, 1f);
+
+        return Color.HSVToColor(Color.alpha(argb), hsv);
+    }
+
+    private static int halfTransparent(final int argb) {
+        return Color.argb(
+                Color.alpha(argb) / 2,
+                Color.red(argb),
+                Color.green(argb),
+                Color.blue(argb)
+        );
+    }
+
+    private static int opaque(final int argb) {
+        return Color.rgb(
+                Color.red(argb),
+                Color.green(argb),
+                Color.blue(argb)
+        );
+    }
+
+    private Drawable createInnerStrokesDrawable(final int color, final float strokeWidth) {
+        if (!mStrokeVisible) {
+            return new ColorDrawable(Color.TRANSPARENT);
+        }
+
+        final ShapeDrawable shapeDrawable = new ShapeDrawable(new OvalShape());
+
+        final int bottomStrokeColor = darkenColor(color);
+        final int bottomStrokeColorHalfTransparent = halfTransparent(bottomStrokeColor);
+        final int topStrokeColor = lightenColor(color);
+        final int topStrokeColorHalfTransparent = halfTransparent(topStrokeColor);
+
+        final Paint paint = shapeDrawable.getPaint();
+        paint.setAntiAlias(true);
+        paint.setStrokeWidth(strokeWidth);
+        paint.setStyle(Style.STROKE);
+        shapeDrawable.setShaderFactory(new ShaderFactory() {
+            @Override
+            public Shader resize(int width, int height) {
+                return new LinearGradient(width / 2, 0, width / 2, height,
+                        new int[]{topStrokeColor, topStrokeColorHalfTransparent, color, bottomStrokeColorHalfTransparent, bottomStrokeColor},
+                        new float[]{0f, 0.2f, 0.5f, 0.8f, 1f},
+                        TileMode.CLAMP
+                );
+            }
+        });
+
+        return shapeDrawable;
+    }
+
+    @Override
+    public void setVisibility(final int visibility) {
+        final TextView label = getLabelView();
+        if (label != null) {
+            label.setVisibility(visibility);
+        }
+
+        super.setVisibility(visibility);
+    }
+
+    @Retention(RetentionPolicy.SOURCE)
+    @IntDef({SIZE_NORMAL, SIZE_MINI})
+    public @interface FAB_SIZE {
+    }
+
+    private static final class TranslucentLayerDrawable extends LayerDrawable {
+        private final int mAlpha;
+
+        private TranslucentLayerDrawable(final int alpha, final Drawable... layers) {
+            super(layers);
+            mAlpha = alpha;
+        }
+
+        @Override
+        public void draw(final Canvas canvas) {
+            final Rect bounds = getBounds();
+            canvas.saveLayerAlpha(bounds.left, bounds.top, bounds.right, bounds.bottom, mAlpha);
+            super.draw(canvas);
+            canvas.restore();
+        }
+    }
+}
@@ -0,0 +1,638 @@
+/*
+ * Copyright © 2014 Jerzy Chalupski
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.widget.fab;
+
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.AnimatorSet;
+import android.animation.ObjectAnimator;
+import android.animation.TimeInterpolator;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.Canvas;
+import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.os.Build;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.support.annotation.Keep;
+import android.support.annotation.NonNull;
+import android.support.v7.widget.AppCompatTextView;
+import android.util.AttributeSet;
+import android.view.ContextThemeWrapper;
+import android.view.TouchDelegate;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.animation.DecelerateInterpolator;
+import android.view.animation.OvershootInterpolator;
+import android.widget.TextView;
+
+import com.wireguard.android.R;
+
+@SuppressWarnings("ReturnOfInnerClass")
+public class FloatingActionsMenu extends ViewGroup {
+    public static final int EXPAND_UP = 0;
+    public static final int EXPAND_DOWN = 1;
+    public static final int EXPAND_LEFT = 2;
+    public static final int EXPAND_RIGHT = 3;
+
+    public static final int LABELS_ON_LEFT_SIDE = 0;
+    public static final int LABELS_ON_RIGHT_SIDE = 1;
+
+    private static final int ANIMATION_DURATION = 300;
+    private static final float COLLAPSED_PLUS_ROTATION = 0f;
+    private static final float EXPANDED_PLUS_ROTATION = 90f + 45f;
+    private static final TimeInterpolator EXPAND_INTERPOLATOR = new OvershootInterpolator();
+    private static final TimeInterpolator COLLAPSE_INTERPOLATOR = new DecelerateInterpolator(3f);
+    private static final TimeInterpolator ALPHA_EXPAND_INTERPOLATOR = new DecelerateInterpolator();
+    private int mAddButtonPlusColor;
+    private int mAddButtonColorNormal;
+    private int mAddButtonColorPressed;
+    private int mAddButtonSize;
+    private boolean mAddButtonStrokeVisible;
+    private int mExpandDirection;
+    private int mButtonSpacing;
+    private int mLabelsMargin;
+    private int mLabelsVerticalOffset;
+    private boolean mExpanded;
+    private final AnimatorSet mExpandAnimation = new AnimatorSet().setDuration(ANIMATION_DURATION);
+    private final AnimatorSet mCollapseAnimation = new AnimatorSet().setDuration(ANIMATION_DURATION);
+    private AddFloatingActionButton mAddButton;
+    private RotatingDrawable mRotatingDrawable;
+    private int mMaxButtonWidth;
+    private int mMaxButtonHeight;
+    private int mLabelsStyle;
+    private int mLabelsPosition;
+    private int mButtonsCount;
+    private TouchDelegateGroup mTouchDelegateGroup;
+    private OnFloatingActionsMenuUpdateListener mListener;
+    private final Rect touchArea = new Rect(0, 0, 0, 0);
+
+    public FloatingActionsMenu(final Context context) {
+        this(context, null);
+    }
+
+    public FloatingActionsMenu(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+        init(context, attrs);
+    }
+
+    public FloatingActionsMenu(final Context context, final AttributeSet attrs, final int defStyle) {
+        super(context, attrs, defStyle);
+        init(context, attrs);
+    }
+
+    private void init(final Context context, final AttributeSet attributeSet) {
+        mButtonSpacing = (int) (getResources().getDimension(R.dimen.fab_actions_spacing) - getResources().getDimension(R.dimen.fab_shadow_radius) - getResources().getDimension(R.dimen.fab_shadow_offset));
+        mLabelsMargin = getResources().getDimensionPixelSize(R.dimen.fab_labels_margin);
+        mLabelsVerticalOffset = getResources().getDimensionPixelSize(R.dimen.fab_shadow_offset);
+
+        mTouchDelegateGroup = new TouchDelegateGroup(this);
+        setTouchDelegate(mTouchDelegateGroup);
+
+        final TypedArray attr = context.obtainStyledAttributes(attributeSet, R.styleable.FloatingActionsMenu, 0, 0);
+        mAddButtonPlusColor = attr.getColor(R.styleable.FloatingActionsMenu_fab_addButtonPlusIconColor,
+                FloatingActionButton.getColorFromTheme(context, android.R.attr.colorBackground, android.R.color.white));
+        mAddButtonColorNormal = attr.getColor(R.styleable.FloatingActionsMenu_fab_addButtonColorNormal,
+                FloatingActionButton.getColorFromTheme(context, android.R.attr.colorAccent, android.R.color.holo_blue_bright));
+        mAddButtonColorPressed = attr.getColor(R.styleable.FloatingActionsMenu_fab_addButtonColorPressed,
+                FloatingActionButton.darkenOrLightenColor(mAddButtonColorNormal)); //TODO(msf): use getColorForState on the accent color from theme instead to get darker states
+        mAddButtonSize = attr.getInt(R.styleable.FloatingActionsMenu_fab_addButtonSize, FloatingActionButton.SIZE_NORMAL);
+        mAddButtonStrokeVisible = attr.getBoolean(R.styleable.FloatingActionsMenu_fab_addButtonStrokeVisible, true);
+        mExpandDirection = attr.getInt(R.styleable.FloatingActionsMenu_fab_expandDirection, EXPAND_UP);
+        mLabelsStyle = attr.getResourceId(R.styleable.FloatingActionsMenu_fab_labelStyle, 0);
+        mLabelsPosition = attr.getInt(R.styleable.FloatingActionsMenu_fab_labelsPosition, LABELS_ON_LEFT_SIDE);
+        attr.recycle();
+
+        if (mLabelsStyle != 0 && expandsHorizontally()) {
+            throw new IllegalStateException("Action labels in horizontal expand orientation is not supported.");
+        }
+
+        createAddButton(context);
+    }
+
+    public void setOnFloatingActionsMenuUpdateListener(final OnFloatingActionsMenuUpdateListener listener) {
+        mListener = listener;
+    }
+
+    private boolean expandsHorizontally() {
+        return mExpandDirection == EXPAND_LEFT || mExpandDirection == EXPAND_RIGHT;
+    }
+
+    private void createAddButton(final Context context) {
+        mAddButton = new AddFloatingActionButton(context) {
+            @Override
+            void updateBackground() {
+                mPlusColor = mAddButtonPlusColor;
+                mColorNormal = mAddButtonColorNormal;
+                mColorPressed = mAddButtonColorPressed;
+                mStrokeVisible = mAddButtonStrokeVisible;
+                super.updateBackground();
+            }
+
+            @Override
+            Drawable getIconDrawable() {
+                final RotatingDrawable rotatingDrawable = new RotatingDrawable(super.getIconDrawable());
+                mRotatingDrawable = rotatingDrawable;
+
+                final TimeInterpolator interpolator = new OvershootInterpolator();
+
+                final ObjectAnimator collapseAnimator = ObjectAnimator.ofFloat(rotatingDrawable, "rotation", EXPANDED_PLUS_ROTATION, COLLAPSED_PLUS_ROTATION);
+                final ObjectAnimator expandAnimator = ObjectAnimator.ofFloat(rotatingDrawable, "rotation", COLLAPSED_PLUS_ROTATION, EXPANDED_PLUS_ROTATION);
+
+                collapseAnimator.setInterpolator(interpolator);
+                expandAnimator.setInterpolator(interpolator);
+
+                mExpandAnimation.play(expandAnimator);
+                mCollapseAnimation.play(collapseAnimator);
+
+                return rotatingDrawable;
+            }
+        };
+
+        mAddButton.setId(R.id.fab_expand_menu_button);
+        mAddButton.setSize(mAddButtonSize);
+        mAddButton.setOnClickListener(v -> toggle());
+
+        addView(mAddButton, super.generateDefaultLayoutParams());
+        mButtonsCount++;
+    }
+
+    public void addButton(final FloatingActionButton button) {
+        addView(button, mButtonsCount - 1);
+        mButtonsCount++;
+
+        if (mLabelsStyle != 0) {
+            createLabels();
+        }
+    }
+
+    public void removeButton(final FloatingActionButton button) {
+        removeView(button.getLabelView());
+        removeView(button);
+        button.setTag(R.id.fab_label, null);
+        mButtonsCount--;
+    }
+
+    @Override
+    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
+        measureChildren(widthMeasureSpec, heightMeasureSpec);
+
+        int width = 0;
+        int height = 0;
+
+        mMaxButtonWidth = 0;
+        mMaxButtonHeight = 0;
+        int maxLabelWidth = 0;
+
+        for (int i = 0; i < mButtonsCount; i++) {
+            final View child = getChildAt(i);
+
+            if (child.getVisibility() == GONE) {
+                continue;
+            }
+
+            switch (mExpandDirection) {
+                case EXPAND_UP:
+                case EXPAND_DOWN:
+                    mMaxButtonWidth = Math.max(mMaxButtonWidth, child.getMeasuredWidth());
+                    height += child.getMeasuredHeight();
+                    break;
+                case EXPAND_LEFT:
+                case EXPAND_RIGHT:
+                    width += child.getMeasuredWidth();
+                    mMaxButtonHeight = Math.max(mMaxButtonHeight, child.getMeasuredHeight());
+                    break;
+            }
+
+            if (!expandsHorizontally()) {
+                final TextView label = (TextView) child.getTag(R.id.fab_label);
+                if (label != null) {
+                    maxLabelWidth = Math.max(maxLabelWidth, label.getMeasuredWidth());
+                }
+            }
+        }
+
+        if (expandsHorizontally()) {
+            height = mMaxButtonHeight;
+        } else {
+            width = mMaxButtonWidth + (maxLabelWidth > 0 ? maxLabelWidth + mLabelsMargin : 0);
+        }
+
+        switch (mExpandDirection) {
+            case EXPAND_UP:
+            case EXPAND_DOWN:
+                height += mButtonSpacing * (mButtonsCount - 1);
+                height = adjustForOvershoot(height);
+                break;
+            case EXPAND_LEFT:
+            case EXPAND_RIGHT:
+                width += mButtonSpacing * (mButtonsCount - 1);
+                width = adjustForOvershoot(width);
+                break;
+        }
+
+        setMeasuredDimension(width, height);
+    }
+
+    private static int adjustForOvershoot(final int dimension) {
+        return dimension * 12 / 10;
+    }
+
+    @Override
+    protected void onLayout(final boolean changed, final int l, final int t, final int r, final int b) {
+        switch (mExpandDirection) {
+            case EXPAND_UP:
+            case EXPAND_DOWN:
+                final boolean expandUp = mExpandDirection == EXPAND_UP;
+
+                if (changed) {
+                    mTouchDelegateGroup.clearTouchDelegates();
+                }
+
+                final int addButtonY = expandUp ? b - t - mAddButton.getMeasuredHeight() : 0;
+                // Ensure mAddButton is centered on the line where the buttons should be
+                final int buttonsHorizontalCenter = mLabelsPosition == LABELS_ON_LEFT_SIDE
+                        ? r - l - mMaxButtonWidth / 2
+                        : mMaxButtonWidth / 2;
+                final int addButtonLeft = buttonsHorizontalCenter - mAddButton.getMeasuredWidth() / 2;
+                mAddButton.layout(addButtonLeft, addButtonY, addButtonLeft + mAddButton.getMeasuredWidth(), addButtonY + mAddButton.getMeasuredHeight());
+
+                final int labelsOffset = mMaxButtonWidth / 2 + mLabelsMargin;
+                final int labelsXNearButton = mLabelsPosition == LABELS_ON_LEFT_SIDE
+                        ? buttonsHorizontalCenter - labelsOffset
+                        : buttonsHorizontalCenter + labelsOffset;
+
+                int nextY = expandUp ?
+                        addButtonY - mButtonSpacing :
+                        addButtonY + mAddButton.getMeasuredHeight() + mButtonSpacing;
+
+                for (int i = mButtonsCount - 1; i >= 0; i--) {
+                    final View child = getChildAt(i);
+
+                    if (child == mAddButton || child.getVisibility() == GONE) continue;
+
+                    final int childX = buttonsHorizontalCenter - child.getMeasuredWidth() / 2;
+                    final int childY = expandUp ? nextY - child.getMeasuredHeight() : nextY;
+                    child.layout(childX, childY, childX + child.getMeasuredWidth(), childY + child.getMeasuredHeight());
+
+                    final float collapsedTranslation = addButtonY - childY;
+                    final float expandedTranslation = 0f;
+
+                    child.setTranslationY(mExpanded ? expandedTranslation : collapsedTranslation);
+                    child.setAlpha(mExpanded ? 1f : 0f);
+
+                    final LayoutParams params = (LayoutParams) child.getLayoutParams();
+                    params.mCollapseDir.setFloatValues(expandedTranslation, collapsedTranslation);
+                    params.mExpandDir.setFloatValues(collapsedTranslation, expandedTranslation);
+                    params.setAnimationsTarget(child);
+
+                    final View label = (View) child.getTag(R.id.fab_label);
+                    if (label != null) {
+                        final int labelXAwayFromButton = mLabelsPosition == LABELS_ON_LEFT_SIDE
+                                ? labelsXNearButton - label.getMeasuredWidth()
+                                : labelsXNearButton + label.getMeasuredWidth();
+
+                        final int labelLeft = mLabelsPosition == LABELS_ON_LEFT_SIDE
+                                ? labelXAwayFromButton
+                                : labelsXNearButton;
+
+                        final int labelRight = mLabelsPosition == LABELS_ON_LEFT_SIDE
+                                ? labelsXNearButton
+                                : labelXAwayFromButton;
+
+                        final int labelTop = childY - mLabelsVerticalOffset + (child.getMeasuredHeight() - label.getMeasuredHeight()) / 2;
+
+                        label.layout(labelLeft, labelTop, labelRight, labelTop + label.getMeasuredHeight());
+
+                        touchArea.set(Math.min(childX, labelLeft),
+                                childY - mButtonSpacing / 2,
+                                Math.max(childX + child.getMeasuredWidth(), labelRight),
+                                childY + child.getMeasuredHeight() + mButtonSpacing / 2);
+                        mTouchDelegateGroup.addTouchDelegate(new TouchDelegate(touchArea, child));
+
+                        label.setTranslationY(mExpanded ? expandedTranslation : collapsedTranslation);
+                        label.setAlpha(mExpanded ? 1f : 0f);
+
+                        final LayoutParams labelParams = (LayoutParams) label.getLayoutParams();
+                        labelParams.mCollapseDir.setFloatValues(expandedTranslation, collapsedTranslation);
+                        labelParams.mExpandDir.setFloatValues(collapsedTranslation, expandedTranslation);
+                        labelParams.setAnimationsTarget(label);
+                    }
+
+                    nextY = expandUp ?
+                            childY - mButtonSpacing :
+                            childY + child.getMeasuredHeight() + mButtonSpacing;
+                }
+                break;
+
+            case EXPAND_LEFT:
+            case EXPAND_RIGHT:
+                final boolean expandLeft = mExpandDirection == EXPAND_LEFT;
+
+                final int addButtonX = expandLeft ? r - l - mAddButton.getMeasuredWidth() : 0;
+                // Ensure mAddButton is centered on the line where the buttons should be
+                final int addButtonTop = b - t - mMaxButtonHeight + (mMaxButtonHeight - mAddButton.getMeasuredHeight()) / 2;
+                mAddButton.layout(addButtonX, addButtonTop, addButtonX + mAddButton.getMeasuredWidth(), addButtonTop + mAddButton.getMeasuredHeight());
+
+                int nextX = expandLeft ?
+                        addButtonX - mButtonSpacing :
+                        addButtonX + mAddButton.getMeasuredWidth() + mButtonSpacing;
+
+                for (int i = mButtonsCount - 1; i >= 0; i--) {
+                    final View child = getChildAt(i);
+
+                    if (child == mAddButton || child.getVisibility() == GONE) continue;
+
+                    final int childX = expandLeft ? nextX - child.getMeasuredWidth() : nextX;
+                    final int childY = addButtonTop + (mAddButton.getMeasuredHeight() - child.getMeasuredHeight()) / 2;
+                    child.layout(childX, childY, childX + child.getMeasuredWidth(), childY + child.getMeasuredHeight());
+
+                    final float collapsedTranslation = addButtonX - childX;
+                    final float expandedTranslation = 0f;
+
+                    child.setTranslationX(mExpanded ? expandedTranslation : collapsedTranslation);
+                    child.setAlpha(mExpanded ? 1f : 0f);
+
+                    final LayoutParams params = (LayoutParams) child.getLayoutParams();
+                    params.mCollapseDir.setFloatValues(expandedTranslation, collapsedTranslation);
+                    params.mExpandDir.setFloatValues(collapsedTranslation, expandedTranslation);
+                    params.setAnimationsTarget(child);
+
+                    nextX = expandLeft ?
+                            childX - mButtonSpacing :
+                            childX + child.getMeasuredWidth() + mButtonSpacing;
+                }
+
+                break;
+        }
+    }
+
+    @Override
+    protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+        return new LayoutParams(super.generateDefaultLayoutParams());
+    }
+
+    @Override
+    public ViewGroup.LayoutParams generateLayoutParams(final AttributeSet attrs) {
+        return new LayoutParams(super.generateLayoutParams(attrs));
+    }
+
+    @Override
+    protected ViewGroup.LayoutParams generateLayoutParams(final ViewGroup.LayoutParams p) {
+        return new LayoutParams(super.generateLayoutParams(p));
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        bringChildToFront(mAddButton);
+        mButtonsCount = getChildCount();
+
+        if (mLabelsStyle != 0) {
+            createLabels();
+        }
+    }
+
+    private void createLabels() {
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 && Build.BRAND.equals("ASUS"))
+            return;
+        final Context context = new ContextThemeWrapper(getContext(), mLabelsStyle);
+
+        for (int i = 0; i < mButtonsCount; i++) {
+            final FloatingActionButton button = (FloatingActionButton) getChildAt(i);
+            final String title = button.getTitle();
+
+            if (button == mAddButton || title == null ||
+                    button.getTag(R.id.fab_label) != null) continue;
+
+            final AppCompatTextView label = new AppCompatTextView(context);
+            label.setTextAppearance(context, mLabelsStyle);
+            label.setText(button.getTitle());
+            addView(label);
+
+            button.setTag(R.id.fab_label, label);
+        }
+    }
+
+    public void collapse() {
+        collapse(false);
+    }
+
+    public void collapseImmediately() {
+        collapse(true);
+    }
+
+    private void collapse(final boolean immediately) {
+        if (mExpanded) {
+            mExpanded = false;
+            mTouchDelegateGroup.setEnabled(false);
+            mCollapseAnimation.setDuration(immediately ? 0 : ANIMATION_DURATION);
+            mCollapseAnimation.start();
+            mExpandAnimation.cancel();
+
+            if (mListener != null) {
+                mListener.onMenuCollapsed();
+            }
+        }
+    }
+
+    public void toggle() {
+        if (mExpanded) {
+            collapse();
+        } else {
+            expand();
+        }
+    }
+
+    public void expand() {
+        if (!mExpanded) {
+            mExpanded = true;
+            mTouchDelegateGroup.setEnabled(true);
+            mCollapseAnimation.cancel();
+            mExpandAnimation.start();
+
+            if (mListener != null) {
+                mListener.onMenuExpanded();
+            }
+        }
+    }
+
+    public boolean isExpanded() {
+        return mExpanded;
+    }
+
+    @Override
+    public void setEnabled(final boolean enabled) {
+        super.setEnabled(enabled);
+
+        mAddButton.setEnabled(enabled);
+    }
+
+    @Override
+    public Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        final SavedState savedState = new SavedState(superState);
+        savedState.mExpanded = mExpanded;
+
+        return savedState;
+    }
+
+    @Override
+    public void onRestoreInstanceState(final Parcelable state) {
+        if (state instanceof SavedState) {
+            final SavedState savedState = (SavedState) state;
+            mExpanded = savedState.mExpanded;
+            mTouchDelegateGroup.setEnabled(mExpanded);
+
+            if (mRotatingDrawable != null) {
+                mRotatingDrawable.setRotation(mExpanded ? EXPANDED_PLUS_ROTATION : COLLAPSED_PLUS_ROTATION);
+            }
+
+            super.onRestoreInstanceState(savedState.getSuperState());
+        } else {
+            super.onRestoreInstanceState(state);
+        }
+    }
+
+    public interface OnFloatingActionsMenuUpdateListener {
+        void onMenuExpanded();
+
+        void onMenuCollapsed();
+    }
+
+    private static class RotatingDrawable extends LayerDrawable {
+        private float mRotation;
+
+        RotatingDrawable(final Drawable drawable) {
+            super(new Drawable[]{drawable});
+        }
+
+        @SuppressWarnings("UnusedDeclaration")
+        public float getRotation() {
+            return mRotation;
+        }
+
+        @Keep
+        @SuppressWarnings("UnusedDeclaration")
+        public void setRotation(final float rotation) {
+            mRotation = rotation;
+            invalidateSelf();
+        }
+
+        @Override
+        public void draw(final Canvas canvas) {
+            canvas.save();
+            canvas.rotate(mRotation, getBounds().centerX(), getBounds().centerY());
+            super.draw(canvas);
+            canvas.restore();
+        }
+    }
+
+    public static class SavedState extends BaseSavedState {
+        public static final Creator<SavedState> CREATOR = new Creator<SavedState>() {
+
+            @Override
+            public SavedState createFromParcel(final Parcel in) {
+                return new SavedState(in);
+            }
+
+            @Override
+            public SavedState[] newArray(final int size) {
+                return new SavedState[size];
+            }
+        };
+        public boolean mExpanded;
+
+        public SavedState(final Parcelable parcel) {
+            super(parcel);
+        }
+
+        private SavedState(final Parcel in) {
+            super(in);
+            mExpanded = in.readInt() == 1;
+        }
+
+        @Override
+        public void writeToParcel(@NonNull final Parcel out, final int flags) {
+            super.writeToParcel(out, flags);
+            out.writeInt(mExpanded ? 1 : 0);
+        }
+    }
+
+    private class LayoutParams extends ViewGroup.LayoutParams {
+
+        private final ObjectAnimator mExpandDir = new ObjectAnimator();
+        private final ObjectAnimator mExpandAlpha = new ObjectAnimator();
+        private final ObjectAnimator mCollapseDir = new ObjectAnimator();
+        private final ObjectAnimator mCollapseAlpha = new ObjectAnimator();
+        private boolean animationsSetToPlay;
+
+        LayoutParams(final ViewGroup.LayoutParams source) {
+            super(source);
+
+            mExpandDir.setInterpolator(EXPAND_INTERPOLATOR);
+            mExpandAlpha.setInterpolator(ALPHA_EXPAND_INTERPOLATOR);
+            mCollapseDir.setInterpolator(COLLAPSE_INTERPOLATOR);
+            mCollapseAlpha.setInterpolator(COLLAPSE_INTERPOLATOR);
+
+            mCollapseAlpha.setProperty(View.ALPHA);
+            mCollapseAlpha.setFloatValues(1f, 0f);
+
+            mExpandAlpha.setProperty(View.ALPHA);
+            mExpandAlpha.setFloatValues(0f, 1f);
+
+            switch (mExpandDirection) {
+                case EXPAND_UP:
+                case EXPAND_DOWN:
+                    mCollapseDir.setProperty(View.TRANSLATION_Y);
+                    mExpandDir.setProperty(View.TRANSLATION_Y);
+                    break;
+                case EXPAND_LEFT:
+                case EXPAND_RIGHT:
+                    mCollapseDir.setProperty(View.TRANSLATION_X);
+                    mExpandDir.setProperty(View.TRANSLATION_X);
+                    break;
+            }
+        }
+
+        public void setAnimationsTarget(final View view) {
+            mCollapseAlpha.setTarget(view);
+            mCollapseDir.setTarget(view);
+            mExpandAlpha.setTarget(view);
+            mExpandDir.setTarget(view);
+
+            // Now that the animations have targets, set them to be played
+            if (!animationsSetToPlay) {
+                addLayerTypeListener(mExpandDir, view);
+                addLayerTypeListener(mCollapseDir, view);
+
+                mCollapseAnimation.play(mCollapseAlpha);
+                mCollapseAnimation.play(mCollapseDir);
+                mExpandAnimation.play(mExpandAlpha);
+                mExpandAnimation.play(mExpandDir);
+                animationsSetToPlay = true;
+            }
+        }
+
+        private void addLayerTypeListener(final Animator animator, final View view) {
+            animator.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(final Animator animation) {
+                    view.setLayerType(LAYER_TYPE_NONE, null);
+                }
+
+                @Override
+                public void onAnimationStart(final Animator animation) {
+                    view.setLayerType(LAYER_TYPE_HARDWARE, null);
+                }
+            });
+        }
+    }
+}
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2014 Jerzy Chalupski
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.widget.fab;
+
+import android.graphics.Rect;
+import android.support.annotation.NonNull;
+import android.view.MotionEvent;
+import android.view.TouchDelegate;
+import android.view.View;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class TouchDelegateGroup extends TouchDelegate {
+    private static final Rect USELESS_HACKY_RECT = new Rect();
+    private final Collection<TouchDelegate> mTouchDelegates = new ArrayList<>();
+    private TouchDelegate mCurrentTouchDelegate;
+    private boolean mEnabled;
+
+    public TouchDelegateGroup(final View uselessHackyView) {
+        super(USELESS_HACKY_RECT, uselessHackyView);
+    }
+
+    public void addTouchDelegate(@NonNull final TouchDelegate touchDelegate) {
+        mTouchDelegates.add(touchDelegate);
+    }
+
+    public void removeTouchDelegate(final TouchDelegate touchDelegate) {
+        mTouchDelegates.remove(touchDelegate);
+        if (mCurrentTouchDelegate == touchDelegate) {
+            mCurrentTouchDelegate = null;
+        }
+    }
+
+    public void clearTouchDelegates() {
+        mTouchDelegates.clear();
+        mCurrentTouchDelegate = null;
+    }
+
+    @Override
+    public boolean onTouchEvent(@NonNull final MotionEvent event) {
+        if (!mEnabled) return false;
+
+        TouchDelegate delegate = null;
+
+        switch (event.getAction()) {
+            case MotionEvent.ACTION_DOWN:
+		for (final TouchDelegate touchDelegate : mTouchDelegates) {
+                    if (touchDelegate.onTouchEvent(event)) {
+                        mCurrentTouchDelegate = touchDelegate;
+                        return true;
+                    }
+                }
+                break;
+
+            case MotionEvent.ACTION_MOVE:
+                delegate = mCurrentTouchDelegate;
+                break;
+
+            case MotionEvent.ACTION_CANCEL:
+            case MotionEvent.ACTION_UP:
+                delegate = mCurrentTouchDelegate;
+                mCurrentTouchDelegate = null;
+                break;
+        }
+
+        return delegate != null && delegate.onTouchEvent(event);
+    }
+
+    public void setEnabled(final boolean enabled) {
+        mEnabled = enabled;
+    }
+}
@@ -1,16 +1,13 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.config;

 import android.text.TextUtils;

-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -21,10 +18,11 @@ import java.util.regex.Pattern;
 * The set of valid attributes for an interface or peer in a WireGuard configuration file.
 */

-enum Attribute {
+public enum Attribute {
    ADDRESS("Address"),
    ALLOWED_IPS("AllowedIPs"),
    DNS("DNS"),
+    EXCLUDED_APPLICATIONS("ExcludedApplications"),
    ENDPOINT("Endpoint"),
    LISTEN_PORT("ListenPort"),
    MTU("MTU"),
@@ -36,7 +34,6 @@ enum Attribute {
    private static final String[] EMPTY_LIST = new String[0];
    private static final Map<String, Attribute> KEY_MAP;
    private static final Pattern LIST_SEPARATOR_PATTERN = Pattern.compile("\\s*,\\s*");
-    private static final Method NUMERIC_ADDRESS_PARSER;
    private static final Pattern SEPARATOR_PATTERN = Pattern.compile("\\s|=");

    static {
@@ -46,14 +43,6 @@ enum Attribute {
        }
    }

-    static {
-        try {
-            NUMERIC_ADDRESS_PARSER = InetAddress.class.getMethod("parseNumericAddress", String.class);
-        } catch (final Exception e) {
-            throw new RuntimeException(e);
-        }
-    }
-
    private final Pattern pattern;
    private final String token;

@@ -70,23 +59,8 @@ enum Attribute {
        return KEY_MAP.get(SEPARATOR_PATTERN.split(line)[0].toLowerCase());
    }

-    public static InetAddress parseIPString(final String address) {
-        if (address == null || address.isEmpty())
-            throw new IllegalArgumentException("Empty address");
-        try {
-            return (InetAddress) NUMERIC_ADDRESS_PARSER.invoke(null, address);
-        } catch (final IllegalAccessException e) {
-            throw new RuntimeException(e);
-        } catch (final InvocationTargetException e) {
-            if (e.getCause() instanceof IllegalArgumentException)
-                throw (IllegalArgumentException) e.getCause();
-            else
-                throw new IllegalArgumentException(e.getCause());
-        }
-    }
-
    public static String[] stringToList(final String string) {
-        if (string == null)
+        if (TextUtils.isEmpty(string))
            return EMPTY_LIST;
        return LIST_SEPARATOR_PATTERN.split(string.trim());
    }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.config;
@@ -1,48 +0,0 @@
-/*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-package com.wireguard.config;
-
-import java.net.Inet4Address;
-import java.net.Inet6Address;
-import java.net.InetAddress;
-import java.util.Locale;
-
-public class IPCidr {
-    private final InetAddress address;
-    private int cidr;
-
-    @SuppressWarnings("MagicNumber")
-    public IPCidr(String in) {
-        cidr = -1;
-        final int slash = in.lastIndexOf('/');
-        if (slash != -1 && slash < in.length() - 1) {
-            try {
-                cidr = Integer.parseInt(in.substring(slash + 1), 10);
-                in = in.substring(0, slash);
-            } catch (final Exception ignored) {
-            }
-        }
-        address = Attribute.parseIPString(in);
-        if ((address instanceof Inet6Address) && (cidr > 128 || cidr < 0))
-            cidr = 128;
-        else if ((address instanceof Inet4Address) && (cidr > 32 || cidr < 0))
-            cidr = 32;
-    }
-
-    public InetAddress getAddress() {
-        return address;
-    }
-
-    public int getCidr() {
-        return cidr;
-    }
-
-    @Override
-    public String toString() {
-        return String.format(Locale.getDefault(), "%s/%d", address.getHostAddress(), cidr);
-    }
-}
@@ -0,0 +1,42 @@
+/*
+ * Copyright © 2018 Samuel Holland <samuel@sholland.org>
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.config;
+
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.net.InetAddress;
+
+public final class InetAddresses {
+    private static final Method PARSER_METHOD;
+
+    static {
+        try {
+            // This method is only present on Android.
+            PARSER_METHOD = InetAddress.class.getMethod("parseNumericAddress", String.class);
+        } catch (final NoSuchMethodException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    private InetAddresses() {
+        // Prevent instantiation.
+    }
+
+    @NonNull
+    public static InetAddress parse(@Nullable final String address) {
+        if (address == null || address.isEmpty())
+            throw new IllegalArgumentException("Empty address");
+        try {
+            return (InetAddress) PARSER_METHOD.invoke(null, address);
+        } catch (final IllegalAccessException | InvocationTargetException e) {
+            throw new RuntimeException(e);
+        }
+    }
+}
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2018 Samuel Holland <samuel@sholland.org>
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.config;
+
+import android.support.annotation.NonNull;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.util.Objects;
+
+public class InetNetwork {
+    private final InetAddress address;
+    private final int mask;
+
+    public InetNetwork(@NonNull final String input) {
+        final int slash = input.lastIndexOf('/');
+        final int rawMask;
+        final String rawAddress;
+        if (slash >= 0) {
+            rawMask = Integer.parseInt(input.substring(slash + 1), 10);
+            rawAddress = input.substring(0, slash);
+        } else {
+            rawMask = -1;
+            rawAddress = input;
+        }
+        address = InetAddresses.parse(rawAddress);
+        final int maxMask = (address instanceof Inet4Address) ? 32 : 128;
+        mask = rawMask >= 0 && rawMask <= maxMask ? rawMask : maxMask;
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (!(obj instanceof InetNetwork))
+            return false;
+        final InetNetwork other = (InetNetwork) obj;
+        return Objects.equals(address, other.address) && mask == other.mask;
+    }
+
+    @NonNull
+    public InetAddress getAddress() {
+        return address;
+    }
+
+    public int getMask() {
+        return mask;
+    }
+
+    @Override
+    public int hashCode() {
+        return address.hashCode() ^ mask;
+    }
+
+    @Override
+    public String toString() {
+        return address.getHostAddress() + '/' + mask;
+    }
+}
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.config;
@@ -16,6 +16,7 @@ import com.wireguard.crypto.Keypair;

 import java.net.InetAddress;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;

 /**
@@ -23,8 +24,9 @@ import java.util.List;
 */

 public class Interface {
-    private final List<IPCidr> addressList;
+    private final List<InetNetwork> addressList;
    private final List<InetAddress> dnsList;
+    private final List<String> excludedApplications;
    private Keypair keypair;
    private int listenPort;
    private int mtu;
@@ -32,6 +34,7 @@ public class Interface {
    public Interface() {
        addressList = new ArrayList<>();
        dnsList = new ArrayList<>();
+        excludedApplications = new ArrayList<>();
    }

    private void addAddresses(final String[] addresses) {
@@ -39,7 +42,7 @@ public class Interface {
            for (final String addr : addresses) {
                if (addr.isEmpty())
                    throw new IllegalArgumentException("Address is empty");
-                addressList.add(new IPCidr(addr));
+                addressList.add(new InetNetwork(addr));
            }
        }
    }
@@ -47,19 +50,25 @@ public class Interface {
    private void addDnses(final String[] dnses) {
        if (dnses != null && dnses.length > 0) {
            for (final String dns : dnses) {
-                dnsList.add(Attribute.parseIPString(dns));
+                dnsList.add(InetAddresses.parse(dns));
            }
        }
    }

+    private void addExcludedApplications(final String[] applications) {
+        if (applications != null && applications.length > 0) {
+            excludedApplications.addAll(Arrays.asList(applications));
+        }
+    }
+
    private String getAddressString() {
        if (addressList.isEmpty())
            return null;
        return Attribute.iterableToString(addressList);
    }

-    public IPCidr[] getAddresses() {
-        return addressList.toArray(new IPCidr[addressList.size()]);
+    public InetNetwork[] getAddresses() {
+        return addressList.toArray(new InetNetwork[addressList.size()]);
    }

    private String getDnsString() {
@@ -79,6 +88,16 @@ public class Interface {
        return dnsList.toArray(new InetAddress[dnsList.size()]);
    }

+    private String getExcludedApplicationsString() {
+        if (excludedApplications.isEmpty())
+            return null;
+        return Attribute.iterableToString(excludedApplications);
+    }
+
+    public String[] getExcludedApplications() {
+        return excludedApplications.toArray(new String[excludedApplications.size()]);
+    }
+
    public int getListenPort() {
        return listenPort;
    }
@@ -120,6 +139,9 @@ public class Interface {
            case DNS:
                addDnses(key.parseList(line));
                break;
+            case EXCLUDED_APPLICATIONS:
+                addExcludedApplications(key.parseList(line));
+                break;
            case LISTEN_PORT:
                setListenPortString(key.parse(line));
                break;
@@ -144,6 +166,11 @@ public class Interface {
        addDnses(Attribute.stringToList(dnsString));
    }

+    private void setExcludedApplicationsString(final String applicationsString) {
+        excludedApplications.clear();
+        addExcludedApplications(Attribute.stringToList(applicationsString));
+    }
+
    private void setListenPort(final int listenPort) {
        this.listenPort = listenPort;
    }
@@ -179,6 +206,8 @@ public class Interface {
            sb.append(Attribute.ADDRESS.composeWith(addressList));
        if (!dnsList.isEmpty())
            sb.append(Attribute.DNS.composeWith(getDnsStrings()));
+        if (!excludedApplications.isEmpty())
+            sb.append(Attribute.EXCLUDED_APPLICATIONS.composeWith(excludedApplications));
        if (listenPort != 0)
            sb.append(Attribute.LISTEN_PORT.composeWith(listenPort));
        if (mtu != 0)
@@ -202,6 +231,7 @@ public class Interface {
        };
        private String addresses;
        private String dnses;
+        private String excludedApplications;
        private String listenPort;
        private String mtu;
        private String privateKey;
@@ -219,11 +249,13 @@ public class Interface {
            privateKey = in.readString();
            listenPort = in.readString();
            mtu = in.readString();
+            excludedApplications = in.readString();
        }

        public void commitData(final Interface parent) {
            parent.setAddressString(addresses);
            parent.setDnsString(dnses);
+            parent.setExcludedApplicationsString(excludedApplications);
            parent.setPrivateKey(privateKey);
            parent.setListenPortString(listenPort);
            parent.setMtuString(mtu);
@@ -254,6 +286,16 @@ public class Interface {
            return dnses;
        }

+        @Bindable
+        public String getExcludedApplications() {
+            return excludedApplications;
+        }
+
+        @Bindable
+        public int getExcludedApplicationsCount() {
+            return Attribute.stringToList(excludedApplications).length;
+        }
+
        @Bindable
        public String getListenPort() {
            return listenPort;
@@ -277,6 +319,7 @@ public class Interface {
        protected void loadData(final Interface parent) {
            addresses = parent.getAddressString();
            dnses = parent.getDnsString();
+            excludedApplications = parent.getExcludedApplicationsString();
            publicKey = parent.getPublicKey();
            privateKey = parent.getPrivateKey();
            listenPort = parent.getListenPortString();
@@ -293,6 +336,12 @@ public class Interface {
            notifyPropertyChanged(BR.dnses);
        }

+        public void setExcludedApplications(final String excludedApplications) {
+            this.excludedApplications = excludedApplications;
+            notifyPropertyChanged(BR.excludedApplications);
+            notifyPropertyChanged(BR.excludedApplicationsCount);
+        }
+
        public void setListenPort(final String listenPort) {
            this.listenPort = listenPort;
            notifyPropertyChanged(BR.listenPort);
@@ -324,6 +373,7 @@ public class Interface {
            dest.writeString(privateKey);
            dest.writeString(listenPort);
            dest.writeString(mtu);
+            dest.writeString(excludedApplications);
        }
    }
 }
@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.config;
@@ -20,6 +20,8 @@ import java.net.URI;
 import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;

@@ -28,7 +30,7 @@ import java.util.Locale;
 */

 public class Peer {
-    private final List<IPCidr> allowedIPsList;
+    private final List<InetNetwork> allowedIPsList;
    private InetSocketAddress endpoint;
    private int persistentKeepalive;
    private String preSharedKey;
@@ -41,13 +43,13 @@ public class Peer {
    private void addAllowedIPs(final String[] allowedIPs) {
        if (allowedIPs != null && allowedIPs.length > 0) {
            for (final String allowedIP : allowedIPs) {
-                allowedIPsList.add(new IPCidr(allowedIP));
+                allowedIPsList.add(new InetNetwork(allowedIP));
            }
        }
    }

-    public IPCidr[] getAllowedIPs() {
-        return allowedIPsList.toArray(new IPCidr[allowedIPsList.size()]);
+    public InetNetwork[] getAllowedIPs() {
+        return allowedIPsList.toArray(new InetNetwork[allowedIPsList.size()]);
    }

    private String getAllowedIPsString() {
@@ -245,11 +247,40 @@ public class Peer {
            return 0;
        }

+        private static final String DEFAULT_ROUTE_V4 = "0.0.0.0/0";
+        private static final List<String> DEFAULT_ROUTE_MOD_RFC1918_V4 = Arrays.asList("0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3", "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12", "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7", "176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16", "192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10", "193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4");
+
+        public void toggleExcludePrivateIPs() {
+            final HashSet<String> ips = new HashSet<>(Arrays.asList(Attribute.stringToList(allowedIPs)));
+            final boolean hasDefaultRoute = ips.contains(DEFAULT_ROUTE_V4);
+            final boolean hasDefaultRouteModRFC1918 = ips.containsAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
+            if (hasDefaultRoute && hasDefaultRouteModRFC1918)
+                ips.removeAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
+            else if (hasDefaultRoute) {
+                ips.remove(DEFAULT_ROUTE_V4);
+                ips.addAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
+            } else if (hasDefaultRouteModRFC1918) {
+                ips.removeAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
+                ips.add(DEFAULT_ROUTE_V4);
+            }
+            setAllowedIPs(Attribute.iterableToString(ips));
+        }
+
        @Bindable
        public String getAllowedIPs() {
            return allowedIPs;
        }

+        @Bindable
+        public boolean getAllowedIPsContainsDefaultRoute() {
+            return Arrays.asList(Attribute.stringToList(allowedIPs)).contains(DEFAULT_ROUTE_V4);
+        }
+
+        @Bindable
+        public boolean getAllowedIPsContainsDefaultRouteModRFC1918() {
+            return Arrays.asList(Attribute.stringToList(allowedIPs)).containsAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
+        }
+
        @Bindable
        public String getEndpoint() {
            return endpoint;
@@ -281,6 +312,8 @@ public class Peer {
        public void setAllowedIPs(final String allowedIPs) {
            this.allowedIPs = allowedIPs;
            notifyPropertyChanged(BR.allowedIPs);
+            notifyPropertyChanged(BR.allowedIPsContainsDefaultRoute);
+            notifyPropertyChanged(BR.allowedIPsContainsDefaultRouteModRFC1918);
        }

        public void setEndpoint(final String endpoint) {
@@ -1,6 +1,6 @@
 /*
 * Copyright © 2016 Southern Storm Software, Pty Ltd.
- * SPDX-License-Identifier: MIT
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.crypto;
@@ -10,23 +10,23 @@ import java.util.Arrays;
 /**
 * Implementation of the Curve25519 elliptic curve algorithm.
 * <p>
+ * This implementation was imported to WireGuard from noise-java:
+ * https://github.com/rweather/noise-java
+ * <p>
 * This implementation is based on that from arduinolibs:
 * https://github.com/rweather/arduinolibs
 * <p>
- * This implementation is copied verbatim from noise-java:
- * https://github.com/rweather/noise-java
- * <p>
 * Differences in this version are due to using 26-bit limbs for the
 * representation instead of the 8/16/32-bit limbs in the original.
 * <p>
 * References: http://cr.yp.to/ecdh.html, RFC 7748
 */
-@SuppressWarnings("MagicNumber")
+@SuppressWarnings({"MagicNumber", "NonConstantFieldWithUpperCaseName", "SuspiciousNameCombination"})
 public final class Curve25519 {
-
    // Numbers modulo 2^255 - 19 are broken up into ten 26-bit words.
    private static final int NUM_LIMBS_255BIT = 10;
    private static final int NUM_LIMBS_510BIT = 20;
+
    private final int[] A;
    private final int[] AA;
    private final int[] B;
@@ -152,6 +152,38 @@ public final class Curve25519 {
        }
    }

+    /**
+     * Subtracts two numbers modulo 2^255 - 19.
+     *
+     * @param result The result.
+     * @param x      The first number to subtract.
+     * @param y      The second number to subtract.
+     */
+    private static void sub(final int[] result, final int[] x, final int[] y) {
+        int index;
+        int borrow;
+
+        // Subtract y from x to generate the intermediate result.
+        borrow = 0;
+        for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
+            borrow = x[index] - y[index] - ((borrow >> 26) & 0x01);
+            result[index] = borrow & 0x03FFFFFF;
+        }
+
+        // If we had a borrow, then the result has gone negative and we
+        // have to add 2^255 - 19 to the result to make it positive again.
+        // The top bits of "borrow" will be all 1's if there is a borrow
+        // or it will be all 0's if there was no borrow.  Easiest is to
+        // conditionally subtract 19 and then mask off the high bits.
+        borrow = result[0] - ((-((borrow >> 26) & 0x01)) & 19);
+        result[0] = borrow & 0x03FFFFFF;
+        for (index = 1; index < NUM_LIMBS_255BIT; ++index) {
+            borrow = result[index] - ((borrow >> 26) & 0x01);
+            result[index] = borrow & 0x03FFFFFF;
+        }
+        result[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
+    }
+
    /**
     * Adds two numbers modulo 2^255 - 19.
     *
@@ -160,8 +192,7 @@ public final class Curve25519 {
     * @param y      The second number to add.
     */
    private void add(final int[] result, final int[] x, final int[] y) {
-        int carry;
-        carry = x[0] + y[0];
+        int carry = x[0] + y[0];
        result[0] = carry & 0x03FFFFFF;
        for (int index = 1; index < NUM_LIMBS_255BIT; ++index) {
            carry = (carry >> 26) + x[index] + y[index];
@@ -200,12 +231,13 @@ public final class Curve25519 {
     */
    private void evalCurve(final byte[] s) {
        int sposn = 31;
+        int sbit = 6;
        int svalue = s[sposn] | 0x40;
        int swap = 0;

        // Iterate over all 255 bits of "s" from the highest to the lowest.
        // We ignore the high bit of the 256-bit representation of "s".
-        for (int sbit = 6; ; ) {
+        while (true) {
            // Conditional swaps on entry to this bit but only if we
            // didn't swap on the previous bit.
            final int select = (svalue >> sbit) & 0x01;
@@ -263,14 +295,12 @@ public final class Curve25519 {
     * @param y      The second number to multiply.
     */
    private void mul(final int[] result, final int[] x, final int[] y) {
-        int i;
-
        // Multiply the two numbers to create the intermediate result.
        long v = x[0];
-        for (i = 0; i < NUM_LIMBS_255BIT; ++i) {
+        for (int i = 0; i < NUM_LIMBS_255BIT; ++i) {
            t1[i] = v * y[i];
        }
-        for (i = 1; i < NUM_LIMBS_255BIT; ++i) {
+        for (int i = 1; i < NUM_LIMBS_255BIT; ++i) {
            v = x[i];
            for (int j = 0; j < (NUM_LIMBS_255BIT - 1); ++j) {
                t1[i + j] += v * y[j];
@@ -281,7 +311,7 @@ public final class Curve25519 {
        // Propagate carries and convert back into 26-bit words.
        v = t1[0];
        t2[0] = ((int) v) & 0x03FFFFFF;
-        for (i = 1; i < NUM_LIMBS_510BIT; ++i) {
+        for (int i = 1; i < NUM_LIMBS_510BIT; ++i) {
            v = (v >> 26) + t1[i];
            t2[i] = ((int) v) & 0x03FFFFFF;
        }
@@ -315,8 +345,6 @@ public final class Curve25519 {
     * @param x      The argument.
     */
    private void pow250(final int[] result, final int[] x) {
-        int j;
-
        // The big-endian hexadecimal expansion of (2^250 - 1) is:
        // 03FFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF FFFFFFFF
        //
@@ -329,11 +357,11 @@ public final class Curve25519 {

        // Build a pattern of 250 bits in length of repeated copies of 0000000001.
        square(A, x);
-        for (j = 0; j < 9; ++j)
+        for (int j = 0; j < 9; ++j)
            square(A, A);
        mul(result, A, x);
        for (int i = 0; i < 23; ++i) {
-            for (j = 0; j < 10; ++j)
+            for (int j = 0; j < 10; ++j)
                square(A, A);
            mul(result, result, A);
        }
@@ -342,7 +370,7 @@ public final class Curve25519 {
        // the result to "fill in" the gaps in the pattern.
        square(A, result);
        mul(result, result, A);
-        for (j = 0; j < 8; ++j) {
+        for (int j = 0; j < 8; ++j) {
            square(A, A);
            mul(result, result, A);
        }
@@ -381,18 +409,14 @@ public final class Curve25519 {
     * @param size   The number of limbs in the high order half of x.
     */
    private void reduce(final int[] result, final int[] x, final int size) {
-        int index;
-        int limb;
-        int carry;
-
        // Calculate (x mod 2^255) + ((x / 2^255) * 19) which will
        // either produce the answer we want or it will produce a
        // value of the form "answer + j * (2^255 - 19)".  There are
        // 5 left-over bits in the top-most limb of the bottom half.
-        carry = 0;
-        limb = x[NUM_LIMBS_255BIT - 1] >> 21;
+        int carry = 0;
+        int limb = x[NUM_LIMBS_255BIT - 1] >> 21;
        x[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
-        for (index = 0; index < size; ++index) {
+        for (int index = 0; index < size; ++index) {
            limb += x[NUM_LIMBS_255BIT + index] << 5;
            carry += (limb & 0x03FFFFFF) * 19 + x[index];
            x[index] = carry & 0x03FFFFFF;
@@ -402,7 +426,7 @@ public final class Curve25519 {
        if (size < NUM_LIMBS_255BIT) {
            // The high order half of the number is short; e.g. for mulA24().
            // Propagate the carry through the rest of the low order part.
-            for (index = size; index < NUM_LIMBS_255BIT; ++index) {
+            for (int index = size; index < NUM_LIMBS_255BIT; ++index) {
                carry += x[index];
                x[index] = carry & 0x03FFFFFF;
                carry >>= 26;
@@ -417,7 +441,7 @@ public final class Curve25519 {
        // top 5 bits of the highest limb of the bottom half.
        carry = (x[NUM_LIMBS_255BIT - 1] >> 21) * 19;
        x[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
-        for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
+        for (int index = 0; index < NUM_LIMBS_255BIT; ++index) {
            carry += x[index];
            result[index] = carry & 0x03FFFFFF;
            carry >>= 26;
@@ -436,14 +460,11 @@ public final class Curve25519 {
     * @param x The number to reduce, and the result.
     */
    private void reduceQuick(final int[] x) {
-        int index;
-        int carry;
-
        // Perform a trial subtraction of (2^255 - 19) from "x" which is
        // equivalent to adding 19 and subtracting 2^255.  We add 19 here;
        // the subtraction of 2^255 occurs in the next step.
-        carry = 19;
-        for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
+        int carry = 19;
+        for (int index = 0; index < NUM_LIMBS_255BIT; ++index) {
            carry += x[index];
            t2[index] = carry & 0x03FFFFFF;
            carry >>= 26;
@@ -457,7 +478,7 @@ public final class Curve25519 {
        final int mask = -((t2[NUM_LIMBS_255BIT - 1] >> 21) & 0x01);
        final int nmask = ~mask;
        t2[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
-        for (index = 0; index < NUM_LIMBS_255BIT; ++index)
+        for (int index = 0; index < NUM_LIMBS_255BIT; ++index)
            x[index] = (x[index] & nmask) | (t2[index] & mask);
    }

@@ -470,36 +491,4 @@ public final class Curve25519 {
    private void square(final int[] result, final int[] x) {
        mul(result, x, x);
    }
-
-    /**
-     * Subtracts two numbers modulo 2^255 - 19.
-     *
-     * @param result The result.
-     * @param x      The first number to subtract.
-     * @param y      The second number to subtract.
-     */
-    private static void sub(final int[] result, final int[] x, final int[] y) {
-        int index;
-        int borrow;
-
-        // Subtract y from x to generate the intermediate result.
-        borrow = 0;
-        for (index = 0; index < NUM_LIMBS_255BIT; ++index) {
-            borrow = x[index] - y[index] - ((borrow >> 26) & 0x01);
-            result[index] = borrow & 0x03FFFFFF;
-        }
-
-        // If we had a borrow, then the result has gone negative and we
-        // have to add 2^255 - 19 to the result to make it positive again.
-        // The top bits of "borrow" will be all 1's if there is a borrow
-        // or it will be all 0's if there was no borrow.  Easiest is to
-        // conditionally subtract 19 and then mask off the high bits.
-        borrow = result[0] - ((-((borrow >> 26) & 0x01)) & 19);
-        result[0] = borrow & 0x03FFFFFF;
-        for (index = 1; index < NUM_LIMBS_255BIT; ++index) {
-            borrow = result[index] - ((borrow >> 26) & 0x01);
-            result[index] = borrow & 0x03FFFFFF;
-        }
-        result[NUM_LIMBS_255BIT - 1] &= 0x001FFFFF;
-    }
 }
@@ -1,6 +1,6 @@
 /*
 * Copyright © 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.crypto;
@@ -25,10 +25,10 @@ public final class KeyEncoding {
        // Prevent instantiation.
    }

-    private static int decodeBase64(final char[] src, final int src_offset) {
+    private static int decodeBase64(final char[] src, final int srcOffset) {
        int val = 0;
        for (int i = 0; i < 4; ++i) {
-            final char c = src[i + src_offset];
+            final char c = src[i + srcOffset];
            val |= (-1
                    + ((((('A' - 1) - c) & (c - ('Z' + 1))) >>> 8) & (c - 64))
                    + ((((('a' - 1) - c) & (c - ('z' + 1))) >>> 8) & (c - 70))
@@ -40,16 +40,16 @@ public final class KeyEncoding {
        return val;
    }

-    private static void encodeBase64(final byte[] src, final int src_offset,
-                                     final char[] dest, final int dest_offset) {
+    private static void encodeBase64(final byte[] src, final int srcOffset,
+                                     final char[] dest, final int destOffset) {
        final byte[] input = {
-                (byte) ((src[src_offset] >>> 2) & 63),
-                (byte) ((src[src_offset] << 4 | ((src[1 + src_offset] & 0xff) >>> 4)) & 63),
-                (byte) ((src[1 + src_offset] << 2 | ((src[2 + src_offset] & 0xff) >>> 6)) & 63),
-                (byte) ((src[2 + src_offset]) & 63),
+                (byte) ((src[srcOffset] >>> 2) & 63),
+                (byte) ((src[srcOffset] << 4 | ((src[1 + srcOffset] & 0xff) >>> 4)) & 63),
+                (byte) ((src[1 + srcOffset] << 2 | ((src[2 + srcOffset] & 0xff) >>> 6)) & 63),
+                (byte) ((src[2 + srcOffset]) & 63),
        };
        for (int i = 0; i < 4; ++i) {
-            dest[i + dest_offset] = (char) (input[i] + 'A'
+            dest[i + destOffset] = (char) (input[i] + 'A'
                    + (((25 - input[i]) >>> 8) & 6)
                    - (((51 - input[i]) >>> 8) & 75)
                    - (((61 - input[i]) >>> 8) & 15)
@@ -63,10 +63,10 @@ public final class KeyEncoding {
        if (input.length != KEY_LENGTH_BASE64 || input[KEY_LENGTH_BASE64 - 1] != '=')
            throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
        int i;
+        int ret = 0;
        for (i = 0; i < KEY_LENGTH / 3; ++i) {
            final int val = decodeBase64(input, i * 4);
-            if (val < 0)
-                throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
+            ret |= val >>> 31;
            key[i * 3] = (byte) ((val >>> 16) & 0xff);
            key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
            key[i * 3 + 2] = (byte) (val & 0xff);
@@ -78,10 +78,12 @@ public final class KeyEncoding {
                'A',
        };
        final int val = decodeBase64(endSegment, 0);
-        if (val < 0 || (val & 0xff) != 0)
-            throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
+        ret |= (val >>> 31) | (val & 0xff);
        key[i * 3] = (byte) ((val >>> 16) & 0xff);
        key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
+
+        if (ret != 0)
+            throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
        return key;
    }

@@ -90,25 +92,37 @@ public final class KeyEncoding {
        final byte[] key = new byte[KEY_LENGTH];
        if (input.length != KEY_LENGTH_HEX)
            throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);
+        int ret = 0;

-        int c_acc = 0;
-        int state = 0;
+        for (int i = 0; i < KEY_LENGTH_HEX; i += 2) {
+            int c;
+            int cNum;
+            int cNum0;
+            int cAlpha;
+            int cAlpha0;
+            int cVal;
+            final int cAcc;

-        for (int i = 0; i < KEY_LENGTH_HEX; ++i) {
-            final int c = input[i];
-            final int c_num = c ^ 48;
-            final int c_num0 = (c_num - 10) >> 8;
-            final int c_alpha = (c & ~32) - 55;
-            final int c_alpha0 = ((c_alpha - 10) ^ (c_alpha - 16)) >> 8;
-            if ((c_num0 | c_alpha0) == 0)
-                throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);
-            final int c_val = (c_num0 & c_num) | (c_alpha0 & c_alpha);
-            if (state == 0)
-                c_acc = c_val * 16;
-            else
-                key[i / 2] = (byte) (c_acc | c_val);
-            state = ~state;
+            c = input[i];
+            cNum = c ^ 48;
+            cNum0 = ((cNum - 10) >>> 8) & 0xff;
+            cAlpha = (c & ~32) - 55;
+            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
+            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
+            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
+            cAcc = cVal * 16;
+
+            c = input[i + 1];
+            cNum = c ^ 48;
+            cNum0 = ((cNum - 10) >>> 8) & 0xff;
+            cAlpha = (c & ~32) - 55;
+            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
+            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
+            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
+            key[i / 2] = (byte) (cAcc | cVal);
        }
+        if (ret != 0)
+            throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);
        return key;
    }

@@ -1,7 +1,7 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.crypto;
@@ -1,10 +1,9 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

-package com.wireguard.android.util;
+package com.wireguard.util;

 /**
 * Interface for objects that have a identifying key of the given type.
@@ -1,10 +1,9 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

-package com.wireguard.android.util;
+package com.wireguard.util;

 import java.util.Collection;
 import java.util.List;
@@ -1,10 +1,9 @@
 /*
 * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
+ * SPDX-License-Identifier: Apache-2.0
 */

-package com.wireguard.android.util;
+package com.wireguard.util;

 import java.util.Collection;
 import java.util.Comparator;
@@ -6,5 +6,5 @@
        android:left="8dp"
        android:right="8dp"
        android:top="4dp" />
-    <solid android:color="?android:attr/colorPrimary" />
+    <solid android:color="@color/fab_label_background_color" />
 </shape>
@@ -4,6 +4,6 @@
    android:viewportHeight="24"
    android:viewportWidth="24">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?android:attr/colorForeground"
        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>
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24"
-    android:viewportWidth="24">
-    <path
-        android:fillColor="#000000"
-        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>
@@ -4,6 +4,6 @@
    android:viewportHeight="24"
    android:viewportWidth="24">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?android:attr/colorForeground"
        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:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="?android:attr/colorBackground"
+        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>
@@ -4,6 +4,6 @@
    android:viewportHeight="24"
    android:viewportWidth="24">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?android:attr/colorForeground"
        android:pathData="M6,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,-6L6,2zM13,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:viewportHeight="24"
+    android:viewportWidth="24">
+    <path
+        android:fillColor="?android:attr/colorBackground"
+        android:pathData="M6,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,-6L6,2zM13,9L13,3.5L18.5,9L13,9z" />
+</vector>
@@ -5,6 +5,6 @@
    android:viewportHeight="24"
    android:viewportWidth="24">
    <path
-        android:fillColor="#FFFFFF"
+        android:fillColor="?android:attr/colorForeground"
        android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
 </vector>
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:width="24dp"
+    android:height="24dp">
+    <path
+        android:fillColor="?android:attr/colorForeground"
+        android:pathData="M3 5L5 5 5 3C3.9 3 3 3.9 3 5Zm0 8l2 0 0 -2 -2 0 0 2zm4 8l2 0 0 -2 -2 0 0 2zM3 9L5 9 5 7 3 7 3 9Zm10 -6l-2 0 0 2 2 0 0 -2zm6 0l0 2 2 0C21 3.9 20.1 3 19 3ZM5 21L5 19 3 19c0 1.1 0.9 2 2 2zm-2 -4l2 0 0 -2 -2 0 0 2zM9 3L7 3 7 5 9 5 9 3Zm2 18l2 0 0 -2 -2 0 0 2zm8 -8l2 0 0 -2 -2 0 0 2zm0 8c1.1 0 2 -0.9 2 -2l-2 0 0 2zm0 -12l2 0 0 -2 -2 0 0 2zm0 8l2 0 0 -2 -2 0 0 2zm-4 4l2 0 0 -2 -2 0 0 2zm0 -16l2 0 0 -2 -2 0 0 2zM7 17L17 17 17 7 7 7 7 17Zm2 -8l6 0 0 6 -6 0 0 -6z" />
+</vector>
@@ -4,6 +4,6 @@
    android:viewportHeight="24"
    android:viewportWidth="24">
    <path
-        android:fillColor="#FFFFFF"
-        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" />
+        android:fillColor="?android:attr/colorForeground"
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
 </vector>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@color/list_item_activated" android:state_activated="true" />
-    <item android:drawable="@android:color/transparent" />
+    <item android:drawable="@color/list_item_activated" android:state_activated="true" /> <!-- TODO(msf): themeify this -->
+    <item android:drawable="@android:color/transparent" /> <!-- TODO(msf): themeify this -->
 </selector>
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/list_item_ripple">
+    android:color="@color/list_item_ripple"> <!-- TODO(msf): themeify this -->
    <item android:drawable="@drawable/list_item_background" />
 </ripple>
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="android.view.View" />
+
+        <import type="com.wireguard.android.model.ApplicationData" />
+
+        <variable
+            name="fragment"
+            type="com.wireguard.android.fragment.AppListDialogFragment" />
+
+        <variable
+            name="appData"
+            type="com.wireguard.android.util.ObservableKeyedList&lt;String, ApplicationData&gt;" />
+    </data>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:minHeight="200dp" >
+
+        <ProgressBar
+            android:id="@+id/progress_bar"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:indeterminate="true"
+            android:visibility="@{appData.isEmpty() ? View.VISIBLE : View.GONE}"/>
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/app_list"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            app:items="@{appData}"
+            app:layout="@{@layout/app_list_item}" />
+
+    </FrameLayout>
+
+
+</layout>
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <data>
+
+        <import type="com.wireguard.android.model.ApplicationData" />
+
+        <variable
+            name="collection"
+            type="com.wireguard.android.util.ObservableKeyedList&lt;String, com.wireguard.android.model.ApplicationData&gt;" />
+
+        <variable
+            name="key"
+            type="String" />
+
+        <variable
+            name="item"
+            type="com.wireguard.android.model.ApplicationData" />
+    </data>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@drawable/list_item_background_anim"
+        android:padding="16dp"
+        android:orientation="horizontal"
+        android:gravity="center_vertical"
+        android:onClick="@{(view) -> item.setExcludedFromTunnel(!item.excludedFromTunnel)}">
+
+        <ImageView
+            android:id="@+id/app_icon"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:src="@{item.icon}" />
+
+        <TextView
+            android:id="@+id/app_name"
+            style="?android:attr/textAppearanceMedium"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:paddingEnd="8dp"
+            android:paddingStart="8dp"
+            android:text="@{key}" />
+
+        <CheckBox
+            android:id="@+id/excluded_checkbox"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:checked="@={item.excludedFromTunnel}" />
+
+    </LinearLayout>
+</layout>
@@ -13,6 +13,10 @@

        <import type="com.wireguard.config.Peer" />

+        <variable
+            name="fragment"
+            type="com.wireguard.android.fragment.TunnelEditorFragment" />
+
        <variable
            name="config"
            type="com.wireguard.config.Config.Observable" />
@@ -96,6 +100,7 @@
                            app:filter="@{KeyInputFilter.newInstance()}" />

                        <Button
+                            style="@style/Widget.AppCompat.Button.Borderless.Colored"
                            android:id="@+id/generate_private_key_button"
                            android:layout_width="96dp"
                            android:layout_height="wrap_content"
@@ -210,6 +215,16 @@
                            android:inputType="number"
                            android:text="@={config.interfaceSection.mtu}"
                            android:textAlignment="center" />
+
+                        <Button
+                            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+                            android:id="@+id/set_excluded_applications"
+                            android:layout_width="wrap_content"
+                            android:layout_height="wrap_content"
+                            android:layout_marginLeft="-8dp"
+                            android:layout_below="@+id/dns_servers_text"
+                            android:onClick="@{fragment::onRequestSetExcludedApplications}"
+                            android:text="@{@plurals/set_excluded_applications(config.interfaceSection.excludedApplicationsCount, config.interfaceSection.excludedApplicationsCount)}" />
                    </RelativeLayout>
                </android.support.v7.widget.CardView>

@@ -223,6 +238,7 @@
                    tools:ignore="UselessLeaf" />

                <Button
+                    style="@style/Widget.AppCompat.Button.Colored"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginBottom="4dp"
@@ -4,6 +4,7 @@

    <data>

+        <import type="android.view.View"/>
        <import type="com.wireguard.android.widget.KeyInputFilter" />

        <variable
@@ -51,7 +52,7 @@
                android:background="@null"
                android:contentDescription="@string/delete"
                android:onClick="@{() -> collection.remove(item)}"
-                android:src="@drawable/ic_action_delete_black" />
+                android:src="@drawable/ic_action_delete" />

            <TextView
                android:id="@+id/public_key_label"
@@ -92,9 +93,21 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:layout_below="@+id/pre_shared_key_text"
+                android:layout_toStartOf="@+id/exclude_private_ips"
                android:labelFor="@+id/allowed_ips_text"
                android:text="@string/allowed_ips" />

+            <CheckBox
+                android:id="@+id/exclude_private_ips"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBaseline="@+id/allowed_ips_label"
+                android:layout_alignParentEnd="true"
+                android:checked="@{item.allowedIPsContainsDefaultRouteModRFC1918}"
+                android:onClick="@{() -> item.toggleExcludePrivateIPs()}"
+                android:text="@string/exclude_private_ips"
+                android:visibility="@{(item.allowedIPsContainsDefaultRoute || item.allowedIPsContainsDefaultRouteModRFC1918) ? View.VISIBLE : View.GONE}" />
+
            <EditText
                android:id="@+id/allowed_ips_text"
                android:layout_width="match_parent"
@@ -29,7 +29,7 @@
            app:items="@{tunnels}"
            app:layout="@{@layout/tunnel_list_item}" />

-        <com.getbase.floatingactionbutton.FloatingActionsMenu
+        <com.wireguard.android.widget.fab.FloatingActionsMenu
            android:id="@+id/create_menu"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
@@ -39,23 +39,23 @@
            app:fab_labelsPosition="left"
            app:layout_dodgeInsetEdges="bottom">

-            <com.getbase.floatingactionbutton.FloatingActionButton
+            <com.wireguard.android.widget.fab.FloatingActionButton
                android:id="@+id/create_empty"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:onClick="@{fragment::onRequestCreateConfig}"
-                app:fab_icon="@drawable/ic_action_edit"
+                app:fab_icon="@drawable/ic_action_edit_inverse"
                app:fab_size="mini"
                app:fab_title="@string/create_empty" />

-            <com.getbase.floatingactionbutton.FloatingActionButton
+            <com.wireguard.android.widget.fab.FloatingActionButton
                android:id="@+id/create_from_file"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                android:onClick="@{fragment::onRequestImportConfig}"
-                app:fab_icon="@drawable/ic_action_open"
+                app:fab_icon="@drawable/ic_action_open_inverse"
                app:fab_size="mini"
                app:fab_title="@string/create_from_file" />
-        </com.getbase.floatingactionbutton.FloatingActionsMenu>
+        </com.wireguard.android.widget.fab.FloatingActionsMenu>
    </android.support.design.widget.CoordinatorLayout>
 </layout>
@@ -6,5 +6,6 @@
        android:alphabeticShortcut="s"
        android:icon="@drawable/ic_settings"
        android:title="@string/settings"
-        app:showAsAction="never" />
+        app:showAsAction="always"
+        android:orderInCategory="1000" />
 </menu>
@@ -1,6 +1,12 @@
 <?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/menu_action_select_all"
+        android:alphabeticShortcut="s"
+        android:icon="@drawable/ic_action_select_all"
+        android:title="@string/select_all"
+        app:showAsAction="always" />
    <item
        android:id="@+id/menu_action_delete"
        android:alphabeticShortcut="d"
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors -->
+    <color name="list_item_activated">#64cfd8dc</color>
+    <color name="list_item_ripple">#a0808e95</color>
+    <color name="fab_label_text_color">#000000</color>
+    <color name="fab_label_background_color">#bbbbbb</color>
+
+    <color name="accent">#BBDEFB</color>
+</resources>
@@ -1,5 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors -->
    <color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 -->
    <color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark -->
+    <color name="fab_label_text_color">#ffffff</color>
+    <color name="fab_label_background_color">#444444</color>
+
+    <color name="accent">#2196F3</color>
 </resources>
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Jason A. Donenfeld	2c7203ab8d	Another bump for misbuild Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 21:13:36 +02:00
Jason A. Donenfeld	d1a812042c	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 18:17:58 +02:00
Jason A. Donenfeld	78d976162d	PeerEditor: put exclusion checkbox next to label Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 18:17:58 +02:00
Jason A. Donenfeld	7078162c69	AppListDialogFragment: add deselect all button Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 18:17:58 +02:00
Jason A. Donenfeld	2742b09b5a	tools: update wg-quick for ExcludedApplications support Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 18:17:58 +02:00
Jason A. Donenfeld	7b28d51cdd	global: move to Apache 2.0 Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 16:28:46 +02:00
Jason A. Donenfeld	d132087b3c	PeerEditor: add exclude private IPs functionality Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 16:28:46 +02:00
Jason A. Donenfeld	124f186983	TunnelEditor: fix nits Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 16:28:46 +02:00
Eric Kuck	500a705531	AppListDialogFragment: add implementation for excluding applications Signed-off-by: Eric Kuck <eric@bluelinelabs.com>	2018-07-06 04:14:19 +02:00
Jason A. Donenfeld	5729947d6c	TunnelEditor: better looking buttons Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-07-06 02:40:11 +02:00
Harsh Shandilya	363d0b9126	android: model: Make some methods static Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-30 21:19:59 +02:00
Harsh Shandilya	e985452f3b	android: FloatingActionsMenu: Don't create labels on ASUS' Android 5 devices They have completely wrecked the framework there and all efforts to work around their absolutely broken software have been in vain, hence let's atleast let users be able to use the app, labels or otherwise. Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-30 21:10:52 +02:00
Harsh Shandilya	5c9643a23b	android: VersionPreference: Handle no-browser-installed case Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-30 21:10:22 +02:00
Harsh Shandilya	0e3e3ae37b	android: Add select all button to action mode Thanks to Jason for suggesting the not-clinically-insane method to go about this. Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-30 21:07:24 +02:00
Harsh Shandilya	b41d473f64	wireguard: Bump snapshot Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-30 21:06:40 +02:00
Jason A. Donenfeld	3de549d2c7	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-25 16:18:57 +02:00
Jason A. Donenfeld	408e9004b0	libwg-quick: add iptables output allowance Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-25 16:16:27 +02:00
Jason A. Donenfeld	e1a66d5766	global: Small cleanups Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-25 16:10:02 +02:00
Harsh Shandilya	99cf2152c4	android: Consolidate getPrefActivity into FragmentUtils Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> [Samuel: Changed static to non-static import] Signed-off-by: Samuel Holland <samuel@sholland.org>	2018-06-23 01:00:07 -05:00
Harsh Shandilya	53e8d425e9	QuickTileService: Remove useless override Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-23 00:57:31 -05:00
Harsh Shandilya	9e5f45da15	gradle: Style Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-23 00:57:31 -05:00
Harsh Shandilya	4c0caa10e9	treewide: Optimize imports Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-23 00:57:31 -05:00
Samuel Holland	b9991e4229	config: Refactor IPCidr and use of InetAddress Use a canonically-named utility class to tack on methods to the existing InetAddress class. Rename IPCidr to InetNetwork so it better matches InetAddress and is more pronouceable :) While here, simplify the constructor and toString() functions, and properly implement hashCode(). Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:59:44 -05:00
Samuel Holland	4acee49d4b	util: Extract non-Android utility interfaces As part of a refactoring that will likely introduce more custom collection classes, move the non-Android-specific parts outside the com.wireguard.android package. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:59:44 -05:00
Samuel Holland	d3a8291a7a	crypto: Slightly Java-ify the Curve25519 implementation Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:59:42 -05:00
Samuel Holland	bcae77b989	app: Regularly scheduled gradle updates Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:35:54 -05:00
Samuel Holland	de75ff4bea	idea: Disable an unwanted inspection Android Studio isn't smart enough to realize that the public/private keys and the keypair are effectively the same thing. Just turn off the inspection because it's usually tripped by intentional things. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:33:36 -05:00
Jason A. Donenfeld	b10a6171a5	Application: make lock final Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-17 22:34:22 +02:00
Jason A. Donenfeld	6534f45a3a	application: style fix Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-17 14:53:31 +02:00
Jason A. Donenfeld	373145d30e	Version bump for clat fix Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-17 05:25:42 +02:00
Jason A. Donenfeld	5feea74f28	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-14 05:07:15 +02:00
Jason A. Donenfeld	e8891d775b	global: supply backend asynchronously We can't block for IO, so move everything to async workers or to callbacks. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-14 05:06:18 +02:00
Jason A. Donenfeld	0f128f99a1	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-12 05:46:02 +02:00
Jason A. Donenfeld	61e3441bfb	Application: require rootshell to use wgquick backend Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-12 05:42:24 +02:00
Jason A. Donenfeld	15e10d8fde	ToolsInstaller: safer state machine Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-10 05:17:09 +02:00
Jason A. Donenfeld	ea72e8b656	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:59:47 +02:00
Jason A. Donenfeld	2ca27c2783	BaseActivity: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:49:15 +02:00
Jason A. Donenfeld	f190db0754	BootShutdownReceiver: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:37:28 +02:00
Jason A. Donenfeld	8d27570eea	Backend: abstract version information Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:35:07 +02:00
Jason A. Donenfeld	24605c9c01	Give Samuel heart attack by removing Dagger Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:12:42 +02:00
Jason A. Donenfeld	7b59353910	VersionPreference: account for checking state and move away from tools installer Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 03:27:06 +02:00
Jason A. Donenfeld	ca7f4e5be9	FloatingActionMenu: 5.1 requires explicit text color Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-06 03:12:29 +02:00
Harsh Shandilya	ab95ac83c9	MainActivity: Fix style Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-06 02:07:26 +02:00
Jason A. Donenfeld	51fb57433b	ToolsInstallerPreference: do not check for magisk on main thread Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-06 00:29:44 +02:00
Harsh Shandilya	0496b94aa8	build: Allow building release artifacts in-tree This change avoids all need for changing any file under VCS to insert signing keys and configs for release builds. Example contents of keystore.properties ``` // Location of keystore, relative to module build.gradle, // in this case, of the app module storeFile=../wireguard.jks storePassword=b3ty0uc4nth4xxth1s keyAlias=wireguard keyPassword=4ndr01dsux ``` Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 19:58:34 +05:30
Harsh Shandilya	d8d6e99df1	MainActivity: Silence useless warning Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 19:52:08 +05:30
Jason A. Donenfeld	377ba1c9d1	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 16:07:56 +02:00
Jason A. Donenfeld	8ebeeb6d90	FloatingActionMenu: use appcompat theme Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 16:01:38 +02:00
Harsh Shandilya	3c3de065c6	MainActivity: collapse action menu on toolbar touch Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 15:22:40 +02:00
Jason A. Donenfeld	a17ec6b1f7	ToolsInstaller: allow installing as Magisk module Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 06:17:00 +02:00
Jason A. Donenfeld	cbf8ac6538	libwg-go: better error when using unpatched Go Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 03:28:16 +02:00
Jason A. Donenfeld	d4b1295e94	ActionBar: show single menu item as toolicon Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 03:09:51 +02:00
Jason A. Donenfeld	db53e17e58	TunnelListFragment: hide menu when going to settings Really the menu should be hidden when clicking on the action bar, too. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 03:05:58 +02:00
Jason A. Donenfeld	f0a3e63743	MainActivity: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:47:59 +02:00
Jason A. Donenfeld	d636e13717	fab: properly get theme color Harsh changed this before, but my original way is what the support library does internally. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:44:32 +02:00
Jason A. Donenfeld	dea60e13c0	libwg-go: more efficient and safer string passing It was unclear when the Go string was actually freed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:18:12 +02:00
Harsh Shandilya	40a30d997d	fab: Remove useless override Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 02:05:35 +02:00
Harsh Shandilya	dba8d0305e	fab: Use themed context to set style Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 02:05:23 +02:00
Jason A. Donenfeld	27072972ab	DarkMode: move to shared preferences listener Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:02:09 +02:00
Jason A. Donenfeld	d56e95c576	MainActivity: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 19:55:27 +02:00
Jason A. Donenfeld	d0ef2c43d9	FloatingActionsMenu: remove unused imports Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 19:12:12 +02:00
Jason A. Donenfeld	0c0c1acc3b	BaseActivity: support android 5 and 6 when clearing drawable cache Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 18:35:18 +02:00
Jason A. Donenfeld	48f796c463	LogExporterPreference: get all past processes Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 17:57:02 +02:00
Jason A. Donenfeld	8aab35a70d	BaseActivity: invalidate icon cache on Android P Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 17:57:02 +02:00
Jason A. Donenfeld	e5f6c24174	Bump version Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 07:16:10 +02:00
Jason A. Donenfeld	4cad06b7ce	app: disable proguard It's mostly a hindrance to debugging. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 07:16:10 +02:00
Jason A. Donenfeld	c4e32328fc	TunnelManager: disable dangerous intents for now We need to think about how to allow this securely. It's not okay for all apps to be allowed to twiddle with VPN settings. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 07:06:28 +02:00
Jason A. Donenfeld	a2ccbf003c	TunnelManager: new intents Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 07:06:28 +02:00
Jason A. Donenfeld	10ca2c8681	Preferences: don't use round icon Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-03 16:15:30 +02:00
Harsh Shandilya	fd63e496e5	Preferences: Move version pref to top and add icon Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-02 19:35:11 +02:00
Jason A. Donenfeld	567503abc7	Backends: print versions somewhere in log Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-02 19:26:33 +02:00
Harsh Shandilya	4671f59c67	android: Cleanup classes - Use final modifer wherever possible - Use try-with-resources for input/output streams Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-02 19:14:56 +02:00
Harsh Shandilya	4986d92f3d	crypto: KeyEncoding: Fix style - Replace python style variable names with camel case - Don't declare multiple variables in the same line Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-02 19:12:30 +02:00
Jason A. Donenfeld	0b1c7cc35f	Topic: John does things differently Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-02 18:44:35 +02:00
Jason A. Donenfeld	9e278c88e6	ExporterPreferences: disable control immediately Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-02 18:38:56 +02:00
Jason A. Donenfeld	c3246060f5	Preferences: add log exporter Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-02 18:35:09 +02:00
Jason A. Donenfeld	b7e025e381	libwg-go: fix style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 18:27:30 +02:00
Jason A. Donenfeld	858ec4c0ab	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 18:01:25 +02:00
Jason A. Donenfeld	65292aaa79	Topic: make reentrant Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 17:34:59 +02:00
Jason A. Donenfeld	3d57eb633e	BaseActivity: flush themed icon cache on theme change The most terrible hack you have ever seen. The drawable cache isn't properly flushed when changing the theme -- a frameworks bug, evidently -- so we work around it by digging deep into the mud. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 16:48:08 +02:00
Jason A. Donenfeld	1e45898d70	Settings: add version Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 16:06:56 +02:00
Jason A. Donenfeld	61431fb579	colors: final touches Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 15:18:23 +02:00
Harsh Shandilya	00d48e867b	ui: Use better list colors in night mode Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 18:42:20 +05:30
Harsh Shandilya	d5df0c10ab	TunnelListFragment: Dejank action mode title When unselecting items, the toolbar briefly says '0 items selected' before it reverts back to the non-action mode toolbar which feels janky at best. To mitigate this, just set a blank title to the action mode toolbar when item count is 0, to facilitate the smoothness of the transition to non-action mode toolbar. Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 18:42:20 +05:30
Harsh Shandilya	af814951f3	fab: Make label responsive to night mode Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 18:42:20 +05:30
Harsh Shandilya	a54a03aa2f	FloatingActionButton: Cleanup declaration of TranslucentLayerDrawable class Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 18:42:20 +05:30
Harsh Shandilya	4edfdd8f3b	FloatingActionButton: Make attribute grabbing not be terrible Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 18:42:19 +05:30
Jason A. Donenfeld	32d669a661	theme: add dark theme with toggle Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 14:57:25 +02:00
Jason A. Donenfeld	918076a670	global: fix theme situation and clean up cruft while adding more cruft Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-01 14:57:25 +02:00
Harsh Shandilya	752e61d1c7	fab: default to app theme colors Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 03:19:26 +02:00
Harsh Shandilya	125f725a03	fab: use AppCompatTextView for label Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 03:17:29 +02:00
Harsh Shandilya	3c84b48f08	fab: cleanup Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-01 03:16:32 +02:00
Jason A. Donenfeld	8c32c32c2b	wg-quick: don't break push notifications Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-31 16:40:50 +02:00
Jason A. Donenfeld	e664a05d4b	KeyEncoding: more constant time Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-30 23:31:20 +02:00
Jason A. Donenfeld	ba4672b422	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-29 19:08:55 +02:00
Jason A. Donenfeld	09833a1ba5	FloatingActionButton: import cleaned up getbase code Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-29 19:03:47 +02:00
Jason A. Donenfeld	ded0191aae	SharedLibraryLoader: introduce to work around Samsung PackageManager bugs Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-29 05:09:37 +02:00
Jason A. Donenfeld	9245e9536a	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-27 19:00:38 +02:00
Jason A. Donenfeld	292df12175	Support always-on-vpn Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-27 18:57:52 +02:00
Jason A. Donenfeld	f988306c17	libwg-go: Saner way to deal with sockets Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-27 18:17:55 +02:00
Jason A. Donenfeld	64ce6cd5a2	EditorFragment: show toast on creation too Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-05-27 04:08:23 +02:00