Simplify connection checks for both wireless and wired connections

.travis.yml

@@ -4,7 +4,7 @@ jdk:
 android:
   components:
     - tools
-    - build-tools-27.0.2
+    - build-tools-28.0.3
     - android-27
     - extra-android-m2repository
 

app/src/main/java/com/aaronjwood/portauthority/activity/HostActivity.java

@@ -2,6 +2,7 @@
 
 import android.app.Dialog;
 import android.app.ProgressDialog;
+import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageManager;
 import android.net.Uri;
@@ -24,6 +25,9 @@
 import com.aaronjwood.portauthority.db.Database;
 import com.aaronjwood.portauthority.listener.ScanPortsListener;
 import com.aaronjwood.portauthority.network.Host;
+import com.aaronjwood.portauthority.network.Network;
+import com.aaronjwood.portauthority.network.Wired;
+import com.aaronjwood.portauthority.network.Wireless;
 import com.aaronjwood.portauthority.response.HostAsyncResponse;
 import com.aaronjwood.portauthority.utils.Constants;
 import com.aaronjwood.portauthority.utils.Errors;
@@ -37,6 +41,8 @@
 
 public abstract class HostActivity extends AppCompatActivity implements HostAsyncResponse {
 
+    protected Wireless wifi;
+    protected Wired wired;
     protected int layout;
     protected ArrayAdapter<String> adapter;
     protected ListView portList;
@@ -56,7 +62,10 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(layout);
 
-        db = Database.getInstance(getApplicationContext());
+        Context ctx = getApplicationContext();
+        db = Database.getInstance(ctx);
+        wifi = new Wireless(ctx);
+        wired = new Wired(ctx);
         handler = new Handler(Looper.getMainLooper());
 
         setupPortsAdapter();
@@ -342,4 +351,17 @@ public void run() {
             }
         });
     }
+
+    /**
+     * Determines if there is an active network connection.
+     *
+     * @return True if there's a connection, otherwise false.
+     */
+    protected boolean isConnected() {
+        try {
+            return wifi.isConnected() || wired.isConnected();
+        } catch (Network.NoConnectivityManagerException e) {
+            return false;
+        }
+    }
 }

app/src/main/java/com/aaronjwood/portauthority/activity/LanHostActivity.java

@@ -12,13 +12,13 @@
 import com.aaronjwood.portauthority.R;
 import com.aaronjwood.portauthority.listener.ScanPortsListener;
 import com.aaronjwood.portauthority.network.Host;
-import com.aaronjwood.portauthority.network.Wireless;
 import com.aaronjwood.portauthority.utils.Constants;
 import com.aaronjwood.portauthority.utils.Errors;
 import com.aaronjwood.portauthority.utils.UserPreference;
 
+import java.util.Objects;
+
 public final class LanHostActivity extends HostActivity {
-    private Wireless wifi;
     private Host host;
 
     /**
@@ -40,13 +40,9 @@ protected void onCreate(Bundle savedInstanceState) {
             return;
         }
 
-        wifi = new Wireless(getApplicationContext());
         host = (Host) extras.get("HOST");
-        if (host == null) {
-            return;
-        }
 
-        hostMacVendor.setText(host.getVendor());
+        hostMacVendor.setText(Objects.requireNonNull(host).getVendor());
         hostName.setText(host.getHostname());
         hostMac.setText(host.getMac());
         ipAddress.setText(host.getIp());
@@ -92,13 +88,7 @@ private void scanWellKnownPortsClick() {
             @Override
             public void onClick(View v) {
                 super.onClick(v);
-
-                try {
-                    if (!wifi.isConnected()) {
-                        Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
-                        return;
-                    }
-                } catch (Wireless.NoConnectivityManagerException e) {
+                if (!isConnected()) {
                     Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
                     return;
                 }
@@ -131,12 +121,7 @@ private void scanPortRangeClick() {
              */
             @Override
             public void onClick(View v) {
-                try {
-                    if (!wifi.isConnected()) {
-                        Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
-                        return;
-                    }
-                } catch (Wireless.NoConnectivityManagerException e) {
+                if (!isConnected()) {
                     Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
                     return;
                 }
@@ -173,12 +158,7 @@ private void setupWol() {
 
             @Override
             public void onClick(View v) {
-                try {
-                    if (!wifi.isConnected()) {
-                        Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
-                        return;
-                    }
-                } catch (Wireless.NoConnectivityManagerException e) {
+                if (!isConnected()) {
                     Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
                     return;
                 }
@@ -209,6 +189,7 @@ public void processFinish(boolean output) {
         if (output && scanProgressDialog != null && scanProgressDialog.isShowing()) {
             scanProgressDialog.dismiss();
         }
+
         if (output && portRangeDialog != null && portRangeDialog.isShowing()) {
             portRangeDialog.dismiss();
         }

app/src/main/java/com/aaronjwood/portauthority/network/Network.java

@@ -20,14 +20,10 @@ public class NoConnectivityManagerException extends Exception {
      *
      * @return Network information
      */
-    NetworkInfo getNetworkInfo() throws NoConnectivityManagerException {
+    private NetworkInfo getNetworkInfo() throws NoConnectivityManagerException {
         return getConnectivityManager().getActiveNetworkInfo();
     }
 
-    NetworkInfo getNetworkInfo(int type) throws NoConnectivityManagerException {
-        return getConnectivityManager().getNetworkInfo(type);
-    }
-
     /**
      * Gets the Android connectivity manager in the context of the current activity
      *

app/src/main/java/com/aaronjwood/portauthority/network/Wired.java

@@ -1,25 +1,11 @@
 package com.aaronjwood.portauthority.network;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
-import android.net.NetworkInfo;
 
 public class Wired extends Network {
 
     public Wired(Context context) {
         super(context);
     }
 
-    /**
-     * Checks if ethernet is connected.
-     *
-     * @return True if connected or in the process of connecting, false otherwise.
-     * @throws NoConnectivityManagerException
-     */
-    @Override
-    public boolean isConnected() throws NoConnectivityManagerException {
-        NetworkInfo info = getNetworkInfo(ConnectivityManager.TYPE_ETHERNET);
-        return info != null && info.isConnectedOrConnecting();
-    }
-
 }

app/src/main/java/com/aaronjwood/portauthority/network/Wireless.java

@@ -1,9 +1,7 @@
 package com.aaronjwood.portauthority.network;
 
 import android.content.Context;
-import android.net.ConnectivityManager;
 import android.net.DhcpInfo;
-import android.net.NetworkInfo;
 import android.net.wifi.WifiInfo;
 import android.net.wifi.WifiManager;
 
@@ -270,17 +268,4 @@ private WifiInfo getWifiInfo() throws NoWifiManagerException {
         return getWifiManager().getConnectionInfo();
     }
 
-    /**
-     * Checks if WiFi is connected.
-     *
-     * @return True if connected or in the process of connecting, false otherwise.
-     * @throws NoConnectivityManagerException
-     */
-    @Override
-    public boolean isConnected() throws NoConnectivityManagerException {
-        NetworkInfo info = getNetworkInfo(ConnectivityManager.TYPE_WIFI);
-        return info != null && info.isConnectedOrConnecting();
-    }
-
-
 }