Ethernet support

app/build.gradle

@@ -19,7 +19,7 @@ android {
     buildToolsVersion '30.0.3'
 
     defaultConfig {
-        minSdkVersion 14
+        minSdkVersion 23
         targetSdkVersion 30
         versionCode 62
         versionName "2.4.0"

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;
@@ -26,6 +27,7 @@
 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.response.HostAsyncResponse;
 import com.aaronjwood.portauthority.utils.Constants;
 import com.aaronjwood.portauthority.utils.Errors;
@@ -37,7 +39,6 @@
 import java.util.List;
 
 public abstract class HostActivity extends AppCompatActivity implements HostAsyncResponse {
-
     protected int layout;
     protected ArrayAdapter<String> adapter;
     protected ListView portList;
@@ -57,7 +58,8 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(layout);
 
-        db = Database.getInstance(getApplicationContext());
+        Context ctx = getApplicationContext();
+        db = Database.getInstance(ctx);
         handler = new Handler(Looper.getMainLooper());
 
         setupPortsAdapter();
@@ -315,4 +317,18 @@ private void addOpenPort(final String port) {
     public <T extends Throwable> void processFinish(final T output) {
         handler.post(() -> Errors.showError(getApplicationContext(), output.getLocalizedMessage()));
     }
+
+    /**
+     * Determines if there is an active network connection.
+     *
+     * @return True if there's a connection, otherwise false.
+     */
+    protected boolean isConnected() {
+        Context ctx = getApplicationContext();
+        try {
+            return Network.isConnected(ctx);
+        } catch (Network.NoConnectivityManagerException e) {
+            return false;
+        }
+    }
 }

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

@@ -14,13 +14,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;
 
     /**
@@ -42,13 +42,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());
@@ -94,13 +90,7 @@ private void scanWellKnownPortsClick() {
             @Override
             public void onClick(View v) {
                 super.onClick(v);
-
-                try {
-                    if (!wifi.isConnectedWifi()) {
-                        Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
-                        return;
-                    }
-                } catch (Wireless.NoConnectivityManagerException e) {
+                if (!isConnected()) {
                     Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
                     return;
                 }
@@ -133,12 +123,7 @@ private void scanPortRangeClick() {
              */
             @Override
             public void onClick(View v) {
-                try {
-                    if (!wifi.isConnectedWifi()) {
-                        Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
-                        return;
-                    }
-                } catch (Wireless.NoConnectivityManagerException e) {
+                if (!isConnected()) {
                     Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
                     return;
                 }
@@ -170,13 +155,9 @@ public void onClick(View v) {
      */
     private void setupWol() {
         Button wakeUpButton = findViewById(R.id.wakeOnLan);
+
         wakeUpButton.setOnClickListener(v -> {
-            try {
-                if (!wifi.isConnectedWifi()) {
-                    Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
-                    return;
-                }
-            } catch (Wireless.NoConnectivityManagerException e) {
+            if (!isConnected()) {
                 Errors.showError(getApplicationContext(), getResources().getString(R.string.notConnectedLan));
                 return;
             }
@@ -206,6 +187,7 @@ public void processFinish(boolean output) {
         if (output && scanProgressDialog != null && scanProgressDialog.isShowing()) {
             scanProgressDialog.dismiss();
         }
+
         if (output && portRangeDialog != null && portRangeDialog.isShowing()) {
             portRangeDialog.dismiss();
         }