update gradle

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Jan 18 09:56:30 EST 2025
-version_build=2
+#Sun Feb 23 13:34:01 EST 2025
+version_build=3
 version_major=3
 version_minor=1
 version_patch=4

app/jacoco.gradle

@@ -66,15 +66,15 @@ task jacocoTestCoverageVerification(type: JacocoCoverageVerification, dependsOn:
             element = 'BUNDLE'
             limit {
                 counter = 'INSTRUCTION'
-                minimum = 0.96
+                minimum = 0.97
             }
             limit {
                 counter = 'BRANCH'
-                minimum = 0.84
+                minimum = 0.88
             }
             limit {
                 counter = 'COMPLEXITY'
-                minimum = 0.89
+                minimum = 0.92
             }
             limit {
                 counter = 'LINE'

app/src/main/AndroidManifest.xml

@@ -56,10 +56,4 @@
             </intent-filter>
         </activity>
     </application>
-
-    <queries>
-        <package android:name="com.aaronjwood.portauthority" />
-        <package android:name="com.aaronjwood.portauthority.free" />
-        <package android:name="com.aaronjwood.portauthority.donate" />
-    </queries>
 </manifest>

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

@@ -100,10 +100,10 @@ class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPrefere
     }
 
     override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<String>, grantResults: IntArray) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
         if (!MainContext.INSTANCE.permissionService.granted(requestCode, grantResults)) {
             finish()
         }
-        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
     }
 
     private fun setWiFiChannelPairs(mainContext: MainContext) {
@@ -181,16 +181,21 @@ class MainActivity : AppCompatActivity(), NavigationMenuControl, OnSharedPrefere
 
     public override fun onStop() {
         MainContext.INSTANCE.scannerService.stop()
+        updateActionBar()
         super.onStop()
     }
 
     public override fun onStart() {
         super.onStart()
         if (MainContext.INSTANCE.permissionService.permissionGranted()) {
+            if (!MainContext.INSTANCE.permissionService.locationEnabled()) {
+                startLocationSettings()
+            }
             MainContext.INSTANCE.scannerService.resume()
         } else {
             MainContext.INSTANCE.permissionService.check()
         }
+        updateActionBar()
     }
 
     override fun onCreateOptionsMenu(menu: Menu): Boolean {

app/src/test/kotlin/com/vrem/wifianalyzer/MainActivityTest.kt

@@ -32,6 +32,7 @@ import org.junit.After
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.mockito.kotlin.mock
+import org.mockito.kotlin.never
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import org.robolectric.Robolectric
@@ -64,7 +65,7 @@ class MainActivityTest {
     }
 
     @Test
-    fun onResumeWithPermissionGrantedWillResumeScanner() {
+    fun onResumeWithPermissionGrantedAndLocationDisabledWillResumeScanner() {
         // setup
         val permissionService = MainContextHelper.INSTANCE.permissionService
         val scannerService = MainContextHelper.INSTANCE.scannerService
@@ -79,6 +80,22 @@ class MainActivityTest {
         verify(scannerService).register(fixture.connectionView)
     }
 
+    @Test
+    fun onResumeWithPermissionGrantedAndLocationEnabledWillResumeScanner() {
+        // setup
+        val permissionService = MainContextHelper.INSTANCE.permissionService
+        val scannerService = MainContextHelper.INSTANCE.scannerService
+        whenever(permissionService.permissionGranted()).thenReturn(true)
+        whenever(permissionService.locationEnabled()).thenReturn(true)
+        // execute
+        fixture.onResume()
+        // validate
+        verify(permissionService).permissionGranted()
+        verify(permissionService).locationEnabled()
+        verify(scannerService).resume()
+        verify(scannerService).register(fixture.connectionView)
+    }
+
     @Test
     fun onResumeWithPermissionNotGrantedWillPauseScanner() {
         // setup
@@ -91,19 +108,37 @@ class MainActivityTest {
         verify(scannerService).pause()
         verify(scannerService).register(fixture.connectionView)
         verify(permissionService).permissionGranted()
+        verify(permissionService, never()).locationEnabled()
     }
 
     @Test
-    fun onStartWithPermissionGrantedWillResumeScanner() {
+    fun onStartWithPermissionGrantedAndLocationDisabledWillResumeScanner() {
         // setup
         val permissionService = MainContextHelper.INSTANCE.permissionService
         val scannerService = MainContextHelper.INSTANCE.scannerService
         whenever(permissionService.permissionGranted()).thenReturn(true)
+        whenever(permissionService.locationEnabled()).thenReturn(false)
         // execute
         fixture.onStart()
         // validate
         verify(scannerService).resume()
         verify(permissionService).permissionGranted()
+        verify(permissionService).locationEnabled()
+    }
+
+    @Test
+    fun onStartWithPermissionGrantedAndLocationEnabledWillResumeScanner() {
+        // setup
+        val permissionService = MainContextHelper.INSTANCE.permissionService
+        val scannerService = MainContextHelper.INSTANCE.scannerService
+        whenever(permissionService.permissionGranted()).thenReturn(true)
+        whenever(permissionService.locationEnabled()).thenReturn(true)
+        // execute
+        fixture.onStart()
+        // validate
+        verify(scannerService).resume()
+        verify(permissionService).permissionGranted()
+        verify(permissionService).locationEnabled()
     }
 
     @Test
@@ -116,6 +151,7 @@ class MainActivityTest {
         // validate
         verify(permissionService).check()
         verify(permissionService).permissionGranted()
+        verify(permissionService, never()).locationEnabled()
     }
 
     @Test

build.gradle

@@ -20,14 +20,14 @@
 
 buildscript {
     ext {
-        kotlin_version = '2.1.0'
+        kotlin_version = '2.1.10'
     }
     repositories {
         google()
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.8.0'
+        classpath 'com.android.tools.build:gradle:8.8.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
         classpath "org.jetbrains.kotlin:kotlin-allopen:$kotlin_version"
     }