Address code analysis warnings

.github/workflows/create_release.yml

@@ -1,19 +1,19 @@
 name: "Create Release"
 
 on:
-    push:
-        tags:
-            - "v*"
+  push:
+    tags:
+      - "v*"
 
 jobs:
-    pre-release:
-        name: "Create Release"
-        runs-on: "ubuntu-latest"
+  pre-release:
+    name: "Create Release"
+    runs-on: "ubuntu-latest"
 
-        steps:
-            - uses: "marvinpinto/action-automatic-releases@latest"
-              with:
-                  repo_token: "${{ secrets.GITHUB_TOKEN }}"
-                  prerelease: false
-                  files: |
-                      *
+    steps:
+      - uses: "marvinpinto/action-automatic-releases@latest"
+        with:
+          repo_token: "${{ secrets.GITHUB_TOKEN }}"
+          prerelease: false
+          files: |
+            *

.gitignore

@@ -42,7 +42,6 @@ out/
 build/
 
 # Local configuration file (sdk path, etc)
-local.properties
 
 # Proguard folder generated by Eclipse
 proguard/
@@ -57,7 +56,6 @@ proguard/
 captures/
 
 # IntelliJ
-*.iml
 .idea/workspace.xml
 .idea/tasks.xml
 .idea/gradle.xml
@@ -76,7 +74,6 @@ captures/
 #*.keystore
 
 # External native build folder generated in Android Studio 2.2 and later
-.externalNativeBuild
 .cxx/
 
 # Google Services (e.g. APIs or Firebase)
@@ -146,7 +143,6 @@ hs_err_pid*
 # Generated files
 
 # Gradle files
-.gradle
 
 # Signing files
 .signing/
@@ -205,7 +201,6 @@ obj/
 .idea/jarRepositories.xml
 
 # OS-specific files
-.DS_Store
 .DS_Store?
 ._*
 .Spotlight-V100

app/build.gradle

@@ -4,11 +4,12 @@ plugins {
 
 android {
     compileSdkVersion 28
-    buildToolsVersion "30.0.2"
+    buildToolsVersion "30.0.3"
 
     defaultConfig {
         applicationId "com.example.prj_android_app"
         minSdkVersion 26
+        //noinspection OldTargetApi
         targetSdkVersion 28
         versionCode 1
         versionName "1.0"

app/src/main/java/com/prj/app/listeners/CustomLocationListener.java

@@ -6,9 +6,9 @@
 import android.os.Bundle;
 import android.util.Log;
 
-import com.prj.app.services.WifiScanningService;
 import com.prj.app.managers.DatabaseManager;
 import com.prj.app.managers.NotificationManager;
+import com.prj.app.services.WifiScanningService;
 import com.prj.app.ui.MainActivity;
 
 import org.jetbrains.annotations.NotNull;

app/src/main/java/com/prj/app/logic/BSSIDMatcher.java

@@ -6,11 +6,11 @@
 import android.widget.TextView;
 
 import com.android.volley.Request;
-import com.prj.app.util.Scan;
 import com.prj.app.api.CustomJsonArrayRequest;
 import com.prj.app.api.VolleySingleton;
 import com.prj.app.managers.DatabaseManager;
 import com.prj.app.managers.NotificationManager;
+import com.prj.app.util.Scan;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;
@@ -91,7 +91,7 @@ private void sendMatchingBSSIDsPOST(@NotNull String URL, @NotNull JSONObject jso
     /**
      * Match given JSONArray of scan data with local storage
      *
-     * @param matchingScans a JSONArray of remote postive scans;
+     * @param matchingScans a JSONArray of remote positive scans;
      */
     private void matchResult(@NotNull JSONArray matchingScans) {
         List<Scan> localScans = databaseManager.getScanData();
@@ -110,7 +110,7 @@ private void matchResult(@NotNull JSONArray matchingScans) {
         localScans = removeUnusedLocalScans(localScans, remoteScans);
         //sort by timestamp
         localScans.sort(Comparator.comparing(Scan::getTimestamp));
-        localScans = removeNonConcurrentScans(localScans); //filter out scans that don't have at least 2 mins of the same bssid
+        localScans = removeNonConcurrentScans(localScans); //filter out scans that don't have at least 2 minutes of the same bssid
 
         remoteScans.sort(Comparator.comparing(Scan::getTimestamp));
         localScans.sort(Comparator.comparing(Scan::getTimestamp));

app/src/main/java/com/prj/app/managers/ScanManager.java

@@ -8,8 +8,6 @@
 import android.net.wifi.ScanResult;
 import android.net.wifi.WifiManager;
 
-import com.prj.app.managers.DatabaseManager;
-
 import java.util.List;
 
 public class ScanManager {

app/src/main/java/com/prj/app/ui/MainActivity.java

@@ -16,11 +16,11 @@
 import androidx.work.PeriodicWorkRequest;
 import androidx.work.WorkManager;
 
-import com.prj.app.workers.DummyUploadWorker;
-import com.prj.app.workers.ExposureWorker;
-import com.prj.app.managers.NotificationManager;
 import com.prj.app.R;
+import com.prj.app.managers.NotificationManager;
 import com.prj.app.services.WifiScanningService;
+import com.prj.app.workers.DummyUploadWorker;
+import com.prj.app.workers.ExposureWorker;
 import com.skyfishjy.library.RippleBackground;
 
 import org.jetbrains.annotations.NotNull;

app/src/main/java/com/prj/app/ui/SettingsActivity.java

@@ -14,12 +14,12 @@
 import androidx.appcompat.app.AppCompatActivity;
 
 import com.android.volley.Request;
-import com.prj.app.logic.BSSIDMatcher;
+import com.prj.app.R;
 import com.prj.app.api.CustomJsonArrayRequest;
+import com.prj.app.api.VolleySingleton;
+import com.prj.app.logic.BSSIDMatcher;
 import com.prj.app.managers.DatabaseManager;
-import com.prj.app.R;
 import com.prj.app.util.Scan;
-import com.prj.app.api.VolleySingleton;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/com/prj/app/ui/UploadDataActivity.java

@@ -14,10 +14,10 @@
 import com.android.volley.Request;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
-import com.prj.app.managers.DatabaseManager;
 import com.prj.app.R;
-import com.prj.app.util.Scan;
 import com.prj.app.api.VolleySingleton;
+import com.prj.app.managers.DatabaseManager;
+import com.prj.app.util.Scan;
 
 import org.json.JSONArray;
 import org.json.JSONException;

app/src/main/java/com/prj/app/util/Scan.java

@@ -9,9 +9,9 @@
 import java.util.List;
 
 public class Scan implements Comparable<Scan> {
-    String bssid;
-    Double distance;
-    Date timestamp;
+    final String bssid;
+    final Double distance;
+    final Date timestamp;
 
     public Scan(String bssid, Double distance, Date timestamp) {
         this.bssid = bssid;

app/src/main/java/com/prj/app/workers/DummyUploadWorker.java

@@ -12,9 +12,9 @@
 import com.android.volley.Request;
 import com.android.volley.VolleyError;
 import com.android.volley.toolbox.JsonObjectRequest;
+import com.prj.app.api.VolleySingleton;
 import com.prj.app.managers.DatabaseManager;
 import com.prj.app.util.Scan;
-import com.prj.app.api.VolleySingleton;
 
 import org.jetbrains.annotations.NotNull;
 import org.json.JSONArray;