Quick cleanup across the board

- Clean up imports
- Adjust method visibility
- Drop in NonNull annotations where needed
- Prevent potential NPEs from nulled getActivity calls
- Remove unused methods

Signed-off-by: Harsh Shandilya <me@msfjarvis.dev>

2 files changed, 4 insertions, 4 deletions

diff --git a/app/src/main/java/com/wireguard/android/model/Tunnel.java b/app/src/main/java/com/wireguard/android/model/Tunnel.java
index 09efc70c..037b380f 100644
--- a/app/src/main/java/com/wireguard/android/model/Tunnel.java
+++ b/app/src/main/java/com/wireguard/android/model/Tunnel.java
@@ -37,8 +37,8 @@ public class Tunnel extends BaseObservable implements Keyed<String> {
         this.state = state;
     }
 
-    public static boolean isNameValid(@NonNull final CharSequence name) {
-        return NAME_PATTERN.matcher(name).matches();
+    public static boolean isNameInvalid(@NonNull final CharSequence name) {
+        return !NAME_PATTERN.matcher(name).matches();
     }
 
     public CompletionStage<Void> delete() {
diff --git a/app/src/main/java/com/wireguard/android/model/TunnelManager.java b/app/src/main/java/com/wireguard/android/model/TunnelManager.java
index 61468920..e4667c82 100644
--- a/app/src/main/java/com/wireguard/android/model/TunnelManager.java
+++ b/app/src/main/java/com/wireguard/android/model/TunnelManager.java
@@ -66,7 +66,7 @@ public final class TunnelManager extends BaseObservable {
     }
 
     public CompletionStage<Tunnel> create(@NonNull final String name, final Config config) {
-        if (!Tunnel.isNameValid(name))
+        if (Tunnel.isNameInvalid(name))
             return CompletableFuture.failedFuture(new IllegalArgumentException("Invalid name"));
         if (tunnels.containsKey(name)) {
             final String message = "Tunnel " + name + " already exists";
@@ -190,7 +190,7 @@ public final class TunnelManager extends BaseObservable {
     }
 
     CompletionStage<String> setTunnelName(final Tunnel tunnel, final String name) {
-        if (!Tunnel.isNameValid(name))
+        if (Tunnel.isNameInvalid(name))
             return CompletableFuture.failedFuture(new IllegalArgumentException("Invalid name"));
         if (tunnels.containsKey(name)) {
             final String message = "Tunnel " + name + " already exists";