Hesham/wireguard-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WgQuickBackend: Ensure tools are available before use

Browse Source 
Signed-off-by: Samuel Holland <samuel@sholland.org>
This commit is contained in:
Samuel Holland 2018-01-08 23:26:39 -06:00
parent 5201c7f849
commit c806e655fa
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/src/main/java/com/wireguard/android/Application.java
View File

@ -81,8 +81,9 @@ public class Application extends android.app.Application {
@ApplicationScope @ApplicationScope
@Provides @Provides
public static Backend getBackend(@ApplicationContext final Context context, public static Backend getBackend(@ApplicationContext final Context context,
final RootShell rootShell) { final RootShell rootShell,
return new WgQuickBackend(context, rootShell); final ToolsInstaller toolsInstaller) {
return new WgQuickBackend(context, rootShell, toolsInstaller);
} }
@ApplicationScope @ApplicationScope

8
app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
View File

@ -9,6 +9,7 @@ import com.wireguard.android.model.Tunnel;
import com.wireguard.android.model.Tunnel.State; import com.wireguard.android.model.Tunnel.State;
import com.wireguard.android.model.Tunnel.Statistics; import com.wireguard.android.model.Tunnel.Statistics;
import com.wireguard.android.util.RootShell; import com.wireguard.android.util.RootShell;
import com.wireguard.android.util.ToolsInstaller;
import com.wireguard.config.Config; import com.wireguard.config.Config;
import java.io.File; import java.io.File;
@ -29,10 +30,13 @@ public final class WgQuickBackend implements Backend {
private final Context context; private final Context context;
private final RootShell rootShell; private final RootShell rootShell;
private final ToolsInstaller toolsInstaller;
public WgQuickBackend(final Context context, final RootShell rootShell) { public WgQuickBackend(final Context context, final RootShell rootShell,
final ToolsInstaller toolsInstaller) {
this.context = context; this.context = context;
this.rootShell = rootShell; this.rootShell = rootShell;
this.toolsInstaller = toolsInstaller;
} }
@Override @Override
@ -47,6 +51,7 @@ public final class WgQuickBackend implements Backend {
final List<String> output = new ArrayList<>(); final List<String> output = new ArrayList<>();
// Don't throw an exception here or nothing will show up in the UI. // Don't throw an exception here or nothing will show up in the UI.
try { try {
toolsInstaller.ensureToolsAvailable();
if (rootShell.run(output, "wg show interfaces") != 0 || output.isEmpty()) if (rootShell.run(output, "wg show interfaces") != 0 || output.isEmpty())
return Collections.emptySet(); return Collections.emptySet();
} catch (final Exception ignored) { } catch (final Exception ignored) {
@ -75,6 +80,7 @@ public final class WgQuickBackend implements Backend {
state = originalState == State.UP ? State.DOWN : State.UP; state = originalState == State.UP ? State.DOWN : State.UP;
if (state == originalState) if (state == originalState)
return originalState; return originalState;
toolsInstaller.ensureToolsAvailable();
final int result; final int result;
if (state == State.UP) { if (state == State.UP) {
if (!new File("/sys/module/wireguard").exists()) if (!new File("/sys/module/wireguard").exists())