cleanup

VREMSoftwareDevelopment · Feb 25, 2024 · 78648c9 · 78648c9
1 parent c87c12f
commit 78648c9
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 30 deletions.
diff --git a/app/build.properties b/app/build.properties
@@ -1,6 +1,6 @@
 #Build Properties
-#Mon Feb 19 11:44:54 EST 2024
-version_build=12
+#Sun Feb 25 10:08:34 EST 2024
+version_build=13
 version_major=3
 version_minor=1
 version_patch=2

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiver.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiver.kt
@@ -17,19 +17,20 @@
  */
 package com.vrem.wifianalyzer.wifi.scanner
 
+import android.annotation.SuppressLint
 import android.content.BroadcastReceiver
 import android.content.Context
 import android.content.Intent
 import android.content.IntentFilter
 import android.net.wifi.WifiManager
-import androidx.core.content.ContextCompat
 import com.vrem.annotation.OpenClass
 import com.vrem.wifianalyzer.MainActivity
 
 fun interface Callback { // Compliant, function interface used
     fun onSuccess()
 }
 
+@SuppressLint("UnspecifiedRegisterReceiverFlag")
 @OpenClass
 internal class ScanResultsReceiver(private val mainActivity: MainActivity, private val callback: Callback) :
     BroadcastReceiver() {
@@ -38,23 +39,19 @@ internal class ScanResultsReceiver(private val mainActivity: MainActivity, priva
     fun register() {
         if (!registered) {
             val intentFilter = makeIntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
-            registerReceiver(mainActivity.applicationContext, this, intentFilter, ContextCompat.RECEIVER_EXPORTED)
+            mainActivity.registerReceiver(this, intentFilter)
             registered = true
         }
     }
 
-    internal fun registerReceiver(context: Context, broadcastReceiver: BroadcastReceiver, intentFilter: IntentFilter, flags: Int) {
-        ContextCompat.registerReceiver(context, broadcastReceiver, intentFilter, flags)
-    }
-
     fun unregister() {
         if (registered) {
             mainActivity.unregisterReceiver(this)
             registered = false
         }
     }
 
-    internal fun makeIntentFilter(action: String): IntentFilter = IntentFilter(action)
+    fun makeIntentFilter(action: String): IntentFilter = IntentFilter(action)
 
     override fun onReceive(context: Context, intent: Intent) {
         if (WifiManager.SCAN_RESULTS_AVAILABLE_ACTION == intent.action &&

diff --git a/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiverTest.kt b/app/src/test/kotlin/com/vrem/wifianalyzer/wifi/scanner/ScanResultsReceiverTest.kt
@@ -17,50 +17,42 @@
  */
 package com.vrem.wifianalyzer.wifi.scanner
 
-import android.content.Context
+import android.annotation.SuppressLint
 import android.content.Intent
 import android.content.IntentFilter
 import android.net.wifi.WifiManager
-import androidx.core.content.ContextCompat
 import com.vrem.wifianalyzer.MainActivity
 import org.junit.After
 import org.junit.Before
 import org.junit.Test
 import org.mockito.ArgumentMatchers
 import org.mockito.kotlin.*
 
+@SuppressLint("UnspecifiedRegisterReceiverFlag")
 class ScanResultsReceiverTest {
     private val mainActivity: MainActivity = mock()
-    private val context: Context = mock()
     private val callback: Callback = mock()
     private val intentFilter: IntentFilter = mock()
     private val intent: Intent = mock()
     private val fixture: ScanResultsReceiver = spy(ScanResultsReceiver(mainActivity, callback))
 
     @Before
     fun setUp() {
-        doReturn(context).whenever(mainActivity).applicationContext
-        doReturn(intentFilter).whenever(fixture).makeIntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
-        doNothing().whenever(fixture).registerReceiver(context, fixture, intentFilter, ContextCompat.RECEIVER_EXPORTED)
+        whenever(fixture.makeIntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)).thenReturn(intentFilter)
     }
 
     @After
     fun tearDown() {
         verifyNoMoreInteractions(mainActivity)
-        verifyNoMoreInteractions(context)
         verifyNoMoreInteractions(callback)
-        verifyNoMoreInteractions(intentFilter)
-        verifyNoMoreInteractions(intent)
     }
 
     @Test
     fun registerOnce() {
         // execute
         fixture.register()
         // verify
-        verify(mainActivity).applicationContext
-        verify(fixture).makeIntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
-        verify(fixture).registerReceiver(context, fixture, intentFilter, ContextCompat.RECEIVER_EXPORTED)
+        verify(mainActivity).registerReceiver(fixture, intentFilter)
     }
 
     @Test
@@ -69,9 +61,7 @@ class ScanResultsReceiverTest {
         fixture.register()
         fixture.register()
         // verify
-        verify(mainActivity).applicationContext
-        verify(fixture).makeIntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
-        verify(fixture).registerReceiver(context, fixture, intentFilter, ContextCompat.RECEIVER_EXPORTED)
+        verify(mainActivity).registerReceiver(fixture, intentFilter)
     }
 
     @Test
@@ -81,10 +71,8 @@ class ScanResultsReceiverTest {
         // execute
         fixture.unregister()
         // verify
-        verify(mainActivity).applicationContext
+        verify(mainActivity).registerReceiver(fixture, intentFilter)
         verify(mainActivity).unregisterReceiver(fixture)
-        verify(fixture).makeIntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
-        verify(fixture).registerReceiver(context, fixture, intentFilter, ContextCompat.RECEIVER_EXPORTED)
     }
 
     @Test
@@ -95,10 +83,8 @@ class ScanResultsReceiverTest {
         fixture.unregister()
         fixture.unregister()
         // verify
-        verify(mainActivity).applicationContext
+        verify(mainActivity).registerReceiver(fixture, intentFilter)
         verify(mainActivity).unregisterReceiver(fixture)
-        verify(fixture).makeIntentFilter(WifiManager.SCAN_RESULTS_AVAILABLE_ACTION)
-        verify(fixture).registerReceiver(context, fixture, intentFilter, ContextCompat.RECEIVER_EXPORTED)
     }
 
     @Test