Version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>

.idea/codeStyles/Project.xml

@@ -34,6 +34,9 @@
       <option name="USE_CUSTOM_SETTINGS" value="true" />
     </AndroidXmlCodeStyleSettings>
     <JavaCodeStyleSettings>
+      <option name="GENERATE_FINAL_LOCALS" value="true" />
+      <option name="GENERATE_FINAL_PARAMETERS" value="true" />
+      <option name="INSERT_INNER_CLASS_IMPORTS" value="true" />
       <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">

.idea/copyright/Default.xml

@@ -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: Apache-2.0
+    <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>

.idea/copyright/profiles_settings.xml

@@ -1,3 +1,3 @@
 <component name="CopyrightManager">
-  <settings default="GPL-2.0-or-later" />
-</component>
+  <settings default="Default" />
+</component>

.idea/inspectionProfiles/Default.xml

@@ -385,7 +385,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" />

app/build.gradle

@@ -6,19 +6,20 @@ apply from: 'nonnull.gradle'
 final def keystorePropertiesFile = rootProject.file("keystore.properties")
 
 android {
-    buildToolsVersion '28.0.1'
+    buildToolsVersion '28.0.3'
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
     }
-    compileSdkVersion 27
+    compileSdkVersion 28
     dataBinding.enabled true
     defaultConfig {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
-        targetSdkVersion 27
-        versionCode 436
-        versionName '0.0.20180724'
+        targetSdkVersion 28
+        versionCode 447
+        versionName '0.0.20190215'
+        buildConfigField 'int', 'MIN_SDK_VERSION', "$minSdkVersion.apiLevel"
     }
     // If the keystore file exists
     if (keystorePropertiesFile.exists()) {
@@ -45,6 +46,8 @@ android {
                     arguments "-DANDROID_PACKAGE_NAME=${android.defaultConfig.applicationId}"
                 }
             }
+            minifyEnabled true
+            proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
         }
         debug {
             applicationIdSuffix ".debug"
@@ -64,24 +67,30 @@ android {
 }
 
 ext {
+    annotationsVersion = '1.0.1'
+    appcompatVersion = '1.0.2'
+    cardviewVersion = '1.0.0'
     databindingVersion = '3.1.3'
-    supportLibsVersion = '27.1.1'
-    streamsupportVersion = '1.6.0'
+    materialComponentsVersion = '1.0.0'
     jsr305Version = '3.0.2'
+    preferenceVersion = '1.0.0'
+    streamsupportVersion = '1.7.0'
+    threetenabpVersion = '1.1.1'
     zxingEmbeddedVersion = '3.6.0'
 }
 
 dependencies {
-    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 "androidx.annotation:annotation:$annotationsVersion"
+    implementation "androidx.appcompat:appcompat:$appcompatVersion"
+    implementation "androidx.cardview:cardview:$cardviewVersion"
+    implementation "androidx.databinding:databinding-runtime:$databindingVersion"
+    implementation "androidx.preference:preference:$preferenceVersion"
+    implementation "com.google.android.material:material:$materialComponentsVersion"
+    implementation "com.google.code.findbugs:jsr305:$jsr305Version"
+    implementation "com.jakewharton.threetenabp:threetenabp:$threetenabpVersion"
+    implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
     implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
     implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
-    implementation "com.google.code.findbugs:jsr305:$jsr305Version"
-    implementation "com.journeyapps:zxing-android-embedded:$zxingEmbeddedVersion"
 }
 
 tasks.withType(JavaCompile) {

app/nonnull.gradle

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

app/proguard-rules.pro

@@ -0,0 +1,5 @@
+# Squelch all warnings, they're harmless but ProGuard
+# escalates them as errors.
+-dontwarn sun.misc.Unsafe
+# We're OSS anyway and who doesn't love a readable log
+-dontobfuscate

app/src/main/AndroidManifest.xml

@@ -11,10 +11,10 @@
 
     <permission
         android:name="${applicationId}.permission.CONTROL_TUNNELS"
-        android:protectionLevel="dangerous"
+        android:description="@string/permission_description"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/permission_label"
-        android:description="@string/permission_description" />
+        android:protectionLevel="dangerous" />
 
     <application
         android:name=".Application"
@@ -43,8 +43,7 @@
         <activity
             android:name=".activity.SettingsActivity"
             android:label="@string/settings"
-            android:parentActivityName=".activity.MainActivity"
-            android:theme="@style/SettingsTheme" />
+            android:parentActivityName=".activity.MainActivity" />
 
         <activity
             android:name=".activity.TunnelCreatorActivity"

app/src/main/java/com/wireguard/android/Application.java

@@ -1,22 +1,24 @@
 /*
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android;
 
+import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatDelegate;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatDelegate;
 
 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;
@@ -25,22 +27,18 @@ import com.wireguard.android.util.ToolsInstaller;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Objects;
-import java.util.concurrent.Executor;
+
+import java9.util.concurrent.CompletableFuture;
 
 public class Application extends android.app.Application {
     @SuppressWarnings("NullableProblems") private static WeakReference<Application> weakSelf;
+    private final CompletableFuture<Backend> futureBackend = new CompletableFuture<>();
     @SuppressWarnings("NullableProblems") private AsyncWorker asyncWorker;
+    @Nullable private Backend backend;
     @SuppressWarnings("NullableProblems") private RootShell rootShell;
     @SuppressWarnings("NullableProblems") private SharedPreferences sharedPreferences;
     @SuppressWarnings("NullableProblems") private ToolsInstaller toolsInstaller;
     @SuppressWarnings("NullableProblems") private TunnelManager tunnelManager;
-    @SuppressWarnings("NullableProblems") private Handler handler;
-    @Nullable private Backend backend;
-    @Nullable private Collection<BackendCallback> haveBackendCallbacks = new ArrayList<>();
-    private final Object haveBackendCallbacksLock = new Object();
 
     public Application() {
         weakSelf = new WeakReference<>(this);
@@ -56,43 +54,26 @@ public class Application extends android.app.Application {
 
     public static Backend getBackend() {
         final Application app = get();
-        synchronized (app) {
+        synchronized (app.futureBackend) {
             if (app.backend == null) {
+                Backend backend = null;
                 if (new File("/sys/module/wireguard").exists()) {
                     try {
                         app.rootShell.start();
-                        app.backend = new WgQuickBackend(app.getApplicationContext());
-                    } catch (final Exception ignored) { }
-                }
-                if (app.backend == null)
-                    app.backend = new GoBackend(app.getApplicationContext());
-                synchronized (app.haveBackendCallbacksLock) {
-                    if (app.haveBackendCallbacks != null) {
-                        for (final BackendCallback callback : app.haveBackendCallbacks)
-                            app.handler.post(() -> callback.callback(app.backend));
-                        app.haveBackendCallbacks = null;
+                        backend = new WgQuickBackend(app.getApplicationContext());
+                    } catch (final Exception ignored) {
                     }
                 }
+                if (backend == null)
+                    backend = new GoBackend(app.getApplicationContext());
+                app.backend = backend;
             }
             return app.backend;
         }
     }
 
-    @FunctionalInterface
-    public interface BackendCallback {
-        void callback(final Backend backend);
-    }
-
-    public static void onHaveBackend(final BackendCallback callback) {
-        final Application app = get();
-        synchronized (app.haveBackendCallbacksLock) {
-            if (app.haveBackendCallbacks == null) {
-                Objects.requireNonNull(app.backend, "Backend still null in onHaveBackend call");
-                callback.callback(app.backend);
-            } else {
-                app.haveBackendCallbacks.add(callback);
-            }
-        }
+    public static CompletableFuture<Backend> getBackendAsync() {
+        return get().futureBackend;
     }
 
     public static RootShell getRootShell() {
@@ -111,15 +92,25 @@ public class Application extends android.app.Application {
         return get().tunnelManager;
     }
 
+    @Override
+    protected void attachBaseContext(final Context context) {
+        super.attachBaseContext(context);
+
+        if (BuildConfig.MIN_SDK_VERSION > Build.VERSION.SDK_INT) {
+            final Intent intent = new Intent(Intent.ACTION_MAIN);
+            intent.addCategory(Intent.CATEGORY_HOME);
+            intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK);
+            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
+            startActivity(intent);
+            System.exit(0);
+        }
+    }
+
     @Override
     public void onCreate() {
         super.onCreate();
 
-        handler = new Handler(Looper.getMainLooper());
-        final Executor executor = AsyncTask.SERIAL_EXECUTOR;
-        final ConfigStore configStore = new FileConfigStore(getApplicationContext());
-
-        asyncWorker = new AsyncWorker(executor, handler);
+        asyncWorker = new AsyncWorker(AsyncTask.SERIAL_EXECUTOR, new Handler(Looper.getMainLooper()));
         rootShell = new RootShell(getApplicationContext());
         toolsInstaller = new ToolsInstaller(getApplicationContext());
 
@@ -128,8 +119,9 @@ public class Application extends android.app.Application {
                 sharedPreferences.getBoolean("dark_theme", false) ?
                         AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
 
-        tunnelManager = new TunnelManager(configStore);
-        asyncWorker.runAsync(Application::getBackend);
+        tunnelManager = new TunnelManager(new FileConfigStore(getApplicationContext()));
         tunnelManager.onCreate();
+
+        asyncWorker.supplyAsync(Application::getBackend).thenAccept(futureBackend::complete);
     }
 }

app/src/main/java/com/wireguard/android/BootShutdownReceiver.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -20,7 +19,7 @@ public class BootShutdownReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(final Context context, final Intent intent) {
-        Application.onHaveBackend(backend -> {
+        Application.getBackendAsync().thenAccept(backend -> {
             if (!(backend instanceof WgQuickBackend))
                 return;
             final String action = intent.getAction();

app/src/main/java/com/wireguard/android/QuickTileService.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,22 +7,23 @@ package com.wireguard.android;
 
 import android.annotation.TargetApi;
 import android.content.Intent;
-import android.databinding.Observable;
-import android.databinding.Observable.OnPropertyChangedCallback;
+import androidx.databinding.Observable;
+import androidx.databinding.Observable.OnPropertyChangedCallback;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.drawable.Icon;
 import android.os.Build;
+import android.os.IBinder;
 import android.service.quicksettings.Tile;
 import android.service.quicksettings.TileService;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 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.util.ExceptionLoggers;
+import com.wireguard.android.util.ErrorMessages;
 import com.wireguard.android.widget.SlashDrawable;
 
 import java.util.Objects;
@@ -40,32 +40,21 @@ public class QuickTileService extends TileService {
 
     private final OnStateChangedCallback onStateChangedCallback = new OnStateChangedCallback();
     private final OnTunnelChangedCallback onTunnelChangedCallback = new OnTunnelChangedCallback();
-    @Nullable private Tunnel tunnel;
-    @Nullable private Icon iconOn;
     @Nullable private Icon iconOff;
+    @Nullable private Icon iconOn;
+    @Nullable private Tunnel tunnel;
 
-    @SuppressWarnings("deprecation")
+    /* This works around an annoying unsolved frameworks bug some people are hitting. */
     @Override
-    public void onCreate() {
-        final SlashDrawable icon = new SlashDrawable(getResources().getDrawable(R.drawable.ic_tile));
-        icon.setAnimationEnabled(false); /* Unfortunately we can't have animations, since Icons are marshaled. */
-        icon.setSlashed(false);
-        Bitmap b = Bitmap.createBitmap(icon.getIntrinsicWidth(), icon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-        Canvas c = new Canvas(b);
-        icon.setBounds(0, 0, c.getWidth(), c.getHeight());
-        icon.draw(c);
-        iconOn = Icon.createWithBitmap(b);
-        /* TODO(msf): Change this to an explicit test for P when we start targetting SDK 28 */
-        if (Build.VERSION.SDK_INT > Build.VERSION_CODES.O_MR1) {
-            iconOff = iconOn;
-        } else {
-            icon.setSlashed(true);
-            b = Bitmap.createBitmap(icon.getIntrinsicWidth(), icon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
-            c = new Canvas(b);
-            icon.setBounds(0, 0, c.getWidth(), c.getHeight());
-            icon.draw(c);
-            iconOff = Icon.createWithBitmap(b);
+    @Nullable
+    public IBinder onBind(final Intent intent) {
+        IBinder ret = null;
+        try {
+            ret = super.onBind(intent);
+        } catch (final Exception e) {
+            Log.d(TAG, "Failed to bind to TileService", e);
         }
+        return ret;
     }
 
     @Override
@@ -84,6 +73,28 @@ public class QuickTileService extends TileService {
         }
     }
 
+    @Override
+    public void onCreate() {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {
+            iconOff = iconOn = Icon.createWithResource(this, R.drawable.ic_tile);
+            return;
+        }
+        final SlashDrawable icon = new SlashDrawable(getResources().getDrawable(R.drawable.ic_tile, Application.get().getTheme()));
+        icon.setAnimationEnabled(false); /* Unfortunately we can't have animations, since Icons are marshaled. */
+        icon.setSlashed(false);
+        Bitmap b = Bitmap.createBitmap(icon.getIntrinsicWidth(), icon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        Canvas c = new Canvas(b);
+        icon.setBounds(0, 0, c.getWidth(), c.getHeight());
+        icon.draw(c);
+        iconOn = Icon.createWithBitmap(b);
+        icon.setSlashed(true);
+        b = Bitmap.createBitmap(icon.getIntrinsicWidth(), icon.getIntrinsicHeight(), Bitmap.Config.ARGB_8888);
+        c = new Canvas(b);
+        icon.setBounds(0, 0, c.getWidth(), c.getHeight());
+        icon.draw(c);
+        iconOff = Icon.createWithBitmap(b);
+    }
+
     @Override
     public void onStartListening() {
         Application.getTunnelManager().addOnPropertyChangedCallback(onTunnelChangedCallback);
@@ -103,7 +114,7 @@ public class QuickTileService extends TileService {
                                   @Nullable final Throwable throwable) {
         if (throwable == null)
             return;
-        final String error = ExceptionLoggers.unwrapMessage(throwable);
+        final String error = ErrorMessages.get(throwable);
         final String message = getString(R.string.toggle_error, error);
         Log.e(TAG, message, throwable);
         Toast.makeText(this, message, Toast.LENGTH_LONG).show();

app/src/main/java/com/wireguard/android/activity/BaseActivity.java

@@ -1,19 +1,17 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.activity;
 
-import android.databinding.CallbackRegistry;
-import android.databinding.CallbackRegistry.NotifierCallback;
+import androidx.databinding.CallbackRegistry;
+import androidx.databinding.CallbackRegistry.NotifierCallback;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.TunnelManager;
 
 import java.util.Objects;
 
@@ -39,15 +37,17 @@ public abstract class BaseActivity extends ThemeChangeAwareActivity {
     @Override
     protected void onCreate(@Nullable final Bundle savedInstanceState) {
         // Restore the saved tunnel if there is one; otherwise grab it from the arguments.
-        String savedTunnelName = null;
+        final String savedTunnelName;
         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.getTunnelManager();
-            selectedTunnel = tunnelManager.getTunnels().get(savedTunnelName);
-        }
+        else
+            savedTunnelName = null;
+
+        if (savedTunnelName != null)
+            Application.getTunnelManager().getTunnels()
+                    .thenAccept(tunnels -> setSelectedTunnel(tunnels.get(savedTunnelName)));
 
         // The selected tunnel must be set before the superclass method recreates fragments.
         super.onCreate(savedInstanceState);

app/src/main/java/com/wireguard/android/activity/MainActivity.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,13 +8,14 @@ package com.wireguard.android.activity;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentManager;
-import android.support.v4.app.FragmentTransaction;
-import android.util.Log;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.FragmentManager;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.appcompat.app.ActionBar;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
+import android.widget.LinearLayout;
 
 import com.wireguard.android.R;
 import com.wireguard.android.fragment.TunnelDetailFragment;
@@ -23,71 +23,46 @@ import com.wireguard.android.fragment.TunnelEditorFragment;
 import com.wireguard.android.fragment.TunnelListFragment;
 import com.wireguard.android.model.Tunnel;
 
-import java.util.List;
-
-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.commitAllowingStateLoss(); /* TODO: switch back to .commit() when this function is rewritten. */
-        } 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;
-    }
+public class MainActivity extends BaseActivity
+        implements FragmentManager.OnBackStackChangedListener {
+    @Nullable private ActionBar actionBar;
+    private boolean isTwoPaneLayout;
+    @Nullable private TunnelListFragment listFragment;
 
     @Override
     public void onBackPressed() {
-        final List<Fragment> fragments = getSupportFragmentManager().getFragments();
-
-        boolean handled = false;
-        if (!fragments.isEmpty() && fragments.get(0) instanceof TunnelListFragment) {
-            handled = ((TunnelListFragment) fragments.get(0)).collapseActionMenu();
+        final int backStackEntries = getSupportFragmentManager().getBackStackEntryCount();
+        // If the action menu is visible and expanded, collapse it instead of navigating back.
+        if (isTwoPaneLayout || backStackEntries == 0) {
+            if (listFragment != null && listFragment.collapseActionMenu())
+                return;
         }
-
-        if (!handled) {
-            handled = moveToState(State.ofLayer(state.layer - 1));
+        // If the two-pane layout does not have an editor open, going back should exit the app.
+        if (isTwoPaneLayout && backStackEntries <= 1) {
+            finish();
+            return;
         }
-
-        if (!handled) {
-            super.onBackPressed();
+        // Deselect the current tunnel on navigating back from the detail pane to the one-pane list.
+        if (!isTwoPaneLayout && backStackEntries == 1) {
+            setSelectedTunnel(null);
+            return;
         }
+        super.onBackPressed();
+    }
+
+    @Override public void onBackStackChanged() {
+        if (actionBar == null)
+            return;
+        // Do not show the home menu when the two-pane layout is at the detail view (see above).
+        final int backStackEntries = getSupportFragmentManager().getBackStackEntryCount();
+        final int minBackStackEntries = isTwoPaneLayout ? 2 : 1;
+        actionBar.setDisplayHomeAsUpEnabled(backStackEntries >= minBackStackEntries);
     }
 
     // We use onTouchListener here to avoid the UI click sound, hence
@@ -97,25 +72,14 @@ public class MainActivity extends BaseActivity {
     protected void onCreate(@Nullable 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();
-        final int actionBarId = getResources().getIdentifier("action_bar", "id", getPackageName());
-        if (actionBarId != 0 && findViewById(actionBarId) != null) {
-            findViewById(actionBarId).setOnTouchListener((v, e) -> {
-                final List<Fragment> fragments = getSupportFragmentManager().getFragments();
-                if (!fragments.isEmpty() && fragments.get(0) instanceof TunnelListFragment) {
-                    ((TunnelListFragment) fragments.get(0)).collapseActionMenu();
-                }
-                return false;
-            });
-        }
+        actionBar = getSupportActionBar();
+        isTwoPaneLayout = findViewById(R.id.master_detail_wrapper) instanceof LinearLayout;
+        listFragment = (TunnelListFragment) getSupportFragmentManager().findFragmentByTag("LIST");
+        getSupportFragmentManager().addOnBackStackChangedListener(this);
+        onBackStackChanged();
+        final View actionBarView = findViewById(R.id.action_bar);
+        if (actionBarView != null)
+            actionBarView.setOnTouchListener((v, e) -> listFragment != null && listFragment.collapseActionMenu());
     }
 
     @Override
@@ -129,11 +93,14 @@ public class MainActivity extends BaseActivity {
         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));
+                onBackPressed();
                 return true;
             case R.id.menu_action_edit:
-                if (getSelectedTunnel() != null)
-                    moveToState(State.EDITOR);
+                getSupportFragmentManager().beginTransaction()
+                        .replace(R.id.detail_container, new TunnelEditorFragment())
+                        .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+                        .addToBackStack(null)
+                        .commit();
                 return true;
             case R.id.menu_action_save:
                 // This menu item is handled by the editor fragment.
@@ -147,37 +114,26 @@ public class MainActivity extends BaseActivity {
     }
 
     @Override
-    protected void onSaveInstanceState(final Bundle outState) {
-        outState.putString(KEY_STATE, state.name());
-        super.onSaveInstanceState(outState);
-    }
-
-    @Override
-    protected void onSelectedTunnelChanged(@Nullable final Tunnel oldTunnel, @Nullable 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);
-
-        @Nullable private final String fragment;
-        private final int layer;
-
-        State(@Nullable final Class<? extends Fragment> fragment, final int layer) {
-            this.fragment = fragment != null ? fragment.getName() : null;
-            this.layer = layer;
+    protected void onSelectedTunnelChanged(@Nullable final Tunnel oldTunnel,
+                                           @Nullable final Tunnel newTunnel) {
+        final FragmentManager fragmentManager = getSupportFragmentManager();
+        final int backStackEntries = fragmentManager.getBackStackEntryCount();
+        if (newTunnel == null) {
+            // Clear everything off the back stack (all editors and detail fragments).
+            fragmentManager.popBackStackImmediate(0, FragmentManager.POP_BACK_STACK_INCLUSIVE);
+            return;
         }
-
-        private static State ofLayer(final int layer) {
-            return Stream.of(State.values()).filter(s -> s.layer == layer).findFirst().get();
+        if (backStackEntries == 2) {
+            // Pop the editor off the back stack to reveal the detail fragment. Use the immediate
+            // method to avoid the editor picking up the new tunnel while it is still visible.
+            fragmentManager.popBackStackImmediate();
+        } else if (backStackEntries == 0) {
+            // Create and show a new detail fragment.
+            fragmentManager.beginTransaction()
+                    .add(R.id.detail_container, new TunnelDetailFragment())
+                    .setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE)
+                    .addToBackStack(null)
+                    .commit();
         }
     }
 }

app/src/main/java/com/wireguard/android/activity/SettingsActivity.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,12 +7,12 @@ package com.wireguard.android.activity;
 
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
-import android.support.v4.content.ContextCompat;
-import android.support.v7.preference.Preference;
-import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.preference.PreferenceScreen;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceFragmentCompat;
+import androidx.preference.PreferenceScreen;
 import android.util.SparseArray;
 import android.view.MenuItem;
 
@@ -93,13 +92,13 @@ public class SettingsActivity extends ThemeChangeAwareActivity {
         public void onCreatePreferences(final Bundle savedInstanceState, final String key) {
             addPreferencesFromResource(R.xml.preferences);
             final Preference wgQuickOnlyPrefs[] = {
-                getPreferenceManager().findPreference("tools_installer"),
-                getPreferenceManager().findPreference("restore_on_boot")
+                    getPreferenceManager().findPreference("tools_installer"),
+                    getPreferenceManager().findPreference("restore_on_boot")
             };
             for (final Preference pref : wgQuickOnlyPrefs)
                 pref.setVisible(false);
             final PreferenceScreen screen = getPreferenceScreen();
-            Application.onHaveBackend(backend -> {
+            Application.getBackendAsync().thenAccept(backend -> {
                 for (final Preference pref : wgQuickOnlyPrefs) {
                     if (backend instanceof WgQuickBackend)
                         pref.setVisible(true);

app/src/main/java/com/wireguard/android/activity/ThemeChangeAwareActivity.java

@@ -1,19 +1,55 @@
 /*
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.activity;
 
 import android.content.SharedPreferences;
+import android.content.res.Resources;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.app.AppCompatDelegate;
+import android.util.Log;
 
 import com.wireguard.android.Application;
 
+import java.lang.reflect.Field;
+
 public abstract class ThemeChangeAwareActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+    private static final String TAG = "WireGuard/" + ThemeChangeAwareActivity.class.getSimpleName();
+    private static boolean lastDarkMode;
+    @Nullable private static Resources lastResources;
+
+    private static synchronized void invalidateDrawableCache(final Resources resources, final boolean darkMode) {
+        if (resources == lastResources && darkMode == lastDarkMode)
+            return;
+
+        try {
+            Field f;
+            Object o = resources;
+            try {
+                f = o.getClass().getDeclaredField("mResourcesImpl");
+                f.setAccessible(true);
+                o = f.get(o);
+            } catch (final Exception ignored) {
+            }
+            f = o.getClass().getDeclaredField("mDrawableCache");
+            f.setAccessible(true);
+            o = f.get(o);
+            try {
+                o.getClass().getMethod("onConfigurationChange", int.class).invoke(o, -1);
+            } catch (final Exception ignored) {
+                o.getClass().getMethod("clear").invoke(o);
+            }
+        } catch (final Exception e) {
+            Log.e(TAG, "Failed to flush drawable cache", e);
+        }
+
+        lastResources = resources;
+        lastDarkMode = darkMode;
+    }
 
 
     @Override
@@ -31,10 +67,12 @@ public abstract class ThemeChangeAwareActivity extends AppCompatActivity impleme
     @Override
     public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key) {
         if ("dark_theme".equals(key)) {
+            final boolean darkMode = sharedPreferences.getBoolean(key, false);
             AppCompatDelegate.setDefaultNightMode(
                     sharedPreferences.getBoolean(key, false) ?
                             AppCompatDelegate.MODE_NIGHT_YES :
                             AppCompatDelegate.MODE_NIGHT_NO);
+            invalidateDrawableCache(getResources(), darkMode);
             recreate();
         }
     }

app/src/main/java/com/wireguard/android/activity/TunnelCreatorActivity.java

@@ -1,13 +1,12 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.activity;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.wireguard.android.fragment.TunnelEditorFragment;
 import com.wireguard.android.model.Tunnel;

app/src/main/java/com/wireguard/android/backend/Backend.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -54,14 +53,11 @@ public interface Backend {
     Statistics getStatistics(Tunnel tunnel) throws Exception;
 
     /**
-     * Set the state of a tunnel.
+     * Determine type name of underlying backend.
      *
-     * @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.
+     * @return Type name
      */
-    State setState(Tunnel tunnel, State state) throws Exception;
+    String getTypePrettyName();
 
     /**
      * Determine version of underlying backend.
@@ -72,9 +68,12 @@ public interface Backend {
     String getVersion() throws Exception;
 
     /**
-     * Determine type name of underlying backend.
+     * Set the state of a tunnel.
      *
-     * @return Type name
+     * @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.
      */
-    String getTypeName();
+    State setState(Tunnel tunnel, State state) throws Exception;
 }

app/src/main/java/com/wireguard/android/backend/GoBackend.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,11 +9,12 @@ import android.app.PendingIntent;
 import android.content.Context;
 import android.content.Intent;
 import android.os.ParcelFileDescriptor;
-import android.support.annotation.Nullable;
-import android.support.v4.util.ArraySet;
+import androidx.annotation.Nullable;
+import androidx.collection.ArraySet;
 import android.util.Log;
 
 import com.wireguard.android.Application;
+import com.wireguard.android.R;
 import com.wireguard.android.activity.MainActivity;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.Tunnel.State;
@@ -23,13 +23,10 @@ import com.wireguard.android.util.ExceptionLoggers;
 import com.wireguard.android.util.SharedLibraryLoader;
 import com.wireguard.config.Config;
 import com.wireguard.config.InetNetwork;
-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.Objects;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -60,12 +57,6 @@ public final class GoBackend implements Backend {
 
     private static native String wgVersion();
 
-    @Override
-    public String getVersion() { return wgVersion(); }
-
-    @Override
-    public String getTypeName() { return "Go userspace"; }
-
     @Override
     public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
         if (tunnel.getState() == State.UP) {
@@ -102,6 +93,16 @@ public final class GoBackend implements Backend {
         return new Statistics();
     }
 
+    @Override
+    public String getTypePrettyName() {
+        return context.getString(R.string.type_name_go_userspace);
+    }
+
+    @Override
+    public String getVersion() {
+        return wgVersion();
+    }
+
     @Override
     public State setState(final Tunnel tunnel, State state) throws Exception {
         final State originalState = getState(tunnel);
@@ -110,7 +111,7 @@ public final class GoBackend implements Backend {
         if (state == originalState)
             return originalState;
         if (state == State.UP && currentTunnel != null)
-            throw new IllegalStateException("Only one userspace tunnel can run at a time");
+            throw new IllegalStateException(context.getString(R.string.multiple_tunnels_error));
         Log.d(TAG, "Changing tunnel " + tunnel.getName() + " to state " + state);
         setStateInternal(tunnel, tunnel.getConfig(), state);
         return getState(tunnel);
@@ -122,10 +123,10 @@ public final class GoBackend implements Backend {
         if (state == State.UP) {
             Log.i(TAG, "Bringing tunnel up");
 
-            Objects.requireNonNull(config, "Trying to bring up a tunnel with no config");
+            Objects.requireNonNull(config, context.getString(R.string.no_config_error));
 
             if (VpnService.prepare(context) != null)
-                throw new Exception("VPN service not authorized by user");
+                throw new Exception(context.getString(R.string.vpn_not_authorized_error));
 
             final VpnService service;
             if (!vpnService.isDone())
@@ -134,7 +135,7 @@ public final class GoBackend implements Backend {
             try {
                 service = vpnService.get(2, TimeUnit.SECONDS);
             } catch (final TimeoutException e) {
-                throw new Exception("Unable to start Android VPN service", e);
+                throw new Exception(context.getString(R.string.vpn_start_error), e);
             }
 
             if (currentTunnelHandle != -1) {
@@ -143,29 +144,7 @@ public final class GoBackend implements Backend {
             }
 
             // Build config
-            final Interface iface = config.getInterface();
-            final String goConfig;
-            try (final Formatter fmt = new Formatter(new StringBuilder())) {
-                fmt.format("replace_peers=true\n");
-                if (iface.getPrivateKey() != null)
-                    fmt.format("private_key=%s\n", KeyEncoding.keyToHex(KeyEncoding.keyFromBase64(iface.getPrivateKey())));
-                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 InetNetwork addr : peer.getAllowedIPs()) {
-                        fmt.format("allowed_ip=%s\n", addr.toString());
-                    }
-                }
-                goConfig = fmt.toString();
-            }
+            final String goConfig = config.toWgUserspaceString();
 
             // Create the vpn tunnel with android API
             final VpnService.Builder builder = service.getBuilder();
@@ -181,28 +160,25 @@ public final class GoBackend implements Backend {
             for (final InetNetwork addr : config.getInterface().getAddresses())
                 builder.addAddress(addr.getAddress(), addr.getMask());
 
-            for (final InetAddress addr : config.getInterface().getDnses())
+            for (final InetAddress addr : config.getInterface().getDnsServers())
                 builder.addDnsServer(addr.getHostAddress());
 
             for (final Peer peer : config.getPeers()) {
-                for (final InetNetwork addr : peer.getAllowedIPs())
+                for (final InetNetwork addr : peer.getAllowedIps())
                     builder.addRoute(addr.getAddress(), addr.getMask());
             }
 
-            int mtu = config.getInterface().getMtu();
-            if (mtu == 0)
-                mtu = 1280;
-            builder.setMtu(mtu);
+            builder.setMtu(config.getInterface().getMtu().orElse(1280));
 
             builder.setBlocking(true);
             try (final ParcelFileDescriptor tun = builder.establish()) {
                 if (tun == null)
-                    throw new Exception("Unable to create tun device");
+                    throw new Exception(context.getString(R.string.tun_create_error));
                 Log.d(TAG, "Go backend v" + wgVersion());
                 currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig);
             }
             if (currentTunnelHandle < 0)
-                throw new Exception("Unable to turn tunnel on (wgTurnOn return " + currentTunnelHandle + ')');
+                throw new Exception(context.getString(R.string.tunnel_on_error, currentTunnelHandle));
 
             currentTunnel = tunnel;
 
@@ -240,10 +216,13 @@ public final class GoBackend implements Backend {
 
         @Override
         public void onDestroy() {
-            for (final Tunnel tunnel : Application.getTunnelManager().getTunnels()) {
-                if (tunnel != null && tunnel.getState() != State.DOWN)
-                    tunnel.setState(State.DOWN);
-            }
+            Application.getTunnelManager().getTunnels().thenAccept(tunnels -> {
+                for (final Tunnel tunnel : tunnels) {
+                    if (tunnel != null && tunnel.getState() != State.DOWN)
+                        tunnel.setState(State.DOWN);
+                }
+            });
+
             vpnService = vpnService.newIncompleteFuture();
             super.onDestroy();
         }

app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java

@@ -1,16 +1,16 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * 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.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.wireguard.android.Application;
+import com.wireguard.android.R;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.Tunnel.State;
 import com.wireguard.android.model.Tunnel.Statistics;
@@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.Locale;
 import java.util.Objects;
 import java.util.Set;
 
@@ -36,23 +37,13 @@ public final class WgQuickBackend implements Backend {
     private static final String TAG = "WireGuard/" + WgQuickBackend.class.getSimpleName();
 
     private final File localTemporaryDir;
+    private final Context context;
 
     public WgQuickBackend(final Context context) {
         localTemporaryDir = new File(context.getCacheDir(), "tmp");
+        this.context = context;
     }
 
-    @Override
-    public String getVersion() throws Exception {
-        final List<String> output = new ArrayList<>();
-        if (Application.getRootShell()
-                .run(output, "cat /sys/module/wireguard/version") != 0 || output.isEmpty())
-            throw new Exception("Unable to determine kernel module version");
-        return output.get(0);
-    }
-
-    @Override
-    public String getTypeName() { return "Kernel module"; }
-
     @Override
     public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
         if (tunnel.getState() == State.UP) {
@@ -95,6 +86,20 @@ public final class WgQuickBackend implements Backend {
         return new Statistics();
     }
 
+    @Override
+    public String getTypePrettyName() {
+        return context.getString(R.string.type_name_kernel_module);
+    }
+
+    @Override
+    public String getVersion() throws Exception {
+        final List<String> output = new ArrayList<>();
+        if (Application.getRootShell()
+                .run(output, "cat /sys/module/wireguard/version") != 0 || output.isEmpty())
+            throw new Exception(context.getString(R.string.module_version_error));
+        return output.get(0);
+    }
+
     @Override
     public State setState(final Tunnel tunnel, State state) throws Exception {
         final State originalState = getState(tunnel);
@@ -113,16 +118,16 @@ public final class WgQuickBackend implements Backend {
 
         final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf");
         try (final FileOutputStream stream = new FileOutputStream(tempFile, false)) {
-            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
+            stream.write(config.toWgQuickString().getBytes(StandardCharsets.UTF_8));
         }
         String command = String.format("wg-quick %s '%s'",
-                state.toString().toLowerCase(), tempFile.getAbsolutePath());
+                state.toString().toLowerCase(Locale.ENGLISH), tempFile.getAbsolutePath());
         if (state == State.UP)
             command = "cat /sys/module/wireguard/version && " + command;
         final int result = Application.getRootShell().run(null, command);
         // noinspection ResultOfMethodCallIgnored
         tempFile.delete();
         if (result != 0)
-            throw new Exception("Unable to configure tunnel (wg-quick returned " + result + ')');
+            throw new Exception(context.getString(R.string.tunnel_config_error));
     }
 }

app/src/main/java/com/wireguard/android/configStore/ConfigStore.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

app/src/main/java/com/wireguard/android/configStore/FileConfigStore.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,6 +8,8 @@ package com.wireguard.android.configStore;
 import android.content.Context;
 import android.util.Log;
 
+import com.wireguard.android.R;
+import com.wireguard.config.BadConfigException;
 import com.wireguard.config.Config;
 
 import java.io.File;
@@ -40,9 +41,9 @@ public final class FileConfigStore implements ConfigStore {
         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");
+            throw new IOException(context.getString(R.string.config_file_exists_error, file.getName()));
         try (final FileOutputStream stream = new FileOutputStream(file, false)) {
-            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
+            stream.write(config.toWgQuickString().getBytes(StandardCharsets.UTF_8));
         }
         return config;
     }
@@ -52,7 +53,7 @@ public final class FileConfigStore implements ConfigStore {
         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());
+            throw new IOException(context.getString(R.string.config_delete_error, file.getName()));
     }
 
     @Override
@@ -68,9 +69,9 @@ public final class FileConfigStore implements ConfigStore {
     }
 
     @Override
-    public Config load(final String name) throws IOException {
+    public Config load(final String name) throws BadConfigException, IOException {
         try (final FileInputStream stream = new FileInputStream(fileFor(name))) {
-            return Config.from(stream);
+            return Config.parse(stream);
         }
     }
 
@@ -80,11 +81,11 @@ public final class FileConfigStore implements ConfigStore {
         final File file = fileFor(name);
         final File replacementFile = fileFor(replacement);
         if (!replacementFile.createNewFile())
-            throw new IOException("Configuration for " + replacement + " already exists");
+            throw new IOException(context.getString(R.string.config_exists_error, replacement));
         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());
+            throw new IOException(context.getString(R.string.config_rename_error, file.getName()));
         }
     }
 
@@ -93,9 +94,9 @@ public final class FileConfigStore implements ConfigStore {
         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");
+            throw new FileNotFoundException(context.getString(R.string.config_not_found_error, file.getName()));
         try (final FileOutputStream stream = new FileOutputStream(file, false)) {
-            stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
+            stream.write(config.toWgQuickString().getBytes(StandardCharsets.UTF_8));
         }
         return config;
     }

app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java

@@ -1,27 +1,35 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.databinding;
 
-import android.databinding.BindingAdapter;
-import android.databinding.ObservableList;
-import android.databinding.adapters.ListenerUtil;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
+import androidx.databinding.BindingAdapter;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableList;
+import androidx.databinding.ViewDataBinding;
+import androidx.databinding.adapters.ListenerUtil;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.LinearLayoutManager;
+import androidx.recyclerview.widget.RecyclerView;
 import android.text.InputFilter;
+import android.view.LayoutInflater;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.wireguard.android.BR;
 import com.wireguard.android.R;
 import com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler;
 import com.wireguard.android.util.ObservableKeyedList;
 import com.wireguard.android.widget.ToggleSwitch;
 import com.wireguard.android.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
+import com.wireguard.config.Attribute;
+import com.wireguard.config.InetNetwork;
 import com.wireguard.util.Keyed;
 
+import java9.util.Optional;
+
 /**
  * Static methods for use by generated code in the Android data binding library.
  */
@@ -43,9 +51,10 @@ public final class BindingAdapters {
     }
 
     @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) {
+    public static <E>
+    void setItems(final LinearLayout view,
+                  @Nullable final ObservableList<E> oldList, final int oldLayoutId,
+                  @Nullable final ObservableList<E> newList, final int newLayoutId) {
         if (oldList == newList && oldLayoutId == newLayoutId)
             return;
         ItemChangeListener<E> listener = ListenerUtil.getListener(view, R.id.item_change_listener);
@@ -67,11 +76,34 @@ public final class BindingAdapters {
         listener.setList(newList);
     }
 
+    @BindingAdapter({"items", "layout"})
+    public static <E>
+    void setItems(final LinearLayout view,
+                  @Nullable final Iterable<E> oldList, final int oldLayoutId,
+                  @Nullable final Iterable<E> newList, final int newLayoutId) {
+        if (oldList == newList && oldLayoutId == newLayoutId)
+            return;
+        view.removeAllViews();
+        if (newList == null)
+            return;
+        final LayoutInflater layoutInflater = LayoutInflater.from(view.getContext());
+        for (final E item : newList) {
+            final ViewDataBinding binding =
+                    DataBindingUtil.inflate(layoutInflater, newLayoutId, view, false);
+            binding.setVariable(BR.collection, newList);
+            binding.setVariable(BR.item, item);
+            binding.executePendingBindings();
+            view.addView(binding.getRoot());
+        }
+    }
+
     @BindingAdapter(requireAll = false, value = {"items", "layout", "configurationHandler"})
     public static <K, E extends Keyed<? extends K>>
     void setItems(final RecyclerView view,
-                  final ObservableKeyedList<K, E> oldList, final int oldLayoutId, final RowConfigurationHandler oldRowConfigurationHandler,
-                  final ObservableKeyedList<K, E> newList, final int newLayoutId, final RowConfigurationHandler newRowConfigurationHandler) {
+                  @Nullable final ObservableKeyedList<K, E> oldList, final int oldLayoutId,
+                  final RowConfigurationHandler oldRowConfigurationHandler,
+                  @Nullable final ObservableKeyedList<K, E> newList, final int newLayoutId,
+                  final RowConfigurationHandler newRowConfigurationHandler) {
         if (view.getLayoutManager() == null)
             view.setLayoutManager(new LinearLayoutManager(view.getContext(), RecyclerView.VERTICAL, false));
 
@@ -104,4 +136,13 @@ public final class BindingAdapters {
         view.setOnBeforeCheckedChangeListener(listener);
     }
 
+    @BindingAdapter("android:text")
+    public static void setText(final TextView view, final Optional<?> text) {
+        view.setText(text.map(Object::toString).orElse(""));
+    }
+
+    @BindingAdapter("android:text")
+    public static void setText(final TextView view, @Nullable final Iterable<InetNetwork> networks) {
+        view.setText(networks != null ? Attribute.join(networks) : "");
+    }
 }

app/src/main/java/com/wireguard/android/databinding/ItemChangeListener.java

@@ -1,15 +1,14 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.databinding;
 
-import android.databinding.DataBindingUtil;
-import android.databinding.ObservableList;
-import android.databinding.ViewDataBinding;
-import android.support.annotation.Nullable;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableList;
+import androidx.databinding.ViewDataBinding;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;

app/src/main/java/com/wireguard/android/databinding/ObservableKeyedRecyclerViewAdapter.java

@@ -1,18 +1,17 @@
 /*
- * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.databinding;
 
 import android.content.Context;
-import android.databinding.DataBindingUtil;
-import android.databinding.ObservableList;
-import android.databinding.ViewDataBinding;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.RecyclerView.Adapter;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ObservableList;
+import androidx.databinding.ViewDataBinding;
+import androidx.annotation.Nullable;
+import androidx.recyclerview.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView.Adapter;
 import android.view.LayoutInflater;
 import android.view.ViewGroup;
 
@@ -41,11 +40,6 @@ public class ObservableKeyedRecyclerViewAdapter<K, E extends Keyed<? extends K>>
         setList(list);
     }
 
-    @Override
-    public int getItemCount() {
-        return list != null ? list.size() : 0;
-    }
-
     @Nullable
     private E getItem(final int position) {
         if (list == null || position < 0 || position >= list.size())
@@ -53,6 +47,11 @@ public class ObservableKeyedRecyclerViewAdapter<K, E extends Keyed<? extends K>>
         return list.get(position);
     }
 
+    @Override
+    public int getItemCount() {
+        return list != null ? list.size() : 0;
+    }
+
     @Override
     public long getItemId(final int position) {
         final K key = getKey(position);
@@ -65,11 +64,6 @@ public class ObservableKeyedRecyclerViewAdapter<K, E extends Keyed<? extends K>>
         return item != null ? item.getKey() : null;
     }
 
-    @Override
-    public ViewHolder onCreateViewHolder(final ViewGroup parent, final int viewType) {
-        return new ViewHolder(DataBindingUtil.inflate(layoutInflater, layoutId, parent, false));
-    }
-
     @SuppressWarnings("unchecked")
     @Override
     public void onBindViewHolder(final ViewHolder holder, final int position) {
@@ -79,13 +73,18 @@ public class ObservableKeyedRecyclerViewAdapter<K, E extends Keyed<? extends K>>
         holder.binding.executePendingBindings();
 
         if (rowConfigurationHandler != null) {
-            E item = getItem(position);
+            final E item = getItem(position);
             if (item != null) {
                 rowConfigurationHandler.onConfigureRow(holder.binding, item, position);
             }
         }
     }
 
+    @Override
+    public ViewHolder onCreateViewHolder(final ViewGroup parent, final int viewType) {
+        return new ViewHolder(DataBindingUtil.inflate(layoutInflater, layoutId, parent, false));
+    }
+
     void setList(@Nullable final ObservableKeyedList<K, E> newList) {
         if (list != null)
             list.removeOnListChangedCallback(callback);
@@ -100,6 +99,10 @@ public class ObservableKeyedRecyclerViewAdapter<K, E extends Keyed<? extends K>>
         this.rowConfigurationHandler = rowConfigurationHandler;
     }
 
+    public interface RowConfigurationHandler<B extends ViewDataBinding, T> {
+        void onConfigureRow(B binding, T item, int position);
+    }
+
     private static final class OnListChangedCallback<E extends Keyed<?>>
             extends ObservableList.OnListChangedCallback<ObservableList<E>> {
 
@@ -153,8 +156,4 @@ public class ObservableKeyedRecyclerViewAdapter<K, E extends Keyed<? extends K>>
         }
     }
 
-    public interface RowConfigurationHandler<B extends ViewDataBinding, T> {
-        void onConfigureRow(B binding, T item, int position);
-    }
-
 }

app/src/main/java/com/wireguard/android/fragment/AppListDialogFragment.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -13,74 +12,42 @@ import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v4.app.Fragment;
-import android.support.v7.app.AlertDialog;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.fragment.app.Fragment;
+import androidx.appcompat.app.AlertDialog;
 import android.widget.Toast;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.databinding.AppListDialogFragmentBinding;
 import com.wireguard.android.model.ApplicationData;
-import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.ErrorMessages;
 import com.wireguard.android.util.ObservableKeyedArrayList;
 import com.wireguard.android.util.ObservableKeyedList;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
+import java9.util.Comparators;
+
 public class AppListDialogFragment extends DialogFragment {
 
     private static final String KEY_EXCLUDED_APPS = "excludedApps";
-
-    private List<String> currentlyExcludedApps;
     private final ObservableKeyedList<String, ApplicationData> appData = new ObservableKeyedArrayList<>();
+    @Nullable private List<String> currentlyExcludedApps;
 
-    public static <T extends Fragment & AppExclusionListener> AppListDialogFragment newInstance(final String[] excludedApps, final T target) {
+    public static <T extends Fragment & AppExclusionListener>
+    AppListDialogFragment newInstance(final ArrayList<String> excludedApps, final T target) {
         final Bundle extras = new Bundle();
-        extras.putStringArray(KEY_EXCLUDED_APPS, excludedApps);
+        extras.putStringArrayList(KEY_EXCLUDED_APPS, excludedApps);
         final AppListDialogFragment fragment = new AppListDialogFragment();
         fragment.setTargetFragment(target, 0);
         fragment.setArguments(extras);
         return fragment;
     }
 
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        currentlyExcludedApps = Arrays.asList(getArguments().getStringArray(KEY_EXCLUDED_APPS));
-    }
-
-    @Override
-    public Dialog onCreateDialog(final Bundle savedInstanceState) {
-        final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
-        alertDialogBuilder.setTitle(R.string.excluded_applications);
-
-        final AppListDialogFragmentBinding binding = AppListDialogFragmentBinding.inflate(getActivity().getLayoutInflater(), null, false);
-        binding.executePendingBindings();
-        alertDialogBuilder.setView(binding.getRoot());
-
-        alertDialogBuilder.setPositiveButton(R.string.set_exclusions, (dialog, which) -> setExclusionsAndDismiss());
-        alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
-        alertDialogBuilder.setNeutralButton(R.string.deselect_all, (dialog, which) -> { });
-
-        binding.setFragment(this);
-        binding.setAppData(appData);
-
-        loadData();
-
-        final AlertDialog dialog = alertDialogBuilder.create();
-        dialog.setOnShowListener(d -> dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(view -> {
-                for (final ApplicationData app : appData)
-                    app.setExcludedFromTunnel(false);
-        }));
-        return dialog;
-    }
-
     private void loadData() {
         final Activity activity = getActivity();
         if (activity == null) {
@@ -99,14 +66,14 @@ public class AppListDialogFragment extends DialogFragment {
                 appData.add(new ApplicationData(resolveInfo.loadIcon(pm), resolveInfo.loadLabel(pm).toString(), packageName, currentlyExcludedApps.contains(packageName)));
             }
 
-            Collections.sort(appData, (lhs, rhs) -> lhs.getName().toLowerCase().compareTo(rhs.getName().toLowerCase()));
+            Collections.sort(appData, Comparators.comparing(ApplicationData::getName, String.CASE_INSENSITIVE_ORDER));
             return appData;
         }).whenComplete(((data, throwable) -> {
             if (data != null) {
                 appData.clear();
                 appData.addAll(data);
             } else {
-                final String error = throwable != null ? ExceptionLoggers.unwrapMessage(throwable) : "Unknown";
+                final String error = ErrorMessages.get(throwable);
                 final String message = activity.getString(R.string.error_fetching_apps, error);
                 Toast.makeText(activity, message, Toast.LENGTH_LONG).show();
                 dismissAllowingStateLoss();
@@ -114,6 +81,39 @@ public class AppListDialogFragment extends DialogFragment {
         }));
     }
 
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        currentlyExcludedApps = getArguments().getStringArrayList(KEY_EXCLUDED_APPS);
+    }
+
+    @Override
+    public Dialog onCreateDialog(@Nullable final Bundle savedInstanceState) {
+        final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
+        alertDialogBuilder.setTitle(R.string.excluded_applications);
+
+        final AppListDialogFragmentBinding binding = AppListDialogFragmentBinding.inflate(getActivity().getLayoutInflater(), null, false);
+        binding.executePendingBindings();
+        alertDialogBuilder.setView(binding.getRoot());
+
+        alertDialogBuilder.setPositiveButton(R.string.set_exclusions, (dialog, which) -> setExclusionsAndDismiss());
+        alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dialog.dismiss());
+        alertDialogBuilder.setNeutralButton(R.string.deselect_all, (dialog, which) -> {
+        });
+
+        binding.setFragment(this);
+        binding.setAppData(appData);
+
+        loadData();
+
+        final AlertDialog dialog = alertDialogBuilder.create();
+        dialog.setOnShowListener(d -> dialog.getButton(DialogInterface.BUTTON_NEUTRAL).setOnClickListener(view -> {
+            for (final ApplicationData app : appData)
+                app.setExcludedFromTunnel(false);
+        }));
+        return dialog;
+    }
+
     void setExclusionsAndDismiss() {
         final List<String> excludedApps = new ArrayList<>();
         for (final ApplicationData data : appData) {

app/src/main/java/com/wireguard/android/fragment/BaseFragment.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,11 +7,11 @@ package com.wireguard.android.fragment;
 
 import android.content.Context;
 import android.content.Intent;
-import android.databinding.DataBindingUtil;
-import android.databinding.ViewDataBinding;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.Fragment;
+import androidx.databinding.DataBindingUtil;
+import androidx.databinding.ViewDataBinding;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.Fragment;
 import android.util.Log;
 import android.view.View;
 import android.widget.Toast;
@@ -26,7 +25,7 @@ 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;
+import com.wireguard.android.util.ErrorMessages;
 
 /**
  * Base class for fragments that need to know the currently-selected tunnel. Only does anything when
@@ -34,9 +33,8 @@ import com.wireguard.android.util.ExceptionLoggers;
  */
 
 public abstract class BaseFragment extends Fragment implements OnSelectedTunnelChangedListener {
-    private static final String TAG = "WireGuard/" + BaseFragment.class.getSimpleName();
     private static final int REQUEST_CODE_VPN_PERMISSION = 23491;
-
+    private static final String TAG = "WireGuard/" + BaseFragment.class.getSimpleName();
     @Nullable private BaseActivity activity;
     @Nullable private Tunnel pendingTunnel;
     @Nullable private Boolean pendingTunnelUp;
@@ -46,6 +44,18 @@ public abstract class BaseFragment extends Fragment implements OnSelectedTunnelC
         return activity != null ? activity.getSelectedTunnel() : null;
     }
 
+    @Override
+    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        if (requestCode == REQUEST_CODE_VPN_PERMISSION) {
+            if (pendingTunnel != null && pendingTunnelUp != null)
+                setTunnelStateWithPermissionsResult(pendingTunnel, pendingTunnelUp);
+            pendingTunnel = null;
+            pendingTunnelUp = null;
+        }
+    }
+
     @Override
     public void onAttach(final Context context) {
         super.onAttach(context);
@@ -65,18 +75,6 @@ public abstract class BaseFragment extends Fragment implements OnSelectedTunnelC
         super.onDetach();
     }
 
-    @Override
-    public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
-        super.onActivityResult(requestCode, resultCode, data);
-
-        if (requestCode == REQUEST_CODE_VPN_PERMISSION) {
-            if (pendingTunnel != null && pendingTunnelUp != null)
-                setTunnelStateWithPermissionsResult(pendingTunnel, pendingTunnelUp);
-            pendingTunnel = null;
-            pendingTunnelUp = null;
-        }
-    }
-
     protected void setSelectedTunnel(@Nullable final Tunnel tunnel) {
         if (activity != null)
             activity.setSelectedTunnel(tunnel);
@@ -94,7 +92,7 @@ public abstract class BaseFragment extends Fragment implements OnSelectedTunnelC
         if (tunnel == null)
             return;
 
-        Application.onHaveBackend(backend -> {
+        Application.getBackendAsync().thenAccept(backend -> {
             if (backend instanceof GoBackend) {
                 final Intent intent = GoBackend.VpnService.prepare(view.getContext());
                 if (intent != null) {
@@ -113,7 +111,7 @@ public abstract class BaseFragment extends Fragment implements OnSelectedTunnelC
         tunnel.setState(State.of(checked)).whenComplete((state, throwable) -> {
             if (throwable == null)
                 return;
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String error = ErrorMessages.get(throwable);
             final int messageResId = checked ? R.string.error_up : R.string.error_down;
             final String message = getContext().getString(messageResId, error);
             final View view = getView();

app/src/main/java/com/wireguard/android/fragment/ConfigNamingDialogFragment.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -11,26 +10,27 @@ import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.v4.app.DialogFragment;
-import android.support.v7.app.AlertDialog;
-import android.view.WindowManager;
+import androidx.annotation.Nullable;
+import androidx.fragment.app.DialogFragment;
+import androidx.appcompat.app.AlertDialog;
 import android.view.inputmethod.InputMethodManager;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.databinding.ConfigNamingDialogFragmentBinding;
+import com.wireguard.config.BadConfigException;
 import com.wireguard.config.Config;
 
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
+import java.nio.charset.StandardCharsets;
 import java.util.Objects;
 
 public class ConfigNamingDialogFragment extends DialogFragment {
-
     private static final String KEY_CONFIG_TEXT = "config_text";
 
-    @Nullable private Config config;
     @Nullable private ConfigNamingDialogFragmentBinding binding;
+    @Nullable private Config config;
     @Nullable private InputMethodManager imm;
 
     public static ConfigNamingDialogFragment newInstance(final String configText) {
@@ -41,53 +41,6 @@ public class ConfigNamingDialogFragment extends DialogFragment {
         return fragment;
     }
 
-    @Override
-    public void onCreate(@Nullable final Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-
-        try {
-            config = Config.from(getArguments().getString(KEY_CONFIG_TEXT));
-        } catch (final IOException exception) {
-            throw new RuntimeException("Invalid config passed to " + getClass().getSimpleName(), exception);
-        }
-    }
-
-    @Override public void onResume() {
-        super.onResume();
-
-        final AlertDialog dialog = (AlertDialog) getDialog();
-        if (dialog != null) {
-            dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(v -> createTunnelAndDismiss());
-
-            setKeyboardVisible(true);
-        }
-    }
-
-    @Override
-    public Dialog onCreateDialog(final Bundle savedInstanceState) {
-        final Activity activity = getActivity();
-
-        imm = (InputMethodManager) getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
-
-        final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(activity);
-        alertDialogBuilder.setTitle(R.string.import_from_qrcode);
-
-        binding = ConfigNamingDialogFragmentBinding.inflate(getActivity().getLayoutInflater(), null, false);
-        binding.executePendingBindings();
-        alertDialogBuilder.setView(binding.getRoot());
-
-        alertDialogBuilder.setPositiveButton(R.string.create_tunnel, null);
-        alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dismiss());
-
-        return alertDialogBuilder.create();
-    }
-
-    @Override
-    public void dismiss() {
-        setKeyboardVisible(false);
-        super.dismiss();
-    }
-
     private void createTunnelAndDismiss() {
         if (binding != null) {
             final String name = binding.tunnelNameText.getText().toString();
@@ -102,6 +55,56 @@ public class ConfigNamingDialogFragment extends DialogFragment {
         }
     }
 
+    @Override
+    public void dismiss() {
+        setKeyboardVisible(false);
+        super.dismiss();
+    }
+
+    @Override
+    public void onCreate(@Nullable final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        final Bundle arguments = getArguments();
+        final String configText = arguments.getString(KEY_CONFIG_TEXT);
+        final byte[] configBytes = configText.getBytes(StandardCharsets.UTF_8);
+        try {
+            config = Config.parse(new ByteArrayInputStream(configBytes));
+        } catch (final BadConfigException | IOException e) {
+            throw new IllegalArgumentException("Invalid config passed to " + getClass().getSimpleName(), e);
+        }
+    }
+
+    @Override
+    public Dialog onCreateDialog(final Bundle savedInstanceState) {
+        final Activity activity = Objects.requireNonNull(getActivity());
+
+        imm = (InputMethodManager) activity.getSystemService(Context.INPUT_METHOD_SERVICE);
+
+        final AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(activity);
+        alertDialogBuilder.setTitle(R.string.import_from_qr_code);
+
+        binding = ConfigNamingDialogFragmentBinding.inflate(activity.getLayoutInflater(), null, false);
+        binding.executePendingBindings();
+        alertDialogBuilder.setView(binding.getRoot());
+
+        alertDialogBuilder.setPositiveButton(R.string.create_tunnel, null);
+        alertDialogBuilder.setNegativeButton(R.string.cancel, (dialog, which) -> dismiss());
+
+        return alertDialogBuilder.create();
+    }
+
+    @Override public void onResume() {
+        super.onResume();
+
+        final AlertDialog dialog = (AlertDialog) getDialog();
+        if (dialog != null) {
+            dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(v -> createTunnelAndDismiss());
+
+            setKeyboardVisible(true);
+        }
+    }
+
     private void setKeyboardVisible(final boolean visible) {
         Objects.requireNonNull(imm);
 

app/src/main/java/com/wireguard/android/fragment/TunnelDetailFragment.java

@@ -1,13 +1,12 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.fragment;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuInflater;
@@ -17,7 +16,6 @@ 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.
@@ -26,12 +24,6 @@ import com.wireguard.config.Config;
 public class TunnelDetailFragment extends BaseFragment {
     @Nullable private TunnelDetailFragmentBinding binding;
 
-    private void onConfigLoaded(final String name, final Config config) {
-        if (binding != null) {
-            binding.setConfig(new Config.Observable(config, name));
-        }
-    }
-
     @Override
     public void onCreate(@Nullable final Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -66,7 +58,7 @@ public class TunnelDetailFragment extends BaseFragment {
         if (newTunnel == null)
             binding.setConfig(null);
         else
-            newTunnel.getConfigAsync().thenAccept(a -> onConfigLoaded(newTunnel.getName(), a));
+            newTunnel.getConfigAsync().thenAccept(binding::setConfig);
     }
 
     @Override

app/src/main/java/com/wireguard/android/fragment/TunnelEditorFragment.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,12 +7,11 @@ package com.wireguard.android.fragment;
 
 import android.app.Activity;
 import android.content.Context;
-import android.databinding.Observable;
-import android.databinding.ObservableList;
+import androidx.databinding.ObservableList;
 import android.os.Bundle;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentManager;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.FragmentManager;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -25,19 +23,16 @@ import android.view.inputmethod.InputMethodManager;
 import android.widget.Toast;
 
 import com.wireguard.android.Application;
-import com.wireguard.android.BR;
 import com.wireguard.android.R;
 import com.wireguard.android.databinding.TunnelEditorFragmentBinding;
 import com.wireguard.android.fragment.AppListDialogFragment.AppExclusionListener;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.ExceptionLoggers;
-import com.wireguard.config.Attribute;
+import com.wireguard.android.util.ErrorMessages;
+import com.wireguard.android.viewmodel.ConfigProxy;
 import com.wireguard.config.Config;
-import com.wireguard.config.Peer;
 
 import java.util.ArrayList;
-import java.util.Collection;
 import java.util.List;
 import java.util.Objects;
 
@@ -53,9 +48,9 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
     @Nullable private TunnelEditorFragmentBinding binding;
     @Nullable private Tunnel tunnel;
 
-    private void onConfigLoaded(final String name, final Config config) {
+    private void onConfigLoaded(final Config config) {
         if (binding != null) {
-            binding.setConfig(new Config.Observable(config, name));
+            binding.setConfig(new ConfigProxy(config));
         }
     }
 
@@ -68,7 +63,7 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
             Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
             onFinished();
         } else {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String error = ErrorMessages.get(throwable);
             message = getString(R.string.config_save_error, savedTunnel.getName(), error);
             Log.e(TAG, message, throwable);
             if (binding != null) {
@@ -88,78 +83,30 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
         inflater.inflate(R.menu.config_editor, menu);
     }
 
-    private final ObservableList.OnListChangedCallback<? extends ObservableList<Peer.Observable>> breakObjectListOrientedLayeringHandler = new ObservableList.OnListChangedCallback<ObservableList<Peer.Observable>>() {
-        @Override
-        public void onChanged(final ObservableList<Peer.Observable> sender) { }
-        @Override
-        public void onItemRangeChanged(final ObservableList<Peer.Observable> sender, final int positionStart, final int itemCount) { }
-        @Override
-        public void onItemRangeMoved(final ObservableList<Peer.Observable> sender, final int fromPosition, final int toPosition, final int itemCount) { }
-
-        @Override
-        public void onItemRangeInserted(final ObservableList<Peer.Observable> sender, final int positionStart, final int itemCount) {
-            if (binding != null)
-                breakObjectOrientedLayeringHandler.onPropertyChanged(binding.getConfig(), BR.peers);
-        }
-        @Override
-        public void onItemRangeRemoved(final ObservableList<Peer.Observable> sender, final int positionStart, final int itemCount) {
-            if (binding != null)
-                breakObjectOrientedLayeringHandler.onPropertyChanged(binding.getConfig(), BR.peers);
-        }
-    };
-
-    private final Collection<Object> breakObjectOrientedLayeringHandlerReceivers = new ArrayList<>();
-    private final Observable.OnPropertyChangedCallback breakObjectOrientedLayeringHandler = new Observable.OnPropertyChangedCallback() {
-        @Override
-        public void onPropertyChanged(final Observable sender, final int propertyId) {
-            if (binding == null)
-                return;
-            final Config.Observable config = binding.getConfig();
-            if (config == null)
-                return;
-            if (propertyId == BR.config) {
-                config.addOnPropertyChangedCallback(breakObjectOrientedLayeringHandler);
-                breakObjectOrientedLayeringHandlerReceivers.add(config);
-                config.getInterfaceSection().addOnPropertyChangedCallback(breakObjectOrientedLayeringHandler);
-                breakObjectOrientedLayeringHandlerReceivers.add(config.getInterfaceSection());
-                config.getPeers().addOnListChangedCallback(breakObjectListOrientedLayeringHandler);
-                breakObjectOrientedLayeringHandlerReceivers.add(config.getPeers());
-            } else if (propertyId == BR.dnses || propertyId == BR.peers)
-                ;
-            else
-                return;
-            final int numSiblings = config.getPeers().size() - 1;
-            for (final Peer.Observable peer : config.getPeers()) {
-                peer.setInterfaceDNSRoutes(config.getInterfaceSection().getDnses());
-                peer.setNumSiblings(numSiblings);
-            }
-        }
-    };
-
     @Override
     public View onCreateView(final LayoutInflater inflater, @Nullable final ViewGroup container,
                              @Nullable final Bundle savedInstanceState) {
         super.onCreateView(inflater, container, savedInstanceState);
         binding = TunnelEditorFragmentBinding.inflate(inflater, container, false);
-        binding.addOnPropertyChangedCallback(breakObjectOrientedLayeringHandler);
-        breakObjectOrientedLayeringHandlerReceivers.add(binding);
         binding.executePendingBindings();
         return binding.getRoot();
     }
 
-    @SuppressWarnings("unchecked")
     @Override
     public void onDestroyView() {
         binding = null;
-        for (final Object o : breakObjectOrientedLayeringHandlerReceivers) {
-            if (o instanceof Observable)
-                ((Observable)o).removeOnPropertyChangedCallback(breakObjectOrientedLayeringHandler);
-            else if (o instanceof ObservableList)
-                ((ObservableList)o).removeOnListChangedCallback(breakObjectListOrientedLayeringHandler);
-        }
         super.onDestroyView();
     }
 
+    @Override
+    public void onExcludedAppsSelected(final List<String> excludedApps) {
+        Objects.requireNonNull(binding, "Tried to set excluded apps while no view was loaded");
+        final ObservableList<String> excludedApplications =
+                binding.getConfig().getInterface().getExcludedApplications();
+        excludedApplications.clear();
+        excludedApplications.addAll(excludedApps);
+    }
+
     private void onFinished() {
         // Hide the keyboard; it rarely goes away on its own.
         final Activity activity = getActivity();
@@ -174,6 +121,7 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
         }
         // Tell the activity to finish itself or go back to the detail view.
         getActivity().runOnUiThread(() -> {
+            // TODO(smaeul): Remove this hack when fixing the Config ViewModel
             // The selected tunnel has to actually change, but we have to remember this one.
             final Tunnel savedTunnel = tunnel;
             if (savedTunnel == getSelectedTunnel())
@@ -186,25 +134,27 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
     public boolean onOptionsItemSelected(final MenuItem item) {
         switch (item.getItemId()) {
             case R.id.menu_action_save:
-                final Config newConfig = new Config();
+                if (binding == null)
+                    return false;
+                final Config newConfig;
                 try {
-                    binding.getConfig().commitData(newConfig);
+                    newConfig = binding.getConfig().resolve();
                 } catch (final Exception e) {
-                    final String error = ExceptionLoggers.unwrapMessage(e);
-                    final String tunnelName = tunnel == null ? binding.getConfig().getName() : tunnel.getName();
+                    final String error = ErrorMessages.get(e);
+                    final String tunnelName = tunnel == null ? binding.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());
+                    Log.d(TAG, "Attempting to create new tunnel " + binding.getName());
                     final TunnelManager manager = Application.getTunnelManager();
-                    manager.create(binding.getConfig().getName(), newConfig)
+                    manager.create(binding.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())
+                } else if (!tunnel.getName().equals(binding.getName())) {
+                    Log.d(TAG, "Attempting to rename tunnel to " + binding.getName());
+                    tunnel.setName(binding.getName())
                             .whenComplete((a, b) -> onTunnelRenamed(tunnel, newConfig, b));
                 } else {
                     Log.d(TAG, "Attempting to save config of " + tunnel.getName());
@@ -217,21 +167,36 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
         }
     }
 
+    public void onRequestSetExcludedApplications(@SuppressWarnings("unused") final View view) {
+        final FragmentManager fragmentManager = getFragmentManager();
+        if (fragmentManager != null && binding != null) {
+            final ArrayList<String> excludedApps = new ArrayList<>(binding.getConfig().getInterface().getExcludedApplications());
+            final AppListDialogFragment fragment = AppListDialogFragment.newInstance(excludedApps, this);
+            fragment.show(fragmentManager, null);
+        }
+    }
+
     @Override
     public void onSaveInstanceState(final Bundle outState) {
-        outState.putParcelable(KEY_LOCAL_CONFIG, binding.getConfig());
+        if (binding != null)
+            outState.putParcelable(KEY_LOCAL_CONFIG, binding.getConfig());
         outState.putString(KEY_ORIGINAL_NAME, tunnel == null ? null : tunnel.getName());
         super.onSaveInstanceState(outState);
     }
 
     @Override
-    public void onSelectedTunnelChanged(@Nullable final Tunnel oldTunnel, @Nullable final Tunnel newTunnel) {
+    public void onSelectedTunnelChanged(@Nullable final Tunnel oldTunnel,
+                                        @Nullable 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));
+        binding.setConfig(new ConfigProxy());
+        if (tunnel != null) {
+            binding.setName(tunnel.getName());
+            tunnel.getConfigAsync().thenAccept(this::onConfigLoaded);
+        } else {
+            binding.setName("");
+        }
     }
 
     private void onTunnelCreated(final Tunnel newTunnel, @Nullable final Throwable throwable) {
@@ -243,7 +208,7 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
             Toast.makeText(getContext(), message, Toast.LENGTH_SHORT).show();
             onFinished();
         } else {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String error = ErrorMessages.get(throwable);
             message = getString(R.string.tunnel_create_error, error);
             Log.e(TAG, message, throwable);
             if (binding != null) {
@@ -262,7 +227,7 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
             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);
+            final String error = ErrorMessages.get(throwable);
             message = getString(R.string.tunnel_rename_error, error);
             Log.e(TAG, message, throwable);
             if (binding != null) {
@@ -283,7 +248,7 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
             onSelectedTunnelChanged(null, getSelectedTunnel());
         } else {
             tunnel = getSelectedTunnel();
-            final Config.Observable config = savedInstanceState.getParcelable(KEY_LOCAL_CONFIG);
+            final ConfigProxy config = savedInstanceState.getParcelable(KEY_LOCAL_CONFIG);
             final String originalName = savedInstanceState.getString(KEY_ORIGINAL_NAME);
             if (tunnel != null && !tunnel.getName().equals(originalName))
                 onSelectedTunnelChanged(null, tunnel);
@@ -294,19 +259,4 @@ public class TunnelEditorFragment extends BaseFragment implements AppExclusionLi
         super.onViewStateRestored(savedInstanceState);
     }
 
-    public void onRequestSetExcludedApplications(@SuppressWarnings("unused") final View view) {
-        final FragmentManager fragmentManager = getFragmentManager();
-        if (fragmentManager != null && binding != null) {
-            final String[] excludedApps = Attribute.stringToList(binding.getConfig().getInterfaceSection().getExcludedApplications());
-            final AppListDialogFragment fragment = AppListDialogFragment.newInstance(excludedApps, this);
-            fragment.show(fragmentManager, null);
-        }
-    }
-
-    @Override
-    public void onExcludedAppsSelected(final List<String> excludedApps) {
-        Objects.requireNonNull(binding, "Tried to set excluded apps while no view was loaded");
-        binding.getConfig().getInterfaceSection().setExcludedApplications(Attribute.iterableToString(excludedApps));
-    }
-
 }

app/src/main/java/com/wireguard/android/fragment/TunnelListFragment.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -15,12 +14,13 @@ import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.OpenableColumns;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v4.app.FragmentManager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.view.ActionMode;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.fragment.app.FragmentManager;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.view.ActionMode;
+import androidx.recyclerview.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -37,11 +37,14 @@ import com.wireguard.android.databinding.ObservableKeyedRecyclerViewAdapter;
 import com.wireguard.android.databinding.TunnelListFragmentBinding;
 import com.wireguard.android.databinding.TunnelListItemBinding;
 import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.ErrorMessages;
+import com.wireguard.android.widget.MultiselectableRelativeLayout;
 import com.wireguard.android.widget.fab.FloatingActionsMenuRecyclerViewScrollListener;
+import com.wireguard.config.BadConfigException;
 import com.wireguard.config.Config;
 
 import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
@@ -50,6 +53,7 @@ import java.util.Collection;
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Locale;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipInputStream;
 
@@ -79,14 +83,14 @@ public class TunnelListFragment extends BaseFragment {
     private void importTunnel(@NonNull final String configText) {
         try {
             // Ensure the config text is parseable before proceeding…
-            Config.from(configText);
+            Config.parse(new ByteArrayInputStream(configText.getBytes(StandardCharsets.UTF_8)));
 
             // Config text is valid, now create the tunnel…
             final FragmentManager fragmentManager = getFragmentManager();
             if (fragmentManager != null)
                 ConfigNamingDialogFragment.newInstance(configText).show(fragmentManager, null);
-        } catch (final IllegalArgumentException|IOException exception) {
-            onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(exception));
+        } catch (final BadConfigException | IOException e) {
+            onTunnelImportFinished(Collections.emptyList(), Collections.singletonList(e));
         }
     }
 
@@ -111,18 +115,18 @@ public class TunnelListFragment extends BaseFragment {
             int idx = name.lastIndexOf('/');
             if (idx >= 0) {
                 if (idx >= name.length() - 1)
-                    throw new IllegalArgumentException("Illegal file name: " + name);
+                    throw new IllegalArgumentException(getResources().getString(R.string.illegal_filename_error, name));
                 name = name.substring(idx + 1);
             }
-            boolean isZip = name.toLowerCase().endsWith(".zip");
-            if (name.toLowerCase().endsWith(".conf"))
+            boolean isZip = name.toLowerCase(Locale.ENGLISH).endsWith(".zip");
+            if (name.toLowerCase(Locale.ENGLISH).endsWith(".conf"))
                 name = name.substring(0, name.length() - ".conf".length());
             else if (!isZip)
-                throw new IllegalArgumentException("File must be .conf or .zip");
+                throw new IllegalArgumentException(getResources().getString(R.string.bad_extension_error));
 
             if (isZip) {
-                try (ZipInputStream zip = new ZipInputStream(contentResolver.openInputStream(uri))) {
-                    BufferedReader reader = new BufferedReader(new InputStreamReader(zip, StandardCharsets.UTF_8));
+                try (ZipInputStream zip = new ZipInputStream(contentResolver.openInputStream(uri));
+                     BufferedReader reader = new BufferedReader(new InputStreamReader(zip))) {
                     ZipEntry entry;
                     while ((entry = zip.getNextEntry()) != null) {
                         if (entry.isDirectory())
@@ -134,13 +138,13 @@ public class TunnelListFragment extends BaseFragment {
                                 continue;
                             name = name.substring(name.lastIndexOf('/') + 1);
                         }
-                        if (name.toLowerCase().endsWith(".conf"))
+                        if (name.toLowerCase(Locale.ENGLISH).endsWith(".conf"))
                             name = name.substring(0, name.length() - ".conf".length());
                         else
                             continue;
                         Config config = null;
                         try {
-                            config = Config.from(reader);
+                            config = Config.parse(reader);
                         } catch (Exception e) {
                             throwables.add(e);
                         }
@@ -150,14 +154,14 @@ public class TunnelListFragment extends BaseFragment {
                 }
             } else {
                 futureTunnels.add(Application.getTunnelManager().create(name,
-                        Config.from(contentResolver.openInputStream(uri))).toCompletableFuture());
+                        Config.parse(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");
+                    throw new IllegalArgumentException(getResources().getString(R.string.no_configs_error));
             }
 
             return CompletableFuture.allOf(futureTunnels.toArray(new CompletableFuture[futureTunnels.size()]));
@@ -183,6 +187,19 @@ public class TunnelListFragment extends BaseFragment {
         });
     }
 
+    @Override
+    public void onActivityCreated(@Nullable final Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        if (savedInstanceState != null) {
+            final Collection<Integer> checkedItems = savedInstanceState.getIntegerArrayList("CHECKED_ITEMS");
+            if (checkedItems != null) {
+                for (final Integer i : checkedItems)
+                    actionModeListener.setItemChecked(i, true);
+            }
+        }
+    }
+
     @Override
     public void onActivityResult(final int requestCode, final int resultCode, @Nullable final Intent data) {
         switch (requestCode) {
@@ -226,6 +243,14 @@ public class TunnelListFragment extends BaseFragment {
         super.onDestroyView();
     }
 
+    @Override
+    public void onPause() {
+        if (binding != null) {
+            binding.createMenu.collapse();
+        }
+        super.onPause();
+    }
+
     public void onRequestCreateConfig(@SuppressWarnings("unused") final View view) {
         startActivity(new Intent(getActivity(), TunnelCreatorActivity.class));
         if (binding != null)
@@ -245,7 +270,7 @@ public class TunnelListFragment extends BaseFragment {
         final IntentIntegrator intentIntegrator = IntentIntegrator.forSupportFragment(this);
         intentIntegrator.setOrientationLocked(false);
         intentIntegrator.setBeepEnabled(false);
-        intentIntegrator.setPrompt(getString(R.string.qrcode_hint));
+        intentIntegrator.setPrompt(getString(R.string.qr_code_hint));
         intentIntegrator.initiateScan(Collections.singletonList(IntentIntegrator.QR_CODE));
 
         if (binding != null)
@@ -253,16 +278,22 @@ public class TunnelListFragment extends BaseFragment {
     }
 
     @Override
-    public void onPause() {
-        if (binding != null) {
-            binding.createMenu.collapse();
-        }
-        super.onPause();
+    public void onSaveInstanceState(final Bundle outState) {
+        super.onSaveInstanceState(outState);
+
+        outState.putIntegerArrayList("CHECKED_ITEMS", actionModeListener.getCheckedItems());
     }
 
     @Override
     public void onSelectedTunnelChanged(@Nullable final Tunnel oldTunnel, @Nullable final Tunnel newTunnel) {
-        // Do nothing.
+        if (binding == null)
+            return;
+        Application.getTunnelManager().getTunnels().thenAccept(tunnels -> {
+            if (newTunnel != null)
+                viewForTunnel(newTunnel, tunnels).setSingleSelected(true);
+            if (oldTunnel != null)
+                viewForTunnel(oldTunnel, tunnels).setSingleSelected(false);
+        });
     }
 
     private void onTunnelDeletionFinished(final Integer count, @Nullable final Throwable throwable) {
@@ -270,7 +301,7 @@ public class TunnelListFragment extends BaseFragment {
         if (throwable == null) {
             message = getResources().getQuantityString(R.plurals.delete_success, count, count);
         } else {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String error = ErrorMessages.get(throwable);
             message = getResources().getQuantityString(R.plurals.delete_error, count, count, error);
             Log.e(TAG, message, throwable);
         }
@@ -283,7 +314,7 @@ public class TunnelListFragment extends BaseFragment {
         String message = null;
 
         for (final Throwable throwable : throwables) {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String error = ErrorMessages.get(throwable);
             message = getString(R.string.import_error, error);
             Log.e(TAG, message, throwable);
         }
@@ -313,7 +344,7 @@ public class TunnelListFragment extends BaseFragment {
         }
 
         binding.setFragment(this);
-        binding.setTunnels(Application.getTunnelManager().getTunnels());
+        Application.getTunnelManager().getTunnels().thenAccept(binding::setTunnels);
         binding.setRowConfigurationHandler((ObservableKeyedRecyclerViewAdapter.RowConfigurationHandler<TunnelListItemBinding, Tunnel>) (binding, tunnel, position) -> {
             binding.setFragment(this);
             binding.getRoot().setOnClickListener(clicked -> {
@@ -328,38 +359,53 @@ public class TunnelListFragment extends BaseFragment {
                 return true;
             });
 
-            binding.getRoot().setActivated(actionModeListener.checkedItems.contains(position));
+            if (actionMode != null)
+                ((MultiselectableRelativeLayout) binding.getRoot()).setMultiSelected(actionModeListener.checkedItems.contains(position));
+            else
+                ((MultiselectableRelativeLayout) binding.getRoot()).setSingleSelected(getSelectedTunnel() == tunnel);
         });
     }
 
+    private MultiselectableRelativeLayout viewForTunnel(final Tunnel tunnel, final List tunnels) {
+        return (MultiselectableRelativeLayout) binding.tunnelList.findViewHolderForAdapterPosition(tunnels.indexOf(tunnel)).itemView;
+    }
+
     private final class ActionModeListener implements ActionMode.Callback {
         private final Collection<Integer> checkedItems = new HashSet<>();
 
         @Nullable private Resources resources;
 
+        public ArrayList<Integer> getCheckedItems() {
+            return new ArrayList<>(checkedItems);
+        }
+
         @Override
         public boolean onActionItemClicked(final ActionMode mode, final MenuItem item) {
             switch (item.getItemId()) {
                 case R.id.menu_action_delete:
-                    final Collection<Tunnel> tunnelsToDelete = new ArrayList<>();
-                    for (final Integer position : checkedItems) {
-                        tunnelsToDelete.add(Application.getTunnelManager().getTunnels().get(position));
-                    }
+                    final Iterable<Integer> copyCheckedItems = new HashSet<>(checkedItems);
+                    Application.getTunnelManager().getTunnels().thenAccept(tunnels -> {
+                        final Collection<Tunnel> tunnelsToDelete = new ArrayList<>();
+                        for (final Integer position : copyCheckedItems)
+                            tunnelsToDelete.add(tunnels.get(position));
 
-                    final CompletableFuture[] futures = StreamSupport.stream(tunnelsToDelete)
-                            .map(Tunnel::delete)
-                            .toArray(CompletableFuture[]::new);
-                    CompletableFuture.allOf(futures)
-                            .thenApply(x -> futures.length)
-                            .whenComplete(TunnelListFragment.this::onTunnelDeletionFinished);
+                        final CompletableFuture[] futures = StreamSupport.stream(tunnelsToDelete)
+                                .map(Tunnel::delete)
+                                .toArray(CompletableFuture[]::new);
+                        CompletableFuture.allOf(futures)
+                                .thenApply(x -> futures.length)
+                                .whenComplete(TunnelListFragment.this::onTunnelDeletionFinished);
 
+                    });
                     checkedItems.clear();
                     mode.finish();
                     return true;
                 case R.id.menu_action_select_all:
-                    for (int i = 0; i < Application.getTunnelManager().getTunnels().size(); ++i) {
-                        setItemChecked(i, true);
-                    }
+                    Application.getTunnelManager().getTunnels().thenAccept(tunnels -> {
+                        for (int i = 0; i < tunnels.size(); ++i) {
+                            setItemChecked(i, true);
+                        }
+                    });
                     return true;
                 default:
                     return false;
@@ -373,6 +419,7 @@ public class TunnelListFragment extends BaseFragment {
                 resources = getActivity().getResources();
             }
             mode.getMenuInflater().inflate(R.menu.tunnel_list_action_mode, menu);
+            binding.tunnelList.getAdapter().notifyDataSetChanged();
             return true;
         }
 
@@ -380,13 +427,14 @@ public class TunnelListFragment extends BaseFragment {
         public void onDestroyActionMode(final ActionMode mode) {
             actionMode = null;
             resources = null;
-
             checkedItems.clear();
             binding.tunnelList.getAdapter().notifyDataSetChanged();
         }
 
-        void toggleItemChecked(final int position) {
-            setItemChecked(position, !checkedItems.contains(position));
+        @Override
+        public boolean onPrepareActionMode(final ActionMode mode, final Menu menu) {
+            updateTitle(mode);
+            return false;
         }
 
         void setItemChecked(final int position, final boolean checked) {
@@ -396,23 +444,22 @@ public class TunnelListFragment extends BaseFragment {
                 checkedItems.remove(position);
             }
 
+            final RecyclerView.Adapter adapter = binding == null ? null : binding.tunnelList.getAdapter();
+
             if (actionMode == null && !checkedItems.isEmpty() && getActivity() != null) {
                 ((AppCompatActivity) getActivity()).startSupportActionMode(this);
             } else if (actionMode != null && checkedItems.isEmpty()) {
                 actionMode.finish();
             }
 
-            if (binding != null) {
-                binding.tunnelList.getAdapter().notifyItemChanged(position);
-            }
+            if (adapter != null)
+                adapter.notifyItemChanged(position);
 
             updateTitle(actionMode);
         }
 
-        @Override
-        public boolean onPrepareActionMode(final ActionMode mode, final Menu menu) {
-            updateTitle(mode);
-            return false;
+        void toggleItemChecked(final int position) {
+            setItemChecked(position, !checkedItems.contains(position));
         }
 
         private void updateTitle(@Nullable final ActionMode mode) {

app/src/main/java/com/wireguard/android/model/ApplicationData.java

@@ -1,20 +1,18 @@
 /*
- * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.model;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
 import android.graphics.drawable.Drawable;
 
 import com.wireguard.android.BR;
 import com.wireguard.util.Keyed;
 
 public class ApplicationData extends BaseObservable implements Keyed<String> {
-
     private final Drawable icon;
     private final String name;
     private final String packageName;
@@ -31,6 +29,11 @@ public class ApplicationData extends BaseObservable implements Keyed<String> {
         return icon;
     }
 
+    @Override
+    public String getKey() {
+        return name;
+    }
+
     public String getName() {
         return name;
     }
@@ -48,9 +51,4 @@ public class ApplicationData extends BaseObservable implements Keyed<String> {
         this.excludedFromTunnel = excludedFromTunnel;
         notifyPropertyChanged(BR.excludedFromTunnel);
     }
-
-    @Override
-    public String getKey() {
-        return name;
-    }
 }

app/src/main/java/com/wireguard/android/model/Tunnel.java

@@ -1,14 +1,13 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.model;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.support.annotation.Nullable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.annotation.Nullable;
 
 import com.wireguard.android.BR;
 import com.wireguard.android.util.ExceptionLoggers;
@@ -50,7 +49,8 @@ public class Tunnel extends BaseObservable implements Keyed<String> {
         return manager.delete(this);
     }
 
-    @Bindable @Nullable
+    @Bindable
+    @Nullable
     public Config getConfig() {
         if (config == null)
             manager.getTunnelConfig(this).whenComplete(ExceptionLoggers.E);
@@ -82,7 +82,8 @@ public class Tunnel extends BaseObservable implements Keyed<String> {
         return TunnelManager.getTunnelState(this);
     }
 
-    @Bindable @Nullable
+    @Bindable
+    @Nullable
     public Statistics getStatistics() {
         // FIXME: Check age of statistics.
         if (statistics == null)
@@ -152,5 +153,6 @@ public class Tunnel extends BaseObservable implements Keyed<String> {
         }
     }
 
-    public static class Statistics extends BaseObservable { }
+    public static class Statistics extends BaseObservable {
+    }
 }

app/src/main/java/com/wireguard/android/model/TunnelManager.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,17 +8,17 @@ package com.wireguard.android.model;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.support.annotation.Nullable;
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.annotation.Nullable;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.BR;
+import com.wireguard.android.R;
 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.ExceptionLoggers;
-import com.wireguard.android.util.ObservableKeyedList;
 import com.wireguard.android.util.ObservableSortedKeyedArrayList;
 import com.wireguard.android.util.ObservableSortedKeyedList;
 import com.wireguard.config.Config;
@@ -46,16 +45,28 @@ public final class TunnelManager extends BaseObservable {
     private static final String KEY_RESTORE_ON_BOOT = "restore_on_boot";
     private static final String KEY_RUNNING_TUNNELS = "enabled_configs";
 
+    private final CompletableFuture<ObservableSortedKeyedList<String, Tunnel>> completableTunnels = new CompletableFuture<>();
     private final ConfigStore configStore;
-    private final ObservableSortedKeyedList<String, Tunnel> tunnels = new ObservableSortedKeyedArrayList<>(COMPARATOR);
-    @Nullable private Tunnel lastUsedTunnel;
-    private boolean haveLoaded;
+    private final Context context = Application.get();
     private final ArrayList<CompletableFuture<Void>> delayedLoadRestoreTunnels = new ArrayList<>();
+    private final ObservableSortedKeyedList<String, Tunnel> tunnels = new ObservableSortedKeyedArrayList<>(COMPARATOR);
+    private boolean haveLoaded;
+    @Nullable private Tunnel lastUsedTunnel;
 
     public TunnelManager(final ConfigStore configStore) {
         this.configStore = configStore;
     }
 
+    static CompletionStage<State> getTunnelState(final Tunnel tunnel) {
+        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getState(tunnel))
+                .thenApply(tunnel::onStateChanged);
+    }
+
+    static CompletionStage<Statistics> getTunnelStatistics(final Tunnel tunnel) {
+        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getStatistics(tunnel))
+                .thenApply(tunnel::onStatisticsChanged);
+    }
+
     private Tunnel addToList(final String name, @Nullable final Config config, final State state) {
         final Tunnel tunnel = new Tunnel(this, name, config, state);
         tunnels.add(tunnel);
@@ -64,9 +75,9 @@ public final class TunnelManager extends BaseObservable {
 
     public CompletionStage<Tunnel> create(final String name, @Nullable final Config config) {
         if (Tunnel.isNameInvalid(name))
-            return CompletableFuture.failedFuture(new IllegalArgumentException("Invalid name"));
+            return CompletableFuture.failedFuture(new IllegalArgumentException(context.getString(R.string.tunnel_error_invalid_name)));
         if (tunnels.containsKey(name)) {
-            final String message = "Tunnel " + name + " already exists";
+            final String message = context.getString(R.string.tunnel_error_already_exists, name);
             return CompletableFuture.failedFuture(new IllegalArgumentException(message));
         }
         return Application.getAsyncWorker().supplyAsync(() -> configStore.create(name, config))
@@ -101,7 +112,8 @@ public final class TunnelManager extends BaseObservable {
         });
     }
 
-    @Bindable @Nullable
+    @Bindable
+    @Nullable
     public Tunnel getLastUsedTunnel() {
         return lastUsedTunnel;
     }
@@ -111,18 +123,8 @@ public final class TunnelManager extends BaseObservable {
                 .thenApply(tunnel::onConfigChanged);
     }
 
-    static CompletionStage<State> getTunnelState(final Tunnel tunnel) {
-        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getState(tunnel))
-                .thenApply(tunnel::onStateChanged);
-    }
-
-    static CompletionStage<Statistics> getTunnelStatistics(final Tunnel tunnel) {
-        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getStatistics(tunnel))
-                .thenApply(tunnel::onStatisticsChanged);
-    }
-
-    public ObservableKeyedList<String, Tunnel> getTunnels() {
-        return tunnels;
+    public CompletableFuture<ObservableSortedKeyedList<String, Tunnel>> getTunnels() {
+        return completableTunnels;
     }
 
     public void onCreate() {
@@ -152,6 +154,8 @@ public final class TunnelManager extends BaseObservable {
                     f.completeExceptionally(t);
             }
         });
+
+        completableTunnels.complete(tunnels);
     }
 
     public void refreshTunnelStates() {
@@ -210,9 +214,9 @@ public final class TunnelManager extends BaseObservable {
 
     CompletionStage<String> setTunnelName(final Tunnel tunnel, final String name) {
         if (Tunnel.isNameInvalid(name))
-            return CompletableFuture.failedFuture(new IllegalArgumentException("Invalid name"));
+            return CompletableFuture.failedFuture(new IllegalArgumentException(context.getString(R.string.tunnel_error_invalid_name)));
         if (tunnels.containsKey(name)) {
-            final String message = "Tunnel " + name + " already exists";
+            final String message = context.getString(R.string.tunnel_error_already_exists, name);
             return CompletableFuture.failedFuture(new IllegalArgumentException(message));
         }
         final State originalState = tunnel.getState();
@@ -285,10 +289,12 @@ public final class TunnelManager extends BaseObservable {
             final String tunnelName = intent.getStringExtra("tunnel");
             if (tunnelName == null)
                 return;
-            final Tunnel tunnel = manager.getTunnels().get(tunnelName);
-            if (tunnel == null)
-                return;
-            manager.setTunnelState(tunnel, state);
+            manager.getTunnels().thenAccept(tunnels -> {
+                final Tunnel tunnel = tunnels.get(tunnelName);
+                if (tunnel == null)
+                    return;
+                manager.setTunnelState(tunnel, state);
+            });
         }
     }
 }

app/src/main/java/com/wireguard/android/preference/LogExporterPreference.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,15 +9,15 @@ import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
-import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.ErrorMessages;
 import com.wireguard.android.util.FragmentUtils;
 
 import java.io.BufferedReader;
@@ -45,7 +44,8 @@ public class LogExporterPreference extends Preference {
             final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
             final File file = new File(path, "wireguard-log.txt");
             if (!path.isDirectory() && !path.mkdirs())
-                throw new IOException("Cannot create output directory");
+                throw new IOException(
+                        getContext().getString(R.string.create_output_dir_error));
 
             /* We would like to simply run `builder.redirectOutput(file);`, but this is API 26.
              * Instead we have to do this dance, since logcat appends.
@@ -76,7 +76,7 @@ public class LogExporterPreference extends Preference {
 
     private void exportLogComplete(final String filePath, @Nullable final Throwable throwable) {
         if (throwable != null) {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String error = ErrorMessages.get(throwable);
             final String message = getContext().getString(R.string.log_export_error, error);
             Log.e(TAG, message, throwable);
             Snackbar.make(
@@ -98,7 +98,7 @@ public class LogExporterPreference extends Preference {
 
     @Override
     public CharSequence getTitle() {
-        return getContext().getString(R.string.log_exporter_title);
+        return getContext().getString(R.string.log_export_title);
     }
 
     @Override

app/src/main/java/com/wireguard/android/preference/ToolsInstallerPreference.java

@@ -1,14 +1,13 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.preference;
 
 import android.content.Context;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 
 import com.wireguard.android.Application;

app/src/main/java/com/wireguard/android/preference/VersionPreference.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,32 +9,35 @@ import android.content.ActivityNotFoundException;
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
-import android.support.annotation.Nullable;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.BuildConfig;
 import com.wireguard.android.R;
 
+import java.util.Locale;
+
 public class VersionPreference extends Preference {
     @Nullable private String versionSummary;
 
     public VersionPreference(final Context context, final AttributeSet attrs) {
         super(context, attrs);
 
-        Application.onHaveBackend(backend -> {
-            versionSummary = getContext().getString(R.string.version_summary_checking, backend.getTypeName().toLowerCase());
+        Application.getBackendAsync().thenAccept(backend -> {
+            versionSummary = getContext().getString(R.string.version_summary_checking, backend.getTypePrettyName().toLowerCase(Locale.ENGLISH));
             Application.getAsyncWorker().supplyAsync(backend::getVersion).whenComplete((version, exception) -> {
                 versionSummary = exception == null
-                        ? getContext().getString(R.string.version_summary, backend.getTypeName(), version)
-                        : getContext().getString(R.string.version_summary_unknown, backend.getTypeName().toLowerCase());
+                        ? getContext().getString(R.string.version_summary, backend.getTypePrettyName(), version)
+                        : getContext().getString(R.string.version_summary_unknown, backend.getTypePrettyName().toLowerCase(Locale.ENGLISH));
                 notifyChanged();
             });
         });
     }
 
-    @Override @Nullable
+    @Nullable
+    @Override
     public CharSequence getSummary() {
         return versionSummary;
     }
@@ -50,7 +53,8 @@ public class VersionPreference extends Preference {
         intent.setData(Uri.parse("https://www.wireguard.com/"));
         try {
             getContext().startActivity(intent);
-        } catch (final ActivityNotFoundException ignored) { }
+        } catch (final ActivityNotFoundException ignored) {
+        }
     }
 
 }

app/src/main/java/com/wireguard/android/preference/ZipExporterPreference.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -10,16 +9,16 @@ import android.Manifest;
 import android.content.Context;
 import android.content.pm.PackageManager;
 import android.os.Environment;
-import android.support.annotation.Nullable;
-import android.support.design.widget.Snackbar;
-import android.support.v7.preference.Preference;
+import androidx.annotation.Nullable;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.ErrorMessages;
 import com.wireguard.android.util.FragmentUtils;
 import com.wireguard.config.Config;
 
@@ -48,12 +47,16 @@ public class ZipExporterPreference extends Preference {
     }
 
     private void exportZip() {
-        final List<Tunnel> tunnels = new ArrayList<>(Application.getTunnelManager().getTunnels());
+        Application.getTunnelManager().getTunnels().thenAccept(this::exportZip);
+    }
+
+    private void exportZip(final List<Tunnel> tunnels) {
         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"));
+            exportZipComplete(null, new IllegalArgumentException(
+                    getContext().getString(R.string.no_tunnels_error)));
             return;
         }
         CompletableFuture.allOf(futureConfigs.toArray(new CompletableFuture[futureConfigs.size()]))
@@ -63,12 +66,13 @@ public class ZipExporterPreference extends Preference {
                     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");
+                        throw new IOException(
+                                getContext().getString(R.string.create_output_dir_error));
                     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));
+                                    toWgQuickString().getBytes(StandardCharsets.UTF_8));
                         }
                         zip.closeEntry();
                     } catch (final Exception e) {
@@ -82,7 +86,7 @@ public class ZipExporterPreference extends Preference {
 
     private void exportZipComplete(@Nullable final String filePath, @Nullable final Throwable throwable) {
         if (throwable != null) {
-            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String error = ErrorMessages.get(throwable);
             final String message = getContext().getString(R.string.zip_export_error, error);
             Log.e(TAG, message, throwable);
             Snackbar.make(
@@ -104,7 +108,7 @@ public class ZipExporterPreference extends Preference {
 
     @Override
     public CharSequence getTitle() {
-        return getContext().getString(R.string.zip_exporter_title);
+        return getContext().getString(R.string.zip_export_title);
     }
 
     @Override

app/src/main/java/com/wireguard/android/util/AsyncWorker.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

app/src/main/java/com/wireguard/android/util/ClipboardUtils.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -9,7 +8,7 @@ package com.wireguard.android.util;
 import android.content.ClipData;
 import android.content.ClipboardManager;
 import android.content.Context;
-import android.support.design.widget.Snackbar;
+import com.google.android.material.snackbar.Snackbar;
 import android.view.View;
 import android.widget.TextView;
 

app/src/main/java/com/wireguard/android/util/ErrorMessages.java

@@ -0,0 +1,130 @@
+/*
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.util;
+
+import android.content.res.Resources;
+import androidx.annotation.Nullable;
+
+import com.wireguard.android.Application;
+import com.wireguard.android.R;
+import com.wireguard.config.BadConfigException;
+import com.wireguard.config.BadConfigException.Location;
+import com.wireguard.config.BadConfigException.Reason;
+import com.wireguard.config.InetEndpoint;
+import com.wireguard.config.InetNetwork;
+import com.wireguard.config.ParseException;
+import com.wireguard.crypto.Key.Format;
+import com.wireguard.crypto.KeyFormatException;
+import com.wireguard.crypto.KeyFormatException.Type;
+
+import java.net.InetAddress;
+import java.util.EnumMap;
+import java.util.Map;
+
+import java9.util.Maps;
+
+public final class ErrorMessages {
+    private static final Map<Reason, Integer> BCE_REASON_MAP = new EnumMap<>(Maps.of(
+            Reason.INVALID_KEY, R.string.bad_config_reason_invalid_key,
+            Reason.INVALID_NUMBER, R.string.bad_config_reason_invalid_number,
+            Reason.INVALID_VALUE, R.string.bad_config_reason_invalid_value,
+            Reason.MISSING_ATTRIBUTE, R.string.bad_config_reason_missing_attribute,
+            Reason.MISSING_SECTION, R.string.bad_config_reason_missing_section,
+            Reason.MISSING_VALUE, R.string.bad_config_reason_missing_value,
+            Reason.SYNTAX_ERROR, R.string.bad_config_reason_syntax_error,
+            Reason.UNKNOWN_ATTRIBUTE, R.string.bad_config_reason_unknown_attribute,
+            Reason.UNKNOWN_SECTION, R.string.bad_config_reason_unknown_section
+    ));
+    private static final Map<Format, Integer> KFE_FORMAT_MAP = new EnumMap<>(Maps.of(
+            Format.BASE64, R.string.key_length_explanation_base64,
+            Format.BINARY, R.string.key_length_explanation_binary,
+            Format.HEX, R.string.key_length_explanation_hex
+    ));
+    private static final Map<Type, Integer> KFE_TYPE_MAP = new EnumMap<>(Maps.of(
+            Type.CONTENTS, R.string.key_contents_error,
+            Type.LENGTH, R.string.key_length_error
+    ));
+    private static final Map<Class, Integer> PE_CLASS_MAP = Maps.of(
+            InetAddress.class, R.string.parse_error_inet_address,
+            InetEndpoint.class, R.string.parse_error_inet_endpoint,
+            InetNetwork.class, R.string.parse_error_inet_network,
+            Integer.class, R.string.parse_error_integer
+    );
+
+    private ErrorMessages() {
+        // Prevent instantiation
+    }
+
+    public static String get(@Nullable final Throwable throwable) {
+        final Resources resources = Application.get().getResources();
+        if (throwable == null)
+            return resources.getString(R.string.unknown_error);
+        final Throwable rootCause = rootCause(throwable);
+        final String message;
+        if (rootCause instanceof BadConfigException) {
+            final BadConfigException bce = (BadConfigException) rootCause;
+            final String reason = getBadConfigExceptionReason(resources, bce);
+            final String context = bce.getLocation() == Location.TOP_LEVEL ?
+                    resources.getString(R.string.bad_config_context_top_level,
+                            bce.getSection().getName()) :
+                    resources.getString(R.string.bad_config_context,
+                            bce.getSection().getName(),
+                            bce.getLocation().getName());
+            final String explanation = getBadConfigExceptionExplanation(resources, bce);
+            message = resources.getString(R.string.bad_config_error, reason, context) + explanation;
+        } else if (rootCause.getMessage() != null) {
+            message = rootCause.getMessage();
+        } else {
+            final String errorType = rootCause.getClass().getSimpleName();
+            message = resources.getString(R.string.generic_error, errorType);
+        }
+        return message;
+    }
+
+    private static String getBadConfigExceptionExplanation(final Resources resources,
+                                                           final BadConfigException bce) {
+        if (bce.getCause() instanceof KeyFormatException) {
+            final KeyFormatException kfe = (KeyFormatException) bce.getCause();
+            if (kfe.getType() == Type.LENGTH)
+                return resources.getString(KFE_FORMAT_MAP.get(kfe.getFormat()));
+        } else if (bce.getCause() instanceof ParseException) {
+            final ParseException pe = (ParseException) bce.getCause();
+            if (pe.getMessage() != null)
+                return ": " + pe.getMessage();
+        } else if (bce.getLocation() == Location.LISTEN_PORT) {
+            return resources.getString(R.string.bad_config_explanation_udp_port);
+        } else if (bce.getLocation() == Location.MTU) {
+            return resources.getString(R.string.bad_config_explanation_positive_number);
+        } else if (bce.getLocation() == Location.PERSISTENT_KEEPALIVE) {
+            return resources.getString(R.string.bad_config_explanation_pka);
+        }
+        return "";
+    }
+
+    private static String getBadConfigExceptionReason(final Resources resources,
+                                                      final BadConfigException bce) {
+        if (bce.getCause() instanceof KeyFormatException) {
+            final KeyFormatException kfe = (KeyFormatException) bce.getCause();
+            return resources.getString(KFE_TYPE_MAP.get(kfe.getType()));
+        } else if (bce.getCause() instanceof ParseException) {
+            final ParseException pe = (ParseException) bce.getCause();
+            final String type = resources.getString(PE_CLASS_MAP.containsKey(pe.getParsingClass()) ?
+                    PE_CLASS_MAP.get(pe.getParsingClass()) : R.string.parse_error_generic);
+            return resources.getString(R.string.parse_error_reason, type, pe.getText());
+        }
+        return resources.getString(BCE_REASON_MAP.get(bce.getReason()), bce.getText());
+    }
+
+    private static Throwable rootCause(final Throwable throwable) {
+        Throwable cause = throwable;
+        while (cause.getCause() != null) {
+            if (cause instanceof BadConfigException)
+                break;
+            cause = cause.getCause();
+        }
+        return cause;
+    }
+}

app/src/main/java/com/wireguard/android/util/ExceptionLoggers.java

@@ -1,15 +1,13 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
-import java9.util.concurrent.CompletionException;
 import java9.util.function.BiConsumer;
 
 /**
@@ -22,27 +20,12 @@ public enum ExceptionLoggers implements BiConsumer<Object, Throwable> {
     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;
-    }
-
-    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, @Nullable final Throwable throwable) {
         if (throwable != null)

app/src/main/java/com/wireguard/android/util/FragmentUtils.java

@@ -1,17 +1,19 @@
 /*
- * Copyright © 2018 Harsh Shandilya <msfjarvis@gmail.com>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * 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.support.v7.preference.Preference;
+import androidx.preference.Preference;
 import android.view.ContextThemeWrapper;
 
 import com.wireguard.android.activity.SettingsActivity;
 
-public class FragmentUtils {
+public final class FragmentUtils {
+    private FragmentUtils() {
+        // Prevent instantiation
+    }
 
     public static SettingsActivity getPrefActivity(final Preference preference) {
         final Context context = preference.getContext();

app/src/main/java/com/wireguard/android/util/ObservableKeyedArrayList.java

@@ -1,13 +1,12 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.util;
 
-import android.databinding.ObservableArrayList;
-import android.support.annotation.Nullable;
+import androidx.databinding.ObservableArrayList;
+import androidx.annotation.Nullable;
 
 import com.wireguard.util.Keyed;
 
@@ -65,13 +64,15 @@ public class ObservableKeyedArrayList<K, E extends Keyed<? extends K>>
         return indexOfKey(key) >= 0;
     }
 
-    @Override @Nullable
+    @Nullable
+    @Override
     public E get(final K key) {
         final int index = indexOfKey(key);
         return index >= 0 ? get(index) : null;
     }
 
-    @Override @Nullable
+    @Nullable
+    @Override
     public E getLast(final K key) {
         final int index = lastIndexOfKey(key);
         return index >= 0 ? get(index) : null;

app/src/main/java/com/wireguard/android/util/ObservableKeyedList.java

@@ -1,12 +1,11 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.util;
 
-import android.databinding.ObservableList;
+import androidx.databinding.ObservableList;
 
 import com.wireguard.util.Keyed;
 import com.wireguard.util.KeyedList;

app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java

@@ -1,12 +1,11 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.util;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import com.wireguard.util.Keyed;
 import com.wireguard.util.SortedKeyedList;
@@ -29,8 +28,7 @@ import java.util.Spliterator;
 
 public class ObservableSortedKeyedArrayList<K, E extends Keyed<? extends K>>
         extends ObservableKeyedArrayList<K, E> implements ObservableSortedKeyedList<K, E> {
-    @Nullable
-    private final Comparator<? super K> comparator;
+    @Nullable private final Comparator<? super K> comparator;
     private final transient KeyList<K, E> keyList = new KeyList<>(this);
 
     @SuppressWarnings("WeakerAccess")

app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedList.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

app/src/main/java/com/wireguard/android/util/RootShell.java

@@ -1,13 +1,12 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * 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.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.Log;
 
 import com.wireguard.android.BuildConfig;
@@ -31,6 +30,7 @@ public class RootShell {
     private static final String SU = "su";
     private static final String TAG = "WireGuard/" + RootShell.class.getSimpleName();
 
+    private final Context context;
     private final String deviceNotRootedMessage;
     private final File localBinaryDir;
     private final File localTemporaryDir;
@@ -48,6 +48,7 @@ public class RootShell {
         localTemporaryDir = new File(cacheDir, "tmp");
         preamble = String.format("export CALLING_PACKAGE=%s PATH=\"%s:$PATH\" TMPDIR='%s'; id -u\n",
                 BuildConfig.APPLICATION_ID, localBinaryDir, localTemporaryDir);
+        this.context = context;
     }
 
     private static boolean isExecutableInPath(final String name) {
@@ -122,9 +123,9 @@ public class RootShell {
                 }
             }
             if (markersSeen != 4)
-                throw new IOException("Expected 4 markers, received " + markersSeen);
+                throw new IOException(context.getString(R.string.shell_marker_count_error, markersSeen));
             if (errnoStdout != errnoStderr)
-                throw new IOException("Unable to read exit status");
+                throw new IOException(context.getString(R.string.shell_exit_status_read_error));
             Log.v(TAG, "exit: " + errnoStdout);
             return errnoStdout;
         }
@@ -137,9 +138,9 @@ public class RootShell {
             if (isRunning())
                 return;
             if (!localBinaryDir.isDirectory() && !localBinaryDir.mkdirs())
-                throw new FileNotFoundException("Could not create local binary directory");
+                throw new FileNotFoundException(context.getString(R.string.create_bin_dir_error));
             if (!localTemporaryDir.isDirectory() && !localTemporaryDir.mkdirs())
-                throw new FileNotFoundException("Could not create local temporary directory");
+                throw new FileNotFoundException(context.getString(R.string.create_temp_dir_error));
             try {
                 final ProcessBuilder builder = new ProcessBuilder().command(SU);
                 builder.environment().put("LC_ALL", "C");
@@ -169,7 +170,7 @@ public class RootShell {
                         if (line.contains("Permission denied"))
                             throw new NoRootException(deviceNotRootedMessage);
                     }
-                    throw new IOException("Shell failed to start: " + process.exitValue());
+                    throw new IOException(context.getString(R.string.shell_start_error, process.exitValue()));
                 }
             } catch (final IOException | NoRootException e) {
                 stop();

app/src/main/java/com/wireguard/android/util/SharedLibraryLoader.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -19,7 +19,8 @@ import java.util.zip.ZipFile;
 public final class SharedLibraryLoader {
     private static final String TAG = "WireGuard/" + SharedLibraryLoader.class.getSimpleName();
 
-    private SharedLibraryLoader() { }
+    private SharedLibraryLoader() {
+    }
 
     public static void loadSharedLibrary(final Context context, final String libName) {
         Throwable noAbiException;

app/src/main/java/com/wireguard/android/util/ToolsInstaller.java

@@ -1,18 +1,18 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * 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.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.system.OsConstants;
 import android.util.Log;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.BuildConfig;
+import com.wireguard.android.R;
 import com.wireguard.android.util.RootShell.NoRootException;
 
 import java.io.File;
@@ -27,11 +27,10 @@ import java.util.List;
 
 public final class ToolsInstaller {
     public static final int ERROR = 0x0;
-    public static final int YES = 0x1;
-    public static final int NO = 0x2;
     public static final int MAGISK = 0x4;
+    public static final int NO = 0x2;
     public static final int SYSTEM = 0x8;
-
+    public static final int YES = 0x1;
     private static final String[][] EXECUTABLES = {
             {"libwg.so", "wg"},
             {"libwg-quick.so", "wg-quick"},
@@ -43,6 +42,7 @@ public final class ToolsInstaller {
     @Nullable private static final File INSTALL_DIR = getInstallDir();
     private static final String TAG = "WireGuard/" + ToolsInstaller.class.getSimpleName();
 
+    private final Context context;
     private final File localBinaryDir;
     private final Object lock = new Object();
     private final File nativeLibraryDir;
@@ -52,6 +52,7 @@ public final class ToolsInstaller {
     public ToolsInstaller(final Context context) {
         localBinaryDir = new File(context.getCacheDir(), "bin");
         nativeLibraryDir = new File(context.getApplicationInfo().nativeLibraryDir);
+        this.context = context;
     }
 
     @Nullable
@@ -104,20 +105,33 @@ public final class ToolsInstaller {
                 }
             }
             if (!areToolsAvailable)
-                throw new FileNotFoundException("Required tools unavailable");
+                throw new FileNotFoundException(
+                        context.getString(R.string.tools_unavailable_error));
         }
     }
 
-    private boolean willInstallAsMagiskModule() {
-        synchronized (lock) {
-            if (installAsMagiskModule == null) {
-                try {
-                    installAsMagiskModule = Application.getRootShell().run(null, "[ -d /sbin/.core/mirror -a -d /sbin/.core/img -a ! -f /cache/.disable_magisk ]") == OsConstants.EXIT_SUCCESS;
-                } catch (final Exception ignored) {
-                    installAsMagiskModule = false;
-                }
-            }
-            return installAsMagiskModule;
+    public int install() throws NoRootException {
+        return willInstallAsMagiskModule() ? installMagisk() : installSystem();
+    }
+
+    private int installMagisk() throws NoRootException {
+        final StringBuilder script = new StringBuilder("set -ex; ");
+
+        script.append("trap 'rm -rf /sbin/ecore/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(String.format("printf 'name=WireGuard Command Line Tools\nversion=%s\nversionCode=%s\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.magisk/img/wireguard/module.prop; ", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
+        script.append("touch /sbin/.magisk/img/wireguard/auto_mount; ");
+        for (final String[] names : EXECUTABLES) {
+            final File destination = new File("/sbin/.magisk/img/wireguard" + INSTALL_DIR, names[1]);
+            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; chcon 'u:object_r:system_file:s0' '%s' || true; ",
+                    new File(nativeLibraryDir, names[0]), destination, destination, destination));
+        }
+        script.append("trap - INT TERM EXIT;");
+
+        try {
+            return Application.getRootShell().run(null, script.toString()) == 0 ? YES | MAGISK : ERROR;
+        } catch (final IOException ignored) {
+            return ERROR;
         }
     }
 
@@ -138,31 +152,6 @@ public final class ToolsInstaller {
         }
     }
 
-    private int installMagisk() throws NoRootException {
-        final StringBuilder script = new StringBuilder("set -ex; ");
-
-        script.append("trap 'rm -rf /sbin/.core/img/wireguard' INT TERM EXIT; ");
-        script.append(String.format("rm -rf /sbin/.core/img/wireguard/; mkdir -p /sbin/.core/img/wireguard%s; ", INSTALL_DIR));
-        script.append(String.format("printf 'name=WireGuard Command Line Tools\nversion=%s\nversionCode=%s\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.core/img/wireguard/module.prop; ", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
-        script.append("touch /sbin/.core/img/wireguard/auto_mount; ");
-        for (final String[] names : EXECUTABLES) {
-            final File destination = new File("/sbin/.core/img/wireguard" + INSTALL_DIR, names[1]);
-            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; restorecon '%s' || true; ",
-                    new File(nativeLibraryDir, names[0]), destination, destination, destination));
-        }
-        script.append("trap - INT TERM EXIT;");
-
-        try {
-            return Application.getRootShell().run(null, script.toString()) == 0 ? YES | MAGISK : ERROR;
-        } catch (final IOException ignored) {
-            return ERROR;
-        }
-    }
-
-    public int install() throws NoRootException {
-        return willInstallAsMagiskModule() ? installMagisk() : installSystem();
-    }
-
     public int symlink() throws NoRootException {
         final StringBuilder script = new StringBuilder("set -x; ");
         for (final String[] names : EXECUTABLES) {
@@ -185,4 +174,17 @@ public final class ToolsInstaller {
             return OsConstants.EXIT_FAILURE;
         }
     }
+
+    private boolean willInstallAsMagiskModule() {
+        synchronized (lock) {
+            if (installAsMagiskModule == null) {
+                try {
+                    installAsMagiskModule = Application.getRootShell().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;
+        }
+    }
 }

app/src/main/java/com/wireguard/android/viewmodel/ConfigProxy.java

@@ -0,0 +1,93 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.viewmodel;
+
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.wireguard.config.BadConfigException;
+import com.wireguard.config.Config;
+import com.wireguard.config.Peer;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+public class ConfigProxy implements Parcelable {
+    public static final Parcelable.Creator<ConfigProxy> CREATOR = new ConfigProxyCreator();
+
+    private final InterfaceProxy interfaze;
+    private final ObservableList<PeerProxy> peers = new ObservableArrayList<>();
+
+    private ConfigProxy(final Parcel in) {
+        interfaze = in.readParcelable(InterfaceProxy.class.getClassLoader());
+        in.readTypedList(peers, PeerProxy.CREATOR);
+        for (final PeerProxy proxy : peers)
+            proxy.bind(this);
+    }
+
+    public ConfigProxy(final Config other) {
+        interfaze = new InterfaceProxy(other.getInterface());
+        for (final Peer peer : other.getPeers()) {
+            final PeerProxy proxy = new PeerProxy(peer);
+            peers.add(proxy);
+            proxy.bind(this);
+        }
+    }
+
+    public ConfigProxy() {
+        interfaze = new InterfaceProxy();
+    }
+
+    public PeerProxy addPeer() {
+        final PeerProxy proxy = new PeerProxy();
+        peers.add(proxy);
+        proxy.bind(this);
+        return proxy;
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public InterfaceProxy getInterface() {
+        return interfaze;
+    }
+
+    public ObservableList<PeerProxy> getPeers() {
+        return peers;
+    }
+
+    public Config resolve() throws BadConfigException {
+        final Collection<Peer> resolvedPeers = new ArrayList<>();
+        for (final PeerProxy proxy : peers)
+            resolvedPeers.add(proxy.resolve());
+        return new Config.Builder()
+                .setInterface(interfaze.resolve())
+                .addPeers(resolvedPeers)
+                .build();
+    }
+
+    @Override
+    public void writeToParcel(final Parcel dest, final int flags) {
+        dest.writeParcelable(interfaze, flags);
+        dest.writeTypedList(peers);
+    }
+
+    private static class ConfigProxyCreator implements Parcelable.Creator<ConfigProxy> {
+        @Override
+        public ConfigProxy createFromParcel(final Parcel in) {
+            return new ConfigProxy(in);
+        }
+
+        @Override
+        public ConfigProxy[] newArray(final int size) {
+            return new ConfigProxy[size];
+        }
+    }
+}

app/src/main/java/com/wireguard/android/viewmodel/InterfaceProxy.java

@@ -0,0 +1,190 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.viewmodel;
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.databinding.ObservableArrayList;
+import androidx.databinding.ObservableList;
+import android.os.Parcel;
+import android.os.Parcelable;
+
+import com.wireguard.android.BR;
+import com.wireguard.config.Attribute;
+import com.wireguard.config.BadConfigException;
+import com.wireguard.config.Interface;
+import com.wireguard.crypto.Key;
+import com.wireguard.crypto.KeyFormatException;
+import com.wireguard.crypto.KeyPair;
+
+import java.net.InetAddress;
+import java.util.List;
+
+import java9.util.stream.Collectors;
+import java9.util.stream.StreamSupport;
+
+public class InterfaceProxy extends BaseObservable implements Parcelable {
+    public static final Parcelable.Creator<InterfaceProxy> CREATOR = new InterfaceProxyCreator();
+
+    private final ObservableList<String> excludedApplications = new ObservableArrayList<>();
+    private String addresses;
+    private String dnsServers;
+    private String listenPort;
+    private String mtu;
+    private String privateKey;
+    private String publicKey;
+
+    private InterfaceProxy(final Parcel in) {
+        addresses = in.readString();
+        dnsServers = in.readString();
+        in.readStringList(excludedApplications);
+        listenPort = in.readString();
+        mtu = in.readString();
+        privateKey = in.readString();
+        publicKey = in.readString();
+    }
+
+    public InterfaceProxy(final Interface other) {
+        addresses = Attribute.join(other.getAddresses());
+        final List<String> dnsServerStrings = StreamSupport.stream(other.getDnsServers())
+                .map(InetAddress::getHostAddress)
+                .collect(Collectors.toUnmodifiableList());
+        dnsServers = Attribute.join(dnsServerStrings);
+        excludedApplications.addAll(other.getExcludedApplications());
+        listenPort = other.getListenPort().map(String::valueOf).orElse("");
+        mtu = other.getMtu().map(String::valueOf).orElse("");
+        final KeyPair keyPair = other.getKeyPair();
+        privateKey = keyPair.getPrivateKey().toBase64();
+        publicKey = keyPair.getPublicKey().toBase64();
+    }
+
+    public InterfaceProxy() {
+        addresses = "";
+        dnsServers = "";
+        listenPort = "";
+        mtu = "";
+        privateKey = "";
+        publicKey = "";
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    public void generateKeyPair() {
+        final KeyPair keyPair = new KeyPair();
+        privateKey = keyPair.getPrivateKey().toBase64();
+        publicKey = keyPair.getPublicKey().toBase64();
+        notifyPropertyChanged(BR.privateKey);
+        notifyPropertyChanged(BR.publicKey);
+    }
+
+    @Bindable
+    public String getAddresses() {
+        return addresses;
+    }
+
+    @Bindable
+    public String getDnsServers() {
+        return dnsServers;
+    }
+
+    public ObservableList<String> getExcludedApplications() {
+        return excludedApplications;
+    }
+
+    @Bindable
+    public String getListenPort() {
+        return listenPort;
+    }
+
+    @Bindable
+    public String getMtu() {
+        return mtu;
+    }
+
+    @Bindable
+    public String getPrivateKey() {
+        return privateKey;
+    }
+
+    @Bindable
+    public String getPublicKey() {
+        return publicKey;
+    }
+
+    public Interface resolve() throws BadConfigException {
+        final Interface.Builder builder = new Interface.Builder();
+        if (!addresses.isEmpty())
+            builder.parseAddresses(addresses);
+        if (!dnsServers.isEmpty())
+            builder.parseDnsServers(dnsServers);
+        if (!excludedApplications.isEmpty())
+            builder.excludeApplications(excludedApplications);
+        if (!listenPort.isEmpty())
+            builder.parseListenPort(listenPort);
+        if (!mtu.isEmpty())
+            builder.parseMtu(mtu);
+        if (!privateKey.isEmpty())
+            builder.parsePrivateKey(privateKey);
+        return builder.build();
+    }
+
+    public void setAddresses(final String addresses) {
+        this.addresses = addresses;
+        notifyPropertyChanged(BR.addresses);
+    }
+
+    public void setDnsServers(final String dnsServers) {
+        this.dnsServers = dnsServers;
+        notifyPropertyChanged(BR.dnsServers);
+    }
+
+    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(Key.fromBase64(privateKey)).getPublicKey().toBase64();
+        } catch (final KeyFormatException ignored) {
+            publicKey = "";
+        }
+        notifyPropertyChanged(BR.privateKey);
+        notifyPropertyChanged(BR.publicKey);
+    }
+
+    @Override
+    public void writeToParcel(final Parcel dest, final int flags) {
+        dest.writeString(addresses);
+        dest.writeString(dnsServers);
+        dest.writeStringList(excludedApplications);
+        dest.writeString(listenPort);
+        dest.writeString(mtu);
+        dest.writeString(privateKey);
+        dest.writeString(publicKey);
+    }
+
+    private static class InterfaceProxyCreator implements Parcelable.Creator<InterfaceProxy> {
+        @Override
+        public InterfaceProxy createFromParcel(final Parcel in) {
+            return new InterfaceProxy(in);
+        }
+
+        @Override
+        public InterfaceProxy[] newArray(final int size) {
+            return new InterfaceProxy[size];
+        }
+    }
+}

app/src/main/java/com/wireguard/android/viewmodel/PeerProxy.java

@@ -0,0 +1,380 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.viewmodel;
+
+import androidx.databinding.BaseObservable;
+import androidx.databinding.Bindable;
+import androidx.databinding.Observable;
+import androidx.databinding.ObservableList;
+import android.os.Parcel;
+import android.os.Parcelable;
+import androidx.annotation.Nullable;
+
+import com.wireguard.android.BR;
+import com.wireguard.config.Attribute;
+import com.wireguard.config.BadConfigException;
+import com.wireguard.config.InetEndpoint;
+import com.wireguard.config.Peer;
+import com.wireguard.crypto.Key;
+
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.LinkedHashSet;
+import java.util.List;
+import java.util.Set;
+
+import java9.util.Lists;
+import java9.util.Sets;
+import java9.util.stream.Collectors;
+import java9.util.stream.Stream;
+
+public class PeerProxy extends BaseObservable implements Parcelable {
+    public static final Parcelable.Creator<PeerProxy> CREATOR = new PeerProxyCreator();
+    private static final Set<String> IPV4_PUBLIC_NETWORKS = new LinkedHashSet<>(Lists.of(
+            "0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3",
+            "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12",
+            "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7",
+            "176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16",
+            "192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10",
+            "193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4"
+    ));
+    private static final Set<String> IPV4_WILDCARD = Sets.of("0.0.0.0/0");
+
+    private final List<String> dnsRoutes = new ArrayList<>();
+    private String allowedIps;
+    private AllowedIpsState allowedIpsState = AllowedIpsState.INVALID;
+    private String endpoint;
+    @Nullable private InterfaceDnsListener interfaceDnsListener;
+    @Nullable private ConfigProxy owner;
+    @Nullable private PeerListListener peerListListener;
+    private String persistentKeepalive;
+    private String preSharedKey;
+    private String publicKey;
+    private int totalPeers;
+
+    private PeerProxy(final Parcel in) {
+        allowedIps = in.readString();
+        endpoint = in.readString();
+        persistentKeepalive = in.readString();
+        preSharedKey = in.readString();
+        publicKey = in.readString();
+    }
+
+    public PeerProxy(final Peer other) {
+        allowedIps = Attribute.join(other.getAllowedIps());
+        endpoint = other.getEndpoint().map(InetEndpoint::toString).orElse("");
+        persistentKeepalive = other.getPersistentKeepalive().map(String::valueOf).orElse("");
+        preSharedKey = other.getPreSharedKey().map(Key::toBase64).orElse("");
+        publicKey = other.getPublicKey().toBase64();
+    }
+
+    public PeerProxy() {
+        allowedIps = "";
+        endpoint = "";
+        persistentKeepalive = "";
+        preSharedKey = "";
+        publicKey = "";
+    }
+
+    public void bind(final ConfigProxy owner) {
+        final InterfaceProxy interfaze = owner.getInterface();
+        final ObservableList<PeerProxy> peers = owner.getPeers();
+        if (interfaceDnsListener == null)
+            interfaceDnsListener = new InterfaceDnsListener(this);
+        interfaze.addOnPropertyChangedCallback(interfaceDnsListener);
+        setInterfaceDns(interfaze.getDnsServers());
+        if (peerListListener == null)
+            peerListListener = new PeerListListener(this);
+        peers.addOnListChangedCallback(peerListListener);
+        setTotalPeers(peers.size());
+        this.owner = owner;
+    }
+
+    private void calculateAllowedIpsState() {
+        final AllowedIpsState newState;
+        if (totalPeers == 1) {
+            // String comparison works because we only care if allowedIps is a superset of one of
+            // the above sets of (valid) *networks*. We are not checking for a superset based on
+            // the individual addresses in each set.
+            final Collection<String> networkStrings = getAllowedIpsSet();
+            // If allowedIps contains both the wildcard and the public networks, then private
+            // networks aren't excluded!
+            if (networkStrings.containsAll(IPV4_WILDCARD))
+                newState = AllowedIpsState.CONTAINS_IPV4_WILDCARD;
+            else if (networkStrings.containsAll(IPV4_PUBLIC_NETWORKS))
+                newState = AllowedIpsState.CONTAINS_IPV4_PUBLIC_NETWORKS;
+            else
+                newState = AllowedIpsState.OTHER;
+        } else {
+            newState = AllowedIpsState.INVALID;
+        }
+        if (newState != allowedIpsState) {
+            allowedIpsState = newState;
+            notifyPropertyChanged(BR.ableToExcludePrivateIps);
+            notifyPropertyChanged(BR.excludingPrivateIps);
+        }
+    }
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Bindable
+    public String getAllowedIps() {
+        return allowedIps;
+    }
+
+    private Set<String> getAllowedIpsSet() {
+        return new LinkedHashSet<>(Lists.of(Attribute.split(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;
+    }
+
+    @Bindable
+    public boolean isAbleToExcludePrivateIps() {
+        return allowedIpsState == AllowedIpsState.CONTAINS_IPV4_PUBLIC_NETWORKS
+                || allowedIpsState == AllowedIpsState.CONTAINS_IPV4_WILDCARD;
+    }
+
+    @Bindable
+    public boolean isExcludingPrivateIps() {
+        return allowedIpsState == AllowedIpsState.CONTAINS_IPV4_PUBLIC_NETWORKS;
+    }
+
+    public Peer resolve() throws BadConfigException {
+        final Peer.Builder builder = new Peer.Builder();
+        if (!allowedIps.isEmpty())
+            builder.parseAllowedIPs(allowedIps);
+        if (!endpoint.isEmpty())
+            builder.parseEndpoint(endpoint);
+        if (!persistentKeepalive.isEmpty())
+            builder.parsePersistentKeepalive(persistentKeepalive);
+        if (!preSharedKey.isEmpty())
+            builder.parsePreSharedKey(preSharedKey);
+        if (!publicKey.isEmpty())
+            builder.parsePublicKey(publicKey);
+        return builder.build();
+    }
+
+    public void setAllowedIps(final String allowedIps) {
+        this.allowedIps = allowedIps;
+        notifyPropertyChanged(BR.allowedIps);
+        calculateAllowedIpsState();
+    }
+
+    public void setEndpoint(final String endpoint) {
+        this.endpoint = endpoint;
+        notifyPropertyChanged(BR.endpoint);
+    }
+
+    public void setExcludingPrivateIps(final boolean excludingPrivateIps) {
+        if (!isAbleToExcludePrivateIps() || isExcludingPrivateIps() == excludingPrivateIps)
+            return;
+        final Set<String> oldNetworks = excludingPrivateIps ? IPV4_WILDCARD : IPV4_PUBLIC_NETWORKS;
+        final Set<String> newNetworks = excludingPrivateIps ? IPV4_PUBLIC_NETWORKS : IPV4_WILDCARD;
+        final Collection<String> input = getAllowedIpsSet();
+        final int outputSize = input.size() - oldNetworks.size() + newNetworks.size();
+        final Collection<String> output = new LinkedHashSet<>(outputSize);
+        boolean replaced = false;
+        // Replace the first instance of the wildcard with the public network list, or vice versa.
+        for (final String network : input) {
+            if (oldNetworks.contains(network)) {
+                if (!replaced) {
+                    for (final String replacement : newNetworks)
+                        if (!output.contains(replacement))
+                            output.add(replacement);
+                    replaced = true;
+                }
+            } else if (!output.contains(network)) {
+                output.add(network);
+            }
+        }
+        // DNS servers only need to handled specially when we're excluding private IPs.
+        if (excludingPrivateIps)
+            output.addAll(dnsRoutes);
+        else
+            output.removeAll(dnsRoutes);
+        allowedIps = Attribute.join(output);
+        allowedIpsState = excludingPrivateIps ?
+                AllowedIpsState.CONTAINS_IPV4_PUBLIC_NETWORKS : AllowedIpsState.CONTAINS_IPV4_WILDCARD;
+        notifyPropertyChanged(BR.allowedIps);
+        notifyPropertyChanged(BR.excludingPrivateIps);
+    }
+
+    private void setInterfaceDns(final CharSequence dnsServers) {
+        final List<String> newDnsRoutes = Stream.of(Attribute.split(dnsServers))
+                .filter(server -> !server.contains(":"))
+                .map(server -> server + "/32")
+                .collect(Collectors.toUnmodifiableList());
+        if (allowedIpsState == AllowedIpsState.CONTAINS_IPV4_PUBLIC_NETWORKS) {
+            final Collection<String> input = getAllowedIpsSet();
+            final Collection<String> output = new LinkedHashSet<>(input.size() + 1);
+            // Yes, this is quadratic in the number of DNS servers, but most users have 1 or 2.
+            for (final String network : input)
+                if (!dnsRoutes.contains(network) || newDnsRoutes.contains(network))
+                    output.add(network);
+            // Since output is a Set, this does the Right Thing™ (it does not duplicate networks).
+            output.addAll(newDnsRoutes);
+            // None of the public networks are /32s, so this cannot change the AllowedIPs state.
+            allowedIps = Attribute.join(output);
+            notifyPropertyChanged(BR.allowedIps);
+        }
+        dnsRoutes.clear();
+        dnsRoutes.addAll(newDnsRoutes);
+    }
+
+    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);
+    }
+
+    private void setTotalPeers(final int totalPeers) {
+        if (this.totalPeers == totalPeers)
+            return;
+        this.totalPeers = totalPeers;
+        calculateAllowedIpsState();
+    }
+
+    public void unbind() {
+        if (owner == null)
+            return;
+        final InterfaceProxy interfaze = owner.getInterface();
+        final ObservableList<PeerProxy> peers = owner.getPeers();
+        if (interfaceDnsListener != null)
+            interfaze.removeOnPropertyChangedCallback(interfaceDnsListener);
+        if (peerListListener != null)
+            peers.removeOnListChangedCallback(peerListListener);
+        peers.remove(this);
+        setInterfaceDns("");
+        setTotalPeers(0);
+        owner = null;
+    }
+
+    @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);
+    }
+
+    private enum AllowedIpsState {
+        CONTAINS_IPV4_PUBLIC_NETWORKS,
+        CONTAINS_IPV4_WILDCARD,
+        INVALID,
+        OTHER
+    }
+
+    private static final class InterfaceDnsListener extends Observable.OnPropertyChangedCallback {
+        private final WeakReference<PeerProxy> weakPeerProxy;
+
+        private InterfaceDnsListener(final PeerProxy peerProxy) {
+            weakPeerProxy = new WeakReference<>(peerProxy);
+        }
+
+        @Override
+        public void onPropertyChanged(final Observable sender, final int propertyId) {
+            @Nullable final PeerProxy peerProxy = weakPeerProxy.get();
+            if (peerProxy == null) {
+                sender.removeOnPropertyChangedCallback(this);
+                return;
+            }
+            // This shouldn't be possible, but try to avoid a ClassCastException anyway.
+            if (!(sender instanceof InterfaceProxy))
+                return;
+            if (!(propertyId == BR._all || propertyId == BR.dnsServers))
+                return;
+            peerProxy.setInterfaceDns(((InterfaceProxy) sender).getDnsServers());
+        }
+    }
+
+    private static final class PeerListListener
+            extends ObservableList.OnListChangedCallback<ObservableList<PeerProxy>> {
+        private final WeakReference<PeerProxy> weakPeerProxy;
+
+        private PeerListListener(final PeerProxy peerProxy) {
+            weakPeerProxy = new WeakReference<>(peerProxy);
+        }
+
+        @Override
+        public void onChanged(final ObservableList<PeerProxy> sender) {
+            @Nullable final PeerProxy peerProxy = weakPeerProxy.get();
+            if (peerProxy == null) {
+                sender.removeOnListChangedCallback(this);
+                return;
+            }
+            peerProxy.setTotalPeers(sender.size());
+        }
+
+        @Override
+        public void onItemRangeChanged(final ObservableList<PeerProxy> sender,
+                                       final int positionStart, final int itemCount) {
+            // Do nothing.
+        }
+
+        @Override
+        public void onItemRangeInserted(final ObservableList<PeerProxy> sender,
+                                        final int positionStart, final int itemCount) {
+            onChanged(sender);
+        }
+
+        @Override
+        public void onItemRangeMoved(final ObservableList<PeerProxy> sender,
+                                     final int fromPosition, final int toPosition,
+                                     final int itemCount) {
+            // Do nothing.
+        }
+
+        @Override
+        public void onItemRangeRemoved(final ObservableList<PeerProxy> sender,
+                                       final int positionStart, final int itemCount) {
+            onChanged(sender);
+        }
+    }
+
+    private static class PeerProxyCreator implements Parcelable.Creator<PeerProxy> {
+        @Override
+        public PeerProxy createFromParcel(final Parcel in) {
+            return new PeerProxy(in);
+        }
+
+        @Override
+        public PeerProxy[] newArray(final int size) {
+            return new PeerProxy[size];
+        }
+    }
+}

app/src/main/java/com/wireguard/android/widget/KeyInputFilter.java

@@ -1,17 +1,16 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.widget;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.InputFilter;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
 
-import com.wireguard.crypto.KeyEncoding;
+import com.wireguard.crypto.Key;
 
 /**
  * InputFilter for entering WireGuard private/public keys encoded with base64.
@@ -26,7 +25,8 @@ public class KeyInputFilter implements InputFilter {
         return new KeyInputFilter();
     }
 
-    @Override @Nullable
+    @Nullable
+    @Override
     public CharSequence filter(final CharSequence source,
                                final int sStart, final int sEnd,
                                final Spanned dest,
@@ -39,9 +39,9 @@ public class KeyInputFilter implements InputFilter {
             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) {
+            if (((dIndex + 1 < Key.Format.BASE64.getLength() && isAllowed(c)) ||
+                    (dIndex + 1 == Key.Format.BASE64.getLength() && c == '=')) &&
+                    dLength + (sIndex - sStart) < Key.Format.BASE64.getLength()) {
                 ++rIndex;
             } else {
                 if (replacement == null)

app/src/main/java/com/wireguard/android/widget/MultiselectableRelativeLayout.java

@@ -0,0 +1,59 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.android.widget;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.RelativeLayout;
+
+import com.wireguard.android.R;
+
+public class MultiselectableRelativeLayout extends RelativeLayout {
+    private static final int[] STATE_MULTISELECTED = {R.attr.state_multiselected};
+    private boolean multiselected;
+
+    public MultiselectableRelativeLayout(final Context context) {
+        super(context);
+    }
+
+    public MultiselectableRelativeLayout(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public MultiselectableRelativeLayout(final Context context, final AttributeSet attrs, final int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+    }
+
+    public MultiselectableRelativeLayout(final Context context, final AttributeSet attrs, final int defStyleAttr, final int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+    }
+
+    @Override
+    protected int[] onCreateDrawableState(final int extraSpace) {
+        if (multiselected) {
+            final int[] drawableState = super.onCreateDrawableState(extraSpace + 1);
+            mergeDrawableStates(drawableState, STATE_MULTISELECTED);
+            return drawableState;
+        }
+        return super.onCreateDrawableState(extraSpace);
+    }
+
+    public void setMultiSelected(final boolean on) {
+        if (!multiselected) {
+            multiselected = true;
+            refreshDrawableState();
+        }
+        setActivated(on);
+    }
+
+    public void setSingleSelected(final boolean on) {
+        if (multiselected) {
+            multiselected = false;
+            refreshDrawableState();
+        }
+        setActivated(on);
+    }
+}

app/src/main/java/com/wireguard/android/widget/NameInputFilter.java

@@ -1,12 +1,11 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.widget;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.text.InputFilter;
 import android.text.SpannableStringBuilder;
 import android.text.Spanned;
@@ -26,7 +25,8 @@ public class NameInputFilter implements InputFilter {
         return new NameInputFilter();
     }
 
-    @Override @Nullable
+    @Nullable
+    @Override
     public CharSequence filter(final CharSequence source,
                                final int sStart, final int sEnd,
                                final Spanned dest,

app/src/main/java/com/wireguard/android/widget/SlashDrawable.java

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2018 The Android Open Source Project
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -23,103 +23,51 @@ import android.graphics.RectF;
 import android.graphics.Region;
 import android.graphics.drawable.Drawable;
 import android.os.Build;
-import android.support.annotation.ColorInt;
-import android.support.annotation.IntRange;
-import android.support.annotation.Nullable;
+import androidx.annotation.ColorInt;
+import androidx.annotation.IntRange;
+import androidx.annotation.Nullable;
 import android.util.FloatProperty;
 
 @TargetApi(Build.VERSION_CODES.N)
 public class SlashDrawable extends Drawable {
 
-    private static final float CORNER_RADIUS = Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? 0f : 1f;
-    private static final long QS_ANIM_LENGTH = 350;
-
-    private final Path mPath = new Path();
-    private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
-
-    // These values are derived in un-rotated (vertical) orientation
-    private static final float SLASH_WIDTH = 1.8384776f;
-    private static final float SLASH_HEIGHT = 28f;
     private static final float CENTER_X = 10.65f;
     private static final float CENTER_Y = 11.869239f;
-    private static final float SCALE = 24f;
-
-    // Bottom is derived during animation
-    private static final float LEFT = (CENTER_X - (SLASH_WIDTH / 2)) / SCALE;
-    private static final float TOP = (CENTER_Y - (SLASH_HEIGHT / 2)) / SCALE;
-    private static final float RIGHT = (CENTER_X + (SLASH_WIDTH / 2)) / SCALE;
+    private static final float CORNER_RADIUS = Build.VERSION.SDK_INT < Build.VERSION_CODES.O ? 0f : 1f;
     // Draw the slash washington-monument style; rotate to no-u-turn style
     private static final float DEFAULT_ROTATION = -45f;
-
-    private final Drawable mDrawable;
-    private final RectF mSlashRect = new RectF(0, 0, 0, 0);
-    private float mRotation;
-    private boolean mSlashed;
-    private boolean mAnimationEnabled = true;
-
-    public SlashDrawable(final Drawable d) {
-        mDrawable = d;
-    }
-
-    @Override
-    public int getIntrinsicHeight() {
-        return mDrawable.getIntrinsicHeight();
-    }
-
-    @Override
-    public int getIntrinsicWidth() {
-        return mDrawable.getIntrinsicWidth();
-    }
-
-    @Override
-    protected void onBoundsChange(final Rect bounds) {
-        super.onBoundsChange(bounds);
-        mDrawable.setBounds(bounds);
-    }
-
-    public void setRotation(final float rotation) {
-        if (mRotation == rotation)
-            return;
-        mRotation = rotation;
-        invalidateSelf();
-    }
-
-    public void setAnimationEnabled(final boolean enabled) {
-        mAnimationEnabled = enabled;
-    }
-
-    // Animate this value on change
-    private float mCurrentSlashLength;
+    private static final long QS_ANIM_LENGTH = 350;
+    private static final float SCALE = 24f;
+    private static final float SLASH_HEIGHT = 28f;
+    // These values are derived in un-rotated (vertical) orientation
+    private static final float SLASH_WIDTH = 1.8384776f;
+    // Bottom is derived during animation
+    private static final float LEFT = (CENTER_X - (SLASH_WIDTH / 2)) / SCALE;
+    private static final float RIGHT = (CENTER_X + (SLASH_WIDTH / 2)) / SCALE;
+    private static final float TOP = (CENTER_Y - (SLASH_HEIGHT / 2)) / SCALE;
     private static final FloatProperty mSlashLengthProp = new FloatProperty<SlashDrawable>("slashLength") {
-        @Override
-        public void setValue(final SlashDrawable object, final float value) {
-            object.mCurrentSlashLength = value;
-        }
-
         @Override
         public Float get(final SlashDrawable object) {
             return object.mCurrentSlashLength;
         }
-    };
 
-    @SuppressWarnings("unchecked")
-    public void setSlashed(final boolean slashed) {
-        if (mSlashed == slashed) return;
-
-        mSlashed = slashed;
-
-        final float end = mSlashed ? SLASH_HEIGHT / SCALE : 0f;
-        final float start = mSlashed ? 0f : SLASH_HEIGHT / SCALE;
-
-        if (mAnimationEnabled) {
-            final ObjectAnimator anim = ObjectAnimator.ofFloat(this, mSlashLengthProp, start, end);
-            anim.addUpdateListener((ValueAnimator valueAnimator) -> invalidateSelf());
-            anim.setDuration(QS_ANIM_LENGTH);
-            anim.start();
-        } else {
-            mCurrentSlashLength = end;
-            invalidateSelf();
+        @Override
+        public void setValue(final SlashDrawable object, final float value) {
+            object.mCurrentSlashLength = value;
         }
+    };
+    private final Drawable mDrawable;
+    private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG);
+    private final Path mPath = new Path();
+    private final RectF mSlashRect = new RectF(0, 0, 0, 0);
+    private boolean mAnimationEnabled = true;
+    // Animate this value on change
+    private float mCurrentSlashLength;
+    private float mRotation;
+    private boolean mSlashed;
+
+    public SlashDrawable(final Drawable d) {
+        mDrawable = d;
     }
 
     @SuppressWarnings("deprecation")
@@ -166,15 +114,76 @@ public class SlashDrawable extends Drawable {
         canvas.restore();
     }
 
+    @Override
+    public int getIntrinsicHeight() {
+        return mDrawable.getIntrinsicHeight();
+    }
+
+    @Override
+    public int getIntrinsicWidth() {
+        return mDrawable.getIntrinsicWidth();
+    }
+
+    @Override
+    public int getOpacity() {
+        return PixelFormat.OPAQUE;
+    }
+
+    @Override
+    protected void onBoundsChange(final Rect bounds) {
+        super.onBoundsChange(bounds);
+        mDrawable.setBounds(bounds);
+    }
+
     private float scale(final float frac, final int width) {
         return frac * width;
     }
 
-    private void updateRect(final float left, final float top, final float right, final float bottom) {
-        mSlashRect.left = left;
-        mSlashRect.top = top;
-        mSlashRect.right = right;
-        mSlashRect.bottom = bottom;
+    @Override
+    public void setAlpha(@IntRange(from = 0, to = 255) final int alpha) {
+        mDrawable.setAlpha(alpha);
+        mPaint.setAlpha(alpha);
+    }
+
+    public void setAnimationEnabled(final boolean enabled) {
+        mAnimationEnabled = enabled;
+    }
+
+    @Override
+    public void setColorFilter(@Nullable final ColorFilter colorFilter) {
+        mDrawable.setColorFilter(colorFilter);
+        mPaint.setColorFilter(colorFilter);
+    }
+
+    private void setDrawableTintList(@Nullable final ColorStateList tint) {
+        mDrawable.setTintList(tint);
+    }
+
+    public void setRotation(final float rotation) {
+        if (mRotation == rotation)
+            return;
+        mRotation = rotation;
+        invalidateSelf();
+    }
+
+    @SuppressWarnings("unchecked")
+    public void setSlashed(final boolean slashed) {
+        if (mSlashed == slashed) return;
+
+        mSlashed = slashed;
+
+        final float end = mSlashed ? SLASH_HEIGHT / SCALE : 0f;
+        final float start = mSlashed ? 0f : SLASH_HEIGHT / SCALE;
+
+        if (mAnimationEnabled) {
+            final ObjectAnimator anim = ObjectAnimator.ofFloat(this, mSlashLengthProp, start, end);
+            anim.addUpdateListener((ValueAnimator valueAnimator) -> invalidateSelf());
+            anim.setDuration(QS_ANIM_LENGTH);
+            anim.start();
+        } else {
+            mCurrentSlashLength = end;
+            invalidateSelf();
+        }
     }
 
     @Override
@@ -192,30 +201,16 @@ public class SlashDrawable extends Drawable {
         invalidateSelf();
     }
 
-    private void setDrawableTintList(@Nullable final ColorStateList tint) {
-        mDrawable.setTintList(tint);
-    }
-
     @Override
     public void setTintMode(final Mode tintMode) {
         super.setTintMode(tintMode);
         mDrawable.setTintMode(tintMode);
     }
 
-    @Override
-    public void setAlpha(@IntRange(from = 0, to = 255) final int alpha) {
-        mDrawable.setAlpha(alpha);
-        mPaint.setAlpha(alpha);
-    }
-
-    @Override
-    public void setColorFilter(@Nullable final ColorFilter colorFilter) {
-        mDrawable.setColorFilter(colorFilter);
-        mPaint.setColorFilter(colorFilter);
-    }
-
-    @Override
-    public int getOpacity() {
-        return PixelFormat.OPAQUE;
+    private void updateRect(final float left, final float top, final float right, final float bottom) {
+        mSlashRect.left = left;
+        mSlashRect.top = top;
+        mSlashRect.right = right;
+        mSlashRect.bottom = bottom;
     }
 }

app/src/main/java/com/wireguard/android/widget/ToggleSwitch.java

@@ -1,5 +1,6 @@
 /*
  * Copyright © 2013 The Android Open Source Project
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -7,7 +8,7 @@ package com.wireguard.android.widget;
 
 import android.content.Context;
 import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.util.AttributeSet;
 import android.widget.Switch;
 

app/src/main/java/com/wireguard/android/widget/fab/FloatingActionButtonBehavior.java

@@ -1,20 +1,49 @@
 /*
- * Copyright © 2018 Harsh Shandilya <msfjarvis@gmail.com>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.widget.fab;
 
+import android.animation.Animator;
+import android.animation.AnimatorListenerAdapter;
+import android.animation.TimeInterpolator;
+import android.animation.ValueAnimator;
 import android.content.Context;
-import android.support.design.widget.CoordinatorLayout;
-import android.support.design.widget.Snackbar;
+import androidx.coordinatorlayout.widget.CoordinatorLayout;
+import com.google.android.material.snackbar.Snackbar;
+import androidx.interpolator.view.animation.FastOutSlowInInterpolator;
 import android.util.AttributeSet;
 import android.view.View;
 
 public class FloatingActionButtonBehavior extends CoordinatorLayout.Behavior<FloatingActionsMenu> {
 
-    public FloatingActionButtonBehavior(final Context context, final AttributeSet attrs) { }
+    private static final long ANIMATION_DURATION = 250;
+    private static final TimeInterpolator FAST_OUT_SLOW_IN_INTERPOLATOR = new FastOutSlowInInterpolator();
+
+    public FloatingActionButtonBehavior(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    private static void animateChange(final FloatingActionsMenu child, final float destination, final float fullSpan) {
+        final float origin = child.getBehaviorYTranslation();
+        if (Math.abs(destination - origin) < fullSpan / 2) {
+            child.setBehaviorYTranslation(destination);
+            return;
+        }
+        final ValueAnimator animator = new ValueAnimator();
+        animator.setFloatValues(origin, destination);
+        animator.setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR);
+        animator.setDuration((long) (ANIMATION_DURATION * (Math.abs(destination - origin) / fullSpan)));
+        animator.addListener(new AnimatorListenerAdapter() {
+            @Override
+            public void onAnimationEnd(final Animator a) {
+                child.setBehaviorYTranslation(destination);
+            }
+        });
+        animator.addUpdateListener(a -> child.setBehaviorYTranslation((float) a.getAnimatedValue()));
+        animator.start();
+    }
 
     @Override
     public boolean layoutDependsOn(final CoordinatorLayout parent, final FloatingActionsMenu child,
@@ -25,7 +54,13 @@ public class FloatingActionButtonBehavior extends CoordinatorLayout.Behavior<Flo
     @Override
     public boolean onDependentViewChanged(final CoordinatorLayout parent, final FloatingActionsMenu child,
                                           final View dependency) {
-        child.setBehaviorYTranslation(Math.min(0, dependency.getTranslationY() - dependency.getMeasuredHeight()));
+        animateChange(child, Math.min(0, dependency.getTranslationY() - dependency.getMeasuredHeight()), dependency.getMeasuredHeight());
         return true;
     }
+
+    @Override
+    public void onDependentViewRemoved(final CoordinatorLayout parent, final FloatingActionsMenu child,
+                                       final View dependency) {
+        animateChange(child, 0, dependency.getMeasuredHeight());
+    }
 }

app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenu.java

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014 Jerzy Chalupski
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -17,13 +17,14 @@ import android.graphics.Canvas;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
+import android.os.Build;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.Keep;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
-import android.support.v4.content.res.ResourcesCompat;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.Keep;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
+import androidx.core.content.res.ResourcesCompat;
+import androidx.appcompat.widget.AppCompatTextView;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
 import android.view.TouchDelegate;
@@ -36,39 +37,38 @@ import android.widget.TextView;
 import com.wireguard.android.R;
 
 public class FloatingActionsMenu extends ViewGroup {
-    public static final int EXPAND_UP = 0;
     public static final int EXPAND_DOWN = 1;
     public static final int EXPAND_LEFT = 2;
     public static final int EXPAND_RIGHT = 3;
-
+    public static final int EXPAND_UP = 0;
     public static final int LABELS_ON_LEFT_SIDE = 0;
     public static final int LABELS_ON_RIGHT_SIDE = 1;
-
+    private static final TimeInterpolator ALPHA_EXPAND_INTERPOLATOR = new DecelerateInterpolator();
     private static final int ANIMATION_DURATION = 300;
+    private static final boolean BROKEN_LABEL_STYLE = Build.VERSION.SDK_INT <= Build.VERSION_CODES.LOLLIPOP_MR1 && Build.BRAND.equals("ASUS");
     private static final float COLLAPSED_PLUS_ROTATION = 0f;
+    private static final TimeInterpolator COLLAPSE_INTERPOLATOR = new DecelerateInterpolator(3f);
     private static final float EXPANDED_PLUS_ROTATION = 90f + 45f;
     private static final TimeInterpolator EXPAND_INTERPOLATOR = new OvershootInterpolator();
-    private static final TimeInterpolator COLLAPSE_INTERPOLATOR = new DecelerateInterpolator(3f);
-    private static final TimeInterpolator ALPHA_EXPAND_INTERPOLATOR = new DecelerateInterpolator();
-    private int mExpandDirection;
-    private int mButtonSpacing;
-    private int mLabelsMargin;
-    private int mLabelsVerticalOffset;
-    private boolean mExpanded;
-    private final AnimatorSet mExpandAnimation = new AnimatorSet().setDuration(ANIMATION_DURATION);
     private final AnimatorSet mCollapseAnimation = new AnimatorSet().setDuration(ANIMATION_DURATION);
-    @Nullable private FloatingActionButton mAddButton;
-    @Nullable private RotatingDrawable mRotatingDrawable;
-    private int mMaxButtonWidth;
-    private int mMaxButtonHeight;
-    private int mLabelsStyle;
-    private int mLabelsPosition;
-    private int mButtonsCount;
-    @Nullable private TouchDelegateGroup mTouchDelegateGroup;
-    @Nullable private OnFloatingActionsMenuUpdateListener mListener;
+    private final AnimatorSet mExpandAnimation = new AnimatorSet().setDuration(ANIMATION_DURATION);
     private final Rect touchArea = new Rect(0, 0, 0, 0);
-    private float scrollYTranslation;
     private float behaviorYTranslation;
+    @Nullable private FloatingActionButton mAddButton;
+    private int mButtonSpacing;
+    private int mButtonsCount;
+    private int mExpandDirection;
+    private boolean mExpanded;
+    private int mLabelsMargin;
+    private int mLabelsPosition;
+    private int mLabelsStyle;
+    private int mLabelsVerticalOffset;
+    @Nullable private OnFloatingActionsMenuUpdateListener mListener;
+    private int mMaxButtonHeight;
+    private int mMaxButtonWidth;
+    @Nullable private RotatingDrawable mRotatingDrawable;
+    @Nullable private TouchDelegateGroup mTouchDelegateGroup;
+    private float scrollYTranslation;
 
     public FloatingActionsMenu(final Context context) {
         this(context, null);
@@ -84,51 +84,39 @@ public class FloatingActionsMenu extends ViewGroup {
         init(context, attrs);
     }
 
-    private void init(final Context context, @Nullable final AttributeSet attributeSet) {
-        mButtonSpacing = (int) (getResources().getDimension(R.dimen.fab_actions_spacing));
-        mLabelsMargin = getResources().getDimensionPixelSize(R.dimen.fab_labels_margin);
-        mLabelsVerticalOffset = getResources().getDimensionPixelSize(R.dimen.fab_shadow_offset);
+    private static int adjustForOvershoot(final int dimension) {
+        return dimension * 12 / 10;
+    }
 
-        mTouchDelegateGroup = new TouchDelegateGroup(this);
-        setTouchDelegate(mTouchDelegateGroup);
+    public void addButton(final LabeledFloatingActionButton button) {
+        addView(button, mButtonsCount - 1);
+        mButtonsCount++;
 
-        final TypedArray attr = context.obtainStyledAttributes(attributeSet, R.styleable.FloatingActionsMenu, 0, 0);
-        mExpandDirection = attr.getInt(R.styleable.FloatingActionsMenu_fab_expandDirection, EXPAND_UP);
-        mLabelsStyle = attr.getResourceId(R.styleable.FloatingActionsMenu_fab_labelStyle, 0);
-        mLabelsPosition = attr.getInt(R.styleable.FloatingActionsMenu_fab_labelsPosition, LABELS_ON_LEFT_SIDE);
-        attr.recycle();
-
-        if (mLabelsStyle != 0 && expandsHorizontally()) {
-            throw new IllegalStateException("Action labels in horizontal expand orientation is not supported.");
+        if (mLabelsStyle != 0) {
+            createLabels();
         }
-
-        createAddButton(context);
     }
 
-    public float getScrollYTranslation() {
-        return scrollYTranslation;
+    public void collapse() {
+        collapse(false);
     }
 
-    public void setScrollYTranslation(final float scrollYTranslation) {
-        this.scrollYTranslation = scrollYTranslation;
-        setTranslationY(behaviorYTranslation + scrollYTranslation);
+    private void collapse(final boolean immediately) {
+        if (mExpanded) {
+            mExpanded = false;
+            mTouchDelegateGroup.setEnabled(false);
+            mCollapseAnimation.setDuration(immediately ? 0 : ANIMATION_DURATION);
+            mCollapseAnimation.start();
+            mExpandAnimation.cancel();
+
+            if (mListener != null) {
+                mListener.onMenuCollapsed();
+            }
+        }
     }
 
-    public float getBehaviorYTranslation() {
-        return behaviorYTranslation;
-    }
-
-    public void setBehaviorYTranslation(final float behaviorYTranslation) {
-        this.behaviorYTranslation = behaviorYTranslation;
-        setTranslationY(behaviorYTranslation + scrollYTranslation);
-    }
-
-    public void setOnFloatingActionsMenuUpdateListener(final OnFloatingActionsMenuUpdateListener listener) {
-        mListener = listener;
-    }
-
-    private boolean expandsHorizontally() {
-        return mExpandDirection == EXPAND_LEFT || mExpandDirection == EXPAND_RIGHT;
+    public void collapseImmediately() {
+        collapse(true);
     }
 
     private void createAddButton(final Context context) {
@@ -155,87 +143,103 @@ public class FloatingActionsMenu extends ViewGroup {
         mButtonsCount++;
     }
 
-    public void addButton(final LabeledFloatingActionButton button) {
-        addView(button, mButtonsCount - 1);
-        mButtonsCount++;
+    private void createLabels() {
+        final Context context = BROKEN_LABEL_STYLE ? getContext() : new ContextThemeWrapper(getContext(), mLabelsStyle);
+
+        for (int i = 0; i < mButtonsCount; i++) {
+            final FloatingActionButton button = (FloatingActionButton) getChildAt(i);
+
+            if (button instanceof LabeledFloatingActionButton) {
+                final String title = ((LabeledFloatingActionButton) button).getTitle();
+
+                final AppCompatTextView label = new AppCompatTextView(context);
+                if (!BROKEN_LABEL_STYLE)
+                    label.setTextAppearance(context, mLabelsStyle);
+                label.setText(title);
+                addView(label);
+
+                button.setTag(R.id.fab_label, label);
+            }
+        }
+    }
+
+    public void expand() {
+        if (!mExpanded) {
+            mExpanded = true;
+            mTouchDelegateGroup.setEnabled(true);
+            mCollapseAnimation.cancel();
+            mExpandAnimation.start();
+
+            if (mListener != null) {
+                mListener.onMenuExpanded();
+            }
+        }
+    }
+
+    private boolean expandsHorizontally() {
+        return mExpandDirection == EXPAND_LEFT || mExpandDirection == EXPAND_RIGHT;
+    }
+
+    @Override
+    protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
+        return new LayoutParams(super.generateDefaultLayoutParams());
+    }
+
+    @Override
+    public ViewGroup.LayoutParams generateLayoutParams(final AttributeSet attrs) {
+        return new LayoutParams(super.generateLayoutParams(attrs));
+    }
+
+    @Override
+    protected ViewGroup.LayoutParams generateLayoutParams(final ViewGroup.LayoutParams p) {
+        return new LayoutParams(super.generateLayoutParams(p));
+    }
+
+    public float getBehaviorYTranslation() {
+        return behaviorYTranslation;
+    }
+
+    public float getScrollYTranslation() {
+        return scrollYTranslation;
+    }
+
+    private void init(final Context context, @Nullable final AttributeSet attributeSet) {
+        mButtonSpacing = (int) (getResources().getDimension(R.dimen.fab_actions_spacing));
+        mLabelsMargin = getResources().getDimensionPixelSize(R.dimen.fab_labels_margin);
+        mLabelsVerticalOffset = getResources().getDimensionPixelSize(R.dimen.fab_shadow_offset);
+
+        mTouchDelegateGroup = new TouchDelegateGroup(this);
+        setTouchDelegate(mTouchDelegateGroup);
+
+        final TypedArray attr = context.obtainStyledAttributes(attributeSet, R.styleable.FloatingActionsMenu, 0, 0);
+        mExpandDirection = attr.getInt(R.styleable.FloatingActionsMenu_fab_expandDirection, EXPAND_UP);
+        mLabelsStyle = attr.getResourceId(R.styleable.FloatingActionsMenu_fab_labelStyle, 0);
+        mLabelsPosition = attr.getInt(R.styleable.FloatingActionsMenu_fab_labelsPosition, LABELS_ON_LEFT_SIDE);
+        attr.recycle();
+
+        if (mLabelsStyle != 0 && expandsHorizontally()) {
+            throw new IllegalStateException("Action labels in horizontal expand orientation are not supported");
+        }
+
+        createAddButton(context);
+    }
+
+    public boolean isExpanded() {
+        return mExpanded;
+    }
+
+    @Override
+    protected void onFinishInflate() {
+        super.onFinishInflate();
+
+        bringChildToFront(mAddButton);
+        mButtonsCount = getChildCount();
 
         if (mLabelsStyle != 0) {
             createLabels();
         }
     }
 
-    public void removeButton(final LabeledFloatingActionButton button) {
-        removeView(button.getLabelView());
-        removeView(button);
-        button.setTag(R.id.fab_label, null);
-        mButtonsCount--;
-    }
-
-    @Override
-    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
-        measureChildren(widthMeasureSpec, heightMeasureSpec);
-
-        int width = 0;
-        int height = 0;
-
-        mMaxButtonWidth = 0;
-        mMaxButtonHeight = 0;
-        int maxLabelWidth = 0;
-
-        for (int i = 0; i < mButtonsCount; i++) {
-            final View child = getChildAt(i);
-
-            if (child.getVisibility() == GONE) {
-                continue;
-            }
-
-            switch (mExpandDirection) {
-                case EXPAND_UP:
-                case EXPAND_DOWN:
-                    mMaxButtonWidth = Math.max(mMaxButtonWidth, child.getMeasuredWidth());
-                    height += child.getMeasuredHeight();
-                    break;
-                case EXPAND_LEFT:
-                case EXPAND_RIGHT:
-                    width += child.getMeasuredWidth();
-                    mMaxButtonHeight = Math.max(mMaxButtonHeight, child.getMeasuredHeight());
-                    break;
-            }
-
-            if (!expandsHorizontally()) {
-                final TextView label = (TextView) child.getTag(R.id.fab_label);
-                if (label != null) {
-                    maxLabelWidth = Math.max(maxLabelWidth, label.getMeasuredWidth());
-                }
-            }
-        }
-
-        if (expandsHorizontally()) {
-            height = mMaxButtonHeight;
-        } else {
-            width = mMaxButtonWidth + (maxLabelWidth > 0 ? maxLabelWidth + mLabelsMargin : 0);
-        }
-
-        switch (mExpandDirection) {
-            case EXPAND_UP:
-            case EXPAND_DOWN:
-                height += mButtonSpacing * (mButtonsCount - 1);
-                height = adjustForOvershoot(height);
-                break;
-            case EXPAND_LEFT:
-            case EXPAND_RIGHT:
-                width += mButtonSpacing * (mButtonsCount - 1);
-                width = adjustForOvershoot(width);
-                break;
-        }
-
-        setMeasuredDimension(width, height);
-    }
-
-    private static int adjustForOvershoot(final int dimension) {
-        return dimension * 12 / 10;
-    }
-
     @Override
     protected void onLayout(final boolean changed, final int l, final int t, final int r, final int b) {
         switch (mExpandDirection) {
@@ -366,112 +370,64 @@ public class FloatingActionsMenu extends ViewGroup {
     }
 
     @Override
-    protected ViewGroup.LayoutParams generateDefaultLayoutParams() {
-        return new LayoutParams(super.generateDefaultLayoutParams());
-    }
+    protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec) {
+        measureChildren(widthMeasureSpec, heightMeasureSpec);
 
-    @Override
-    public ViewGroup.LayoutParams generateLayoutParams(final AttributeSet attrs) {
-        return new LayoutParams(super.generateLayoutParams(attrs));
-    }
+        int width = 0;
+        int height = 0;
 
-    @Override
-    protected ViewGroup.LayoutParams generateLayoutParams(final ViewGroup.LayoutParams p) {
-        return new LayoutParams(super.generateLayoutParams(p));
-    }
-
-    @Override
-    protected void onFinishInflate() {
-        super.onFinishInflate();
-
-        bringChildToFront(mAddButton);
-        mButtonsCount = getChildCount();
-
-        if (mLabelsStyle != 0) {
-            createLabels();
-        }
-    }
-
-    private void createLabels() {
-        final Context context = new ContextThemeWrapper(getContext(), mLabelsStyle);
+        mMaxButtonWidth = 0;
+        mMaxButtonHeight = 0;
+        int maxLabelWidth = 0;
 
         for (int i = 0; i < mButtonsCount; i++) {
-            final FloatingActionButton button = (FloatingActionButton) getChildAt(i);
+            final View child = getChildAt(i);
 
-            if (button instanceof LabeledFloatingActionButton) {
-                final String title = ((LabeledFloatingActionButton) button).getTitle();
+            if (child.getVisibility() == GONE) {
+                continue;
+            }
 
-                final AppCompatTextView label = new AppCompatTextView(context);
-                label.setTextAppearance(context, mLabelsStyle);
-                label.setText(title);
-                addView(label);
+            switch (mExpandDirection) {
+                case EXPAND_UP:
+                case EXPAND_DOWN:
+                    mMaxButtonWidth = Math.max(mMaxButtonWidth, child.getMeasuredWidth());
+                    height += child.getMeasuredHeight();
+                    break;
+                case EXPAND_LEFT:
+                case EXPAND_RIGHT:
+                    width += child.getMeasuredWidth();
+                    mMaxButtonHeight = Math.max(mMaxButtonHeight, child.getMeasuredHeight());
+                    break;
+            }
 
-                button.setTag(R.id.fab_label, label);
+            if (!expandsHorizontally()) {
+                final TextView label = (TextView) child.getTag(R.id.fab_label);
+                if (label != null) {
+                    maxLabelWidth = Math.max(maxLabelWidth, label.getMeasuredWidth());
+                }
             }
         }
-    }
 
-    public void collapse() {
-        collapse(false);
-    }
-
-    public void collapseImmediately() {
-        collapse(true);
-    }
-
-    private void collapse(final boolean immediately) {
-        if (mExpanded) {
-            mExpanded = false;
-            mTouchDelegateGroup.setEnabled(false);
-            mCollapseAnimation.setDuration(immediately ? 0 : ANIMATION_DURATION);
-            mCollapseAnimation.start();
-            mExpandAnimation.cancel();
-
-            if (mListener != null) {
-                mListener.onMenuCollapsed();
-            }
-        }
-    }
-
-    public void toggle() {
-        if (mExpanded) {
-            collapse();
+        if (expandsHorizontally()) {
+            height = mMaxButtonHeight;
         } else {
-            expand();
+            width = mMaxButtonWidth + (maxLabelWidth > 0 ? maxLabelWidth + mLabelsMargin : 0);
         }
-    }
 
-    public void expand() {
-        if (!mExpanded) {
-            mExpanded = true;
-            mTouchDelegateGroup.setEnabled(true);
-            mCollapseAnimation.cancel();
-            mExpandAnimation.start();
-
-            if (mListener != null) {
-                mListener.onMenuExpanded();
-            }
+        switch (mExpandDirection) {
+            case EXPAND_UP:
+            case EXPAND_DOWN:
+                height += mButtonSpacing * (mButtonsCount - 1);
+                height = adjustForOvershoot(height);
+                break;
+            case EXPAND_LEFT:
+            case EXPAND_RIGHT:
+                width += mButtonSpacing * (mButtonsCount - 1);
+                width = adjustForOvershoot(width);
+                break;
         }
-    }
 
-    public boolean isExpanded() {
-        return mExpanded;
-    }
-
-    @Override
-    public void setEnabled(final boolean enabled) {
-        super.setEnabled(enabled);
-
-        mAddButton.setEnabled(enabled);
-    }
-
-    @Override
-    public Parcelable onSaveInstanceState() {
-        final Parcelable superState = super.onSaveInstanceState();
-        final SavedState savedState = new SavedState(superState);
-        savedState.mExpanded = mExpanded;
-
-        return savedState;
+        setMeasuredDimension(width, height);
     }
 
     @Override
@@ -491,10 +447,55 @@ public class FloatingActionsMenu extends ViewGroup {
         }
     }
 
-    public interface OnFloatingActionsMenuUpdateListener {
-        void onMenuExpanded();
+    @Override
+    public Parcelable onSaveInstanceState() {
+        final Parcelable superState = super.onSaveInstanceState();
+        final SavedState savedState = new SavedState(superState);
+        savedState.mExpanded = mExpanded;
 
+        return savedState;
+    }
+
+    public void removeButton(final LabeledFloatingActionButton button) {
+        removeView(button.getLabelView());
+        removeView(button);
+        button.setTag(R.id.fab_label, null);
+        mButtonsCount--;
+    }
+
+    public void setBehaviorYTranslation(final float behaviorYTranslation) {
+        this.behaviorYTranslation = behaviorYTranslation;
+        setTranslationY(behaviorYTranslation + scrollYTranslation);
+    }
+
+    @Override
+    public void setEnabled(final boolean enabled) {
+        super.setEnabled(enabled);
+
+        mAddButton.setEnabled(enabled);
+    }
+
+    public void setOnFloatingActionsMenuUpdateListener(final OnFloatingActionsMenuUpdateListener listener) {
+        mListener = listener;
+    }
+
+    public void setScrollYTranslation(final float scrollYTranslation) {
+        this.scrollYTranslation = scrollYTranslation;
+        setTranslationY(behaviorYTranslation + scrollYTranslation);
+    }
+
+    public void toggle() {
+        if (mExpanded) {
+            collapse();
+        } else {
+            expand();
+        }
+    }
+
+    public interface OnFloatingActionsMenuUpdateListener {
         void onMenuCollapsed();
+
+        void onMenuExpanded();
     }
 
     private static class RotatingDrawable extends LayerDrawable {
@@ -504,6 +505,14 @@ public class FloatingActionsMenu extends ViewGroup {
             super(new Drawable[]{drawable});
         }
 
+        @Override
+        public void draw(final Canvas canvas) {
+            canvas.save();
+            canvas.rotate(mRotation, getBounds().centerX(), getBounds().centerY());
+            super.draw(canvas);
+            canvas.restore();
+        }
+
         @SuppressWarnings("UnusedDeclaration")
         public float getRotation() {
             return mRotation;
@@ -515,14 +524,6 @@ public class FloatingActionsMenu extends ViewGroup {
             mRotation = rotation;
             invalidateSelf();
         }
-
-        @Override
-        public void draw(final Canvas canvas) {
-            canvas.save();
-            canvas.rotate(mRotation, getBounds().centerX(), getBounds().centerY());
-            super.draw(canvas);
-            canvas.restore();
-        }
     }
 
     public static class SavedState extends BaseSavedState {
@@ -538,7 +539,7 @@ public class FloatingActionsMenu extends ViewGroup {
                 return new SavedState[size];
             }
         };
-        public boolean mExpanded;
+        private boolean mExpanded;
 
         public SavedState(final Parcelable parcel) {
             super(parcel);
@@ -558,10 +559,10 @@ public class FloatingActionsMenu extends ViewGroup {
 
     private class LayoutParams extends ViewGroup.LayoutParams {
 
-        private final ObjectAnimator mExpandDir = new ObjectAnimator();
-        private final ObjectAnimator mExpandAlpha = new ObjectAnimator();
-        private final ObjectAnimator mCollapseDir = new ObjectAnimator();
         private final ObjectAnimator mCollapseAlpha = new ObjectAnimator();
+        private final ObjectAnimator mCollapseDir = new ObjectAnimator();
+        private final ObjectAnimator mExpandAlpha = new ObjectAnimator();
+        private final ObjectAnimator mExpandDir = new ObjectAnimator();
         private boolean animationsSetToPlay;
 
         LayoutParams(final ViewGroup.LayoutParams source) {
@@ -592,6 +593,20 @@ public class FloatingActionsMenu extends ViewGroup {
             }
         }
 
+        private void addLayerTypeListener(final Animator animator, final View view) {
+            animator.addListener(new AnimatorListenerAdapter() {
+                @Override
+                public void onAnimationEnd(final Animator animation) {
+                    view.setLayerType(LAYER_TYPE_NONE, null);
+                }
+
+                @Override
+                public void onAnimationStart(final Animator animation) {
+                    view.setLayerType(LAYER_TYPE_HARDWARE, null);
+                }
+            });
+        }
+
         public void setAnimationsTarget(final View view) {
             mCollapseAlpha.setTarget(view);
             mCollapseDir.setTarget(view);
@@ -610,19 +625,5 @@ public class FloatingActionsMenu extends ViewGroup {
                 animationsSetToPlay = true;
             }
         }
-
-        private void addLayerTypeListener(final Animator animator, final View view) {
-            animator.addListener(new AnimatorListenerAdapter() {
-                @Override
-                public void onAnimationEnd(final Animator animation) {
-                    view.setLayerType(LAYER_TYPE_NONE, null);
-                }
-
-                @Override
-                public void onAnimationStart(final Animator animation) {
-                    view.setLayerType(LAYER_TYPE_HARDWARE, null);
-                }
-            });
-        }
     }
 }

app/src/main/java/com/wireguard/android/widget/fab/FloatingActionsMenuRecyclerViewScrollListener.java

@@ -1,11 +1,11 @@
 /*
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.widget.fab;
 
-import android.support.v7.widget.RecyclerView;
+import androidx.recyclerview.widget.RecyclerView;
 
 public class FloatingActionsMenuRecyclerViewScrollListener extends RecyclerView.OnScrollListener {
     private static final float SCALE_FACTOR = 1.5f;

app/src/main/java/com/wireguard/android/widget/fab/LabeledFloatingActionButton.java

@@ -1,6 +1,6 @@
 /*
  * Copyright © 2014 Jerzy Chalupski
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,8 +8,8 @@ package com.wireguard.android.widget.fab;
 
 import android.content.Context;
 import android.content.res.TypedArray;
-import android.support.annotation.Nullable;
-import android.support.design.widget.FloatingActionButton;
+import androidx.annotation.Nullable;
+import com.google.android.material.floatingactionbutton.FloatingActionButton;
 import android.util.AttributeSet;
 import android.widget.TextView;
 

app/src/main/java/com/wireguard/android/widget/fab/TouchDelegateGroup.java

@@ -1,13 +1,13 @@
 /*
  * Copyright © 2014 Jerzy Chalupski
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.android.widget.fab;
 
 import android.graphics.Rect;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 import android.view.MotionEvent;
 import android.view.TouchDelegate;
 import android.view.View;
@@ -29,13 +29,6 @@ public class TouchDelegateGroup extends TouchDelegate {
         mTouchDelegates.add(touchDelegate);
     }
 
-    public void removeTouchDelegate(final TouchDelegate touchDelegate) {
-        mTouchDelegates.remove(touchDelegate);
-        if (mCurrentTouchDelegate == touchDelegate) {
-            mCurrentTouchDelegate = null;
-        }
-    }
-
     public void clearTouchDelegates() {
         mTouchDelegates.clear();
         mCurrentTouchDelegate = null;
@@ -72,6 +65,13 @@ public class TouchDelegateGroup extends TouchDelegate {
         return delegate != null && delegate.onTouchEvent(event);
     }
 
+    public void removeTouchDelegate(final TouchDelegate touchDelegate) {
+        mTouchDelegates.remove(touchDelegate);
+        if (mCurrentTouchDelegate == touchDelegate) {
+            mCurrentTouchDelegate = null;
+        }
+    }
+
     public void setEnabled(final boolean enabled) {
         mEnabled = enabled;
     }

app/src/main/java/com/wireguard/config/Attribute.java

@@ -1,91 +1,49 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.config;
 
-import android.support.annotation.Nullable;
 import android.text.TextUtils;
 
-import java.util.HashMap;
-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.
- */
+import java9.util.Optional;
 
-public enum Attribute {
-    ADDRESS("Address"),
-    ALLOWED_IPS("AllowedIPs"),
-    DNS("DNS"),
-    EXCLUDED_APPLICATIONS("ExcludedApplications"),
-    ENDPOINT("Endpoint"),
-    LISTEN_PORT("ListenPort"),
-    MTU("MTU"),
-    PERSISTENT_KEEPALIVE("PersistentKeepalive"),
-    PRESHARED_KEY("PresharedKey"),
-    PRIVATE_KEY("PrivateKey"),
-    PUBLIC_KEY("PublicKey");
+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 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 Pattern SEPARATOR_PATTERN = Pattern.compile("\\s|=");
+    private final String key;
+    private final String value;
 
-    static {
-        KEY_MAP = new HashMap<>(Attribute.values().length);
-        for (final Attribute key : Attribute.values()) {
-            KEY_MAP.put(key.token.toLowerCase(), key);
-        }
+    private Attribute(final String key, final String value) {
+        this.key = key;
+        this.value = value;
     }
 
-    private final Pattern pattern;
-    private final String token;
-
-    Attribute(final String token) {
-        pattern = Pattern.compile(token + "\\s*=\\s*(\\S.*)");
-        this.token = token;
+    public static String join(final Iterable<?> values) {
+        return TextUtils.join(", ", values);
     }
 
-    public static <T> String iterableToString(final Iterable<T> iterable) {
-        return TextUtils.join(", ", iterable);
+    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 Attribute match(final CharSequence line) {
-        return KEY_MAP.get(SEPARATOR_PATTERN.split(line)[0].toLowerCase());
+    public static String[] split(final CharSequence value) {
+        return LIST_SEPARATOR.split(value);
     }
 
-    public static String[] stringToList(@Nullable final String string) {
-        if (TextUtils.isEmpty(string))
-            return EMPTY_LIST;
-        return LIST_SEPARATOR_PATTERN.split(string.trim());
+    public String getKey() {
+        return key;
     }
 
-    public String composeWith(@Nullable final Object value) {
-        return String.format("%s = %s%n", token, value);
-    }
-
-    public String composeWith(final int value) {
-        return String.format("%s = %d%n", token, value);
-    }
-
-    public <T> String composeWith(final Iterable<T> value) {
-        return String.format("%s = %s%n", token, iterableToString(value));
-    }
-
-    @Nullable
-    public String parse(final CharSequence line) {
-        final Matcher matcher = pattern.matcher(line);
-        return matcher.matches() ? matcher.group(1) : null;
-    }
-
-    @Nullable
-    public String[] parseList(final CharSequence line) {
-        final Matcher matcher = pattern.matcher(line);
-        return matcher.matches() ? stringToList(matcher.group(1)) : null;
+    public String getValue() {
+        return value;
     }
 }

app/src/main/java/com/wireguard/config/BadConfigException.java

@@ -0,0 +1,118 @@
+/*
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.config;
+
+import androidx.annotation.Nullable;
+
+import com.wireguard.crypto.KeyFormatException;
+
+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"),
+        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,
+        MISSING_VALUE,
+        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;
+        }
+    }
+}

app/src/main/java/com/wireguard/config/Config.java

@@ -1,51 +1,73 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 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 android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
-import com.android.databinding.library.baseAdapters.BR;
+import com.wireguard.config.BadConfigException.Location;
+import com.wireguard.config.BadConfigException.Reason;
+import com.wireguard.config.BadConfigException.Section;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Objects;
+import java.util.Set;
 
 /**
- * Represents a wg-quick configuration file, its name, and its connection state.
+ * Represents the contents of a wg-quick configuration file, made up of one or more "Interface"
+ * sections (combined together), and zero or more "Peer" sections (treated individually).
+ * <p>
+ * Instances of this class are immutable.
  */
+public final class Config {
+    private final Interface interfaze;
+    private final List<Peer> peers;
 
-public class Config {
-    private final Interface interfaceSection = new Interface();
-    private List<Peer> peers = new ArrayList<>();
-
-    public static Config from(final String string) throws IOException {
-        return from(new BufferedReader(new StringReader(string)));
+    private Config(final Builder builder) {
+        interfaze = Objects.requireNonNull(builder.interfaze, "An [Interface] section is required");
+        // Defensively copy to ensure immutability even if the Builder is reused.
+        peers = Collections.unmodifiableList(new ArrayList<>(builder.peers));
     }
 
-    public static Config from(final InputStream stream) throws IOException {
-        return from(new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8)));
+    /**
+     * Parses an series of "Interface" and "Peer" sections into a {@code Config}. Throws
+     * {@link BadConfigException} if the input is not well-formed or contains data that cannot
+     * be parsed.
+     *
+     * @param stream a stream of UTF-8 text that is interpreted as a WireGuard configuration
+     * @return a {@code Config} instance representing the supplied configuration
+     */
+    public static Config parse(final InputStream stream)
+            throws IOException, BadConfigException {
+        return parse(new BufferedReader(new InputStreamReader(stream)));
     }
 
-    public static Config from(final BufferedReader reader) throws IOException {
-        final Config config = new Config();
-        Peer currentPeer = null;
-        String line;
+    /**
+     * Parses an series of "Interface" and "Peer" sections into a {@code Config}. Throws
+     * {@link BadConfigException} if the input is not well-formed or contains data that cannot
+     * be parsed.
+     *
+     * @param reader a BufferedReader of UTF-8 text that is interpreted as a WireGuard configuration
+     * @return a {@code Config} instance representing the supplied configuration
+     */
+    public static Config parse(final BufferedReader reader)
+            throws IOException, BadConfigException {
+        final Builder builder = new Builder();
+        final Collection<String> interfaceLines = new ArrayList<>();
+        final Collection<String> peerLines = new ArrayList<>();
         boolean inInterfaceSection = false;
+        boolean inPeerSection = false;
+        @Nullable String line;
         while ((line = reader.readLine()) != null) {
             final int commentIndex = line.indexOf('#');
             if (commentIndex != -1)
@@ -53,119 +75,147 @@ public class Config {
             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;
+            if (line.startsWith("[")) {
+                // Consume all [Peer] lines read so far.
+                if (inPeerSection) {
+                    builder.parsePeer(peerLines);
+                    peerLines.clear();
+                }
+                if ("[Interface]".equalsIgnoreCase(line)) {
+                    inInterfaceSection = true;
+                    inPeerSection = false;
+                } else if ("[Peer]".equalsIgnoreCase(line)) {
+                    inInterfaceSection = false;
+                    inPeerSection = true;
+                } else {
+                    throw new BadConfigException(Section.CONFIG, Location.TOP_LEVEL,
+                            Reason.UNKNOWN_SECTION, line);
+                }
             } else if (inInterfaceSection) {
-                config.interfaceSection.parse(line);
-            } else if (currentPeer != null) {
-                currentPeer.parse(line);
+                interfaceLines.add(line);
+            } else if (inPeerSection) {
+                peerLines.add(line);
             } else {
-                throw new IllegalArgumentException("Invalid configuration line: " + line);
+                throw new BadConfigException(Section.CONFIG, Location.TOP_LEVEL,
+                        Reason.UNKNOWN_SECTION, line);
             }
         }
-        if (!inInterfaceSection && currentPeer == null) {
-            throw new IllegalArgumentException("Could not find any config information");
-        }
-        return config;
+        if (inPeerSection)
+            builder.parsePeer(peerLines);
+        else if (!inInterfaceSection)
+            throw new BadConfigException(Section.CONFIG, Location.TOP_LEVEL,
+                    Reason.MISSING_SECTION, null);
+        // Combine all [Interface] sections in the file.
+        builder.parseInterface(interfaceLines);
+        return builder.build();
     }
 
+    @Override
+    public boolean equals(final Object obj) {
+        if (!(obj instanceof Config))
+            return false;
+        final Config other = (Config) obj;
+        return interfaze.equals(other.interfaze) && peers.equals(other.peers);
+    }
+
+    /**
+     * Returns the interface section of the configuration.
+     *
+     * @return the interface configuration
+     */
     public Interface getInterface() {
-        return interfaceSection;
+        return interfaze;
     }
 
+    /**
+     * Returns a list of the configuration's peer sections.
+     *
+     * @return a list of {@link Peer}s
+     */
     public List<Peer> getPeers() {
         return peers;
     }
 
+    @Override
+    public int hashCode() {
+        return 31 * interfaze.hashCode() + peers.hashCode();
+    }
+
+    /**
+     * Converts the {@code Config} into a string suitable for debugging purposes. The {@code Config}
+     * is identified by its interface's public key and the number of peers it has.
+     *
+     * @return a concise single-line identifier for the {@code Config}
+     */
     @Override
     public String toString() {
-        final StringBuilder sb = new StringBuilder().append(interfaceSection);
+        return "(Config " + interfaze + " (" + peers.size() + " peers))";
+    }
+
+    /**
+     * Converts the {@code Config} into a string suitable for use as a {@code wg-quick}
+     * configuration file.
+     *
+     * @return the {@code Config} represented as one [Interface] and zero or more [Peer] sections
+     */
+    public String toWgQuickString() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("[Interface]\n").append(interfaze.toWgQuickString());
         for (final Peer peer : peers)
-            sb.append('\n').append(peer);
+            sb.append("\n[Peer]\n").append(peer.toWgQuickString());
         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);
-            }
+    /**
+     * Serializes the {@code Config} for use with the WireGuard cross-platform userspace API.
+     *
+     * @return the {@code Config} represented as a series of "key=value" lines
+     */
+    public String toWgUserspaceString() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append(interfaze.toWgUserspaceString());
+        sb.append("replace_peers=true\n");
+        for (final Peer peer : peers)
+            sb.append(peer.toWgUserspaceString());
+        return sb.toString();
+    }
 
-            @Override
-            public Observable[] newArray(final int size) {
-                return new Observable[size];
-            }
-        };
-        @Nullable private String name;
-        private final Interface.Observable observableInterface;
-        private final ObservableList<Peer.Observable> observablePeers;
+    @SuppressWarnings("UnusedReturnValue")
+    public static final class Builder {
+        // Defaults to an empty set.
+        private final Set<Peer> peers = new LinkedHashSet<>();
+        // No default; must be provided before building.
+        @Nullable private Interface interfaze;
 
-        public Observable(@Nullable final Config parent, @Nullable final String name) {
-            this.name = name;
-
-            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 Builder addPeer(final Peer peer) {
+            peers.add(peer);
+            return this;
         }
 
-        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 Builder addPeers(final Collection<Peer> peers) {
+            this.peers.addAll(peers);
+            return this;
         }
 
-        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();
+        public Config build() {
+            if (interfaze == null)
+                throw new IllegalArgumentException("An [Interface] section is required");
+            return new Config(this);
         }
 
-        @Override
-        public int describeContents() {
-            return 0;
+        public Builder parseInterface(final Iterable<? extends CharSequence> lines)
+                throws BadConfigException {
+            return setInterface(Interface.parse(lines));
         }
 
-        @Bindable
-        public Interface.Observable getInterfaceSection() {
-            return observableInterface;
+        public Builder parsePeer(final Iterable<? extends CharSequence> lines)
+                throws BadConfigException {
+            return addPeer(Peer.parse(lines));
         }
 
-        @Bindable
-        public String getName() {
-            return name == null ? "" : name;
-        }
-
-        @Bindable
-        public ObservableList<Peer.Observable> getPeers() {
-            return observablePeers;
-        }
-
-        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);
+        public Builder setInterface(final Interface interfaze) {
+            this.interfaze = interfaze;
+            return this;
         }
     }
 }

app/src/main/java/com/wireguard/config/InetAddresses.java

@@ -1,23 +1,26 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.config;
 
-import android.support.annotation.Nullable;
-
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.Inet4Address;
+import java.net.Inet6Address;
 import java.net.InetAddress;
 
+/**
+ * Utility methods for creating instances of {@link InetAddress}.
+ */
 public final class InetAddresses {
     private static final Method PARSER_METHOD;
 
     static {
         try {
             // This method is only present on Android.
+            // noinspection JavaReflectionMemberAccess
             PARSER_METHOD = InetAddress.class.getMethod("parseNumericAddress", String.class);
         } catch (final NoSuchMethodException e) {
             throw new RuntimeException(e);
@@ -28,13 +31,24 @@ public final class InetAddresses {
         // Prevent instantiation.
     }
 
-    public static InetAddress parse(@Nullable final String address) {
-        if (address == null || address.isEmpty())
-            throw new IllegalArgumentException("Empty address");
+    /**
+     * Parses a numeric IPv4 or IPv6 address without performing any DNS lookups.
+     *
+     * @param address a string representing the IP address
+     * @return an instance of {@link Inet4Address} or {@link Inet6Address}, as appropriate
+     */
+    public static InetAddress parse(final String address) throws ParseException {
+        if (address.isEmpty())
+            throw new ParseException(InetAddress.class, address, "Empty address");
         try {
             return (InetAddress) PARSER_METHOD.invoke(null, address);
         } catch (final IllegalAccessException | InvocationTargetException e) {
-            throw new RuntimeException(e.getCause() == null ? e : e.getCause());
+            final Throwable cause = e.getCause();
+            // Re-throw parsing exceptions with the original type, as callers might try to catch
+            // them. On the other hand, callers cannot be expected to handle reflection failures.
+            if (cause instanceof IllegalArgumentException)
+                throw new ParseException(InetAddress.class, address, cause);
+            throw new RuntimeException(e);
         }
     }
 }

app/src/main/java/com/wireguard/config/InetEndpoint.java

@@ -0,0 +1,125 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.config;
+
+import androidx.annotation.Nullable;
+
+import org.threeten.bp.Duration;
+import org.threeten.bp.Instant;
+
+import java.net.Inet4Address;
+import java.net.InetAddress;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.net.UnknownHostException;
+import java.util.regex.Pattern;
+
+import java9.util.Optional;
+
+
+/**
+ * An external endpoint (host and port) used to connect to a WireGuard {@link Peer}.
+ * <p>
+ * Instances of this class are externally immutable.
+ */
+public final class InetEndpoint {
+    private static final Pattern BARE_IPV6 = Pattern.compile("^[^\\[]*:");
+    private static final Pattern FORBIDDEN_CHARACTERS = Pattern.compile("[/?#]");
+
+    private final String host;
+    private final boolean isResolved;
+    private final Object lock = new Object();
+    private final int port;
+    private Instant lastResolution = Instant.EPOCH;
+    @Nullable private InetEndpoint resolved;
+
+    private InetEndpoint(final String host, final boolean isResolved, final int port) {
+        this.host = host;
+        this.isResolved = isResolved;
+        this.port = port;
+    }
+
+    public static InetEndpoint parse(final String endpoint) throws ParseException {
+        if (FORBIDDEN_CHARACTERS.matcher(endpoint).find())
+            throw new ParseException(InetEndpoint.class, endpoint, "Forbidden characters");
+        final URI uri;
+        try {
+            uri = new URI("wg://" + endpoint);
+        } catch (final URISyntaxException e) {
+            throw new IllegalArgumentException(e);
+        }
+        if (uri.getPort() < 0 || uri.getPort() > 65535)
+            throw new ParseException(InetEndpoint.class, endpoint, "Missing/invalid port number");
+        try {
+            InetAddresses.parse(uri.getHost());
+            // Parsing ths host as a numeric address worked, so we don't need to do DNS lookups.
+            return new InetEndpoint(uri.getHost(), true, uri.getPort());
+        } catch (final ParseException ignored) {
+            // Failed to parse the host as a numeric address, so it must be a DNS hostname/FQDN.
+            return new InetEndpoint(uri.getHost(), false, uri.getPort());
+        }
+    }
+
+    @Override
+    public boolean equals(final Object obj) {
+        if (!(obj instanceof InetEndpoint))
+            return false;
+        final InetEndpoint other = (InetEndpoint) obj;
+        return host.equals(other.host) && port == other.port;
+    }
+
+    public String getHost() {
+        return host;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    /**
+     * Generate an {@code InetEndpoint} instance with the same port and the host resolved using DNS
+     * to a numeric address. If the host is already numeric, the existing instance may be returned.
+     * Because this function may perform network I/O, it must not be called from the main thread.
+     *
+     * @return the resolved endpoint, or {@link Optional#empty()}
+     */
+    public Optional<InetEndpoint> getResolved() {
+        if (isResolved)
+            return Optional.of(this);
+        synchronized (lock) {
+            //TODO(zx2c4): Implement a real timeout mechanism using DNS TTL
+            if (Duration.between(lastResolution, Instant.now()).toMinutes() > 1) {
+                try {
+                    // Prefer v4 endpoints over v6 to work around DNS64 and IPv6 NAT issues.
+                    final InetAddress[] candidates = InetAddress.getAllByName(host);
+                    InetAddress address = candidates[0];
+                    for (final InetAddress candidate : candidates) {
+                        if (candidate instanceof Inet4Address) {
+                            address = candidate;
+                            break;
+                        }
+                    }
+                    resolved = new InetEndpoint(address.getHostAddress(), true, port);
+                    lastResolution = Instant.now();
+                } catch (final UnknownHostException e) {
+                    resolved = null;
+                }
+            }
+            return Optional.ofNullable(resolved);
+        }
+    }
+
+    @Override
+    public int hashCode() {
+        return host.hashCode() ^ port;
+    }
+
+    @Override
+    public String toString() {
+        final boolean isBareIpv6 = isResolved && BARE_IPV6.matcher(host).matches();
+        return (isBareIpv6 ? '[' + host + ']' : host) + ':' + port;
+    }
+}

app/src/main/java/com/wireguard/config/InetNetwork.java

@@ -1,6 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -8,26 +7,45 @@ package com.wireguard.config;
 
 import java.net.Inet4Address;
 import java.net.InetAddress;
-import java.util.Objects;
 
-public class InetNetwork {
+/**
+ * An Internet network, denoted by its address and netmask
+ * <p>
+ * Instances of this class are immutable.
+ */
+public final class InetNetwork {
     private final InetAddress address;
     private final int mask;
 
-    public InetNetwork(final String input) {
-        final int slash = input.lastIndexOf('/');
+    private InetNetwork(final InetAddress address, final int mask) {
+        this.address = address;
+        this.mask = mask;
+    }
+
+    public static InetNetwork parse(final String network) throws ParseException {
+        final int slash = network.lastIndexOf('/');
+        final String maskString;
         final int rawMask;
         final String rawAddress;
         if (slash >= 0) {
-            rawMask = Integer.parseInt(input.substring(slash + 1), 10);
-            rawAddress = input.substring(0, slash);
+            maskString = network.substring(slash + 1);
+            try {
+                rawMask = Integer.parseInt(maskString, 10);
+            } catch (final NumberFormatException ignored) {
+                throw new ParseException(Integer.class, maskString);
+            }
+            rawAddress = network.substring(0, slash);
         } else {
+            maskString = "";
             rawMask = -1;
-            rawAddress = input;
+            rawAddress = network;
         }
-        address = InetAddresses.parse(rawAddress);
+        final InetAddress address = InetAddresses.parse(rawAddress);
         final int maxMask = (address instanceof Inet4Address) ? 32 : 128;
-        mask = rawMask >= 0 && rawMask <= maxMask ? rawMask : maxMask;
+        if (rawMask > maxMask)
+            throw new ParseException(InetNetwork.class, maskString, "Invalid network mask");
+        final int mask = rawMask >= 0 && rawMask <= maxMask ? rawMask : maxMask;
+        return new InetNetwork(address, mask);
     }
 
     @Override
@@ -35,7 +53,7 @@ public class InetNetwork {
         if (!(obj instanceof InetNetwork))
             return false;
         final InetNetwork other = (InetNetwork) obj;
-        return Objects.equals(address, other.address) && mask == other.mask;
+        return address.equals(other.address) && mask == other.mask;
     }
 
     public InetAddress getAddress() {

app/src/main/java/com/wireguard/config/Interface.java

@@ -1,394 +1,355 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.config;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
-import com.wireguard.android.BR;
-import com.wireguard.crypto.Keypair;
+import com.wireguard.config.BadConfigException.Location;
+import com.wireguard.config.BadConfigException.Reason;
+import com.wireguard.config.BadConfigException.Section;
+import com.wireguard.crypto.Key;
+import com.wireguard.crypto.KeyFormatException;
+import com.wireguard.crypto.KeyPair;
 
 import java.net.InetAddress;
-import java.util.ArrayList;
-import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Set;
+
+import java9.util.Lists;
+import java9.util.Optional;
+import java9.util.stream.Collectors;
+import java9.util.stream.StreamSupport;
 
 /**
- * Represents the configuration for a WireGuard interface (an [Interface] block).
+ * Represents the configuration for a WireGuard interface (an [Interface] block). Interfaces must
+ * have a private key (used to initialize a {@code KeyPair}), and may optionally have several other
+ * attributes.
+ * <p>
+ * Instances of this class are immutable.
  */
+public final class Interface {
+    private static final int MAX_UDP_PORT = 65535;
+    private static final int MIN_UDP_PORT = 0;
 
-public class Interface {
-    private final List<InetNetwork> addressList;
-    private final List<InetAddress> dnsList;
-    private final List<String> excludedApplications;
-    @Nullable private Keypair keypair;
-    private int listenPort;
-    private int mtu;
+    private final Set<InetNetwork> addresses;
+    private final Set<InetAddress> dnsServers;
+    private final Set<String> excludedApplications;
+    private final KeyPair keyPair;
+    private final Optional<Integer> listenPort;
+    private final Optional<Integer> mtu;
 
-    public Interface() {
-        addressList = new ArrayList<>();
-        dnsList = new ArrayList<>();
-        excludedApplications = new ArrayList<>();
+    private Interface(final Builder builder) {
+        // Defensively copy to ensure immutability even if the Builder is reused.
+        addresses = Collections.unmodifiableSet(new LinkedHashSet<>(builder.addresses));
+        dnsServers = Collections.unmodifiableSet(new LinkedHashSet<>(builder.dnsServers));
+        excludedApplications = Collections.unmodifiableSet(new LinkedHashSet<>(builder.excludedApplications));
+        keyPair = Objects.requireNonNull(builder.keyPair, "Interfaces must have a private key");
+        listenPort = builder.listenPort;
+        mtu = builder.mtu;
     }
 
-    private void addAddresses(@Nullable 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 InetNetwork(addr));
+    /**
+     * Parses an series of "KEY = VALUE" lines into an {@code Interface}. Throws
+     * {@link ParseException} if the input is not well-formed or contains unknown attributes.
+     *
+     * @param lines An iterable sequence of lines, containing at least a private key attribute
+     * @return An {@code Interface} with all of the attributes from {@code lines} set
+     */
+    public static Interface parse(final Iterable<? extends CharSequence> lines)
+            throws BadConfigException {
+        final Builder builder = new Builder();
+        for (final CharSequence line : lines) {
+            final Attribute attribute = Attribute.parse(line).orElseThrow(() ->
+                    new BadConfigException(Section.INTERFACE, Location.TOP_LEVEL,
+                            Reason.SYNTAX_ERROR, line));
+            switch (attribute.getKey().toLowerCase(Locale.ENGLISH)) {
+                case "address":
+                    builder.parseAddresses(attribute.getValue());
+                    break;
+                case "dns":
+                    builder.parseDnsServers(attribute.getValue());
+                    break;
+                case "excludedapplications":
+                    builder.parseExcludedApplications(attribute.getValue());
+                    break;
+                case "listenport":
+                    builder.parseListenPort(attribute.getValue());
+                    break;
+                case "mtu":
+                    builder.parseMtu(attribute.getValue());
+                    break;
+                case "privatekey":
+                    builder.parsePrivateKey(attribute.getValue());
+                    break;
+                default:
+                    throw new BadConfigException(Section.INTERFACE, Location.TOP_LEVEL,
+                            Reason.UNKNOWN_ATTRIBUTE, attribute.getKey());
             }
         }
-    }
-
-    private void addDnses(@Nullable final String[] dnses) {
-        if (dnses != null && dnses.length > 0) {
-            for (final String dns : dnses) {
-                dnsList.add(InetAddresses.parse(dns));
-            }
-        }
-    }
-
-    private void addExcludedApplications(@Nullable final String[] applications) {
-        if (applications != null && applications.length > 0) {
-            excludedApplications.addAll(Arrays.asList(applications));
-        }
-    }
-
-    @Nullable
-    private String getAddressString() {
-        if (addressList.isEmpty())
-            return null;
-        return Attribute.iterableToString(addressList);
-    }
-
-    public InetNetwork[] getAddresses() {
-        return addressList.toArray(new InetNetwork[addressList.size()]);
-    }
-
-    @Nullable
-    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()]);
-    }
-
-    @Nullable
-    private String getExcludedApplicationsString() {
-        if (excludedApplications.isEmpty())
-            return null;
-        return Attribute.iterableToString(excludedApplications);
-    }
-
-    public String[] getExcludedApplications() {
-        return excludedApplications.toArray(new String[excludedApplications.size()]);
-    }
-
-    public int getListenPort() {
-        return listenPort;
-    }
-
-    @Nullable
-    private String getListenPortString() {
-        if (listenPort == 0)
-            return null;
-        return Integer.valueOf(listenPort).toString();
-    }
-
-    public int getMtu() {
-        return mtu;
-    }
-
-    @Nullable
-    private String getMtuString() {
-        if (mtu == 0)
-            return null;
-        return Integer.toString(mtu);
-    }
-
-    @Nullable
-    public String getPrivateKey() {
-        if (keypair == null)
-            return null;
-        return keypair.getPrivateKey();
-    }
-
-    @Nullable
-    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 EXCLUDED_APPLICATIONS:
-                addExcludedApplications(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(@Nullable final String addressString) {
-        addressList.clear();
-        addAddresses(Attribute.stringToList(addressString));
-    }
-
-    private void setDnsString(@Nullable final String dnsString) {
-        dnsList.clear();
-        addDnses(Attribute.stringToList(dnsString));
-    }
-
-    private void setExcludedApplicationsString(@Nullable final String applicationsString) {
-        excludedApplications.clear();
-        addExcludedApplications(Attribute.stringToList(applicationsString));
-    }
-
-    private void setListenPort(final int listenPort) {
-        this.listenPort = listenPort;
-    }
-
-    private void setListenPortString(@Nullable 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(@Nullable final String mtu) {
-        if (mtu != null && !mtu.isEmpty())
-            setMtu(Integer.parseInt(mtu, 10));
-        else
-            setMtu(0);
-    }
-
-    private void setPrivateKey(@Nullable String privateKey) {
-        if (privateKey != null && privateKey.isEmpty())
-            privateKey = null;
-        keypair = privateKey == null ? null : new Keypair(privateKey);
+        return builder.build();
     }
 
+    @Override
+    public boolean equals(final Object obj) {
+        if (!(obj instanceof Interface))
+            return false;
+        final Interface other = (Interface) obj;
+        return addresses.equals(other.addresses)
+                && dnsServers.equals(other.dnsServers)
+                && excludedApplications.equals(other.excludedApplications)
+                && keyPair.equals(other.keyPair)
+                && listenPort.equals(other.listenPort)
+                && mtu.equals(other.mtu);
+    }
+
+    /**
+     * Returns the set of IP addresses assigned to the interface.
+     *
+     * @return a set of {@link InetNetwork}s
+     */
+    public Set<InetNetwork> getAddresses() {
+        // The collection is already immutable.
+        return addresses;
+    }
+
+    /**
+     * Returns the set of DNS servers associated with the interface.
+     *
+     * @return a set of {@link InetAddress}es
+     */
+    public Set<InetAddress> getDnsServers() {
+        // The collection is already immutable.
+        return dnsServers;
+    }
+
+    /**
+     * Returns the set of applications excluded from using the interface.
+     *
+     * @return a set of package names
+     */
+    public Set<String> getExcludedApplications() {
+        // The collection is already immutable.
+        return excludedApplications;
+    }
+
+    /**
+     * Returns the public/private key pair used by the interface.
+     *
+     * @return a key pair
+     */
+    public KeyPair getKeyPair() {
+        return keyPair;
+    }
+
+    /**
+     * Returns the UDP port number that the WireGuard interface will listen on.
+     *
+     * @return a UDP port number, or {@code Optional.empty()} if none is configured
+     */
+    public Optional<Integer> getListenPort() {
+        return listenPort;
+    }
+
+    /**
+     * Returns the MTU used for the WireGuard interface.
+     *
+     * @return the MTU, or {@code Optional.empty()} if none is configured
+     */
+    public Optional<Integer> getMtu() {
+        return mtu;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = 31 * hash + addresses.hashCode();
+        hash = 31 * hash + dnsServers.hashCode();
+        hash = 31 * hash + excludedApplications.hashCode();
+        hash = 31 * hash + keyPair.hashCode();
+        hash = 31 * hash + listenPort.hashCode();
+        hash = 31 * hash + mtu.hashCode();
+        return hash;
+    }
+
+    /**
+     * Converts the {@code Interface} into a string suitable for debugging purposes. The {@code
+     * Interface} is identified by its public key and (if set) the port used for its UDP socket.
+     *
+     * @return A concise single-line identifier for the {@code Interface}
+     */
     @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 (!excludedApplications.isEmpty())
-            sb.append(Attribute.EXCLUDED_APPLICATIONS.composeWith(excludedApplications));
-        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()));
+        final StringBuilder sb = new StringBuilder("(Interface ");
+        sb.append(keyPair.getPublicKey().toBase64());
+        listenPort.ifPresent(lp -> sb.append(" @").append(lp));
+        sb.append(')');
         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);
-            }
+    /**
+     * Converts the {@code Interface} into a string suitable for inclusion in a {@code wg-quick}
+     * configuration file.
+     *
+     * @return The {@code Interface} represented as a series of "Key = Value" lines
+     */
+    public String toWgQuickString() {
+        final StringBuilder sb = new StringBuilder();
+        if (!addresses.isEmpty())
+            sb.append("Address = ").append(Attribute.join(addresses)).append('\n');
+        if (!dnsServers.isEmpty()) {
+            final List<String> dnsServerStrings = StreamSupport.stream(dnsServers)
+                    .map(InetAddress::getHostAddress)
+                    .collect(Collectors.toUnmodifiableList());
+            sb.append("DNS = ").append(Attribute.join(dnsServerStrings)).append('\n');
+        }
+        if (!excludedApplications.isEmpty())
+            sb.append("ExcludedApplications = ").append(Attribute.join(excludedApplications)).append('\n');
+        listenPort.ifPresent(lp -> sb.append("ListenPort = ").append(lp).append('\n'));
+        mtu.ifPresent(m -> sb.append("MTU = ").append(m).append('\n'));
+        sb.append("PrivateKey = ").append(keyPair.getPrivateKey().toBase64()).append('\n');
+        return sb.toString();
+    }
 
-            @Override
-            public Observable[] newArray(final int size) {
-                return new Observable[size];
-            }
-        };
-        @Nullable private String addresses;
-        @Nullable private String dnses;
-        @Nullable private String excludedApplications;
-        @Nullable private String listenPort;
-        @Nullable private String mtu;
-        @Nullable private String privateKey;
-        @Nullable private String publicKey;
+    /**
+     * Serializes the {@code Interface} for use with the WireGuard cross-platform userspace API.
+     * Note that not all attributes are included in this representation.
+     *
+     * @return the {@code Interface} represented as a series of "KEY=VALUE" lines
+     */
+    public String toWgUserspaceString() {
+        final StringBuilder sb = new StringBuilder();
+        sb.append("private_key=").append(keyPair.getPrivateKey().toHex()).append('\n');
+        listenPort.ifPresent(lp -> sb.append("listen_port=").append(lp).append('\n'));
+        return sb.toString();
+    }
 
-        public Observable(@Nullable final Interface parent) {
-            if (parent != null)
-                loadData(parent);
+    @SuppressWarnings("UnusedReturnValue")
+    public static final class Builder {
+        // Defaults to an empty set.
+        private final Set<InetNetwork> addresses = new LinkedHashSet<>();
+        // Defaults to an empty set.
+        private final Set<InetAddress> dnsServers = new LinkedHashSet<>();
+        // Defaults to an empty set.
+        private final Set<String> excludedApplications = new LinkedHashSet<>();
+        // No default; must be provided before building.
+        @Nullable private KeyPair keyPair;
+        // Defaults to not present.
+        private Optional<Integer> listenPort = Optional.empty();
+        // Defaults to not present.
+        private Optional<Integer> mtu = Optional.empty();
+
+        public Builder addAddress(final InetNetwork address) {
+            addresses.add(address);
+            return this;
         }
 
-        private Observable(final Parcel in) {
-            addresses = in.readString();
-            dnses = in.readString();
-            publicKey = in.readString();
-            privateKey = in.readString();
-            listenPort = in.readString();
-            mtu = in.readString();
-            excludedApplications = in.readString();
+        public Builder addAddresses(final Collection<InetNetwork> addresses) {
+            this.addresses.addAll(addresses);
+            return this;
         }
 
-        public void commitData(final Interface parent) {
-            parent.setAddressString(addresses);
-            parent.setDnsString(dnses);
-            parent.setExcludedApplicationsString(excludedApplications);
-            parent.setPrivateKey(privateKey);
-            parent.setListenPortString(listenPort);
-            parent.setMtuString(mtu);
-            loadData(parent);
-            notifyChange();
+        public Builder addDnsServer(final InetAddress dnsServer) {
+            dnsServers.add(dnsServer);
+            return this;
         }
 
-        @Override
-        public int describeContents() {
-            return 0;
+        public Builder addDnsServers(final Collection<? extends InetAddress> dnsServers) {
+            this.dnsServers.addAll(dnsServers);
+            return this;
         }
 
-        public void generateKeypair() {
-            final Keypair keypair = new Keypair();
-            privateKey = keypair.getPrivateKey();
-            publicKey = keypair.getPublicKey();
-            notifyPropertyChanged(BR.privateKey);
-            notifyPropertyChanged(BR.publicKey);
+        public Interface build() throws BadConfigException {
+            if (keyPair == null)
+                throw new BadConfigException(Section.INTERFACE, Location.PRIVATE_KEY,
+                        Reason.MISSING_ATTRIBUTE, null);
+            return new Interface(this);
         }
 
-        @Nullable
-        @Bindable
-        public String getAddresses() {
-            return addresses;
+        public Builder excludeApplication(final String application) {
+            excludedApplications.add(application);
+            return this;
         }
 
-        @Nullable
-        @Bindable
-        public String getDnses() {
-            return dnses;
+        public Builder excludeApplications(final Collection<String> applications) {
+            excludedApplications.addAll(applications);
+            return this;
         }
 
-        @Nullable
-        @Bindable
-        public String getExcludedApplications() {
-            return excludedApplications;
-        }
-
-        @Bindable
-        public int getExcludedApplicationsCount() {
-            return Attribute.stringToList(excludedApplications).length;
-        }
-
-        @Nullable
-        @Bindable
-        public String getListenPort() {
-            return listenPort;
-        }
-
-        @Nullable
-        @Bindable
-        public String getMtu() {
-            return mtu;
-        }
-
-        @Nullable
-        @Bindable
-        public String getPrivateKey() {
-            return privateKey;
-        }
-
-        @Nullable
-        @Bindable
-        public String getPublicKey() {
-            return publicKey;
-        }
-
-        private void loadData(final Interface parent) {
-            addresses = parent.getAddressString();
-            dnses = parent.getDnsString();
-            excludedApplications = parent.getExcludedApplicationsString();
-            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 setExcludedApplications(final String excludedApplications) {
-            this.excludedApplications = excludedApplications;
-            notifyPropertyChanged(BR.excludedApplications);
-            notifyPropertyChanged(BR.excludedApplicationsCount);
-        }
-
-        public void setListenPort(final String listenPort) {
-            this.listenPort = listenPort;
-            notifyPropertyChanged(BR.listenPort);
-        }
-
-        public void setMtu(final String mtu) {
-            this.mtu = mtu;
-            notifyPropertyChanged(BR.mtu);
-        }
-
-        public void setPrivateKey(final String privateKey) {
-            this.privateKey = privateKey;
-
+        public Builder parseAddresses(final CharSequence addresses) throws BadConfigException {
             try {
-                publicKey = new Keypair(privateKey).getPublicKey();
-            } catch (final IllegalArgumentException ignored) {
-                publicKey = "";
+                for (final String address : Attribute.split(addresses))
+                    addAddress(InetNetwork.parse(address));
+                return this;
+            } catch (final ParseException e) {
+                throw new BadConfigException(Section.INTERFACE, Location.ADDRESS, e);
             }
-
-            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);
-            dest.writeString(excludedApplications);
+        public Builder parseDnsServers(final CharSequence dnsServers) throws BadConfigException {
+            try {
+                for (final String dnsServer : Attribute.split(dnsServers))
+                    addDnsServer(InetAddresses.parse(dnsServer));
+                return this;
+            } catch (final ParseException e) {
+                throw new BadConfigException(Section.INTERFACE, Location.DNS, e);
+            }
+        }
+
+        public Builder parseExcludedApplications(final CharSequence apps) {
+            return excludeApplications(Lists.of(Attribute.split(apps)));
+        }
+
+        public Builder parseListenPort(final String listenPort) throws BadConfigException {
+            try {
+                return setListenPort(Integer.parseInt(listenPort));
+            } catch (final NumberFormatException e) {
+                throw new BadConfigException(Section.INTERFACE, Location.LISTEN_PORT, listenPort, e);
+            }
+        }
+
+        public Builder parseMtu(final String mtu) throws BadConfigException {
+            try {
+                return setMtu(Integer.parseInt(mtu));
+            } catch (final NumberFormatException e) {
+                throw new BadConfigException(Section.INTERFACE, Location.MTU, mtu, e);
+            }
+        }
+
+        public Builder parsePrivateKey(final String privateKey) throws BadConfigException {
+            try {
+                return setKeyPair(new KeyPair(Key.fromBase64(privateKey)));
+            } catch (final KeyFormatException e) {
+                throw new BadConfigException(Section.INTERFACE, Location.PRIVATE_KEY, e);
+            }
+        }
+
+        public Builder setKeyPair(final KeyPair keyPair) {
+            this.keyPair = keyPair;
+            return this;
+        }
+
+        public Builder setListenPort(final int listenPort) throws BadConfigException {
+            if (listenPort < MIN_UDP_PORT || listenPort > MAX_UDP_PORT)
+                throw new BadConfigException(Section.INTERFACE, Location.LISTEN_PORT,
+                        Reason.INVALID_VALUE, String.valueOf(listenPort));
+            this.listenPort = listenPort == 0 ? Optional.empty() : Optional.of(listenPort);
+            return this;
+        }
+
+        public Builder setMtu(final int mtu) throws BadConfigException {
+            if (mtu < 0)
+                throw new BadConfigException(Section.INTERFACE, Location.LISTEN_PORT,
+                        Reason.INVALID_VALUE, String.valueOf(mtu));
+            this.mtu = mtu == 0 ? Optional.empty() : Optional.of(mtu);
+            return this;
         }
     }
 }

app/src/main/java/com/wireguard/config/ParseException.java

@@ -0,0 +1,44 @@
+/*
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.config;
+
+import androidx.annotation.Nullable;
+
+/**
+ */
+public class ParseException extends Exception {
+    private final Class<?> parsingClass;
+    private final CharSequence text;
+
+    public ParseException(final Class<?> parsingClass, final CharSequence text,
+                          @Nullable final String message, @Nullable final Throwable cause) {
+        super(message, cause);
+        this.parsingClass = parsingClass;
+        this.text = text;
+    }
+
+    public ParseException(final Class<?> parsingClass, final CharSequence text,
+                          @Nullable final String message) {
+        this(parsingClass, text, message, null);
+    }
+
+    public ParseException(final Class<?> parsingClass, final CharSequence text,
+                          @Nullable final Throwable cause) {
+        this(parsingClass, text, null, cause);
+    }
+
+    public ParseException(final Class<?> parsingClass, final CharSequence text) {
+        this(parsingClass, text, null, null);
+    }
+
+    public Class<?> getParsingClass() {
+        return parsingClass;
+    }
+
+    public CharSequence getText() {
+        return text;
+    }
+}

app/src/main/java/com/wireguard/config/Peer.java

@@ -1,382 +1,306 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
- * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.config;
 
-import android.databinding.BaseObservable;
-import android.databinding.Bindable;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
-import com.android.databinding.library.baseAdapters.BR;
-import com.wireguard.crypto.KeyEncoding;
+import com.wireguard.config.BadConfigException.Location;
+import com.wireguard.config.BadConfigException.Reason;
+import com.wireguard.config.BadConfigException.Section;
+import com.wireguard.crypto.Key;
+import com.wireguard.crypto.KeyFormatException;
 
-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.Arrays;
 import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
+import java.util.Collections;
+import java.util.LinkedHashSet;
+import java.util.Locale;
+import java.util.Objects;
+import java.util.Set;
 
-import java9.lang.Iterables;
+import java9.util.Optional;
 
 /**
- * Represents the configuration for a WireGuard peer (a [Peer] block).
+ * Represents the configuration for a WireGuard peer (a [Peer] block). Peers must have a public key,
+ * and may optionally have several other attributes.
+ * <p>
+ * Instances of this class are immutable.
  */
+public final class Peer {
+    private final Set<InetNetwork> allowedIps;
+    private final Optional<InetEndpoint> endpoint;
+    private final Optional<Integer> persistentKeepalive;
+    private final Optional<Key> preSharedKey;
+    private final Key publicKey;
 
-public class Peer {
-    private final List<InetNetwork> allowedIPsList;
-    @Nullable private InetSocketAddress endpoint;
-    private int persistentKeepalive;
-    @Nullable private String preSharedKey;
-    @Nullable private String publicKey;
-
-    public Peer() {
-        allowedIPsList = new ArrayList<>();
+    private Peer(final Builder builder) {
+        // Defensively copy to ensure immutability even if the Builder is reused.
+        allowedIps = Collections.unmodifiableSet(new LinkedHashSet<>(builder.allowedIps));
+        endpoint = builder.endpoint;
+        persistentKeepalive = builder.persistentKeepalive;
+        preSharedKey = builder.preSharedKey;
+        publicKey = Objects.requireNonNull(builder.publicKey, "Peers must have a public key");
     }
 
-    private void addAllowedIPs(@Nullable final String[] allowedIPs) {
-        if (allowedIPs != null && allowedIPs.length > 0) {
-            for (final String allowedIP : allowedIPs) {
-                allowedIPsList.add(new InetNetwork(allowedIP));
+    /**
+     * Parses an series of "KEY = VALUE" lines into a {@code Peer}. Throws {@link ParseException} if
+     * the input is not well-formed or contains unknown attributes.
+     *
+     * @param lines an iterable sequence of lines, containing at least a public key attribute
+     * @return a {@code Peer} with all of its attributes set from {@code lines}
+     */
+    public static Peer parse(final Iterable<? extends CharSequence> lines)
+            throws BadConfigException {
+        final Builder builder = new Builder();
+        for (final CharSequence line : lines) {
+            final Attribute attribute = Attribute.parse(line).orElseThrow(() ->
+                    new BadConfigException(Section.PEER, Location.TOP_LEVEL,
+                            Reason.SYNTAX_ERROR, line));
+            switch (attribute.getKey().toLowerCase(Locale.ENGLISH)) {
+                case "allowedips":
+                    builder.parseAllowedIPs(attribute.getValue());
+                    break;
+                case "endpoint":
+                    builder.parseEndpoint(attribute.getValue());
+                    break;
+                case "persistentkeepalive":
+                    builder.parsePersistentKeepalive(attribute.getValue());
+                    break;
+                case "presharedkey":
+                    builder.parsePreSharedKey(attribute.getValue());
+                    break;
+                case "publickey":
+                    builder.parsePublicKey(attribute.getValue());
+                    break;
+                default:
+                    throw new BadConfigException(Section.PEER, Location.TOP_LEVEL,
+                            Reason.UNKNOWN_ATTRIBUTE, attribute.getKey());
             }
         }
-    }
-
-    public InetNetwork[] getAllowedIPs() {
-        return allowedIPsList.toArray(new InetNetwork[allowedIPsList.size()]);
-    }
-
-    @Nullable
-    private String getAllowedIPsString() {
-        if (allowedIPsList.isEmpty())
-            return null;
-        return Attribute.iterableToString(allowedIPsList);
-    }
-
-    @Nullable
-    public InetSocketAddress getEndpoint() {
-        return endpoint;
-    }
-
-    @Nullable
-    private String getEndpointString() {
-        if (endpoint == null)
-            return null;
-        return String.format("%s:%d", endpoint.getHostString(), endpoint.getPort());
-    }
-
-    public int getPersistentKeepalive() {
-        return persistentKeepalive;
-    }
-
-    @Nullable
-    private String getPersistentKeepaliveString() {
-        if (persistentKeepalive == 0)
-            return null;
-        return Integer.valueOf(persistentKeepalive).toString();
-    }
-
-    @Nullable
-    public String getPreSharedKey() {
-        return preSharedKey;
-    }
-
-    @Nullable
-    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("[%s]:%d",
-                    endpoint.getAddress().getHostAddress(),
-                    endpoint.getPort());
-        return String.format("%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(@Nullable final String allowedIPsString) {
-        allowedIPsList.clear();
-        addAllowedIPs(Attribute.stringToList(allowedIPsString));
-    }
-
-    private void setEndpoint(@Nullable final InetSocketAddress endpoint) {
-        this.endpoint = endpoint;
-    }
-
-    private void setEndpointString(@Nullable 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(@Nullable final String persistentKeepalive) {
-        if (persistentKeepalive != null && !persistentKeepalive.isEmpty())
-            setPersistentKeepalive(Integer.parseInt(persistentKeepalive, 10));
-        else
-            setPersistentKeepalive(0);
-    }
-
-    private void setPreSharedKey(@Nullable String preSharedKey) {
-        if (preSharedKey != null && preSharedKey.isEmpty())
-            preSharedKey = null;
-        if (preSharedKey != null)
-            KeyEncoding.keyFromBase64(preSharedKey);
-        this.preSharedKey = preSharedKey;
-    }
-
-    private void setPublicKey(@Nullable String publicKey) {
-        if (publicKey != null && publicKey.isEmpty())
-            publicKey = null;
-        if (publicKey != null)
-            KeyEncoding.keyFromBase64(publicKey);
-        this.publicKey = publicKey;
+        return builder.build();
     }
 
+    @Override
+    public boolean equals(final Object obj) {
+        if (!(obj instanceof Peer))
+            return false;
+        final Peer other = (Peer) obj;
+        return allowedIps.equals(other.allowedIps)
+                && endpoint.equals(other.endpoint)
+                && persistentKeepalive.equals(other.persistentKeepalive)
+                && preSharedKey.equals(other.preSharedKey)
+                && publicKey.equals(other.publicKey);
+    }
+
+    /**
+     * Returns the peer's set of allowed IPs.
+     *
+     * @return the set of allowed IPs
+     */
+    public Set<InetNetwork> getAllowedIps() {
+        // The collection is already immutable.
+        return allowedIps;
+    }
+
+    /**
+     * Returns the peer's endpoint.
+     *
+     * @return the endpoint, or {@code Optional.empty()} if none is configured
+     */
+    public Optional<InetEndpoint> getEndpoint() {
+        return endpoint;
+    }
+
+    /**
+     * Returns the peer's persistent keepalive.
+     *
+     * @return the persistent keepalive, or {@code Optional.empty()} if none is configured
+     */
+    public Optional<Integer> getPersistentKeepalive() {
+        return persistentKeepalive;
+    }
+
+    /**
+     * Returns the peer's pre-shared key.
+     *
+     * @return the pre-shared key, or {@code Optional.empty()} if none is configured
+     */
+    public Optional<Key> getPreSharedKey() {
+        return preSharedKey;
+    }
+
+    /**
+     * Returns the peer's public key.
+     *
+     * @return the public key
+     */
+    public Key getPublicKey() {
+        return publicKey;
+    }
+
+    @Override
+    public int hashCode() {
+        int hash = 1;
+        hash = 31 * hash + allowedIps.hashCode();
+        hash = 31 * hash + endpoint.hashCode();
+        hash = 31 * hash + persistentKeepalive.hashCode();
+        hash = 31 * hash + preSharedKey.hashCode();
+        hash = 31 * hash + publicKey.hashCode();
+        return hash;
+    }
+
+    /**
+     * Converts the {@code Peer} into a string suitable for debugging purposes. The {@code Peer} is
+     * identified by its public key and (if known) its endpoint.
+     *
+     * @return a concise single-line identifier for the {@code Peer}
+     */
     @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));
+        final StringBuilder sb = new StringBuilder("(Peer ");
+        sb.append(publicKey.toBase64());
+        endpoint.ifPresent(ep -> sb.append(" @").append(ep));
+        sb.append(')');
         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);
+    /**
+     * Converts the {@code Peer} into a string suitable for inclusion in a {@code wg-quick}
+     * configuration file.
+     *
+     * @return the {@code Peer} represented as a series of "Key = Value" lines
+     */
+    public String toWgQuickString() {
+        final StringBuilder sb = new StringBuilder();
+        if (!allowedIps.isEmpty())
+            sb.append("AllowedIPs = ").append(Attribute.join(allowedIps)).append('\n');
+        endpoint.ifPresent(ep -> sb.append("Endpoint = ").append(ep).append('\n'));
+        persistentKeepalive.ifPresent(pk -> sb.append("PersistentKeepalive = ").append(pk).append('\n'));
+        preSharedKey.ifPresent(psk -> sb.append("PreSharedKey = ").append(psk.toBase64()).append('\n'));
+        sb.append("PublicKey = ").append(publicKey.toBase64()).append('\n');
+        return sb.toString();
+    }
+
+    /**
+     * Serializes the {@code Peer} for use with the WireGuard cross-platform userspace API. Note
+     * that not all attributes are included in this representation.
+     *
+     * @return the {@code Peer} represented as a series of "key=value" lines
+     */
+    public String toWgUserspaceString() {
+        final StringBuilder sb = new StringBuilder();
+        // The order here is important: public_key signifies the beginning of a new peer.
+        sb.append("public_key=").append(publicKey.toHex()).append('\n');
+        for (final InetNetwork allowedIp : allowedIps)
+            sb.append("allowed_ip=").append(allowedIp).append('\n');
+        endpoint.flatMap(InetEndpoint::getResolved).ifPresent(ep -> sb.append("endpoint=").append(ep).append('\n'));
+        persistentKeepalive.ifPresent(pk -> sb.append("persistent_keepalive_interval=").append(pk).append('\n'));
+        preSharedKey.ifPresent(psk -> sb.append("preshared_key=").append(psk.toHex()).append('\n'));
+        return sb.toString();
+    }
+
+    @SuppressWarnings("UnusedReturnValue")
+    public static final class Builder {
+        // See wg(8)
+        private static final int MAX_PERSISTENT_KEEPALIVE = 65535;
+
+        // Defaults to an empty set.
+        private final Set<InetNetwork> allowedIps = new LinkedHashSet<>();
+        // Defaults to not present.
+        private Optional<InetEndpoint> endpoint = Optional.empty();
+        // Defaults to not present.
+        private Optional<Integer> persistentKeepalive = Optional.empty();
+        // Defaults to not present.
+        private Optional<Key> preSharedKey = Optional.empty();
+        // No default; must be provided before building.
+        @Nullable private Key publicKey;
+
+        public Builder addAllowedIp(final InetNetwork allowedIp) {
+            allowedIps.add(allowedIp);
+            return this;
+        }
+
+        public Builder addAllowedIps(final Collection<InetNetwork> allowedIps) {
+            this.allowedIps.addAll(allowedIps);
+            return this;
+        }
+
+        public Peer build() throws BadConfigException {
+            if (publicKey == null)
+                throw new BadConfigException(Section.PEER, Location.PUBLIC_KEY,
+                        Reason.MISSING_ATTRIBUTE, null);
+            return new Peer(this);
+        }
+
+        public Builder parseAllowedIPs(final CharSequence allowedIps) throws BadConfigException {
+            try {
+                for (final String allowedIp : Attribute.split(allowedIps))
+                    addAllowedIp(InetNetwork.parse(allowedIp));
+                return this;
+            } catch (final ParseException e) {
+                throw new BadConfigException(Section.PEER, Location.ALLOWED_IPS, e);
             }
+        }
 
-            @Override
-            public Observable[] newArray(final int size) {
-                return new Observable[size];
+        public Builder parseEndpoint(final String endpoint) throws BadConfigException {
+            try {
+                return setEndpoint(InetEndpoint.parse(endpoint));
+            } catch (final ParseException e) {
+                throw new BadConfigException(Section.PEER, Location.ENDPOINT, e);
             }
-        };
-        @Nullable private String allowedIPs;
-        @Nullable private String endpoint;
-        @Nullable private String persistentKeepalive;
-        @Nullable private String preSharedKey;
-        @Nullable private String publicKey;
-        private final List<String> interfaceDNSRoutes = new ArrayList<>();
-        private int numSiblings;
-
-        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();
-            numSiblings = in.readInt();
-            in.readStringList(interfaceDNSRoutes);
+        public Builder parsePersistentKeepalive(final String persistentKeepalive)
+                throws BadConfigException {
+            try {
+                return setPersistentKeepalive(Integer.parseInt(persistentKeepalive));
+            } catch (final NumberFormatException e) {
+                throw new BadConfigException(Section.PEER, Location.PERSISTENT_KEEPALIVE,
+                        persistentKeepalive, e);
+            }
         }
 
-        public static Observable newInstance() {
-            return new Observable(new Peer());
+        public Builder parsePreSharedKey(final String preSharedKey) throws BadConfigException {
+            try {
+                return setPreSharedKey(Key.fromBase64(preSharedKey));
+            } catch (final KeyFormatException e) {
+                throw new BadConfigException(Section.PEER, Location.PRE_SHARED_KEY, e);
+            }
         }
 
-        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();
+        public Builder parsePublicKey(final String publicKey) throws BadConfigException {
+            try {
+                return setPublicKey(Key.fromBase64(publicKey));
+            } catch (final KeyFormatException e) {
+                throw new BadConfigException(Section.PEER, Location.PUBLIC_KEY, e);
+            }
         }
 
-        @Override
-        public int describeContents() {
-            return 0;
+        public Builder setEndpoint(final InetEndpoint endpoint) {
+            this.endpoint = Optional.of(endpoint);
+            return this;
         }
 
-        private static final String DEFAULT_ROUTE_V4 = "0.0.0.0/0";
-        private static final List<String> DEFAULT_ROUTE_MOD_RFC1918_V4 = Arrays.asList("0.0.0.0/5", "8.0.0.0/7", "11.0.0.0/8", "12.0.0.0/6", "16.0.0.0/4", "32.0.0.0/3", "64.0.0.0/2", "128.0.0.0/3", "160.0.0.0/5", "168.0.0.0/6", "172.0.0.0/12", "172.32.0.0/11", "172.64.0.0/10", "172.128.0.0/9", "173.0.0.0/8", "174.0.0.0/7", "176.0.0.0/4", "192.0.0.0/9", "192.128.0.0/11", "192.160.0.0/13", "192.169.0.0/16", "192.170.0.0/15", "192.172.0.0/14", "192.176.0.0/12", "192.192.0.0/10", "193.0.0.0/8", "194.0.0.0/7", "196.0.0.0/6", "200.0.0.0/5", "208.0.0.0/4");
-
-        public void toggleExcludePrivateIPs() {
-            final Collection<String> ips = new HashSet<>(Arrays.asList(Attribute.stringToList(allowedIPs)));
-            final boolean hasDefaultRoute = ips.contains(DEFAULT_ROUTE_V4);
-            final boolean hasDefaultRouteModRFC1918 = ips.containsAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
-            if ((!hasDefaultRoute && !hasDefaultRouteModRFC1918) || numSiblings > 0)
-                return;
-            Iterables.removeIf(ips, ip -> !ip.contains(":"));
-            if (hasDefaultRoute) {
-                ips.addAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
-                ips.addAll(interfaceDNSRoutes);
-            } else if (hasDefaultRouteModRFC1918)
-                ips.add(DEFAULT_ROUTE_V4);
-            setAllowedIPs(Attribute.iterableToString(ips));
+        public Builder setPersistentKeepalive(final int persistentKeepalive)
+                throws BadConfigException {
+            if (persistentKeepalive < 0 || persistentKeepalive > MAX_PERSISTENT_KEEPALIVE)
+                throw new BadConfigException(Section.PEER, Location.PERSISTENT_KEEPALIVE,
+                        Reason.INVALID_VALUE, String.valueOf(persistentKeepalive));
+            this.persistentKeepalive = persistentKeepalive == 0 ?
+                    Optional.empty() : Optional.of(persistentKeepalive);
+            return this;
         }
 
-        @Bindable
-        public boolean getCanToggleExcludePrivateIPs() {
-            final Collection<String> ips = Arrays.asList(Attribute.stringToList(allowedIPs));
-            return numSiblings == 0 && (ips.contains(DEFAULT_ROUTE_V4) || ips.containsAll(DEFAULT_ROUTE_MOD_RFC1918_V4));
+        public Builder setPreSharedKey(final Key preSharedKey) {
+            this.preSharedKey = Optional.of(preSharedKey);
+            return this;
         }
 
-        @Bindable
-        public boolean getIsExcludePrivateIPsOn() {
-            return numSiblings == 0 && Arrays.asList(Attribute.stringToList(allowedIPs)).containsAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
-        }
-
-        @Bindable @Nullable
-        public String getAllowedIPs() {
-            return allowedIPs;
-        }
-
-        @Bindable @Nullable
-        public String getEndpoint() {
-            return endpoint;
-        }
-
-        @Bindable @Nullable
-        public String getPersistentKeepalive() {
-            return persistentKeepalive;
-        }
-
-        @Bindable @Nullable
-        public String getPreSharedKey() {
-            return preSharedKey;
-        }
-
-        @Bindable @Nullable
-        public String getPublicKey() {
-            return publicKey;
-        }
-
-        private 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);
-            notifyPropertyChanged(BR.canToggleExcludePrivateIPs);
-            notifyPropertyChanged(BR.isExcludePrivateIPsOn);
-        }
-
-        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) {
+        public Builder setPublicKey(final Key publicKey) {
             this.publicKey = publicKey;
-            notifyPropertyChanged(BR.publicKey);
-        }
-
-        public void setInterfaceDNSRoutes(@Nullable final String dnsServers) {
-            final Collection<String> ips = new HashSet<>(Arrays.asList(Attribute.stringToList(allowedIPs)));
-            final boolean modifyAllowedIPs = ips.containsAll(DEFAULT_ROUTE_MOD_RFC1918_V4);
-
-            ips.removeAll(interfaceDNSRoutes);
-            interfaceDNSRoutes.clear();
-            for (final String dnsServer : Attribute.stringToList(dnsServers)) {
-                if (!dnsServer.contains(":"))
-                    interfaceDNSRoutes.add(dnsServer + "/32");
-            }
-            ips.addAll(interfaceDNSRoutes);
-            if (modifyAllowedIPs)
-                setAllowedIPs(Attribute.iterableToString(ips));
-        }
-
-        public void setNumSiblings(final int num) {
-            numSiblings = num;
-            notifyPropertyChanged(BR.canToggleExcludePrivateIPs);
-            notifyPropertyChanged(BR.isExcludePrivateIPsOn);
-        }
-
-        @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);
-            dest.writeInt(numSiblings);
-            dest.writeStringList(interfaceDNSRoutes);
+            return this;
         }
     }
 }

app/src/main/java/com/wireguard/crypto/Curve25519.java

@@ -1,11 +1,12 @@
 /*
  * Copyright © 2016 Southern Storm Software, Pty Ltd.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.crypto;
 
-import android.support.annotation.Nullable;
+import androidx.annotation.Nullable;
 
 import java.util.Arrays;
 

app/src/main/java/com/wireguard/crypto/Key.java

@@ -0,0 +1,269 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.crypto;
+
+import com.wireguard.crypto.KeyFormatException.Type;
+
+import java.security.SecureRandom;
+import java.util.Arrays;
+
+/**
+ * Represents a WireGuard public or private key. This class uses specialized constant-time base64
+ * and hexadecimal codec implementations that resist side-channel attacks.
+ * <p>
+ * Instances of this class are immutable.
+ */
+@SuppressWarnings("MagicNumber")
+public final class Key {
+    private final byte[] key;
+
+    /**
+     * Constructs an object encapsulating the supplied key.
+     *
+     * @param key an array of bytes containing a binary key. Callers of this constructor are
+     *            responsible for ensuring that the array is of the correct length.
+     */
+    private Key(final byte[] key) {
+        // Defensively copy to ensure immutability.
+        this.key = Arrays.copyOf(key, key.length);
+    }
+
+    /**
+     * Decodes a single 4-character base64 chunk to an integer in constant time.
+     *
+     * @param src       an array of at least 4 characters in base64 format
+     * @param srcOffset the offset of the beginning of the chunk in {@code src}
+     * @return the decoded 3-byte integer, or some arbitrary integer value if the input was not
+     * valid base64
+     */
+    private static int decodeBase64(final char[] src, final int srcOffset) {
+        int val = 0;
+        for (int i = 0; i < 4; ++i) {
+            final char c = src[i + srcOffset];
+            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;
+    }
+
+    /**
+     * Encodes a single 4-character base64 chunk from 3 consecutive bytes in constant time.
+     *
+     * @param src        an array of at least 3 bytes
+     * @param srcOffset  the offset of the beginning of the chunk in {@code src}
+     * @param dest       an array of at least 4 characters
+     * @param destOffset the offset of the beginning of the chunk in {@code dest}
+     */
+    private static void encodeBase64(final byte[] src, final int srcOffset,
+                                     final char[] dest, final int destOffset) {
+        final byte[] input = {
+                (byte) ((src[srcOffset] >>> 2) & 63),
+                (byte) ((src[srcOffset] << 4 | ((src[1 + srcOffset] & 0xff) >>> 4)) & 63),
+                (byte) ((src[1 + srcOffset] << 2 | ((src[2 + srcOffset] & 0xff) >>> 6)) & 63),
+                (byte) ((src[2 + srcOffset]) & 63),
+        };
+        for (int i = 0; i < 4; ++i) {
+            dest[i + destOffset] = (char) (input[i] + 'A'
+                    + (((25 - input[i]) >>> 8) & 6)
+                    - (((51 - input[i]) >>> 8) & 75)
+                    - (((61 - input[i]) >>> 8) & 15)
+                    + (((62 - input[i]) >>> 8) & 3));
+        }
+    }
+
+    /**
+     * Decodes a WireGuard public or private key from its base64 string representation. This
+     * function throws a {@link KeyFormatException} if the source string is not well-formed.
+     *
+     * @param str the base64 string representation of a WireGuard key
+     * @return the decoded key encapsulated in an immutable container
+     */
+    public static Key fromBase64(final String str) throws KeyFormatException {
+        final char[] input = str.toCharArray();
+        if (input.length != Format.BASE64.length || input[Format.BASE64.length - 1] != '=')
+            throw new KeyFormatException(Format.BASE64, Type.LENGTH);
+        final byte[] key = new byte[Format.BINARY.length];
+        int i;
+        int ret = 0;
+        for (i = 0; i < key.length / 3; ++i) {
+            final int val = decodeBase64(input, i * 4);
+            ret |= val >>> 31;
+            key[i * 3] = (byte) ((val >>> 16) & 0xff);
+            key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
+            key[i * 3 + 2] = (byte) (val & 0xff);
+        }
+        final char[] endSegment = {
+                input[i * 4],
+                input[i * 4 + 1],
+                input[i * 4 + 2],
+                'A',
+        };
+        final int val = decodeBase64(endSegment, 0);
+        ret |= (val >>> 31) | (val & 0xff);
+        key[i * 3] = (byte) ((val >>> 16) & 0xff);
+        key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
+
+        if (ret != 0)
+            throw new KeyFormatException(Format.BASE64, Type.CONTENTS);
+        return new Key(key);
+    }
+
+    /**
+     * Wraps a WireGuard public or private key in an immutable container. This function throws a
+     * {@link KeyFormatException} if the source data is not the correct length.
+     *
+     * @param bytes an array of bytes containing a WireGuard key in binary format
+     * @return the key encapsulated in an immutable container
+     */
+    public static Key fromBytes(final byte[] bytes) throws KeyFormatException {
+        if (bytes.length != Format.BINARY.length)
+            throw new KeyFormatException(Format.BINARY, Type.LENGTH);
+        return new Key(bytes);
+    }
+
+    /**
+     * Decodes a WireGuard public or private key from its hexadecimal string representation. This
+     * function throws a {@link KeyFormatException} if the source string is not well-formed.
+     *
+     * @param str the hexadecimal string representation of a WireGuard key
+     * @return the decoded key encapsulated in an immutable container
+     */
+    public static Key fromHex(final String str) throws KeyFormatException {
+        final char[] input = str.toCharArray();
+        if (input.length != Format.HEX.length)
+            throw new KeyFormatException(Format.HEX, Type.LENGTH);
+        final byte[] key = new byte[Format.BINARY.length];
+        int ret = 0;
+        for (int i = 0; i < key.length; ++i) {
+            int c;
+            int cNum;
+            int cNum0;
+            int cAlpha;
+            int cAlpha0;
+            int cVal;
+            final int cAcc;
+
+            c = input[i * 2];
+            cNum = c ^ 48;
+            cNum0 = ((cNum - 10) >>> 8) & 0xff;
+            cAlpha = (c & ~32) - 55;
+            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
+            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
+            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
+            cAcc = cVal * 16;
+
+            c = input[i * 2 + 1];
+            cNum = c ^ 48;
+            cNum0 = ((cNum - 10) >>> 8) & 0xff;
+            cAlpha = (c & ~32) - 55;
+            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
+            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
+            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
+            key[i] = (byte) (cAcc | cVal);
+        }
+        if (ret != 0)
+            throw new KeyFormatException(Format.HEX, Type.CONTENTS);
+        return new Key(key);
+    }
+
+    /**
+     * Generates a private key using the system's {@link SecureRandom} number generator.
+     *
+     * @return a well-formed random private key
+     */
+    static Key generatePrivateKey() {
+        final SecureRandom secureRandom = new SecureRandom();
+        final byte[] privateKey = new byte[Format.BINARY.getLength()];
+        secureRandom.nextBytes(privateKey);
+        privateKey[0] &= 248;
+        privateKey[31] &= 127;
+        privateKey[31] |= 64;
+        return new Key(privateKey);
+    }
+
+    /**
+     * Generates a public key from an existing private key.
+     *
+     * @param privateKey a private key
+     * @return a well-formed public key that corresponds to the supplied private key
+     */
+    static Key generatePublicKey(final Key privateKey) {
+        final byte[] publicKey = new byte[Format.BINARY.getLength()];
+        Curve25519.eval(publicKey, 0, privateKey.getBytes(), null);
+        return new Key(publicKey);
+    }
+
+    /**
+     * Returns the key as an array of bytes.
+     *
+     * @return an array of bytes containing the raw binary key
+     */
+    public byte[] getBytes() {
+        // Defensively copy to ensure immutability.
+        return Arrays.copyOf(key, key.length);
+    }
+
+    /**
+     * Encodes the key to base64.
+     *
+     * @return a string containing the encoded key
+     */
+    public String toBase64() {
+        final char[] output = new char[Format.BASE64.length];
+        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[Format.BASE64.length - 1] = '=';
+        return new String(output);
+    }
+
+    /**
+     * Encodes the key to hexadecimal ASCII characters.
+     *
+     * @return a string containing the encoded key
+     */
+    public String toHex() {
+        final char[] output = new char[Format.HEX.length];
+        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);
+    }
+
+    /**
+     * The supported formats for encoding a WireGuard key.
+     */
+    public enum Format {
+        BASE64(44),
+        BINARY(32),
+        HEX(64);
+
+        private final int length;
+
+        Format(final int length) {
+            this.length = length;
+        }
+
+        public int getLength() {
+            return length;
+        }
+    }
+
+}

app/src/main/java/com/wireguard/crypto/KeyEncoding.java

@@ -1,158 +0,0 @@
-/*
- * Copyright © 2015-2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
- * SPDX-License-Identifier: Apache-2.0
- */
-
-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 srcOffset) {
-        int val = 0;
-        for (int i = 0; i < 4; ++i) {
-            final char c = src[i + srcOffset];
-            val |= (-1
-                    + ((((('A' - 1) - c) & (c - ('Z' + 1))) >>> 8) & (c - 64))
-                    + ((((('a' - 1) - c) & (c - ('z' + 1))) >>> 8) & (c - 70))
-                    + ((((('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 srcOffset,
-                                     final char[] dest, final int destOffset) {
-        final byte[] input = {
-                (byte) ((src[srcOffset] >>> 2) & 63),
-                (byte) ((src[srcOffset] << 4 | ((src[1 + srcOffset] & 0xff) >>> 4)) & 63),
-                (byte) ((src[1 + srcOffset] << 2 | ((src[2 + srcOffset] & 0xff) >>> 6)) & 63),
-                (byte) ((src[2 + srcOffset]) & 63),
-        };
-        for (int i = 0; i < 4; ++i) {
-            dest[i + destOffset] = (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;
-        int ret = 0;
-        for (i = 0; i < KEY_LENGTH / 3; ++i) {
-            final int val = decodeBase64(input, i * 4);
-            ret |= val >>> 31;
-            key[i * 3] = (byte) ((val >>> 16) & 0xff);
-            key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
-            key[i * 3 + 2] = (byte) (val & 0xff);
-        }
-        final char[] endSegment = {
-                input[i * 4],
-                input[i * 4 + 1],
-                input[i * 4 + 2],
-                'A',
-        };
-        final int val = decodeBase64(endSegment, 0);
-        ret |= (val >>> 31) | (val & 0xff);
-        key[i * 3] = (byte) ((val >>> 16) & 0xff);
-        key[i * 3 + 1] = (byte) ((val >>> 8) & 0xff);
-
-        if (ret != 0)
-            throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
-        return key;
-    }
-
-    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 ret = 0;
-
-        for (int i = 0; i < KEY_LENGTH_HEX; i += 2) {
-            int c;
-            int cNum;
-            int cNum0;
-            int cAlpha;
-            int cAlpha0;
-            int cVal;
-            final int cAcc;
-
-            c = input[i];
-            cNum = c ^ 48;
-            cNum0 = ((cNum - 10) >>> 8) & 0xff;
-            cAlpha = (c & ~32) - 55;
-            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
-            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
-            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
-            cAcc = cVal * 16;
-
-            c = input[i + 1];
-            cNum = c ^ 48;
-            cNum0 = ((cNum - 10) >>> 8) & 0xff;
-            cAlpha = (c & ~32) - 55;
-            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
-            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
-            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
-            key[i / 2] = (byte) (cAcc | cVal);
-        }
-        if (ret != 0)
-            throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);
-        return key;
-    }
-
-    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);
-    }
-}

app/src/main/java/com/wireguard/crypto/KeyFormatException.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright © 2018-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.crypto;
+
+/**
+ * An exception thrown when attempting to parse an invalid key (too short, too long, or byte
+ * data inappropriate for the format). The format being parsed can be accessed with the
+ * {@link #getFormat} method.
+ */
+public final class KeyFormatException extends Exception {
+    private final Key.Format format;
+    private final Type type;
+
+    KeyFormatException(final Key.Format format, final Type type) {
+        this.format = format;
+        this.type = type;
+    }
+
+    public Key.Format getFormat() {
+        return format;
+    }
+
+    public Type getType() {
+        return type;
+    }
+
+    public enum Type {
+        CONTENTS,
+        LENGTH
+    }
+}

app/src/main/java/com/wireguard/crypto/KeyPair.java

@@ -0,0 +1,51 @@
+/*
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+package com.wireguard.crypto;
+
+/**
+ * Represents a Curve25519 key pair as used by WireGuard.
+ * <p>
+ * Instances of this class are immutable.
+ */
+public class KeyPair {
+    private final Key privateKey;
+    private final Key publicKey;
+
+    /**
+     * Creates a key pair using a newly-generated private key.
+     */
+    public KeyPair() {
+        this(Key.generatePrivateKey());
+    }
+
+    /**
+     * Creates a key pair using an existing private key.
+     *
+     * @param privateKey a private key, used to derive the public key
+     */
+    public KeyPair(final Key privateKey) {
+        this.privateKey = privateKey;
+        publicKey = Key.generatePublicKey(privateKey);
+    }
+
+    /**
+     * Returns the private key from the key pair.
+     *
+     * @return the private key
+     */
+    public Key getPrivateKey() {
+        return privateKey;
+    }
+
+    /**
+     * Returns the public key from the key pair.
+     *
+     * @return the public key
+     */
+    public Key getPublicKey() {
+        return publicKey;
+    }
+}

app/src/main/java/com/wireguard/crypto/Keypair.java

@@ -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: Apache-2.0
- */
-
-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);
-    }
-}

app/src/main/java/com/wireguard/util/Keyed.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 

app/src/main/java/com/wireguard/util/KeyedList.java

@@ -1,10 +1,12 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.util;
 
+import androidx.annotation.Nullable;
+
 import java.util.Collection;
 import java.util.List;
 
@@ -18,8 +20,10 @@ public interface KeyedList<K, E extends Keyed<? extends K>> extends List<E> {
 
     boolean containsKey(K key);
 
+    @Nullable
     E get(K key);
 
+    @Nullable
     E getLast(K key);
 
     int indexOfKey(K key);

app/src/main/java/com/wireguard/util/NonNullForAll.java

@@ -1,5 +1,5 @@
 /*
- * Copyright © 2018 Eric Kuck <eric@bluelinelabs.com>.
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
@@ -22,4 +22,5 @@ import javax.annotation.meta.TypeQualifierDefault;
 @Nonnull
 @TypeQualifierDefault({ElementType.FIELD, ElementType.METHOD, ElementType.PARAMETER})
 @Retention(RetentionPolicy.RUNTIME)
-public @interface NonNullForAll { }
+public @interface NonNullForAll {
+}

app/src/main/java/com/wireguard/util/SortedKeyedList.java

@@ -1,10 +1,12 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
+ * Copyright © 2017-2019 WireGuard LLC. All Rights Reserved.
  * SPDX-License-Identifier: Apache-2.0
  */
 
 package com.wireguard.util;
 
+import androidx.annotation.Nullable;
+
 import java.util.Collection;
 import java.util.Comparator;
 import java.util.Set;
@@ -17,10 +19,12 @@ import java.util.Set;
 public interface SortedKeyedList<K, E extends Keyed<? extends K>> extends KeyedList<K, E> {
     Comparator<? super K> comparator();
 
+    @Nullable
     K firstKey();
 
     Set<K> keySet();
 
+    @Nullable
     K lastKey();
 
     Collection<E> values();

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

@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:viewportWidth="24"
-    android:viewportHeight="24"
     android:width="24dp"
-    android:height="24dp">
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24">
     <path
         android:fillColor="?android:attr/colorForeground"
         android:pathData="M3 5L5 5 5 3C3.9 3 3 3.9 3 5Zm0 8l2 0 0 -2 -2 0 0 2zm4 8l2 0 0 -2 -2 0 0 2zM3 9L5 9 5 7 3 7 3 9Zm10 -6l-2 0 0 2 2 0 0 -2zm6 0l0 2 2 0C21 3.9 20.1 3 19 3ZM5 21L5 19 3 19c0 1.1 0.9 2 2 2zm-2 -4l2 0 0 -2 -2 0 0 2zM9 3L7 3 7 5 9 5 9 3Zm2 18l2 0 0 -2 -2 0 0 2zm8 -8l2 0 0 -2 -2 0 0 2zm0 8c1.1 0 2 -0.9 2 -2l-2 0 0 2zm0 -12l2 0 0 -2 -2 0 0 2zm0 8l2 0 0 -2 -2 0 0 2zm-4 4l2 0 0 -2 -2 0 0 2zm0 -16l2 0 0 -2 -2 0 0 2zM7 17L17 17 17 7 7 7 7 17Zm2 -8l6 0 0 6 -6 0 0 -6z" />
-</vector>
+</vector>

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

@@ -5,5 +5,5 @@
     android:viewportWidth="24">
     <path
         android:fillColor="?android:attr/colorForeground"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z" />
 </vector>

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

@@ -1,5 +1,19 @@
 <?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" /> <!-- TODO(msf): themeify this -->
-    <item android:drawable="@android:color/transparent" /> <!-- TODO(msf): themeify this -->
-</selector>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item>
+        <selector>
+            <item
+                android:state_activated="true"
+                app:state_multiselected="true">
+                <color android:color="?attr/colorControlActivated" />
+            </item>
+            <item
+                android:state_activated="true"
+                app:state_multiselected="false">
+                <color android:color="?attr/colorControlHighlight" />
+            </item>
+        </selector>
+    </item>
+    <item android:drawable="?attr/selectableItemBackground" />
+</layer-list>

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

@@ -1,6 +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"> <!-- TODO(msf): themeify this -->
-    <item android:drawable="@drawable/list_item_background" />
-    <item android:id="@android:id/mask" android:drawable="@android:color/white" />
-</ripple>

app/src/main/res/layout-sw600dp/main_activity.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/master_detail_wrapper"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:baselineAligned="false"
+    android:divider="?attr/dividerHorizontal"
+    android:orientation="horizontal"
+    android:showDividers="middle"
+    tools:context=".activity.MainActivity">
+
+    <fragment
+        android:name="com.wireguard.android.fragment.TunnelListFragment"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="2"
+        android:tag="LIST" />
+
+    <FrameLayout
+        android:id="@+id/detail_container"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="3" />
+</LinearLayout>

app/src/main/res/layout/app_list_dialog_fragment.xml

@@ -20,7 +20,7 @@
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:minHeight="200dp" >
+        android:minHeight="200dp">
 
         <ProgressBar
             android:id="@+id/progress_bar"
@@ -28,9 +28,9 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:indeterminate="true"
-            android:visibility="@{appData.isEmpty() ? View.VISIBLE : View.GONE}"/>
+            android:visibility="@{appData.isEmpty() ? View.VISIBLE : View.GONE}" />
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/app_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"

app/src/main/res/layout/app_list_item.xml

@@ -1,6 +1,5 @@
 <?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">
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
 
@@ -22,11 +21,11 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/list_item_background_anim"
-        android:padding="16dp"
-        android:orientation="horizontal"
+        android:background="@drawable/list_item_background"
         android:gravity="center_vertical"
-        android:onClick="@{(view) -> item.setExcludedFromTunnel(!item.excludedFromTunnel)}">
+        android:onClick="@{(view) -> item.setExcludedFromTunnel(!item.excludedFromTunnel)}"
+        android:orientation="horizontal"
+        android:padding="16dp">
 
         <ImageView
             android:id="@+id/app_icon"

app/src/main/res/layout/config_naming_dialog_fragment.xml

@@ -1,12 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android">
+<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.NameInputFilter" />
+    </data>
 
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:padding="16dp">
 
-        <android.support.design.widget.TextInputLayout
+        <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/tunnel_name_text_layout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
@@ -15,9 +21,11 @@
                 android:id="@+id/tunnel_name_text"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/tunnel_name" />
+                android:hint="@string/tunnel_name"
+                android:inputType="textNoSuggestions|textVisiblePassword"
+                app:filter="@{NameInputFilter.newInstance()}" />
 
-        </android.support.design.widget.TextInputLayout>
+        </com.google.android.material.textfield.TextInputLayout>
 
     </FrameLayout>
 

app/src/main/res/layout/main_activity.xml

@@ -1,7 +1,19 @@
 <?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:id="@+id/master_detail_wrapper"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:ignore="MergeRootFrame" />
+    tools:context=".activity.MainActivity">
+
+    <fragment
+        android:name="com.wireguard.android.fragment.TunnelListFragment"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:tag="LIST" />
+
+    <FrameLayout
+        android:id="@+id/detail_container"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>

app/src/main/res/layout/tunnel_detail_fragment.xml

@@ -19,7 +19,7 @@
 
         <variable
             name="config"
-            type="com.wireguard.config.Config.Observable" />
+            type="com.wireguard.config.Config" />
     </data>
 
     <ScrollView
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:orientation="vertical">
 
-            <android.support.v7.widget.CardView
+            <androidx.cardview.widget.CardView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginBottom="4dp"
@@ -102,7 +102,7 @@
                         android:ellipsize="end"
                         android:maxLines="1"
                         android:onClick="@{ClipboardUtils::copyTextView}"
-                        android:text="@{config.interfaceSection.publicKey}" />
+                        android:text="@{config.interface.keyPair.publicKey.toBase64}" />
 
                     <TextView
                         android:id="@+id/addresses_label"
@@ -120,9 +120,9 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@+id/addresses_label"
                         android:contentDescription="@string/addresses"
-                        android:text="@{config.interfaceSection.addresses}" />
+                        android:text="@{config.interface.addresses}" />
                 </RelativeLayout>
-            </android.support.v7.widget.CardView>
+            </androidx.cardview.widget.CardView>
 
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout/tunnel_detail_peer.xml

@@ -8,10 +8,10 @@
 
         <variable
             name="item"
-            type="com.wireguard.config.Peer.Observable" />
+            type="com.wireguard.config.Peer" />
     </data>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -54,7 +54,7 @@
                 android:ellipsize="end"
                 android:maxLines="1"
                 android:onClick="@{ClipboardUtils::copyTextView}"
-                android:text="@{item.publicKey}" />
+                android:text="@{item.publicKey.toBase64}" />
 
             <TextView
                 android:id="@+id/allowed_ips_label"
@@ -71,7 +71,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/allowed_ips_label"
-                android:text="@{item.allowedIPs}" />
+                android:text="@{item.allowedIps}" />
 
             <TextView
                 android:id="@+id/endpoint_label"
@@ -90,5 +90,5 @@
                 android:layout_below="@+id/endpoint_label"
                 android:text="@{item.endpoint}" />
         </RelativeLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </layout>

app/src/main/res/layout/tunnel_editor_fragment.xml

@@ -11,18 +11,20 @@
 
         <import type="com.wireguard.android.widget.NameInputFilter" />
 
-        <import type="com.wireguard.config.Peer" />
-
         <variable
             name="fragment"
             type="com.wireguard.android.fragment.TunnelEditorFragment" />
 
         <variable
             name="config"
-            type="com.wireguard.config.Config.Observable" />
+            type="com.wireguard.android.viewmodel.ConfigProxy" />
+
+        <variable
+            name="name"
+            type="String" />
     </data>
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/main_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
@@ -37,7 +39,7 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical">
 
-                <android.support.v7.widget.CardView
+                <androidx.cardview.widget.CardView
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:layout_marginBottom="4dp"
@@ -76,7 +78,7 @@
                             android:layout_height="wrap_content"
                             android:layout_below="@+id/interface_name_label"
                             android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.name}"
+                            android:text="@={name}"
                             app:filter="@{NameInputFilter.newInstance()}" />
 
                         <TextView
@@ -96,18 +98,18 @@
                             android:layout_toStartOf="@+id/generate_private_key_button"
                             android:contentDescription="@string/public_key_description"
                             android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.interfaceSection.privateKey}"
+                            android:text="@={config.interface.privateKey}"
                             app:filter="@{KeyInputFilter.newInstance()}" />
 
                         <Button
-                            style="@style/Widget.AppCompat.Button.Borderless.Colored"
                             android:id="@+id/generate_private_key_button"
+                            style="@style/Widget.AppCompat.Button.Borderless.Colored"
                             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:onClick="@{() -> config.interface.generateKeyPair()}"
                             android:text="@string/generate" />
 
                         <TextView
@@ -120,7 +122,7 @@
 
                         <TextView
                             android:id="@+id/public_key_text"
-                            style="?android:attr/editTextStyle"
+                            style="?attr/editTextStyle"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:layout_below="@+id/public_key_label"
@@ -130,7 +132,7 @@
                             android:hint="@string/hint_generated"
                             android:maxLines="1"
                             android:onClick="@{ClipboardUtils::copyTextView}"
-                            android:text="@{config.interfaceSection.publicKey}" />
+                            android:text="@{config.interface.publicKey}" />
 
                         <TextView
                             android:id="@+id/addresses_label"
@@ -150,7 +152,7 @@
                             android:layout_below="@+id/addresses_label"
                             android:layout_toStartOf="@+id/listen_port_text"
                             android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.interfaceSection.addresses}" />
+                            android:text="@={config.interface.addresses}" />
 
                         <TextView
                             android:id="@+id/listen_port_label"
@@ -171,7 +173,7 @@
                             android:layout_alignStart="@+id/generate_private_key_button"
                             android:hint="@string/hint_random"
                             android:inputType="number"
-                            android:text="@={config.interfaceSection.listenPort}"
+                            android:text="@={config.interface.listenPort}"
                             android:textAlignment="center" />
 
                         <TextView
@@ -192,7 +194,7 @@
                             android:layout_below="@+id/dns_servers_label"
                             android:layout_toStartOf="@+id/mtu_text"
                             android:inputType="textNoSuggestions|textVisiblePassword"
-                            android:text="@={config.interfaceSection.dnses}" />
+                            android:text="@={config.interface.dnsServers}" />
 
                         <TextView
                             android:id="@+id/mtu_label"
@@ -213,20 +215,20 @@
                             android:layout_alignStart="@+id/generate_private_key_button"
                             android:hint="@string/hint_automatic"
                             android:inputType="number"
-                            android:text="@={config.interfaceSection.mtu}"
+                            android:text="@={config.interface.mtu}"
                             android:textAlignment="center" />
 
                         <Button
-                            style="@style/Widget.AppCompat.Button.Borderless.Colored"
                             android:id="@+id/set_excluded_applications"
+                            style="@style/Widget.AppCompat.Button.Borderless.Colored"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
-                            android:layout_marginLeft="-8dp"
                             android:layout_below="@+id/dns_servers_text"
+                            android:layout_marginLeft="-8dp"
                             android:onClick="@{fragment::onRequestSetExcludedApplications}"
-                            android:text="@{@plurals/set_excluded_applications(config.interfaceSection.excludedApplicationsCount, config.interfaceSection.excludedApplicationsCount)}" />
+                            android:text="@{@plurals/set_excluded_applications(config.interface.excludedApplications.size, config.interface.excludedApplications.size)}" />
                     </RelativeLayout>
-                </android.support.v7.widget.CardView>
+                </androidx.cardview.widget.CardView>
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -244,9 +246,9 @@
                     android:layout_marginBottom="4dp"
                     android:layout_marginEnd="4dp"
                     android:layout_marginStart="4dp"
-                    android:onClick="@{() -> config.peers.add(Peer.Observable.newInstance())}"
+                    android:onClick="@{() -> config.addPeer()}"
                     android:text="@string/add_peer" />
             </LinearLayout>
         </ScrollView>
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>

app/src/main/res/layout/tunnel_editor_peer.xml

@@ -4,19 +4,20 @@
 
     <data>
 
-        <import type="android.view.View"/>
+        <import type="android.view.View" />
+
         <import type="com.wireguard.android.widget.KeyInputFilter" />
 
         <variable
             name="collection"
-            type="android.databinding.ObservableList&lt;com.wireguard.config.Peer.Observable&gt;" />
+            type="androidx.databinding.ObservableList&lt;com.wireguard.android.viewmodel.PeerProxy&gt;" />
 
         <variable
             name="item"
-            type="com.wireguard.config.Peer.Observable" />
+            type="com.wireguard.android.viewmodel.PeerProxy" />
     </data>
 
-    <android.support.v7.widget.CardView
+    <androidx.cardview.widget.CardView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="4dp"
@@ -51,7 +52,7 @@
                 android:layout_alignParentTop="true"
                 android:background="@null"
                 android:contentDescription="@string/delete"
-                android:onClick="@{() -> collection.remove(item)}"
+                android:onClick="@{() -> item.unbind()}"
                 android:src="@drawable/ic_action_delete" />
 
             <TextView
@@ -103,10 +104,9 @@
                 android:layout_height="wrap_content"
                 android:layout_alignBaseline="@+id/allowed_ips_label"
                 android:layout_alignParentEnd="true"
-                android:checked="@{item.isExcludePrivateIPsOn}"
-                android:onClick="@{() -> item.toggleExcludePrivateIPs()}"
+                android:checked="@={item.excludingPrivateIps}"
                 android:text="@string/exclude_private_ips"
-                android:visibility="@{item.canToggleExcludePrivateIPs ? View.VISIBLE : View.GONE}" />
+                android:visibility="@{item.ableToExcludePrivateIps ? View.VISIBLE : View.GONE}" />
 
             <EditText
                 android:id="@+id/allowed_ips_text"
@@ -114,7 +114,7 @@
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/allowed_ips_label"
                 android:inputType="textNoSuggestions|textVisiblePassword"
-                android:text="@={item.allowedIPs}" />
+                android:text="@={item.allowedIps}" />
 
             <TextView
                 android:id="@+id/endpoint_label"
@@ -157,5 +157,5 @@
                 android:text="@={item.persistentKeepalive}"
                 android:textAlignment="center" />
         </RelativeLayout>
-    </android.support.v7.widget.CardView>
+    </androidx.cardview.widget.CardView>
 </layout>

app/src/main/res/layout/tunnel_list_fragment.xml

@@ -19,76 +19,78 @@
             type="com.wireguard.android.util.ObservableKeyedList<String, Tunnel>" />
     </data>
 
-    <android.support.design.widget.CoordinatorLayout
+    <androidx.coordinatorlayout.widget.CoordinatorLayout
         android:id="@+id/main_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="?android:attr/colorBackground"
         android:clipChildren="false">
 
-        <android.support.v7.widget.RecyclerView
+        <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/tunnel_list"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:paddingBottom="@{@dimen/design_fab_size_normal * 1.1f}"
-            android:clipToPadding="false"
             android:choiceMode="multipleChoiceModal"
+            android:clipToPadding="false"
+            android:paddingBottom="@{@dimen/design_fab_size_normal * 1.1f}"
             android:visibility="@{tunnels.size() > 0 ? android.view.View.VISIBLE : android.view.View.GONE}"
+            app:configurationHandler="@{rowConfigurationHandler}"
             app:items="@{tunnels}"
-            app:layout="@{@layout/tunnel_list_item}"
-            app:configurationHandler="@{rowConfigurationHandler}" />
+            app:layout="@{@layout/tunnel_list_item}" />
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:orientation="vertical"
-            android:visibility="@{tunnels.size() == 0 ? android.view.View.VISIBLE : android.view.View.GONE}"
-            android:layout_gravity="center">
-            <android.support.v7.widget.AppCompatImageView
+            android:visibility="@{tunnels.size() == 0 ? android.view.View.VISIBLE : android.view.View.GONE}">
+
+            <androidx.appcompat.widget.AppCompatImageView
                 android:id="@+id/logo_placeholder"
                 android:layout_width="140dp"
                 android:layout_height="140dp"
                 android:layout_gravity="center"
-                android:tint="@color/transparent_background_placeholder"
-                android:layout_marginTop="-70dp"
                 android:layout_marginBottom="20dp"
+                android:layout_marginTop="-70dp"
+                android:alpha="0.3333333"
                 android:src="@mipmap/ic_launcher" />
+
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center"
-                android:textSize="20sp"
-                android:text="@string/tunnel_list_placeholder" />
+                android:text="@string/tunnel_list_placeholder"
+                android:textSize="20sp" />
         </LinearLayout>
 
         <com.wireguard.android.widget.fab.FloatingActionsMenu
             android:id="@+id/create_menu"
-            android:clipChildren="false"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
+            android:clipChildren="false"
             app:fab_labelStyle="@style/fab_label"
             app:fab_labelsPosition="@integer/label_position"
-            app:layout_behavior="com.wireguard.android.widget.fab.FloatingActionButtonBehavior" >
+            app:layout_behavior="com.wireguard.android.widget.fab.FloatingActionButtonBehavior">
 
             <com.wireguard.android.widget.fab.LabeledFloatingActionButton
                 android:id="@+id/create_from_file"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:onClick="@{fragment::onRequestImportConfig}"
-                app:srcCompat="@drawable/ic_action_open_white"
                 app:fabSize="mini"
-                app:fab_title="@string/create_from_file" />
+                app:fab_title="@string/create_from_file"
+                app:srcCompat="@drawable/ic_action_open_white" />
 
             <com.wireguard.android.widget.fab.LabeledFloatingActionButton
-                android:id="@+id/scan_qr_code"
+                android:id="@+id/create_from_qrcode"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:onClick="@{fragment::onRequestScanQRCode}"
-                app:srcCompat="@drawable/ic_action_scan_qr_code_white"
                 app:fabSize="mini"
-                app:fab_title="@string/create_from_qrcode" />
+                app:fab_title="@string/create_from_qr_code"
+                app:srcCompat="@drawable/ic_action_scan_qr_code_white" />
 
             <com.wireguard.android.widget.fab.LabeledFloatingActionButton
                 android:id="@+id/create_empty"
@@ -96,9 +98,8 @@
                 android:layout_height="wrap_content"
                 android:onClick="@{fragment::onRequestCreateConfig}"
                 app:fabSize="mini"
-                app:srcCompat="@drawable/ic_action_edit_white"
-                app:fab_title="@string/create_empty" />
+                app:fab_title="@string/create_empty"
+                app:srcCompat="@drawable/ic_action_edit_white" />
         </com.wireguard.android.widget.fab.FloatingActionsMenu>
-
-    </android.support.design.widget.CoordinatorLayout>
+    </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>

app/src/main/res/layout/tunnel_list_item.xml

@@ -25,10 +25,10 @@
             type="com.wireguard.android.fragment.TunnelListFragment" />
     </data>
 
-    <RelativeLayout
+    <com.wireguard.android.widget.MultiselectableRelativeLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/list_item_background_anim"
+        android:background="@drawable/list_item_background"
         android:descendantFocusability="blocksDescendants"
         android:padding="16dp">
 
@@ -51,5 +51,5 @@
             android:layout_alignParentEnd="true"
             app:checked="@{item.state == State.UP}"
             app:onBeforeCheckedChanged="@{fragment::setTunnelState}" />
-    </RelativeLayout>
+    </com.wireguard.android.widget.MultiselectableRelativeLayout>
 </layout>

app/src/main/res/menu/main_activity.xml

@@ -5,7 +5,7 @@
         android:id="@+id/menu_settings"
         android:alphabeticShortcut="s"
         android:icon="@drawable/ic_settings"
+        android:orderInCategory="1000"
         android:title="@string/settings"
-        app:showAsAction="always"
-        android:orderInCategory="1000" />
+        app:showAsAction="always" />
 </menu>

app/src/main/res/values-night/colors.xml

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors -->
-    <color name="list_item_activated">#64cfd8dc</color>
-    <color name="list_item_ripple">#a0808e95</color>
+    <!-- TODO(msf): remove these 2 hard-coded colors and replace with theme colors -->
     <color name="fab_label_text_color">#000000</color>
     <color name="fab_label_background_color">#bbbbbb</color>
 
     <color name="accent">#5e97f6</color>
-
-    <!-- TODO(msf): replace with ?android:attr/colorBackground with some alpha -->
-    <color name="transparent_background_placeholder">#aa2e2e2e</color>
 </resources>

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

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <declare-styleable name="Multiselected">
+        <attr name="state_multiselected" format="boolean" />
+    </declare-styleable>
+</resources>

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

@@ -1,13 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors -->
-    <color name="list_item_activated">#cfd8dc</color> <!-- Blue Grey 200 -->
-    <color name="list_item_ripple">#808e95</color> <!-- Blue Grey 200 dark -->
+    <!-- TODO(msf): remove these 2 hard-coded colors and replace with theme colors -->
     <color name="fab_label_text_color">#ffffff</color>
     <color name="fab_label_background_color">#444444</color>
 
     <color name="accent">#2196F3</color>
-
-    <!-- TODO(msf): replace with ?android:attr/colorBackground with some alpha -->
-    <color name="transparent_background_placeholder">#aafafafa</color>
 </resources>