* Added a message when network is not available before scanning

* Using the latest androidx preferences
* SettingsActivity design changes
* Refactoring

Author: CodeDead

app/src/main/AndroidManifest.xml

@@ -12,15 +12,18 @@
     <application
         android:name=".domain.object.Runner"
         android:allowBackup="true"
+        android:fullBackupContent="@xml/backup_descriptor"
         android:hardwareAccelerated="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:largeHeap="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning"
-        android:fullBackupContent="@xml/backup_descriptor">
+        tools:ignore="GoogleAppIndexingWarning">
+        <activity
+            android:name=".gui.activity.SettingsActivity"
+            android:label="@string/title_activity_settings"></activity>
         <activity
             android:name=".gui.activity.LoadingActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"
@@ -34,14 +37,11 @@
         </activity>
         <activity
             android:name=".gui.activity.ScanActivity"
-            android:launchMode="singleInstance"
-            android:label="@string/app_name" />
+            android:label="@string/app_name"
+            android:launchMode="singleInstance" />
         <activity
             android:name=".gui.activity.AboutActivity"
             android:label="@string/title_activity_about" />
-        <activity
-            android:name=".gui.activity.SettingsActivity"
-            android:label="@string/title_activity_settings" />
     </application>
 
 </manifest>

app/src/main/java/com/codedead/advancedportchecker/domain/object/NetworkUtils.java

@@ -0,0 +1,58 @@
+package com.codedead.advancedportchecker.domain.object;
+
+import android.content.Context;
+import android.net.ConnectivityManager;
+import android.net.NetworkCapabilities;
+import android.net.NetworkInfo;
+import android.net.wifi.WifiManager;
+import android.os.Build;
+
+public final class NetworkUtils {
+
+    private WifiManager wifiManager;
+    private Context context;
+
+    /**
+     * Initialize a new NetworkUtils
+     * @param context The context that can be used to access device information
+     */
+    public NetworkUtils(Context context) {
+        if (context == null) throw new NullPointerException("Context cannot be null!");
+
+        this.context = context;
+        wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
+    }
+
+    /**
+     * Check whether a network connection is available
+     * @return True if a network connection is available, otherwise false
+     */
+    public boolean hasNetworkConnection() {
+        final ConnectivityManager cm = (ConnectivityManager) context.getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
+
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if (cm != null) {
+                final NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
+                if (capabilities != null) {
+                    return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
+                }
+            }
+        } else {
+            if (cm != null) {
+                final NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
+                if (activeNetwork != null) {
+                    return activeNetwork.getType() == ConnectivityManager.TYPE_WIFI || activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE;
+                }
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Check whether Wifi is enabled or not
+     * @return True if Wifi is enabled, otherwise false
+     */
+    public boolean isWifiEnabled() {
+        return wifiManager.isWifiEnabled();
+    }
+}

app/src/main/java/com/codedead/advancedportchecker/gui/activity/AppCompatPreferenceActivity.java

@@ -7,12 +7,7 @@
 import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.content.res.Configuration;
-import android.net.ConnectivityManager;
-import android.net.NetworkCapabilities;
-import android.net.NetworkInfo;
 import android.net.Uri;
-import android.net.wifi.WifiManager;
-import android.os.Build;
 import android.os.CountDownTimer;
 
 import androidx.preference.PreferenceManager;
@@ -32,6 +27,7 @@
 import com.codedead.advancedportchecker.R;
 import com.codedead.advancedportchecker.domain.controller.LocaleHelper;
 import com.codedead.advancedportchecker.domain.controller.UtilController;
+import com.codedead.advancedportchecker.domain.object.NetworkUtils;
 
 import static android.content.pm.PackageManager.GET_META_DATA;
 
@@ -40,7 +36,7 @@ public final class LoadingActivity extends AppCompatActivity {
     private static final int ACTIVITY_SETTINGS_CODE = 1337;
     private static final int ACTIVITY_WIFI_CODE = 443;
 
-    private WifiManager wifi;
+    private NetworkUtils networkUtils;
     private static boolean hasStopped;
 
     @Override
@@ -56,6 +52,7 @@ protected void onCreate(Bundle savedInstanceState) {
         decorView.setSystemUiVisibility(uiOptions);
 
         setContentView(R.layout.activity_loading);
+        networkUtils = new NetworkUtils(this);
 
         checkPermissions();
     }
@@ -193,54 +190,17 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
     }
 
-    /**
-     * Check whether an internet connection is available
-     *
-     * @return True if an internet connection is available, otherwise false
-     */
-    private boolean hasInternet() {
-        final ConnectivityManager cm = (ConnectivityManager) getApplicationContext().getSystemService(Context.CONNECTIVITY_SERVICE);
-
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            if (cm != null) {
-                final NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
-                if (capabilities != null) {
-                    return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
-                }
-            }
-        } else {
-            if (cm != null) {
-                final NetworkInfo activeNetwork = cm.getActiveNetworkInfo();
-                if (activeNetwork != null) {
-                    return activeNetwork.getType() == ConnectivityManager.TYPE_WIFI || activeNetwork.getType() == ConnectivityManager.TYPE_MOBILE;
-                }
-            }
-        }
-        return false;
-    }
-
-    /**
-     * Check if Wifi is enabled. If Wifi is not enabled, request the user to enable Wifi
-     */
-    private void checkWifiState() {
-        if (!wifi.isWifiEnabled()) {
-            wifiConfirmationCheck();
-        } else {
-            delayedWifiCheck();
-        }
-    }
-
     /**
      * Check whether an internet connection is available
      */
     private void checkConnectivity() {
-        // Initialize WifiManager
-        wifi = (WifiManager) getApplicationContext().getSystemService(Context.WIFI_SERVICE);
-
         // Check if an internet connection is available
-        if (!hasInternet()) {
-            // Check if the wifi module on the device is enabled or not
-            checkWifiState();
+        if (!networkUtils.hasNetworkConnection()) {
+            if (!networkUtils.isWifiEnabled()) {
+                wifiConfirmationCheck();
+            } else {
+                delayedWifiCheck();
+            }
         } else {
             continueLoading();
         }
@@ -284,7 +244,7 @@ public void onTick(long l) {
             public void onFinish() {
                 // No need for this code if the app is already finishing
                 if (isFinishing()) return;
-                if (hasInternet()) {
+                if (networkUtils.hasNetworkConnection()) {
                     // Load the next screen because an internet connection is available
                     continueLoading();
                 } else {