Version bump

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
libwg-quick: add iptables output allowance
2026-07-03 14:05:13 +02:00 · 2018-06-25 16:18:57 +02:00 · 2018-06-25 16:16:27 +02:00 · 2018-06-25 16:10:02 +02:00 · 2018-06-23 01:00:07 -05:00 · 2018-06-23 00:57:31 -05:00
58 changed files with 710 additions and 760 deletions
@@ -13,3 +13,5 @@ build/
 *.class
 *.dex
 *.iml
+*.jks
+keystore.properties
@@ -150,7 +150,6 @@
    <inspection_tool class="FieldMayBeFinal" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FieldMayBeStatic" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FieldMustBeInitialized" enabled="true" level="ERROR" enabled_by_default="true" />
-    <inspection_tool class="FieldNotUsedInToString" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FinalMethodInFinalClass" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="FloatingPointEquality" enabled="true" level="WARNING" enabled_by_default="true" />
    <inspection_tool class="ForLoopReplaceableByWhile" enabled="true" level="WARNING" enabled_by_default="true">
@@ -1,21 +1,45 @@
 apply plugin: 'com.android.application'

+// Create a variable called keystorePropertiesFile, and initialize it to your
+// keystore.properties file, in the rootProject folder.
+final def keystorePropertiesFile = rootProject.file("keystore.properties")
+
 android {
-    buildToolsVersion '27.0.3'
+    buildToolsVersion '28.0.0'
    compileOptions {
        sourceCompatibility JavaVersion.VERSION_1_8
        targetCompatibility JavaVersion.VERSION_1_8
    }
    compileSdkVersion 27
-    dataBinding {
-        enabled true
-    }
+    dataBinding.enabled true
    defaultConfig {
        applicationId 'com.wireguard.android'
        minSdkVersion 21
        targetSdkVersion 27
-        versionCode 421
-        versionName '0.0.20180604'
+        versionCode 427
+        versionName '0.0.20180625'
+    }
+    // If the keystore file exists
+    if (keystorePropertiesFile.exists()) {
+        // Initialize a new Properties() object called keystoreProperties.
+        final def keystoreProperties = new Properties()
+
+        // Load your keystore.properties file into the keystoreProperties object.
+        keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
+        signingConfigs {
+            release {
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+            }
+        }
+    }
+    buildTypes {
+        release {
+            if (keystorePropertiesFile.exists()) signingConfig signingConfigs.release
+        }
    }
    externalNativeBuild {
        cmake {
@@ -23,22 +47,20 @@ android {
        }
    }
 }
+
 ext {
-    databindingVersion = '3.1.2'
+    databindingVersion = '3.1.3'
    supportLibsVersion = '27.1.1'
-    daggerVersion = '2.14.1'
    streamsupportVersion = '1.6.0'
 }

 dependencies {
-    annotationProcessor "com.google.dagger:dagger-compiler:$daggerVersion"
    implementation "com.android.databinding:library:$databindingVersion"
    implementation "com.android.support:appcompat-v7:$supportLibsVersion"
    implementation "com.android.support:cardview-v7:$supportLibsVersion"
    implementation "com.android.support:design:$supportLibsVersion"
    implementation "com.android.support:preference-v14:$supportLibsVersion"
    implementation "com.android.support:support-annotations:$supportLibsVersion"
-    implementation "com.google.dagger:dagger:$daggerVersion"
    implementation "net.sourceforge.streamsupport:android-retrofuture:$streamsupportVersion"
    implementation "net.sourceforge.streamsupport:android-retrostreams:$streamsupportVersion"
 }
@@ -1,12 +1,10 @@
 /*
- * Copyright © 2018 Samuel Holland <samuel@sholland.org>
 * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
 * SPDX-License-Identifier: GPL-2.0-or-later
 */

 package com.wireguard.android;

-import android.content.Context;
 import android.content.SharedPreferences;
 import android.os.AsyncTask;
 import android.os.Handler;
@@ -23,133 +21,109 @@ import com.wireguard.android.model.TunnelManager;
 import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.RootShell;
 import com.wireguard.android.util.ToolsInstaller;
-import com.wireguard.android.util.Topic;

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

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

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

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

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

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

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

-        TunnelManager getTunnelManager();
-
-        Topic getThemeChangeTopic();
-    }
-
-    @Qualifier
-    public @interface ApplicationContext {
-    }
-
-    @Qualifier
-    public @interface ApplicationHandler {
-    }
-
-    @Scope
-    public @interface ApplicationScope {
-    }
-
-    @Module
-    public static final class ApplicationModule {
-        private final Context context;
-
-        private ApplicationModule(final Application application) {
-            context = application.getApplicationContext();
-
-            AppCompatDelegate.setDefaultNightMode(
-                    getPreferences(context).getBoolean("dark_theme", false) ?
-                          AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
-        }
-
-        @ApplicationScope
-        @Provides
-        public static Backend getBackend(@ApplicationContext final Context context,
-                                         final RootShell rootShell,
-                                         final ToolsInstaller toolsInstaller) {
-            if (new File("/sys/module/wireguard").exists())
-                return new WgQuickBackend(context, rootShell, toolsInstaller);
-            else
-                return new GoBackend(context);
-        }
-
-        @ApplicationScope
-        @Provides
-        public static Class getBackendType(final Backend backend) {
-            return backend.getClass();
-        }
-
-        @ApplicationScope
-        @Provides
-        public static ConfigStore getConfigStore(@ApplicationContext final Context context) {
-            return new FileConfigStore(context);
-        }
-
-        @ApplicationScope
-        @Provides
-        public static Topic getThemeChangeTopic() {
-            return new Topic();
-        }
-
-
-        @ApplicationScope
-        @Provides
-        public static Executor getExecutor() {
-            return AsyncTask.SERIAL_EXECUTOR;
-        }
-
-        @ApplicationHandler
-        @ApplicationScope
-        @Provides
-        public static Handler getHandler() {
-            return new Handler(Looper.getMainLooper());
-        }
-
-        @ApplicationScope
-        @Provides
-        public static SharedPreferences getPreferences(@ApplicationContext final Context context) {
-            return PreferenceManager.getDefaultSharedPreferences(context);
-        }
-
-        @ApplicationContext
-        @ApplicationScope
-        @Provides
-        public Context getContext() {
-            return context;
-        }
+        tunnelManager = new TunnelManager(configStore);
+        asyncWorker.runAsync(Application::getBackend);
+        tunnelManager.onCreate();
    }
 }
@@ -20,19 +20,20 @@ public class BootShutdownReceiver extends BroadcastReceiver {

    @Override
    public void onReceive(final Context context, final Intent intent) {
-        if (Application.getComponent().getBackendType() != WgQuickBackend.class) {
-            return;
-        }
-        final String action = intent.getAction();
-        if (action == null)
-            return;
-        final TunnelManager tunnelManager = Application.getComponent().getTunnelManager();
-        if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
-            Log.i(TAG, "Broadcast receiver restoring state (boot)");
-            tunnelManager.restoreState(false).whenComplete(ExceptionLoggers.D);
-        } else if (Intent.ACTION_SHUTDOWN.equals(action)) {
-            Log.i(TAG, "Broadcast receiver saving state (shutdown)");
-            tunnelManager.saveState();
-        }
+        Application.onHaveBackend(backend -> {
+            if (backend.getClass() != WgQuickBackend.class)
+                return;
+            final String action = intent.getAction();
+            if (action == null)
+                return;
+            final TunnelManager tunnelManager = Application.getTunnelManager();
+            if (Intent.ACTION_BOOT_COMPLETED.equals(action)) {
+                Log.i(TAG, "Broadcast receiver restoring state (boot)");
+                tunnelManager.restoreState(false).whenComplete(ExceptionLoggers.D);
+            } else if (Intent.ACTION_SHUTDOWN.equals(action)) {
+                Log.i(TAG, "Broadcast receiver saving state (shutdown)");
+                tunnelManager.saveState();
+            }
+        });
    }
 }
@@ -20,7 +20,6 @@ import android.widget.Toast;
 import com.wireguard.android.activity.MainActivity;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.Tunnel.State;
-import com.wireguard.android.model.TunnelManager;
 import com.wireguard.android.util.ExceptionLoggers;

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

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

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

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

    private void updateTile() {
        // Update the tunnel.
-        final Tunnel newTunnel = tunnelManager.getLastUsedTunnel();
+        final Tunnel newTunnel = Application.getTunnelManager().getLastUsedTunnel();
        if (newTunnel != tunnel) {
            if (tunnel != null)
                tunnel.removeOnPropertyChangedCallback(onStateChangedCallback);
@@ -10,25 +10,19 @@ import android.content.Intent;
 import android.databinding.CallbackRegistry;
 import android.databinding.CallbackRegistry.NotifierCallback;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;

 import com.wireguard.android.Application;
 import com.wireguard.android.backend.GoBackend;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.Topic;

-import java.lang.reflect.Field;
 import java.util.Objects;

 /**
 * Base class for activities that need to remember the currently-selected tunnel.
 */

-public abstract class BaseActivity extends AppCompatActivity implements Topic.Subscriber {
-    private static final String TAG = "WireGuard/" + BaseActivity.class.getSimpleName();
-
+public abstract class BaseActivity extends ThemeChangeAwareActivity {
    private static final String KEY_SELECTED_TUNNEL = "selected_tunnel";

    private final SelectionChangeRegistry selectionChangeRegistry = new SelectionChangeRegistry();
@@ -45,8 +39,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Topic.Su

    @Override
    protected void onCreate(final Bundle savedInstanceState) {
-        subscribeTopics();
-
        // Restore the saved tunnel if there is one; otherwise grab it from the arguments.
        String savedTunnelName = null;
        if (savedInstanceState != null)
@@ -54,25 +46,20 @@ public abstract class BaseActivity extends AppCompatActivity implements Topic.Su
        else if (getIntent() != null)
            savedTunnelName = getIntent().getStringExtra(KEY_SELECTED_TUNNEL);
        if (savedTunnelName != null) {
-            final TunnelManager tunnelManager = Application.getComponent().getTunnelManager();
+            final TunnelManager tunnelManager = Application.getTunnelManager();
            selectedTunnel = tunnelManager.getTunnels().get(savedTunnelName);
        }

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

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

    @Override
@@ -118,28 +105,4 @@ public abstract class BaseActivity extends AppCompatActivity implements Topic.Su
            super(new SelectionChangeNotifier());
        }
    }
-
-    @Override
-    public void onTopicPublished(Topic topic) {
-        try {
-            Field f = getResources().getClass().getDeclaredField("mResourcesImpl");
-            f.setAccessible(true);
-            Object o = f.get(getResources());
-            f = o.getClass().getDeclaredField("mDrawableCache");
-            f.setAccessible(true);
-            o = f.get(o);
-            f = o.getClass().getSuperclass().getDeclaredField("mThemedEntries");
-            f.setAccessible(true);
-            o = f.get(o);
-            o.getClass().getMethod("clear").invoke(o);
-        } catch (Exception e) {
-            Log.e(TAG, "Failed to flush icon cache", e);
-        }
-        recreate();
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { Application.getComponent().getThemeChangeTopic() };
-    }
 }
@@ -6,6 +6,7 @@

 package com.wireguard.android.activity;

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

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

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

-
    @Override
    protected void onSelectedTunnelChanged(final Tunnel oldTunnel, final Tunnel newTunnel) {
        moveToState(newTunnel != null ? State.DETAIL : State.LIST);
@@ -6,22 +6,19 @@

 package com.wireguard.android.activity;

-import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.content.ContextCompat;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.app.AppCompatDelegate;
 import android.support.v7.preference.Preference;
 import android.support.v7.preference.PreferenceFragmentCompat;
+import android.support.v7.preference.PreferenceScreen;
 import android.view.MenuItem;

 import com.wireguard.android.Application;
 import com.wireguard.android.R;
 import com.wireguard.android.backend.WgQuickBackend;
-import com.wireguard.android.util.Topic;

 import java.util.ArrayList;
 import java.util.Arrays;
@@ -33,7 +30,7 @@ import java.util.Map;
 * Interface for changing application-global persistent settings.
 */

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

@@ -59,7 +56,6 @@ public class SettingsActivity extends AppCompatActivity implements Topic.Subscri
    @Override
    protected void onCreate(final Bundle savedInstanceState) {
        super.onCreate(savedInstanceState);
-        subscribeTopics();
        if (getSupportFragmentManager().findFragmentById(android.R.id.content) == null) {
            getSupportFragmentManager().beginTransaction()
                    .add(android.R.id.content, new SettingsFragment())
@@ -67,12 +63,6 @@ public class SettingsActivity extends AppCompatActivity implements Topic.Subscri
        }
    }

-    @Override
-    protected void onDestroy() {
-        unsubscribeTopics();
-        super.onDestroy();
-    }
-
    @Override
    public boolean onOptionsItemSelected(final MenuItem item) {
        switch (item.getItemId()) {
@@ -99,47 +89,25 @@ public class SettingsActivity extends AppCompatActivity implements Topic.Subscri
        void done(String[] permissions, int[] grantResults);
    }

-    @Override
-    public void onTopicPublished(final Topic topic) {
-        recreate();
-    }
-
-    @Override
-    public Topic[] getSubscription() {
-        return new Topic[] { Application.getComponent().getThemeChangeTopic() };
-    }
-
-    public static class SettingsFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener {
+    public static class SettingsFragment extends PreferenceFragmentCompat {
        @Override
        public void onCreatePreferences(final Bundle savedInstanceState, final String key) {
            addPreferencesFromResource(R.xml.preferences);
-            if (Application.getComponent().getBackendType() != WgQuickBackend.class) {
-                Preference pref = getPreferenceManager().findPreference("tools_installer");
-                getPreferenceScreen().removePreference(pref);
-                pref = getPreferenceManager().findPreference("restore_on_boot");
-                getPreferenceScreen().removePreference(pref);
-            }
-        }
-
-        @Override
-        public void onResume() {
-            super.onResume();
-            getPreferenceManager().getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
-        }
-
-        @Override
-        public void onPause() {
-            getPreferenceManager().getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
-            super.onPause();
-        }
-
-        @Override
-        public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key) {
-            if ("dark_theme".equals(key)) {
-                AppCompatDelegate.setDefaultNightMode(
-                        sharedPreferences.getBoolean(key, false) ? AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
-                Application.getComponent().getThemeChangeTopic().publish(false);
-            }
+            final Preference wgQuickOnlyPrefs[] = {
+                getPreferenceManager().findPreference("tools_installer"),
+                getPreferenceManager().findPreference("restore_on_boot")
+            };
+            for (final Preference pref : wgQuickOnlyPrefs)
+                pref.setVisible(false);
+            final PreferenceScreen screen = getPreferenceScreen();
+            Application.onHaveBackend(backend -> {
+                for (final Preference pref : wgQuickOnlyPrefs) {
+                    if (backend.getClass() == WgQuickBackend.class)
+                        pref.setVisible(true);
+                    else
+                        screen.removePreference(pref);
+                }
+            });
        }
    }
 }
@@ -0,0 +1,77 @@
+/*
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+package com.wireguard.android.activity;
+
+import android.content.SharedPreferences;
+import android.content.res.Resources;
+import android.os.Bundle;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
+import android.util.Log;
+
+import com.wireguard.android.Application;
+
+import java.lang.reflect.Field;
+
+public abstract class ThemeChangeAwareActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+    private static final String TAG = "WireGuard/" + ThemeChangeAwareActivity.class.getSimpleName();
+
+    private static Resources lastResources;
+    private static boolean lastDarkMode;
+    private static synchronized void invalidateDrawableCache(final Resources resources, final boolean darkMode) {
+        if (resources == lastResources && darkMode == lastDarkMode)
+            return;
+
+        try {
+            Field f;
+            Object o = resources;
+            try {
+                f = o.getClass().getDeclaredField("mResourcesImpl");
+                f.setAccessible(true);
+                o = f.get(o);
+            } catch (final Exception ignored) { }
+            f = o.getClass().getDeclaredField("mDrawableCache");
+            f.setAccessible(true);
+            o = f.get(o);
+            try {
+                o.getClass().getMethod("onConfigurationChange", int.class).invoke(o, -1);
+            } catch (final Exception ignored) {
+                o.getClass().getMethod("clear").invoke(o);
+            }
+        } catch (final Exception e) {
+            Log.e(TAG, "Failed to flush drawable cache", e);
+        }
+
+        lastResources = resources;
+        lastDarkMode = darkMode;
+    }
+
+
+    @Override
+    protected void onCreate(final Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        Application.getSharedPreferences().registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        Application.getSharedPreferences().unregisterOnSharedPreferenceChangeListener(this);
+        super.onDestroy();
+    }
+
+    @Override
+    public void onSharedPreferenceChanged(final SharedPreferences sharedPreferences, final String key) {
+        if ("dark_theme".equals(key)) {
+            final boolean darkMode = sharedPreferences.getBoolean(key, false);
+            AppCompatDelegate.setDefaultNightMode(
+                    sharedPreferences.getBoolean(key, false) ?
+                            AppCompatDelegate.MODE_NIGHT_YES :
+                            AppCompatDelegate.MODE_NIGHT_NO);
+            invalidateDrawableCache(getResources(), darkMode);
+            recreate();
+        }
+    }
+}
@@ -62,4 +62,19 @@ public interface Backend {
     * @return The updated state of the tunnel.
     */
    State setState(Tunnel tunnel, State state) throws Exception;
+
+    /**
+     * Determine version of underlying backend.
+     *
+     * @return The version of the backend.
+     * @throws Exception
+     */
+    String getVersion() throws Exception;
+
+    /**
+     * Determine type name of underlying backend.
+     *
+     * @return Type name
+     */
+    String getTypeName();
 }
@@ -21,7 +21,7 @@ import com.wireguard.android.model.Tunnel.Statistics;
 import com.wireguard.android.util.ExceptionLoggers;
 import com.wireguard.android.util.SharedLibraryLoader;
 import com.wireguard.config.Config;
-import com.wireguard.config.IPCidr;
+import com.wireguard.config.InetNetwork;
 import com.wireguard.config.Interface;
 import com.wireguard.config.Peer;
 import com.wireguard.crypto.KeyEncoding;
@@ -58,7 +58,11 @@ public final class GoBackend implements Backend {

    private static native String wgVersion();

-    public static String getVersion() { return 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 {
@@ -152,7 +156,7 @@ public final class GoBackend implements Backend {
                        fmt.format("endpoint=%s\n", peer.getResolvedEndpointString());
                    if (peer.getPersistentKeepalive() != 0)
                        fmt.format("persistent_keepalive_interval=%d\n", peer.getPersistentKeepalive());
-                    for (final IPCidr addr : peer.getAllowedIPs()) {
+                    for (final InetNetwork addr : peer.getAllowedIPs()) {
                        fmt.format("allowed_ip=%s\n", addr.toString());
                    }
                }
@@ -167,15 +171,15 @@ public final class GoBackend implements Backend {
            configureIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
            builder.setConfigureIntent(PendingIntent.getActivity(context, 0, configureIntent, 0));

-            for (final IPCidr addr : config.getInterface().getAddresses())
-                builder.addAddress(addr.getAddress(), addr.getCidr());
+            for (final InetNetwork addr : config.getInterface().getAddresses())
+                builder.addAddress(addr.getAddress(), addr.getMask());

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

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

            int mtu = config.getInterface().getMtu();
@@ -229,7 +233,7 @@ public final class GoBackend implements Backend {

        @Override
        public void onDestroy() {
-            for (final Tunnel tunnel : Application.getComponent().getTunnelManager().getTunnels()) {
+            for (final Tunnel tunnel : Application.getTunnelManager().getTunnels()) {
                if (tunnel != null && tunnel.getState() != State.DOWN)
                    tunnel.setState(State.DOWN);
            }
@@ -242,7 +246,7 @@ public final class GoBackend implements Backend {
            vpnService.complete(this);
            if (intent == null || intent.getComponent() == null || !intent.getComponent().getPackageName().equals(getPackageName())) {
                Log.d(TAG, "Service started by Always-on VPN feature");
-                Application.getComponent().getTunnelManager().restoreState(true).whenComplete(ExceptionLoggers.D);
+                Application.getTunnelManager().restoreState(true).whenComplete(ExceptionLoggers.D);
            }
            return super.onStartCommand(intent, flags, startId);
        }
@@ -9,11 +9,10 @@ package com.wireguard.android.backend;
 import android.content.Context;
 import android.util.Log;

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

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

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

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

+    @Override
+    public String getVersion() throws Exception {
+        final List<String> output = new ArrayList<>();
+        if (Application.getRootShell()
+                .run(output, "cat /sys/module/wireguard/version") != 0 || output.isEmpty())
+            throw new Exception("Unable to determine kernel module version");
+        return output.get(0);
+    }
+
+    @Override
+    public String getTypeName() { return "Kernel module"; }
+
    @Override
    public Config applyConfig(final Tunnel tunnel, final Config config) throws Exception {
        if (tunnel.getState() == State.UP) {
@@ -66,8 +72,8 @@ public final class WgQuickBackend implements Backend {
        final List<String> output = new ArrayList<>();
        // Don't throw an exception here or nothing will show up in the UI.
        try {
-            toolsInstaller.ensureToolsAvailable();
-            if (rootShell.run(output, "wg show interfaces") != 0 || output.isEmpty())
+            Application.getToolsInstaller().ensureToolsAvailable();
+            if (Application.getRootShell().run(output, "wg show interfaces") != 0 || output.isEmpty())
                return Collections.emptySet();
        } catch (final Exception e) {
            Log.w(TAG, "Unable to enumerate running tunnels", e);
@@ -95,7 +101,7 @@ public final class WgQuickBackend implements Backend {
        if (state == originalState)
            return originalState;
        Log.d(TAG, "Changing tunnel " + tunnel.getName() + " to state " + state);
-        toolsInstaller.ensureToolsAvailable();
+        Application.getToolsInstaller().ensureToolsAvailable();
        setStateInternal(tunnel, tunnel.getConfig(), state);
        return getState(tunnel);
    }
@@ -110,7 +116,7 @@ public final class WgQuickBackend implements Backend {
                state.toString().toLowerCase(), tempFile.getAbsolutePath());
        if (state == State.UP)
            command = "cat /sys/module/wireguard/version && " + command;
-        final int result = rootShell.run(null, command);
+        final int result = Application.getRootShell().run(null, command);
        // noinspection ResultOfMethodCallIgnored
        tempFile.delete();
        if (result != 0)
@@ -9,7 +9,6 @@ package com.wireguard.android.configStore;
 import android.content.Context;
 import android.util.Log;

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

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

    private final Context context;

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

@@ -15,7 +15,7 @@ import android.widget.ListView;
 import android.widget.TextView;

 import com.wireguard.android.R;
-import com.wireguard.android.util.Keyed;
+import com.wireguard.util.Keyed;
 import com.wireguard.android.util.ObservableKeyedList;
 import com.wireguard.android.widget.ToggleSwitch;
 import com.wireguard.android.widget.ToggleSwitch.OnBeforeCheckedChangeListener;
@@ -16,7 +16,7 @@ import android.view.ViewGroup;
 import android.widget.BaseAdapter;

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

 import java.lang.ref.WeakReference;
@@ -128,7 +128,7 @@ public class TunnelEditorFragment extends BaseFragment {
                }
                if (tunnel == null) {
                    Log.d(TAG, "Attempting to create new tunnel " + binding.getConfig().getName());
-                    final TunnelManager manager = Application.getComponent().getTunnelManager();
+                    final TunnelManager manager = Application.getTunnelManager();
                    manager.create(binding.getConfig().getName(), newConfig)
                            .whenComplete(this::onTunnelCreated);
                } else if (!tunnel.getName().equals(binding.getConfig().getName())) {
@@ -34,13 +34,10 @@ import android.widget.AdapterView.OnItemClickListener;
 import android.widget.AdapterView.OnItemLongClickListener;

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

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

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

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

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

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

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

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

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

    private final class ActionModeListener implements MultiChoiceModeListener {
@@ -13,7 +13,7 @@ import android.support.annotation.Nullable;

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

 import java.util.regex.Pattern;
@@ -9,19 +9,15 @@ package com.wireguard.android.model;
 import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.SharedPreferences;
 import android.databinding.BaseObservable;
 import android.databinding.Bindable;
 import android.support.annotation.NonNull;

 import com.wireguard.android.Application;
-import com.wireguard.android.Application.ApplicationScope;
 import com.wireguard.android.BR;
-import com.wireguard.android.backend.Backend;
 import com.wireguard.android.configStore.ConfigStore;
 import com.wireguard.android.model.Tunnel.State;
 import com.wireguard.android.model.Tunnel.Statistics;
-import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.ExceptionLoggers;
 import com.wireguard.android.util.ObservableKeyedList;
 import com.wireguard.android.util.ObservableSortedKeyedArrayList;
@@ -33,8 +29,6 @@ import java.util.Collection;
 import java.util.Comparator;
 import java.util.Set;

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

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

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

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

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

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

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

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

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

@@ -142,8 +127,8 @@ public final class TunnelManager extends BaseObservable {
    }

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

@@ -151,7 +136,7 @@ public final class TunnelManager extends BaseObservable {
    private void onTunnelsLoaded(final Iterable<String> present, final Collection<String> running) {
        for (final String name : present)
            addToList(name, null, running.contains(name) ? State.UP : State.DOWN);
-        final String lastUsedName = preferences.getString(KEY_LAST_USED_TUNNEL, null);
+        final String lastUsedName = Application.getSharedPreferences().getString(KEY_LAST_USED_TUNNEL, null);
        if (lastUsedName != null)
            setLastUsedTunnel(tunnels.get(lastUsedName));
        final CompletableFuture<Void>[] toComplete;
@@ -171,7 +156,7 @@ public final class TunnelManager extends BaseObservable {
    }

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

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

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

    CompletionStage<Config> setTunnelConfig(final Tunnel tunnel, final Config config) {
-        return asyncWorker.supplyAsync(() -> {
-            final Config appliedConfig = backend.applyConfig(tunnel, config);
+        return Application.getAsyncWorker().supplyAsync(() -> {
+            final Config appliedConfig = Application.getBackend().applyConfig(tunnel, config);
            return configStore.save(tunnel.getName(), appliedConfig);
        }).thenApply(tunnel::onConfigChanged);
    }
@@ -237,13 +222,13 @@ public final class TunnelManager extends BaseObservable {
        if (wasLastUsed)
            setLastUsedTunnel(null);
        tunnels.remove(tunnel);
-        return asyncWorker.supplyAsync(() -> {
+        return Application.getAsyncWorker().supplyAsync(() -> {
            if (originalState == State.UP)
-                backend.setState(tunnel, State.DOWN);
+                Application.getBackend().setState(tunnel, State.DOWN);
            configStore.rename(tunnel.getName(), name);
            final String newName = tunnel.onNameChanged(name);
            if (originalState == State.UP)
-                backend.setState(tunnel, State.UP);
+                Application.getBackend().setState(tunnel, State.UP);
            return newName;
        }).whenComplete((newName, e) -> {
            // On failure, we don't know what state the tunnel might be in. Fix that.
@@ -259,7 +244,7 @@ public final class TunnelManager extends BaseObservable {
    CompletionStage<State> setTunnelState(final Tunnel tunnel, final State state) {
        // Ensure the configuration is loaded before trying to use it.
        return tunnel.getConfigAsync().thenCompose(x ->
-                asyncWorker.supplyAsync(() -> backend.setState(tunnel, state))
+                Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().setState(tunnel, state))
        ).whenComplete((newState, e) -> {
            // Ensure onStateChanged is always called (failure or not), and with the correct state.
            tunnel.onStateChanged(e == null ? newState : tunnel.getState());
@@ -272,7 +257,7 @@ public final class TunnelManager extends BaseObservable {
    public static final class IntentReceiver extends BroadcastReceiver {
        @Override
        public void onReceive(final Context context, final Intent intent) {
-            final TunnelManager manager = Application.getComponent().getTunnelManager();
+            final TunnelManager manager = Application.getTunnelManager();
            if (intent == null)
                return;
            final String action = intent.getAction();
@@ -14,12 +14,11 @@ import android.support.design.widget.Snackbar;
 import android.support.v7.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.ContextThemeWrapper;

 import com.wireguard.android.Application;
 import com.wireguard.android.R;
-import com.wireguard.android.activity.SettingsActivity;
 import com.wireguard.android.util.ExceptionLoggers;
+import com.wireguard.android.util.FragmentUtils;

 import java.io.BufferedReader;
 import java.io.File;
@@ -40,18 +39,8 @@ public class LogExporterPreference extends Preference {
        super(context, attrs);
    }

-    private static SettingsActivity getPrefActivity(final Preference preference) {
-        final Context context = preference.getContext();
-        if (context instanceof ContextThemeWrapper) {
-            if (((ContextThemeWrapper) context).getBaseContext() instanceof SettingsActivity) {
-                return ((SettingsActivity) ((ContextThemeWrapper) context).getBaseContext());
-            }
-        }
-        return null;
-    }
-
    private void exportLog() {
-        Application.getComponent().getAsyncWorker().supplyAsync(() -> {
+        Application.getAsyncWorker().supplyAsync(() -> {
            final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
            final File file = new File(path, "wireguard-log.txt");
            if (!path.isDirectory() && !path.mkdirs())
@@ -64,7 +53,7 @@ public class LogExporterPreference extends Preference {

            try {
                final Process process = Runtime.getRuntime().exec(new String[]{
-                        "logcat", "-b", "all", "-d", "-v", "threadtime", "--pid", Integer.toString(android.os.Process.myPid()), "-f", file.getAbsolutePath(), "*:V"});
+                        "logcat", "-b", "all", "-d", "-v", "threadtime", "-f", file.getAbsolutePath(), "*:V"});
                if (process.waitFor() != 0) {
                    try (final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
                        final StringBuilder errors = new StringBuilder();
@@ -90,7 +79,7 @@ public class LogExporterPreference extends Preference {
            final String message = getContext().getString(R.string.log_export_error, error);
            Log.e(TAG, message, throwable);
            Snackbar.make(
-                    getPrefActivity(this).findViewById(android.R.id.content),
+                    FragmentUtils.getPrefActivity(this).findViewById(android.R.id.content),
                    message, Snackbar.LENGTH_LONG).show();
            setEnabled(true);
        } else {
@@ -113,7 +102,7 @@ public class LogExporterPreference extends Preference {

    @Override
    protected void onClick() {
-        getPrefActivity(this).ensurePermissions(
+        FragmentUtils.getPrefActivity(this).ensurePermissions(
                new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
                (permissions, granted) -> {
                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED) {
@@ -9,13 +9,10 @@ package com.wireguard.android.preference;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.support.v7.preference.Preference;
-import android.system.OsConstants;
 import android.util.AttributeSet;

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

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

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

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

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

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

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

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

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

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

        private final int messageResourceId;
        private final boolean shouldEnableView;
@@ -14,8 +14,6 @@ import android.util.AttributeSet;
 import com.wireguard.android.Application;
 import com.wireguard.android.BuildConfig;
 import com.wireguard.android.R;
-import com.wireguard.android.backend.GoBackend;
-import com.wireguard.android.backend.WgQuickBackend;

 public class VersionPreference extends Preference {
    private String versionSummary;
@@ -23,16 +21,15 @@ public class VersionPreference extends Preference {
    public VersionPreference(final Context context, final AttributeSet attrs) {
        super(context, attrs);

-        if (Application.getComponent().getBackendType() == GoBackend.class) {
-            versionSummary = getContext().getString(R.string.version_userspace_summary, GoBackend.getVersion());
-        } else if (Application.getComponent().getBackendType() == WgQuickBackend.class) {
-            Application.getComponent().getToolsInstaller().getVersion().whenComplete((version, exception) -> {
+        Application.onHaveBackend(backend -> {
+            versionSummary = getContext().getString(R.string.version_summary_checking, backend.getTypeName().toLowerCase());
+            Application.getAsyncWorker().supplyAsync(backend::getVersion).whenComplete((version, exception) -> {
                versionSummary = exception == null
-                        ? getContext().getString(R.string.version_kernel_summary, version)
-                        : getContext().getString(R.string.version_kernel_unknown_summary);
+                        ? getContext().getString(R.string.version_summary, backend.getTypeName(), version)
+                        : getContext().getString(R.string.version_summary_unknown, backend.getTypeName().toLowerCase());
                notifyChanged();
            });
-        }
+        });
    }

    @Override
@@ -14,13 +14,12 @@ import android.support.design.widget.Snackbar;
 import android.support.v7.preference.Preference;
 import android.util.AttributeSet;
 import android.util.Log;
-import android.view.ContextThemeWrapper;

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

 import java.io.File;
@@ -47,18 +46,8 @@ public class ZipExporterPreference extends Preference {
        super(context, attrs);
    }

-    private static SettingsActivity getPrefActivity(final Preference preference) {
-        final Context context = preference.getContext();
-        if (context instanceof ContextThemeWrapper) {
-            if (((ContextThemeWrapper) context).getBaseContext() instanceof SettingsActivity) {
-                return ((SettingsActivity) ((ContextThemeWrapper) context).getBaseContext());
-            }
-        }
-        return null;
-    }
-
    private void exportZip() {
-        final List<Tunnel> tunnels = new ArrayList<>(Application.getComponent().getTunnelManager().getTunnels());
+        final List<Tunnel> tunnels = new ArrayList<>(Application.getTunnelManager().getTunnels());
        final List<CompletableFuture<Config>> futureConfigs = new ArrayList<>(tunnels.size());
        for (final Tunnel tunnel : tunnels)
            futureConfigs.add(tunnel.getConfigAsync().toCompletableFuture());
@@ -67,7 +56,7 @@ public class ZipExporterPreference extends Preference {
            return;
        }
        CompletableFuture.allOf(futureConfigs.toArray(new CompletableFuture[futureConfigs.size()]))
-                .whenComplete((ignored1, exception) -> Application.getComponent().getAsyncWorker().supplyAsync(() -> {
+                .whenComplete((ignored1, exception) -> Application.getAsyncWorker().supplyAsync(() -> {
                    if (exception != null)
                        throw exception;
                    final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
@@ -96,7 +85,7 @@ public class ZipExporterPreference extends Preference {
            final String message = getContext().getString(R.string.zip_export_error, error);
            Log.e(TAG, message, throwable);
            Snackbar.make(
-                    getPrefActivity(this).findViewById(android.R.id.content),
+                    FragmentUtils.getPrefActivity(this).findViewById(android.R.id.content),
                    message, Snackbar.LENGTH_LONG).show();
            setEnabled(true);
        } else {
@@ -119,7 +108,7 @@ public class ZipExporterPreference extends Preference {

    @Override
    protected void onClick() {
-        getPrefActivity(this).ensurePermissions(
+        FragmentUtils.getPrefActivity(this).ensurePermissions(
                new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
                (permissions, granted) -> {
                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED) {
@@ -8,13 +8,8 @@ package com.wireguard.android.util;

 import android.os.Handler;

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

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

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

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

-    @Inject
-    AsyncWorker(final Executor executor, @ApplicationHandler final Handler handler) {
+    public AsyncWorker(final Executor executor, final Handler handler) {
        this.executor = executor;
        this.handler = handler;
    }
@@ -0,0 +1,25 @@
+/*
+ * Copyright © 2018 Harsh Shandilya <msfjarvis@gmail.com>
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+package com.wireguard.android.util;
+
+import android.content.Context;
+import android.support.v7.preference.Preference;
+import android.view.ContextThemeWrapper;
+
+import com.wireguard.android.activity.SettingsActivity;
+
+public class FragmentUtils {
+
+    public static SettingsActivity getPrefActivity(final Preference preference) {
+        final Context context = preference.getContext();
+        if (context instanceof ContextThemeWrapper) {
+            if (((ContextThemeWrapper) context).getBaseContext() instanceof SettingsActivity) {
+                return ((SettingsActivity) ((ContextThemeWrapper) context).getBaseContext());
+            }
+        }
+        return null;
+    }
+}
@@ -9,6 +9,8 @@ package com.wireguard.android.util;
 import android.databinding.ObservableArrayList;
 import android.support.annotation.NonNull;

+import com.wireguard.util.Keyed;
+
 import java.util.Collection;
 import java.util.ListIterator;
 import java.util.Objects;
@@ -8,6 +8,9 @@ package com.wireguard.android.util;

 import android.databinding.ObservableList;

+import com.wireguard.util.Keyed;
+import com.wireguard.util.KeyedList;
+
 /**
 * A list that is both keyed and observable.
 */
@@ -8,6 +8,9 @@ package com.wireguard.android.util;

 import android.support.annotation.NonNull;

+import com.wireguard.util.Keyed;
+import com.wireguard.util.SortedKeyedList;
+
 import java.util.AbstractList;
 import java.util.Collection;
 import java.util.Collections;
@@ -6,6 +6,9 @@

 package com.wireguard.android.util;

+import com.wireguard.util.Keyed;
+import com.wireguard.util.SortedKeyedList;
+
 /**
 * A list that is both sorted/keyed and observable.
 */
@@ -9,8 +9,6 @@ package com.wireguard.android.util;
 import android.content.Context;
 import android.util.Log;

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

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

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

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

-    @Inject
-    public RootShell(@ApplicationContext final Context context) {
+    public RootShell(final Context context) {
        deviceNotRootedMessage = context.getString(R.string.error_root);
        final File cacheDir = context.getCacheDir();
        localBinaryDir = new File(cacheDir, "bin");
@@ -13,8 +13,8 @@ import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
-import java.util.zip.ZipFile;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipFile;

 public final class SharedLibraryLoader {
    private static final String TAG = "WireGuard/" + SharedLibraryLoader.class.getSimpleName();
@@ -27,7 +27,7 @@ public final class SharedLibraryLoader {
        try {
            System.loadLibrary(libName);
            return;
-        } catch (UnsatisfiedLinkError e) {
+        } catch (final UnsatisfiedLinkError e) {
            Log.d(TAG, "Failed to load library normally, so attempting to extract from apk", e);
            noAbiException = e;
        }
@@ -59,7 +59,7 @@ public final class SharedLibraryLoader {
                }
                System.load(f.getAbsolutePath());
                return;
-            } catch (Exception e) {
+            } catch (final Exception e) {
                Log.d(TAG, "Failed to load library apk:/" + libZipPath, e);
                noAbiException = e;
            } finally {
@@ -11,27 +11,26 @@ import android.system.OsConstants;
 import android.util.Log;

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

 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

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

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

-    @Inject
-    public ToolsInstaller(@ApplicationContext final Context context, final RootShell rootShell) {
+    public ToolsInstaller(final Context context) {
        localBinaryDir = new File(context.getCacheDir(), "bin");
        nativeLibraryDir = new File(context.getApplicationInfo().nativeLibraryDir);
-        this.rootShell = rootShell;
-    }
-
-    public CompletionStage<String> getVersion() {
-        return Application.getComponent().getAsyncWorker().supplyAsync(() -> {
-            final List<String> output = new ArrayList<>();
-            if (rootShell.run(output, "cat /sys/module/wireguard/version") != 0 || output.isEmpty())
-                throw new RuntimeException("Unable to determine kernel module version");
-            return output.get(0);
-        });
    }

    private static File getInstallDir() {
@@ -79,7 +67,7 @@ public final class ToolsInstaller {

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

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

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

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

        try {
-            return rootShell.run(null, script.toString());
+            return Application.getRootShell().run(null, script.toString());
        } catch (final IOException ignored) {
            return OsConstants.EXIT_FAILURE;
        }
@@ -1,109 +0,0 @@
-/*
- * Copyright © 2017 John Wu <topjohnwu@gmail.com>
- * SPDX-License-Identifier: GPL-2.0-or-later
- */
-
-package com.wireguard.android.util;
-
-import java.lang.ref.WeakReference;
-import java.util.Iterator;
-import java.util.LinkedList;
-import java.util.List;
-
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-import java.util.List;
-
-public class Topic {
-
-    private static final int NON_INIT = 0;
-    private static final int PENDING = 1;
-    private static final int PUBLISHED = 2;
-
-    private int state = NON_INIT;
-    private List<WeakReference<Subscriber>> subscribers;
-    private Object[] results;
-
-    public Topic() {
-        subscribers = new SyncArrayList<>();
-    }
-
-    public synchronized void subscribe(final Subscriber sub) {
-        subscribers.add(new WeakReference<>(sub));
-    }
-
-    public synchronized void unsubscribe() {
-        subscribers = new SyncArrayList<>();
-    }
-
-    public synchronized void unsubscribe(final Subscriber sub) {
-        List<WeakReference<Subscriber>> subs = subscribers;
-        subscribers = new ArrayList<>();
-        for (final WeakReference<Subscriber> subscriber : subs) {
-            if (subscriber.get() != null && subscriber.get() != sub)
-                subscribers.add(subscriber);
-        }
-    }
-
-    public void reset() {
-        state = NON_INIT;
-        results = null;
-    }
-
-    public boolean isPublished() {
-        return state == PUBLISHED;
-    }
-
-    public void publish() {
-        publish(true);
-    }
-
-    public void publish(boolean record, Object... results) {
-        if (record)
-            state = PUBLISHED;
-        this.results = results;
-        // Snapshot
-        List<WeakReference<Subscriber>> subs = subscribers;
-        for (final WeakReference<Subscriber> subscriber : subs) {
-            if (subscriber != null && subscriber.get() != null)
-                subscriber.get().onTopicPublished(this);
-        }
-    }
-
-    public Object[] getResults() {
-        return results;
-    }
-
-    public boolean isPending() {
-        return state == PENDING;
-    }
-
-    public void setPending() {
-        state = PENDING;
-    }
-
-    public interface Subscriber {
-        default void subscribeTopics() {
-            for (final Topic topic : getSubscription()) {
-                if (topic.isPublished()) {
-                    onTopicPublished(topic);
-                }
-                topic.subscribe(this);
-            }
-        }
-        default void unsubscribeTopics() {
-            for (final Topic event : getSubscription()) {
-                event.unsubscribe(this);
-            }
-        }
-        void onTopicPublished(Topic topic);
-        Topic[] getSubscription();
-    }
-
-    private static class SyncArrayList<E> extends ArrayList<E> {
-        @Override
-        public synchronized boolean add(final E e) {
-            return super.add(e);
-        }
-    }
-}
@@ -7,19 +7,30 @@
 package com.wireguard.android.widget.fab;

 import android.content.Context;
-import android.content.res.Resources;
 import android.content.res.TypedArray;
-import android.graphics.*;
+import android.graphics.Canvas;
+import android.graphics.Color;
+import android.graphics.LinearGradient;
+import android.graphics.Paint;
 import android.graphics.Paint.Style;
+import android.graphics.Rect;
+import android.graphics.Shader;
 import android.graphics.Shader.TileMode;
-import android.graphics.drawable.*;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
+import android.graphics.drawable.LayerDrawable;
+import android.graphics.drawable.ShapeDrawable;
 import android.graphics.drawable.ShapeDrawable.ShaderFactory;
+import android.graphics.drawable.StateListDrawable;
 import android.graphics.drawable.shapes.OvalShape;
-import android.support.annotation.*;
+import android.support.annotation.ColorRes;
+import android.support.annotation.DimenRes;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.IntDef;
+import android.support.annotation.NonNull;
 import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatImageButton;
 import android.util.AttributeSet;
-import android.util.TypedValue;
 import android.widget.TextView;

 import com.wireguard.android.R;
@@ -60,12 +71,12 @@ public class FloatingActionButton extends AppCompatImageButton {
    }

    public static int getColorFromTheme(final Context context, final int themeResource, @ColorRes final int fallback) {
-        final TypedValue typedValue = new TypedValue();
-        final Resources.Theme theme = context.getTheme();
-        theme.resolveAttribute(themeResource, typedValue, true);
-        @ColorInt final int color = typedValue.data;
-        return color == 0 ? fallback : color;
-
+        final TypedArray a = context.obtainStyledAttributes(new int[]{themeResource});
+        try {
+            return a.getColor(0, ContextCompat.getColor(context, fallback));
+        } finally {
+            a.recycle();
+        }
    }

    void init(final Context context, final AttributeSet attributeSet) {
@@ -222,6 +233,7 @@ public class FloatingActionButton extends AppCompatImageButton {

        final LayerDrawable layerDrawable = new LayerDrawable(
                new Drawable[]{
+                        //TODO(msf); replace these pngs with programatic elevation
                        getResources().getDrawable(mSize == SIZE_NORMAL ? R.drawable.fab_bg_normal : R.drawable.fab_bg_mini, null),
                        createFillDrawable(strokeWidth),
                        createOuterStrokeDrawable(strokeWidth),
@@ -14,16 +14,13 @@ import android.animation.TimeInterpolator;
 import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
-import android.graphics.Color;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.graphics.drawable.LayerDrawable;
 import android.os.Parcel;
 import android.os.Parcelable;
-import android.support.annotation.ColorRes;
 import android.support.annotation.Keep;
 import android.support.annotation.NonNull;
-import android.support.v4.content.ContextCompat;
 import android.support.v7.widget.AppCompatTextView;
 import android.util.AttributeSet;
 import android.view.ContextThemeWrapper;
@@ -390,11 +387,6 @@ public class FloatingActionsMenu extends ViewGroup {
        return new LayoutParams(super.generateLayoutParams(p));
    }

-    @Override
-    protected boolean checkLayoutParams(final ViewGroup.LayoutParams p) {
-        return super.checkLayoutParams(p);
-    }
-
    @Override
    protected void onFinishInflate() {
        super.onFinishInflate();
@@ -418,7 +410,7 @@ public class FloatingActionsMenu extends ViewGroup {
                    button.getTag(R.id.fab_label) != null) continue;

            final AppCompatTextView label = new AppCompatTextView(context);
-            label.setTextAppearance(getContext(), mLabelsStyle);
+            label.setTextAppearance(context, mLabelsStyle);
            label.setText(button.getTitle());
            addView(label);

@@ -474,7 +466,7 @@ public class FloatingActionsMenu extends ViewGroup {
    }

    @Override
-    public void setEnabled(boolean enabled) {
+    public void setEnabled(final boolean enabled) {
        super.setEnabled(enabled);

        mAddButton.setEnabled(enabled);
@@ -13,11 +13,11 @@ import android.view.TouchDelegate;
 import android.view.View;

 import java.util.ArrayList;
-import java.util.List;
+import java.util.Collection;

 public class TouchDelegateGroup extends TouchDelegate {
    private static final Rect USELESS_HACKY_RECT = new Rect();
-    private final List<TouchDelegate> mTouchDelegates = new ArrayList<>();
+    private final Collection<TouchDelegate> mTouchDelegates = new ArrayList<>();
    private TouchDelegate mCurrentTouchDelegate;
    private boolean mEnabled;

@@ -49,8 +49,7 @@ public class TouchDelegateGroup extends TouchDelegate {

        switch (event.getAction()) {
            case MotionEvent.ACTION_DOWN:
-                for (int i = 0; i < mTouchDelegates.size(); i++) {
-                    final TouchDelegate touchDelegate = mTouchDelegates.get(i);
+		for (final TouchDelegate touchDelegate : mTouchDelegates) {
                    if (touchDelegate.onTouchEvent(event)) {
                        mCurrentTouchDelegate = touchDelegate;
                        return true;
@@ -8,9 +8,6 @@ package com.wireguard.config;

 import android.text.TextUtils;

-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.net.InetAddress;
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
@@ -36,7 +33,6 @@ enum Attribute {
    private static final String[] EMPTY_LIST = new String[0];
    private static final Map<String, Attribute> KEY_MAP;
    private static final Pattern LIST_SEPARATOR_PATTERN = Pattern.compile("\\s*,\\s*");
-    private static final Method NUMERIC_ADDRESS_PARSER;
    private static final Pattern SEPARATOR_PATTERN = Pattern.compile("\\s|=");

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

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

@@ -70,21 +58,6 @@ enum Attribute {
        return KEY_MAP.get(SEPARATOR_PATTERN.split(line)[0].toLowerCase());
    }

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

 public class Interface {
-    private final List<IPCidr> addressList;
+    private final List<InetNetwork> addressList;
    private final List<InetAddress> dnsList;
    private Keypair keypair;
    private int listenPort;
@@ -39,7 +39,7 @@ public class Interface {
            for (final String addr : addresses) {
                if (addr.isEmpty())
                    throw new IllegalArgumentException("Address is empty");
-                addressList.add(new IPCidr(addr));
+                addressList.add(new InetNetwork(addr));
            }
        }
    }
@@ -47,7 +47,7 @@ public class Interface {
    private void addDnses(final String[] dnses) {
        if (dnses != null && dnses.length > 0) {
            for (final String dns : dnses) {
-                dnsList.add(Attribute.parseIPString(dns));
+                dnsList.add(InetAddresses.parse(dns));
            }
        }
    }
@@ -58,8 +58,8 @@ public class Interface {
        return Attribute.iterableToString(addressList);
    }

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

    private String getDnsString() {
@@ -28,7 +28,7 @@ import java.util.Locale;
 */

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

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

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

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

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

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

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

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

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

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

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

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

 import java.util.Collection;
 import java.util.Comparator;
@@ -5,5 +5,5 @@
    android:viewportWidth="24">
    <path
        android:fillColor="?android:attr/colorForeground"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
+        android: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>
@@ -6,5 +6,6 @@
        android:alphabeticShortcut="s"
        android:icon="@drawable/ic_settings"
        android:title="@string/settings"
-        app:showAsAction="never" />
+        app:showAsAction="always"
+        android:orderInCategory="1000" />
 </menu>
@@ -69,18 +69,21 @@
    <string name="toggle_error">Error toggling WireGuard tunnel: %s</string>
    <string name="tools_installer_already">wg and wg-quick are already installed</string>
    <string name="tools_installer_failure">Unable to install command-line tools (no root?)</string>
-    <string name="tools_installer_initial">Install optional tools for scripting into the system partition</string>
-    <string name="tools_installer_success">wg and wg-quick installed into the system partition</string>
+    <string name="tools_installer_initial">Install optional tools for scripting</string>
+    <string name="tools_installer_working">Installing wg and wg-quick</string>
+    <string name="tools_installer_initial_system">Install optional tools for scripting into the system partition</string>
+    <string name="tools_installer_initial_magisk">Install optional tools for scripting as Magisk module</string>
+    <string name="tools_installer_success_system">wg and wg-quick installed into the system partition</string>
+    <string name="tools_installer_success_magisk">wg and wg-quick installed as a Magisk module (reboot required)</string>
    <string name="tools_installer_title">Install command line tools</string>
-    <string name="tools_installer_working">Installing wg and wg-quick into the system partition</string>
    <string name="tunnel_create_error">Unable to create tunnel: %s</string>
    <string name="tunnel_create_success">Successfully created tunnel “%s”</string>
    <string name="tunnel_rename_error">Unable to rename tunnel: %s</string>
    <string name="tunnel_rename_success">Successfully renamed tunnel to “%s”</string>
    <string name="version_title">WireGuard for Android v%s"</string>
-    <string name="version_kernel_summary">Kernel module backend v%s</string>
-    <string name="version_kernel_unknown_summary">Unknown kernel module version</string>
-    <string name="version_userspace_summary">Go userspace backend v%s</string>
+    <string name="version_summary">%s backend v%s</string>
+    <string name="version_summary_checking">Checking %s backend version</string>
+    <string name="version_summary_unknown">Unknown %s version</string>
    <string name="zip_exporter_title">Export tunnels to zip file</string>
    <string name="zip_export_error">Unable to export tunnels: %s</string>
    <string name="zip_export_success">Saved to %s</string>
@@ -9,7 +9,7 @@
        <item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
    </style>

-    <style name="fab_label" parent="android:TextAppearance.DeviceDefault.Inverse">
+    <style name="fab_label" parent="TextAppearance.AppCompat.Inverse">
        <item name="android:background">@drawable/fab_label_background</item>
        <item name="android:textColor">@color/fab_label_text_color</item>
    </style>
@@ -29,7 +29,7 @@ GOBUILDVERSION_NEEDED := go version go$(GOBUILDVERSION) $(GOBUILDOS)/$(GOBUILDAR

 GOBUILDVERSION_CURRENT := $(shell go version 2>/dev/null)
 ifeq ($(GOBUILDVERSION_NEEDED),$(GOBUILDVERSION_CURRENT))
-$(info Using system go)
+$(info Using system Go)
 else
 export GOROOT := $(CURDIR)/goroot
 export PATH := $(GOROOT)/bin:$(PATH)
@@ -41,18 +41,18 @@ $(GOROOT)/bin/go:
 	rm -rf "$(GOROOT)"
 	mkdir -p "$(GOROOT)"
 	curl "$(GOBUILDTARBALL)" | tar -C "$(GOROOT)" --strip-components=1 -xzf - || { rm -rf "$(GOROOT)"; exit 1; }
-	patch -p1 -f -N -r- -d"$(GOROOT)" < goruntime-boottime-over-monotonic.diff || { rm -rf "$(GOROOT)"; exit 1; }
+	patch -p1 -f -N -r- -d "$(GOROOT)" < goruntime-boottime-over-monotonic.diff || { rm -rf "$(GOROOT)"; exit 1; }
 $(DESTDIR)/libwg-go.so: $(GOROOT)/bin/go
 endif

 $(shell test "$$(cat .gobuildversion 2>/dev/null)" = "$(GOBUILDVERSION_CURRENT)" || rm -f "$(DESTDIR)/libwg-go.so")

 $(DESTDIR)/libwg-go.so: $(FILES) src/git.zx2c4.com/wireguard-go/api-android.go src/git.zx2c4.com/wireguard-go/tun/api-android.go src/git.zx2c4.com/wireguard-go/jni.c
+	@goroot="$$(go env GOROOT)" || exit 1; patch -p1 -f -R -s --dry-run -d "$$goroot" < goruntime-boottime-over-monotonic.diff >/dev/null 2>&1 || { echo "ERROR: Your system's Go is not patched to use the suspend-aware monotonic clock. Please try again after having run: \`patch -p1 -d \"$$goroot\" < \"$(CURDIR)/goruntime-boottime-over-monotonic.diff\"\`."; exit 1; }
 	find . -name '*.go' -type l -delete
 	find . -type d -empty -delete
 	mkdir -p $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILES)))
 	$(foreach FILE,$(FILES),ln -sfrt $(subst ../wireguard-go/,./src/git.zx2c4.com/wireguard-go/,$(dir $(FILE))) $(FILE);)
-	patch -p1 -f -R -s --dry-run -d"$$(go env GOROOT)" < goruntime-boottime-over-monotonic.diff
 	GOPATH=$(PWD) go get -v -d git.zx2c4.com/wireguard-go
 	GOPATH=$(PWD) go build -v -o $(DESTDIR)/libwg-go.so -buildmode c-shared git.zx2c4.com/wireguard-go
 	go version > .gobuildversion
@@ -161,8 +161,8 @@ func wgGetSocketV6(tunnelHandle int32) int32 {
 }

 //export wgVersion
-func wgVersion() string {
-	return WireGuardGoVersion
+func wgVersion() *C.char {
+	return C.CString(WireGuardGoVersion)
 }

 func main() {}
@@ -12,7 +12,7 @@ extern int wgTurnOn(struct go_string ifname, int tun_fd, struct go_string settin
 extern void wgTurnOff(int handle);
 extern int wgGetSocketV4(int handle);
 extern int wgGetSocketV6(int handle);
-extern struct go_string wgVersion();
+extern char *wgVersion();

 JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgTurnOn(JNIEnv *env, jclass c, jstring ifname, jint tun_fd, jstring settings)
 {
@@ -50,13 +50,10 @@ JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgGetSocketV
 JNIEXPORT jstring JNICALL Java_com_wireguard_android_backend_GoBackend_wgVersion(JNIEnv *env, jclass c)
 {
 	jstring ret;
-	struct go_string s = wgVersion();
-	char *cstr = malloc(s.n + 1);
-	if (!cstr)
+	char *version = wgVersion();
+	if (!version)
 		return NULL;
-	memcpy(cstr, s.str, s.n);
-	cstr[s.n] = '\0';
-	ret = (*env)->NewStringUTF(env, cstr);
-	free(cstr);
+	ret = (*env)->NewStringUTF(env, version);
+	free(version);
 	return ret;
 }
@@ -7,7 +7,7 @@ allprojects {

 buildscript {
    dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.2'
+        classpath 'com.android.tools.build:gradle:3.1.3'
    }
    repositories {
        google()
@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.4-bin.zip
Author	SHA1	Message	Date
Jason A. Donenfeld	3de549d2c7	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-25 16:18:57 +02:00
Jason A. Donenfeld	408e9004b0	libwg-quick: add iptables output allowance Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-25 16:16:27 +02:00
Jason A. Donenfeld	e1a66d5766	global: Small cleanups Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-25 16:10:02 +02:00
Harsh Shandilya	99cf2152c4	android: Consolidate getPrefActivity into FragmentUtils Signed-off-by: Harsh Shandilya <me@msfjarvis.dev> [Samuel: Changed static to non-static import] Signed-off-by: Samuel Holland <samuel@sholland.org>	2018-06-23 01:00:07 -05:00
Harsh Shandilya	53e8d425e9	QuickTileService: Remove useless override Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-23 00:57:31 -05:00
Harsh Shandilya	9e5f45da15	gradle: Style Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-23 00:57:31 -05:00
Harsh Shandilya	4c0caa10e9	treewide: Optimize imports Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-23 00:57:31 -05:00
Samuel Holland	b9991e4229	config: Refactor IPCidr and use of InetAddress Use a canonically-named utility class to tack on methods to the existing InetAddress class. Rename IPCidr to InetNetwork so it better matches InetAddress and is more pronouceable :) While here, simplify the constructor and toString() functions, and properly implement hashCode(). Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:59:44 -05:00
Samuel Holland	4acee49d4b	util: Extract non-Android utility interfaces As part of a refactoring that will likely introduce more custom collection classes, move the non-Android-specific parts outside the com.wireguard.android package. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:59:44 -05:00
Samuel Holland	d3a8291a7a	crypto: Slightly Java-ify the Curve25519 implementation Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:59:42 -05:00
Samuel Holland	bcae77b989	app: Regularly scheduled gradle updates Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:35:54 -05:00
Samuel Holland	de75ff4bea	idea: Disable an unwanted inspection Android Studio isn't smart enough to realize that the public/private keys and the keypair are effectively the same thing. Just turn off the inspection because it's usually tripped by intentional things. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-19 21:33:36 -05:00
Jason A. Donenfeld	b10a6171a5	Application: make lock final Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-17 22:34:22 +02:00
Jason A. Donenfeld	6534f45a3a	application: style fix Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-17 14:53:31 +02:00
Jason A. Donenfeld	373145d30e	Version bump for clat fix Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-17 05:25:42 +02:00
Jason A. Donenfeld	5feea74f28	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-14 05:07:15 +02:00
Jason A. Donenfeld	e8891d775b	global: supply backend asynchronously We can't block for IO, so move everything to async workers or to callbacks. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-14 05:06:18 +02:00
Jason A. Donenfeld	0f128f99a1	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-12 05:46:02 +02:00
Jason A. Donenfeld	61e3441bfb	Application: require rootshell to use wgquick backend Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-12 05:42:24 +02:00
Jason A. Donenfeld	15e10d8fde	ToolsInstaller: safer state machine Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-10 05:17:09 +02:00
Jason A. Donenfeld	ea72e8b656	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:59:47 +02:00
Jason A. Donenfeld	2ca27c2783	BaseActivity: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:49:15 +02:00
Jason A. Donenfeld	f190db0754	BootShutdownReceiver: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:37:28 +02:00
Jason A. Donenfeld	8d27570eea	Backend: abstract version information Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:35:07 +02:00
Jason A. Donenfeld	24605c9c01	Give Samuel heart attack by removing Dagger Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 04:12:42 +02:00
Jason A. Donenfeld	7b59353910	VersionPreference: account for checking state and move away from tools installer Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-07 03:27:06 +02:00
Jason A. Donenfeld	ca7f4e5be9	FloatingActionMenu: 5.1 requires explicit text color Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-06 03:12:29 +02:00
Harsh Shandilya	ab95ac83c9	MainActivity: Fix style Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-06 02:07:26 +02:00
Jason A. Donenfeld	51fb57433b	ToolsInstallerPreference: do not check for magisk on main thread Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-06 00:29:44 +02:00
Harsh Shandilya	0496b94aa8	build: Allow building release artifacts in-tree This change avoids all need for changing any file under VCS to insert signing keys and configs for release builds. Example contents of keystore.properties ``` // Location of keystore, relative to module build.gradle, // in this case, of the app module storeFile=../wireguard.jks storePassword=b3ty0uc4nth4xxth1s keyAlias=wireguard keyPassword=4ndr01dsux ``` Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 19:58:34 +05:30
Harsh Shandilya	d8d6e99df1	MainActivity: Silence useless warning Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 19:52:08 +05:30
Jason A. Donenfeld	377ba1c9d1	Version bump Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 16:07:56 +02:00
Jason A. Donenfeld	8ebeeb6d90	FloatingActionMenu: use appcompat theme Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 16:01:38 +02:00
Harsh Shandilya	3c3de065c6	MainActivity: collapse action menu on toolbar touch Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 15:22:40 +02:00
Jason A. Donenfeld	a17ec6b1f7	ToolsInstaller: allow installing as Magisk module Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 06:17:00 +02:00
Jason A. Donenfeld	cbf8ac6538	libwg-go: better error when using unpatched Go Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 03:28:16 +02:00
Jason A. Donenfeld	d4b1295e94	ActionBar: show single menu item as toolicon Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 03:09:51 +02:00
Jason A. Donenfeld	db53e17e58	TunnelListFragment: hide menu when going to settings Really the menu should be hidden when clicking on the action bar, too. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 03:05:58 +02:00
Jason A. Donenfeld	f0a3e63743	MainActivity: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:47:59 +02:00
Jason A. Donenfeld	d636e13717	fab: properly get theme color Harsh changed this before, but my original way is what the support library does internally. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:44:32 +02:00
Jason A. Donenfeld	dea60e13c0	libwg-go: more efficient and safer string passing It was unclear when the Go string was actually freed. Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:18:12 +02:00
Harsh Shandilya	40a30d997d	fab: Remove useless override Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 02:05:35 +02:00
Harsh Shandilya	dba8d0305e	fab: Use themed context to set style Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>	2018-06-05 02:05:23 +02:00
Jason A. Donenfeld	27072972ab	DarkMode: move to shared preferences listener Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-05 02:02:09 +02:00
Jason A. Donenfeld	d56e95c576	MainActivity: style Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 19:55:27 +02:00
Jason A. Donenfeld	d0ef2c43d9	FloatingActionsMenu: remove unused imports Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 19:12:12 +02:00
Jason A. Donenfeld	0c0c1acc3b	BaseActivity: support android 5 and 6 when clearing drawable cache Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 18:35:18 +02:00
Jason A. Donenfeld	48f796c463	LogExporterPreference: get all past processes Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 17:57:02 +02:00
Jason A. Donenfeld	8aab35a70d	BaseActivity: invalidate icon cache on Android P Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>	2018-06-04 17:57:02 +02:00