Merge pull request #4 from CodeDead/release/1.4.2

Release/1.4.2

Author: CodeDead

app/build.gradle

@@ -1,13 +1,13 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 29
+    compileSdkVersion 30
     defaultConfig {
         applicationId "com.codedead.advancedportchecker"
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 11
-        versionName '1.4.1'
+        minSdkVersion 24
+        targetSdkVersion 30
+        versionCode 12
+        versionName '1.4.2'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
@@ -20,22 +20,22 @@ android {
     productFlavors {
     }
     compileOptions {
-        sourceCompatibility = 1.8
-        targetCompatibility = 1.8
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
     }
 }
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation 'androidx.core:core:1.1.0'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'androidx.core:core:1.6.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation "androidx.preference:preference:1.1.0"
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    implementation "androidx.preference:preference:1.1.1"
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
 }

app/src/main/AndroidManifest.xml

@@ -23,7 +23,7 @@
         tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".gui.activity.SettingsActivity"
-            android:label="@string/title_activity_settings"></activity>
+            android:label="@string/title_activity_settings" />
         <activity
             android:name=".gui.activity.LoadingActivity"
             android:configChanges="orientation|keyboardHidden|screenSize"

app/src/main/java/com/codedead/advancedportchecker/domain/controller/LocaleHelper.java

@@ -19,7 +19,7 @@ public class LocaleHelper {
      * @param context The Context object that is attached
      * @return The Context object containing correct resource properties
      */
-    public static Context onAttach(Context context) {
+    public static Context onAttach(final Context context) {
         final String lang = getPersistedData(context, Locale.getDefault().getLanguage());
         return setLocale(context, lang);
     }
@@ -31,7 +31,7 @@ public static Context onAttach(Context context) {
      * @param defaultLanguage The default language code
      * @return The Context object containing correct resource properties
      */
-    public static Context onAttach(Context context, String defaultLanguage) {
+    public static Context onAttach(final Context context, final String defaultLanguage) {
         final String lang = getPersistedData(context, defaultLanguage);
         return setLocale(context, lang);
     }
@@ -43,7 +43,7 @@ public static Context onAttach(Context context, String defaultLanguage) {
      * @param language The language that should be attached
      * @return The Context object containing correct resource properties
      */
-    public static Context setLocale(Context context, String language) {
+    public static Context setLocale(final Context context, final String language) {
         persist(context, language);
 
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
@@ -60,7 +60,7 @@ public static Context setLocale(Context context, String language) {
      * @param defaultLanguage The default language code
      * @return The language code that is stored in the shared preferences
      */
-    private static String getPersistedData(Context context, String defaultLanguage) {
+    private static String getPersistedData(final Context context, final String defaultLanguage) {
         final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
         return preferences.getString("language", defaultLanguage);
     }
@@ -71,9 +71,9 @@ private static String getPersistedData(Context context, String defaultLanguage)
      * @param context  The Context object that can be used to store preferences
      * @param language The language code that should be stored
      */
-    private static void persist(Context context, String language) {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
-        SharedPreferences.Editor editor = preferences.edit();
+    private static void persist(final Context context, final String language) {
+        final SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        final SharedPreferences.Editor editor = preferences.edit();
 
         editor.putString("language", language);
         editor.apply();
@@ -87,7 +87,7 @@ private static void persist(Context context, String language) {
      * @return The Context object containing correct resource properties
      */
     @TargetApi(Build.VERSION_CODES.N)
-    private static Context updateResources(Context context, String language) {
+    private static Context updateResources(final Context context, final String language) {
         final Locale locale = new Locale(language);
         Locale.setDefault(locale);
 
@@ -104,7 +104,7 @@ private static Context updateResources(Context context, String language) {
      * @param language The language code that should be applied to the Context object
      * @return The Context object containing correct resource properties
      */
-    private static Context updateResourcesLegacy(Context context, String language) {
+    private static Context updateResourcesLegacy(final Context context, final String language) {
         final Locale locale = new Locale(language);
         Locale.setDefault(locale);
 

app/src/main/java/com/codedead/advancedportchecker/domain/controller/ScanController.java

@@ -14,12 +14,12 @@
 
 public final class ScanController extends AsyncTask<Void, ScanProgress, Void> {
 
-    private String host;
-    private int startPort;
-    private int endPort;
-    private int timeOut;
+    private final String host;
+    private final int startPort;
+    private final int endPort;
+    private final int timeOut;
 
-    private AsyncResponse response;
+    private final AsyncResponse response;
 
     /**
      * Initialize a new ScanController
@@ -31,9 +31,9 @@ public final class ScanController extends AsyncTask<Void, ScanProgress, Void> {
      * @param timeOut   The time it takes before a connection is marked as timed-out
      * @param response  The AsyncResponse that can be called when a scan has finished or been cancelled
      */
-    public ScanController(Context context, String host, int startPort,
-                          int endPort, int timeOut,
-                          AsyncResponse response) {
+    public ScanController(final Context context, String host, final int startPort,
+                          final int endPort, final int timeOut,
+                          final AsyncResponse response) {
 
         if (context == null) throw new NullPointerException("Context cannot be null!");
         if (host == null || host.isEmpty() || !UtilController.isValidAddress(host))
@@ -47,7 +47,7 @@ public ScanController(Context context, String host, int startPort,
             throw new IllegalArgumentException(context.getString(R.string.string_invalid_endport));
         if (endPort < startPort)
             throw new IllegalArgumentException(context.getString(R.string.string_endport_larger_than_startport));
-        if (endPort > 65535 || startPort > 65535)
+        if (endPort > 65535)
             throw new IllegalArgumentException(context.getString(R.string.string_largest_possible_port));
 
         host = host
@@ -63,7 +63,7 @@ public ScanController(Context context, String host, int startPort,
     }
 
     @Override
-    protected Void doInBackground(Void... voids) {
+    protected Void doInBackground(final Void... voids) {
         int currentPort = startPort;
         while (currentPort <= endPort) {
             if (isCancelled()) {
@@ -76,13 +76,13 @@ protected Void doInBackground(Void... voids) {
     }
 
     @Override
-    protected void onPostExecute(Void aVoid) {
+    protected void onPostExecute(final Void aVoid) {
         response.scanComplete();
         super.onPostExecute(aVoid);
     }
 
     @Override
-    protected void onProgressUpdate(ScanProgress... values) {
+    protected void onProgressUpdate(final ScanProgress... values) {
         if (isCancelled()) return;
 
         response.update(values[0]);
@@ -97,16 +97,16 @@ protected void onProgressUpdate(ScanProgress... values) {
      * @param timeOut The time it takes before a connection is closed due to a time-out
      * @return A ScanProgress object containing the result of the scan
      */
-    private static ScanProgress scanTcp(String host, int port, int timeOut) {
+    private static ScanProgress scanTcp(final String host, final int port, final int timeOut) {
         final ScanProgress scan = new ScanProgress(host, port);
         try {
-            Socket socket = new Socket();
-            socket.connect(new InetSocketAddress(host, port), timeOut);
-            socket.close();
+            try (final Socket socket = new Socket()) {
+                socket.connect(new InetSocketAddress(host, port), timeOut);
+            }
             scan.setStatus(ScanStatus.OPEN);
-        } catch (SocketTimeoutException ce) {
+        } catch (final SocketTimeoutException ce) {
             scan.setStatus(ScanStatus.TIMEOUT);
-        } catch (Exception ex) {
+        } catch (final Exception ex) {
             scan.setStatus(ScanStatus.CLOSED);
         }
 

app/src/main/java/com/codedead/advancedportchecker/domain/controller/UtilController.java

@@ -16,13 +16,13 @@ public final class UtilController {
      * @param context The context that can be used to start the activity
      * @param url     The URL that should be opened
      */
-    public static void openWebsite(Context context, String url) {
+    public static void openWebsite(final Context context, final String url) {
         try {
             final Uri uri = Uri.parse(url);
             final Intent intent = new Intent(Intent.ACTION_VIEW, uri);
 
             context.startActivity(intent);
-        } catch (Exception ex) {
+        } catch (final Exception ex) {
             ex.printStackTrace();
         }
     }
@@ -33,7 +33,7 @@ public static void openWebsite(Context context, String url) {
      * @param context The context that can be used to display the alert
      * @param message The message that needs to be displayed to the user
      */
-    public static void showAlert(Context context, String message) {
+    public static void showAlert(final Context context, final String message) {
         final AlertDialog.Builder builder = new AlertDialog.Builder(context);
         builder.setMessage(message);
         builder.setCancelable(true);
@@ -42,7 +42,7 @@ public static void showAlert(Context context, String message) {
                 android.R.string.ok,
                 (dialog, id) -> dialog.cancel());
 
-        AlertDialog alert = builder.create();
+        final AlertDialog alert = builder.create();
         alert.show();
     }
 

app/src/main/java/com/codedead/advancedportchecker/domain/interfaces/AsyncResponse.java

@@ -7,5 +7,5 @@ public interface AsyncResponse {
 
     void scanCancelled();
 
-    void update(ScanProgress scanProgress);
+    void update(final ScanProgress scanProgress);
 }

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

@@ -3,21 +3,20 @@
 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;
+    private final WifiManager wifiManager;
+    private final 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!");
+    public NetworkUtils(final Context context) {
+        if (context == null)
+            throw new NullPointerException("Context cannot be null!");
 
         this.context = context;
         wifiManager = (WifiManager) context.getApplicationContext().getSystemService(Context.WIFI_SERVICE);
@@ -30,19 +29,10 @@ public NetworkUtils(Context context) {
     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;
-                }
+        if (cm != null) {
+            final NetworkCapabilities capabilities = cm.getNetworkCapabilities(cm.getActiveNetwork());
+            if (capabilities != null) {
+                return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_WIFI) || capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
             }
         }
         return false;

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

@@ -11,7 +11,7 @@
 public final class Runner extends Application {
 
     @Override
-    protected void attachBaseContext(Context base) {
+    protected void attachBaseContext(final Context base) {
         final SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(base);
         super.attachBaseContext(LocaleHelper.onAttach(base, sharedPref.getString("appLanguage", "en")));
     }

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

@@ -12,7 +12,7 @@ public final class ScanProgress {
      * @param host The host that was scanned
      * @param port The port that was scanned
      */
-    public ScanProgress(String host, int port) {
+    public ScanProgress(final String host, final int port) {
         if (host == null || host.isEmpty())
             throw new IllegalArgumentException("Host cannot be null or empty!");
 
@@ -26,8 +26,9 @@ public ScanProgress(String host, int port) {
      *
      * @param status The status of the scan
      */
-    public void setStatus(ScanStatus status) {
-        if (status == null) throw new NullPointerException("Status cannot be null!");
+    public void setStatus(final ScanStatus status) {
+        if (status == null)
+            throw new NullPointerException("Status cannot be null!");
         this.status = status;
     }