Merge branch 'feature'

Author: VREMSoftwareDevelopment

.github/workflows/android_ci.yml

@@ -15,9 +15,9 @@ jobs:
       - name: unit tests
         run: bash ./gradlew testDebugUnitTest --stacktrace
       - name: coverage
-        run: bash ./gradlew jacocoTestReport --stacktrace
+        run: bash ./gradlew jacocoTestCoverageVerification --stacktrace
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1
+        uses: codecov/codecov-action@v2
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
           file: ./app/build/reports/jacoco/jacocoTestReport/jacocoTestReport.xml

README.md

@@ -1,9 +1,5 @@
 <h1>WiFi Analyzer <img src="images/icon.png" alt="Application Icon" width="45" height="45"></h1>
 
-## News: 
-- WiFi Analyzer rated as one of the 15 most useful apps for Android by [Android Authority](https://www.androidauthority.com/most-useful-apps-for-android-603100/amp)
-- [Gizmodo](https://gizmodo.com/the-best-wifi-analyzer-apps-to-troubleshoot-your-networ-1843957301) rates WiFi Analyzer one of The Best Apps for Fixing Your WiFi
-
 [<img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png" alt="Get it on Google Play" height="80">](https://play.google.com/store/apps/details?id=com.vrem.wifianalyzer)
 [<img src="https://f-droid.org/badge/get-it-on.png" alt="Get it on F-Droid" height="80">](https://f-droid.org/repository/browse/?fdid=com.vrem.wifianalyzer)
 [<img src="https://images-na.ssl-images-amazon.com/images/G/01/mobile-apps/devportal2/res/images/amazon-underground-app-us-white.png" alt="Get it at Amazon Store" height="70">
@@ -30,6 +26,7 @@ This is the official repository of WiFi Analyzer.
 * Graph Access Point signal strength over time
 * Analyze WiFi networks to rate channels
 * HT/VHT Detection - 40/80/160MHz (Requires Android OS 6+)
+* 2.4 GHz, 5 GHz and 6 GHz WiFi bands (Requires hardware support)
 * Access Point view complete or compact
 * Estimated Distance to the Access Points
 * Export access points details
@@ -42,7 +39,7 @@ This is the official repository of WiFi Analyzer.
 **Please note WiFi Analyzer is not a WiFi password cracking or phishing tool.**
 
 ## Usage Tips
-* Tap the title bar to switch between 2.4 and 5 GHz WiFi band.
+* Tap the title bar to switch between 2.4, 5 and 6 GHz WiFi band.
 * SSID with `***` or `*hidden*` means it is hidden.
 * Access Point security: 
      * <img src="images/ic_lock_black_18dp.png" alt="WPA2/WPA" height="20"> WPA3(SAE)/WPA2/WPA 
@@ -121,9 +118,9 @@ WiFi Analyzer is licensed under the GNU General Public License v3.0 (GPLv3).
     * Select the root directory of the WiFi Analyzer repository and click "OK".
     * WiFi Analyzer will build automatically.
 
-### Running unit tests and jacoco coverage report
+### Running lint, unit tests and jacoco coverage report
 ```
-./gradlew lint testDebugUnitTest jacocoTestReport
+./gradlew lintDebug jacocoTestCoverageVerification
 ```
 
 - lint report: `app/build/reports/lint-results.html`

app/build.gradle

@@ -27,22 +27,22 @@ dependencies {
     // Compile Build Dependencies
     implementation fileTree(include: ["*.jar"], dir: "libs")
     implementation 'com.google.android.material:material:1.4.0'
-    implementation 'androidx.annotation:annotation:1.2.0'
-    implementation 'androidx.collection:collection-ktx:1.1.0'
+    implementation 'androidx.annotation:annotation:1.3.0'
+    implementation 'androidx.collection:collection-ktx:1.2.0'
     implementation 'androidx.core:core-ktx:1.6.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.media:media:1.4.1'
+    implementation 'androidx.media:media:1.4.3'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'com.jjoe64:graphview:4.2.2'
     // Unit Test Dependencies
     testImplementation 'androidx.test.ext:junit:1.1.3'
     testImplementation 'com.googlecode.junit-toolbox:junit-toolbox:2.4'
     testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
-    testImplementation 'io.mockk:mockk:1.12.0'
+    testImplementation 'io.mockk:mockk:1.12.1'
     testImplementation 'junit:junit:4.13.2'
-    testImplementation 'org.mockito:mockito-core:3.11.2'
-    testImplementation 'org.robolectric:robolectric:4.6.1'
+    testImplementation 'org.mockito:mockito-core:4.2.0'
+    testImplementation 'org.robolectric:robolectric:4.7.3'
     testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
     testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
     // Android Test Dependencies

app/build.properties

@@ -1,7 +1,7 @@
 #Build Properties
-#Sat Aug 07 14:32:46 EDT 2021
+#Sat Dec 25 09:47:27 EST 2021
 version_minor=0
 version_store=57
 version_patch=5
-version_build=2
+version_build=9
 version_major=3

app/jacoco.gradle

@@ -22,39 +22,71 @@ jacoco {
     toolVersion = "0.8.7"
 }
 
+def executionPath = 'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'
+
+def fileFilter = [
+    '**/R.class',
+    '**/R$*.class',
+    '**/BuildConfig.*',
+    '**/databinding/*.*',
+    '**/Manifest*.*',
+    '**/*Test*.*',
+    'android/**/*.*',
+    '**/com/jjoe64/*'
+]
+
+def classJavaDir = "$project.buildDir/intermediates/javac/debug/classes"
+def classKotlinDir = "$project.buildDir/tmp/kotlin-classes/debug"
+def mainJavaSrc = "$project.projectDir/src/main/java"
+def mainKotlinSrc = "$project.projectDir/src/main/kotlin"
+def debugTree = fileTree(dir: classJavaDir, excludes: fileFilter) + fileTree(dir: classKotlinDir, excludes: fileFilter)
+
 tasks.withType(Test) {
     jacoco.includeNoLocationClasses = true
     jacoco.excludes = ['jdk.internal.*']
 }
 
 task jacocoTestReport(type: JacocoReport, dependsOn: ['testDebugUnitTest']) {
-
     reports {
         xml.enabled = true
         html.enabled = true
     }
-
-    def fileFilter = [
-        '**/R.class',
-        '**/R$*.class',
-        '**/BuildConfig.*',
-        '**/databinding/*.*',
-        '**/Manifest*.*',
-        '**/*Test*.*',
-        'android/**/*.*',
-        '**/com/jjoe64/*'
-    ]
-
-    def classJavaDir = "$project.buildDir/intermediates/javac/debug/classes"
-    def classKotlinDir = "$project.buildDir/tmp/kotlin-classes/debug"
-    def mainJavaSrc = "$project.projectDir/src/main/java"
-    def mainKotlinSrc = "$project.projectDir/src/main/kotlin"
-    def debugTree = fileTree(dir: classJavaDir, excludes: fileFilter) +
-            fileTree(dir: classKotlinDir, excludes: fileFilter)
-
     sourceDirectories.from = files([mainJavaSrc, mainKotlinSrc])
     classDirectories.from = files([debugTree])
-    executionData.from = fileTree(dir: project.buildDir, includes: [
-        'outputs/unit_test_code_coverage/debugUnitTest/testDebugUnitTest.exec'
-    ])
+    executionData.from = fileTree(dir: project.buildDir, includes: [executionPath])
+}
+
+task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn: 'jacocoTestReport') {
+    sourceDirectories.from = files([[mainJavaSrc, mainKotlinSrc]])
+    classDirectories.from = files([debugTree])
+    executionData.from = fileTree(dir: project.buildDir, includes: [executionPath])
+    violationRules {
+        failOnViolation = true
+        rule {
+            limit {
+                counter = 'INSTRUCTION'
+                minimum = 0.96
+            }
+            limit {
+                counter = 'BRANCH'
+                minimum = 0.82
+            }
+            limit {
+                counter = 'COMPLEXITY'
+                minimum = 0.87
+            }
+            limit {
+                counter = 'LINE'
+                minimum = 0.97
+            }
+            limit {
+                counter = 'METHOD'
+                minimum = 0.97
+            }
+            limit {
+                counter = 'CLASS'
+                minimum = 0.99
+            }
+        }
+    }
 }

app/src/main/kotlin/com/vrem/util/StringUtils.kt

@@ -25,9 +25,5 @@ val String.Companion.SPACE_SEPARATOR: String get() = " "
 fun String.specialTrim(): String =
         this.trim { it <= ' ' }.replace(" +".toRegex(), String.SPACE_SEPARATOR)
 
-fun String.toHtml(color: Int, small: Boolean): String =
-        "<font color='" + color + "'><" + (if (small) "small" else "strong") +
-                ">" + this + "</" + (if (small) "small" else "strong") + "></font>"
-
 fun String.toCapitalize(locale: Locale): String =
         this.replaceFirstChar { word -> word.uppercase(locale) }

app/src/main/kotlin/com/vrem/wifianalyzer/ActivityUtils.kt

@@ -33,7 +33,6 @@ internal fun MainActivity.keepScreenOn() =
 
 internal fun MainActivity.setupToolbar(): Toolbar {
     val toolbar: Toolbar = this.findViewById(R.id.toolbar)
-    toolbar.setOnClickListener { toggleWiFiBand() }
     this.setSupportActionBar(toolbar)
     this.supportActionBar?.let {
         it.setHomeButtonEnabled(true)
@@ -42,12 +41,6 @@ internal fun MainActivity.setupToolbar(): Toolbar {
     return toolbar
 }
 
-internal fun MainActivity.toggleWiFiBand() {
-    if (this.currentNavigationMenu().wiFiBandSwitchable()) {
-        MainContext.INSTANCE.settings.toggleWiFiBand()
-    }
-}
-
 internal fun makeIntent(action: String): Intent = Intent(action)
 
 @TargetApi(Build.VERSION_CODES.Q)

app/src/main/kotlin/com/vrem/wifianalyzer/Configuration.kt

@@ -18,18 +18,38 @@
 package com.vrem.wifianalyzer
 
 import com.vrem.annotation.OpenClass
+import com.vrem.wifianalyzer.wifi.band.WiFiBand
+import com.vrem.wifianalyzer.wifi.band.WiFiChannelPair
 import com.vrem.wifianalyzer.wifi.band.WiFiChannels
 
 const val SIZE_MIN = 1024
 const val SIZE_MAX = 4096
 
 @OpenClass
 class Configuration(val largeScreen: Boolean) {
-    var size = SIZE_MAX
+    private var wiFiChannelPair = mutableMapOf<WiFiBand, WiFiChannelPair>()
 
-    var wiFiChannelPair = WiFiChannels.UNKNOWN
+    var size = SIZE_MAX
 
     val sizeAvailable: Boolean
         get() = size == SIZE_MAX
 
+    fun wiFiChannelPair(countryCode: String): Unit =
+        WiFiBand.values().forEach {
+            this.wiFiChannelPair[it] = it.wiFiChannels.wiFiChannelPairFirst(countryCode)
+        }
+
+    fun wiFiChannelPair(wiFiBand: WiFiBand): WiFiChannelPair =
+        this.wiFiChannelPair[wiFiBand]!!
+
+    fun wiFiChannelPair(wiFiBand: WiFiBand, wiFiChannelPair: WiFiChannelPair) {
+        this.wiFiChannelPair[wiFiBand] = wiFiChannelPair
+    }
+
+    init {
+        WiFiBand.values().forEach {
+            this.wiFiChannelPair[it] = WiFiChannels.UNKNOWN
+        }
+
+    }
 }

app/src/main/kotlin/com/vrem/wifianalyzer/MainActivity.kt

@@ -41,20 +41,21 @@ import com.vrem.wifianalyzer.permission.PermissionService
 import com.vrem.wifianalyzer.settings.Repository
 import com.vrem.wifianalyzer.settings.Settings
 import com.vrem.wifianalyzer.wifi.accesspoint.ConnectionView
-import com.vrem.wifianalyzer.wifi.band.WiFiBand
+import com.vrem.wifianalyzer.wifi.scanner.ScannerService
 
 @OpenClass
 class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPreferenceChangeListener {
-    lateinit var drawerNavigation: DrawerNavigation
-    lateinit var mainReload: MainReload
-    lateinit var navigationMenuController: NavigationMenuController
-    lateinit var optionMenu: OptionMenu
-    lateinit var permissionService: PermissionService
+    internal lateinit var drawerNavigation: DrawerNavigation
+    internal lateinit var mainReload: MainReload
+    internal lateinit var navigationMenuController: NavigationMenuController
+    internal lateinit var optionMenu: OptionMenu
+    internal lateinit var permissionService: PermissionService
+    internal lateinit var connectionView: ConnectionView
 
     private var currentCountryCode: String = String.EMPTY
 
     override fun attachBaseContext(newBase: Context) =
-            super.attachBaseContext(newBase.createContext(Settings(Repository(newBase)).languageLocale()))
+        super.attachBaseContext(newBase.createContext(Settings(Repository(newBase)).languageLocale()))
 
     override fun onCreate(savedInstanceState: Bundle?) {
         val mainContext = MainContext.INSTANCE
@@ -84,11 +85,9 @@ class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPrefere
         navigationMenuController.currentNavigationMenu(settings.selectedMenu())
         onNavigationItemSelected(currentMenuItem())
 
-        val connectionView = ConnectionView(this)
-        mainContext.scannerService.register(connectionView)
+        connectionView = ConnectionView(this)
 
         permissionService = PermissionService(this)
-        permissionService.check()
     }
 
     public override fun onPostCreate(savedInstanceState: Bundle?) {
@@ -112,8 +111,7 @@ class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPrefere
         val settings = mainContext.settings
         val countryCode = settings.countryCode()
         if (countryCode != currentCountryCode) {
-            val pair = WiFiBand.GHZ5.wiFiChannels.wiFiChannelPairFirst(countryCode)
-            mainContext.configuration.wiFiChannelPair = pair
+            mainContext.configuration.wiFiChannelPair(countryCode)
             currentCountryCode = countryCode
         }
     }
@@ -172,27 +170,42 @@ class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPrefere
     }
 
     public override fun onPause() {
-        MainContext.INSTANCE.scannerService.pause()
+        val scannerService: ScannerService = MainContext.INSTANCE.scannerService
+        scannerService.pause()
+        scannerService.unregister(connectionView)
         updateActionBar()
         super.onPause()
     }
 
     public override fun onResume() {
         super.onResume()
+        val scannerService: ScannerService = MainContext.INSTANCE.scannerService
         if (permissionService.permissionGranted()) {
             if (!permissionService.systemEnabled()) {
                 startLocationSettings()
             }
-            MainContext.INSTANCE.scannerService.resume()
+            scannerService.resume()
+        } else {
+            scannerService.pause()
         }
         updateActionBar()
+        scannerService.register(connectionView)
     }
 
     public override fun onStop() {
         MainContext.INSTANCE.scannerService.stop()
         super.onStop()
     }
 
+    public override fun onStart() {
+        super.onStart()
+        if (permissionService.permissionGranted()) {
+            MainContext.INSTANCE.scannerService.resume()
+        } else {
+            permissionService.check()
+        }
+    }
+
     override fun onCreateOptionsMenu(menu: Menu): Boolean {
         optionMenu.create(this, menu)
         updateActionBar()

app/src/main/kotlin/com/vrem/wifianalyzer/MainContext.kt

@@ -60,7 +60,7 @@ enum class MainContext {
         settings = Settings(Repository(context))
         vendorService = VendorService(activity.resources)
         wiFiManagerWrapper = WiFiManagerWrapper(wiFiManager)
-        scannerService = makeScannerService(wiFiManagerWrapper, Handler(Looper.getMainLooper()), settings)
+        scannerService = makeScannerService(mainActivity, wiFiManagerWrapper, Handler(Looper.getMainLooper()), settings)
         filtersAdapter = FiltersAdapter(settings)
     }