Version bump for clat fix

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

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId 'com.wireguard.android'
         minSdkVersion 21
         targetSdkVersion 27
-        versionCode 423
-        versionName '0.0.20180606'
+        versionCode 426
+        versionName '0.0.20180616'
     }
     // If the keystore file exists
     if (keystorePropertiesFile.exists()) {

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

@@ -24,6 +24,8 @@ import com.wireguard.android.util.ToolsInstaller;
 
 import java.io.File;
 import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.concurrent.Executor;
 
 public class Application extends android.app.Application {
@@ -34,6 +36,10 @@ public class Application extends android.app.Application {
     private SharedPreferences sharedPreferences;
     private ToolsInstaller toolsInstaller;
     private TunnelManager tunnelManager;
+    private Handler handler;
+    private List<BackendCallback> haveBackendCallbacks = new ArrayList<>();
+    private Object haveBackendCallbacksLock = new Object();
+
     public Application() {
         weakSelf = new WeakReference<>(this);
     }
@@ -47,11 +53,40 @@ public class Application extends android.app.Application {
     }
 
     public static Backend getBackend() {
-        return get().backend;
+        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;
+        }
     }
 
-    public static Class getBackendType() {
-        return get().backend.getClass();
+    @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() {
@@ -74,8 +109,8 @@ public class Application extends android.app.Application {
     public void onCreate() {
         super.onCreate();
 
+        handler = new Handler(Looper.getMainLooper());
         final Executor executor = AsyncTask.SERIAL_EXECUTOR;
-        final Handler handler = new Handler(Looper.getMainLooper());
         final ConfigStore configStore = new FileConfigStore(getApplicationContext());
 
         asyncWorker = new AsyncWorker(executor, handler);
@@ -87,12 +122,8 @@ public class Application extends android.app.Application {
                 sharedPreferences.getBoolean("dark_theme", false) ?
                         AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO);
 
-        if (new File("/sys/module/wireguard").exists())
-            backend = new WgQuickBackend(getApplicationContext());
-        else
-            backend = new GoBackend(getApplicationContext());
-
-        tunnelManager = new TunnelManager(backend, configStore);
+        tunnelManager = new TunnelManager(configStore);
+        asyncWorker.runAsync(Application::getBackend);
         tunnelManager.onCreate();
     }
 }

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

@@ -20,18 +20,20 @@ public class BootShutdownReceiver extends BroadcastReceiver {
 
     @Override
     public void onReceive(final Context context, final Intent intent) {
-        if (Application.getBackendType() != 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();
-        }
+        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();
+            }
+        });
     }
 }

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

@@ -54,11 +54,13 @@ public abstract class BaseActivity extends ThemeChangeAwareActivity {
         // The selected tunnel must be set before the superclass method recreates fragments.
         super.onCreate(savedInstanceState);
 
-        if (Application.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

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

@@ -16,6 +16,7 @@ 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;
@@ -95,12 +96,21 @@ public class SettingsActivity extends ThemeChangeAwareActivity {
         @Override
         public void onCreatePreferences(final Bundle savedInstanceState, final String key) {
             addPreferencesFromResource(R.xml.preferences);
-            if (Application.getBackendType() != WgQuickBackend.class) {
-                Preference pref = getPreferenceManager().findPreference("tools_installer");
-                getPreferenceScreen().removePreference(pref);
-                pref = getPreferenceManager().findPreference("restore_on_boot");
-                getPreferenceScreen().removePreference(pref);
-            }
+            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);
+                }
+            });
         }
     }
 }

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

@@ -15,7 +15,6 @@ import android.support.annotation.NonNull;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.BR;
-import com.wireguard.android.backend.Backend;
 import com.wireguard.android.configStore.ConfigStore;
 import com.wireguard.android.model.Tunnel.State;
 import com.wireguard.android.model.Tunnel.Statistics;
@@ -47,7 +46,6 @@ 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 Backend backend;
     private final ConfigStore configStore;
     private final ObservableSortedKeyedList<String, Tunnel> tunnels =
             new ObservableSortedKeyedArrayList<>(COMPARATOR);
@@ -55,8 +53,7 @@ public final class TunnelManager extends BaseObservable {
     private boolean haveLoaded;
     private final ArrayList<CompletableFuture<Void>> delayedLoadRestoreTunnels = new ArrayList<>();
 
-    public TunnelManager(final Backend backend, final ConfigStore configStore) {
-        this.backend = backend;
+    public TunnelManager(final ConfigStore configStore) {
         this.configStore = configStore;
     }
 
@@ -86,12 +83,12 @@ public final class TunnelManager extends BaseObservable {
         tunnels.remove(tunnel);
         return Application.getAsyncWorker().runAsync(() -> {
             if (originalState == State.UP)
-                backend.setState(tunnel, State.DOWN);
+                Application.getBackend().setState(tunnel, State.DOWN);
             try {
                 configStore.delete(tunnel.getName());
             } catch (final Exception e) {
                 if (originalState == State.UP)
-                    backend.setState(tunnel, State.UP);
+                    Application.getBackend().setState(tunnel, State.UP);
                 // Re-throw the exception to fail the completion.
                 throw e;
             }
@@ -116,12 +113,12 @@ public final class TunnelManager extends BaseObservable {
     }
 
     CompletionStage<State> getTunnelState(final Tunnel tunnel) {
-        return Application.getAsyncWorker().supplyAsync(() -> backend.getState(tunnel))
+        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getState(tunnel))
                 .thenApply(tunnel::onStateChanged);
     }
 
     CompletionStage<Statistics> getTunnelStatistics(final Tunnel tunnel) {
-        return Application.getAsyncWorker().supplyAsync(() -> backend.getStatistics(tunnel))
+        return Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getStatistics(tunnel))
                 .thenApply(tunnel::onStatisticsChanged);
     }
 
@@ -131,7 +128,7 @@ public final class TunnelManager extends BaseObservable {
 
     public void onCreate() {
         Application.getAsyncWorker().supplyAsync(configStore::enumerate)
-                .thenAcceptBoth(Application.getAsyncWorker().supplyAsync(backend::enumerate), this::onTunnelsLoaded)
+                .thenAcceptBoth(Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().enumerate()), this::onTunnelsLoaded)
                 .whenComplete(ExceptionLoggers.E);
     }
 
@@ -159,7 +156,7 @@ public final class TunnelManager extends BaseObservable {
     }
 
     public void refreshTunnelStates() {
-        Application.getAsyncWorker().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);
@@ -207,7 +204,7 @@ public final class TunnelManager extends BaseObservable {
 
     CompletionStage<Config> setTunnelConfig(final Tunnel tunnel, final Config config) {
         return Application.getAsyncWorker().supplyAsync(() -> {
-            final Config appliedConfig = backend.applyConfig(tunnel, config);
+            final Config appliedConfig = Application.getBackend().applyConfig(tunnel, config);
             return configStore.save(tunnel.getName(), appliedConfig);
         }).thenApply(tunnel::onConfigChanged);
     }
@@ -227,11 +224,11 @@ public final class TunnelManager extends BaseObservable {
         tunnels.remove(tunnel);
         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.
@@ -247,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 ->
-                Application.getAsyncWorker().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());

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

@@ -11,9 +11,11 @@ import android.support.annotation.NonNull;
 import android.support.v7.preference.Preference;
 import android.system.OsConstants;
 import android.util.AttributeSet;
+import android.util.Log;
 
 import com.wireguard.android.Application;
 import com.wireguard.android.R;
+import com.wireguard.android.util.ToolsInstaller;
 
 /**
  * Preference implementing a button that asynchronously runs {@code ToolsInstaller} and displays the
@@ -43,28 +45,34 @@ public class ToolsInstallerPreference extends Preference {
         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 : initialState());
+    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(workingState());
+        setState(State.WORKING);
         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 = successState();
-        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) {
@@ -76,26 +84,15 @@ public class ToolsInstallerPreference extends Preference {
         notifyChanged();
     }
 
-    private State initialState() {
-        return Application.getToolsInstaller().willInstallAsMagiskModule(false) ? State.INITIAL_MAGISK : State.INITIAL_SYSTEM;
-    }
-    private State workingState() {
-        return Application.getToolsInstaller().willInstallAsMagiskModule(false) ? State.WORKING_MAGISK : State.WORKING_SYSTEM;
-    }
-    private State successState() {
-        return Application.getToolsInstaller().willInstallAsMagiskModule(false) ? State.SUCCESS_MAGISK : State.SUCCESS_SYSTEM;
-    }
-
     private enum State {
         INITIAL(R.string.tools_installer_initial, true),
         ALREADY(R.string.tools_installer_already, false),
         FAILURE(R.string.tools_installer_failure, true),
+        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);
+        SUCCESS_MAGISK(R.string.tools_installer_success_magisk, false);
 
         private final int messageResourceId;
         private final boolean shouldEnableView;

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

@@ -27,13 +27,14 @@ public class VersionPreference extends Preference {
     public VersionPreference(final Context context, final AttributeSet attrs) {
         super(context, attrs);
 
-        final Backend backend = Application.getBackend();
-        versionSummary = getContext().getString(R.string.version_summary_checking, backend.getTypeName().toLowerCase());
-        Application.getAsyncWorker().supplyAsync(backend::getVersion).whenComplete((version, exception) -> {
-            versionSummary = exception == null
-                    ? getContext().getString(R.string.version_summary, backend.getTypeName(), version)
-                    : getContext().getString(R.string.version_summary_unknown, backend.getTypeName().toLowerCase());
-            notifyChanged();
+        Application.onHaveBackend(backend -> {
+            versionSummary = getContext().getString(R.string.version_summary_checking, backend.getTypeName().toLowerCase());
+            Application.getAsyncWorker().supplyAsync(backend::getVersion).whenComplete((version, exception) -> {
+                versionSummary = exception == null
+                        ? getContext().getString(R.string.version_summary, backend.getTypeName(), version)
+                        : getContext().getString(R.string.version_summary_unknown, backend.getTypeName().toLowerCase());
+                notifyChanged();
+            });
         });
     }
 

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

@@ -25,6 +25,12 @@ import java.util.List;
  */
 
 public final class ToolsInstaller {
+    public static final int ERROR = 0x0;
+    public static final int YES = 0x1;
+    public static final int NO = 0x2;
+    public static final int MAGISK = 0x4;
+    public static final int SYSTEM = 0x8;
+
     private static final String[][] EXECUTABLES = {
             {"libwg.so", "wg"},
             {"libwg-quick.so", "wg-quick"},
@@ -60,9 +66,8 @@ public final class ToolsInstaller {
     }
 
     public int areInstalled() throws NoRootException {
-        willInstallAsMagiskModule(true);
         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' && ",
@@ -71,9 +76,13 @@ public final class ToolsInstaller {
         }
         script.append("exit ").append(OsConstants.EALREADY).append(';');
         try {
-            return Application.getRootShell().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;
         }
     }
 
@@ -97,11 +106,9 @@ public final class ToolsInstaller {
         }
     }
 
-    public boolean willInstallAsMagiskModule(boolean checkForIt) {
+    private boolean willInstallAsMagiskModule() {
         synchronized (lock) {
             if (installAsMagiskModule == null) {
-                if (!checkForIt)
-                    throw new RuntimeException("Expected to already know whether this is a Magisk system");
                 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) {
@@ -123,9 +130,9 @@ public final class ToolsInstaller {
                     new File(nativeLibraryDir, names[0]), destination, destination, destination));
         }
         try {
-            return Application.getRootShell().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;
         }
     }
 
@@ -144,14 +151,14 @@ public final class ToolsInstaller {
         script.append("trap - INT TERM EXIT;");
 
         try {
-            return Application.getRootShell().run(null, script.toString());
+            return Application.getRootShell().run(null, script.toString()) == 0 ? YES | MAGISK : ERROR;
         } catch (final IOException ignored) {
-            return OsConstants.EXIT_FAILURE;
+            return ERROR;
         }
     }
 
     public int install() throws NoRootException {
-        return willInstallAsMagiskModule(true) ? installMagisk() : installSystem();
+        return willInstallAsMagiskModule() ? installMagisk() : installSystem();
     }
 
     public int symlink() throws NoRootException {

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

@@ -70,13 +70,12 @@
     <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</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_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>