aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/app/src/main/java/com/wireguard/android/util
diff options
context:
space:
mode:
authorSamuel Holland <samuel@sholland.org>2018-01-08 20:42:58 -0600
committerSamuel Holland <samuel@sholland.org>2018-01-08 23:39:26 -0600
commit4f02817ef0a7f0383468805f8e9a976a85d43e3e (patch)
treefb26bd712c81c6730d92e61ccec574c002ed4ab1 /app/src/main/java/com/wireguard/android/util
parentproject: Remove currently-unused library (diff)
downloadwireguard-android-4f02817ef0a7f0383468805f8e9a976a85d43e3e.tar.xz
wireguard-android-4f02817ef0a7f0383468805f8e9a976a85d43e3e.zip
global: Fix or suppress most lints/warnings
Signed-off-by: Samuel Holland <samuel@sholland.org>
Diffstat (limited to 'app/src/main/java/com/wireguard/android/util')
-rw-r--r--app/src/main/java/com/wireguard/android/util/ClipboardUtils.java2
-rw-r--r--app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java2
-rw-r--r--app/src/main/java/com/wireguard/android/util/RootShell.java15
3 files changed, 10 insertions, 9 deletions
diff --git a/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java b/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java
index 20aeffff..ea0001e4 100644
--- a/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java
+++ b/app/src/main/java/com/wireguard/android/util/ClipboardUtils.java
@@ -9,7 +9,7 @@ import android.widget.TextView;
import com.commonsware.cwac.crossport.design.widget.Snackbar;
/**
- * Created by samuel on 12/30/17.
+ * Standalone utilities for interacting with the system clipboard.
*/
public final class ClipboardUtils {
diff --git a/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java b/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java
index d4dff389..7ffffc4c 100644
--- a/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java
+++ b/app/src/main/java/com/wireguard/android/util/ObservableSortedKeyedArrayList.java
@@ -23,6 +23,7 @@ public class ObservableSortedKeyedArrayList<K, E extends Keyed<? extends K>>
private final Comparator<? super K> comparator;
private final transient KeyList<K, E> keyList = new KeyList<>(this);
+ @SuppressWarnings("WeakerAccess")
public ObservableSortedKeyedArrayList() {
comparator = null;
}
@@ -178,6 +179,7 @@ public class ObservableSortedKeyedArrayList<K, E extends Keyed<? extends K>>
}
@Override
+ @SuppressWarnings("EmptyMethod")
public Spliterator<K> spliterator() {
return super.spliterator();
}
diff --git a/app/src/main/java/com/wireguard/android/util/RootShell.java b/app/src/main/java/com/wireguard/android/util/RootShell.java
index 2c498131..6dda2d8f 100644
--- a/app/src/main/java/com/wireguard/android/util/RootShell.java
+++ b/app/src/main/java/com/wireguard/android/util/RootShell.java
@@ -9,14 +9,14 @@ import com.wireguard.android.Application.ApplicationContext;
import com.wireguard.android.Application.ApplicationScope;
import com.wireguard.android.R;
-import java.io.BufferedWriter;
import java.io.BufferedReader;
-import java.io.OutputStreamWriter;
-import java.io.InputStreamReader;
+import java.io.BufferedWriter;
import java.io.File;
import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.OutputStreamWriter;
import java.nio.charset.StandardCharsets;
-import java.util.List;
+import java.util.Collection;
import java.util.UUID;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
@@ -38,11 +38,10 @@ public class RootShell {
private final String exceptionMessage;
private final String preamble;
-
+ private Process process;
+ private BufferedReader stderr;
private BufferedWriter stdin;
private BufferedReader stdout;
- private BufferedReader stderr;
- private Process process;
@Inject
public RootShell(@ApplicationContext final Context context) {
@@ -141,7 +140,7 @@ public class RootShell {
* @param command Command to run as root.
* @return The exit value of the last command run, or -1 if there was an internal error.
*/
- public int run(final List<String> output, final String command)
+ public int run(final Collection<String> output, final String command)
throws ErrnoException, IOException, NoRootException {
ensureRoot();