improve Wi-Fi channel handling

Author: VREMSoftwareDevelopment

app/build.properties

@@ -1,6 +1,6 @@
 #Build Properties
-#Sun Mar 30 17:46:54 EDT 2025
-version_build=2
+#Mon Mar 31 19:38:42 EDT 2025
+version_build=3
 version_major=3
 version_minor=2
 version_patch=0

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

@@ -17,15 +17,15 @@
  */
 package com.vrem.util
 
-import android.annotation.TargetApi
 import android.content.Context
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager.PackageInfoFlags
 import android.content.res.Configuration
 import android.content.res.Resources
 import android.net.wifi.ScanResult
 import android.os.Build
-import java.util.*
+import androidx.annotation.RequiresApi
+import java.util.Locale
 
 fun Context.createContext(newLocale: Locale): Context {
     val resources: Resources = resources
@@ -41,7 +41,7 @@ fun Context.packageInfo(): PackageInfo =
         packageInfoLegacy()
     }
 
-@TargetApi(Build.VERSION_CODES.TIRAMISU)
+@RequiresApi(Build.VERSION_CODES.TIRAMISU)
 private fun Context.packageInfoAndroidT(): PackageInfo =
     packageManager.getPackageInfo(packageName, PackageInfoFlags.of(0))
 
@@ -55,7 +55,7 @@ fun ScanResult.ssid(): String =
         ssidLegacy()
     }.removeSurrounding("\"")
 
-@TargetApi(Build.VERSION_CODES.TIRAMISU)
+@RequiresApi(Build.VERSION_CODES.TIRAMISU)
 private fun ScanResult.ssidAndroidT(): String = String.nullToEmpty(wifiSsid?.toString())
 
 @Suppress("DEPRECATION")

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

@@ -17,11 +17,11 @@
  */
 package com.vrem.wifianalyzer
 
-import android.annotation.TargetApi
 import android.content.Intent
 import android.os.Build
 import android.provider.Settings
 import android.view.WindowManager
+import androidx.annotation.RequiresApi
 import androidx.appcompat.widget.Toolbar
 
 internal fun MainActivity.keepScreenOn() =
@@ -43,7 +43,7 @@ internal fun MainActivity.setupToolbar(): Toolbar {
 
 internal fun makeIntent(action: String): Intent = Intent(action)
 
-@TargetApi(Build.VERSION_CODES.Q)
+@RequiresApi(Build.VERSION_CODES.Q)
 internal fun MainActivity.startWiFiSettings() =
     this.startActivity(makeIntent(Settings.Panel.ACTION_WIFI))
 

app/src/main/kotlin/com/vrem/wifianalyzer/about/AboutFragment.kt

@@ -23,7 +23,6 @@ import android.content.ActivityNotFoundException
 import android.content.Intent
 import android.content.pm.PackageInfo
 import android.content.pm.PackageManager.NameNotFoundException
-import android.net.Uri
 import android.os.Build
 import android.os.Bundle
 import android.view.LayoutInflater
@@ -32,6 +31,7 @@ import android.view.ViewGroup
 import android.widget.TextView
 import android.widget.Toast
 import androidx.core.content.pm.PackageInfoCompat
+import androidx.core.net.toUri
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentActivity
 import com.vrem.util.EMPTY
@@ -129,7 +129,7 @@ class AboutFragment : Fragment() {
     private class WriteReviewClickListener(private val activity: Activity) : View.OnClickListener {
         override fun onClick(view: View) {
             val url = "market://details?id=" + activity.applicationContext.packageName
-            val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url))
+            val intent = Intent(Intent.ACTION_VIEW, url.toUri())
             try {
                 activity.startActivity(intent)
             } catch (e: ActivityNotFoundException) {

app/src/main/kotlin/com/vrem/wifianalyzer/export/Export.kt

@@ -78,7 +78,7 @@ class Export(private val exportIntent: ExportIntent = ExportIntent()) {
                 "${wiFiSignal.primaryFrequency}$FREQUENCY_UNITS|" +
                 "${wiFiSignal.centerWiFiChannel.channel}|" +
                 "${wiFiSignal.centerFrequency}$FREQUENCY_UNITS|" +
-                    "${wiFiSignal.wiFiWidth.frequencyWidth}$FREQUENCY_UNITS (${wiFiSignal.wiFiChannelStart.frequency} - ${wiFiSignal.wiFiChannelEnd.frequency})|" +
+                "${wiFiSignal.wiFiWidth.frequencyWidth}$FREQUENCY_UNITS (${wiFiSignal.wiFiChannelStart.frequency} - ${wiFiSignal.wiFiChannelEnd.frequency})|" +
                 "${wiFiSignal.distance}|" +
                 "${wiFiSignal.extra.is80211mc}|" +
                 wiFiSecurity.capabilities + "|" +

app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenuController.kt

@@ -19,6 +19,8 @@ package com.vrem.wifianalyzer.navigation
 
 import android.view.Menu
 import android.view.MenuItem
+import androidx.core.view.get
+import androidx.core.view.size
 import com.google.android.material.bottomnavigation.BottomNavigationView
 import com.google.android.material.navigation.NavigationView
 import com.vrem.annotation.OpenClass
@@ -33,7 +35,7 @@ class NavigationMenuController(
 
     private lateinit var currentNavigationMenu: NavigationMenu
 
-    fun currentMenuItem(): MenuItem = navigationView.menu.getItem(currentNavigationMenu.ordinal)
+    fun currentMenuItem(): MenuItem = navigationView.menu[currentNavigationMenu.ordinal]
 
     fun currentNavigationMenu(): NavigationMenu = currentNavigationMenu
 
@@ -44,8 +46,8 @@ class NavigationMenuController(
     }
 
     private fun selectCurrentMenuItem(navigationMenu: NavigationMenu, menu: Menu) {
-        for (i in 0 until menu.size()) {
-            val menuItem: MenuItem = menu.getItem(i)
+        for (i in 0 until menu.size) {
+            val menuItem: MenuItem = menu[i]
             menuItem.isCheckable = false
             menuItem.isChecked = false
         }

app/src/main/kotlin/com/vrem/wifianalyzer/permission/LocationPermission.kt

@@ -17,10 +17,10 @@
  */
 package com.vrem.wifianalyzer.permission
 
-import android.annotation.TargetApi
 import android.app.Activity
 import android.location.LocationManager
 import android.os.Build
+import androidx.annotation.RequiresApi
 import com.vrem.annotation.OpenClass
 import com.vrem.util.buildMinVersionP
 
@@ -54,7 +54,7 @@ class LocationPermission(private val activity: Activity) {
             false
         }
 
-    @TargetApi(Build.VERSION_CODES.P)
+    @RequiresApi(Build.VERSION_CODES.P)
     private fun locationEnabled(locationManager: LocationManager): Boolean =
         try {
             locationManager.isLocationEnabled

app/src/main/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/ConnectionView.kt

@@ -21,6 +21,7 @@ import android.net.wifi.WifiInfo
 import android.view.View
 import android.view.ViewGroup
 import android.widget.TextView
+import androidx.core.view.isEmpty
 import com.vrem.wifianalyzer.MainActivity
 import com.vrem.wifianalyzer.MainContext
 import com.vrem.wifianalyzer.R
@@ -64,7 +65,7 @@ class ConnectionView(
             val parent = connectionView.findViewById<ViewGroup>(R.id.connectionDetail)
             val view =
                 accessPointDetail.makeView(parent.getChildAt(0), parent, connection, layout = connectionViewType.layout)
-            if (parent.childCount == 0) {
+            if (parent.isEmpty()) {
                 parent.addView(view)
             }
             setViewConnection(connectionView, wiFiConnection)

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

@@ -20,145 +20,6 @@ package com.vrem.wifianalyzer.wifi.band
 import com.vrem.util.EMPTY
 import com.vrem.wifianalyzer.wifi.model.WiFiWidth
 
-internal const val FREQUENCY_SPREAD = 5
-
-typealias WiFiRange = Pair<Int, Int>
-typealias WiFiChannelPair = Pair<WiFiChannel, WiFiChannel>
-
-private val countriesETSI = listOf(
-    "AT",
-    "BE",
-    "CH",
-    "CY",
-    "CZ",
-    "DE",
-    "DK",
-    "EE",
-    "ES",
-    "FI",
-    "FR",
-    "GR",
-    "HU",
-    "IE",
-    "IS",
-    "IT",
-    "LI",
-    "LT",
-    "LU",
-    "LV",
-    "MT",
-    "NL",
-    "NO",
-    "PL",
-    "PT",
-    "RO",
-    "SE",
-    "SI",
-    "SK",
-    "IL"
-)
-
-private fun excludeGHZ6(): List<Map<String, List<Int>>> {
-    val exclude = (97..223).toList()
-    val additional = listOf("JP", "RU", "NZ", "AU", "GL", "AE", "GB", "MX", "SG", "HK", "MO", "PH")
-    return (countriesETSI + additional).map { mapOf(it to exclude) }
-}
-
-private fun excludeGHZ5(): List<Map<String, List<Int>>> {
-    val exclude1 = listOf(177)
-    val exclude2 = (120..128).toList()
-    val exclude3 = (169..177).toList()
-    val exclude4 = (96..128).toList()
-    val exclude5 = (173..177).toList()
-    val exclude6 = (149..177).toList()
-    val exclude7 = (96..144).toList()
-    val exclude8 = listOf(144)
-    val exclude9 = (165..177).toList()
-    val additional = listOf(
-        "AU" to exclude2 + exclude1,
-        "CA" to exclude2 + exclude3,
-        "UK" to exclude2 + exclude1,
-        "RU" to exclude4 + exclude5,
-        "JP" to exclude4 + exclude6,
-        "IN" to exclude1,
-        "SG" to exclude3,
-        "CH" to exclude7 + exclude3,
-        "IL" to exclude1,
-        "KR" to exclude3,
-        "TR" to exclude8 + exclude6,
-        "ZA" to exclude8 + exclude6,
-        "BR" to exclude3,
-        "TW" to exclude3,
-        "NZ" to exclude3,
-        "BH" to exclude7 + exclude3,
-        "VN" to exclude3,
-        "ID" to exclude7 + exclude9,
-        "PH" to exclude5
-    )
-    return countriesETSI.map { mapOf(it to exclude1) } + additional.map { mapOf(it.first to it.second) }
-}
-
-
-val wiFiChannelsGHZ2: WiFiChannels = WiFiChannels(
-    WiFiChannelPair(WiFiChannel(-1, 2402), WiFiChannel(15, 2482)),
-    1,
-    mapOf(
-        (WiFiWidth.MHZ_20 to listOf(1, 2, 3, 6, 7, 8, 11, 12, 13)),
-        (WiFiWidth.MHZ_40 to listOf(3, 7, 11))
-    ),
-    (1..13).associate { it to "$it" },
-    listOf(1, 2, 3, 6, 7, 8, 11, 12, 13)
-)
-
-val wiFiChannelsGHZ5: WiFiChannels = WiFiChannels(
-    WiFiChannelPair(WiFiChannel(30, 5150), WiFiChannel(184, 5920)),
-    2,
-    mapOf(
-        (WiFiWidth.MHZ_20 to ((32..144 step WiFiWidth.MHZ_20.step) + (149..177 step WiFiWidth.MHZ_20.step))),
-        (WiFiWidth.MHZ_40 to ((38..142 step WiFiWidth.MHZ_40.step) + (151..175 step WiFiWidth.MHZ_40.step))),
-        (WiFiWidth.MHZ_80 to ((42..138 step WiFiWidth.MHZ_80.step) + (155..171 step WiFiWidth.MHZ_80.step))),
-        (WiFiWidth.MHZ_160 to ((50..114 step WiFiWidth.MHZ_160.step) + 163))
-    ),
-    listOf(34, 50, 66, 82, 98, 113, 129, 147, 163, 178).associateWith {
-        when (it) {
-            113 -> "114"
-            129 -> "130"
-            178 -> "179"
-            else -> "$it"
-        }
-    },
-    ((42..138 step WiFiWidth.MHZ_80.step) + (155..171 step WiFiWidth.MHZ_80.step) +
-            (50..114 step WiFiWidth.MHZ_160.step) + 163)
-        .toSortedSet()
-        .toList(),
-    excludeGHZ5()
-)
-
-val wiFiChannelsGHZ6: WiFiChannels = WiFiChannels(
-    WiFiChannelPair(WiFiChannel(-5, 5925), WiFiChannel(235, 7125)),
-    2,
-    mapOf(
-        (WiFiWidth.MHZ_20 to (1..233 step WiFiWidth.MHZ_20.step).toList()),
-        (WiFiWidth.MHZ_40 to (3..227 step WiFiWidth.MHZ_40.step).toList()),
-        (WiFiWidth.MHZ_80 to (7..215 step WiFiWidth.MHZ_80.step).toList()),
-        (WiFiWidth.MHZ_160 to (15..207 step WiFiWidth.MHZ_160.step).toList()),
-        (WiFiWidth.MHZ_320 to (31..191 step WiFiWidth.MHZ_320.step).toList())
-    ),
-    listOf(1, 31, 63, 95, 128, 160, 192, 222).associateWith {
-        when (it) {
-            128 -> "127"
-            160 -> "159"
-            192 -> "191"
-            222 -> "223"
-            else -> "$it"
-        }
-    },
-    ((15..207 step WiFiWidth.MHZ_160.step) + (31..191 step WiFiWidth.MHZ_320.step))
-        .toSortedSet()
-        .toList(),
-    excludeGHZ6()
-)
-
 class WiFiChannels(
     val channelRange: WiFiChannelPair,
     val offset: Int,
@@ -171,6 +32,12 @@ class WiFiChannels(
     fun availableChannels(wiFiBand: WiFiBand, countryCode: String): List<WiFiChannel> =
         WiFiChannelCountry.find(countryCode).channels(wiFiBand).map { wiFiChannelByChannel(it) }
 
+    fun availableChannels(wiFiWidth: WiFiWidth, countryCode: String): List<Int> =
+        activeChannels[wiFiWidth]
+            .orEmpty()
+            .subtract(excludeChannels.flatMap { it[countryCode] ?: emptyList() })
+            .toList()
+
     fun inRange(frequency: Int): Boolean = frequency in channelRange.first.frequency..channelRange.second.frequency
 
     fun wiFiChannelByFrequency(frequency: Int): WiFiChannel =
@@ -183,6 +50,9 @@ class WiFiChannels(
             WiFiChannel.UNKNOWN
         }
 
+    fun wiFiWidthByChannel(channel: Int): WiFiWidth =
+        activeChannels.entries.firstOrNull { it.value.contains(channel) }?.key ?: WiFiWidth.MHZ_20
+
     fun graphChannelCount(): Int = (channelRange.second.channel - channelRange.first.channel + 1) / offset
 
     fun graphChannelByFrequency(frequency: Int): String =