minor cleanup

VREMSoftwareDevelopment · Feb 17, 2024 · c87b9ac · c87b9ac
1 parent 4093b1f
commit c87b9ac
Show file tree

Hide file tree

Showing 10 changed files with 42 additions and 87 deletions.
diff --git a/app/build.properties b/app/build.properties
@@ -1,6 +1,6 @@
 #Build Properties
-#Sat Feb 17 09:31:26 EST 2024
-version_build=10
+#Sat Feb 17 09:56:58 EST 2024
+version_build=11
 version_major=3
 version_minor=1
 version_patch=2

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/export/Export.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/export/Export.kt
@@ -32,21 +32,21 @@ import java.util.Locale
 class Export(private val exportIntent: ExportIntent = ExportIntent()) {
 
     private val header = "Time Stamp|" +
-            "SSID|" +
-            "BSSID|" +
-            "Strength|" +
-            "Primary Channel|" +
-            "Primary Frequency|" +
-            "Center Channel|" +
-            "Center Frequency|" +
-            "Width (Range)|" +
-            "Distance|" +
-            "Timestamp|" +
-            "802.11mc|" +
-            "Security|" +
-            "Standard|" +
-            "FastRoaming" +
-            "\n"
+        "SSID|" +
+        "BSSID|" +
+        "Strength|" +
+        "Primary Channel|" +
+        "Primary Frequency|" +
+        "Center Channel|" +
+        "Center Frequency|" +
+        "Width (Range)|" +
+        "Distance|" +
+        "Timestamp|" +
+        "802.11mc|" +
+        "Security|" +
+        "Standard|" +
+        "FastRoaming" +
+        "\n"
 
     fun export(mainActivity: MainActivity, wiFiDetails: List<WiFiDetail>): Intent =
         export(mainActivity, wiFiDetails, Date())
@@ -72,21 +72,21 @@ class Export(private val exportIntent: ExportIntent = ExportIntent()) {
     private fun toExportString(context: Context, timestamp: String): (WiFiDetail) -> String = {
         with(it) {
             "$timestamp|" +
-                    "${wiFiIdentifier.ssid}|" +
-                    "${wiFiIdentifier.bssid}|" +
-                    "${wiFiSignal.level}dBm|" +
-                    "${wiFiSignal.primaryWiFiChannel.channel}|" +
-                    "${wiFiSignal.primaryFrequency}$FREQUENCY_UNITS|" +
-                    "${wiFiSignal.centerWiFiChannel.channel}|" +
-                    "${wiFiSignal.centerFrequency}$FREQUENCY_UNITS|" +
-                    "${wiFiSignal.wiFiWidth.frequencyWidth}$FREQUENCY_UNITS (${wiFiSignal.frequencyStart} - ${wiFiSignal.frequencyEnd})|" +
-                    "${wiFiSignal.distance}|" +
-                    "${wiFiSignal.extra.timestamp}|" +
-                    "${wiFiSignal.extra.is80211mc}|" +
-                    wiFiSecurity.capabilities + "|" +
-                    wiFiSignal.extra.wiFiStandardDisplay(context) + "|" +
-                    wiFiSignal.extra.fastRoamingDisplay(context) +
-                    "\n"
+                "${wiFiIdentifier.ssid}|" +
+                "${wiFiIdentifier.bssid}|" +
+                "${wiFiSignal.level}dBm|" +
+                "${wiFiSignal.primaryWiFiChannel.channel}|" +
+                "${wiFiSignal.primaryFrequency}$FREQUENCY_UNITS|" +
+                "${wiFiSignal.centerWiFiChannel.channel}|" +
+                "${wiFiSignal.centerFrequency}$FREQUENCY_UNITS|" +
+                "${wiFiSignal.wiFiWidth.frequencyWidth}$FREQUENCY_UNITS (${wiFiSignal.frequencyStart} - ${wiFiSignal.frequencyEnd})|" +
+                "${wiFiSignal.distance}|" +
+                "${wiFiSignal.extra.timestamp}|" +
+                "${wiFiSignal.extra.is80211mc}|" +
+                wiFiSecurity.capabilities + "|" +
+                wiFiSignal.extra.wiFiStandardDisplay(context) + "|" +
+                wiFiSignal.extra.fastRoamingDisplay(context) +
+                "\n"
         }
     }
 

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenu.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/navigation/NavigationMenu.kt
@@ -20,22 +20,8 @@ package com.vrem.wifianalyzer.navigation
 import android.view.MenuItem
 import com.vrem.wifianalyzer.MainActivity
 import com.vrem.wifianalyzer.R
-import com.vrem.wifianalyzer.navigation.availability.NavigationOption
-import com.vrem.wifianalyzer.navigation.availability.navigationOptionAp
-import com.vrem.wifianalyzer.navigation.availability.navigationOptionOff
-import com.vrem.wifianalyzer.navigation.availability.navigationOptionOther
-import com.vrem.wifianalyzer.navigation.availability.navigationOptionRating
-import com.vrem.wifianalyzer.navigation.availability.navigationOptionWiFiSwitchOn
-import com.vrem.wifianalyzer.navigation.items.NavigationItem
-import com.vrem.wifianalyzer.navigation.items.navigationItemAbout
-import com.vrem.wifianalyzer.navigation.items.navigationItemAccessPoints
-import com.vrem.wifianalyzer.navigation.items.navigationItemChannelAvailable
-import com.vrem.wifianalyzer.navigation.items.navigationItemChannelGraph
-import com.vrem.wifianalyzer.navigation.items.navigationItemChannelRating
-import com.vrem.wifianalyzer.navigation.items.navigationItemExport
-import com.vrem.wifianalyzer.navigation.items.navigationItemSettings
-import com.vrem.wifianalyzer.navigation.items.navigationItemTimeGraph
-import com.vrem.wifianalyzer.navigation.items.navigationItemVendors
+import com.vrem.wifianalyzer.navigation.availability.*
+import com.vrem.wifianalyzer.navigation.items.*
 
 enum class NavigationMenu(
     val icon: Int,

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/settings/Settings.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/settings/Settings.kt
@@ -19,13 +19,7 @@ package com.vrem.wifianalyzer.settings
 
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener
 import com.vrem.annotation.OpenClass
-import com.vrem.util.buildMinVersionQ
-import com.vrem.util.defaultCountryCode
-import com.vrem.util.defaultLanguageTag
-import com.vrem.util.findByLanguageTag
-import com.vrem.util.findOne
-import com.vrem.util.findSet
-import com.vrem.util.ordinals
+import com.vrem.util.*
 import com.vrem.wifianalyzer.R
 import com.vrem.wifianalyzer.navigation.NavigationGroup
 import com.vrem.wifianalyzer.navigation.NavigationMenu

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphView.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelgraph/ChannelGraphView.kt
@@ -28,13 +28,7 @@ import com.vrem.wifianalyzer.settings.ThemeStyle
 import com.vrem.wifianalyzer.wifi.band.WiFiBand
 import com.vrem.wifianalyzer.wifi.band.WiFiChannelPair
 import com.vrem.wifianalyzer.wifi.band.WiFiChannels
-import com.vrem.wifianalyzer.wifi.graphutils.GraphDataPoint
-import com.vrem.wifianalyzer.wifi.graphutils.GraphViewBuilder
-import com.vrem.wifianalyzer.wifi.graphutils.GraphViewNotifier
-import com.vrem.wifianalyzer.wifi.graphutils.GraphViewWrapper
-import com.vrem.wifianalyzer.wifi.graphutils.MIN_Y
-import com.vrem.wifianalyzer.wifi.graphutils.THICKNESS_INVISIBLE
-import com.vrem.wifianalyzer.wifi.graphutils.transparent
+import com.vrem.wifianalyzer.wifi.graphutils.*
 import com.vrem.wifianalyzer.wifi.model.WiFiData
 import com.vrem.wifianalyzer.wifi.predicate.Predicate
 import com.vrem.wifianalyzer.wifi.predicate.makeOtherPredicate

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapter.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/channelrating/ChannelRatingAdapter.kt
@@ -32,12 +32,8 @@ import com.vrem.wifianalyzer.R
 import com.vrem.wifianalyzer.databinding.ChannelRatingDetailsBinding
 import com.vrem.wifianalyzer.wifi.band.WiFiBand
 import com.vrem.wifianalyzer.wifi.band.WiFiChannel
-import com.vrem.wifianalyzer.wifi.model.ChannelRating
-import com.vrem.wifianalyzer.wifi.model.SortBy
-import com.vrem.wifianalyzer.wifi.model.Strength
+import com.vrem.wifianalyzer.wifi.model.*
 import com.vrem.wifianalyzer.wifi.model.Strength.Companion.reverse
-import com.vrem.wifianalyzer.wifi.model.WiFiData
-import com.vrem.wifianalyzer.wifi.model.WiFiDetail
 import com.vrem.wifianalyzer.wifi.predicate.Predicate
 import com.vrem.wifianalyzer.wifi.predicate.predicate
 import com.vrem.wifianalyzer.wifi.scanner.UpdateNotifier

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/FastRoaming.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/FastRoaming.kt
@@ -40,14 +40,14 @@ typealias Available = (id: Int, bytes: ByteBuffer) -> Boolean
 
 private val available802_11k: Available = { id: Int, bytes: ByteBuffer ->
     RM_ENABLED_CAPABILITIES_IE == id &&
-            bytes.contains(NEIGHBOR_REPORT_IDX, NEIGHBOR_REPORT_BIT)
+        bytes.contains(NEIGHBOR_REPORT_IDX, NEIGHBOR_REPORT_BIT)
 }
 private val available802_11r: Available = { id: Int, _: ByteBuffer ->
     MOBILE_DOMAIN_IE == id
 }
 private val available802_11v: Available = { id: Int, bytes: ByteBuffer ->
     EXTENDED_CAPABILITIES_IE == id &&
-            bytes.contains(BSS_TRANSITION_IDX, BSS_TRANSITION_BIT)
+        bytes.contains(BSS_TRANSITION_IDX, BSS_TRANSITION_BIT)
 }
 
 enum class FastRoaming(@StringRes val textResource: Int, val available: Available) {

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
@@ -29,6 +29,7 @@ import com.vrem.wifianalyzer.MainActivity
 fun interface Callback { // Compliant, function interface used
     fun onSuccess()
 }
+
 @OpenClass
 internal class ScanResultsReceiver(private val mainActivity: MainActivity, private val callback: Callback) :
     BroadcastReceiver() {

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Transformer.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Transformer.kt
@@ -21,19 +21,7 @@ import android.net.wifi.WifiInfo
 import com.vrem.annotation.OpenClass
 import com.vrem.util.nullToEmpty
 import com.vrem.util.ssid
-import com.vrem.wifianalyzer.wifi.model.FastRoaming
-import com.vrem.wifianalyzer.wifi.model.WiFiConnection
-import com.vrem.wifianalyzer.wifi.model.WiFiData
-import com.vrem.wifianalyzer.wifi.model.WiFiDetail
-import com.vrem.wifianalyzer.wifi.model.WiFiIdentifier
-import com.vrem.wifianalyzer.wifi.model.WiFiSecurity
-import com.vrem.wifianalyzer.wifi.model.WiFiSecurityType
-import com.vrem.wifianalyzer.wifi.model.WiFiSignal
-import com.vrem.wifianalyzer.wifi.model.WiFiSignalExtra
-import com.vrem.wifianalyzer.wifi.model.WiFiStandard
-import com.vrem.wifianalyzer.wifi.model.WiFiWidth
-import com.vrem.wifianalyzer.wifi.model.convertIpV4Address
-import com.vrem.wifianalyzer.wifi.model.convertSSID
+import com.vrem.wifianalyzer.wifi.model.*
 
 @Suppress("DEPRECATION")
 fun WifiInfo.ipV4Address(): Int = ipAddress

diff --git a/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/DataManager.kt b/app/src/main/kotlin/com/vrem/wifianalyzer/wifi/timegraph/DataManager.kt
@@ -19,11 +19,7 @@ package com.vrem.wifianalyzer.wifi.timegraph
 
 import com.jjoe64.graphview.series.LineGraphSeries
 import com.vrem.annotation.OpenClass
-import com.vrem.wifianalyzer.wifi.graphutils.GraphDataPoint
-import com.vrem.wifianalyzer.wifi.graphutils.GraphViewWrapper
-import com.vrem.wifianalyzer.wifi.graphutils.MAX_SCAN_COUNT
-import com.vrem.wifianalyzer.wifi.graphutils.MIN_Y
-import com.vrem.wifianalyzer.wifi.graphutils.MIN_Y_OFFSET
+import com.vrem.wifianalyzer.wifi.graphutils.*
 import com.vrem.wifianalyzer.wifi.model.WiFiDetail
 
 @OpenClass