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

ModuleLoader: Staticize isModuleLoaded

Browse Source 
Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>
This commit is contained in:
Harsh Shandilya 2020-02-28 13:16:31 +05:30
parent 44fc0228a9
commit 5e94adc73a
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -73,7 +73,7 @@ public class Application extends android.app.Application {
if (app.backend == null) { if (app.backend == null) {
Backend backend = null; Backend backend = null;
boolean didStartRootShell = false; boolean didStartRootShell = false;
if (!app.moduleLoader.isModuleLoaded() && app.moduleLoader.moduleMightExist()) { if (!ModuleLoader.isModuleLoaded() && app.moduleLoader.moduleMightExist()) {
try { try {
app.rootShell.start(); app.rootShell.start();
didStartRootShell = true; didStartRootShell = true;
@ -81,7 +81,7 @@ public class Application extends android.app.Application {
} catch (final Exception ignored) { } catch (final Exception ignored) {
} }
} }
if (app.moduleLoader.isModuleLoaded()) { if (ModuleLoader.isModuleLoaded()) {
try { try {
if (!didStartRootShell) if (!didStartRootShell)
app.rootShell.start(); app.rootShell.start();

3
app/src/main/java/com/wireguard/android/activity/SettingsActivity.java
View File

@ -20,6 +20,7 @@ import android.view.MenuItem;
import com.wireguard.android.Application; import com.wireguard.android.Application;
import com.wireguard.android.R; import com.wireguard.android.R;
import com.wireguard.android.backend.WgQuickBackend; import com.wireguard.android.backend.WgQuickBackend;
import com.wireguard.android.util.ModuleLoader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
@ -113,7 +114,7 @@ public class SettingsActivity extends ThemeChangeAwareActivity {
final Preference moduleInstaller = getPreferenceManager().findPreference("module_downloader"); final Preference moduleInstaller = getPreferenceManager().findPreference("module_downloader");
moduleInstaller.setVisible(false); moduleInstaller.setVisible(false);
if (Application.getModuleLoader().isModuleLoaded()) { if (ModuleLoader.isModuleLoaded()) {
screen.removePreference(moduleInstaller); screen.removePreference(moduleInstaller);
} else { } else {
Application.getAsyncWorker().runAsync(Application.getRootShell()::start).whenComplete((v, e) -> { Application.getAsyncWorker().runAsync(Application.getRootShell()::start).whenComplete((v, e) -> {

2
app/src/main/java/com/wireguard/android/util/ModuleLoader.java
View File

@ -59,7 +59,7 @@ public class ModuleLoader {
Application.getRootShell().run(null, String.format("insmod \"%s/wireguard-$(sha256sum /proc/version|cut -d ' ' -f 1).ko\"", moduleDir.getAbsolutePath())); Application.getRootShell().run(null, String.format("insmod \"%s/wireguard-$(sha256sum /proc/version|cut -d ' ' -f 1).ko\"", moduleDir.getAbsolutePath()));
} }
public boolean isModuleLoaded() { public static boolean isModuleLoaded() {
return new File("/sys/module/wireguard").exists(); return new File("/sys/module/wireguard").exists();
} }