Version bump

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

app/build.gradle

@@ -2,12 +2,6 @@ apply plugin: 'com.android.application'
 
 android {
     buildToolsVersion '27.0.3'
-    buildTypes {
-        release {
-            minifyEnabled true
-            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
-        }
-    }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_8
         targetCompatibility JavaVersion.VERSION_1_8
@@ -20,8 +14,8 @@ android {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 420
-        versionName '0.0.20180601'
+        versionCode 422
+        versionName '0.0.20180605'
     }
     externalNativeBuild {
         cmake {

app/proguard-rules.pro

@@ -1,26 +0,0 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in /opt/android-sdk/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
--dontwarn sun.misc.Unsafe

app/src/main/AndroidManifest.xml

@@ -8,6 +8,13 @@
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
+    <permission
+        android:name="com.wireguard.android.permission.CONTROL_TUNNELS"
+        android:protectionLevel="dangerous"
+        android:icon="@mipmap/ic_launcher"
+        android:label="@string/permission_label"
+        android:description="@string/permission_description" />
+
     <application
         android:name=".Application"
         android:allowBackup="false"
@@ -50,9 +57,13 @@
             </intent-filter>
         </receiver>
 
-        <receiver android:name=".backend.WgQuickBackend$WgQuickChangeReceiver">
+        <receiver
+            android:name=".model.TunnelManager$IntentReceiver"
+            android:permission="com.wireguard.android.permission.CONTROL_TUNNELS">
             <intent-filter>
-                <action android:name="com.wireguard.android.WGQUICK_CHANGE" />
+                <action android:name="com.wireguard.android.action.REFRESH_TUNNEL_STATES" />
+                <action android:name="com.wireguard.android.action.SET_TUNNEL_UP" />
+                <action android:name="com.wireguard.android.action.SET_TUNNEL_DOWN" />
             </intent-filter>
         </receiver>
 

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

@@ -23,7 +23,6 @@ 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.util.concurrent.Executor;
@@ -68,8 +67,6 @@ public class Application extends android.app.Application {
         ToolsInstaller getToolsInstaller();
 
         TunnelManager getTunnelManager();
-
-        Topic getThemeChangeTopic();
     }
 
     @Qualifier
@@ -119,13 +116,6 @@ public class Application extends android.app.Application {
             return new FileConfigStore(context);
         }
 
-        @ApplicationScope
-        @Provides
-        public static Topic getThemeChangeTopic() {
-            return new Topic();
-        }
-
-
         @ApplicationScope
         @Provides
         public static Executor getExecutor() {

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

@@ -11,24 +11,19 @@ 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 +40,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)
@@ -69,12 +62,6 @@ public abstract class BaseActivity extends AppCompatActivity implements Topic.Su
         }
     }
 
-    @Override
-    protected void onDestroy() {
-        unsubscribeTopics();
-        super.onDestroy();
-    }
-
     @Override
     protected void onSaveInstanceState(final Bundle outState) {
         if (selectedTunnel != null)
@@ -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() };
-    }
 }

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

@@ -76,7 +76,7 @@ public class MainActivity extends BaseActivity {
                             getSupportFragmentManager().getFragments().get(0));
         } catch (final ClassCastException ignored) {
         }
-        if (fragment == null || !(fragment.collapseActionMenu())) {
+        if (fragment == null || !fragment.collapseActionMenu()) {
             if (!moveToState(State.ofLayer(state.layer - 1)))
                 super.onBackPressed();
         }
@@ -95,6 +95,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 +140,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);

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

@@ -21,7 +21,6 @@ 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 +32,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 +58,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 +65,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,17 +91,7 @@ public class SettingsActivity extends AppCompatActivity implements Topic.Subscri
         void done(String[] permissions, int[] grantResults);
     }
 
-    @Override
-    public void onTopicPublished(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);
@@ -120,26 +102,5 @@ public class SettingsActivity extends AppCompatActivity implements Topic.Subscri
                 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(SharedPreferences sharedPreferences, 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);
-            }
-        }
     }
 }

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

@@ -0,0 +1,76 @@
+/*
+ * 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.preference.PreferenceManager;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.app.AppCompatDelegate;
+import android.util.Log;
+
+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);
+        PreferenceManager.getDefaultSharedPreferences(this).registerOnSharedPreferenceChangeListener(this);
+    }
+
+    @Override
+    protected void onDestroy() {
+        PreferenceManager.getDefaultSharedPreferences(this).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();
+        }
+    }
+}

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

@@ -137,7 +137,7 @@ public final class GoBackend implements Backend {
             // Build config
             final Interface iface = config.getInterface();
             final String goConfig;
-            try (Formatter fmt = new Formatter(new StringBuilder())) {
+            try (final Formatter fmt = new Formatter(new StringBuilder())) {
                 fmt.format("replace_peers=true\n");
                 if (iface.getPrivateKey() != null)
                     fmt.format("private_key=%s\n", KeyEncoding.keyToHex(KeyEncoding.keyFromBase64(iface.getPrivateKey())));
@@ -184,11 +184,12 @@ public final class GoBackend implements Backend {
             builder.setMtu(mtu);
 
             builder.setBlocking(true);
-            final ParcelFileDescriptor tun = builder.establish();
-            if (tun == null)
-                throw new Exception("Unable to create tun device");
-
-            currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig);
+            try (final ParcelFileDescriptor tun = builder.establish()) {
+                if (tun == null)
+                    throw new Exception("Unable to create tun device");
+                Log.d(TAG, "Go backend v" + wgVersion());
+                currentTunnelHandle = wgTurnOn(tunnel.getName(), tun.detachFd(), goConfig);
+            }
             if (currentTunnelHandle < 0)
                 throw new Exception("Unable to turn tunnel on (wgTurnOn return " + currentTunnelHandle + ')');
 
@@ -237,7 +238,7 @@ public final class GoBackend implements Backend {
         }
 
         @Override
-        public int onStartCommand(Intent intent, int flags, int startId) {
+        public int onStartCommand(final Intent intent, final int flags, final int startId) {
             vpnService.complete(this);
             if (intent == null || intent.getComponent() == null || !intent.getComponent().getPackageName().equals(getPackageName())) {
                 Log.d(TAG, "Service started by Always-on VPN feature");

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

@@ -6,12 +6,9 @@
 
 package com.wireguard.android.backend;
 
-import android.content.BroadcastReceiver;
 import android.content.Context;
-import android.content.Intent;
 import android.util.Log;
 
-import com.wireguard.android.Application;
 import com.wireguard.android.model.Tunnel;
 import com.wireguard.android.model.Tunnel.State;
 import com.wireguard.android.model.Tunnel.Statistics;
@@ -106,23 +103,17 @@ public final class WgQuickBackend implements Backend {
     private void setStateInternal(final Tunnel tunnel, final Config config, final State state)
             throws Exception {
         final File tempFile = new File(localTemporaryDir, tunnel.getName() + ".conf");
-        try (FileOutputStream stream = new FileOutputStream(tempFile, false)) {
+        try (final FileOutputStream stream = new FileOutputStream(tempFile, false)) {
             stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
         }
-        final String command = String.format("wg-quick %s '%s'",
+        String command = String.format("wg-quick %s '%s'",
                 state.toString().toLowerCase(), tempFile.getAbsolutePath());
+        if (state == State.UP)
+            command = "cat /sys/module/wireguard/version && " + command;
         final int result = rootShell.run(null, command);
         // noinspection ResultOfMethodCallIgnored
         tempFile.delete();
         if (result != 0)
             throw new Exception("Unable to configure tunnel (wg-quick returned " + result + ')');
     }
-
-    public static final class WgQuickChangeReceiver extends BroadcastReceiver {
-        @Override
-        public void onReceive(final Context context, final Intent intent) {
-            Log.d(TAG, "Refreshing tunnel states");
-            Application.getComponent().getTunnelManager().refreshTunnelStates();
-        }
-    }
 }

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

@@ -42,7 +42,7 @@ public final class FileConfigStore implements ConfigStore {
         final File file = fileFor(name);
         if (!file.createNewFile())
             throw new IOException("Configuration file " + file.getName() + " already exists");
-        try (FileOutputStream stream = new FileOutputStream(file, false)) {
+        try (final FileOutputStream stream = new FileOutputStream(file, false)) {
             stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
         }
         return config;
@@ -70,7 +70,7 @@ public final class FileConfigStore implements ConfigStore {
 
     @Override
     public Config load(final String name) throws IOException {
-        try (FileInputStream stream = new FileInputStream(fileFor(name))) {
+        try (final FileInputStream stream = new FileInputStream(fileFor(name))) {
             return Config.from(stream);
         }
     }
@@ -95,7 +95,7 @@ public final class FileConfigStore implements ConfigStore {
         final File file = fileFor(name);
         if (!file.isFile())
             throw new FileNotFoundException("Configuration file " + file.getName() + " not found");
-        try (FileOutputStream stream = new FileOutputStream(file, false)) {
+        try (final FileOutputStream stream = new FileOutputStream(file, false)) {
             stream.write(config.toString().getBytes(StandardCharsets.UTF_8));
         }
         return config;

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

@@ -229,6 +229,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.

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

@@ -6,11 +6,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;
@@ -57,7 +61,7 @@ public final class TunnelManager extends BaseObservable {
             new ObservableSortedKeyedArrayList<>(COMPARATOR);
     private Tunnel lastUsedTunnel;
     private boolean haveLoaded;
-    private ArrayList<CompletableFuture<Void>> delayedLoadRestoreTunnels = new ArrayList<>();
+    private final ArrayList<CompletableFuture<Void>> delayedLoadRestoreTunnels = new ArrayList<>();
 
     @Inject
     public TunnelManager(final AsyncWorker asyncWorker, final Backend backend,
@@ -150,7 +154,7 @@ public final class TunnelManager extends BaseObservable {
         final String lastUsedName = preferences.getString(KEY_LAST_USED_TUNNEL, null);
         if (lastUsedName != null)
             setLastUsedTunnel(tunnels.get(lastUsedName));
-        CompletableFuture<Void> toComplete[];
+        final CompletableFuture<Void>[] toComplete;
         synchronized (delayedLoadRestoreTunnels) {
             haveLoaded = true;
             toComplete = delayedLoadRestoreTunnels.toArray(new CompletableFuture[delayedLoadRestoreTunnels.size()]);
@@ -175,12 +179,12 @@ public final class TunnelManager extends BaseObservable {
                 .whenComplete(ExceptionLoggers.E);
     }
 
-    public CompletionStage<Void> restoreState(boolean force) {
+    public CompletionStage<Void> restoreState(final boolean force) {
         if (!force && !preferences.getBoolean(KEY_RESTORE_ON_BOOT, false))
             return CompletableFuture.completedFuture(null);
         synchronized (delayedLoadRestoreTunnels) {
             if (!haveLoaded) {
-                CompletableFuture<Void> f = new CompletableFuture<>();
+                final CompletableFuture<Void> f = new CompletableFuture<>();
                 delayedLoadRestoreTunnels.add(f);
                 return f;
             }
@@ -264,4 +268,43 @@ public final class TunnelManager extends BaseObservable {
             saveState();
         });
     }
+
+    public static final class IntentReceiver extends BroadcastReceiver {
+        @Override
+        public void onReceive(final Context context, final Intent intent) {
+            final TunnelManager manager = Application.getComponent().getTunnelManager();
+            if (intent == null)
+                return;
+            final String action = intent.getAction();
+            if (action == null)
+                return;
+
+            if ("com.wireguard.android.action.REFRESH_TUNNEL_STATES".equals(action)) {
+                manager.refreshTunnelStates();
+                return;
+            }
+
+            /* We disable the below, for now, as the security model of allowing this
+             * might take a bit more consideration.
+             */
+            if (true)
+                return;
+
+            final State state;
+            if ("com.wireguard.android.action.SET_TUNNEL_UP".equals(action))
+                state = State.UP;
+            else if ("com.wireguard.android.action.SET_TUNNEL_DOWN".equals(action))
+                state = State.DOWN;
+            else
+                return;
+
+            final String tunnelName = intent.getStringExtra("tunnel");
+            if (tunnelName == null)
+                return;
+            final Tunnel tunnel = manager.getTunnels().get(tunnelName);
+            if (tunnel == null)
+                return;
+            manager.setTunnelState(tunnel, state);
+        }
+    }
 }

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

@@ -0,0 +1,126 @@
+/*
+ * Copyright © 2018 Samuel Holland <samuel@sholland.org>
+ * Copyright © 2018 Jason A. Donenfeld <Jason@zx2c4.com>. All Rights Reserved.
+ * SPDX-License-Identifier: GPL-2.0-or-later
+ */
+
+package com.wireguard.android.preference;
+
+import android.Manifest;
+import android.content.Context;
+import android.content.pm.PackageManager;
+import android.os.Environment;
+import android.support.design.widget.Snackbar;
+import android.support.v7.preference.Preference;
+import android.util.AttributeSet;
+import android.util.Log;
+import android.view.ContextThemeWrapper;
+
+import com.wireguard.android.Application;
+import com.wireguard.android.R;
+import com.wireguard.android.activity.SettingsActivity;
+import com.wireguard.android.util.ExceptionLoggers;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+
+/**
+ * Preference implementing a button that asynchronously exports logs.
+ */
+
+public class LogExporterPreference extends Preference {
+    private static final String TAG = "WireGuard/" + LogExporterPreference.class.getSimpleName();
+
+    private String exportedFilePath;
+
+    public LogExporterPreference(final Context context, final AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    private 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(() -> {
+            final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
+            final File file = new File(path, "wireguard-log.txt");
+            if (!path.isDirectory() && !path.mkdirs())
+                throw new IOException("Cannot create output directory");
+
+            /* We would like to simply run `builder.redirectOutput(file);`, but this is API 26.
+             * Instead we have to do this dance, since logcat appends.
+             */
+            new FileOutputStream(file).close();
+
+            try {
+                final Process process = Runtime.getRuntime().exec(new String[]{
+                        "logcat", "-b", "all", "-d", "-v", "threadtime", "-f", file.getAbsolutePath(), "*:V"});
+                if (process.waitFor() != 0) {
+                    try (final BufferedReader reader = new BufferedReader(new InputStreamReader(process.getErrorStream()))) {
+                        final StringBuilder errors = new StringBuilder();
+                        errors.append("Unable to run logcat: ");
+                        String line;
+                        while ((line = reader.readLine()) != null)
+                            errors.append(line);
+                        throw new Exception(errors.toString());
+                    }
+                }
+            } catch (final Exception e) {
+                // noinspection ResultOfMethodCallIgnored
+                file.delete();
+                throw e;
+            }
+            return file.getAbsolutePath();
+        }).whenComplete(this::exportLogComplete);
+    }
+
+    private void exportLogComplete(final String filePath, final Throwable throwable) {
+        if (throwable != null) {
+            final String error = ExceptionLoggers.unwrapMessage(throwable);
+            final String message = getContext().getString(R.string.log_export_error, error);
+            Log.e(TAG, message, throwable);
+            Snackbar.make(
+                    getPrefActivity(this).findViewById(android.R.id.content),
+                    message, Snackbar.LENGTH_LONG).show();
+            setEnabled(true);
+        } else {
+            exportedFilePath = filePath;
+            notifyChanged();
+        }
+    }
+
+    @Override
+    public CharSequence getSummary() {
+        return exportedFilePath == null ?
+                getContext().getString(R.string.log_export_summary) :
+                getContext().getString(R.string.log_export_success, exportedFilePath);
+    }
+
+    @Override
+    public CharSequence getTitle() {
+        return getContext().getString(R.string.log_exporter_title);
+    }
+
+    @Override
+    protected void onClick() {
+        getPrefActivity(this).ensurePermissions(
+                new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
+                (permissions, granted) -> {
+                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED) {
+                        setEnabled(false);
+                        exportLog();
+                    }
+                });
+    }
+
+}

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

@@ -26,7 +26,7 @@ import com.wireguard.android.util.ToolsInstaller;
 public class ToolsInstallerPreference extends Preference {
     private final AsyncWorker asyncWorker;
     private final ToolsInstaller toolsInstaller;
-    private State state = State.INITIAL;
+    private State state;
 
     @SuppressWarnings({"SameParameterValue", "WeakerAccess"})
     public ToolsInstallerPreference(final Context context, final AttributeSet attrs) {
@@ -34,6 +34,7 @@ public class ToolsInstallerPreference extends Preference {
         final ApplicationComponent applicationComponent = Application.getComponent();
         asyncWorker = applicationComponent.getAsyncWorker();
         toolsInstaller = applicationComponent.getToolsInstaller();
+        state = initialState();
     }
 
     @Override
@@ -54,12 +55,12 @@ public class ToolsInstallerPreference extends Preference {
 
     private void onCheckResult(final Integer result, final Throwable throwable) {
         setState(throwable == null && result == OsConstants.EALREADY ?
-                State.ALREADY : State.INITIAL);
+                State.ALREADY : initialState());
     }
 
     @Override
     protected void onClick() {
-        setState(State.WORKING);
+        setState(workingState());
         asyncWorker.supplyAsync(toolsInstaller::install).whenComplete(this::onInstallResult);
     }
 
@@ -68,7 +69,7 @@ public class ToolsInstallerPreference extends Preference {
         if (throwable != null)
             nextState = State.FAILURE;
         else if (result == OsConstants.EXIT_SUCCESS)
-            nextState = State.SUCCESS;
+            nextState = successState();
         else if (result == OsConstants.EALREADY)
             nextState = State.ALREADY;
         else
@@ -85,12 +86,25 @@ public class ToolsInstallerPreference extends Preference {
         notifyChanged();
     }
 
+    private State initialState() {
+        return toolsInstaller.willInstallAsMagiskModule() ? State.INITIAL_MAGISK : State.INITIAL_SYSTEM;
+    }
+    private State workingState() {
+        return toolsInstaller.willInstallAsMagiskModule() ? State.WORKING_MAGISK : State.WORKING_SYSTEM;
+    }
+    private State successState() {
+        return toolsInstaller.willInstallAsMagiskModule() ? State.SUCCESS_MAGISK : State.SUCCESS_SYSTEM;
+    }
+
     private enum State {
         ALREADY(R.string.tools_installer_already, false),
         FAILURE(R.string.tools_installer_failure, true),
-        INITIAL(R.string.tools_installer_initial, true),
-        SUCCESS(R.string.tools_installer_success, false),
-        WORKING(R.string.tools_installer_working, false);
+        INITIAL_SYSTEM(R.string.tools_installer_initial_system, true),
+        SUCCESS_SYSTEM(R.string.tools_installer_success_system, false),
+        WORKING_SYSTEM(R.string.tools_installer_working_system, false),
+        INITIAL_MAGISK(R.string.tools_installer_initial_magisk, true),
+        SUCCESS_MAGISK(R.string.tools_installer_success_magisk, false),
+        WORKING_MAGISK(R.string.tools_installer_working_magisk, false);
 
         private final int messageResourceId;
         private final boolean shouldEnableView;

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

@@ -27,10 +27,9 @@ public class VersionPreference extends Preference {
             versionSummary = getContext().getString(R.string.version_userspace_summary, GoBackend.getVersion());
         } else if (Application.getComponent().getBackendType() == WgQuickBackend.class) {
             Application.getComponent().getToolsInstaller().getVersion().whenComplete((version, exception) -> {
-                if (exception == null)
-                    versionSummary = getContext().getString(R.string.version_kernel_summary, version);
-                else
-                    versionSummary = getContext().getString(R.string.version_kernel_unknown_summary);
+                versionSummary = exception == null
+                        ? getContext().getString(R.string.version_kernel_summary, version)
+                        : getContext().getString(R.string.version_kernel_unknown_summary);
                 notifyChanged();
             });
         }

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

@@ -17,12 +17,9 @@ import android.util.Log;
 import android.view.ContextThemeWrapper;
 
 import com.wireguard.android.Application;
-import com.wireguard.android.Application.ApplicationComponent;
 import com.wireguard.android.R;
 import com.wireguard.android.activity.SettingsActivity;
 import com.wireguard.android.model.Tunnel;
-import com.wireguard.android.model.TunnelManager;
-import com.wireguard.android.util.AsyncWorker;
 import com.wireguard.android.util.ExceptionLoggers;
 import com.wireguard.config.Config;
 
@@ -44,16 +41,10 @@ import java9.util.concurrent.CompletableFuture;
 public class ZipExporterPreference extends Preference {
     private static final String TAG = "WireGuard/" + ZipExporterPreference.class.getSimpleName();
 
-    private final AsyncWorker asyncWorker;
-    private final TunnelManager tunnelManager;
     private String exportedFilePath;
 
-    @SuppressWarnings({"SameParameterValue", "WeakerAccess"})
     public ZipExporterPreference(final Context context, final AttributeSet attrs) {
         super(context, attrs);
-        final ApplicationComponent applicationComponent = Application.getComponent();
-        asyncWorker = applicationComponent.getAsyncWorker();
-        tunnelManager = applicationComponent.getTunnelManager();
     }
 
     private static SettingsActivity getPrefActivity(final Preference preference) {
@@ -67,7 +58,7 @@ public class ZipExporterPreference extends Preference {
     }
 
     private void exportZip() {
-        final List<Tunnel> tunnels = new ArrayList<>(tunnelManager.getTunnels());
+        final List<Tunnel> tunnels = new ArrayList<>(Application.getComponent().getTunnelManager().getTunnels());
         final List<CompletableFuture<Config>> futureConfigs = new ArrayList<>(tunnels.size());
         for (final Tunnel tunnel : tunnels)
             futureConfigs.add(tunnel.getConfigAsync().toCompletableFuture());
@@ -76,7 +67,7 @@ public class ZipExporterPreference extends Preference {
             return;
         }
         CompletableFuture.allOf(futureConfigs.toArray(new CompletableFuture[futureConfigs.size()]))
-                .whenComplete((ignored1, exception) -> asyncWorker.supplyAsync(() -> {
+                .whenComplete((ignored1, exception) -> Application.getComponent().getAsyncWorker().supplyAsync(() -> {
                     if (exception != null)
                         throw exception;
                     final File path = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DOWNLOADS);
@@ -90,8 +81,7 @@ public class ZipExporterPreference extends Preference {
                                     toString().getBytes(StandardCharsets.UTF_8));
                         }
                         zip.closeEntry();
-                        zip.close();
-                    } catch (Exception e) {
+                    } catch (final Exception e) {
                         // noinspection ResultOfMethodCallIgnored
                         file.delete();
                         throw e;
@@ -103,14 +93,14 @@ public class ZipExporterPreference extends Preference {
     private void exportZipComplete(final String filePath, final Throwable throwable) {
         if (throwable != null) {
             final String error = ExceptionLoggers.unwrapMessage(throwable);
-            final String message = getContext().getString(R.string.export_error, error);
+            final String message = getContext().getString(R.string.zip_export_error, error);
             Log.e(TAG, message, throwable);
             Snackbar.make(
                     getPrefActivity(this).findViewById(android.R.id.content),
                     message, Snackbar.LENGTH_LONG).show();
+            setEnabled(true);
         } else {
             exportedFilePath = filePath;
-            setEnabled(false);
             notifyChanged();
         }
     }
@@ -118,8 +108,8 @@ public class ZipExporterPreference extends Preference {
     @Override
     public CharSequence getSummary() {
         return exportedFilePath == null ?
-                getContext().getString(R.string.export_summary) :
-                getContext().getString(R.string.export_success, exportedFilePath);
+                getContext().getString(R.string.zip_export_summary) :
+                getContext().getString(R.string.zip_export_success, exportedFilePath);
     }
 
     @Override
@@ -132,8 +122,10 @@ public class ZipExporterPreference extends Preference {
         getPrefActivity(this).ensurePermissions(
                 new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
                 (permissions, granted) -> {
-                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED)
+                    if (granted.length > 0 && granted[0] == PackageManager.PERMISSION_GRANTED) {
+                        setEnabled(false);
                         exportZip();
+                    }
                 });
     }
 

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

@@ -22,7 +22,7 @@ public final class SharedLibraryLoader {
     private SharedLibraryLoader() {
     }
 
-    public static final void loadSharedLibrary(final Context context, final String libName) {
+    public static void loadSharedLibrary(final Context context, final String libName) {
         Throwable noAbiException;
         try {
             System.loadLibrary(libName);
@@ -35,12 +35,12 @@ public final class SharedLibraryLoader {
         final ZipFile zipFile;
         try {
             zipFile = new ZipFile(new File(context.getApplicationInfo().sourceDir), ZipFile.OPEN_READ);
-        } catch (IOException e) {
+        } catch (final IOException e) {
             throw new RuntimeException(e);
         }
 
         final String mappedLibName = System.mapLibraryName(libName);
-        byte buffer[] = new byte[1024 * 32];
+        final byte[] buffer = new byte[1024 * 32];
         for (final String abi : Build.SUPPORTED_ABIS) {
             final String libZipPath = "lib" + File.separatorChar + abi + File.separatorChar + mappedLibName;
             final ZipEntry zipEntry = zipFile.getEntry(libZipPath);
@@ -50,13 +50,13 @@ public final class SharedLibraryLoader {
             try {
                 f = File.createTempFile("lib", ".so", context.getCacheDir());
                 Log.d(TAG, "Extracting apk:/" + libZipPath + " to " + f.getAbsolutePath() + " and loading");
-                FileOutputStream out = new FileOutputStream(f);
-                InputStream in = zipFile.getInputStream(zipEntry);
-                int len;
-                while ((len = in.read(buffer)) != -1) {
-                    out.write(buffer, 0, len);
+                try (final FileOutputStream out = new FileOutputStream(f);
+                     final InputStream in = zipFile.getInputStream(zipEntry)) {
+                    int len;
+                    while ((len = in.read(buffer)) != -1) {
+                        out.write(buffer, 0, len);
+                    }
                 }
-                out.close();
                 System.load(f.getAbsolutePath());
                 return;
             } catch (Exception e) {
@@ -64,6 +64,7 @@ public final class SharedLibraryLoader {
                 noAbiException = e;
             } finally {
                 if (f != null)
+                    // noinspection ResultOfMethodCallIgnored
                     f.delete();
             }
         }

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

@@ -13,6 +13,7 @@ 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;
@@ -48,6 +49,7 @@ public final class ToolsInstaller {
     private final File nativeLibraryDir;
     private final RootShell rootShell;
     private Boolean areToolsAvailable;
+    private Boolean installAsMagiskModule;
 
     @Inject
     public ToolsInstaller(@ApplicationContext final Context context, final RootShell rootShell) {
@@ -58,7 +60,7 @@ public final class ToolsInstaller {
 
     public CompletionStage<String> getVersion() {
         return Application.getComponent().getAsyncWorker().supplyAsync(() -> {
-            final ArrayList<String> output = new ArrayList<>();
+            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);
@@ -114,7 +116,20 @@ public final class ToolsInstaller {
         }
     }
 
-    public int install() throws NoRootException {
+    public boolean willInstallAsMagiskModule() {
+        synchronized (lock) {
+            if (installAsMagiskModule == null) {
+                try {
+                    installAsMagiskModule = rootShell.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; ");
@@ -131,6 +146,31 @@ public final class ToolsInstaller {
         }
     }
 
+    private int installMagisk() throws NoRootException {
+        final StringBuilder script = new StringBuilder("set -ex; ");
+
+        script.append("trap 'rm -rf /sbin/.core/img/wireguard' INT TERM EXIT; ");
+        script.append(String.format("rm -rf /sbin/.core/img/wireguard/; mkdir -p /sbin/.core/img/wireguard%s; ", INSTALL_DIR));
+        script.append(String.format("printf 'name=WireGuard Command Line Tools\nversion=%s\nversionCode=%s\nauthor=zx2c4\ndescription=Command line tools for WireGuard\nminMagisk=1500\n' > /sbin/.core/img/wireguard/module.prop; ", BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE));
+        script.append("touch /sbin/.core/img/wireguard/auto_mount; ");
+        for (final String[] names : EXECUTABLES) {
+            final File destination = new File("/sbin/.core/img/wireguard" + INSTALL_DIR, names[1]);
+            script.append(String.format("cp '%s' '%s'; chmod 755 '%s'; restorecon '%s' || true; ",
+                    new File(nativeLibraryDir, names[0]), destination, destination, destination));
+        }
+        script.append("trap - INT TERM EXIT;");
+
+        try {
+            return rootShell.run(null, script.toString());
+        } catch (final IOException ignored) {
+            return OsConstants.EXIT_FAILURE;
+        }
+    }
+
+    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) {

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

@@ -1,108 +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;
-
-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 void subscribe(Subscriber sub) {
-        if (subscribers == null) {
-            subscribers = new LinkedList<>();
-        }
-        synchronized (subscribers) {
-            subscribers.add(new WeakReference<>(sub));
-        }
-    }
-
-    public void unsubscribe() {
-        subscribers = null;
-    }
-
-    public void unsubscribe(Subscriber sub) {
-        synchronized (subscribers) {
-            for (Iterator<WeakReference<Subscriber>> i = subscribers.iterator(); i.hasNext(); ) {
-                WeakReference<Subscriber> subscriber = i.next();
-                if (subscriber.get() == null || subscriber.get() == sub) {
-                    i.remove();
-                }
-            }
-        }
-    }
-
-    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;
-        if (subscribers != null) {
-            List<WeakReference<Subscriber>> subscribersCopy = new LinkedList<>();
-            synchronized (subscribers) {
-                subscribersCopy.addAll(subscribers);
-            }
-            for (WeakReference<Subscriber> subscriber : subscribersCopy) {
-                if (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 (Topic topic : getSubscription()) {
-                if (topic.isPublished()) {
-                    onTopicPublished(topic);
-                }
-                topic.subscribe(this);
-            }
-        }
-
-        default void unsubscribeTopics() {
-            for (Topic event : getSubscription()) {
-                event.unsubscribe(this);
-            }
-        }
-
-        void onTopicPublished(Topic topic);
-
-        Topic[] getSubscription();
-    }
-}

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

@@ -7,7 +7,6 @@
 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.Paint.Style;
@@ -19,7 +18,6 @@ import android.support.annotation.*;
 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 +58,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 +220,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),

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

@@ -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);
 

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

@@ -25,10 +25,10 @@ public final class KeyEncoding {
         // Prevent instantiation.
     }
 
-    private static int decodeBase64(final char[] src, final int src_offset) {
+    private static int decodeBase64(final char[] src, final int srcOffset) {
         int val = 0;
         for (int i = 0; i < 4; ++i) {
-            final char c = src[i + src_offset];
+            final char c = src[i + srcOffset];
             val |= (-1
                     + ((((('A' - 1) - c) & (c - ('Z' + 1))) >>> 8) & (c - 64))
                     + ((((('a' - 1) - c) & (c - ('z' + 1))) >>> 8) & (c - 70))
@@ -40,16 +40,16 @@ public final class KeyEncoding {
         return val;
     }
 
-    private static void encodeBase64(final byte[] src, final int src_offset,
-                                     final char[] dest, final int dest_offset) {
+    private static void encodeBase64(final byte[] src, final int srcOffset,
+                                     final char[] dest, final int destOffset) {
         final byte[] input = {
-                (byte) ((src[src_offset] >>> 2) & 63),
-                (byte) ((src[src_offset] << 4 | ((src[1 + src_offset] & 0xff) >>> 4)) & 63),
-                (byte) ((src[1 + src_offset] << 2 | ((src[2 + src_offset] & 0xff) >>> 6)) & 63),
-                (byte) ((src[2 + src_offset]) & 63),
+                (byte) ((src[srcOffset] >>> 2) & 63),
+                (byte) ((src[srcOffset] << 4 | ((src[1 + srcOffset] & 0xff) >>> 4)) & 63),
+                (byte) ((src[1 + srcOffset] << 2 | ((src[2 + srcOffset] & 0xff) >>> 6)) & 63),
+                (byte) ((src[2 + srcOffset]) & 63),
         };
         for (int i = 0; i < 4; ++i) {
-            dest[i + dest_offset] = (char) (input[i] + 'A'
+            dest[i + destOffset] = (char) (input[i] + 'A'
                     + (((25 - input[i]) >>> 8) & 6)
                     - (((51 - input[i]) >>> 8) & 75)
                     - (((61 - input[i]) >>> 8) & 15)
@@ -62,7 +62,8 @@ public final class KeyEncoding {
         final byte[] key = new byte[KEY_LENGTH];
         if (input.length != KEY_LENGTH_BASE64 || input[KEY_LENGTH_BASE64 - 1] != '=')
             throw new IllegalArgumentException(KEY_LENGTH_BASE64_EXCEPTION_MESSAGE);
-        int i, ret = 0;
+        int i;
+        int ret = 0;
         for (i = 0; i < KEY_LENGTH / 3; ++i) {
             final int val = decodeBase64(input, i * 4);
             ret |= val >>> 31;
@@ -94,25 +95,31 @@ public final class KeyEncoding {
         int ret = 0;
 
         for (int i = 0; i < KEY_LENGTH_HEX; i += 2) {
-            int c, c_num, c_num0, c_alpha, c_alpha0, c_val, c_acc;
+            int c;
+            int cNum;
+            int cNum0;
+            int cAlpha;
+            int cAlpha0;
+            int cVal;
+            final int cAcc;
 
             c = input[i];
-            c_num = c ^ 48;
-            c_num0 = ((c_num - 10) >>> 8) & 0xff;
-            c_alpha = (c & ~32) - 55;
-            c_alpha0 = (((c_alpha - 10) ^ (c_alpha - 16)) >>> 8) & 0xff;
-            ret |= ((c_num0 | c_alpha0) - 1) >>> 8;
-            c_val = (c_num0 & c_num) | (c_alpha0 & c_alpha);
-            c_acc = c_val * 16;
+            cNum = c ^ 48;
+            cNum0 = ((cNum - 10) >>> 8) & 0xff;
+            cAlpha = (c & ~32) - 55;
+            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
+            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
+            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
+            cAcc = cVal * 16;
 
             c = input[i + 1];
-            c_num = c ^ 48;
-            c_num0 = ((c_num - 10) >>> 8) & 0xff;
-            c_alpha = (c & ~32) - 55;
-            c_alpha0 = (((c_alpha - 10) ^ (c_alpha - 16)) >>> 8) & 0xff;
-            ret |= ((c_num0 | c_alpha0) - 1) >>> 8;
-            c_val = (c_num0 & c_num) | (c_alpha0 & c_alpha);
-            key[i / 2] = (byte) (c_acc | c_val);
+            cNum = c ^ 48;
+            cNum0 = ((cNum - 10) >>> 8) & 0xff;
+            cAlpha = (c & ~32) - 55;
+            cAlpha0 = (((cAlpha - 10) ^ (cAlpha - 16)) >>> 8) & 0xff;
+            ret |= ((cNum0 | cAlpha0) - 1) >>> 8;
+            cVal = (cNum0 & cNum) | (cAlpha0 & cAlpha);
+            key[i / 2] = (byte) (cAcc | cVal);
         }
         if (ret != 0)
             throw new IllegalArgumentException(KEY_LENGTH_HEX_EXCEPTION_MESSAGE);

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

@@ -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>

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

@@ -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>

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

@@ -1,9 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- TODO(msf): remove these 4 hard-coded colors and replace with theme colors -->
+    <!-- TODO(msf): remove these 3 hard-coded colors and replace with theme colors -->
     <color name="list_item_activated">#64cfd8dc</color>
     <color name="list_item_ripple">#a0808e95</color>
-    <color name="fab_label_text_color">#000000</color>
     <color name="fab_label_background_color">#bbbbbb</color>
 
     <color name="accent">#BBDEFB</color>

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

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

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

@@ -39,9 +39,6 @@
     <string name="error_down">Error bringing down tunnel: %s</string>
     <string name="error_root">Please obtain root access and try again</string>
     <string name="error_up">Error bringing up tunnel: %s</string>
-    <string name="export_error">Unable to export tunnels: %s</string>
-    <string name="export_success">Saved to %s</string>
-    <string name="export_summary">Zip file will be saved to downloads folder</string>
     <string name="generate">Generate</string>
     <string name="hint_automatic">(auto)</string>
     <string name="hint_generated">(generated)</string>
@@ -51,9 +48,15 @@
     <string name="import_success">Imported “%s”</string>
     <string name="interface_title">Interface</string>
     <string name="listen_port">Listen port</string>
+    <string name="log_exporter_title">Export log file</string>
+    <string name="log_export_error">Unable to export log: %s</string>
+    <string name="log_export_success">Saved to %s</string>
+    <string name="log_export_summary">Log file will be saved to downloads folder</string>
     <string name="mtu">MTU</string>
     <string name="name">Name</string>
     <string name="peer">Peer</string>
+    <string name="permission_label">control WireGuard tunnels</string>
+    <string name="permission_description">Allows an app to control WireGuard tunnels. Apps with this permission may enable and disable WireGuard tunnels at will, potentially misdirecting Internet traffic.</string>
     <string name="persistent_keepalive">Persistent keepalive</string>
     <string name="pre_shared_key">Pre-shared key</string>
     <string name="private_key">Private key</string>
@@ -66,17 +69,23 @@
     <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_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="tools_installer_working_system">Installing wg and wg-quick into the system partition</string>
+    <string name="tools_installer_working_magisk">Installing wg and wg-quick as a Magisk module</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">Using kernel module implementation v%s</string>
-    <string name="version_kernel_unknown_summary">Using unknown kernel module implementation</string>
-    <string name="version_userspace_summary">Using Go userspace implementation 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="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>
+    <string name="zip_export_summary">Zip file will be saved to downloads folder</string>
 </resources>

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

@@ -9,9 +9,8 @@
         <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>
 
 </resources>

app/src/main/res/xml/preferences.xml

@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+    <com.wireguard.android.preference.VersionPreference android:icon="@mipmap/ic_launcher" />
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="restore_on_boot"
         android:summary="@string/restore_on_boot_summary"
         android:title="@string/restore_on_boot_title" />
     <com.wireguard.android.preference.ToolsInstallerPreference android:key="tools_installer" />
-    <com.wireguard.android.preference.ZipExporterPreference android:key="zip_exporter" />
+    <com.wireguard.android.preference.ZipExporterPreference />
+    <com.wireguard.android.preference.LogExporterPreference />
     <CheckBoxPreference
         android:defaultValue="false"
         android:key="dark_theme"
         android:summaryOn="@string/dark_theme_summary_on"
         android:summaryOff="@string/dark_theme_summary_off"
         android:title="@string/dark_theme_title" />
-    <com.wireguard.android.preference.VersionPreference />
 </PreferenceScreen>

app/tools/libwg-go/Makefile

@@ -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

app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/api-android.go

@@ -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() {}

app/tools/libwg-go/src/git.zx2c4.com/wireguard-go/jni.c

@@ -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)
 {
@@ -49,14 +49,11 @@ JNIEXPORT jint JNICALL Java_com_wireguard_android_backend_GoBackend_wgGetSocketV
 
 JNIEXPORT jstring JNICALL Java_com_wireguard_android_backend_GoBackend_wgVersion(JNIEnv *env, jclass c)
 {
-	struct go_string s = wgVersion();
-	char *cstr = malloc(s.n + 1);
-	if (!cstr)
-		return NULL;
 	jstring ret;
-	memcpy(cstr, s.str, s.n);
-	cstr[s.n] = '\0';
-	ret = (*env)->NewStringUTF(env, cstr);
-	free(cstr);
+	char *version = wgVersion();
+	if (!version)
+		return NULL;
+	ret = (*env)->NewStringUTF(env, version);
+	free(version);
 	return ret;
 }