cleanup

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sun Mar 23 19:35:05 EDT 2025
-version_build=8
+#Sun Mar 23 19:56:25 EDT 2025
+version_build=9
 version_major=3
 version_minor=1
 version_patch=4

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannels.kt

@@ -55,7 +55,9 @@ abstract class WiFiChannels(private val wiFiRange: WiFiRange, private val wiFiCh
     abstract fun availableChannels(countryCode: String): List<WiFiChannel>
     abstract fun channelAvailable(countryCode: String, channel: Int): Boolean
     abstract fun wiFiChannelPairs(): List<WiFiChannelPair>
-    abstract fun wiFiChannelByFrequency(frequency: Int, wiFiChannelPair: WiFiChannelPair): WiFiChannel
+    
+    fun wiFiChannelByFrequency(frequency: Int, wiFiChannelPair: WiFiChannelPair): WiFiChannel =
+        if (inRange(frequency)) wiFiChannel(frequency, wiFiChannelPair) else WiFiChannel.UNKNOWN
 
     fun availableChannels(channels: Set<Int>): List<WiFiChannel> = channels.map { this.wiFiChannelByChannel(it) }
 

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannelsGHZ2.kt

@@ -26,9 +26,6 @@ class WiFiChannelsGHZ2 : WiFiChannels(RANGE, SETS) {
     override fun channelAvailable(countryCode: String, channel: Int): Boolean =
         WiFiChannelCountry.find(countryCode).channelAvailableGHZ2(channel)
 
-    override fun wiFiChannelByFrequency(frequency: Int, wiFiChannelPair: WiFiChannelPair): WiFiChannel =
-        if (inRange(frequency)) wiFiChannel(frequency, SET) else WiFiChannel.UNKNOWN
-
     companion object {
         private val RANGE: WiFiRange = WiFiRange(2400, 2499)
         private val SETS: List<WiFiChannelPair> = listOf(

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannelsGHZ5.kt

@@ -26,9 +26,6 @@ class WiFiChannelsGHZ5 : WiFiChannels(RANGE, SETS) {
     override fun channelAvailable(countryCode: String, channel: Int): Boolean =
         WiFiChannelCountry.find(countryCode).channelAvailableGHZ5(channel)
 
-    override fun wiFiChannelByFrequency(frequency: Int, wiFiChannelPair: WiFiChannelPair): WiFiChannel =
-        if (inRange(frequency)) wiFiChannel(frequency, wiFiChannelPair) else WiFiChannel.UNKNOWN
-
     companion object {
         private val SET1 = WiFiChannelPair(WiFiChannel(36, 5180), WiFiChannel(64, 5320))
         private val SET2 = WiFiChannelPair(WiFiChannel(100, 5500), WiFiChannel(144, 5720))

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/band/WiFiChannelsGHZ6.kt

@@ -26,9 +26,6 @@ class WiFiChannelsGHZ6 : WiFiChannels(RANGE, SETS) {
     override fun channelAvailable(countryCode: String, channel: Int): Boolean =
         WiFiChannelCountry.find(countryCode).channelAvailableGHZ6(channel)
 
-    override fun wiFiChannelByFrequency(frequency: Int, wiFiChannelPair: WiFiChannelPair): WiFiChannel =
-        if (inRange(frequency)) wiFiChannel(frequency, wiFiChannelPair) else WiFiChannel.UNKNOWN
-
     companion object {
         private val SET = WiFiChannelPair(WiFiChannel(1, 5955), WiFiChannel(229, 7095))
         private val SETS = listOf(SET)