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

global: java access control has important semantic meaning

Browse Source 
It's not right to blindly follow all of AndroidStudio's suggestions,
especially for things in tunnel/ which comprise useful API.

Signed-off-by: Jason A. Donenfeld <Jason@zx2c4.com>
This commit is contained in:
Jason A. Donenfeld 2020-03-10 08:41:29 -06:00
parent 8f85e4c88f
commit 6b304391b5
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -128,7 +128,7 @@ public class ModuleLoader {
} }
@Nullable @Nullable
private static Map<String, Sha256Digest> verifySignedHashes(final String signifyDigest) { private Map<String, Sha256Digest> verifySignedHashes(final String signifyDigest) {
final byte[] publicKeyBytes = Base64.decode(MODULE_PUBLIC_KEY_BASE64, Base64.DEFAULT); final byte[] publicKeyBytes = Base64.decode(MODULE_PUBLIC_KEY_BASE64, Base64.DEFAULT);
if (publicKeyBytes == null || publicKeyBytes.length != 32 + 10 || publicKeyBytes[0] != 'E' || publicKeyBytes[1] != 'd') if (publicKeyBytes == null || publicKeyBytes.length != 32 + 10 || publicKeyBytes[0] != 'E' || publicKeyBytes[1] != 'd')

2
tunnel/src/main/java/com/wireguard/android/util/RootShell.java
View File

@ -177,7 +177,7 @@ public class RootShell {
} }
} }
private void stop() { public void stop() {
synchronized (lock) { synchronized (lock) {
if (process != null) { if (process != null) {
process.destroy(); process.destroy();

2
tunnel/src/main/java/com/wireguard/android/util/ToolsInstaller.java
View File

@ -107,7 +107,7 @@ public final class ToolsInstaller {
} }
} }
private boolean extract() throws IOException { public boolean extract() throws IOException {
localBinaryDir.mkdirs(); localBinaryDir.mkdirs();
final File[] files = new File[EXECUTABLES.length]; final File[] files = new File[EXECUTABLES.length];
final File[] tempFiles = new File[EXECUTABLES.length]; final File[] tempFiles = new File[EXECUTABLES.length];

2
ui/src/main/java/com/wireguard/android/model/TunnelManager.java
View File

@ -161,7 +161,7 @@ public final class TunnelManager extends BaseObservable {
completableTunnels.complete(tunnels); completableTunnels.complete(tunnels);
} }
private void refreshTunnelStates() { public void refreshTunnelStates() {
Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getRunningTunnelNames()) Application.getAsyncWorker().supplyAsync(() -> Application.getBackend().getRunningTunnelNames())
.thenAccept(running -> { .thenAccept(running -> {
for (final ObservableTunnel tunnel : tunnels) for (final ObservableTunnel tunnel : tunnels)