version: bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
strings: sync translations
2026-07-03 14:05:13 +02:00 · 2020-04-08 00:02:37 -06:00 · 2020-04-08 03:37:01 +05:30 · 2020-04-08 03:34:07 +05:30 · 2020-04-07 14:19:54 +05:30 · 2020-04-07 02:28:34 -06:00
261 changed files with 13555 additions and 6964 deletions
@@ -6,10 +6,12 @@
 /captures/
 /local.properties
 .DS_Store
-.externalNativeBuild/
+.cxx/
 Thumbs.db
 build/
 *.apk
 *.class
 *.dex
 *.iml
+*.jks
+keystore.properties
@@ -1,9 +1,3 @@
-[submodule "app/tools/libmnl"]
-	path = app/tools/libmnl
-	url = https://git.netfilter.org/libmnl/
-[submodule "app/tools/wireguard"]
-	path = app/tools/wireguard
-	url = https://git.zx2c4.com/WireGuard
-[submodule "app/tools/wireguard-go"]
-	path = app/tools/wireguard-go
-	url = https://git.zx2c4.com/wireguard-go
+[submodule "tunnel/tools/wireguard-tools"]
+	path = tunnel/tools/wireguard-tools
+	url = https://git.zx2c4.com/wireguard-tools
@@ -29,16 +29,10 @@
        <emptyLine />
      </value>
    </option>
-    <option name="RIGHT_MARGIN" value="100" />
-    <AndroidXmlCodeStyleSettings>
-      <option name="USE_CUSTOM_SETTINGS" value="true" />
-    </AndroidXmlCodeStyleSettings>
    <JavaCodeStyleSettings>
-      <option name="CLASS_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="NAMES_COUNT_TO_USE_IMPORT_ON_DEMAND" value="99" />
-      <option name="PACKAGES_TO_USE_IMPORT_ON_DEMAND">
-        <value />
-      </option>
+      <option name="GENERATE_FINAL_LOCALS" value="true" />
+      <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
      <option name="IMPORT_LAYOUT_TABLE">
        <value>
          <package name="android" withSubpackages="true" static="false" />
@@ -62,38 +56,21 @@
        </value>
      </option>
    </JavaCodeStyleSettings>
-    <Objective-C-extensions>
-      <file>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" />
-      </file>
-      <class>
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" />
-        <option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" />
-      </class>
-      <extensions>
-        <pair source="cpp" header="h" fileNamingConvention="NONE" />
-        <pair source="c" header="h" fileNamingConvention="NONE" />
-      </extensions>
-    </Objective-C-extensions>
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="kotlinx.android.synthetic" withSubpackages="true" static="false" />
+        </value>
+      </option>
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT" value="10" />
+      <option name="NAME_COUNT_TO_USE_STAR_IMPORT_FOR_MEMBERS" value="10" />
+    </JetCodeStyleSettings>
    <XML>
-      <option name="XML_KEEP_LINE_BREAKS" value="false" />
-      <option name="XML_ALIGN_ATTRIBUTES" value="false" />
-      <option name="XML_SPACE_INSIDE_EMPTY_TAG" value="true" />
      <option name="XML_LEGACY_SETTINGS_IMPORTED" value="true" />
    </XML>
    <codeStyleSettings language="JAVA">
+      <option name="METHOD_ANNOTATION_WRAP" value="0" />
+      <option name="FIELD_ANNOTATION_WRAP" value="0" />
      <arrangement>
        <groups />
        <rules>
@@ -380,7 +357,6 @@
      </arrangement>
    </codeStyleSettings>
    <codeStyleSettings language="XML">
-      <option name="FORCE_REARRANGE_MODE" value="1" />
      <indentOptions>
        <option name="CONTINUATION_INDENT_SIZE" value="4" />
      </indentOptions>
@@ -391,6 +367,7 @@
              <match>
                <AND>
                  <NAME>xmlns:android</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@@ -401,6 +378,7 @@
              <match>
                <AND>
                  <NAME>xmlns:.*</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@@ -412,6 +390,7 @@
              <match>
                <AND>
                  <NAME>.*:id</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
@@ -422,6 +401,7 @@
              <match>
                <AND>
                  <NAME>.*:name</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
@@ -432,6 +412,7 @@
              <match>
                <AND>
                  <NAME>name</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@@ -442,6 +423,7 @@
              <match>
                <AND>
                  <NAME>style</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@@ -452,6 +434,7 @@
              <match>
                <AND>
                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>^$</XML_NAMESPACE>
                </AND>
              </match>
@@ -462,64 +445,12 @@
            <rule>
              <match>
                <AND>
-                  <NAME>.*:layout_width</NAME>
+                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
                </AND>
              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:layout_.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:width</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*:height</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
-            </rule>
-          </section>
-          <section>
-            <rule>
-              <match>
-                <AND>
-                  <NAME>.*</NAME>
-                  <XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
-                </AND>
-              </match>
-              <order>BY_NAME</order>
+              <order>ANDROID_ATTRIBUTE_ORDER</order>
            </rule>
          </section>
          <section>
@@ -527,6 +458,7 @@
              <match>
                <AND>
                  <NAME>.*</NAME>
+                  <XML_ATTRIBUTE />
                  <XML_NAMESPACE>.*</XML_NAMESPACE>
                </AND>
              </match>
@@ -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 WireGuard LLC. All Rights Reserved.&#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>
@@ -1,3 +1,3 @@
 <component name="CopyrightManager">
-  <settings default="GPL-2.0-or-later" />
-</component>
+  <settings default="Default" />
+</component>
@@ -9,7 +9,6 @@
      </option>
      <option name="nonThreadSafeTypes" value="" />
    </inspection_tool>
-    <inspection_tool class="AndroidLintGoogleAppIndexingWarning" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="AndroidLintIconExpectedSize" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AndroidLintNegativeMargin" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AndroidLintTypographyQuotes" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -40,7 +39,9 @@
    <inspection_tool class="AssignmentToLambdaParameter" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AssignmentToSuperclassField" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="AssignmentUsedAsCondition" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="AutoCloseableResource" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="METHOD_MATCHER_CONFIG" value="java.util.Formatter,format,java.io.Writer,append,com.google.common.base.Preconditions,checkNotNull,org.hibernate.Session,close,java.io.PrintWriter,printf,java.util.HashMap,put,java.util.Map,put" />
+    </inspection_tool>
    <inspection_tool class="BadExceptionCaught" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="exceptionsString" value="" />
      <option name="exceptions">
@@ -59,6 +60,9 @@
    <inspection_tool class="CallToStringConcatCanBeReplacedByOperator" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="CannotResolve" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="CastConflictsWithInstanceof" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="CatchMayIgnoreException" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="m_ignoreCatchBlocksWithComments" value="false" />
+    </inspection_tool>
    <inspection_tool class="ChainedEquality" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ClassInitializer" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ClassNameDiffersFromFileName" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -103,9 +107,6 @@
    <inspection_tool class="DoubleLiteralMayBeFloatLiteral" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="DuplicateAlternationBranch" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="DuplicateBooleanBranch" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="DuplicateCondition" enabled="true" level="WARNING" enabled_by_default="true">
-      <option name="ignoreSideEffectConditions" value="true" />
-    </inspection_tool>
    <inspection_tool class="DuplicateDeclarations" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="DynamicRegexReplaceableByCompiledPattern" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ElementOnlyUsedFromTestCode" enabled="false" level="WARNING" enabled_by_default="false" />
@@ -150,7 +151,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">
@@ -197,7 +197,6 @@
    <inspection_tool class="ImplicitSubclassInspection" enabled="false" level="ERROR" enabled_by_default="false" />
    <inspection_tool class="IncompatibleTypes" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="InitializerIssues" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="InnerClassMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="InnerClassReferencedViaSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="InnerClassVariableHidesOuterClassVariable" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="m_ignoreInvisibleFields" value="true" />
@@ -216,7 +215,6 @@
    <inspection_tool class="InstanceofThis" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="InstantiationOfUtilityClass" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="IntLiteralMayBeLongLiteral" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="IntegerDivisionInFloatingPointContext" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="IntegerTypeRequired" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="InterfaceMayBeAnnotatedFunctional" enabled="true" level="INFORMATION" enabled_by_default="true" />
    <inspection_tool class="InterfaceNamingConvention" enabled="false" level="WARNING" enabled_by_default="false">
@@ -295,6 +293,7 @@
      <option name="ignoreForLoopDeclarations" value="true" />
    </inspection_tool>
    <inspection_tool class="MultipleTopLevelClassesInFile" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="MultipleVariablesInDeclaration" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="NamedResource" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="NativeMethodNamingConvention" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="NegatedConditional" enabled="true" level="WARNING" enabled_by_default="true">
@@ -348,7 +347,6 @@
    <inspection_tool class="OverriddenMethodCallDuringObjectConstruction" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="PackageInfoWithoutPackage" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="PointerTypeRequired" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="PointlessNullCheck" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ProblematicVarargsMethodOverride" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ProtectedField" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ProtectedInnerClass" enabled="true" level="WARNING" enabled_by_default="true">
@@ -386,7 +384,6 @@
      <option name="ignorePrivateMethods" value="true" />
    </inspection_tool>
    <inspection_tool class="ReturnOfDateField" enabled="false" level="WARNING" enabled_by_default="false" />
-    <inspection_tool class="ReturnOfInnerClass" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ScalarTypeRequired" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="SerializableClassInSecureContext" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="SetReplaceableByEnumSet" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -396,7 +393,13 @@
    <inspection_tool class="SizeReplaceableByIsEmpty" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="StaticCallOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="StaticFieldReferenceOnSubclass" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="StaticImport" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="StaticImport" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="allowedClasses">
+        <set>
+          <option value="org.junit.Assert" />
+        </set>
+      </option>
+    </inspection_tool>
    <inspection_tool class="StaticInheritance" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="StaticMethodNamingConvention" enabled="false" level="WARNING" enabled_by_default="false">
      <option name="m_regex" value="[a-z][A-Za-z\d]*" />
@@ -434,7 +437,6 @@
    <inspection_tool class="TemplateArgumentsIssues" enabled="true" level="ERROR" enabled_by_default="true" />
    <inspection_tool class="TestMethodWithoutAssertion" enabled="false" level="WARNING" enabled_by_default="false">
      <option name="assertionMethods" value="org.junit.Assert,assert.*|fail.*,junit.framework.Assert,assert.*|fail.*,org.junit.jupiter.api.Assertions,assert.*|fail.*,org.mockito.Mockito,verify.*,org.mockito.InOrder,verify,org.junit.rules.ExpectedException,expect.*,org.hamcrest.MatcherAssert,assertThat" />
-      <option name="assertKeywordIsAssertion" value="false" />
    </inspection_tool>
    <inspection_tool class="TestNGMethodNamingConvention" enabled="false" level="WARNING" enabled_by_default="false" />
    <inspection_tool class="ThisEscapedInConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
@@ -442,7 +444,6 @@
      <option name="ignoreRethrownExceptions" value="true" />
    </inspection_tool>
    <inspection_tool class="ThrowsRuntimeException" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="ToArrayCallWithZeroLengthArrayArgument" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="TooBroadScope" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="m_allowConstructorAsInitializer" value="false" />
      <option name="m_onlyLookAtBlocks" value="true" />
@@ -468,10 +469,8 @@
    <inspection_tool class="UnnecessaryBlockStatement" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="ignoreSwitchBranches" value="false" />
    </inspection_tool>
-    <inspection_tool class="UnnecessaryCallToStringValueOf" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="UnnecessaryConstantArrayCreationExpression" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="UnnecessaryConstructor" enabled="true" level="WARNING" enabled_by_default="true" />
-    <inspection_tool class="UnnecessaryDefault" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="UnnecessaryExplicitNumericCast" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="UnnecessaryFullyQualifiedName" enabled="true" level="WARNING" enabled_by_default="true">
      <option name="m_ignoreJavadoc" value="false" />
@@ -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.
@@ -7,25 +7,30 @@ This is an Android GUI for [WireGuard](https://www.wireguard.com/). It [opportun
 ## Building

 ```
-$ git clone https://git.zx2c4.com/wireguard-android
+$ git clone --recurse-submodules https://git.zx2c4.com/wireguard-android
 $ cd wireguard-android
-$ git submodule init
-$ git submodule update
 $ ./gradlew assembleRelease
 ```

-## License
+macOS users may need [flock(1)](https://github.com/discoteq/flock).

-    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.
+## Embedding

-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
+The tunnel library is [on JCenter](https://bintray.com/wireguard/wireguard-android/wireguard-android/_latestVersion), alongside [extensive class library documentation](https://javadoc.io/doc/com.wireguard.android/tunnel).

-    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.
+```
+implementation 'com.wireguard.android:tunnel:$wireguardTunnelVersion'
+```
+
+The library makes use of Java 8 features, so be sure to support those in your gradle configuration:
+
+```
+compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+}
+```
+
+## Translating
+
+Please help us translate the app into several languages on [our translation platform](https://crowdin.com/project/WireGuard).
@@ -1,52 +0,0 @@
-apply plugin: 'com.android.application'
-
-android {
-    buildToolsVersion '27.0.3'
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
-    }
-    compileSdkVersion 27
-    dataBinding {
-        enabled true
-    }
-    defaultConfig {
-        applicationId 'com.wireguard.android'
-        minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 415
-        versionName '0.0.20180523'
-    }
-    externalNativeBuild {
-        cmake {
-            path 'tools/CMakeLists.txt'
-        }
-    }
-}
-ext {
-    databindingVersion = '3.1.2'
-    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"
-}
@@ -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
@@ -1,141 +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.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 com.wireguard.android.backend.Backend;
-import com.wireguard.android.backend.GoBackend;
-import com.wireguard.android.backend.WgQuickBackend;
-import com.wireguard.android.configStore.ConfigStore;
-import com.wireguard.android.configStore.FileConfigStore;
-import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.AsyncWorker;
-import com.wireguard.android.util.RootShell;
-import com.wireguard.android.util.ToolsInstaller;
-
-import java.io.File;
-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;
-
-    public static ApplicationComponent getComponent() {
-        if (component == null)
-            throw new IllegalStateException("Application instance not yet created");
-        return component;
-    }
-
-    @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();
-
-        Class getBackendType();
-
-        ToolsInstaller getToolsInstaller();
-
-        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;
-        }
-    }
-}
@@ -1,34 +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.android;
-
-import android.content.BroadcastReceiver;
-import android.content.Context;
-import android.content.Intent;
-import android.util.Log;
-
-import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.ExceptionLoggers;
-
-public class BootShutdownReceiver extends BroadcastReceiver {
-    private static final String TAG = "WireGuard/" + BootShutdownReceiver.class.getSimpleName();
-
-    @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();
-        }
-    }
-}
@@ -1,140 +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.android;
-
-import android.annotation.TargetApi;
-import android.content.Intent;
-import android.databinding.Observable;
-import android.databinding.Observable.OnPropertyChangedCallback;
-import android.graphics.drawable.Icon;
-import android.os.Build;
-import android.service.quicksettings.Tile;
-import android.service.quicksettings.TileService;
-import android.util.Log;
-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;
-
-/**
- * Service that maintains the application's custom Quick Settings tile. This service is bound by the
- * system framework as necessary to update the appearance of the tile in the system UI, and to
- * forward click events to the application.
- */
-
-@TargetApi(Build.VERSION_CODES.N)
-public class QuickTileService extends TileService {
-    private static final String TAG = "WireGuard/" + QuickTileService.class.getSimpleName();
-
-    private final OnStateChangedCallback onStateChangedCallback = new OnStateChangedCallback();
-    private final OnTunnelChangedCallback onTunnelChangedCallback = new OnTunnelChangedCallback();
-    private Tunnel tunnel;
-    private TunnelManager tunnelManager;
-
-    @Override
-    public void onClick() {
-        if (tunnel != null) {
-            tunnel.setState(State.TOGGLE).whenComplete(this::onToggleFinished);
-        } else {
-            final Intent intent = new Intent(this, MainActivity.class);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
-            startActivityAndCollapse(intent);
-        }
-    }
-
-    @Override
-    public void onCreate() {
-        super.onCreate();
-        tunnelManager = Application.getComponent().getTunnelManager();
-    }
-
-    @Override
-    public void onStartListening() {
-        tunnelManager.addOnPropertyChangedCallback(onTunnelChangedCallback);
-        if (tunnel != null)
-            tunnel.addOnPropertyChangedCallback(onStateChangedCallback);
-        updateTile();
-    }
-
-    @Override
-    public void onStopListening() {
-        if (tunnel != null)
-            tunnel.removeOnPropertyChangedCallback(onStateChangedCallback);
-        tunnelManager.removeOnPropertyChangedCallback(onTunnelChangedCallback);
-    }
-
-    private void onToggleFinished(@SuppressWarnings("unused") final State state,
-                                  final Throwable throwable) {
-        if (throwable == null)
-            return;
-        final String error = ExceptionLoggers.unwrapMessage(throwable);
-        final String message = getString(R.string.toggle_error, error);
-        Log.e(TAG, message, throwable);
-        Toast.makeText(this, message, Toast.LENGTH_LONG).show();
-    }
-
-    private void updateTile() {
-        // Update the tunnel.
-        final Tunnel newTunnel = tunnelManager.getLastUsedTunnel();
-        if (newTunnel != tunnel) {
-            if (tunnel != null)
-                tunnel.removeOnPropertyChangedCallback(onStateChangedCallback);
-            tunnel = newTunnel;
-            if (tunnel != null)
-                tunnel.addOnPropertyChangedCallback(onStateChangedCallback);
-        }
-        // Update the tile contents.
-        final String label;
-        final int state;
-        final Tile tile = getQsTile();
-        if (tunnel != null) {
-            label = tunnel.getName();
-            state = tunnel.getState() == Tunnel.State.UP ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
-        } else {
-            label = getString(R.string.app_name);
-            state = Tile.STATE_INACTIVE;
-        }
-        if (tile == null)
-            return;
-        tile.setLabel(label);
-        if (tile.getState() != state) {
-            // The icon must be changed every time the state changes, or the shade will not change.
-            final Integer iconResource = state == Tile.STATE_ACTIVE ? R.drawable.ic_tile
-                    : R.drawable.ic_tile_disabled;
-            tile.setIcon(Icon.createWithResource(this, iconResource));
-            tile.setState(state);
-        }
-        tile.updateTile();
-    }
-
-    private final class OnStateChangedCallback extends OnPropertyChangedCallback {
-        @Override
-        public void onPropertyChanged(final Observable sender, final int propertyId) {
-            if (!Objects.equals(sender, tunnel)) {
-                sender.removeOnPropertyChangedCallback(this);
-                return;
-            }
-            if (propertyId != 0 && propertyId != BR.state)
-                return;
-            updateTile();
-        }
-    }
-
-    private final class OnTunnelChangedCallback extends OnPropertyChangedCallback {
-        @Override
-        public void onPropertyChanged(final Observable sender, final int propertyId) {
-            if (propertyId != 0 && propertyId != BR.lastUsedTunnel)
-                return;
-            updateTile();
-        }
-    }
-}
@@ -1,108 +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.android.activity;
-
-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;
-import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.TunnelManager;
-
-import java.util.Objects;
-
-/**
- * Base class for activities that need to remember the currently-selected tunnel.
- */
-
-public abstract class BaseActivity extends AppCompatActivity {
-    private static final String KEY_SELECTED_TUNNEL = "selected_tunnel";
-
-    private final SelectionChangeRegistry selectionChangeRegistry = new SelectionChangeRegistry();
-    private Tunnel selectedTunnel;
-
-    public void addOnSelectedTunnelChangedListener(
-            final OnSelectedTunnelChangedListener listener) {
-        selectionChangeRegistry.add(listener);
-    }
-
-    public Tunnel getSelectedTunnel() {
-        return selectedTunnel;
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        // Restore the saved tunnel if there is one; otherwise grab it from the arguments.
-        String savedTunnelName = null;
-        if (savedInstanceState != null)
-            savedTunnelName = savedInstanceState.getString(KEY_SELECTED_TUNNEL);
-        else if (getIntent() != null)
-            savedTunnelName = getIntent().getStringExtra(KEY_SELECTED_TUNNEL);
-        if (savedTunnelName != null) {
-            final TunnelManager tunnelManager = Application.getComponent().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);
-            }
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(final Bundle outState) {
-        if (selectedTunnel != null)
-            outState.putString(KEY_SELECTED_TUNNEL, selectedTunnel.getName());
-        super.onSaveInstanceState(outState);
-    }
-
-    protected abstract void onSelectedTunnelChanged(Tunnel oldTunnel, Tunnel newTunnel);
-
-    public void removeOnSelectedTunnelChangedListener(
-            final OnSelectedTunnelChangedListener listener) {
-        selectionChangeRegistry.remove(listener);
-    }
-
-    public void setSelectedTunnel(final Tunnel tunnel) {
-        final Tunnel oldTunnel = selectedTunnel;
-        if (Objects.equals(oldTunnel, tunnel))
-            return;
-        selectedTunnel = tunnel;
-        onSelectedTunnelChanged(oldTunnel, tunnel);
-        selectionChangeRegistry.notifyCallbacks(oldTunnel, 0, tunnel);
-    }
-
-    public interface OnSelectedTunnelChangedListener {
-        void onSelectedTunnelChanged(Tunnel oldTunnel, Tunnel newTunnel);
-    }
-
-    private static final class SelectionChangeNotifier
-            extends NotifierCallback<OnSelectedTunnelChangedListener, Tunnel, Tunnel> {
-        @Override
-        public void onNotifyCallback(final OnSelectedTunnelChangedListener listener,
-                                     final Tunnel oldTunnel, final int ignored,
-                                     final Tunnel newTunnel) {
-            listener.onSelectedTunnelChanged(oldTunnel, newTunnel);
-        }
-    }
-
-    private static final class SelectionChangeRegistry
-            extends CallbackRegistry<OnSelectedTunnelChangedListener, Tunnel, Tunnel> {
-        private SelectionChangeRegistry() {
-            super(new SelectionChangeNotifier());
-        }
-    }
-}
@@ -1,163 +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.android.activity;
-
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
-import android.view.Menu;
-import android.view.MenuItem;
-
-import com.wireguard.android.R;
-import com.wireguard.android.fragment.TunnelDetailFragment;
-import com.wireguard.android.fragment.TunnelEditorFragment;
-import com.wireguard.android.fragment.TunnelListFragment;
-import com.wireguard.android.model.Tunnel;
-
-import java9.util.stream.Stream;
-
-/**
- * CRUD interface for WireGuard tunnels. This activity serves as the main entry point to the
- * WireGuard application, and contains several fragments for listing, viewing details of, and
- * editing the configuration and interface state of WireGuard tunnels.
- */
-
-public class MainActivity extends BaseActivity {
-    private static final String KEY_STATE = "fragment_state";
-    private static final String TAG = "WireGuard/" + MainActivity.class.getSimpleName();
-    private State state = State.EMPTY;
-
-    private boolean moveToState(final State nextState) {
-        if (state == nextState)
-            return false;
-        final FragmentManager fragmentManager = getSupportFragmentManager();
-        Log.i(TAG, "Moving from " + state.name() + " to " + nextState.name());
-        if (nextState.layer > state.layer + 1) {
-            moveToState(State.ofLayer(state.layer + 1));
-            moveToState(nextState);
-            return true;
-        } else if (nextState.layer == state.layer + 1) {
-            final Fragment fragment = Fragment.instantiate(this, nextState.fragment);
-            final FragmentTransaction transaction = fragmentManager.beginTransaction()
-                    .replace(R.id.master_fragment, fragment)
-                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
-            if (state.layer > 0)
-                transaction.addToBackStack(null);
-            transaction.commit();
-        } else if (nextState.layer == state.layer - 1) {
-            if (fragmentManager.getBackStackEntryCount() == 0)
-                return false;
-            fragmentManager.popBackStack();
-        } else if (nextState.layer < state.layer - 1) {
-            moveToState(State.ofLayer(state.layer - 1));
-            moveToState(nextState);
-            return true;
-        }
-        state = nextState;
-        if (state.layer <= State.LIST.layer)
-            setSelectedTunnel(null);
-        updateActionBar();
-        return true;
-    }
-
-    @Override
-    public void onBackPressed() {
-        TunnelListFragment fragment = null;
-        try {
-            fragment =
-                    ((TunnelListFragment)
-                            getSupportFragmentManager().getFragments().get(0));
-        } catch (final ClassCastException ignored) {
-        }
-        if (fragment == null || !(fragment.collapseActionMenu())) {
-            if (!moveToState(State.ofLayer(state.layer - 1)))
-                super.onBackPressed();
-        }
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main_activity);
-        if (savedInstanceState != null && savedInstanceState.getString(KEY_STATE) != null)
-            state = State.valueOf(savedInstanceState.getString(KEY_STATE));
-        if (state == State.EMPTY) {
-            State initialState = getSelectedTunnel() != null ? State.DETAIL : State.LIST;
-            if (getIntent() != null && getIntent().getStringExtra(KEY_STATE) != null)
-                initialState = State.valueOf(getIntent().getStringExtra(KEY_STATE));
-            moveToState(initialState);
-        }
-        updateActionBar();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(final Menu menu) {
-        getMenuInflater().inflate(R.menu.main_activity, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                // The back arrow in the action bar should act the same as the back button.
-                moveToState(State.ofLayer(state.layer - 1));
-                return true;
-            case R.id.menu_action_edit:
-                if (getSelectedTunnel() != null)
-                    moveToState(State.EDITOR);
-                return true;
-            case R.id.menu_action_save:
-                // This menu item is handled by the editor fragment.
-                return false;
-            case R.id.menu_settings:
-                startActivity(new Intent(this, SettingsActivity.class));
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    protected void onSaveInstanceState(final Bundle outState) {
-        outState.putString(KEY_STATE, state.name());
-        super.onSaveInstanceState(outState);
-    }
-
-
-    @Override
-    protected void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
-        moveToState(newTunnel != null ? State.DETAIL : State.LIST);
-    }
-
-    private void updateActionBar() {
-        if (getSupportActionBar() != null)
-            getSupportActionBar().setDisplayHomeAsUpEnabled(state.layer > State.LIST.layer);
-    }
-
-    private enum State {
-        EMPTY(null, 0),
-        LIST(TunnelListFragment.class, 1),
-        DETAIL(TunnelDetailFragment.class, 2),
-        EDITOR(TunnelEditorFragment.class, 3);
-
-        private final String fragment;
-        private final int layer;
-
-        State(final Class<? extends Fragment> fragment, final int layer) {
-            this.fragment = fragment != null ? fragment.getName() : null;
-            this.layer = layer;
-        }
-
-        private static State ofLayer(final int layer) {
-            return Stream.of(State.values()).filter(s -> s.layer == layer).findFirst().get();
-        }
-    }
-}
@@ -1,103 +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.android.activity;
-
-import android.content.pm.PackageManager;
-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.view.MenuItem;
-
-import com.wireguard.android.Application;
-import com.wireguard.android.R;
-import com.wireguard.android.backend.WgQuickBackend;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-/**
- * Interface for changing application-global persistent settings.
- */
-
-public class SettingsActivity extends AppCompatActivity {
-    private final Map<Integer, PermissionRequestCallback> permissionRequestCallbacks = new HashMap<>();
-    private int permissionRequestCounter;
-
-    public void ensurePermissions(final String[] permissions, final PermissionRequestCallback cb) {
-        final List<String> needPermissions = new ArrayList<>(permissions.length);
-        for (final String permission : permissions) {
-            if (ContextCompat.checkSelfPermission(this, permission)
-                    != PackageManager.PERMISSION_GRANTED)
-                needPermissions.add(permission);
-        }
-        if (needPermissions.isEmpty()) {
-            final int[] granted = new int[permissions.length];
-            Arrays.fill(granted, PackageManager.PERMISSION_GRANTED);
-            cb.done(permissions, granted);
-            return;
-        }
-        final int idx = permissionRequestCounter++;
-        permissionRequestCallbacks.put(idx, cb);
-        ActivityCompat.requestPermissions(this,
-                needPermissions.toArray(new String[needPermissions.size()]), idx);
-    }
-
-    @Override
-    protected void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) {
-            getSupportFragmentManager().beginTransaction()
-                    .add(android.R.id.content, new SettingsFragment())
-                    .commit();
-        }
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onRequestPermissionsResult(final int requestCode,
-                                           @NonNull final String[] permissions,
-                                           @NonNull final int[] grantResults) {
-        final PermissionRequestCallback f = permissionRequestCallbacks.get(requestCode);
-        if (f != null) {
-            permissionRequestCallbacks.remove(requestCode);
-            f.done(permissions, grantResults);
-        }
-    }
-
-    public interface PermissionRequestCallback {
-        void done(String[] permissions, int[] grantResults);
-    }
-
-    public static class SettingsFragment extends PreferenceFragmentCompat {
-        @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);
-            }
-        }
-    }
-}
@@ -1,34 +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.android.activity;
-
-import android.os.Bundle;
-
-import com.wireguard.android.fragment.TunnelEditorFragment;
-import com.wireguard.android.model.Tunnel;
-
-/**
- * Standalone activity for creating tunnels.
- */
-
-public class TunnelCreatorActivity extends BaseActivity {
-    @Override
-    @SuppressWarnings("UnnecessaryFullyQualifiedName")
-    protected void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) {
-            getSupportFragmentManager().beginTransaction()
-                    .add(android.R.id.content, new TunnelEditorFragment())
-                    .commit();
-        }
-    }
-
-    @Override
-    protected void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
-        finish();
-    }
-}
@@ -1,65 +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.android.backend;
-
-import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.Tunnel.State;
-import com.wireguard.android.model.Tunnel.Statistics;
-import com.wireguard.config.Config;
-
-import java.util.Set;
-
-/**
- * Interface for implementations of the WireGuard secure network tunnel.
- */
-
-public interface Backend {
-    /**
-     * Update the volatile configuration of a running tunnel and return the resulting configuration.
-     * If the tunnel is not up, return the configuration that would result (if known), or else
-     * simply return the given configuration.
-     *
-     * @param tunnel The tunnel to apply the configuration to.
-     * @param config The new configuration for this tunnel.
-     * @return The updated configuration of the tunnel.
-     */
-    Config applyConfig(Tunnel tunnel, Config config) throws Exception;
-
-    /**
-     * Enumerate the names of currently-running tunnels.
-     *
-     * @return The set of running tunnel names.
-     */
-    Set<String> enumerate();
-
-    /**
-     * Get the actual state of a tunnel.
-     *
-     * @param tunnel The tunnel to examine the state of.
-     * @return The state of the tunnel.
-     */
-    State getState(Tunnel tunnel) throws Exception;
-
-    /**
-     * Get statistics about traffic and errors on this tunnel. If the tunnel is not running, the
-     * statistics object will be filled with zero values.
-     *
-     * @param tunnel The tunnel to retrieve statistics for.
-     * @return The statistics for the tunnel.
-     */
-    Statistics getStatistics(Tunnel tunnel) throws Exception;
-
-    /**
-     * Set the state of a tunnel.
-     *
-     * @param tunnel The tunnel to control the state of.
-     * @param state  The new state for this tunnel. Must be {@code UP}, {@code DOWN}, or
-     *               {@code TOGGLE}.
-     * @return The updated state of the tunnel.
-     */
-    State setState(Tunnel tunnel, State state) throws Exception;
-}
@@ -1,229 +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.android.backend;
-
-import android.content.Context;
-import android.content.Intent;
-import android.os.ParcelFileDescriptor;
-import android.support.v4.util.ArraySet;
-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.config.Config;
-import com.wireguard.config.IPCidr;
-import com.wireguard.config.Interface;
-import com.wireguard.config.Peer;
-import com.wireguard.crypto.KeyEncoding;
-
-import java.net.InetAddress;
-import java.util.Collections;
-import java.util.Formatter;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.TimeoutException;
-
-import java9.util.concurrent.CompletableFuture;
-
-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) {
-        this.context = context;
-    }
-
-    private static native int wgGetSocketV4(int handle);
-
-    private static native int wgGetSocketV6(int handle);
-
-    private static native void wgTurnOff(int handle);
-
-    private static native int wgTurnOn(String ifName, int tunFd, String settings);
-
-    @Override
-    public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
-        if (tunnel.getState() == State.UP) {
-            // Restart the tunnel to apply the new config.
-            setStateInternal(tunnel, tunnel.getConfig(), State.DOWN);
-            try {
-                setStateInternal(tunnel, config, State.UP);
-            } catch (final Exception e) {
-                // The new configuration didn't work, so try to go back to the old one.
-                setStateInternal(tunnel, tunnel.getConfig(), State.UP);
-                throw e;
-            }
-        }
-        return config;
-    }
-
-    @Override
-    public Set<String> enumerate() {
-        if (currentTunnel != null) {
-            final Set<String> runningTunnels = new ArraySet<>();
-            runningTunnels.add(currentTunnel.getName());
-            return runningTunnels;
-        }
-        return Collections.emptySet();
-    }
-
-    @Override
-    public State getState(final Tunnel tunnel) {
-        return currentTunnel == tunnel ? State.UP : State.DOWN;
-    }
-
-    @Override
-    public Statistics getStatistics(final Tunnel tunnel) {
-        return new Statistics();
-    }
-
-    @Override
-    public State setState(final Tunnel tunnel, State state) throws Exception {
-        final State originalState = getState(tunnel);
-        if (state == State.TOGGLE)
-            state = originalState == State.UP ? State.DOWN : State.UP;
-        if (state == originalState)
-            return originalState;
-        if (state == State.UP && currentTunnel != null)
-            throw new IllegalStateException("Only one userspace tunnel can run at a time");
-        Log.d(TAG, "Changing tunnel " + tunnel.getName() + " to state " + state);
-        setStateInternal(tunnel, tunnel.getConfig(), state);
-        return getState(tunnel);
-    }
-
-    private void setStateInternal(final Tunnel tunnel, final Config config, final State state)
-            throws Exception {
-
-        if (state == State.UP) {
-            Log.i(TAG, "Bringing tunnel up");
-
-            if (VpnService.prepare(context) != null)
-                throw new Exception("VPN service not authorized by user");
-
-            final VpnService service;
-            if (!vpnService.isDone())
-                startVpnService();
-
-            try {
-                service = vpnService.get(2, TimeUnit.SECONDS);
-            } catch (final TimeoutException e) {
-                throw new Exception("Unable to start Android VPN service", e);
-            }
-
-            if (currentTunnelHandle != -1) {
-                Log.w(TAG, "Tunnel already up");
-                return;
-            }
-
-            // Build config
-            final Interface iface = config.getInterface();
-            final String goConfig;
-            try (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())));
-                if (iface.getListenPort() != 0)
-                    fmt.format("listen_port=%d\n", config.getInterface().getListenPort());
-                for (final Peer peer : config.getPeers()) {
-                    if (peer.getPublicKey() != null)
-                        fmt.format("public_key=%s\n", KeyEncoding.keyToHex(KeyEncoding.keyFromBase64(peer.getPublicKey())));
-                    if (peer.getPreSharedKey() != null)
-                        fmt.format("preshared_key=%s\n", KeyEncoding.keyToHex(KeyEncoding.keyFromBase64(peer.getPreSharedKey())));
-                    if (peer.getEndpoint() != null)
-                        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()) {
-                        fmt.format("allowed_ip=%s\n", addr.toString());
-                    }
-                }
-                goConfig = fmt.toString();
-            }
-
-            // Create the vpn tunnel with android API
-            final VpnService.Builder builder = service.getBuilder();
-            builder.setSession(tunnel.getName());
-
-            for (final IPCidr addr : config.getInterface().getAddresses())
-                builder.addAddress(addr.getAddress(), addr.getCidr());
-
-            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());
-            }
-
-            int mtu = config.getInterface().getMtu();
-            if (mtu == 0)
-                mtu = 1280;
-            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);
-            if (currentTunnelHandle < 0)
-                throw new Exception("Unable to turn tunnel on (wgTurnOn return " + currentTunnelHandle + ')');
-
-            currentTunnel = tunnel;
-
-            service.protect(wgGetSocketV4(currentTunnelHandle));
-            service.protect(wgGetSocketV6(currentTunnelHandle));
-        } else {
-            Log.i(TAG, "Bringing tunnel down");
-
-            if (currentTunnelHandle == -1) {
-                Log.w(TAG, "Tunnel already down");
-                return;
-            }
-
-            wgTurnOff(currentTunnelHandle);
-            currentTunnel = null;
-            currentTunnelHandle = -1;
-        }
-    }
-
-    private void startVpnService() {
-        context.startService(new Intent(context, VpnService.class));
-    }
-
-    public static class VpnService extends android.net.VpnService {
-        public Builder getBuilder() {
-            return new Builder();
-        }
-
-        @Override
-        public void onCreate() {
-            vpnService.complete(this);
-            super.onCreate();
-        }
-
-        @Override
-        public void onDestroy() {
-            for (final Tunnel tunnel : Application.getComponent().getTunnelManager().getTunnels()) {
-                if (tunnel != null && tunnel.getState() != State.DOWN)
-                    tunnel.setState(State.DOWN);
-            }
-            vpnService = vpnService.newIncompleteFuture();
-            super.onDestroy();
-        }
-    }
-}
@@ -1,128 +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.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;
-import java.io.FileOutputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import java9.util.stream.Collectors;
-import java9.util.stream.Stream;
-
-/**
- * WireGuard backend that uses {@code wg-quick} to implement tunnel configuration.
- */
-
-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) {
-        localTemporaryDir = new File(context.getCacheDir(), "tmp");
-        this.rootShell = rootShell;
-        this.toolsInstaller = toolsInstaller;
-    }
-
-    @Override
-    public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
-        if (tunnel.getState() == State.UP) {
-            // Restart the tunnel to apply the new config.
-            setStateInternal(tunnel, tunnel.getConfig(), State.DOWN);
-            try {
-                setStateInternal(tunnel, config, State.UP);
-            } catch (final Exception e) {
-                // The new configuration didn't work, so try to go back to the old one.
-                setStateInternal(tunnel, tunnel.getConfig(), State.UP);
-                throw e;
-            }
-        }
-        return config;
-    }
-
-    @Override
-    public Set<String> enumerate() {
-        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())
-                return Collections.emptySet();
-        } catch (final Exception e) {
-            Log.w(TAG, "Unable to enumerate running tunnels", e);
-            return Collections.emptySet();
-        }
-        // wg puts all interface names on the same line. Split them into separate elements.
-        return Stream.of(output.get(0).split(" ")).collect(Collectors.toUnmodifiableSet());
-    }
-
-    @Override
-    public State getState(final Tunnel tunnel) {
-        return enumerate().contains(tunnel.getName()) ? State.UP : State.DOWN;
-    }
-
-    @Override
-    public Statistics getStatistics(final Tunnel tunnel) {
-        return new Statistics();
-    }
-
-    @Override
-    public State setState(final Tunnel tunnel, State state) throws Exception {
-        final State originalState = getState(tunnel);
-        if (state == State.TOGGLE)
-            state = originalState == State.UP ? State.DOWN : State.UP;
-        if (state == originalState)
-            return originalState;
-        Log.d(TAG, "Changing tunnel " + tunnel.getName() + " to state " + state);
-        toolsInstaller.ensureToolsAvailable();
-        setStateInternal(tunnel, tunnel.getConfig(), state);
-        return getState(tunnel);
-    }
-
-    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)) {
-            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
-        }
-        final String command = String.format("wg-quick %s '%s'",
-                state.toString().toLowerCase(), tempFile.getAbsolutePath());
-        final int result = rootShell.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,103 +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.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;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.Set;
-
-import java9.util.stream.Collectors;
-import java9.util.stream.Stream;
-
-/**
- * Configuration store that uses a {@code wg-quick}-style file for each configured tunnel.
- */
-
-public final class FileConfigStore implements ConfigStore {
-    private static final String TAG = "WireGuard/" + FileConfigStore.class.getSimpleName();
-
-    private final Context context;
-
-    public FileConfigStore(@ApplicationContext final Context context) {
-        this.context = context;
-    }
-
-    @Override
-    public Config create(final String name, final Config config) throws IOException {
-        Log.d(TAG, "Creating configuration for tunnel " + name);
-        final File file = fileFor(name);
-        if (!file.createNewFile())
-            throw new IOException("Configuration file " + file.getName() + " already exists");
-        try (FileOutputStream stream = new FileOutputStream(file, false)) {
-            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
-        }
-        return config;
-    }
-
-    @Override
-    public void delete(final String name) throws IOException {
-        Log.d(TAG, "Deleting configuration for tunnel " + name);
-        final File file = fileFor(name);
-        if (!file.delete())
-            throw new IOException("Cannot delete configuration file " + file.getName());
-    }
-
-    @Override
-    public Set<String> enumerate() {
-        return Stream.of(context.fileList())
-                .filter(name -> name.endsWith(".conf"))
-                .map(name -> name.substring(0, name.length() - ".conf".length()))
-                .collect(Collectors.toUnmodifiableSet());
-    }
-
-    private File fileFor(final String name) {
-        return new File(context.getFilesDir(), name + ".conf");
-    }
-
-    @Override
-    public Config load(final String name) throws IOException {
-        try (FileInputStream stream = new FileInputStream(fileFor(name))) {
-            return Config.from(stream);
-        }
-    }
-
-    @Override
-    public void rename(final String name, final String replacement) throws IOException {
-        Log.d(TAG, "Renaming configuration for tunnel " + name + " to " + replacement);
-        final File file = fileFor(name);
-        final File replacementFile = fileFor(replacement);
-        if (!replacementFile.createNewFile())
-            throw new IOException("Configuration for " + replacement + " already exists");
-        if (!file.renameTo(replacementFile)) {
-            if (!replacementFile.delete())
-                Log.w(TAG, "Couldn't delete marker file for new name " + replacement);
-            throw new IOException("Cannot rename configuration file " + file.getName());
-        }
-    }
-
-    @Override
-    public Config save(final String name, final Config config) throws IOException {
-        Log.d(TAG, "Saving configuration for tunnel " + name);
-        final File file = fileFor(name);
-        if (!file.isFile())
-            throw new FileNotFoundException("Configuration file " + file.getName() + " not found");
-        try (FileOutputStream stream = new FileOutputStream(file, false)) {
-            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
-        }
-        return config;
-    }
-}
@@ -1,99 +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.android.databinding;
-
-import android.databinding.BindingAdapter;
-import android.databinding.ObservableList;
-import android.databinding.adapters.ListenerUtil;
-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;
-
-/**
- * Static methods for use by generated code in the Android data binding library.
- */
-
-@SuppressWarnings("unused")
-public final class BindingAdapters {
-    private BindingAdapters() {
-        // Prevent instantiation.
-    }
-
-    @BindingAdapter("checked")
-    public static void setChecked(final ToggleSwitch view, final boolean checked) {
-        view.setCheckedInternal(checked);
-    }
-
-    @BindingAdapter("filter")
-    public static void setFilter(final TextView view, final InputFilter filter) {
-        view.setFilters(new InputFilter[]{filter});
-    }
-
-    @BindingAdapter({"items", "layout"})
-    public static <E> void setItems(final LinearLayout view,
-                                    final ObservableList<E> oldList, final int oldLayoutId,
-                                    final ObservableList<E> newList, final int newLayoutId) {
-        if (oldList == newList && oldLayoutId == newLayoutId)
-            return;
-        ItemChangeListener<E> listener = ListenerUtil.getListener(view, R.id.item_change_listener);
-        // If the layout changes, any existing listener must be replaced.
-        if (listener != null && oldList != null && oldLayoutId != newLayoutId) {
-            listener.setList(null);
-            listener = null;
-            // Stop tracking the old listener.
-            ListenerUtil.trackListener(view, null, R.id.item_change_listener);
-        }
-        // Avoid adding a listener when there is no new list or layout.
-        if (newList == null || newLayoutId == 0)
-            return;
-        if (listener == null) {
-            listener = new ItemChangeListener<>(view, newLayoutId);
-            ListenerUtil.trackListener(view, listener, R.id.item_change_listener);
-        }
-        // Either the list changed, or this is an entirely new listener because the layout changed.
-        listener.setList(newList);
-    }
-
-    @BindingAdapter({"items", "layout"})
-    public static <K, E extends Keyed<? extends K>>
-    void setItems(final ListView view,
-                  final ObservableKeyedList<K, E> oldList, final int oldLayoutId,
-                  final ObservableKeyedList<K, E> newList, final int newLayoutId) {
-        if (oldList == newList && oldLayoutId == newLayoutId)
-            return;
-        // The ListAdapter interface is not generic, so this cannot be checked.
-        @SuppressWarnings("unchecked") ObservableKeyedListAdapter<K, E> adapter =
-                (ObservableKeyedListAdapter<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 ObservableKeyedListAdapter<>(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,135 +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.android.databinding;
-
-import android.databinding.DataBindingUtil;
-import android.databinding.ObservableList;
-import android.databinding.ViewDataBinding;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.wireguard.android.BR;
-
-import java.lang.ref.WeakReference;
-
-/**
- * Helper class for binding an ObservableList to the children of a ViewGroup.
- */
-
-class ItemChangeListener<T> {
-    private final OnListChangedCallback<T> callback = new OnListChangedCallback<>(this);
-    private final ViewGroup container;
-    private final int layoutId;
-    private final LayoutInflater layoutInflater;
-    private ObservableList<T> list;
-
-    ItemChangeListener(final ViewGroup container, final int layoutId) {
-        this.container = container;
-        this.layoutId = layoutId;
-        layoutInflater = LayoutInflater.from(container.getContext());
-    }
-
-    private View getView(final int position, final View convertView) {
-        ViewDataBinding binding = DataBindingUtil.getBinding(convertView);
-        if (binding == null)
-            binding = DataBindingUtil.inflate(layoutInflater, layoutId, container, false);
-        binding.setVariable(BR.collection, list);
-        binding.setVariable(BR.item, list.get(position));
-        binding.executePendingBindings();
-        return binding.getRoot();
-    }
-
-    void setList(final ObservableList<T> newList) {
-        if (list != null)
-            list.removeOnListChangedCallback(callback);
-        list = newList;
-        if (list != null) {
-            list.addOnListChangedCallback(callback);
-            callback.onChanged(list);
-        } else {
-            container.removeAllViews();
-        }
-    }
-
-    private static final class OnListChangedCallback<T>
-            extends ObservableList.OnListChangedCallback<ObservableList<T>> {
-
-        private final WeakReference<ItemChangeListener<T>> weakListener;
-
-        private OnListChangedCallback(final ItemChangeListener<T> listener) {
-            weakListener = new WeakReference<>(listener);
-        }
-
-        @Override
-        public void onChanged(final ObservableList<T> sender) {
-            final ItemChangeListener<T> listener = weakListener.get();
-            if (listener != null) {
-                // TODO: recycle views
-                listener.container.removeAllViews();
-                for (int i = 0; i < sender.size(); ++i)
-                    listener.container.addView(listener.getView(i, null));
-            } else {
-                sender.removeOnListChangedCallback(this);
-            }
-        }
-
-        @Override
-        public void onItemRangeChanged(final ObservableList<T> sender, final int positionStart,
-                                       final int itemCount) {
-            final ItemChangeListener<T> listener = weakListener.get();
-            if (listener != null) {
-                for (int i = positionStart; i < positionStart + itemCount; ++i) {
-                    final View child = listener.container.getChildAt(i);
-                    listener.container.removeViewAt(i);
-                    listener.container.addView(listener.getView(i, child));
-                }
-            } else {
-                sender.removeOnListChangedCallback(this);
-            }
-        }
-
-        @Override
-        public void onItemRangeInserted(final ObservableList<T> sender, final int positionStart,
-                                        final int itemCount) {
-            final ItemChangeListener<T> listener = weakListener.get();
-            if (listener != null) {
-                for (int i = positionStart; i < positionStart + itemCount; ++i)
-                    listener.container.addView(listener.getView(i, null));
-            } else {
-                sender.removeOnListChangedCallback(this);
-            }
-        }
-
-        @Override
-        public void onItemRangeMoved(final ObservableList<T> sender, final int fromPosition,
-                                     final int toPosition, final int itemCount) {
-            final ItemChangeListener<T> listener = weakListener.get();
-            if (listener != null) {
-                final View[] views = new View[itemCount];
-                for (int i = 0; i < itemCount; ++i)
-                    views[i] = listener.container.getChildAt(fromPosition + i);
-                listener.container.removeViews(fromPosition, itemCount);
-                for (int i = 0; i < itemCount; ++i)
-                    listener.container.addView(views[i], toPosition + i);
-            } else {
-                sender.removeOnListChangedCallback(this);
-            }
-        }
-
-        @Override
-        public void onItemRangeRemoved(final ObservableList<T> sender, final int positionStart,
-                                       final int itemCount) {
-            final ItemChangeListener<T> listener = weakListener.get();
-            if (listener != null) {
-                listener.container.removeViews(positionStart, itemCount);
-            } else {
-                sender.removeOnListChangedCallback(this);
-            }
-        }
-    }
-}
@@ -1,133 +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.android.databinding;
-
-import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.databinding.ObservableList;
-import android.databinding.ViewDataBinding;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.BaseAdapter;
-
-import com.wireguard.android.BR;
-import com.wireguard.android.util.Keyed;
-import com.wireguard.android.util.ObservableKeyedList;
-
-import java.lang.ref.WeakReference;
-
-/**
- * A generic {@code ListAdapter} backed by a {@code ObservableKeyedList}.
- */
-
-class ObservableKeyedListAdapter<K, E extends Keyed<? extends K>> extends BaseAdapter {
-    private final OnListChangedCallback<E> callback = new OnListChangedCallback<>(this);
-    private final int layoutId;
-    private final LayoutInflater layoutInflater;
-    private ObservableKeyedList<K, E> list;
-
-    ObservableKeyedListAdapter(final Context context, final int layoutId,
-                               final ObservableKeyedList<K, E> list) {
-        this.layoutId = layoutId;
-        layoutInflater = LayoutInflater.from(context);
-        setList(list);
-    }
-
-    @Override
-    public int getCount() {
-        return list != null ? list.size() : 0;
-    }
-
-    @Override
-    public 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;
-    }
-
-    @Override
-    public View getView(final int position, final View convertView, final ViewGroup parent) {
-        ViewDataBinding binding = DataBindingUtil.getBinding(convertView);
-        if (binding == null)
-            binding = DataBindingUtil.inflate(layoutInflater, layoutId, parent, false);
-        binding.setVariable(BR.collection, list);
-        binding.setVariable(BR.key, getKey(position));
-        binding.setVariable(BR.item, getItem(position));
-        binding.executePendingBindings();
-        return binding.getRoot();
-    }
-
-    @Override
-    public boolean hasStableIds() {
-        return true;
-    }
-
-    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<ObservableKeyedListAdapter<?, E>> weakAdapter;
-
-        private OnListChangedCallback(final ObservableKeyedListAdapter<?, E> adapter) {
-            weakAdapter = new WeakReference<>(adapter);
-        }
-
-        @Override
-        public void onChanged(final ObservableList<E> sender) {
-            final ObservableKeyedListAdapter 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);
-        }
-    }
-}
@@ -1,51 +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.android.fragment;
-
-import android.content.Context;
-import android.support.v4.app.Fragment;
-
-import com.wireguard.android.activity.BaseActivity;
-import com.wireguard.android.activity.BaseActivity.OnSelectedTunnelChangedListener;
-import com.wireguard.android.model.Tunnel;
-
-/**
- * Base class for fragments that need to know the currently-selected tunnel. Only does anything when
- * attached to a {@code BaseActivity}.
- */
-
-public abstract class BaseFragment extends Fragment implements OnSelectedTunnelChangedListener {
-    private BaseActivity activity;
-
-    protected Tunnel getSelectedTunnel() {
-        return activity != null ? activity.getSelectedTunnel() : null;
-    }
-
-    @Override
-    public void onAttach(final Context context) {
-        super.onAttach(context);
-        if (context instanceof BaseActivity) {
-            activity = (BaseActivity) context;
-            activity.addOnSelectedTunnelChangedListener(this);
-        } else {
-            activity = null;
-        }
-    }
-
-    @Override
-    public void onDetach() {
-        if (activity != null)
-            activity.removeOnSelectedTunnelChangedListener(this);
-        activity = null;
-        super.onDetach();
-    }
-
-    protected void setSelectedTunnel(final Tunnel tunnel) {
-        if (activity != null)
-            activity.setSelectedTunnel(tunnel);
-    }
-}
@@ -1,58 +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.android.fragment;
-
-import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.view.View;
-
-import com.wireguard.android.R;
-import com.wireguard.android.databinding.TunnelDetailFragmentBinding;
-import com.wireguard.android.databinding.TunnelListItemBinding;
-import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.Tunnel.State;
-import com.wireguard.android.util.ExceptionLoggers;
-
-/**
- * Helper method shared by TunnelListFragment and TunnelDetailFragment.
- */
-
-public final class TunnelController {
-    private static final String TAG = "WireGuard/" + TunnelController.class.getSimpleName();
-
-    private TunnelController() {
-        // Prevent instantiation.
-    }
-
-    public static void setTunnelState(final View view, final boolean checked) {
-        final ViewDataBinding binding = DataBindingUtil.findBinding(view);
-        final Tunnel tunnel;
-        if (binding instanceof TunnelDetailFragmentBinding)
-            tunnel = ((TunnelDetailFragmentBinding) binding).getTunnel();
-        else if (binding instanceof TunnelListItemBinding)
-            tunnel = ((TunnelListItemBinding) binding).getItem();
-        else
-            tunnel = null;
-        if (tunnel == null) {
-            Log.e(TAG, "setChecked() from a null tunnel", new IllegalStateException("No tunnel"));
-            return;
-        }
-        tunnel.setState(State.of(checked)).whenComplete((state, throwable) -> {
-            if (throwable == null)
-                return;
-            final Context context = view.getContext();
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
-            final int messageResId = checked ? R.string.error_up : R.string.error_down;
-            final String message = context.getString(messageResId, error);
-            Snackbar.make(view, message, Snackbar.LENGTH_LONG).show();
-            Log.e(TAG, message, throwable);
-        });
-    }
-}
@@ -1,75 +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.android.fragment;
-
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.View;
-import android.view.ViewGroup;
-
-import com.wireguard.android.R;
-import com.wireguard.android.databinding.TunnelDetailFragmentBinding;
-import com.wireguard.android.model.Tunnel;
-import com.wireguard.config.Config;
-
-/**
- * Fragment that shows details about a specific tunnel.
- */
-
-public class TunnelDetailFragment extends BaseFragment {
-    private TunnelDetailFragmentBinding binding;
-
-    private void onConfigLoaded(final String name, final Config config) {
-        binding.setConfig(new Config.Observable(config, name));
-    }
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        inflater.inflate(R.menu.tunnel_detail, menu);
-    }
-
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
-                             final Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        binding = TunnelDetailFragmentBinding.inflate(inflater, container, false);
-        binding.executePendingBindings();
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onDestroyView() {
-        binding = null;
-        super.onDestroyView();
-    }
-
-    @Override
-    public void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
-        if (binding == null)
-            return;
-        binding.setTunnel(newTunnel);
-        if (newTunnel == null)
-            binding.setConfig(null);
-        else
-            newTunnel.getConfigAsync().thenAccept(a -> onConfigLoaded(newTunnel.getName(), a));
-    }
-
-    @Override
-    public void onViewStateRestored(final Bundle savedInstanceState) {
-        onSelectedTunnelChanged(null, getSelectedTunnel());
-        super.onViewStateRestored(savedInstanceState);
-    }
-}
@@ -1,218 +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.android.fragment;
-
-import android.app.Activity;
-import android.content.Context;
-import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.view.inputmethod.InputMethodManager;
-import android.widget.Toast;
-
-import com.wireguard.android.Application;
-import com.wireguard.android.R;
-import com.wireguard.android.databinding.TunnelEditorFragmentBinding;
-import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.ExceptionLoggers;
-import com.wireguard.config.Config;
-
-/**
- * Fragment for editing a WireGuard configuration.
- */
-
-public class TunnelEditorFragment extends BaseFragment {
-    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();
-
-    private TunnelEditorFragmentBinding binding;
-    private Tunnel tunnel;
-
-    private void onConfigLoaded(final String name, final Config config) {
-        binding.setConfig(new Config.Observable(config, name));
-    }
-
-    private void onConfigSaved(final Tunnel savedTunnel,
-                               final Throwable throwable) {
-        final String message;
-        if (throwable == null) {
-            message = getString(R.string.config_save_success, savedTunnel.getName());
-            Log.d(TAG, message);
-            Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
-            onFinished();
-        } else {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
-            message = getString(R.string.config_save_error, savedTunnel.getName(), error);
-            Log.e(TAG, message, throwable);
-            if (binding != null) {
-                Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
-            }
-        }
-    }
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setHasOptionsMenu(true);
-    }
-
-    @Override
-    public void onCreateOptionsMenu(final Menu menu, final MenuInflater inflater) {
-        inflater.inflate(R.menu.config_editor, menu);
-    }
-
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
-                             final Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        binding = TunnelEditorFragmentBinding.inflate(inflater, container, false);
-        binding.executePendingBindings();
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onDestroyView() {
-        binding = null;
-        super.onDestroyView();
-    }
-
-    private void onFinished() {
-        // Hide the keyboard; it rarely goes away on its own.
-        final Activity activity = getActivity();
-        if (activity == null) return;
-        final View focusedView = activity.getCurrentFocus();
-        if (focusedView != null) {
-            final Object service = activity.getSystemService(Context.INPUT_METHOD_SERVICE);
-            final InputMethodManager inputManager = (InputMethodManager) service;
-            if (inputManager != null)
-                inputManager.hideSoftInputFromWindow(focusedView.getWindowToken(),
-                        InputMethodManager.HIDE_NOT_ALWAYS);
-        }
-        // Tell the activity to finish itself or go back to the detail view.
-        getActivity().runOnUiThread(() -> {
-            // The selected tunnel has to actually change, but we have to remember this one.
-            final Tunnel savedTunnel = tunnel;
-            if (savedTunnel == getSelectedTunnel())
-                setSelectedTunnel(null);
-            setSelectedTunnel(savedTunnel);
-        });
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(final MenuItem item) {
-        switch (item.getItemId()) {
-            case R.id.menu_action_save:
-                final Config newConfig = new Config();
-                try {
-                    binding.getConfig().commitData(newConfig);
-                } catch (final Exception e) {
-                    final String error = ExceptionLoggers.unwrapMessage(e);
-                    final String tunnelName = tunnel == null ? binding.getConfig().getName() : tunnel.getName();
-                    final String message = getString(R.string.config_save_error, tunnelName, error);
-                    Log.e(TAG, message, e);
-                    Snackbar.make(binding.mainContainer, error, Snackbar.LENGTH_LONG).show();
-                    return false;
-                }
-                if (tunnel == null) {
-                    Log.d(TAG, "Attempting to create new tunnel " + binding.getConfig().getName());
-                    final TunnelManager manager = Application.getComponent().getTunnelManager();
-                    manager.create(binding.getConfig().getName(), newConfig)
-                            .whenComplete(this::onTunnelCreated);
-                } else if (!tunnel.getName().equals(binding.getConfig().getName())) {
-                    Log.d(TAG, "Attempting to rename tunnel to " + binding.getConfig().getName());
-                    tunnel.setName(binding.getConfig().getName())
-                            .whenComplete((a, b) -> onTunnelRenamed(tunnel, newConfig, b));
-                } else {
-                    Log.d(TAG, "Attempting to save config of " + tunnel.getName());
-                    tunnel.setConfig(newConfig)
-                            .whenComplete((a, b) -> onConfigSaved(tunnel, b));
-                }
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
-
-    @Override
-    public void onSaveInstanceState(@NonNull final Bundle outState) {
-        outState.putParcelable(KEY_LOCAL_CONFIG, binding.getConfig());
-        outState.putString(KEY_ORIGINAL_NAME, tunnel == null ? null : tunnel.getName());
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
-    public void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
-        tunnel = newTunnel;
-        if (binding == null)
-            return;
-        binding.setConfig(new Config.Observable(null, null));
-        if (tunnel != null)
-            tunnel.getConfigAsync().thenAccept(a -> onConfigLoaded(tunnel.getName(), a));
-    }
-
-    private void onTunnelCreated(final Tunnel newTunnel, final Throwable throwable) {
-        final String message;
-        if (throwable == null) {
-            tunnel = newTunnel;
-            message = getString(R.string.tunnel_create_success, tunnel.getName());
-            Log.d(TAG, message);
-            onFinished();
-        } else {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
-            message = getString(R.string.tunnel_create_error, error);
-            Log.e(TAG, message, throwable);
-            if (binding != null) {
-                Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
-            }
-        }
-    }
-
-    private void onTunnelRenamed(final Tunnel renamedTunnel, final Config newConfig,
-                                 final Throwable throwable) {
-        final String message;
-        if (throwable == null) {
-            message = getString(R.string.tunnel_rename_success, renamedTunnel.getName());
-            Log.d(TAG, message);
-            // Now save the rest of configuration changes.
-            Log.d(TAG, "Attempting to save config of renamed tunnel " + tunnel.getName());
-            renamedTunnel.setConfig(newConfig).whenComplete((a, b) -> onConfigSaved(renamedTunnel, b));
-        } else {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
-            message = getString(R.string.tunnel_rename_error, error);
-            Log.e(TAG, message, throwable);
-            if (binding != null) {
-                Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
-            }
-        }
-    }
-
-    @Override
-    public void onViewStateRestored(final Bundle savedInstanceState) {
-        if (savedInstanceState == null) {
-            onSelectedTunnelChanged(null, getSelectedTunnel());
-        } else {
-            tunnel = getSelectedTunnel();
-            final Config.Observable config = savedInstanceState.getParcelable(KEY_LOCAL_CONFIG);
-            final String originalName = savedInstanceState.getString(KEY_ORIGINAL_NAME);
-            if (tunnel != null && !tunnel.getName().equals(originalName))
-                onSelectedTunnelChanged(null, tunnel);
-            else
-                binding.setConfig(config);
-        }
-
-        super.onViewStateRestored(savedInstanceState);
-    }
-}
@@ -1,376 +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.android.fragment;
-
-import android.annotation.SuppressLint;
-import android.app.Activity;
-import android.content.ContentResolver;
-import android.content.Intent;
-import android.content.res.Resources;
-import android.database.Cursor;
-import android.net.Uri;
-import android.os.Bundle;
-import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.design.widget.Snackbar;
-import android.util.Log;
-import android.util.SparseBooleanArray;
-import android.view.ActionMode;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.MotionEvent;
-import android.view.View;
-import android.view.View.OnTouchListener;
-import android.view.ViewGroup;
-import android.widget.AbsListView;
-import android.widget.AbsListView.MultiChoiceModeListener;
-import android.widget.AdapterView;
-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;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipInputStream;
-
-import java9.util.concurrent.CompletableFuture;
-import java9.util.stream.Collectors;
-import java9.util.stream.IntStream;
-import java9.util.stream.StreamSupport;
-
-/**
- * Fragment containing a list of known WireGuard tunnels. It allows creating and deleting tunnels.
- */
-
-public class TunnelListFragment extends BaseFragment {
-    private static final int REQUEST_IMPORT = 1;
-    private static final String TAG = "WireGuard/" + TunnelListFragment.class.getSimpleName();
-
-    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()) {
-            binding.createMenu.collapse();
-            return true;
-        }
-        return false;
-    }
-
-    private void importTunnel(final Uri uri) {
-        final Activity activity = getActivity();
-        if (activity == null)
-            return;
-        final ContentResolver contentResolver = activity.getContentResolver();
-
-        final Collection<CompletableFuture<Tunnel>> futureTunnels = new ArrayList<>();
-        final List<Throwable> throwables = new ArrayList<>();
-        asyncWorker.supplyAsync(() -> {
-            final String[] columns = {OpenableColumns.DISPLAY_NAME};
-            String name = null;
-            try (Cursor cursor = contentResolver.query(uri, columns,
-                    null, null, null)) {
-                if (cursor != null && cursor.moveToFirst() && !cursor.isNull(0))
-                    name = cursor.getString(0);
-            }
-            if (name == null)
-                name = Uri.decode(uri.getLastPathSegment());
-            int idx = name.lastIndexOf('/');
-            if (idx >= 0) {
-                if (idx >= name.length() - 1)
-                    throw new IllegalArgumentException("Illegal file name: " + name);
-                name = name.substring(idx + 1);
-            }
-            boolean isZip = name.toLowerCase().endsWith(".zip");
-            if (name.toLowerCase().endsWith(".conf"))
-                name = name.substring(0, name.length() - ".conf".length());
-            else if (!isZip)
-                throw new IllegalArgumentException("File must be .conf or .zip");
-
-            if (isZip) {
-                try (ZipInputStream zip = new ZipInputStream(contentResolver.openInputStream(uri))) {
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(zip, StandardCharsets.UTF_8));
-                    ZipEntry entry;
-                    while ((entry = zip.getNextEntry()) != null) {
-                        if (entry.isDirectory())
-                            continue;
-                        name = entry.getName();
-                        idx = name.lastIndexOf('/');
-                        if (idx >= 0) {
-                            if (idx >= name.length() - 1)
-                                continue;
-                            name = name.substring(name.lastIndexOf('/') + 1);
-                        }
-                        if (name.toLowerCase().endsWith(".conf"))
-                            name = name.substring(0, name.length() - ".conf".length());
-                        else
-                            continue;
-                        Config config = null;
-                        try {
-                            config = Config.from(reader);
-                        } catch (Exception e) {
-                            throwables.add(e);
-                        }
-                        if (config != null)
-                            futureTunnels.add(tunnelManager.create(name, config).toCompletableFuture());
-                    }
-                }
-            } else {
-                futureTunnels.add(tunnelManager.create(name,
-                        Config.from(contentResolver.openInputStream(uri))).toCompletableFuture());
-            }
-
-            if (futureTunnels.isEmpty()) {
-                if (throwables.size() == 1)
-                    throw throwables.get(0);
-                else if (throwables.isEmpty())
-                    throw new IllegalArgumentException("No configurations found");
-            }
-
-            return CompletableFuture.allOf(futureTunnels.toArray(new CompletableFuture[futureTunnels.size()]));
-        }).whenComplete((future, exception) -> {
-            if (exception != null) {
-                onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(exception));
-            } else {
-                future.whenComplete((ignored1, ignored2) -> {
-                    final List<Tunnel> tunnels = new ArrayList<>(futureTunnels.size());
-                    for (final CompletableFuture<Tunnel> futureTunnel : futureTunnels) {
-                        Tunnel tunnel = null;
-                        try {
-                            tunnel = futureTunnel.getNow(null);
-                        } catch (final Exception e) {
-                            throwables.add(e);
-                        }
-                        if (tunnel != null)
-                            tunnels.add(tunnel);
-                    }
-                    onTunnelImportFinished(tunnels, throwables);
-                });
-            }
-        });
-    }
-
-    @Override
-    public void onActivityResult(final int requestCode, final int resultCode, final Intent data) {
-        switch (requestCode) {
-            case REQUEST_IMPORT:
-                if (resultCode == Activity.RESULT_OK)
-                    importTunnel(data.getData());
-                return;
-            default:
-                super.onActivityResult(requestCode, resultCode, data);
-        }
-    }
-
-    @Override
-    public void onCreate(final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        final ApplicationComponent applicationComponent = Application.getComponent();
-        asyncWorker = applicationComponent.getAsyncWorker();
-        tunnelManager = applicationComponent.getTunnelManager();
-    }
-
-    @Override
-    public View onCreateView(@NonNull final LayoutInflater inflater, final ViewGroup container,
-                             final Bundle savedInstanceState) {
-        super.onCreateView(inflater, container, savedInstanceState);
-        binding = TunnelListFragmentBinding.inflate(inflater, container, false);
-        binding.tunnelList.setMultiChoiceModeListener(actionModeListener);
-        binding.tunnelList.setOnItemClickListener(listViewCallbacks);
-        binding.tunnelList.setOnItemLongClickListener(listViewCallbacks);
-        binding.tunnelList.setOnTouchListener(listViewCallbacks);
-        binding.executePendingBindings();
-        return binding.getRoot();
-    }
-
-    @Override
-    public void onDestroyView() {
-        binding = null;
-        super.onDestroyView();
-    }
-
-    public void onRequestCreateConfig(@SuppressWarnings("unused") final View view) {
-        startActivity(new Intent(getActivity(), TunnelCreatorActivity.class));
-        if (binding != null)
-            binding.createMenu.collapse();
-    }
-
-    public void onRequestImportConfig(@SuppressWarnings("unused") final View view) {
-        final Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-        intent.addCategory(Intent.CATEGORY_OPENABLE);
-        intent.setType("*/*");
-        startActivityForResult(intent, REQUEST_IMPORT);
-        if (binding != null)
-            binding.createMenu.collapse();
-    }
-
-    @Override
-    public void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
-        // Do nothing.
-    }
-
-    private void onTunnelDeletionFinished(final Integer count, final Throwable throwable) {
-        final String message;
-        if (throwable == null) {
-            message = getResources().getQuantityString(R.plurals.delete_success, count, count);
-        } else {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
-            message = getResources().getQuantityString(R.plurals.delete_error, count, count, error);
-            Log.e(TAG, message, throwable);
-        }
-        if (binding != null) {
-            Snackbar.make(binding.mainContainer, message, Snackbar.LENGTH_LONG).show();
-        }
-    }
-
-    private void onTunnelImportFinished(final List<Tunnel> tunnels, final Collection<Throwable> throwables) {
-        String message = null;
-
-        for (final Throwable throwable : throwables) {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
-            message = getString(R.string.import_error, error);
-            Log.e(TAG, message, throwable);
-        }
-
-        if (tunnels.size() == 1 && throwables.isEmpty())
-            message = getString(R.string.import_success, tunnels.get(0).getName());
-        else if (tunnels.isEmpty() && throwables.size() == 1)
-            /* Use the exception message from above. */ ;
-        else if (throwables.isEmpty())
-            message = getResources().getQuantityString(R.plurals.import_total_success,
-                    tunnels.size(), tunnels.size());
-        else if (!throwables.isEmpty())
-            message = getResources().getQuantityString(R.plurals.import_partial_success,
-                    tunnels.size() + throwables.size(),
-                    tunnels.size(), tunnels.size() + throwables.size());
-
-        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());
-    }
-
-    private final class ActionModeListener implements MultiChoiceModeListener {
-        private Resources resources;
-        private AbsListView tunnelList;
-
-        private IntStream getCheckedPositions() {
-            final SparseBooleanArray checkedItemPositions = tunnelList.getCheckedItemPositions();
-            return IntStream.range(0, checkedItemPositions.size())
-                    .filter(checkedItemPositions::valueAt)
-                    .map(checkedItemPositions::keyAt);
-        }
-
-        @Override
-        public boolean onActionItemClicked(final ActionMode mode, final MenuItem item) {
-            switch (item.getItemId()) {
-                case R.id.menu_action_delete:
-                    // Must operate in two steps: positions change once we start deleting things.
-                    final List<Tunnel> tunnelsToDelete = getCheckedPositions()
-                            .mapToObj(pos -> (Tunnel) tunnelList.getItemAtPosition(pos))
-                            .collect(Collectors.toList());
-                    final CompletableFuture[] futures = StreamSupport.stream(tunnelsToDelete)
-                            .map(Tunnel::delete)
-                            .toArray(CompletableFuture[]::new);
-                    CompletableFuture.allOf(futures)
-                            .thenApply(x -> futures.length)
-                            .whenComplete(TunnelListFragment.this::onTunnelDeletionFinished);
-                    mode.finish();
-                    return true;
-                default:
-                    return false;
-            }
-        }
-
-        @Override
-        public boolean onCreateActionMode(final ActionMode mode, final Menu menu) {
-            actionMode = mode;
-            if (getActivity() != null)
-                resources = getActivity().getResources();
-            tunnelList = binding.tunnelList;
-            mode.getMenuInflater().inflate(R.menu.tunnel_list_action_mode, menu);
-            return true;
-        }
-
-        @Override
-        public void onDestroyActionMode(final ActionMode mode) {
-            actionMode = null;
-            resources = null;
-        }
-
-        @Override
-        public void onItemCheckedStateChanged(final ActionMode mode, final int position,
-                                              final long id, final boolean checked) {
-            updateTitle(mode);
-        }
-
-        @Override
-        public boolean onPrepareActionMode(final ActionMode mode, final Menu menu) {
-            updateTitle(mode);
-            return false;
-        }
-
-        private void updateTitle(final ActionMode mode) {
-            final int count = (int) getCheckedPositions().count();
-            mode.setTitle(resources.getQuantityString(R.plurals.delete_title, count, count));
-        }
-    }
-
-    private final class ListViewCallbacks
-            implements OnItemClickListener, OnItemLongClickListener, OnTouchListener {
-        @Override
-        public void onItemClick(final AdapterView<?> parent, final View view,
-                                final int position, final long id) {
-            setSelectedTunnel((Tunnel) parent.getItemAtPosition(position));
-        }
-
-        @Override
-        public boolean onItemLongClick(final AdapterView<?> parent, final View view,
-                                       final int position, final long id) {
-            if (actionMode != null)
-                return false;
-            if (binding != null)
-                binding.tunnelList.setItemChecked(position, true);
-            return true;
-        }
-
-        @Override
-        @SuppressLint("ClickableViewAccessibility")
-        public boolean onTouch(final View view, final MotionEvent motionEvent) {
-            if (binding != null)
-                binding.createMenu.collapse();
-            return false;
-        }
-    }
-}
@@ -1,157 +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.android.model;
-
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.support.annotation.NonNull;
-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.config.Config;
-
-import java.util.regex.Pattern;
-
-import java9.util.concurrent.CompletableFuture;
-import java9.util.concurrent.CompletionStage;
-
-/**
- * Encapsulates the volatile and nonvolatile state of a WireGuard tunnel.
- */
-
-public class Tunnel extends BaseObservable implements Keyed<String> {
-    public static final int NAME_MAX_LENGTH = 15;
-    private static final Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z0-9_=+.-]{1,15}");
-
-    private final TunnelManager manager;
-    private Config config;
-    private String name;
-    private State state;
-    private Statistics statistics;
-
-    Tunnel(@NonNull final TunnelManager manager, @NonNull final String name,
-           @Nullable final Config config, @NonNull final State state) {
-        this.manager = manager;
-        this.name = name;
-        this.config = config;
-        this.state = state;
-    }
-
-    public static boolean isNameInvalid(@NonNull final CharSequence name) {
-        return !NAME_PATTERN.matcher(name).matches();
-    }
-
-    public CompletionStage<Void> delete() {
-        return manager.delete(this);
-    }
-
-    @Bindable
-    public Config getConfig() {
-        if (config == null)
-            manager.getTunnelConfig(this).whenComplete(ExceptionLoggers.E);
-        return config;
-    }
-
-    public CompletionStage<Config> getConfigAsync() {
-        if (config == null)
-            return manager.getTunnelConfig(this);
-        return CompletableFuture.completedFuture(config);
-    }
-
-    @Override
-    public String getKey() {
-        return name;
-    }
-
-    @Bindable
-    public String getName() {
-        return name;
-    }
-
-    @Bindable
-    public State getState() {
-        return state;
-    }
-
-    public CompletionStage<State> getStateAsync() {
-        return manager.getTunnelState(this);
-    }
-
-    @Bindable
-    public Statistics getStatistics() {
-        // FIXME: Check age of statistics.
-        if (statistics == null)
-            manager.getTunnelStatistics(this).whenComplete(ExceptionLoggers.E);
-        return statistics;
-    }
-
-    public CompletionStage<Statistics> getStatisticsAsync() {
-        // FIXME: Check age of statistics.
-        if (statistics == null)
-            return manager.getTunnelStatistics(this);
-        return CompletableFuture.completedFuture(statistics);
-    }
-
-    Config onConfigChanged(final Config config) {
-        this.config = config;
-        notifyPropertyChanged(BR.config);
-        return config;
-    }
-
-    public String onNameChanged(final String name) {
-        this.name = name;
-        notifyPropertyChanged(BR.name);
-        return name;
-    }
-
-    State onStateChanged(final State state) {
-        if (state != State.UP)
-            onStatisticsChanged(null);
-        this.state = state;
-        notifyPropertyChanged(BR.state);
-        return state;
-    }
-
-    Statistics onStatisticsChanged(final Statistics statistics) {
-        this.statistics = statistics;
-        notifyPropertyChanged(BR.statistics);
-        return statistics;
-    }
-
-    public CompletionStage<Config> setConfig(@NonNull final Config config) {
-        if (!config.equals(this.config))
-            return manager.setTunnelConfig(this, config);
-        return CompletableFuture.completedFuture(this.config);
-    }
-
-    public CompletionStage<String> setName(@NonNull final String name) {
-        if (!name.equals(this.name))
-            return manager.setTunnelName(this, name);
-        return CompletableFuture.completedFuture(this.name);
-    }
-
-    public CompletionStage<State> setState(@NonNull final State state) {
-        if (state != this.state)
-            return manager.setTunnelState(this, state);
-        return CompletableFuture.completedFuture(this.state);
-    }
-
-    public enum State {
-        DOWN,
-        TOGGLE,
-        UP;
-
-        public static State of(final boolean running) {
-            return running ? UP : DOWN;
-        }
-    }
-
-    public static class Statistics extends BaseObservable {
-    }
-}
@@ -1,241 +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.android.model;
-
-import android.content.SharedPreferences;
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.support.annotation.NonNull;
-
-import com.wireguard.android.Application.ApplicationScope;
-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.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;
-import java9.util.stream.Collectors;
-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());
-    private static final String KEY_LAST_USED_TUNNEL = "last_used_tunnel";
-    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;
-
-    @Inject
-    public TunnelManager(final AsyncWorker asyncWorker, final Backend backend,
-                         final ConfigStore configStore, final SharedPreferences preferences) {
-        this.asyncWorker = asyncWorker;
-        this.backend = backend;
-        this.configStore = configStore;
-        this.preferences = preferences;
-    }
-
-    private Tunnel addToList(final String name, final Config config, final State state) {
-        final Tunnel tunnel = new Tunnel(this, name, config, state);
-        tunnels.add(tunnel);
-        return tunnel;
-    }
-
-    public CompletionStage<Tunnel> create(@NonNull final String name, final Config config) {
-        if (Tunnel.isNameInvalid(name))
-            return CompletableFuture.failedFuture(new IllegalArgumentException("Invalid name"));
-        if (tunnels.containsKey(name)) {
-            final String message = "Tunnel " + name + " already exists";
-            return CompletableFuture.failedFuture(new IllegalArgumentException(message));
-        }
-        return asyncWorker.supplyAsync(() -> configStore.create(name, config))
-                .thenApply(savedConfig -> addToList(name, savedConfig, State.DOWN));
-    }
-
-    CompletionStage<Void> delete(final Tunnel tunnel) {
-        final State originalState = tunnel.getState();
-        final boolean wasLastUsed = tunnel == lastUsedTunnel;
-        // Make sure nothing touches the tunnel.
-        if (wasLastUsed)
-            setLastUsedTunnel(null);
-        tunnels.remove(tunnel);
-        return asyncWorker.runAsync(() -> {
-            if (originalState == State.UP)
-                backend.setState(tunnel, State.DOWN);
-            try {
-                configStore.delete(tunnel.getName());
-            } catch (final Exception e) {
-                if (originalState == State.UP)
-                    backend.setState(tunnel, State.UP);
-                // Re-throw the exception to fail the completion.
-                throw e;
-            }
-        }).whenComplete((x, e) -> {
-            if (e == null)
-                return;
-            // Failure, put the tunnel back.
-            tunnels.add(tunnel);
-            if (wasLastUsed)
-                setLastUsedTunnel(tunnel);
-        });
-    }
-
-    @Bindable
-    public Tunnel getLastUsedTunnel() {
-        return lastUsedTunnel;
-    }
-
-    CompletionStage<Config> getTunnelConfig(final Tunnel tunnel) {
-        return asyncWorker.supplyAsync(() -> configStore.load(tunnel.getName()))
-                .thenApply(tunnel::onConfigChanged);
-    }
-
-    CompletionStage<State> getTunnelState(final Tunnel tunnel) {
-        return asyncWorker.supplyAsync(() -> backend.getState(tunnel))
-                .thenApply(tunnel::onStateChanged);
-    }
-
-    CompletionStage<Statistics> getTunnelStatistics(final Tunnel tunnel) {
-        return asyncWorker.supplyAsync(() -> backend.getStatistics(tunnel))
-                .thenApply(tunnel::onStatisticsChanged);
-    }
-
-    public ObservableKeyedList<String, Tunnel> getTunnels() {
-        return tunnels;
-    }
-
-    public void onCreate() {
-        asyncWorker.supplyAsync(configStore::enumerate)
-                .thenAcceptBoth(asyncWorker.supplyAsync(backend::enumerate), this::onTunnelsLoaded)
-                .whenComplete(ExceptionLoggers.E);
-    }
-
-    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);
-        if (lastUsedName != null)
-            setLastUsedTunnel(tunnels.get(lastUsedName));
-    }
-
-    public void refreshTunnelStates() {
-        asyncWorker.supplyAsync(backend::enumerate)
-                .thenAccept(running -> {
-                    for (final Tunnel tunnel : tunnels)
-                        tunnel.onStateChanged(running.contains(tunnel.getName()) ? State.UP : State.DOWN);
-                })
-                .whenComplete(ExceptionLoggers.E);
-    }
-
-    public CompletionStage<Void> restoreState() {
-        if (!preferences.getBoolean(KEY_RESTORE_ON_BOOT, false))
-            return CompletableFuture.completedFuture(null);
-        final Set<String> previouslyRunning = preferences.getStringSet(KEY_RUNNING_TUNNELS, null);
-        if (previouslyRunning == null)
-            return CompletableFuture.completedFuture(null);
-        return CompletableFuture.allOf(StreamSupport.stream(tunnels)
-                .filter(tunnel -> previouslyRunning.contains(tunnel.getName()))
-                .map(tunnel -> setTunnelState(tunnel, State.UP))
-                .toArray(CompletableFuture[]::new));
-    }
-
-    public void saveState() {
-        final Set<String> runningTunnels = StreamSupport.stream(tunnels)
-                .filter(tunnel -> tunnel.getState() == State.UP)
-                .map(Tunnel::getName)
-                .collect(Collectors.toUnmodifiableSet());
-        preferences.edit().putStringSet(KEY_RUNNING_TUNNELS, runningTunnels).apply();
-    }
-
-    private void setLastUsedTunnel(final Tunnel tunnel) {
-        if (tunnel == lastUsedTunnel)
-            return;
-        lastUsedTunnel = tunnel;
-        notifyPropertyChanged(BR.lastUsedTunnel);
-        if (tunnel != null)
-            preferences.edit().putString(KEY_LAST_USED_TUNNEL, tunnel.getName()).apply();
-        else
-            preferences.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 configStore.save(tunnel.getName(), appliedConfig);
-        }).thenApply(tunnel::onConfigChanged);
-    }
-
-    CompletionStage<String> setTunnelName(final Tunnel tunnel, final String name) {
-        if (Tunnel.isNameInvalid(name))
-            return CompletableFuture.failedFuture(new IllegalArgumentException("Invalid name"));
-        if (tunnels.containsKey(name)) {
-            final String message = "Tunnel " + name + " already exists";
-            return CompletableFuture.failedFuture(new IllegalArgumentException(message));
-        }
-        final State originalState = tunnel.getState();
-        final boolean wasLastUsed = tunnel == lastUsedTunnel;
-        // Make sure nothing touches the tunnel.
-        if (wasLastUsed)
-            setLastUsedTunnel(null);
-        tunnels.remove(tunnel);
-        return asyncWorker.supplyAsync(() -> {
-            if (originalState == State.UP)
-                backend.setState(tunnel, State.DOWN);
-            configStore.rename(tunnel.getName(), name);
-            final String newName = tunnel.onNameChanged(name);
-            if (originalState == State.UP)
-                backend.setState(tunnel, State.UP);
-            return newName;
-        }).whenComplete((newName, e) -> {
-            // On failure, we don't know what state the tunnel might be in. Fix that.
-            if (e != null)
-                getTunnelState(tunnel);
-            // Add the tunnel back to the manager, under whatever name it thinks it has.
-            tunnels.add(tunnel);
-            if (wasLastUsed)
-                setLastUsedTunnel(tunnel);
-        });
-    }
-
-    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))
-        ).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);
-        });
-    }
-}
@@ -1,103 +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.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;
-
-/**
- * Preference implementing a button that asynchronously runs {@code ToolsInstaller} and displays the
- * result as the preference summary.
- */
-
-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
-    public CharSequence getSummary() {
-        return getContext().getString(state.messageResourceId);
-    }
-
-    @Override
-    public CharSequence getTitle() {
-        return getContext().getString(R.string.tools_installer_title);
-    }
-
-    @Override
-    public void onAttached() {
-        super.onAttached();
-        asyncWorker.supplyAsync(toolsInstaller::areInstalled).whenComplete(this::onCheckResult);
-    }
-
-    private void onCheckResult(final Integer result, final Throwable throwable) {
-        setState(throwable == null && result == OsConstants.EALREADY ?
-                State.ALREADY : State.INITIAL);
-    }
-
-    @Override
-    protected void onClick() {
-        setState(State.WORKING);
-        asyncWorker.supplyAsync(toolsInstaller::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;
-        else
-            nextState = State.FAILURE;
-        setState(nextState);
-    }
-
-    private void setState(@NonNull final State state) {
-        if (this.state == state)
-            return;
-        this.state = state;
-        if (isEnabled() != state.shouldEnableView)
-            setEnabled(state.shouldEnableView);
-        notifyChanged();
-    }
-
-    private enum State {
-        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);
-
-        private final int messageResourceId;
-        private final boolean shouldEnableView;
-
-        State(final int messageResourceId, final boolean shouldEnableView) {
-            this.messageResourceId = messageResourceId;
-            this.shouldEnableView = shouldEnableView;
-        }
-    }
-}
@@ -1,140 +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.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 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.config.Config;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.zip.ZipEntry;
-import java.util.zip.ZipOutputStream;
-
-import java9.util.concurrent.CompletableFuture;
-
-/**
- * Preference implementing a button that asynchronously exports config zips.
- */
-
-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<CompletableFuture<Config>> futureConfigs = new ArrayList<>(tunnels.size());
-        for (final Tunnel tunnel : tunnels)
-            futureConfigs.add(tunnel.getConfigAsync().toCompletableFuture());
-        if (futureConfigs.isEmpty()) {
-            exportZipComplete(null, new IllegalArgumentException("No tunnels exist"));
-            return;
-        }
-        CompletableFuture.allOf(futureConfigs.toArray(new CompletableFuture[futureConfigs.size()]))
-                .whenComplete((ignored1, exception) -> asyncWorker.supplyAsync(() -> {
-                    if (exception != null)
-                        throw exception;
-                    final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
-                    final File file = new File(path, "wireguard-export.zip");
-                    if (!path.isDirectory() && !path.mkdirs())
-                        throw new IOException("Cannot create output directory");
-                    try (ZipOutputStream zip = new ZipOutputStream(new FileOutputStream(file))) {
-                        for (int i = 0; i < futureConfigs.size(); ++i) {
-                            zip.putNextEntry(new ZipEntry(tunnels.get(i).getName() + ".conf"));
-                            zip.write(futureConfigs.get(i).getNow(null).
-                                    toString().getBytes(StandardCharsets.UTF_8));
-                        }
-                        zip.closeEntry();
-                        zip.close();
-                    } catch (Exception e) {
-                        // noinspection ResultOfMethodCallIgnored
-                        file.delete();
-                        throw e;
-                    }
-                    return file.getAbsolutePath();
-                }).whenComplete(this::exportZipComplete));
-    }
-
-    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);
-            Log.e(TAG, message, throwable);
-            Snackbar.make(
-                    getPrefActivity(this).findViewById(android.R.id.content),
-                    message, Snackbar.LENGTH_LONG).show();
-        } else {
-            exportedFilePath = filePath;
-            setEnabled(false);
-            notifyChanged();
-        }
-    }
-
-    @Override
-    public CharSequence getSummary() {
-        return exportedFilePath == null ?
-                getContext().getString(R.string.export_summary) :
-                getContext().getString(R.string.export_success, exportedFilePath);
-    }
-
-    @Override
-    public CharSequence getTitle() {
-        return getContext().getString(R.string.zip_exporter_title);
-    }
-
-    @Override
-    protected void onClick() {
-        getPrefActivity(this).ensurePermissions(
-                new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
-                (permissions, granted) -> {
-                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED)
-                        exportZip();
-                });
-    }
-
-}
@@ -1,71 +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.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;
-
-/**
- * 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) {
-        this.executor = executor;
-        this.handler = handler;
-    }
-
-    public CompletionStage<Void> runAsync(final AsyncRunnable<?> runnable) {
-        final CompletableFuture<Void> future = new CompletableFuture<>();
-        executor.execute(() -> {
-            try {
-                runnable.run();
-                handler.post(() -> future.complete(null));
-            } catch (final Throwable t) {
-                handler.post(() -> future.completeExceptionally(t));
-            }
-        });
-        return future;
-    }
-
-    public <T> CompletionStage<T> supplyAsync(final AsyncSupplier<T, ?> supplier) {
-        final CompletableFuture<T> future = new CompletableFuture<>();
-        executor.execute(() -> {
-            try {
-                final T result = supplier.get();
-                handler.post(() -> future.complete(result));
-            } catch (final Throwable t) {
-                handler.post(() -> future.completeExceptionally(t));
-            }
-        });
-        return future;
-    }
-
-    @FunctionalInterface
-    public interface AsyncRunnable<E extends Throwable> {
-        void run() throws E;
-    }
-
-    @FunctionalInterface
-    public interface AsyncSupplier<T, E extends Throwable> {
-        T get() throws E;
-    }
-}
@@ -1,38 +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.android.util;
-
-import android.content.ClipData;
-import android.content.ClipboardManager;
-import android.content.Context;
-import android.support.design.widget.Snackbar;
-import android.view.View;
-import android.widget.TextView;
-
-/**
- * Standalone utilities for interacting with the system clipboard.
- */
-
-public final class ClipboardUtils {
-    private ClipboardUtils() {
-        // Prevent instantiation
-    }
-
-    public static void copyTextView(final View view) {
-        if (!(view instanceof TextView))
-            return;
-        final CharSequence text = ((TextView) view).getText();
-        if (text == null || text.length() == 0)
-            return;
-        final Object service = view.getContext().getSystemService(Context.CLIPBOARD_SERVICE);
-        if (!(service instanceof ClipboardManager))
-            return;
-        final CharSequence description = view.getContentDescription();
-        ((ClipboardManager) service).setPrimaryClip(ClipData.newPlainText(description, text));
-        Snackbar.make(view, description + " copied to clipboard", Snackbar.LENGTH_LONG).show();
-    }
-}
@@ -1,53 +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.android.util;
-
-import android.support.annotation.NonNull;
-import android.util.Log;
-import java9.util.concurrent.CompletionException;
-import java9.util.function.BiConsumer;
-
-/**
- * Helpers for logging exceptions from asynchronous tasks. These can be passed to
- * {@code CompletionStage.whenComplete()} at the end of an asynchronous future chain.
- */
-
-public enum ExceptionLoggers implements BiConsumer<Object, Throwable> {
-    D(Log.DEBUG),
-    E(Log.ERROR);
-
-    private static final String TAG = "WireGuard/" + ExceptionLoggers.class.getSimpleName();
-
-    private final int priority;
-
-    ExceptionLoggers(final int priority) {
-        this.priority = priority;
-    }
-
-    public static Throwable unwrap(final Throwable throwable) {
-        if (throwable instanceof CompletionException && throwable.getCause() != null)
-            return throwable.getCause();
-        return throwable;
-    }
-
-    @NonNull
-    public static String unwrapMessage(Throwable throwable) {
-        throwable = unwrap(throwable);
-        final String message = throwable.getMessage();
-        if (message != null)
-            return message;
-        return throwable.getClass().getSimpleName();
-    }
-
-    @Override
-    public void accept(final Object result, final Throwable throwable) {
-        if (throwable != null)
-            Log.println(Log.ERROR, TAG, Log.getStackTraceString(throwable));
-        else if (priority <= Log.DEBUG)
-            Log.println(priority, TAG, "Future completed successfully");
-    }
-}
@@ -1,15 +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.android.util;
-
-/**
- * Interface for objects that have a identifying key of the given type.
- */
-
-public interface Keyed<K> {
-    K getKey();
-}
@@ -1,29 +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.android.util;
-
-import java.util.Collection;
-import java.util.List;
-
-/**
- * A list containing elements that can be looked up by key. A {@code KeyedList} cannot contain
- * {@code null} elements.
- */
-
-public interface KeyedList<K, E extends Keyed<? extends K>> extends List<E> {
-    boolean containsAllKeys(Collection<K> keys);
-
-    boolean containsKey(K key);
-
-    E get(K key);
-
-    E getLast(K key);
-
-    int indexOfKey(K key);
-
-    int lastIndexOfKey(K key);
-}
@@ -1,106 +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.android.util;
-
-import android.databinding.ObservableArrayList;
-import android.support.annotation.NonNull;
-
-import java.util.Collection;
-import java.util.ListIterator;
-import java.util.Objects;
-
-/**
- * ArrayList that allows looking up elements by some key property. As the key property must always
- * be retrievable, this list cannot hold {@code null} elements. Because this class places no
- * restrictions on the order or duplication of keys, lookup by key, as well as all list modification
- * operations, require O(n) time.
- */
-
-public class ObservableKeyedArrayList<K, E extends Keyed<? extends K>>
-        extends ObservableArrayList<E> implements ObservableKeyedList<K, E> {
-    @Override
-    public boolean add(final E e) {
-        if (e == null)
-            throw new NullPointerException("Trying to add a null element");
-        return super.add(e);
-    }
-
-    @Override
-    public void add(final int index, final E e) {
-        if (e == null)
-            throw new NullPointerException("Trying to add a null element");
-        super.add(index, e);
-    }
-
-    @Override
-    public boolean addAll(@NonNull final Collection<? extends E> c) {
-        if (c.contains(null))
-            throw new NullPointerException("Trying to add a collection with null element(s)");
-        return super.addAll(c);
-    }
-
-    @Override
-    public boolean addAll(final int index, @NonNull final Collection<? extends E> c) {
-        if (c.contains(null))
-            throw new NullPointerException("Trying to add a collection with null element(s)");
-        return super.addAll(index, c);
-    }
-
-    @Override
-    public boolean containsAllKeys(final Collection<K> keys) {
-        for (final K key : keys)
-            if (!containsKey(key))
-                return false;
-        return true;
-    }
-
-    @Override
-    public boolean containsKey(final K key) {
-        return indexOfKey(key) >= 0;
-    }
-
-    @Override
-    public E get(final K key) {
-        final int index = indexOfKey(key);
-        return index >= 0 ? get(index) : null;
-    }
-
-    @Override
-    public E getLast(final K key) {
-        final int index = lastIndexOfKey(key);
-        return index >= 0 ? get(index) : null;
-    }
-
-    @Override
-    public int indexOfKey(final K key) {
-        final ListIterator<E> iterator = listIterator();
-        while (iterator.hasNext()) {
-            final int index = iterator.nextIndex();
-            if (Objects.equals(iterator.next().getKey(), key))
-                return index;
-        }
-        return -1;
-    }
-
-    @Override
-    public int lastIndexOfKey(final K key) {
-        final ListIterator<E> iterator = listIterator(size());
-        while (iterator.hasPrevious()) {
-            final int index = iterator.previousIndex();
-            if (Objects.equals(iterator.previous().getKey(), key))
-                return index;
-        }
-        return -1;
-    }
-
-    @Override
-    public E set(final int index, final E e) {
-        if (e == null)
-            throw new NullPointerException("Trying to set a null key");
-        return super.set(index, e);
-    }
-}
@@ -1,17 +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.android.util;
-
-import android.databinding.ObservableList;
-
-/**
- * A list that is both keyed and observable.
- */
-
-public interface ObservableKeyedList<K, E extends Keyed<? extends K>>
-        extends KeyedList<K, E>, ObservableList<E> {
-}
@@ -1,197 +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.android.util;
-
-import android.support.annotation.NonNull;
-
-import java.util.AbstractList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.NoSuchElementException;
-import java.util.Set;
-import java.util.Spliterator;
-
-/**
- * KeyedArrayList that enforces uniqueness and sorted order across the set of keys. This class uses
- * binary search to improve lookup and replacement times to O(log(n)). However, due to the
- * array-based nature of this class, insertion and removal of elements with anything but the largest
- * key still require O(n) time.
- */
-
-public class ObservableSortedKeyedArrayList<K, E extends Keyed<? extends K>>
-        extends ObservableKeyedArrayList<K, E> implements ObservableSortedKeyedList<K, E> {
-    private final Comparator<? super K> comparator;
-    private final transient KeyList<K, E> keyList = new KeyList<>(this);
-
-    @SuppressWarnings("WeakerAccess")
-    public ObservableSortedKeyedArrayList() {
-        comparator = null;
-    }
-
-    public ObservableSortedKeyedArrayList(final Comparator<? super K> comparator) {
-        this.comparator = comparator;
-    }
-
-    public ObservableSortedKeyedArrayList(final Collection<? extends E> c) {
-        this();
-        addAll(c);
-    }
-
-    public ObservableSortedKeyedArrayList(final SortedKeyedList<K, E> other) {
-        this(other.comparator());
-        addAll(other);
-    }
-
-    @Override
-    public boolean add(final E e) {
-        final int insertionPoint = getInsertionPoint(e);
-        if (insertionPoint < 0) {
-            // Skipping insertion is non-destructive if the new and existing objects are the same.
-            if (e == get(-insertionPoint - 1))
-                return false;
-            throw new IllegalArgumentException("Element with same key already exists in list");
-        }
-        super.add(insertionPoint, e);
-        return true;
-    }
-
-    @Override
-    public void add(final int index, final E e) {
-        final int insertionPoint = getInsertionPoint(e);
-        if (insertionPoint < 0)
-            throw new IllegalArgumentException("Element with same key already exists in list");
-        if (insertionPoint != index)
-            throw new IndexOutOfBoundsException("Wrong index given for element");
-        super.add(index, e);
-    }
-
-    @Override
-    public boolean addAll(@NonNull final Collection<? extends E> c) {
-        boolean didChange = false;
-        for (final E e : c)
-            if (add(e))
-                didChange = true;
-        return didChange;
-    }
-
-    @Override
-    public boolean addAll(int index, @NonNull final Collection<? extends E> c) {
-        for (final E e : c)
-            add(index++, e);
-        return true;
-    }
-
-    @Override
-    public Comparator<? super K> comparator() {
-        return comparator;
-    }
-
-    @Override
-    public K firstKey() {
-        if (isEmpty())
-            // The parameter in the exception is only to shut
-            // lint up, we never care for the exception message.
-            throw new NoSuchElementException("Empty set");
-        return get(0).getKey();
-    }
-
-    private int getInsertionPoint(final E e) {
-        if (comparator != null) {
-            return -Collections.binarySearch(keyList, e.getKey(), comparator) - 1;
-        } else {
-            @SuppressWarnings("unchecked") final List<Comparable<? super K>> list =
-                    (List<Comparable<? super K>>) keyList;
-            return -Collections.binarySearch(list, e.getKey()) - 1;
-        }
-    }
-
-    @Override
-    public int indexOfKey(final K key) {
-        final int index;
-        if (comparator != null) {
-            index = Collections.binarySearch(keyList, key, comparator);
-        } else {
-            @SuppressWarnings("unchecked") final List<Comparable<? super K>> list =
-                    (List<Comparable<? super K>>) keyList;
-            index = Collections.binarySearch(list, key);
-        }
-        return index >= 0 ? index : -1;
-    }
-
-    @Override
-    @NonNull
-    public Set<K> keySet() {
-        return keyList;
-    }
-
-    @Override
-    public int lastIndexOfKey(final K key) {
-        // There can never be more than one element with the same key in the list.
-        return indexOfKey(key);
-    }
-
-    @Override
-    public K lastKey() {
-        if (isEmpty())
-            // The parameter in the exception is only to shut
-            // lint up, we never care for the exception message.
-            throw new NoSuchElementException("Empty set");
-        return get(size() - 1).getKey();
-    }
-
-    @Override
-    public E set(final int index, final E e) {
-        final int order;
-        if (comparator != null) {
-            order = comparator.compare(e.getKey(), get(index).getKey());
-        } else {
-            @SuppressWarnings("unchecked") final Comparable<? super K> key =
-                    (Comparable<? super K>) e.getKey();
-            order = key.compareTo(get(index).getKey());
-        }
-        if (order != 0) {
-            // Allow replacement if the new key would be inserted adjacent to the replaced element.
-            final int insertionPoint = getInsertionPoint(e);
-            if (insertionPoint < index || insertionPoint > index + 1)
-                throw new IndexOutOfBoundsException("Wrong index given for element");
-        }
-        return super.set(index, e);
-    }
-
-    @Override
-    @NonNull
-    public Collection<E> values() {
-        return this;
-    }
-
-    private static final class KeyList<K, E extends Keyed<? extends K>>
-            extends AbstractList<K> implements Set<K> {
-        private final ObservableSortedKeyedArrayList<K, E> list;
-
-        private KeyList(final ObservableSortedKeyedArrayList<K, E> list) {
-            this.list = list;
-        }
-
-        @Override
-        public K get(final int index) {
-            return list.get(index).getKey();
-        }
-
-        @Override
-        public int size() {
-            return list.size();
-        }
-
-        @Override
-        @SuppressWarnings("EmptyMethod")
-        public Spliterator<K> spliterator() {
-            return super.spliterator();
-        }
-    }
-}
@@ -1,15 +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.android.util;
-
-/**
- * A list that is both sorted/keyed and observable.
- */
-
-public interface ObservableSortedKeyedList<K, E extends Keyed<? extends K>>
-        extends ObservableKeyedList<K, E>, SortedKeyedList<K, E> {
-}
@@ -1,28 +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.android.util;
-
-import java.util.Collection;
-import java.util.Comparator;
-import java.util.Set;
-
-/**
- * A keyed list where all elements are sorted by the comparator returned by {@code comparator()}
- * applied to their keys.
- */
-
-public interface SortedKeyedList<K, E extends Keyed<? extends K>> extends KeyedList<K, E> {
-    Comparator<? super K> comparator();
-
-    K firstKey();
-
-    Set<K> keySet();
-
-    K lastKey();
-
-    Collection<E> values();
-}
@@ -1,142 +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.android.util;
-
-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.util.RootShell.NoRootException;
-
-import java.io.File;
-import java.io.FileNotFoundException;
-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 {
-    private static final String[][] EXECUTABLES = {
-            {"libwg.so", "wg"},
-            {"libwg-quick.so", "wg-quick"},
-    };
-    private static final File[] INSTALL_DIRS = {
-            new File("/system/xbin"),
-            new File("/system/bin"),
-    };
-    private static final File INSTALL_DIR = getInstallDir();
-    private static final String TAG = "WireGuard/" + ToolsInstaller.class.getSimpleName();
-
-    private final File localBinaryDir;
-    private final Object lock = new Object();
-    private final File nativeLibraryDir;
-    private final RootShell rootShell;
-    private Boolean areToolsAvailable;
-
-    @Inject
-    public ToolsInstaller(@ApplicationContext final Context context, final RootShell rootShell) {
-        localBinaryDir = new File(context.getCacheDir(), "bin");
-        nativeLibraryDir = new File(context.getApplicationInfo().nativeLibraryDir);
-        this.rootShell = rootShell;
-    }
-
-    private static File getInstallDir() {
-        final String path = System.getenv("PATH");
-        if (path == null)
-            return INSTALL_DIRS[0];
-        final List<String> paths = Arrays.asList(path.split(":"));
-        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;
-        final StringBuilder script = new StringBuilder();
-        for (final String[] names : EXECUTABLES) {
-            script.append(String.format("cmp -s '%s' '%s' && ",
-                    new File(nativeLibraryDir, names[0]),
-                    new File(INSTALL_DIR, names[1])));
-        }
-        script.append("exit ").append(OsConstants.EALREADY).append(';');
-        try {
-            return rootShell.run(null, script.toString());
-        } catch (final IOException ignored) {
-            return OsConstants.EXIT_FAILURE;
-        }
-    }
-
-    public void ensureToolsAvailable() throws FileNotFoundException, NoRootException {
-        synchronized (lock) {
-            if (areToolsAvailable == null) {
-                final int ret = symlink();
-                if (ret == OsConstants.EALREADY) {
-                    Log.d(TAG, "Tools were already symlinked into our private binary dir");
-                    areToolsAvailable = true;
-                } else if (ret == OsConstants.EXIT_SUCCESS) {
-                    Log.d(TAG, "Tools are now symlinked into our private binary dir");
-                    areToolsAvailable = true;
-                } else {
-                    Log.e(TAG, "For some reason, wg and wg-quick are not available at all");
-                    areToolsAvailable = false;
-                }
-            }
-            if (!areToolsAvailable)
-                throw new FileNotFoundException("Required tools unavailable");
-        }
-    }
-
-    public int install() throws NoRootException {
-        if (INSTALL_DIR == null)
-            return OsConstants.ENOENT;
-        final StringBuilder script = new StringBuilder("set -ex; ");
-        script.append("trap 'mount -o ro,remount /system' EXIT; mount -o rw,remount /system; ");
-        for (final String[] names : EXECUTABLES) {
-            final File destination = new File(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));
-        }
-        try {
-            return rootShell.run(null, script.toString());
-        } catch (final IOException ignored) {
-            return OsConstants.EXIT_FAILURE;
-        }
-    }
-
-    public int symlink() throws NoRootException {
-        final StringBuilder script = new StringBuilder("set -x; ");
-        for (final String[] names : EXECUTABLES) {
-            script.append(String.format("test '%s' -ef '%s' && ",
-                    new File(nativeLibraryDir, names[0]),
-                    new File(localBinaryDir, names[1])));
-        }
-        script.append("exit ").append(OsConstants.EALREADY).append("; set -e; ");
-
-        for (final String[] names : EXECUTABLES) {
-            script.append(String.format("ln -fns '%s' '%s'; ",
-                    new File(nativeLibraryDir, names[0]),
-                    new File(localBinaryDir, names[1])));
-        }
-        script.append("exit ").append(OsConstants.EXIT_SUCCESS).append(';');
-
-        try {
-            return rootShell.run(null, script.toString());
-        } catch (final IOException ignored) {
-            return OsConstants.EXIT_FAILURE;
-        }
-    }
-}
@@ -1,53 +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.android.widget;
-
-import android.text.InputFilter;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-
-import com.wireguard.crypto.KeyEncoding;
-
-/**
- * InputFilter for entering WireGuard private/public keys encoded with base64.
- */
-
-public class KeyInputFilter implements InputFilter {
-    private static boolean isAllowed(final char c) {
-        return Character.isLetterOrDigit(c) || c == '+' || c == '/';
-    }
-
-    public static InputFilter newInstance() {
-        return new KeyInputFilter();
-    }
-
-    @Override
-    public CharSequence filter(final CharSequence source,
-                               final int sStart, final int sEnd,
-                               final Spanned dest,
-                               final int dStart, final int dEnd) {
-        SpannableStringBuilder replacement = null;
-        int rIndex = 0;
-        final int dLength = dest.length();
-        for (int sIndex = sStart; sIndex < sEnd; ++sIndex) {
-            final char c = source.charAt(sIndex);
-            final int dIndex = dStart + (sIndex - sStart);
-            // Restrict characters to the base64 character set.
-            // Ensure adding this character does not push the length over the limit.
-            if (((dIndex + 1 < KeyEncoding.KEY_LENGTH_BASE64 && isAllowed(c)) ||
-                    (dIndex + 1 == KeyEncoding.KEY_LENGTH_BASE64 && c == '=')) &&
-                    dLength + (sIndex - sStart) < KeyEncoding.KEY_LENGTH_BASE64) {
-                ++rIndex;
-            } else {
-                if (replacement == null)
-                    replacement = new SpannableStringBuilder(source, sStart, sEnd);
-                replacement.delete(rIndex, rIndex + 1);
-            }
-        }
-        return replacement;
-    }
-}
@@ -1,52 +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.android.widget;
-
-import android.text.InputFilter;
-import android.text.SpannableStringBuilder;
-import android.text.Spanned;
-
-import com.wireguard.android.model.Tunnel;
-
-/**
- * InputFilter for entering WireGuard configuration names (Linux interface names).
- */
-
-public class NameInputFilter implements InputFilter {
-    private static boolean isAllowed(final char c) {
-        return Character.isLetterOrDigit(c) || "_=+.-".indexOf(c) >= 0;
-    }
-
-    public static InputFilter newInstance() {
-        return new NameInputFilter();
-    }
-
-    @Override
-    public CharSequence filter(final CharSequence source,
-                               final int sStart, final int sEnd,
-                               final Spanned dest,
-                               final int dStart, final int dEnd) {
-        SpannableStringBuilder replacement = null;
-        int rIndex = 0;
-        final int dLength = dest.length();
-        for (int sIndex = sStart; sIndex < sEnd; ++sIndex) {
-            final char c = source.charAt(sIndex);
-            final int dIndex = dStart + (sIndex - sStart);
-            // Restrict characters to those valid in interfaces.
-            // Ensure adding this character does not push the length over the limit.
-            if ((dIndex < Tunnel.NAME_MAX_LENGTH && isAllowed(c)) &&
-                    dLength + (sIndex - sStart) < Tunnel.NAME_MAX_LENGTH) {
-                ++rIndex;
-            } else {
-                if (replacement == null)
-                    replacement = new SpannableStringBuilder(source, sStart, sEnd);
-                replacement.delete(rIndex, rIndex + 1);
-            }
-        }
-        return replacement;
-    }
-}
@@ -1,57 +0,0 @@
-/*
- * Copyright © 2013 The Android Open Source Project
- * SPDX-License-Identifier: Apache-2.0
- */
-
-package com.wireguard.android.widget;
-
-import android.content.Context;
-import android.os.Parcelable;
-import android.util.AttributeSet;
-import android.widget.Switch;
-
-public class ToggleSwitch extends Switch {
-    private boolean isRestoringState;
-    private OnBeforeCheckedChangeListener listener;
-
-    @SuppressWarnings({"SameParameterValue", "WeakerAccess"})
-    public ToggleSwitch(final Context context, final AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    public ToggleSwitch(final Context context) {
-        this(context, null);
-    }
-
-    @Override
-    public void onRestoreInstanceState(final Parcelable state) {
-        isRestoringState = true;
-        super.onRestoreInstanceState(state);
-        isRestoringState = false;
-    }
-
-    @Override
-    public void setChecked(final boolean checked) {
-        if (checked == isChecked())
-            return;
-        if (isRestoringState || listener == null) {
-            super.setChecked(checked);
-            return;
-        }
-        setEnabled(false);
-        listener.onBeforeCheckedChanged(this, checked);
-    }
-
-    public void setCheckedInternal(final boolean checked) {
-        super.setChecked(checked);
-        setEnabled(true);
-    }
-
-    public void setOnBeforeCheckedChangeListener(final OnBeforeCheckedChangeListener listener) {
-        this.listener = listener;
-    }
-
-    public interface OnBeforeCheckedChangeListener {
-        void onBeforeCheckedChanged(ToggleSwitch toggleSwitch, boolean checked);
-    }
-}
@@ -1,115 +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 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;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * The set of valid attributes for an interface or peer in a WireGuard configuration file.
- */
-
-enum Attribute {
-    ADDRESS("Address"),
-    ALLOWED_IPS("AllowedIPs"),
-    DNS("DNS"),
-    ENDPOINT("Endpoint"),
-    LISTEN_PORT("ListenPort"),
-    MTU("MTU"),
-    PERSISTENT_KEEPALIVE("PersistentKeepalive"),
-    PRESHARED_KEY("PresharedKey"),
-    PRIVATE_KEY("PrivateKey"),
-    PUBLIC_KEY("PublicKey");
-
-    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 {
-        KEY_MAP = new HashMap<>(Attribute.values().length);
-        for (final Attribute key : Attribute.values()) {
-            KEY_MAP.put(key.token.toLowerCase(), key);
-        }
-    }
-
-    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;
-
-    Attribute(final String token) {
-        pattern = Pattern.compile(token + "\\s*=\\s*(\\S.*)");
-        this.token = token;
-    }
-
-    public static <T> String iterableToString(final Iterable<T> iterable) {
-        return TextUtils.join(", ", iterable);
-    }
-
-    public static Attribute match(final CharSequence line) {
-        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)
-            return EMPTY_LIST;
-        return LIST_SEPARATOR_PATTERN.split(string.trim());
-    }
-
-    public String composeWith(final Object value) {
-        return String.format("%s = %s%n", token, value);
-    }
-
-    public String composeWith(final int value) {
-        return String.format(Locale.getDefault(), "%s = %d%n", token, value);
-    }
-
-    public <T> String composeWith(final Iterable<T> value) {
-        return String.format("%s = %s%n", token, iterableToString(value));
-    }
-
-    public String parse(final CharSequence line) {
-        final Matcher matcher = pattern.matcher(line);
-        return matcher.matches() ? matcher.group(1) : null;
-    }
-
-    public String[] parseList(final CharSequence line) {
-        final Matcher matcher = pattern.matcher(line);
-        return matcher.matches() ? stringToList(matcher.group(1)) : null;
-    }
-}
@@ -1,168 +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 android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.databinding.ObservableArrayList;
-import android.databinding.ObservableList;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.android.databinding.library.baseAdapters.BR;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents a wg-quick configuration file, its name, and its connection state.
- */
-
-public class Config {
-    private final Interface interfaceSection = new Interface();
-    private List<Peer> peers = new ArrayList<>();
-
-    public static Config from(final InputStream stream) throws IOException {
-        return from(new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)));
-    }
-
-    public static Config from(final BufferedReader reader) throws IOException {
-        final Config config = new Config();
-        Peer currentPeer = null;
-        String line;
-        boolean inInterfaceSection = false;
-        while ((line = reader.readLine()) != null) {
-            final int commentIndex = line.indexOf('#');
-            if (commentIndex != -1)
-                line = line.substring(0, commentIndex);
-            line = line.trim();
-            if (line.isEmpty())
-                continue;
-            if ("[Interface]".toLowerCase().equals(line.toLowerCase())) {
-                currentPeer = null;
-                inInterfaceSection = true;
-            } else if ("[Peer]".toLowerCase().equals(line.toLowerCase())) {
-                currentPeer = new Peer();
-                config.peers.add(currentPeer);
-                inInterfaceSection = false;
-            } else if (inInterfaceSection) {
-                config.interfaceSection.parse(line);
-            } else if (currentPeer != null) {
-                currentPeer.parse(line);
-            } else {
-                throw new IllegalArgumentException("Invalid configuration line: " + line);
-            }
-        }
-        if (!inInterfaceSection && currentPeer == null) {
-            throw new IllegalArgumentException("Could not find any config information");
-        }
-        return config;
-    }
-
-    public Interface getInterface() {
-        return interfaceSection;
-    }
-
-    public List<Peer> getPeers() {
-        return peers;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder().append(interfaceSection);
-        for (final Peer peer : peers)
-            sb.append('\n').append(peer);
-        return sb.toString();
-    }
-
-    public static class Observable extends BaseObservable implements Parcelable {
-        public static final Creator<Observable> CREATOR = new Creator<Observable>() {
-            @Override
-            public Observable createFromParcel(final Parcel in) {
-                return new Observable(in);
-            }
-
-            @Override
-            public Observable[] newArray(final int size) {
-                return new Observable[size];
-            }
-        };
-        private String name;
-        private Interface.Observable observableInterface;
-        private ObservableList<Peer.Observable> observablePeers;
-
-        public Observable(final Config parent, final String name) {
-            this.name = name;
-            loadData(parent);
-        }
-
-        private Observable(final Parcel in) {
-            name = in.readString();
-            observableInterface = in.readParcelable(Interface.Observable.class.getClassLoader());
-            observablePeers = new ObservableArrayList<>();
-            in.readTypedList(observablePeers, Peer.Observable.CREATOR);
-        }
-
-        public void commitData(final Config parent) {
-            observableInterface.commitData(parent.interfaceSection);
-            final List<Peer> newPeers = new ArrayList<>(observablePeers.size());
-            for (final Peer.Observable observablePeer : observablePeers) {
-                final Peer peer = new Peer();
-                observablePeer.commitData(peer);
-                newPeers.add(peer);
-            }
-            parent.peers = newPeers;
-            notifyChange();
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Bindable
-        public Interface.Observable getInterfaceSection() {
-            return observableInterface;
-        }
-
-        @Bindable
-        public String getName() {
-            return name == null ? "" : name;
-        }
-
-        @Bindable
-        public ObservableList<Peer.Observable> getPeers() {
-            return observablePeers;
-        }
-
-        protected void loadData(final Config parent) {
-            observableInterface = new Interface.Observable(parent == null ? null : parent.interfaceSection);
-            observablePeers = new ObservableArrayList<>();
-            if (parent != null) {
-                for (final Peer peer : parent.getPeers())
-                    observablePeers.add(new Peer.Observable(peer));
-            }
-        }
-
-        public void setName(final String name) {
-            this.name = name;
-            notifyPropertyChanged(BR.name);
-        }
-
-        @Override
-        public void writeToParcel(final Parcel dest, final int flags) {
-            dest.writeString(name);
-            dest.writeParcelable(observableInterface, flags);
-            dest.writeTypedList(observablePeers);
-        }
-    }
-}
@@ -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);
-    }
-}
@@ -1,329 +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 android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.wireguard.android.BR;
-import com.wireguard.crypto.Keypair;
-
-import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.List;
-
-/**
- * Represents the configuration for a WireGuard interface (an [Interface] block).
- */
-
-public class Interface {
-    private final List<IPCidr> addressList;
-    private final List<InetAddress> dnsList;
-    private Keypair keypair;
-    private int listenPort;
-    private int mtu;
-
-    public Interface() {
-        addressList = new ArrayList<>();
-        dnsList = new ArrayList<>();
-    }
-
-    private void addAddresses(final String[] addresses) {
-        if (addresses != null && addresses.length > 0) {
-            for (final String addr : addresses) {
-                if (addr.isEmpty())
-                    throw new IllegalArgumentException("Address is empty");
-                addressList.add(new IPCidr(addr));
-            }
-        }
-    }
-
-    private void addDnses(final String[] dnses) {
-        if (dnses != null && dnses.length > 0) {
-            for (final String dns : dnses) {
-                dnsList.add(Attribute.parseIPString(dns));
-            }
-        }
-    }
-
-    private String getAddressString() {
-        if (addressList.isEmpty())
-            return null;
-        return Attribute.iterableToString(addressList);
-    }
-
-    public IPCidr[] getAddresses() {
-        return addressList.toArray(new IPCidr[addressList.size()]);
-    }
-
-    private String getDnsString() {
-        if (dnsList.isEmpty())
-            return null;
-        return Attribute.iterableToString(getDnsStrings());
-    }
-
-    private List<String> getDnsStrings() {
-        final List<String> strings = new ArrayList<>();
-        for (final InetAddress addr : dnsList)
-            strings.add(addr.getHostAddress());
-        return strings;
-    }
-
-    public InetAddress[] getDnses() {
-        return dnsList.toArray(new InetAddress[dnsList.size()]);
-    }
-
-    public int getListenPort() {
-        return listenPort;
-    }
-
-    private String getListenPortString() {
-        if (listenPort == 0)
-            return null;
-        return Integer.valueOf(listenPort).toString();
-    }
-
-    public int getMtu() {
-        return mtu;
-    }
-
-    private String getMtuString() {
-        if (mtu == 0)
-            return null;
-        return Integer.toString(mtu);
-    }
-
-    public String getPrivateKey() {
-        if (keypair == null)
-            return null;
-        return keypair.getPrivateKey();
-    }
-
-    public String getPublicKey() {
-        if (keypair == null)
-            return null;
-        return keypair.getPublicKey();
-    }
-
-    public void parse(final String line) {
-        final Attribute key = Attribute.match(line);
-        switch (key) {
-            case ADDRESS:
-                addAddresses(key.parseList(line));
-                break;
-            case DNS:
-                addDnses(key.parseList(line));
-                break;
-            case LISTEN_PORT:
-                setListenPortString(key.parse(line));
-                break;
-            case MTU:
-                setMtuString(key.parse(line));
-                break;
-            case PRIVATE_KEY:
-                setPrivateKey(key.parse(line));
-                break;
-            default:
-                throw new IllegalArgumentException(line);
-        }
-    }
-
-    private void setAddressString(final String addressString) {
-        addressList.clear();
-        addAddresses(Attribute.stringToList(addressString));
-    }
-
-    private void setDnsString(final String dnsString) {
-        dnsList.clear();
-        addDnses(Attribute.stringToList(dnsString));
-    }
-
-    private void setListenPort(final int listenPort) {
-        this.listenPort = listenPort;
-    }
-
-    private void setListenPortString(final String port) {
-        if (port != null && !port.isEmpty())
-            setListenPort(Integer.parseInt(port, 10));
-        else
-            setListenPort(0);
-    }
-
-    private void setMtu(final int mtu) {
-        this.mtu = mtu;
-    }
-
-    private void setMtuString(final String mtu) {
-        if (mtu != null && !mtu.isEmpty())
-            setMtu(Integer.parseInt(mtu, 10));
-        else
-            setMtu(0);
-    }
-
-    private void setPrivateKey(String privateKey) {
-        if (privateKey != null && privateKey.isEmpty())
-            privateKey = null;
-        keypair = privateKey == null ? null : new Keypair(privateKey);
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder().append("[Interface]\n");
-        if (!addressList.isEmpty())
-            sb.append(Attribute.ADDRESS.composeWith(addressList));
-        if (!dnsList.isEmpty())
-            sb.append(Attribute.DNS.composeWith(getDnsStrings()));
-        if (listenPort != 0)
-            sb.append(Attribute.LISTEN_PORT.composeWith(listenPort));
-        if (mtu != 0)
-            sb.append(Attribute.MTU.composeWith(mtu));
-        if (keypair != null)
-            sb.append(Attribute.PRIVATE_KEY.composeWith(keypair.getPrivateKey()));
-        return sb.toString();
-    }
-
-    public static class Observable extends BaseObservable implements Parcelable {
-        public static final Creator<Observable> CREATOR = new Creator<Observable>() {
-            @Override
-            public Observable createFromParcel(final Parcel in) {
-                return new Observable(in);
-            }
-
-            @Override
-            public Observable[] newArray(final int size) {
-                return new Observable[size];
-            }
-        };
-        private String addresses;
-        private String dnses;
-        private String listenPort;
-        private String mtu;
-        private String privateKey;
-        private String publicKey;
-
-        public Observable(final Interface parent) {
-            if (parent != null)
-                loadData(parent);
-        }
-
-        private Observable(final Parcel in) {
-            addresses = in.readString();
-            dnses = in.readString();
-            publicKey = in.readString();
-            privateKey = in.readString();
-            listenPort = in.readString();
-            mtu = in.readString();
-        }
-
-        public void commitData(final Interface parent) {
-            parent.setAddressString(addresses);
-            parent.setDnsString(dnses);
-            parent.setPrivateKey(privateKey);
-            parent.setListenPortString(listenPort);
-            parent.setMtuString(mtu);
-            loadData(parent);
-            notifyChange();
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        public void generateKeypair() {
-            final Keypair keypair = new Keypair();
-            privateKey = keypair.getPrivateKey();
-            publicKey = keypair.getPublicKey();
-            notifyPropertyChanged(BR.privateKey);
-            notifyPropertyChanged(BR.publicKey);
-        }
-
-        @Bindable
-        public String getAddresses() {
-            return addresses;
-        }
-
-        @Bindable
-        public String getDnses() {
-            return dnses;
-        }
-
-        @Bindable
-        public String getListenPort() {
-            return listenPort;
-        }
-
-        @Bindable
-        public String getMtu() {
-            return mtu;
-        }
-
-        @Bindable
-        public String getPrivateKey() {
-            return privateKey;
-        }
-
-        @Bindable
-        public String getPublicKey() {
-            return publicKey;
-        }
-
-        protected void loadData(final Interface parent) {
-            addresses = parent.getAddressString();
-            dnses = parent.getDnsString();
-            publicKey = parent.getPublicKey();
-            privateKey = parent.getPrivateKey();
-            listenPort = parent.getListenPortString();
-            mtu = parent.getMtuString();
-        }
-
-        public void setAddresses(final String addresses) {
-            this.addresses = addresses;
-            notifyPropertyChanged(BR.addresses);
-        }
-
-        public void setDnses(final String dnses) {
-            this.dnses = dnses;
-            notifyPropertyChanged(BR.dnses);
-        }
-
-        public void setListenPort(final String listenPort) {
-            this.listenPort = listenPort;
-            notifyPropertyChanged(BR.listenPort);
-        }
-
-        public void setMtu(final String mtu) {
-            this.mtu = mtu;
-            notifyPropertyChanged(BR.mtu);
-        }
-
-        public void setPrivateKey(final String privateKey) {
-            this.privateKey = privateKey;
-
-            try {
-                publicKey = new Keypair(privateKey).getPublicKey();
-            } catch (final IllegalArgumentException ignored) {
-                publicKey = "";
-            }
-
-            notifyPropertyChanged(BR.privateKey);
-            notifyPropertyChanged(BR.publicKey);
-        }
-
-        @Override
-        public void writeToParcel(final Parcel dest, final int flags) {
-            dest.writeString(addresses);
-            dest.writeString(dnses);
-            dest.writeString(publicKey);
-            dest.writeString(privateKey);
-            dest.writeString(listenPort);
-            dest.writeString(mtu);
-        }
-    }
-}
@@ -1,315 +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 android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.os.Parcel;
-import android.os.Parcelable;
-
-import com.android.databinding.library.baseAdapters.BR;
-import com.wireguard.crypto.KeyEncoding;
-
-import java.net.Inet6Address;
-import java.net.InetSocketAddress;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.net.UnknownHostException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-/**
- * Represents the configuration for a WireGuard peer (a [Peer] block).
- */
-
-public class Peer {
-    private final List<IPCidr> allowedIPsList;
-    private InetSocketAddress endpoint;
-    private int persistentKeepalive;
-    private String preSharedKey;
-    private String publicKey;
-
-    public Peer() {
-        allowedIPsList = new ArrayList<>();
-    }
-
-    private void addAllowedIPs(final String[] allowedIPs) {
-        if (allowedIPs != null && allowedIPs.length > 0) {
-            for (final String allowedIP : allowedIPs) {
-                allowedIPsList.add(new IPCidr(allowedIP));
-            }
-        }
-    }
-
-    public IPCidr[] getAllowedIPs() {
-        return allowedIPsList.toArray(new IPCidr[allowedIPsList.size()]);
-    }
-
-    private String getAllowedIPsString() {
-        if (allowedIPsList.isEmpty())
-            return null;
-        return Attribute.iterableToString(allowedIPsList);
-    }
-
-    public InetSocketAddress getEndpoint() {
-        return endpoint;
-    }
-
-    private String getEndpointString() {
-        if (endpoint == null)
-            return null;
-        return String.format(Locale.getDefault(), "%s:%d", endpoint.getHostString(), endpoint.getPort());
-    }
-
-    public int getPersistentKeepalive() {
-        return persistentKeepalive;
-    }
-
-    private String getPersistentKeepaliveString() {
-        if (persistentKeepalive == 0)
-            return null;
-        return Integer.valueOf(persistentKeepalive).toString();
-    }
-
-    public String getPreSharedKey() {
-        return preSharedKey;
-    }
-
-    public String getPublicKey() {
-        return publicKey;
-    }
-
-    public String getResolvedEndpointString() throws UnknownHostException {
-        if (endpoint == null)
-            throw new UnknownHostException("{empty}");
-        if (endpoint.isUnresolved())
-            endpoint = new InetSocketAddress(endpoint.getHostString(), endpoint.getPort());
-        if (endpoint.isUnresolved())
-            throw new UnknownHostException(endpoint.getHostString());
-        if (endpoint.getAddress() instanceof Inet6Address)
-            return String.format(Locale.getDefault(),
-                    "[%s]:%d",
-                    endpoint.getAddress().getHostAddress(),
-                    endpoint.getPort());
-        return String.format(Locale.getDefault(),
-                "%s:%d",
-                endpoint.getAddress().getHostAddress(),
-                endpoint.getPort());
-    }
-
-    public void parse(final String line) {
-        final Attribute key = Attribute.match(line);
-        switch (key) {
-            case ALLOWED_IPS:
-                addAllowedIPs(key.parseList(line));
-                break;
-            case ENDPOINT:
-                setEndpointString(key.parse(line));
-                break;
-            case PERSISTENT_KEEPALIVE:
-                setPersistentKeepaliveString(key.parse(line));
-                break;
-            case PRESHARED_KEY:
-                setPreSharedKey(key.parse(line));
-                break;
-            case PUBLIC_KEY:
-                setPublicKey(key.parse(line));
-                break;
-            default:
-                throw new IllegalArgumentException(line);
-        }
-    }
-
-    private void setAllowedIPsString(final String allowedIPsString) {
-        allowedIPsList.clear();
-        addAllowedIPs(Attribute.stringToList(allowedIPsString));
-    }
-
-    private void setEndpoint(final InetSocketAddress endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    private void setEndpointString(final String endpoint) {
-        if (endpoint != null && !endpoint.isEmpty()) {
-            final InetSocketAddress constructedEndpoint;
-            if (endpoint.indexOf('/') != -1 || endpoint.indexOf('?') != -1 || endpoint.indexOf('#') != -1)
-                throw new IllegalArgumentException("Forbidden characters in endpoint");
-            final URI uri;
-            try {
-                uri = new URI("wg://" + endpoint);
-            } catch (final URISyntaxException e) {
-                throw new IllegalArgumentException(e);
-            }
-            constructedEndpoint = InetSocketAddress.createUnresolved(uri.getHost(), uri.getPort());
-            setEndpoint(constructedEndpoint);
-        } else
-            setEndpoint(null);
-    }
-
-    private void setPersistentKeepalive(final int persistentKeepalive) {
-        this.persistentKeepalive = persistentKeepalive;
-    }
-
-    private void setPersistentKeepaliveString(final String persistentKeepalive) {
-        if (persistentKeepalive != null && !persistentKeepalive.isEmpty())
-            setPersistentKeepalive(Integer.parseInt(persistentKeepalive, 10));
-        else
-            setPersistentKeepalive(0);
-    }
-
-    private void setPreSharedKey(String preSharedKey) {
-        if (preSharedKey != null && preSharedKey.isEmpty())
-            preSharedKey = null;
-        if (preSharedKey != null)
-            KeyEncoding.keyFromBase64(preSharedKey);
-        this.preSharedKey = preSharedKey;
-    }
-
-    private void setPublicKey(String publicKey) {
-        if (publicKey != null && publicKey.isEmpty())
-            publicKey = null;
-        if (publicKey != null)
-            KeyEncoding.keyFromBase64(publicKey);
-        this.publicKey = publicKey;
-    }
-
-    @Override
-    public String toString() {
-        final StringBuilder sb = new StringBuilder().append("[Peer]\n");
-        if (!allowedIPsList.isEmpty())
-            sb.append(Attribute.ALLOWED_IPS.composeWith(allowedIPsList));
-        if (endpoint != null)
-            sb.append(Attribute.ENDPOINT.composeWith(getEndpointString()));
-        if (persistentKeepalive != 0)
-            sb.append(Attribute.PERSISTENT_KEEPALIVE.composeWith(persistentKeepalive));
-        if (preSharedKey != null)
-            sb.append(Attribute.PRESHARED_KEY.composeWith(preSharedKey));
-        if (publicKey != null)
-            sb.append(Attribute.PUBLIC_KEY.composeWith(publicKey));
-        return sb.toString();
-    }
-
-    public static class Observable extends BaseObservable implements Parcelable {
-        public static final Creator<Observable> CREATOR = new Creator<Observable>() {
-            @Override
-            public Observable createFromParcel(final Parcel in) {
-                return new Observable(in);
-            }
-
-            @Override
-            public Observable[] newArray(final int size) {
-                return new Observable[size];
-            }
-        };
-        private String allowedIPs;
-        private String endpoint;
-        private String persistentKeepalive;
-        private String preSharedKey;
-        private String publicKey;
-
-        public Observable(final Peer parent) {
-            loadData(parent);
-        }
-
-        private Observable(final Parcel in) {
-            allowedIPs = in.readString();
-            endpoint = in.readString();
-            persistentKeepalive = in.readString();
-            preSharedKey = in.readString();
-            publicKey = in.readString();
-        }
-
-        public static Observable newInstance() {
-            return new Observable(new Peer());
-        }
-
-        public void commitData(final Peer parent) {
-            parent.setAllowedIPsString(allowedIPs);
-            parent.setEndpointString(endpoint);
-            parent.setPersistentKeepaliveString(persistentKeepalive);
-            parent.setPreSharedKey(preSharedKey);
-            parent.setPublicKey(publicKey);
-            if (parent.getPublicKey() == null)
-                throw new IllegalArgumentException("Peer public key may not be empty");
-            loadData(parent);
-            notifyChange();
-        }
-
-        @Override
-        public int describeContents() {
-            return 0;
-        }
-
-        @Bindable
-        public String getAllowedIPs() {
-            return allowedIPs;
-        }
-
-        @Bindable
-        public String getEndpoint() {
-            return endpoint;
-        }
-
-        @Bindable
-        public String getPersistentKeepalive() {
-            return persistentKeepalive;
-        }
-
-        @Bindable
-        public String getPreSharedKey() {
-            return preSharedKey;
-        }
-
-        @Bindable
-        public String getPublicKey() {
-            return publicKey;
-        }
-
-        protected void loadData(final Peer parent) {
-            allowedIPs = parent.getAllowedIPsString();
-            endpoint = parent.getEndpointString();
-            persistentKeepalive = parent.getPersistentKeepaliveString();
-            preSharedKey = parent.getPreSharedKey();
-            publicKey = parent.getPublicKey();
-        }
-
-        public void setAllowedIPs(final String allowedIPs) {
-            this.allowedIPs = allowedIPs;
-            notifyPropertyChanged(BR.allowedIPs);
-        }
-
-        public void setEndpoint(final String endpoint) {
-            this.endpoint = endpoint;
-            notifyPropertyChanged(BR.endpoint);
-        }
-
-        public void setPersistentKeepalive(final String persistentKeepalive) {
-            this.persistentKeepalive = persistentKeepalive;
-            notifyPropertyChanged(BR.persistentKeepalive);
-        }
-
-        public void setPreSharedKey(final String preSharedKey) {
-            this.preSharedKey = preSharedKey;
-            notifyPropertyChanged(BR.preSharedKey);
-        }
-
-        public void setPublicKey(final String publicKey) {
-            this.publicKey = publicKey;
-            notifyPropertyChanged(BR.publicKey);
-        }
-
-        @Override
-        public void writeToParcel(final Parcel dest, final int flags) {
-            dest.writeString(allowedIPs);
-            dest.writeString(endpoint);
-            dest.writeString(persistentKeepalive);
-            dest.writeString(preSharedKey);
-            dest.writeString(publicKey);
-        }
-    }
-}
@@ -1,144 +0,0 @@
-/*
- * Copyright © 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-package com.wireguard.crypto;
-
-/**
- * This is a specialized constant-time base64 and hex implementation that resists side-channel attacks.
- */
-
-@SuppressWarnings("MagicNumber")
-public final class KeyEncoding {
-    public static final int KEY_LENGTH = 32;
-    public static final int KEY_LENGTH_BASE64 = 44;
-    public static final int KEY_LENGTH_HEX = 64;
-    private static final String KEY_LENGTH_BASE64_EXCEPTION_MESSAGE =
-            "WireGuard base64 keys must be 44 characters encoding 32 bytes";
-    private static final String KEY_LENGTH_EXCEPTION_MESSAGE =
-            "WireGuard keys must be 32 bytes";
-    private static final String KEY_LENGTH_HEX_EXCEPTION_MESSAGE =
-            "WireGuard hex keys must be 64 characters encoding 32 bytes";
-
-    private KeyEncoding() {
-        // Prevent instantiation.
-    }
-
-    private static int decodeBase64(final char[] src, final int src_offset) {
-        int val = 0;
-        for (int i = 0; i < 4; ++i) {
-            final char c = src[i + src_offset];
-            val |= (-1
-                    + ((((('A' - 1) - c) & (c - ('Z' + 1))) >>> 8) & (c - 64))
-                    + ((((('a' - 1) - c) & (c - ('z' + 1))) >>> 8) & (c - 70))
-                    + ((((('0' - 1) - c) & (c - ('9' + 1))) >>> 8) & (c + 5))
-                    + ((((('+' - 1) - c) & (c - ('+' + 1))) >>> 8) & 63)
-                    + ((((('/' - 1) - c) & (c - ('/' + 1))) >>> 8) & 64)
-            ) << (18 - 6 * i);
-        }
-        return val;
-    }
-
-    private static void encodeBase64(final byte[] src, final int src_offset,
-                                     final char[] dest, final int dest_offset) {
-        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),
-        };
-        for (int i = 0; i < 4; ++i) {
-            dest[i + dest_offset] = (char) (input[i] + 'A'
-                    + (((25 - input[i]) >>> 8) & 6)
-                    - (((51 - input[i]) >>> 8) & 75)
-                    - (((61 - input[i]) >>> 8) & 15)
-                    + (((62 - input[i]) >>> 8) & 3));
-        }
-    }
-
-    public static byte[] keyFromBase64(final String str) {
-        final char[] input = str.toCharArray();
-        final byte[] key = new byte[KEY_LENGTH];
-        if (input.length != KEY_LENGTH_BASE64 || input[KEY_LENGTH_BASE64 - 1] != '=')
-            throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
-        int i;
-        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);
-            key[i * 3] = (byte) ((val >>> 16) & 0xff);
-            key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
-            key[i * 3 + 2] = (byte) (val & 0xff);
-        }
-        final char[] endSegment = {
-                input[i * 4],
-                input[i * 4 + 1],
-                input[i * 4 + 2],
-                'A',
-        };
-        final int val = decodeBase64(endSegment, 0);
-        if (val < 0 || (val & 0xff) != 0)
-            throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
-        key[i * 3] = (byte) ((val >>> 16) & 0xff);
-        key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
-        return key;
-    }
-
-    public static byte[] keyFromHex(final String str) {
-        final char[] input = str.toCharArray();
-        final byte[] key = new byte[KEY_LENGTH];
-        if (input.length != KEY_LENGTH_HEX)
-            throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);
-
-        int c_acc = 0;
-        int state = 0;
-
-        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;
-        }
-        return key;
-    }
-
-    public static String keyToBase64(final byte[] key) {
-        final char[] output = new char[KEY_LENGTH_BASE64];
-        if (key.length != KEY_LENGTH)
-            throw new IllegalArgumentException(KEY_LENGTH_EXCEPTION_MESSAGE);
-        int i;
-        for (i = 0; i < KEY_LENGTH / 3; ++i)
-            encodeBase64(key, i * 3, output, i * 4);
-        final byte[] endSegment = {
-                key[i * 3],
-                key[i * 3 + 1],
-                0,
-        };
-        encodeBase64(endSegment, 0, output, i * 4);
-        output[KEY_LENGTH_BASE64 - 1] = '=';
-        return new String(output);
-    }
-
-    public static String keyToHex(final byte[] key) {
-        final char[] output = new char[KEY_LENGTH_HEX];
-        if (key.length != KEY_LENGTH)
-            throw new IllegalArgumentException(KEY_LENGTH_EXCEPTION_MESSAGE);
-        for (int i = 0; i < KEY_LENGTH; ++i) {
-            output[i * 2] = (char) (87 + (key[i] >> 4 & 0xf)
-                    + ((((key[i] >> 4 & 0xf) - 10) >> 8) & ~38));
-            output[i * 2 + 1] = (char) (87 + (key[i] & 0xf)
-                    + ((((key[i] & 0xf) - 10) >> 8) & ~38));
-        }
-        return new String(output);
-    }
-}
@@ -1,56 +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.crypto;
-
-import java.security.SecureRandom;
-
-/**
- * Represents a Curve25519 keypair as used by WireGuard.
- */
-
-public class Keypair {
-    private final byte[] privateKey;
-    private final byte[] publicKey;
-
-    public Keypair() {
-        this(generatePrivateKey());
-    }
-
-    private Keypair(final byte[] privateKey) {
-        this.privateKey = privateKey;
-        publicKey = generatePublicKey(privateKey);
-    }
-
-    public Keypair(final String privateKey) {
-        this(KeyEncoding.keyFromBase64(privateKey));
-    }
-
-    @SuppressWarnings("MagicNumber")
-    private static byte[] generatePrivateKey() {
-        final SecureRandom secureRandom = new SecureRandom();
-        final byte[] privateKey = new byte[KeyEncoding.KEY_LENGTH];
-        secureRandom.nextBytes(privateKey);
-        privateKey[0] &= 248;
-        privateKey[31] &= 127;
-        privateKey[31] |= 64;
-        return privateKey;
-    }
-
-    private static byte[] generatePublicKey(final byte[] privateKey) {
-        final byte[] publicKey = new byte[KeyEncoding.KEY_LENGTH];
-        Curve25519.eval(publicKey, 0, privateKey, null);
-        return publicKey;
-    }
-
-    public String getPrivateKey() {
-        return KeyEncoding.keyToBase64(privateKey);
-    }
-
-    public String getPublicKey() {
-        return KeyEncoding.keyToBase64(publicKey);
-    }
-}
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="4dp" />
-    <padding
-        android:bottom="4dp"
-        android:left="8dp"
-        android:right="8dp"
-        android:top="4dp" />
-    <solid android:color="?android:attr/colorPrimary" />
-</shape>
@@ -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>
@@ -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="#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" />
-</vector>
@@ -1,29 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="400dp"
-    android:height="400dp"
-    android:viewportHeight="400.0"
-    android:viewportWidth="400.0">
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#ffffff"
-        android:pathData="M197.7,0C191.5,0.1 185.2,0.5 178.7,1.1C191.1,4 202.2,6.6 213.4,9.2C213.3,9.8 213.1,10.5 213,11.2C198.1,13.2 183.9,7.7 169.3,5.7C174.6,8.8 180,11.7 185.5,14.2C191.2,16.7 197,18.8 202.8,21.2C195.4,27.5 188,28.8 178.7,26.7C173.7,25.6 168.3,25 163.1,25.2C157.8,25.5 152.4,26.8 147.5,30C152.7,32.7 157.5,34.8 162.1,37.5C163.9,38.6 166.1,40.4 166.6,42.4C167.8,46.9 168.2,51.8 168.9,56.5C160.4,57.5 145.4,66.1 142.4,71.7C155.5,74.3 169.7,71.2 182.2,79.6C178.1,82.8 168.5,86.6 165,89.3C169.3,90.4 179.4,89.9 183.3,89.6C186.6,89.4 188.2,89.3 189.5,90.4L228,120.6C232.1,123.8 248.4,139.3 252.7,149C256.3,157.3 256.8,164.4 256.8,166.1C256.8,170.7 256.2,177.9 253,186C252.7,186.9 252,188.3 251.2,189.8L280.8,219.4C288.3,207.7 293.4,194.5 296.3,180C299.6,163.2 299.4,146.5 291.7,130.5C285.8,118.3 276.1,109.4 265.8,101.3C255.1,93 243.7,85.4 233.1,77C230.2,74.8 228.3,70.8 226.9,67.3C226.4,65.8 228.2,61.7 229.4,61.5C236,60.3 242.6,59.7 249.3,59.4C256.9,59.2 264.6,59.4 272.3,59.5C274,59.5 276.2,59.3 277.2,60.3C281.2,64.2 284.3,61.6 287,59.1C289.4,56.9 291,54 292.9,51.6C291.7,51.4 289.4,50.9 287.1,50.8C279.4,50.6 271.7,50.7 264,50.5C262.6,50.4 261.3,49 259.9,48.2C261.3,47.6 262.8,46.6 264.2,46.6C277.5,46.5 290.8,46.5 304.1,46.5C304.2,39.6 294.9,30.1 286.7,27.5C286.6,28.5 286.5,29.3 286.5,30.3C278.3,30.5 270.3,30.3 263,26.4C261.1,25.4 259.8,23.1 258.3,21.5C256.3,19.3 254.7,16.6 252.3,15.2C247.4,12.3 242,10.3 236.9,7.8C224.3,1.7 211.3,-0.1 197.7,0zM249.6,29.4C250.3,29.4 250.9,29.6 251.6,30.2C252.6,31 253.6,31.9 254.8,33C253.3,33.8 252,34.5 250.8,35.1C249,36 247.6,35.4 246.5,34C245.6,32.8 245.5,31.7 246.8,30.7C247.7,30 248.6,29.4 249.6,29.4zM231.8,213C220.7,221.9 207.6,227.2 193.6,230.1C152.7,238.5 118.7,282.2 128.3,330.3C139.5,386.5 201.5,416.9 252.2,390.2C285,372.9 302.3,339.2 297.7,302.5C295.9,288.1 291,275.4 283.1,264.3L265.1,246.3C264.2,246.2 263.2,246.6 261.9,247.5C253.1,253.1 244.2,258.4 235.1,263.4C229.9,266.2 224.2,268.3 217.7,271.2C219.9,271.8 221,272.1 222.1,272.4C246.5,278.9 259.6,300.3 253.8,324.4C248.7,345.7 227,359.4 205.9,355.8C188.4,352.8 173.1,338.2 170.5,320.8C167.8,301.8 177.2,283.5 194.1,275.9C203.4,271.6 213,267.9 222.3,263.6C232.9,258.7 244.4,254.9 253.6,248.1C256.2,246.2 258.7,244.2 261,242.2L231.8,213z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1.3750788" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#ffffff"
-        android:pathData="m97.9,307.6c-7.8,2 -15.4,4.9 -23.4,7.5 3.9,-26.3 34.7,-50.6 60.8,-47.8 -8.1,10.9 -11.8,23.3 -12.7,35.6 -8.7,1.6 -16.8,2.7 -24.8,4.7"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1.3750788" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#ffffff"
-        android:pathData="M177,111.6C175.7,111.6 174.4,111.7 173.1,111.7L247,185.6C248.1,183.2 249,180.6 249.9,177.9C252.2,170.4 251.8,159.3 248,152.1C234.7,126.6 206.6,111.3 177,111.6zM139.7,120.9C137.9,121.8 136.1,122.9 134.3,124C81.2,156.4 84.3,231 132.9,260.7C136.6,263 138.3,262.7 140.8,259.4C148.4,249.2 157.9,241.1 169,234.9C171.7,233.3 174.5,231.9 178.1,230C154,225.8 141.1,214.8 139.6,197.8C137.9,179.4 146.9,164.5 163.2,158.3C167,156.9 171,156.2 174.9,156.1L139.7,120.9zM212.5,193.7C212.5,195.8 212.3,197.9 211.8,200.1C209.9,210.5 203.6,218.1 195.8,224.8C208.5,221.9 219.6,216.9 228.6,209.7L212.5,193.7z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1.3750788" />
-    <path
-        android:fillAlpha="1"
-        android:fillColor="#ffffff"
-        android:pathData="M78.4,59.6l262,262l-21.3,21.3l-262,-262z"
-        android:strokeWidth="0.82064575" />
-</vector>
@@ -1,5 +0,0 @@
-<?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" />
-</selector>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ripple xmlns:android="http://schemas.android.com/apk/res/android"
-    android:color="@color/list_item_ripple">
-    <item android:drawable="@drawable/list_item_background" />
-</ripple>
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/master_fragment"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:ignore="MergeRootFrame" />
@@ -1,137 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="com.wireguard.android.fragment.TunnelController" />
-
-        <import type="com.wireguard.android.model.Tunnel.State" />
-
-        <import type="com.wireguard.android.util.ClipboardUtils" />
-
-        <variable
-            name="tunnel"
-            type="com.wireguard.android.model.Tunnel" />
-
-        <variable
-            name="config"
-            type="com.wireguard.config.Config.Observable" />
-    </data>
-
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:attr/colorBackground">
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:orientation="vertical">
-
-            <android.support.v7.widget.CardView
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginStart="8dp"
-                android:layout_marginTop="8dp"
-                android:background="?android:attr/colorBackground"
-                app:cardCornerRadius="4dp"
-                app:cardElevation="2dp"
-                app:contentPadding="8dp">
-
-                <RelativeLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
-
-                    <TextView
-                        android:id="@+id/interface_title"
-                        style="?android:attr/textAppearanceMedium"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignParentStart="true"
-                        android:layout_alignParentTop="true"
-                        android:layout_toStartOf="@+id/tunnel_switch"
-                        android:text="@string/interface_title" />
-
-                    <com.wireguard.android.widget.ToggleSwitch
-                        android:id="@+id/tunnel_switch"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_alignBaseline="@+id/interface_title"
-                        android:layout_alignParentEnd="true"
-                        app:checked="@{tunnel.state == State.UP}"
-                        app:onBeforeCheckedChanged="@{TunnelController::setTunnelState}" />
-
-                    <TextView
-                        android:id="@+id/interface_name_label"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/interface_title"
-                        android:layout_marginTop="8dp"
-                        android:labelFor="@+id/interface_name_text"
-                        android:text="@string/name" />
-
-                    <TextView
-                        android:id="@+id/interface_name_text"
-                        style="?android:attr/textAppearanceMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/interface_name_label"
-                        android:text="@{tunnel.name}" />
-
-                    <TextView
-                        android:id="@+id/public_key_label"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/interface_name_text"
-                        android:layout_marginTop="8dp"
-                        android:labelFor="@+id/public_key_text"
-                        android:text="@string/public_key" />
-
-                    <TextView
-                        android:id="@+id/public_key_text"
-                        style="?android:attr/textAppearanceMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/public_key_label"
-                        android:contentDescription="@string/public_key_description"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interfaceSection.publicKey}" />
-
-                    <TextView
-                        android:id="@+id/addresses_label"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@id/public_key_text"
-                        android:layout_marginTop="8dp"
-                        android:labelFor="@+id/addresses_text"
-                        android:text="@string/addresses" />
-
-                    <TextView
-                        android:id="@+id/addresses_text"
-                        style="?android:attr/textAppearanceMedium"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_below="@+id/addresses_label"
-                        android:contentDescription="@string/addresses"
-                        android:text="@{config.interfaceSection.addresses}" />
-                </RelativeLayout>
-            </android.support.v7.widget.CardView>
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="4dp"
-                android:divider="@null"
-                android:orientation="vertical"
-                app:items="@{config.peers}"
-                app:layout="@{@layout/tunnel_detail_peer}"
-                tools:ignore="UselessLeaf" />
-        </LinearLayout>
-    </ScrollView>
-</layout>
@@ -1,94 +0,0 @@
-<?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.util.ClipboardUtils" />
-
-        <variable
-            name="item"
-            type="com.wireguard.config.Peer.Observable" />
-    </data>
-
-    <android.support.v7.widget.CardView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="4dp"
-        android:background="?android:attr/colorBackground"
-        app:cardCornerRadius="4dp"
-        app:cardElevation="2dp"
-        app:contentPadding="8dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/peer_title"
-                style="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_alignParentTop="true"
-                android:text="@string/peer" />
-
-            <TextView
-                android:id="@+id/public_key_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/peer_title"
-                android:layout_marginTop="8dp"
-                android:labelFor="@+id/public_key_text"
-                android:text="@string/public_key" />
-
-            <TextView
-                android:id="@+id/public_key_text"
-                style="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/public_key_label"
-                android:contentDescription="@string/public_key_description"
-                android:ellipsize="end"
-                android:maxLines="1"
-                android:onClick="@{ClipboardUtils::copyTextView}"
-                android:text="@{item.publicKey}" />
-
-            <TextView
-                android:id="@+id/allowed_ips_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/public_key_text"
-                android:layout_marginTop="8dp"
-                android:labelFor="@+id/allowed_ips_text"
-                android:text="@string/allowed_ips" />
-
-            <TextView
-                android:id="@+id/allowed_ips_text"
-                style="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/allowed_ips_label"
-                android:text="@{item.allowedIPs}" />
-
-            <TextView
-                android:id="@+id/endpoint_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/allowed_ips_text"
-                android:layout_marginTop="8dp"
-                android:labelFor="@+id/endpoint_text"
-                android:text="@string/endpoint" />
-
-            <TextView
-                android:id="@+id/endpoint_text"
-                style="?android:attr/textAppearanceMedium"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/endpoint_label"
-                android:text="@{item.endpoint}" />
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-</layout>
@@ -1,236 +0,0 @@
-<?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"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <data>
-
-        <import type="com.wireguard.android.util.ClipboardUtils" />
-
-        <import type="com.wireguard.android.widget.KeyInputFilter" />
-
-        <import type="com.wireguard.android.widget.NameInputFilter" />
-
-        <import type="com.wireguard.config.Peer" />
-
-        <variable
-            name="config"
-            type="com.wireguard.config.Config.Observable" />
-    </data>
-
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/main_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:attr/colorBackground">
-
-        <ScrollView
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="vertical">
-
-                <android.support.v7.widget.CardView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginStart="8dp"
-                    android:layout_marginTop="8dp"
-                    android:background="?android:attr/colorBackground"
-                    app:cardCornerRadius="4dp"
-                    app:cardElevation="2dp"
-                    app:contentPadding="8dp">
-
-                    <RelativeLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content">
-
-                        <TextView
-                            android:id="@+id/interface_title"
-                            style="?android:attr/textAppearanceMedium"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentTop="true"
-                            android:text="@string/interface_title" />
-
-                        <TextView
-                            android:id="@+id/interface_name_label"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/interface_title"
-                            android:layout_marginTop="8dp"
-                            android:labelFor="@+id/interface_name_text"
-                            android:text="@string/name" />
-
-                        <EditText
-                            android:id="@+id/interface_name_text"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/interface_name_label"
-                            android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.name}"
-                            app:filter="@{NameInputFilter.newInstance()}" />
-
-                        <TextView
-                            android:id="@+id/private_key_label"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/interface_name_text"
-                            android:labelFor="@+id/private_key_text"
-                            android:text="@string/private_key" />
-
-                        <EditText
-                            android:id="@+id/private_key_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_below="@+id/private_key_label"
-                            android:layout_toStartOf="@+id/generate_private_key_button"
-                            android:contentDescription="@string/public_key_description"
-                            android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.interfaceSection.privateKey}"
-                            app:filter="@{KeyInputFilter.newInstance()}" />
-
-                        <Button
-                            android:id="@+id/generate_private_key_button"
-                            android:layout_width="96dp"
-                            android:layout_height="wrap_content"
-                            android:layout_alignBottom="@id/private_key_text"
-                            android:layout_alignParentEnd="true"
-                            android:layout_below="@+id/private_key_label"
-                            android:onClick="@{() -> config.interfaceSection.generateKeypair()}"
-                            android:text="@string/generate" />
-
-                        <TextView
-                            android:id="@+id/public_key_label"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/private_key_text"
-                            android:labelFor="@+id/public_key_text"
-                            android:text="@string/public_key" />
-
-                        <TextView
-                            android:id="@+id/public_key_text"
-                            style="?android:attr/editTextStyle"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_below="@+id/public_key_label"
-                            android:contentDescription="@string/public_key_description"
-                            android:ellipsize="end"
-                            android:focusable="false"
-                            android:hint="@string/hint_generated"
-                            android:maxLines="1"
-                            android:onClick="@{ClipboardUtils::copyTextView}"
-                            android:text="@{config.interfaceSection.publicKey}" />
-
-                        <TextView
-                            android:id="@+id/addresses_label"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_below="@+id/public_key_text"
-                            android:layout_toStartOf="@+id/listen_port_label"
-                            android:labelFor="@+id/addresses_text"
-                            android:text="@string/addresses" />
-
-                        <EditText
-                            android:id="@+id/addresses_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_below="@+id/addresses_label"
-                            android:layout_toStartOf="@+id/listen_port_text"
-                            android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.interfaceSection.addresses}" />
-
-                        <TextView
-                            android:id="@+id/listen_port_label"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignBaseline="@+id/addresses_label"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignStart="@+id/generate_private_key_button"
-                            android:labelFor="@+id/listen_port_text"
-                            android:text="@string/listen_port" />
-
-                        <EditText
-                            android:id="@+id/listen_port_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignBaseline="@+id/addresses_text"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignStart="@+id/generate_private_key_button"
-                            android:hint="@string/hint_random"
-                            android:inputType="number"
-                            android:text="@={config.interfaceSection.listenPort}"
-                            android:textAlignment="center" />
-
-                        <TextView
-                            android:id="@+id/dns_servers_label"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_below="@+id/addresses_text"
-                            android:layout_toStartOf="@+id/mtu_label"
-                            android:labelFor="@+id/dns_servers_text"
-                            android:text="@string/dns_servers" />
-
-                        <EditText
-                            android:id="@+id/dns_servers_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignParentStart="true"
-                            android:layout_below="@+id/dns_servers_label"
-                            android:layout_toStartOf="@+id/mtu_text"
-                            android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.interfaceSection.dnses}" />
-
-                        <TextView
-                            android:id="@+id/mtu_label"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignBaseline="@+id/dns_servers_label"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignStart="@+id/generate_private_key_button"
-                            android:labelFor="@+id/mtu_text"
-                            android:text="@string/mtu" />
-
-                        <EditText
-                            android:id="@+id/mtu_text"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:layout_alignBaseline="@+id/dns_servers_text"
-                            android:layout_alignParentEnd="true"
-                            android:layout_alignStart="@+id/generate_private_key_button"
-                            android:hint="@string/hint_automatic"
-                            android:inputType="number"
-                            android:text="@={config.interfaceSection.mtu}"
-                            android:textAlignment="center" />
-                    </RelativeLayout>
-                </android.support.v7.widget.CardView>
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:divider="@null"
-                    android:orientation="vertical"
-                    app:items="@{config.peers}"
-                    app:layout="@{@layout/tunnel_editor_peer}"
-                    tools:ignore="UselessLeaf" />
-
-                <Button
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginBottom="4dp"
-                    android:layout_marginEnd="4dp"
-                    android:layout_marginStart="4dp"
-                    android:onClick="@{() -> config.peers.add(Peer.Observable.newInstance())}"
-                    android:text="@string/add_peer" />
-            </LinearLayout>
-        </ScrollView>
-    </android.support.design.widget.CoordinatorLayout>
-</layout>
@@ -1,148 +0,0 @@
-<?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.widget.KeyInputFilter" />
-
-        <variable
-            name="collection"
-            type="android.databinding.ObservableList&lt;com.wireguard.config.Peer.Observable&gt;" />
-
-        <variable
-            name="item"
-            type="com.wireguard.config.Peer.Observable" />
-    </data>
-
-    <android.support.v7.widget.CardView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="4dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="4dp"
-        android:background="?android:attr/colorBackground"
-        app:cardCornerRadius="4dp"
-        app:cardElevation="2dp"
-        app:contentPadding="8dp">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/peer_title"
-                style="?android:attr/textAppearanceMedium"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_alignParentTop="true"
-                android:layout_marginBottom="8dp"
-                android:layout_toStartOf="@+id/peer_action_delete"
-                android:text="@string/peer" />
-
-            <ImageButton
-                android:id="@+id/peer_action_delete"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:layout_alignParentTop="true"
-                android:background="@null"
-                android:contentDescription="@string/delete"
-                android:onClick="@{() -> collection.remove(item)}"
-                android:src="@drawable/ic_action_delete_black" />
-
-            <TextView
-                android:id="@+id/public_key_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/peer_title"
-                android:labelFor="@+id/public_key_text"
-                android:text="@string/public_key" />
-
-            <EditText
-                android:id="@+id/public_key_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/public_key_label"
-                android:inputType="textNoSuggestions|textVisiblePassword"
-                android:text="@={item.publicKey}"
-                app:filter="@{KeyInputFilter.newInstance()}" />
-
-            <TextView
-                android:id="@+id/pre_shared_key_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/public_key_text"
-                android:labelFor="@+id/pre_shared_key_text"
-                android:text="@string/pre_shared_key" />
-
-            <EditText
-                android:id="@+id/pre_shared_key_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/pre_shared_key_label"
-                android:hint="@string/hint_optional"
-                android:inputType="textNoSuggestions|textVisiblePassword"
-                android:text="@={item.preSharedKey}" />
-
-            <TextView
-                android:id="@+id/allowed_ips_label"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/pre_shared_key_text"
-                android:labelFor="@+id/allowed_ips_text"
-                android:text="@string/allowed_ips" />
-
-            <EditText
-                android:id="@+id/allowed_ips_text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_below="@+id/allowed_ips_label"
-                android:inputType="textNoSuggestions|textVisiblePassword"
-                android:text="@={item.allowedIPs}" />
-
-            <TextView
-                android:id="@+id/endpoint_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/allowed_ips_text"
-                android:layout_toStartOf="@+id/persistent_keepalive_label"
-                android:labelFor="@+id/endpoint_text"
-                android:text="@string/endpoint" />
-
-            <EditText
-                android:id="@+id/endpoint_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentStart="true"
-                android:layout_below="@+id/endpoint_label"
-                android:layout_toStartOf="@+id/persistent_keepalive_text"
-                android:inputType="textNoSuggestions|textVisiblePassword"
-                android:text="@={item.endpoint}" />
-
-            <TextView
-                android:id="@+id/persistent_keepalive_label"
-                android:layout_width="96dp"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/endpoint_label"
-                android:layout_alignParentEnd="true"
-                android:labelFor="@+id/persistent_keepalive_text"
-                android:text="@string/persistent_keepalive" />
-
-            <EditText
-                android:id="@+id/persistent_keepalive_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignBaseline="@+id/endpoint_text"
-                android:layout_alignParentEnd="true"
-                android:layout_alignStart="@+id/persistent_keepalive_label"
-                android:hint="@string/hint_optional"
-                android:inputType="number"
-                android:text="@={item.persistentKeepalive}"
-                android:textAlignment="center" />
-        </RelativeLayout>
-    </android.support.v7.widget.CardView>
-</layout>
@@ -1,61 +0,0 @@
-<?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.Tunnel" />
-
-        <variable
-            name="fragment"
-            type="com.wireguard.android.fragment.TunnelListFragment" />
-
-        <variable
-            name="tunnels"
-            type="com.wireguard.android.util.ObservableKeyedList&lt;String, Tunnel&gt;" />
-    </data>
-
-    <android.support.design.widget.CoordinatorLayout
-        android:id="@+id/main_container"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?android:attr/colorBackground">
-
-        <ListView
-            android:id="@+id/tunnel_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:choiceMode="multipleChoiceModal"
-            app:items="@{tunnels}"
-            app:layout="@{@layout/tunnel_list_item}" />
-
-        <com.getbase.floatingactionbutton.FloatingActionsMenu
-            android:id="@+id/create_menu"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="bottom|end"
-            android:layout_margin="8dp"
-            app:fab_labelStyle="@style/fab_label"
-            app:fab_labelsPosition="left"
-            app:layout_dodgeInsetEdges="bottom">
-
-            <com.getbase.floatingactionbutton.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_size="mini"
-                app:fab_title="@string/create_empty" />
-
-            <com.getbase.floatingactionbutton.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_size="mini"
-                app:fab_title="@string/create_from_file" />
-        </com.getbase.floatingactionbutton.FloatingActionsMenu>
-    </android.support.design.widget.CoordinatorLayout>
-</layout>
@@ -1,54 +0,0 @@
-<?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.fragment.TunnelController" />
-
-        <import type="com.wireguard.android.model.Tunnel" />
-
-        <import type="com.wireguard.android.model.Tunnel.State" />
-
-        <variable
-            name="collection"
-            type="com.wireguard.android.util.ObservableKeyedList&lt;String, Tunnel&gt;" />
-
-        <variable
-            name="key"
-            type="String" />
-
-        <variable
-            name="item"
-            type="com.wireguard.android.model.Tunnel" />
-    </data>
-
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="@drawable/list_item_background_anim"
-        android:descendantFocusability="blocksDescendants"
-        android:padding="16dp">
-
-        <TextView
-            android:id="@+id/tunnel_name"
-            style="?android:attr/textAppearanceMedium"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentTop="true"
-            android:layout_toStartOf="@+id/tunnel_switch"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:text="@{key}" />
-
-        <com.wireguard.android.widget.ToggleSwitch
-            android:id="@+id/tunnel_switch"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBaseline="@+id/tunnel_name"
-            android:layout_alignParentEnd="true"
-            app:checked="@{item.state == State.UP}"
-            app:onBeforeCheckedChanged="@{TunnelController::setTunnelState}" />
-    </RelativeLayout>
-</layout>
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 -->
-    <color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark -->
-</resources>
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <plurals name="delete_error">
-        <item quantity="one">Unable to delete %d tunnel: %s</item>
-        <item quantity="other">Unable to delete %d tunnels: %s</item>
-    </plurals>
-    <plurals name="delete_success">
-        <item quantity="one">Successfully deleted %d tunnel</item>
-        <item quantity="other">Successfully deleted %d tunnels</item>
-    </plurals>
-    <plurals name="delete_title">
-        <item quantity="one">%d tunnel selected</item>
-        <item quantity="other">%d tunnels selected</item>
-    </plurals>
-    <plurals name="import_partial_success">
-        <item quantity="one">Imported %d of %d tunnels</item>
-        <item quantity="other">Imported %d of %d tunnels</item>
-    </plurals>
-    <plurals name="import_total_success">
-        <item quantity="one">Imported %d tunnel</item>
-        <item quantity="other">Imported %d tunnels</item>
-    </plurals>
-    <string name="add_peer">Add peer</string>
-    <string name="addresses">Addresses</string>
-    <string name="allowed_ips">Allowed IPs</string>
-    <string name="app_name">WireGuard</string>
-    <string name="config_save_error">Unable to save configuration for “%s”: %s</string>
-    <string name="config_save_success">Successfully saved configuration for “%s”</string>
-    <string name="create_activity_title">Create WireGuard Tunnel</string>
-    <string name="create_empty">Create from scratch</string>
-    <string name="create_from_file">Create from file or archive</string>
-    <string name="delete">Delete</string>
-    <string name="dns_servers">DNS servers</string>
-    <string name="edit">Edit</string>
-    <string name="endpoint">Endpoint</string>
-    <string name="error_down">Error bringing down tunnel: %s</string>
-    <string name="error_root">Please obtain root access and try again</string>
-    <string name="error_up">Error bringing up tunnel: %s</string>
-    <string name="export_error">Unable to export tunnels: %s</string>
-    <string name="export_success">Saved to %s</string>
-    <string name="export_summary">Zip file will be saved to downloads folder</string>
-    <string name="generate">Generate</string>
-    <string name="hint_automatic">(auto)</string>
-    <string name="hint_generated">(generated)</string>
-    <string name="hint_optional">(optional)</string>
-    <string name="hint_random">(random)</string>
-    <string name="import_error">Unable to import tunnel: %s</string>
-    <string name="import_success">Imported “%s”</string>
-    <string name="interface_title">Interface</string>
-    <string name="listen_port">Listen port</string>
-    <string name="mtu">MTU</string>
-    <string name="name">Name</string>
-    <string name="peer">Peer</string>
-    <string name="persistent_keepalive">Persistent keepalive</string>
-    <string name="pre_shared_key">Pre-shared key</string>
-    <string name="private_key">Private key</string>
-    <string name="public_key">Public key</string>
-    <string name="public_key_description">Public key</string>
-    <string name="restore_on_boot_summary">Bring up previously-enabled tunnels on boot</string>
-    <string name="restore_on_boot_title">Restore on boot</string>
-    <string name="save">Save</string>
-    <string name="settings">Settings</string>
-    <string name="toggle_error">Error toggling WireGuard tunnel: %s</string>
-    <string name="tools_installer_already">wg and wg-quick are already installed</string>
-    <string name="tools_installer_failure">Unable to install command-line tools (no root?)</string>
-    <string name="tools_installer_initial">Install optional tools for scripting into the system partition</string>
-    <string name="tools_installer_success">wg and wg-quick installed into the system partition</string>
-    <string name="tools_installer_title">Install command line tools</string>
-    <string name="tools_installer_working">Installing wg and wg-quick into the system partition</string>
-    <string name="tunnel_create_error">Unable to create tunnel: %s</string>
-    <string name="tunnel_create_success">Successfully created tunnel “%s”</string>
-    <string name="tunnel_rename_error">Unable to rename tunnel: %s</string>
-    <string name="tunnel_rename_success">Successfully renamed tunnel to “%s”</string>
-    <string name="zip_exporter_title">Export tunnels to zip file</string>
-</resources>
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:android="http://schemas.android.com/apk/res/android">
-
-    <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar" />
-
-    <style name="SettingsTheme" parent="AppTheme">
-        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
-    </style>
-
-    <style name="fab_label" parent="android:TextAppearance.DeviceDefault.Inverse">
-        <item name="android:background">@drawable/fab_label_background</item>
-    </style>
-
-</resources>
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
-    <CheckBoxPreference
-        android:defaultValue="false"
-        android:key="restore_on_boot"
-        android:summary="@string/restore_on_boot_summary"
-        android:title="@string/restore_on_boot_title" />
-    <com.wireguard.android.preference.ToolsInstallerPreference android:key="tools_installer" />
-    <com.wireguard.android.preference.ZipExporterPreference android:key="zip_exporter" />
-</PreferenceScreen>
@@ -1,2 +0,0 @@
-src/
-.gobuildversion
@@ -1,58 +0,0 @@
-# SPDX-License-Identifier: GPL-2.0
-#
-# Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
-
-FILES := $(filter-out %/main.go,$(wildcard ../wireguard-go/*/*.go) $(wildcard ../wireguard-go/*.go))
-
-NDK_GO_ARCH_MAP_x86 := 386
-NDK_GO_ARCH_MAP_x86_64 := amd64
-NDK_GO_ARCH_MAP_arm := arm
-NDK_GO_ARCH_MAP_arm64 := arm64
-NDK_GO_ARCH_MAP_mips := mipsx
-NDK_GO_ARCH_MAP_mips64 := mips64x
-
-CLANG_FLAGS := --target=$(ANDROID_LLVM_TRIPLE) --gcc-toolchain=$(ANDROID_TOOLCHAIN_ROOT) --sysroot=$(ANDROID_SYSROOT)
-export CGO_CFLAGS := $(CLANG_FLAGS) $(CFLAGS)
-export CGO_LDFLAGS := $(CLANG_FLAGS) $(LDFLAGS)
-export CC := $(ANDROID_C_COMPILER)
-export GOARCH := $(NDK_GO_ARCH_MAP_$(ANDROID_ARCH_NAME))
-export GOOS := android
-export CGO_ENABLED := 1
-
-default: $(DESTDIR)/libwg-go.so
-
-GOBUILDARCH := $(NDK_GO_ARCH_MAP_$(shell uname -m))
-GOBUILDOS := $(shell uname -s | tr '[:upper:]' '[:lower:]')
-GOBUILDVERSION := 1.10.2
-GOBUILDTARBALL := https://dl.google.com/go/go$(GOBUILDVERSION).$(GOBUILDOS)-$(GOBUILDARCH).tar.gz
-GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDARCH)
-
-GOBUILDVERSION_CURRENT := $(shell go version 2>/dev/null)
-ifeq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT))
-$(info Using system go)
-else
-export GOROOT := $(CURDIR)/goroot
-export PATH := $(GOROOT)/bin:$(PATH)
-GOBUILDVERSION_CURRENT := $(shell $(GOROOT)/bin/go version 2>/dev/null)
-ifneq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT))
-$(shell rm -f $(GOROOT)/bin/go)
-endif
-$(GOROOT)/bin/go:
-	rm -rf "$(GOROOT)"
-	mkdir -p "$(GOROOT)"
-	curl "$(GOBUILDTARBALL)" | tar -C "$(GOROOT)" --strip-components=1 -xzf - || { rm -rf "$(GOROOT)"; exit 1; }
-	patch -p1 -f -N -r- -d"$(GOROOT)" < goruntime-boottime-over-monotonic.diff || { rm -rf "$(GOROOT)"; exit 1; }
-$(DESTDIR)/libwg-go.so: $(GOROOT)/bin/go
-endif
-
-$(shell test "$$(cat .gobuildversion 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.so")
-
-$(DESTDIR)/libwg-go.so: $(FILES) src/git.zx2c4.com/wireguard-go/api-android.go src/git.zx2c4.com/wireguard-go/tun/api-android.go src/git.zx2c4.com/wireguard-go/jni.c
-	find . -name '*.go' -type l -delete
-	find . -type d -empty -delete
-	mkdir -p $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILES)))
-	$(foreach FILE,$(FILES),ln -sfrt $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILE))) $(FILE);)
-	patch -p1 -f -R -s --dry-run -d"$$(go env GOROOT)" < goruntime-boottime-over-monotonic.diff
-	GOPATH=$(PWD) go get -v -d git.zx2c4.com/wireguard-go
-	GOPATH=$(PWD) go build -v -o $(DESTDIR)/libwg-go.so -buildmode c-shared git.zx2c4.com/wireguard-go
-	go version > .gobuildversion
@@ -1,103 +0,0 @@
-diff -ru b/src/runtime/sys_linux_386.s a/src/runtime/sys_linux_386.s
--- b/src/runtime/sys_linux_386.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_386.s	2018-05-09 17:09:42.319531743 +0200
-@@ -287,13 +287,13 @@
- 
- 	LEAL	8(SP), BX	// &ts (struct timespec)
- 	MOVL	BX, 4(SP)
-	MOVL	$1, 0(SP)	// CLOCK_MONOTONIC
-+	MOVL	$7, 0(SP)	// CLOCK_BOOTTIME
- 	CALL	AX
- 	JMP finish
- 
- fallback:
- 	MOVL	$SYS_clock_gettime, AX
-	MOVL	$1, BX		// CLOCK_MONOTONIC
-+	MOVL	$7, BX		// CLOCK_BOOTTIME
- 	LEAL	8(SP), CX
- 	INVOKE_SYSCALL
- 
-diff -ru b/src/runtime/sys_linux_amd64.s a/src/runtime/sys_linux_amd64.s
--- b/src/runtime/sys_linux_amd64.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_amd64.s	2018-05-09 17:09:42.319531743 +0200
-@@ -258,7 +258,7 @@
- 	MOVQ	runtime·__vdso_clock_gettime_sym(SB), AX
- 	CMPQ	AX, $0
- 	JEQ	fallback
-	MOVL	$1, DI // CLOCK_MONOTONIC
-+	MOVL	$7, DI // CLOCK_BOOTTIME
- 	LEAQ	0(SP), SI
- 	CALL	AX
- 	MOVQ	0(SP), AX	// sec
-diff -ru b/src/runtime/sys_linux_arm64.s a/src/runtime/sys_linux_arm64.s
--- b/src/runtime/sys_linux_arm64.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_arm64.s	2018-05-09 17:12:47.844591628 +0200
-@@ -201,7 +201,7 @@
- 	RET
- 
- TEXT runtime·nanotime(SB),NOSPLIT,$24-8
-	MOVW	$1, R0 // CLOCK_MONOTONIC
-+	MOVW	$7, R0 // CLOCK_BOOTTIME
- 	MOVD	RSP, R1
- 	MOVD	$SYS_clock_gettime, R8
- 	SVC
-diff -ru b/src/runtime/sys_linux_arm.s a/src/runtime/sys_linux_arm.s
--- b/src/runtime/sys_linux_arm.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_arm.s	2018-05-09 17:13:18.983281049 +0200
-@@ -235,7 +235,7 @@
- 
- // int64 nanotime(void)
- TEXT runtime·nanotime(SB),NOSPLIT,$32
-	MOVW	$1, R0  // CLOCK_MONOTONIC
-+	MOVW	$7, R0  // CLOCK_BOOTTIME
- 	MOVW	$8(R13), R1  // timespec
- 	MOVW	$SYS_clock_gettime, R7
- 	SWI	$0
-diff -ru b/src/runtime/sys_linux_mips64x.s a/src/runtime/sys_linux_mips64x.s
--- b/src/runtime/sys_linux_mips64x.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_mips64x.s	2018-05-09 17:09:42.321531721 +0200
-@@ -197,7 +197,7 @@
- 	RET
- 
- TEXT runtime·nanotime(SB),NOSPLIT,$16
-	MOVW	$1, R4 // CLOCK_MONOTONIC
-+	MOVW	$7, R4 // CLOCK_BOOTTIME
- 	MOVV	$0(R29), R5
- 	MOVV	$SYS_clock_gettime, R2
- 	SYSCALL
-diff -ru b/src/runtime/sys_linux_mipsx.s a/src/runtime/sys_linux_mipsx.s
--- b/src/runtime/sys_linux_mipsx.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_mipsx.s	2018-05-09 17:09:42.321531721 +0200
-@@ -202,7 +202,7 @@
- 	RET
- 
- TEXT runtime·nanotime(SB),NOSPLIT,$8-8
-	MOVW	$1, R4	// CLOCK_MONOTONIC
-+	MOVW	$7, R4	// CLOCK_BOOTTIME
- 	MOVW	$4(R29), R5
- 	MOVW	$SYS_clock_gettime, R2
- 	SYSCALL
-diff -ru b/src/runtime/sys_linux_ppc64x.s a/src/runtime/sys_linux_ppc64x.s
--- b/src/runtime/sys_linux_ppc64x.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_ppc64x.s	2018-05-09 17:09:42.322531710 +0200
-@@ -176,7 +176,7 @@
- 	RET
- 
- TEXT runtime·nanotime(SB),NOSPLIT,$16
-	MOVW	$1, R3 // CLOCK_MONOTONIC
-+	MOVW	$7, R3 // CLOCK_BOOTTIME
- 	MOVD	$0(R1), R4
- 	SYSCALL	$SYS_clock_gettime
- 	MOVD	0(R1), R3	// sec
-diff -ru b/src/runtime/sys_linux_s390x.s a/src/runtime/sys_linux_s390x.s
--- b/src/runtime/sys_linux_s390x.s	2018-04-30 22:26:39.000000000 +0200
-+++ a/src/runtime/sys_linux_s390x.s	2018-05-09 17:09:42.322531710 +0200
-@@ -188,7 +188,7 @@
- 	RET
- 
- TEXT runtime·nanotime(SB),NOSPLIT,$16
-	MOVW	$1, R2 // CLOCK_MONOTONIC
-+	MOVW	$7, R2 // CLOCK_BOOTTIME
- 	MOVD	$tp-16(SP), R3
- 	MOVW	$SYS_clock_gettime, R1
- 	SYSCALL
@@ -1,31 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later
- *
- * Copyright (C) 2017-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- */
-
-package tun
-
-import (
-	"git.zx2c4.com/wireguard-go/rwcancel"
-	"os"
-)
-
-func CreateTUNFromFD(tun_fd int) (TUNDevice, string, error) {
-	tun := &nativeTun{
-		fd:     os.NewFile(uintptr(tun_fd), "/dev/tun"),
-		events: make(chan TUNEvent, 5),
-		errors: make(chan error, 5),
-		nopi:   true,
-	}
-	var err error
-	tun.fdCancel, err = rwcancel.NewRWCancel(tun_fd)
-	if err != nil {
-		return nil, "", err
-	}
-	name, err := tun.Name()
-	if err != nil {
-		tun.fdCancel.Cancel()
-		return nil, "", err
-	}
-	return tun, name, nil
-}
@@ -1,3 +1,4 @@
+
 allprojects {
    repositories {
        google()
@@ -6,8 +7,37 @@ allprojects {
 }

 buildscript {
+    ext {
+        agpVersion = '3.6.2'
+        annotationsVersion = '1.1.0'
+        appcompatVersion = '1.1.0'
+        bintrayPluginVersion = '1.8.4'
+        biometricVersion = '1.0.1'
+        cardviewVersion = '1.0.0'
+        collectionVersion = '1.1.0'
+        constraintLayoutVersion = '1.1.3'
+        coordinatorLayoutVersion = '1.1.0'
+        coreKtxVersion = '1.2.0'
+        coroutinesVersion = '1.3.5'
+        eddsaVersion = '0.3.0'
+        fragmentVersion = '1.2.4'
+        jsr305Version = '3.0.2'
+        junitVersion = '4.13'
+        kotlinVersion = '1.3.71'
+        materialComponentsVersion = '1.2.0-alpha05'
+        mavenPluginVersion = '2.1'
+        preferenceVersion = '1.1.0'
+        streamsupportVersion = '1.7.2'
+        threetenabpVersion = '1.2.3'
+        zxingEmbeddedVersion = '3.6.0'
+
+        groupName = 'com.wireguard.android'
+    }
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath "com.android.tools.build:gradle:$agpVersion"
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
+        classpath "com.github.dcendents:android-maven-gradle-plugin:$mavenPluginVersion"
+        classpath "com.jfrog.bintray.gradle:gradle-bintray-plugin:$bintrayPluginVersion"
    }
    repositories {
        google()
@@ -18,3 +48,12 @@ buildscript {
 task clean(type: Delete) {
    delete rootProject.buildDir
 }
+
+tasks {
+    wrapper {
+        gradleVersion = "6.2.2"
+        distributionType = Wrapper.DistributionType.ALL
+    }
+}
+
+apply from: "version.gradle"
@@ -9,9 +9,25 @@

 # Specifies the JVM arguments used for the daemon process.
 # The setting is particularly useful for tweaking memory settings.
+android.enableJetifier=true
+android.useAndroidX=true
 org.gradle.jvmargs=-Xmx1536m

 # When configured, Gradle will run in incubating parallel mode.
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+
+# R8 Full mode
+android.enableR8.fullMode=true
+
+# https://jakewharton.com/increased-accuracy-of-aapt2-keep-rules/
+android.useMinimalKeepRules=true
+
+# Enable rudimentary R class namespacing where each library only contains
+# references to the resources it declares instead of declarations plus all
+# transitive dependency references.
+android.namespacedRClass=true
+
+# Suppress warnings for some features that aren't yet stabilized
+android.suppressUnsupportedOptionWarnings=android.enableR8.fullMode,android.useMinimalKeepRules,android.namespacedRClass,android.suppressUnsupportedOptionWarnings
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-all.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
@@ -1,5 +1,21 @@
 #!/usr/bin/env sh

+#
+# Copyright 2015 the original author or authors.
+#
+# 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
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# 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.
+#
+
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
@@ -28,7 +44,7 @@ APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`

 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'

 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
@@ -109,8 +125,8 @@ if $darwin; then
    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi

-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
    JAVACMD=`cygpath --unix "$JAVACMD"`
@@ -138,19 +154,19 @@ if $cygwin ; then
        else
            eval `echo args$i`="\"$arg\""
        fi
-        i=$((i+1))
+        i=`expr $i + 1`
    done
    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
    esac
 fi

@@ -159,14 +175,9 @@ save () {
    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
    echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`

 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"

-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"
@@ -1 +1,2 @@
-include ':app'
+include ':tunnel'
+include ':ui'
@@ -0,0 +1,57 @@
+apply plugin: 'com.android.library'
+
+version wireguardVersionName
+group groupName
+
+android {
+    buildToolsVersion '29.0.3'
+    compileSdkVersion 29
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
+    defaultConfig {
+        minSdkVersion 21
+        targetSdkVersion 29
+        versionCode wireguardVersionCode
+        versionName wireguardVersionName
+    }
+    externalNativeBuild {
+        cmake {
+            path 'tools/CMakeLists.txt'
+        }
+    }
+    testOptions.unitTests.all {
+        testLogging {
+            events 'passed', 'skipped', 'failed', 'standardOut', 'standardError'
+        }
+    }
+    buildTypes {
+        release {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DANDROID_PACKAGE_NAME=${groupName}", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
+                }
+            }
+        }
+        debug {
+            externalNativeBuild {
+                cmake {
+                    arguments "-DANDROID_PACKAGE_NAME=${groupName}.debug", "-DGRADLE_USER_HOME=${project.gradle.gradleUserHomeDir}"
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    api "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
+    implementation "androidx.annotation:annotation:$annotationsVersion"
+    implementation "androidx.collection:collection:$collectionVersion"
+    implementation "com.google.code.findbugs:jsr305:$jsr305Version"
+    implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
+    implementation "net.i2p.crypto:eddsa:$eddsaVersion"
+    testImplementation "junit:junit:$junitVersion"
+}
+
+apply from: "publish.gradle"
@@ -0,0 +1,76 @@
+apply plugin: 'com.github.dcendents.android-maven'
+apply plugin: 'com.jfrog.bintray'
+
+install {
+    repositories.mavenInstaller {
+        pom.project {
+            name 'WireGuard Tunnel Library'
+            description 'Embeddable tunnel library for WireGuard for Android'
+            url 'https://www.wireguard.com/'
+
+            packaging 'aar'
+            groupId groupName
+            artifactId 'tunnel'
+            version wireguardVersionName
+
+            licenses {
+                license {
+                    name 'The Apache Software License, Version 2.0'
+                    url 'http://www.apache.org/licenses/LICENSE-2.0.txt'
+                    distribution 'repo'
+                }
+            }
+            scm {
+                connection 'scm:git:https://git.zx2c4.com/wireguard-android'
+                url 'https://git.zx2c4.com/wireguard-android'
+            }
+            organization {
+                name 'WireGuard'
+                url 'https://www.wireguard.com/'
+            }
+        }
+    }
+}
+
+bintray {
+    user = hasProperty('BINTRAY_USER') ? getProperty('BINTRAY_USER') : System.getenv('BINTRAY_USER')
+    key = hasProperty('BINTRAY_KEY') ? getProperty('BINTRAY_KEY') : System.getenv('BINTRAY_KEY')
+
+    configurations = [ 'archives' ]
+
+    pkg {
+        repo = 'wireguard-android'
+        name = 'wireguard-android'
+        userOrg = 'wireguard'
+        licenses = [ 'Apache-2.0' ]
+        vcsUrl = 'https://git.zx2c4.com/wireguard-android'
+        publish = true
+
+        version {
+            name = wireguardVersionName
+        }
+    }
+}
+
+android.libraryVariants.all { variant ->
+    if (variant.name == 'release') {
+        task javadoc(type: Javadoc) {
+            source = variant.javaCompileProvider.get().source
+            classpath = files((android.bootClasspath.join(File.pathSeparator)))
+            classpath += variant.javaCompileProvider.get().classpath
+            title = 'Embeddable WireGuard Tunnel for Android v$wireguardVersionName'
+        }
+        task javadocJar(type: Jar, dependsOn: javadoc) {
+            archiveClassifier = 'javadoc'
+            from javadoc.destinationDir
+        }
+        task sourcesJar(type: Jar) {
+            archiveClassifier = 'sources'
+            from android.sourceSets.main.java.srcDirs
+        }
+        artifacts {
+            archives sourcesJar
+            archives javadocJar
+        }
+    }
+}
@@ -0,0 +1,18 @@
+<!--
+  ~ Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+  ~ SPDX-License-Identifier: Apache-2.0
+  -->
+
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.wireguard.android.tunnel">
+
+    <application>
+        <service
+            android:name="com.wireguard.android.backend.GoBackend$VpnService"
+            android:permission="android.permission.BIND_VPN_SERVICE">
+            <intent-filter>
+                <action android:name="android.net.VpnService" />
+            </intent-filter>
+        </service>
+    </application>
+</manifest>
@@ -0,0 +1,64 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.backend;
+
+import com.wireguard.config.Config;
+import com.wireguard.util.NonNullForAll;
+
+import java.util.Set;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Interface for implementations of the WireGuard secure network tunnel.
+ */
+
+@NonNullForAll
+public interface Backend {
+    /**
+     * Enumerate names of currently-running tunnels.
+     *
+     * @return The set of running tunnel names.
+     */
+    Set<String> getRunningTunnelNames();
+
+    /**
+     * Get the state of a tunnel.
+     *
+     * @param tunnel The tunnel to examine the state of.
+     * @return The state of the tunnel.
+     */
+    Tunnel.State getState(Tunnel tunnel) throws Exception;
+
+    /**
+     * Get statistics about traffic and errors on this tunnel. If the tunnel is not running, the
+     * statistics object will be filled with zero values.
+     *
+     * @param tunnel The tunnel to retrieve statistics for.
+     * @return The statistics for the tunnel.
+     */
+    Statistics getStatistics(Tunnel tunnel) throws Exception;
+
+    /**
+     * Determine version of underlying backend.
+     *
+     * @return The version of the backend.
+     * @throws Exception
+     */
+    String getVersion() throws Exception;
+
+    /**
+     * Set the state of a tunnel, updating it's configuration. If the tunnel is already up, config
+     * may update the running configuration; config may be null when setting the tunnel down.
+     *
+     * @param tunnel The tunnel to control the state of.
+     * @param state  The new state for this tunnel. Must be {@code UP}, {@code DOWN}, or
+     *               {@code TOGGLE}.
+     * @param config The configuration for this tunnel, may be null if state is {@code DOWN}.
+     * @return The updated state of the tunnel.
+     */
+    Tunnel.State setState(Tunnel tunnel, Tunnel.State state, @Nullable Config config) throws Exception;
+}
@@ -0,0 +1,37 @@
+/*
+ * Copyright © 2020 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.backend;
+
+import com.wireguard.util.NonNullForAll;
+
+@NonNullForAll
+public final class BackendException extends Exception {
+    private final Object[] format;
+    private final Reason reason;
+
+    public BackendException(final Reason reason, final Object... format) {
+        this.reason = reason;
+        this.format = format;
+    }
+
+    public Object[] getFormat() {
+        return format;
+    }
+
+    public Reason getReason() {
+        return reason;
+    }
+
+    public enum Reason {
+        UNKNOWN_KERNEL_MODULE_NAME,
+        WG_QUICK_CONFIG_ERROR_CODE,
+        TUNNEL_MISSING_CONFIG,
+        VPN_NOT_AUTHORIZED,
+        UNABLE_TO_START_VPN,
+        TUN_CREATION_ERROR,
+        GO_ACTIVATION_ERROR_CODE
+    }
+}
@@ -0,0 +1,330 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.backend;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Build;
+import android.os.ParcelFileDescriptor;
+import android.util.Log;
+
+import com.wireguard.android.backend.BackendException.Reason;
+import com.wireguard.android.backend.Tunnel.State;
+import com.wireguard.android.util.SharedLibraryLoader;
+import com.wireguard.config.Config;
+import com.wireguard.config.InetNetwork;
+import com.wireguard.config.Peer;
+import com.wireguard.crypto.Key;
+import com.wireguard.crypto.KeyFormatException;
+import com.wireguard.util.NonNullForAll;
+
+import java.net.InetAddress;
+import java.util.Collections;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
+
+import androidx.annotation.Nullable;
+import androidx.collection.ArraySet;
+
+@NonNullForAll
+public final class GoBackend implements Backend {
+    private static final String TAG = "WireGuard/GoBackend";
+    @Nullable private static AlwaysOnCallback alwaysOnCallback;
+    private static GhettoCompletableFuture<VpnService> vpnService = new GhettoCompletableFuture<>();
+    private final Context context;
+    @Nullable private Config currentConfig;
+    @Nullable private Tunnel currentTunnel;
+    private int currentTunnelHandle = -1;
+
+    public GoBackend(final Context context) {
+        SharedLibraryLoader.loadSharedLibrary(context, "wg-go");
+        this.context = context;
+    }
+
+    public static void setAlwaysOnCallback(final AlwaysOnCallback cb) {
+        alwaysOnCallback = cb;
+    }
+
+    private static native String wgGetConfig(int handle);
+
+    private static native int wgGetSocketV4(int handle);
+
+    private static native int wgGetSocketV6(int handle);
+
+    private static native void wgTurnOff(int handle);
+
+    private static native int wgTurnOn(String ifName, int tunFd, String settings);
+
+    private static native String wgVersion();
+
+    @Override
+    public Set<String> getRunningTunnelNames() {
+        if (currentTunnel != null) {
+            final Set<String> runningTunnels = new ArraySet<>();
+            runningTunnels.add(currentTunnel.getName());
+            return runningTunnels;
+        }
+        return Collections.emptySet();
+    }
+
+    @Override
+    public State getState(final Tunnel tunnel) {
+        return currentTunnel == tunnel ? State.UP : State.DOWN;
+    }
+
+    @Override
+    public Statistics getStatistics(final Tunnel tunnel) {
+        final Statistics stats = new Statistics();
+        if (tunnel != currentTunnel) {
+            return stats;
+        }
+        final String config = wgGetConfig(currentTunnelHandle);
+        Key key = null;
+        long rx = 0;
+        long tx = 0;
+        for (final String line : config.split("\\n")) {
+            if (line.startsWith("public_key=")) {
+                if (key != null)
+                    stats.add(key, rx, tx);
+                rx = 0;
+                tx = 0;
+                try {
+                    key = Key.fromHex(line.substring(11));
+                } catch (final KeyFormatException ignored) {
+                    key = null;
+                }
+            } else if (line.startsWith("rx_bytes=")) {
+                if (key == null)
+                    continue;
+                try {
+                    rx = Long.parseLong(line.substring(9));
+                } catch (final NumberFormatException ignored) {
+                    rx = 0;
+                }
+            } else if (line.startsWith("tx_bytes=")) {
+                if (key == null)
+                    continue;
+                try {
+                    tx = Long.parseLong(line.substring(9));
+                } catch (final NumberFormatException ignored) {
+                    tx = 0;
+                }
+            }
+        }
+        if (key != null)
+            stats.add(key, rx, tx);
+        return stats;
+    }
+
+    @Override
+    public String getVersion() {
+        return wgVersion();
+    }
+
+    @Override
+    public State setState(final Tunnel tunnel, State state, @Nullable final Config config) throws Exception {
+        final State originalState = getState(tunnel);
+
+        if (state == State.TOGGLE)
+            state = originalState == State.UP ? State.DOWN : State.UP;
+        if (state == originalState && tunnel == currentTunnel && config == currentConfig)
+            return originalState;
+        if (state == State.UP) {
+            final Config originalConfig = currentConfig;
+            final Tunnel originalTunnel = currentTunnel;
+            if (currentTunnel != null)
+                setStateInternal(currentTunnel, null, State.DOWN);
+            try {
+                setStateInternal(tunnel, config, state);
+            } catch (final Exception e) {
+                if (originalTunnel != null)
+                    setStateInternal(originalTunnel, originalConfig, State.UP);
+                throw e;
+            }
+        } else if (state == State.DOWN && tunnel == currentTunnel) {
+            setStateInternal(tunnel, null, State.DOWN);
+        }
+        return getState(tunnel);
+    }
+
+    private void setStateInternal(final Tunnel tunnel, @Nullable final Config config, final State state)
+            throws Exception {
+        Log.i(TAG, "Bringing tunnel " + tunnel.getName() + ' ' + state);
+
+        if (state == State.UP) {
+            if (config == null)
+                throw new BackendException(Reason.TUNNEL_MISSING_CONFIG);
+
+            if (VpnService.prepare(context) != null)
+                throw new BackendException(Reason.VPN_NOT_AUTHORIZED);
+
+            final VpnService service;
+            if (!vpnService.isDone())
+                startVpnService();
+
+            try {
+                service = vpnService.get(2, TimeUnit.SECONDS);
+            } catch (final TimeoutException e) {
+                final Exception be = new BackendException(Reason.UNABLE_TO_START_VPN);
+                be.initCause(e);
+                throw be;
+            }
+            service.setOwner(this);
+
+            if (currentTunnelHandle != -1) {
+                Log.w(TAG, "Tunnel already up");
+                return;
+            }
+
+            // Build config
+            final String goConfig = config.toWgUserspaceString();
+
+            // Create the vpn tunnel with android API
+            final VpnService.Builder builder = service.getBuilder();
+            builder.setSession(tunnel.getName());
+
+            for (final String excludedApplication : config.getInterface().getExcludedApplications())
+                builder.addDisallowedApplication(excludedApplication);
+
+            for (final String includedApplication : config.getInterface().getIncludedApplications())
+                builder.addAllowedApplication(includedApplication);
+
+            for (final InetNetwork addr : config.getInterface().getAddresses())
+                builder.addAddress(addr.getAddress(), addr.getMask());
+
+            for (final InetAddress addr : config.getInterface().getDnsServers())
+                builder.addDnsServer(addr.getHostAddress());
+
+            for (final Peer peer : config.getPeers()) {
+                for (final InetNetwork addr : peer.getAllowedIps())
+                    builder.addRoute(addr.getAddress(), addr.getMask());
+            }
+
+            builder.setMtu(config.getInterface().getMtu().orElse(1280));
+
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q)
+                builder.setMetered(false);
+            if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M)
+                service.setUnderlyingNetworks(null);
+
+            builder.setBlocking(true);
+            try (final ParcelFileDescriptor tun = builder.establish()) {
+                if (tun == null)
+                    throw new BackendException(Reason.TUN_CREATION_ERROR);
+                Log.d(TAG, "Go backend v" + wgVersion());
+                currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig);
+            }
+            if (currentTunnelHandle < 0)
+                throw new BackendException(Reason.GO_ACTIVATION_ERROR_CODE, currentTunnelHandle);
+
+            currentTunnel = tunnel;
+            currentConfig = config;
+
+            service.protect(wgGetSocketV4(currentTunnelHandle));
+            service.protect(wgGetSocketV6(currentTunnelHandle));
+        } else {
+            if (currentTunnelHandle == -1) {
+                Log.w(TAG, "Tunnel already down");
+                return;
+            }
+
+            wgTurnOff(currentTunnelHandle);
+            currentTunnel = null;
+            currentTunnelHandle = -1;
+            currentConfig = null;
+        }
+
+        tunnel.onStateChange(state);
+    }
+
+    private void startVpnService() {
+        Log.d(TAG, "Requesting to start VpnService");
+        context.startService(new Intent(context, VpnService.class));
+    }
+
+    public interface AlwaysOnCallback {
+        void alwaysOnTriggered();
+    }
+
+    // TODO: When we finally drop API 21 and move to API 24, delete this and replace with the ordinary CompletableFuture.
+    private static final class GhettoCompletableFuture<V> {
+        private final LinkedBlockingQueue<V> completion = new LinkedBlockingQueue<>(1);
+        private final FutureTask<V> result = new FutureTask<>(completion::peek);
+
+        public boolean complete(final V value) {
+            final boolean offered = completion.offer(value);
+            if (offered)
+                result.run();
+            return offered;
+        }
+
+        public V get() throws ExecutionException, InterruptedException {
+            return result.get();
+        }
+
+        public V get(final long timeout, final TimeUnit unit) throws ExecutionException, InterruptedException, TimeoutException {
+            return result.get(timeout, unit);
+        }
+
+        public boolean isDone() {
+            return !completion.isEmpty();
+        }
+
+        public GhettoCompletableFuture<V> newIncompleteFuture() {
+            return new GhettoCompletableFuture<>();
+        }
+    }
+
+    public static class VpnService extends android.net.VpnService {
+        @Nullable private GoBackend owner;
+
+        public Builder getBuilder() {
+            return new Builder();
+        }
+
+        @Override
+        public void onCreate() {
+            vpnService.complete(this);
+            super.onCreate();
+        }
+
+        @Override
+        public void onDestroy() {
+            if (owner != null) {
+                final Tunnel tunnel = owner.currentTunnel;
+                if (tunnel != null) {
+                    if (owner.currentTunnelHandle != -1)
+                        wgTurnOff(owner.currentTunnelHandle);
+                    owner.currentTunnel = null;
+                    owner.currentTunnelHandle = -1;
+                    owner.currentConfig = null;
+                    tunnel.onStateChange(State.DOWN);
+                }
+            }
+            vpnService = vpnService.newIncompleteFuture();
+            super.onDestroy();
+        }
+
+        @Override
+        public int onStartCommand(@Nullable 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");
+                if (alwaysOnCallback != null)
+                    alwaysOnCallback.alwaysOnTriggered();
+            }
+            return super.onStartCommand(intent, flags, startId);
+        }
+
+        public void setOwner(final GoBackend owner) {
+            this.owner = owner;
+        }
+    }
+}
@@ -0,0 +1,65 @@
+/*
+ * Copyright © 2020 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.backend;
+
+import android.os.SystemClock;
+import android.util.Pair;
+
+import com.wireguard.crypto.Key;
+import com.wireguard.util.NonNullForAll;
+
+import java.util.HashMap;
+import java.util.Map;
+
+@NonNullForAll
+public class Statistics {
+    private final Map<Key, Pair<Long, Long>> peerBytes = new HashMap<>();
+    private long lastTouched = SystemClock.elapsedRealtime();
+
+    Statistics() {
+    }
+
+    void add(final Key key, final long rx, final long tx) {
+        peerBytes.put(key, Pair.create(rx, tx));
+        lastTouched = SystemClock.elapsedRealtime();
+    }
+
+    public boolean isStale() {
+        return SystemClock.elapsedRealtime() - lastTouched > 900;
+    }
+
+    public long peerRx(final Key peer) {
+        if (!peerBytes.containsKey(peer))
+            return 0;
+        return peerBytes.get(peer).first;
+    }
+
+    public long peerTx(final Key peer) {
+        if (!peerBytes.containsKey(peer))
+            return 0;
+        return peerBytes.get(peer).second;
+    }
+
+    public Key[] peers() {
+        return peerBytes.keySet().toArray(new Key[0]);
+    }
+
+    public long totalRx() {
+        long rx = 0;
+        for (final Pair<Long, Long> val : peerBytes.values()) {
+            rx += val.first;
+        }
+        return rx;
+    }
+
+    public long totalTx() {
+        long tx = 0;
+        for (final Pair<Long, Long> val : peerBytes.values()) {
+            tx += val.second;
+        }
+        return tx;
+    }
+}
@@ -0,0 +1,48 @@
+/*
+ * Copyright © 2020 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.backend;
+
+import com.wireguard.util.NonNullForAll;
+
+import java.util.regex.Pattern;
+
+/**
+ * Represents a WireGuard tunnel.
+ */
+
+@NonNullForAll
+public interface Tunnel {
+    int NAME_MAX_LENGTH = 15;
+    Pattern NAME_PATTERN = Pattern.compile("[a-zA-Z0-9_=+.-]{1,15}");
+
+    static boolean isNameInvalid(final CharSequence name) {
+        return !NAME_PATTERN.matcher(name).matches();
+    }
+
+    /**
+     * Get the name of the tunnel, which should always pass the !isNameInvalid test.
+     *
+     * @return The name of the tunnel.
+     */
+    String getName();
+
+    /**
+     * React to a change in state of the tunnel. Should only be directly called by Backend.
+     *
+     * @param newState The new state of the tunnel.
+     */
+    void onStateChange(State newState);
+
+    enum State {
+        DOWN,
+        TOGGLE,
+        UP;
+
+        public static State of(final boolean running) {
+            return running ? UP : DOWN;
+        }
+    }
+}
@@ -0,0 +1,192 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.backend;
+
+import android.content.Context;
+import android.util.Log;
+import android.util.Pair;
+
+import com.wireguard.android.backend.BackendException.Reason;
+import com.wireguard.android.backend.Tunnel.State;
+import com.wireguard.android.util.RootShell;
+import com.wireguard.android.util.ToolsInstaller;
+import com.wireguard.config.Config;
+import com.wireguard.crypto.Key;
+import com.wireguard.util.NonNullForAll;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+import androidx.annotation.Nullable;
+import java9.util.stream.Collectors;
+import java9.util.stream.Stream;
+
+/**
+ * WireGuard backend that uses {@code wg-quick} to implement tunnel configuration.
+ */
+
+@NonNullForAll
+public final class WgQuickBackend implements Backend {
+    private static final String TAG = "WireGuard/WgQuickBackend";
+    private final File localTemporaryDir;
+    private final RootShell rootShell;
+    private final Map<Tunnel, Config> runningConfigs = new HashMap<>();
+    private final ToolsInstaller toolsInstaller;
+    private boolean multipleTunnels;
+
+    public WgQuickBackend(final Context context, final RootShell rootShell, final ToolsInstaller toolsInstaller) {
+        localTemporaryDir = new File(context.getCacheDir(), "tmp");
+        this.rootShell = rootShell;
+        this.toolsInstaller = toolsInstaller;
+    }
+
+    @Override
+    public Set<String> getRunningTunnelNames() {
+        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())
+                return Collections.emptySet();
+        } catch (final Exception e) {
+            Log.w(TAG, "Unable to enumerate running tunnels", e);
+            return Collections.emptySet();
+        }
+        // wg puts all interface names on the same line. Split them into separate elements.
+        return Stream.of(output.get(0).split(" ")).collect(Collectors.toUnmodifiableSet());
+    }
+
+    @Override
+    public State getState(final Tunnel tunnel) {
+        return getRunningTunnelNames().contains(tunnel.getName()) ? State.UP : State.DOWN;
+    }
+
+    @Override
+    public Statistics getStatistics(final Tunnel tunnel) {
+        final Statistics stats = new Statistics();
+        final Collection<String> output = new ArrayList<>();
+        try {
+            if (rootShell.run(output, String.format("wg show '%s' transfer", tunnel.getName())) != 0)
+                return stats;
+        } catch (final Exception ignored) {
+            return stats;
+        }
+        for (final String line : output) {
+            final String[] parts = line.split("\\t");
+            if (parts.length != 3)
+                continue;
+            try {
+                stats.add(Key.fromBase64(parts[0]), Long.parseLong(parts[1]), Long.parseLong(parts[2]));
+            } catch (final Exception ignored) {
+            }
+        }
+        return stats;
+    }
+
+    @Override
+    public String getVersion() throws Exception {
+        final List<String> output = new ArrayList<>();
+        if (rootShell.run(output, "cat /sys/module/wireguard/version") != 0 || output.isEmpty())
+            throw new BackendException(Reason.UNKNOWN_KERNEL_MODULE_NAME);
+        return output.get(0);
+    }
+
+    public void setMultipleTunnels(final boolean on) {
+        multipleTunnels = on;
+    }
+
+    @Override
+    public State setState(final Tunnel tunnel, State state, @Nullable final Config config) throws Exception {
+        final State originalState = getState(tunnel);
+        final Config originalConfig = runningConfigs.get(tunnel);
+        final Map<Tunnel, Config> runningConfigsSnapshot = new HashMap<>(runningConfigs);
+
+        if (state == State.TOGGLE)
+            state = originalState == State.UP ? State.DOWN : State.UP;
+        if ((state == State.UP && originalState == State.UP && originalConfig != null && originalConfig == config) ||
+                (state == State.DOWN && originalState == State.DOWN))
+            return originalState;
+        if (state == State.UP) {
+            toolsInstaller.ensureToolsAvailable();
+            if (!multipleTunnels && originalState == State.DOWN) {
+                final List<Pair<Tunnel, Config>> rewind = new LinkedList<>();
+                try {
+                    for (final Map.Entry<Tunnel, Config> entry : runningConfigsSnapshot.entrySet()) {
+                        setStateInternal(entry.getKey(), entry.getValue(), State.DOWN);
+                        rewind.add(Pair.create(entry.getKey(), entry.getValue()));
+                    }
+                } catch (final Exception e) {
+                    try {
+                        for (final Pair<Tunnel, Config> entry : rewind) {
+                            setStateInternal(entry.first, entry.second, State.UP);
+                        }
+                    } catch (final Exception ignored) {
+                    }
+                    throw e;
+                }
+            }
+            if (originalState == State.UP)
+                setStateInternal(tunnel, originalConfig == null ? config : originalConfig, State.DOWN);
+            try {
+                setStateInternal(tunnel, config, State.UP);
+            } catch (final Exception e) {
+                try {
+                    if (originalState == State.UP && originalConfig != null) {
+                        setStateInternal(tunnel, originalConfig, State.UP);
+                    }
+                    if (!multipleTunnels && originalState == State.DOWN) {
+                        for (final Map.Entry<Tunnel, Config> entry : runningConfigsSnapshot.entrySet()) {
+                            setStateInternal(entry.getKey(), entry.getValue(), State.UP);
+                        }
+                    }
+                } catch (final Exception ignored) {
+                }
+                throw e;
+            }
+        } else if (state == State.DOWN) {
+            setStateInternal(tunnel, originalConfig == null ? config : originalConfig, State.DOWN);
+        }
+        return state;
+    }
+
+    private void setStateInternal(final Tunnel tunnel, @Nullable final Config config, final State state) throws Exception {
+        Log.i(TAG, "Bringing tunnel " + tunnel.getName() + ' ' + state);
+
+        Objects.requireNonNull(config, "Trying to set state up with a null config");
+
+        final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf");
+        try (final FileOutputStream stream = new FileOutputStream(tempFile, false)) {
+            stream.write(config.toWgQuickString().getBytes(StandardCharsets.UTF_8));
+        }
+        String command = String.format("wg-quick %s '%s'",
+                state.toString().toLowerCase(Locale.ENGLISH), tempFile.getAbsolutePath());
+        if (state == State.UP)
+            command = "cat /sys/module/wireguard/version && " + command;
+        final int result = rootShell.run(null, command);
+        // noinspection ResultOfMethodCallIgnored
+        tempFile.delete();
+        if (result != 0)
+            throw new BackendException(Reason.WG_QUICK_CONFIG_ERROR_CODE, result);
+
+        if (state == State.UP)
+            runningConfigs.put(tunnel, config);
+        else
+            runningConfigs.remove(tunnel);
+
+        tunnel.onStateChange(state);
+    }
+}
@@ -0,0 +1,189 @@
+/*
+ * Copyright © 2019-2020 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.util;
+
+import android.content.Context;
+import android.system.OsConstants;
+import android.util.Base64;
+
+import com.wireguard.android.util.RootShell.RootShellException;
+import com.wireguard.util.NonNullForAll;
+
+import net.i2p.crypto.eddsa.EdDSAEngine;
+import net.i2p.crypto.eddsa.EdDSAPublicKey;
+import net.i2p.crypto.eddsa.spec.EdDSANamedCurveTable;
+import net.i2p.crypto.eddsa.spec.EdDSAParameterSpec;
+import net.i2p.crypto.eddsa.spec.EdDSAPublicKeySpec;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.security.InvalidParameterException;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+import java.security.Signature;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import androidx.annotation.Nullable;
+
+@NonNullForAll
+@SuppressWarnings("MagicNumber")
+public class ModuleLoader {
+    private static final String MODULE_LIST_URL = "https://download.wireguard.com/android-module/modules.txt.sig";
+    private static final String MODULE_NAME = "wireguard-%s.ko";
+    private static final String MODULE_PUBLIC_KEY_BASE64 = "RWRmHuT9PSqtwfsLtEx+QS06BJtLgFYteL9WCNjH7yuyu5Y1DieSN7If";
+    private static final String MODULE_URL = "https://download.wireguard.com/android-module/%s";
+    private final File moduleDir;
+    private final RootShell rootShell;
+    private final File tmpDir;
+    private final String userAgent;
+
+    public ModuleLoader(final Context context, final RootShell rootShell, final String userAgent) {
+        moduleDir = new File(context.getCacheDir(), "kmod");
+        tmpDir = new File(context.getCacheDir(), "tmp");
+        this.rootShell = rootShell;
+        this.userAgent = userAgent;
+    }
+
+    public static boolean isModuleLoaded() {
+        return new File("/sys/module/wireguard").exists();
+    }
+
+    public Integer download() throws IOException, RootShellException, NoSuchAlgorithmException {
+        final List<String> output = new ArrayList<>();
+        rootShell.run(output, "sha256sum /proc/version|cut -d ' ' -f 1");
+        if (output.size() != 1 || output.get(0).length() != 64)
+            throw new InvalidParameterException("Invalid sha256 of /proc/version");
+        final String moduleName = String.format(MODULE_NAME, output.get(0));
+        HttpURLConnection connection = (HttpURLConnection) new URL(MODULE_LIST_URL).openConnection();
+        connection.setRequestProperty("User-Agent", userAgent);
+        connection.connect();
+        if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
+            throw new IOException("Hash list could not be found");
+        final byte[] input = new byte[1024 * 1024 * 3 /* 3MiB */];
+        int len;
+        try (final InputStream inputStream = connection.getInputStream()) {
+            len = inputStream.read(input);
+        }
+        if (len <= 0)
+            throw new IOException("Hash list was empty");
+        final Map<String, Sha256Digest> modules = verifySignedHashes(new String(input, 0, len, StandardCharsets.UTF_8));
+        if (modules == null)
+            throw new InvalidParameterException("The signature did not verify or invalid hash list format");
+        if (!modules.containsKey(moduleName))
+            return OsConstants.ENOENT;
+        connection = (HttpURLConnection) new URL(String.format(MODULE_URL, moduleName)).openConnection();
+        connection.setRequestProperty("User-Agent", userAgent);
+        connection.connect();
+        if (connection.getResponseCode() != HttpURLConnection.HTTP_OK)
+            throw new IOException("Module file could not be found, despite being on hash list");
+
+        tmpDir.mkdirs();
+        moduleDir.mkdir();
+        File tempFile = null;
+        try {
+            tempFile = File.createTempFile("UNVERIFIED-", null, tmpDir);
+            final MessageDigest digest = MessageDigest.getInstance("SHA-256");
+            try (final InputStream inputStream = connection.getInputStream();
+                 final FileOutputStream outputStream = new FileOutputStream(tempFile)) {
+                int total = 0;
+                while ((len = inputStream.read(input)) > 0) {
+                    total += len;
+                    if (total > 1024 * 1024 * 15 /* 15 MiB */)
+                        throw new IOException("File too big");
+                    outputStream.write(input, 0, len);
+                    digest.update(input, 0, len);
+                }
+                outputStream.getFD().sync();
+            }
+            if (!Arrays.equals(digest.digest(), modules.get(moduleName).bytes))
+                throw new IOException("Incorrect file hash");
+
+            if (!tempFile.renameTo(new File(moduleDir, moduleName)))
+                throw new IOException("Unable to rename to final destination");
+        } finally {
+            if (tempFile != null)
+                tempFile.delete();
+        }
+        return OsConstants.EXIT_SUCCESS;
+    }
+
+    public void loadModule() throws IOException, RootShellException {
+        rootShell.run(null, String.format("insmod \"%s/wireguard-$(sha256sum /proc/version|cut -d ' ' -f 1).ko\"", moduleDir.getAbsolutePath()));
+    }
+
+    public boolean moduleMightExist() {
+        return moduleDir.exists() && moduleDir.isDirectory();
+    }
+
+    @Nullable
+    private Map<String, Sha256Digest> verifySignedHashes(final String signifyDigest) {
+        final byte[] publicKeyBytes = Base64.decode(MODULE_PUBLIC_KEY_BASE64, Base64.DEFAULT);
+
+        if (publicKeyBytes == null || publicKeyBytes.length != 32 + 10 || publicKeyBytes[0] != 'E' || publicKeyBytes[1] != 'd')
+            return null;
+
+        final String[] lines = signifyDigest.split("\n", 3);
+        if (lines.length != 3)
+            return null;
+        if (!lines[0].startsWith("untrusted comment: "))
+            return null;
+
+        final byte[] signatureBytes = Base64.decode(lines[1], Base64.DEFAULT);
+        if (signatureBytes == null || signatureBytes.length != 64 + 10)
+            return null;
+        for (int i = 0; i < 10; ++i) {
+            if (signatureBytes[i] != publicKeyBytes[i])
+                return null;
+        }
+
+        try {
+            final EdDSAParameterSpec parameterSpec = EdDSANamedCurveTable.getByName(EdDSANamedCurveTable.ED_25519);
+            final Signature signature = new EdDSAEngine(MessageDigest.getInstance(parameterSpec.getHashAlgorithm()));
+            final byte[] rawPublicKeyBytes = new byte[32];
+            System.arraycopy(publicKeyBytes, 10, rawPublicKeyBytes, 0, 32);
+            signature.initVerify(new EdDSAPublicKey(new EdDSAPublicKeySpec(rawPublicKeyBytes, parameterSpec)));
+            signature.update(lines[2].getBytes(StandardCharsets.UTF_8));
+            if (!signature.verify(signatureBytes, 10, 64))
+                return null;
+        } catch (final Exception ignored) {
+            return null;
+        }
+
+        final Map<String, Sha256Digest> hashes = new HashMap<>();
+        for (final String line : lines[2].split("\n")) {
+            final String[] components = line.split(" {2}", 2);
+            if (components.length != 2)
+                return null;
+            try {
+                hashes.put(components[1], new Sha256Digest(components[0]));
+            } catch (final Exception ignored) {
+                return null;
+            }
+        }
+        return hashes;
+    }
+
+    private static final class Sha256Digest {
+        private final byte[] bytes;
+
+        private Sha256Digest(final String hex) {
+            if (hex.length() != 64)
+                throw new InvalidParameterException("SHA256 hashes must be 32 bytes long");
+            bytes = new byte[32];
+            for (int i = 0; i < 32; ++i)
+                bytes[i] = (byte) Integer.parseInt(hex.substring(i * 2, i * 2 + 2), 16);
+        }
+    }
+}
@@ -1,7 +1,6 @@
 /*
- * 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
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
 */

 package com.wireguard.android.util;
@@ -9,13 +8,11 @@ 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 com.wireguard.android.util.RootShell.RootShellException.Reason;
+import com.wireguard.util.NonNullForAll;

 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
@@ -23,35 +20,31 @@ import java.nio.charset.StandardCharsets;
 import java.util.Collection;
 import java.util.UUID;

-import javax.inject.Inject;
+import androidx.annotation.Nullable;

 /**
 * Helper class for running commands as root.
 */

-@ApplicationScope
+@NonNullForAll
 public class RootShell {
    private static final String SU = "su";
-    private static final String TAG = "WireGuard/" + RootShell.class.getSimpleName();
+    private static final String TAG = "WireGuard/RootShell";

-    private final String deviceNotRootedMessage;
    private final File localBinaryDir;
    private final File localTemporaryDir;
    private final Object lock = new Object();
    private final String preamble;
-    private Process process;
-    private BufferedReader stderr;
-    private OutputStreamWriter stdin;
-    private BufferedReader stdout;
+    @Nullable private Process process;
+    @Nullable private BufferedReader stderr;
+    @Nullable private OutputStreamWriter stdin;
+    @Nullable private BufferedReader stdout;

-    @Inject
-    public RootShell(@ApplicationContext final Context context) {
-        deviceNotRootedMessage = context.getString(R.string.error_root);
-        final File cacheDir = context.getCacheDir();
-        localBinaryDir = new File(cacheDir, "bin");
-        localTemporaryDir = new File(cacheDir, "tmp");
-        preamble = String.format("export CALLING_PACKAGE=com.wireguard.android PATH=\"%s:$PATH\" TMPDIR='%s'; id -u\n",
-                localBinaryDir, localTemporaryDir);
+    public RootShell(final Context context) {
+        localBinaryDir = new File(context.getCodeCacheDir(), "bin");
+        localTemporaryDir = new File(context.getCacheDir(), "tmp");
+        preamble = String.format("export CALLING_PACKAGE=%s PATH=\"%s:$PATH\" TMPDIR='%s'; id -u\n",
+                context.getPackageName(), localBinaryDir, localTemporaryDir);
    }

    private static boolean isExecutableInPath(final String name) {
@@ -86,8 +79,8 @@ public class RootShell {
     * @param command Command to run as root.
     * @return The exit value of the command.
     */
-    public int run(final Collection<String> output, final String command)
-            throws IOException, NoRootException {
+    public int run(@Nullable final Collection<String> output, final String command)
+            throws IOException, RootShellException {
        synchronized (lock) {
            /* Start inside synchronized block to prevent a concurrent call to stop(). */
            start();
@@ -126,24 +119,24 @@ public class RootShell {
                }
            }
            if (markersSeen != 4)
-                throw new IOException("Expected 4 markers, received " + markersSeen);
+                throw new RootShellException(Reason.SHELL_MARKER_COUNT_ERROR, markersSeen);
            if (errnoStdout != errnoStderr)
-                throw new IOException("Unable to read exit status");
+                throw new RootShellException(Reason.SHELL_EXIT_STATUS_READ_ERROR);
            Log.v(TAG, "exit: " + errnoStdout);
            return errnoStdout;
        }
    }

-    public void start() throws IOException, NoRootException {
+    public void start() throws IOException, RootShellException {
        if (!isExecutableInPath(SU))
-            throw new NoRootException(deviceNotRootedMessage);
+            throw new RootShellException(Reason.NO_ROOT_ACCESS);
        synchronized (lock) {
            if (isRunning())
                return;
            if (!localBinaryDir.isDirectory() && !localBinaryDir.mkdirs())
-                throw new FileNotFoundException("Could not create local binary directory");
+                throw new RootShellException(Reason.CREATE_BIN_DIR_ERROR);
            if (!localTemporaryDir.isDirectory() && !localTemporaryDir.mkdirs())
-                throw new FileNotFoundException("Could not create local temporary directory");
+                throw new RootShellException(Reason.CREATE_TEMP_DIR_ERROR);
            try {
                final ProcessBuilder builder = new ProcessBuilder().command(SU);
                builder.environment().put("LC_ALL", "C");
@@ -151,7 +144,9 @@ public class RootShell {
                    process = builder.start();
                } catch (final IOException e) {
                    // A failure at this stage means the device isn't rooted.
-                    throw new NoRootException(deviceNotRootedMessage, e);
+                    final RootShellException rse = new RootShellException(Reason.NO_ROOT_ACCESS);
+                    rse.initCause(e);
+                    throw rse;
                }
                stdin = new OutputStreamWriter(process.getOutputStream(), StandardCharsets.UTF_8);
                stdout = new BufferedReader(new InputStreamReader(process.getInputStream(),
@@ -164,18 +159,18 @@ public class RootShell {
                final String uid = stdout.readLine();
                if (!"0".equals(uid)) {
                    Log.w(TAG, "Root check did not return correct UID: " + uid);
-                    throw new NoRootException(deviceNotRootedMessage);
+                    throw new RootShellException(Reason.NO_ROOT_ACCESS);
                }
                if (!isRunning()) {
                    String line;
                    while ((line = stderr.readLine()) != null) {
                        Log.w(TAG, "Root check returned an error: " + line);
                        if (line.contains("Permission denied"))
-                            throw new NoRootException(deviceNotRootedMessage);
+                            throw new RootShellException(Reason.NO_ROOT_ACCESS);
                    }
-                    throw new IOException("Shell failed to start: " + process.exitValue());
+                    throw new RootShellException(Reason.SHELL_START_ERROR, process.exitValue());
                }
-            } catch (final IOException | NoRootException e) {
+            } catch (final IOException | RootShellException e) {
                stop();
                throw e;
            }
@@ -191,13 +186,34 @@ public class RootShell {
        }
    }

-    public static class NoRootException extends Exception {
-        public NoRootException(final String message, final Throwable cause) {
-            super(message, cause);
+    public static class RootShellException extends Exception {
+        private final Object[] format;
+        private final Reason reason;
+
+        public RootShellException(final Reason reason, final Object... format) {
+            this.reason = reason;
+            this.format = format;
        }

-        public NoRootException(final String message) {
-            super(message);
+        public Object[] getFormat() {
+            return format;
+        }
+
+        public Reason getReason() {
+            return reason;
+        }
+
+        public boolean isIORelated() {
+            return reason != Reason.NO_ROOT_ACCESS;
+        }
+
+        public enum Reason {
+            NO_ROOT_ACCESS,
+            SHELL_MARKER_COUNT_ERROR,
+            SHELL_EXIT_STATUS_READ_ERROR,
+            SHELL_START_ERROR,
+            CREATE_BIN_DIR_ERROR,
+            CREATE_TEMP_DIR_ERROR
        }
    }
 }
@@ -0,0 +1,95 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. 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 com.wireguard.util.NonNullForAll;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.HashSet;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;
+
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+@NonNullForAll
+@RestrictTo(Scope.LIBRARY_GROUP)
+public final class SharedLibraryLoader {
+    private static final String TAG = "WireGuard/SharedLibraryLoader";
+
+    private SharedLibraryLoader() {
+    }
+
+    public static boolean extractLibrary(final Context context, final String libName, final File destination) throws IOException {
+        final Collection<String> apks = new HashSet<>();
+        if (context.getApplicationInfo().sourceDir != null)
+            apks.add(context.getApplicationInfo().sourceDir);
+        if (context.getApplicationInfo().splitSourceDirs != null)
+            apks.addAll(Arrays.asList(context.getApplicationInfo().splitSourceDirs));
+
+        for (final String abi : Build.SUPPORTED_ABIS) {
+            for (final String apk : apks) {
+                try (final ZipFile zipFile = new ZipFile(new File(apk), ZipFile.OPEN_READ)) {
+                    final String mappedLibName = System.mapLibraryName(libName);
+                    final String libZipPath = "lib" + File.separatorChar + abi + File.separatorChar + mappedLibName;
+                    final ZipEntry zipEntry = zipFile.getEntry(libZipPath);
+                    if (zipEntry == null)
+                        continue;
+                    Log.d(TAG, "Extracting apk:/" + libZipPath + " to " + destination.getAbsolutePath());
+                    try (final FileOutputStream out = new FileOutputStream(destination);
+                         final InputStream in = zipFile.getInputStream(zipEntry)) {
+                        int len;
+                        final byte[] buffer = new byte[1024 * 32];
+                        while ((len = in.read(buffer)) != -1) {
+                            out.write(buffer, 0, len);
+                        }
+                        out.getFD().sync();
+                    }
+                }
+                return true;
+            }
+        }
+        return false;
+    }
+
+    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;
+        }
+        File f = null;
+        try {
+            f = File.createTempFile("lib", ".so", context.getCodeCacheDir());
+            if (extractLibrary(context, libName, f)) {
+                System.load(f.getAbsolutePath());
+                return;
+            }
+        } catch (final Exception e) {
+            Log.d(TAG, "Failed to load library apk:/" + libName, e);
+            noAbiException = e;
+        } finally {
+            if (f != null)
+                // noinspection ResultOfMethodCallIgnored
+                f.delete();
+        }
+        if (noAbiException instanceof RuntimeException)
+            throw (RuntimeException) noAbiException;
+        throw new RuntimeException(noAbiException);
+    }
+}
@@ -0,0 +1,202 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.util;
+
+import android.content.Context;
+import android.system.OsConstants;
+import android.util.Log;
+
+import com.wireguard.android.util.RootShell.RootShellException;
+import com.wireguard.util.NonNullForAll;
+
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.Arrays;
+import java.util.List;
+
+import androidx.annotation.Nullable;
+import androidx.annotation.RestrictTo;
+import androidx.annotation.RestrictTo.Scope;
+
+/**
+ * Helper to install WireGuard tools to the system partition.
+ */
+
+@NonNullForAll
+public final class ToolsInstaller {
+    public static final int ERROR = 0x0;
+    public static final int MAGISK = 0x4;
+    public static final int NO = 0x2;
+    public static final int SYSTEM = 0x8;
+    public static final int YES = 0x1;
+    private static final String[] EXECUTABLES = {"wg", "wg-quick"};
+    private static final File[] INSTALL_DIRS = {
+            new File("/system/xbin"),
+            new File("/system/bin"),
+    };
+    @Nullable private static final File INSTALL_DIR = getInstallDir();
+    private static final String TAG = "WireGuard/ToolsInstaller";
+
+    private final Context context;
+    private final File localBinaryDir;
+    private final Object lock = new Object();
+    private final RootShell rootShell;
+    @Nullable private Boolean areToolsAvailable;
+    @Nullable private Boolean installAsMagiskModule;
+
+    public ToolsInstaller(final Context context, final RootShell rootShell) {
+        localBinaryDir = new File(context.getCodeCacheDir(), "bin");
+        this.context = context;
+        this.rootShell = rootShell;
+    }
+
+    @Nullable
+    private static File getInstallDir() {
+        final String path = System.getenv("PATH");
+        if (path == null)
+            return INSTALL_DIRS[0];
+        final List<String> paths = Arrays.asList(path.split(":"));
+        for (final File dir : INSTALL_DIRS) {
+            if (paths.contains(dir.getPath()) && dir.isDirectory())
+                return dir;
+        }
+        return null;
+    }
+
+    public int areInstalled() throws RootShellException {
+        if (INSTALL_DIR == null)
+            return ERROR;
+        final StringBuilder script = new StringBuilder();
+        for (final String name : EXECUTABLES) {
+            script.append(String.format("cmp -s '%s' '%s' && ",
+                    new File(localBinaryDir, name).getAbsolutePath(),
+                    new File(INSTALL_DIR, name).getAbsolutePath()));
+        }
+        script.append("exit ").append(OsConstants.EALREADY).append(';');
+        try {
+            final int ret = rootShell.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 ERROR;
+        } catch (final RootShellException e) {
+            if (e.isIORelated())
+                return ERROR;
+            throw e;
+        }
+    }
+
+    public void ensureToolsAvailable() throws FileNotFoundException {
+        synchronized (lock) {
+            if (areToolsAvailable == null) {
+                try {
+                    Log.d(TAG, extract() ? "Tools are now extracted into our private binary dir" :
+                            "Tools were already extracted into our private binary dir");
+                    areToolsAvailable = true;
+                } catch (final IOException e) {
+                    Log.e(TAG, "The wg and wg-quick tools are not available", e);
+                    areToolsAvailable = false;
+                }
+            }
+            if (!areToolsAvailable)
+                throw new FileNotFoundException("Required tools unavailable");
+        }
+    }
+
+    public boolean extract() throws IOException {
+        localBinaryDir.mkdirs();
+        final File[] files = new File[EXECUTABLES.length];
+        final File[] tempFiles = new File[EXECUTABLES.length];
+        boolean allExist = true;
+        for (int i = 0; i < files.length; ++i) {
+            files[i] = new File(localBinaryDir, EXECUTABLES[i]);
+            tempFiles[i] = new File(localBinaryDir, EXECUTABLES[i] + ".tmp");
+            allExist &= files[i].exists();
+        }
+        if (allExist)
+            return false;
+        for (int i = 0; i < files.length; ++i) {
+            if (!SharedLibraryLoader.extractLibrary(context, EXECUTABLES[i], tempFiles[i]))
+                throw new FileNotFoundException("Unable to find " + EXECUTABLES[i]);
+            if (!tempFiles[i].setExecutable(true, false))
+                throw new IOException("Unable to mark " + tempFiles[i].getAbsolutePath() + " as executable");
+            if (!tempFiles[i].renameTo(files[i]))
+                throw new IOException("Unable to rename " + tempFiles[i].getAbsolutePath() + " to " + files[i].getAbsolutePath());
+        }
+        return true;
+    }
+
+    @RestrictTo(Scope.LIBRARY_GROUP)
+    public int install() throws RootShellException, IOException {
+        if (!context.getPackageName().startsWith("com.wireguard."))
+            throw new SecurityException("The tools may only be installed system-wide from the main WireGuard app.");
+        return willInstallAsMagiskModule() ? installMagisk() : installSystem();
+    }
+
+    private int installMagisk() throws RootShellException, IOException {
+        extract();
+        final StringBuilder script = new StringBuilder("set -ex; ");
+
+        script.append("trap 'rm -rf /sbin/.magisk/img/wireguard' INT TERM EXIT; ");
+        script.append(String.format("rm -rf /sbin/.magisk/img/wireguard/; mkdir -p /sbin/.magisk/img/wireguard%s; ", INSTALL_DIR));
+        script.append("printf 'name=WireGuard Command Line Tools\nversion=1.0\nversionCode=1\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.magisk/img/wireguard/module.prop; ");
+        script.append("touch /sbin/.magisk/img/wireguard/auto_mount; ");
+        for (final String name : EXECUTABLES) {
+            final File destination = new File("/sbin/.magisk/img/wireguard" + INSTALL_DIR, name);
+            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; chcon 'u:object_r:system_file:s0' '%s' || true; ",
+                    new File(localBinaryDir, name), destination, destination, destination));
+        }
+        script.append("trap - INT TERM EXIT;");
+
+        try {
+            return rootShell.run(null, script.toString()) == 0 ? YES | MAGISK : ERROR;
+        } catch (final IOException ignored) {
+            return ERROR;
+        } catch (final RootShellException e) {
+            if (e.isIORelated())
+                return ERROR;
+            throw e;
+        }
+    }
+
+    private int installSystem() throws RootShellException, IOException {
+        if (INSTALL_DIR == null)
+            return OsConstants.ENOENT;
+        extract();
+        final StringBuilder script = new StringBuilder("set -ex; ");
+        script.append("trap 'mount -o ro,remount /system' EXIT; mount -o rw,remount /system; ");
+        for (final String name : EXECUTABLES) {
+            final File destination = new File(INSTALL_DIR, name);
+            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; restorecon '%s' || true; ",
+                    new File(localBinaryDir, name), destination, destination, destination));
+        }
+        try {
+            return rootShell.run(null, script.toString()) == 0 ? YES | SYSTEM : ERROR;
+        } catch (final IOException ignored) {
+            return ERROR;
+        } catch (final RootShellException e) {
+            if (e.isIORelated())
+                return ERROR;
+            throw e;
+        }
+    }
+
+    private boolean willInstallAsMagiskModule() {
+        synchronized (lock) {
+            if (installAsMagiskModule == null) {
+                try {
+                    installAsMagiskModule = rootShell.run(null, "[ -d /sbin/.magisk/mirror -a -d /sbin/.magisk/img -a ! -f /cache/.disable_magisk ]") == OsConstants.EXIT_SUCCESS;
+                } catch (final Exception ignored) {
+                    installAsMagiskModule = false;
+                }
+            }
+            return installAsMagiskModule;
+        }
+    }
+}
@@ -0,0 +1,61 @@
+/*
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.config;
+
+import com.wireguard.util.NonNullForAll;
+
+import java.util.Iterator;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import java9.util.Optional;
+
+@NonNullForAll
+public final class Attribute {
+    private static final Pattern LINE_PATTERN = Pattern.compile("(\\w+)\\s*=\\s*([^\\s#][^#]*)");
+    private static final Pattern LIST_SEPARATOR = Pattern.compile("\\s*,\\s*");
+
+    private final String key;
+    private final String value;
+
+    private Attribute(final String key, final String value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public static String join(final Iterable<?> values) {
+        final Iterator<?> it = values.iterator();
+        if (!it.hasNext()) {
+            return "";
+        }
+        final StringBuilder sb = new StringBuilder();
+        sb.append(it.next());
+        while (it.hasNext()) {
+            sb.append(", ");
+            sb.append(it.next());
+        }
+        return sb.toString();
+    }
+
+    public static Optional<Attribute> parse(final CharSequence line) {
+        final Matcher matcher = LINE_PATTERN.matcher(line);
+        if (!matcher.matches())
+            return Optional.empty();
+        return Optional.of(new Attribute(matcher.group(1), matcher.group(2)));
+    }
+
+    public static String[] split(final CharSequence value) {
+        return LIST_SEPARATOR.split(value);
+    }
+
+    public String getKey() {
+        return key;
+    }
+
+    public String getValue() {
+        return value;
+    }
+}
@@ -0,0 +1,120 @@
+/*
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.config;
+
+import com.wireguard.crypto.KeyFormatException;
+import com.wireguard.util.NonNullForAll;
+
+import androidx.annotation.Nullable;
+
+@NonNullForAll
+public class BadConfigException extends Exception {
+    private final Location location;
+    private final Reason reason;
+    private final Section section;
+    @Nullable private final CharSequence text;
+
+    private BadConfigException(final Section section, final Location location,
+                               final Reason reason, @Nullable final CharSequence text,
+                               @Nullable final Throwable cause) {
+        super(cause);
+        this.section = section;
+        this.location = location;
+        this.reason = reason;
+        this.text = text;
+    }
+
+    public BadConfigException(final Section section, final Location location,
+                              final Reason reason, @Nullable final CharSequence text) {
+        this(section, location, reason, text, null);
+    }
+
+    public BadConfigException(final Section section, final Location location,
+                              final KeyFormatException cause) {
+        this(section, location, Reason.INVALID_KEY, null, cause);
+    }
+
+    public BadConfigException(final Section section, final Location location,
+                              @Nullable final CharSequence text,
+                              final NumberFormatException cause) {
+        this(section, location, Reason.INVALID_NUMBER, text, cause);
+    }
+
+    public BadConfigException(final Section section, final Location location,
+                              final ParseException cause) {
+        this(section, location, Reason.INVALID_VALUE, cause.getText(), cause);
+    }
+
+    public Location getLocation() {
+        return location;
+    }
+
+    public Reason getReason() {
+        return reason;
+    }
+
+    public Section getSection() {
+        return section;
+    }
+
+    @Nullable
+    public CharSequence getText() {
+        return text;
+    }
+
+    public enum Location {
+        TOP_LEVEL(""),
+        ADDRESS("Address"),
+        ALLOWED_IPS("AllowedIPs"),
+        DNS("DNS"),
+        ENDPOINT("Endpoint"),
+        EXCLUDED_APPLICATIONS("ExcludedApplications"),
+        INCLUDED_APPLICATIONS("IncludedApplications"),
+        LISTEN_PORT("ListenPort"),
+        MTU("MTU"),
+        PERSISTENT_KEEPALIVE("PersistentKeepalive"),
+        PRE_SHARED_KEY("PresharedKey"),
+        PRIVATE_KEY("PrivateKey"),
+        PUBLIC_KEY("PublicKey");
+
+        private final String name;
+
+        Location(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+
+    public enum Reason {
+        INVALID_KEY,
+        INVALID_NUMBER,
+        INVALID_VALUE,
+        MISSING_ATTRIBUTE,
+        MISSING_SECTION,
+        SYNTAX_ERROR,
+        UNKNOWN_ATTRIBUTE,
+        UNKNOWN_SECTION
+    }
+
+    public enum Section {
+        CONFIG("Config"),
+        INTERFACE("Interface"),
+        PEER("Peer");
+
+        private final String name;
+
+        Section(final String name) {
+            this.name = name;
+        }
+
+        public String getName() {
+            return name;
+        }
+    }
+}
--- a/Show More
+++ b/Show More