aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-01-06 17:32:33 -0600
committerSamuel Holland <samuel@sholland.org>2018-01-06 22:14:10 -0600
commit4d38993832839da2c4567ec5c412ecd4464b5d33 (patch)
treeac92647718621538653b87adb9ae1d98915308c5 /app/src/main
parentmodel: Proxy all async work through the TunnelManager (diff)
downloadwireguard-android-4d38993832839da2c4567ec5c412ecd4464b5d33.tar.xz
wireguard-android-4d38993832839da2c4567ec5c412ecd4464b5d33.zip
project: Minor cleanups
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/wireguard/android/activity/BaseActivity.java2
-rw-r--r--app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java2
-rw-r--r--app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java2
-rw-r--r--app/src/main/res/values/strings.xml4
4 files changed, 4 insertions, 6 deletions
diff --git a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java
index 3a6941b9..90392e0f 100644
--- a/app/src/main/java/com/wireguard/android/activity/BaseActivity.java
+++ b/app/src/main/java/com/wireguard/android/activity/BaseActivity.java
@@ -16,8 +16,6 @@ import java.util.Objects;
*/
public abstract class BaseActivity extends Activity {
- private static final String TAG = BaseActivity.class.getSimpleName();
-
private final SelectionChangeRegistry selectionChangeRegistry = new SelectionChangeRegistry();
private Tunnel selectedTunnel;
diff --git a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
index 03daee8d..656cfa9c 100644
--- a/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
+++ b/app/src/main/java/com/wireguard/android/backend/WgQuickBackend.java
@@ -86,7 +86,7 @@ public final class WgQuickBackend implements Backend {
final String stateName = resolveState(currentState, state).name().toLowerCase();
final File file = new File(context.getFilesDir(), tunnel.getName() + ".conf");
final String path = file.getAbsolutePath();
- // FIXME: Assumes file layout from FIleConfigStore. Use a temporary file.
+ // FIXME: Assumes file layout from FileConfigStore. Use a temporary file.
if (rootShell.run(null, String.format("wg-quick %s '%s'", stateName, path)) != 0)
throw new IOException("wg-quick failed");
return tunnel;
diff --git a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
index d887ee80..f4dd2aff 100644
--- a/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
+++ b/app/src/main/java/com/wireguard/android/databinding/BindingAdapters.java
@@ -24,7 +24,7 @@ import org.threeten.bp.format.DateTimeFormatter;
* Static methods for use by generated code in the Android data binding library.
*/
-@SuppressWarnings({"unused", "WeakerAccess"})
+@SuppressWarnings({"unused"})
public final class BindingAdapters {
private BindingAdapters() {
// Prevent instantiation.
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2b5d49c2..52b7de60 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -35,8 +35,8 @@
<h3>Come back later!</h3><br>
<p>Your Android device does not <em>currently</em> have the WireGuard kernel module. Please
- talk to the manufacturer of your Android device or the author of your device\'s ROM about
- including the WireGuard kernel module.</p><br>
+ talk to the manufacturer of your Android device or the author of your device&rsquo;s ROM
+ about including the WireGuard kernel module.</p><br>
<p>Fortunately, we are in the process of implementing support for WireGuard in a way that
will work on all devices, without any need for the kernel module. This means that while you