Skip to content

Commit 95fe86d

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
cleanup
1 parent 267e189 commit 95fe86d

File tree

4 files changed

+55
-55
lines changed

4 files changed

+55
-55
lines changed

‎app/build.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#Build Properties
2-
#Mon Aug 04 11:58:45 EDT 2025
3-
version_build=27
2+
#Mon Aug 04 12:26:03 EDT 2025
3+
version_build=28
44
version_major=3
55
version_minor=2
66
version_patch=1

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/model/FastRoaming.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,20 @@ import com.vrem.util.buildMinVersionR
2424
import com.vrem.wifianalyzer.R
2525
import java.nio.ByteBuffer
2626

27-
typealias Available = (ie: Int, bytes: ByteBuffer) -> Boolean
27+
typealias Available = (id: Int, bytes: ByteBuffer) -> Boolean
2828

29-
private const val IE_MOBILE_DOMAIN = 54
30-
private const val IE_RM_ENABLED_CAPABILITIES = 70
31-
private const val IE_EXTENDED_CAPABILITIES = 127
32-
private const val IE_VENDOR_SPECIFIC = 221
29+
private const val ID_MOBILE_DOMAIN = 54
30+
private const val ID_RM_ENABLED_CAPABILITIES = 70
31+
private const val ID_EXTENDED_CAPABILITIES = 127
32+
private const val ID_VENDOR_SPECIFIC = 221
3333

3434
/**
3535
* Checks for 802.11k (Radio Resource Management) support.
3636
* Returns true if the Information Element is RM Enabled Capabilities (IE 70)
3737
* and the Neighbor Report bit (bit 1 of the first byte) is set.
3838
*/
39-
internal val available802_11k: Available = { ie: Int, bytes: ByteBuffer ->
40-
ie == IE_RM_ENABLED_CAPABILITIES &&
39+
private val available802_11k: Available = { id: Int, bytes: ByteBuffer ->
40+
id == ID_RM_ENABLED_CAPABILITIES &&
4141
bytes.remaining() > 0 &&
4242
(bytes[0].toInt() and (1 shl 1)) != 0
4343
}
@@ -46,15 +46,15 @@ internal val available802_11k: Available = { ie: Int, bytes: ByteBuffer ->
4646
* Checks for 802.11r (Fast BSS Transition) support.
4747
* Returns true if the Information Element is Mobile Domain IE (IE 54).
4848
*/
49-
internal val available802_11r: Available = { ie: Int, _: ByteBuffer -> ie == IE_MOBILE_DOMAIN }
49+
private val available802_11r: Available = { id: Int, _: ByteBuffer -> id == ID_MOBILE_DOMAIN }
5050

5151
/**
5252
* Checks for 802.11v (BSS Transition Management) support.
5353
* Returns true if the Information Element is Extended Capabilities (IE 127)
5454
* and the BSS Transition bit (bit 3 of the third byte) is set.
5555
*/
56-
internal val available802_11v: Available = { ie: Int, bytes: ByteBuffer ->
57-
ie == IE_EXTENDED_CAPABILITIES &&
56+
private val available802_11v: Available = { id: Int, bytes: ByteBuffer ->
57+
id == ID_EXTENDED_CAPABILITIES &&
5858
bytes.remaining() > 2 &&
5959
(bytes[2].toInt() and (1 shl 3)) != 0
6060
}
@@ -64,8 +64,8 @@ internal val available802_11v: Available = { ie: Int, bytes: ByteBuffer ->
6464
* Returns true if the Information Element is Vendor Specific (IE 221)
6565
* and the first 4 bytes match the OKC OUI and type.
6666
*/
67-
internal val availableOKC: Available = { ie: Int, bytes: ByteBuffer ->
68-
ie == IE_VENDOR_SPECIFIC &&
67+
private val availableOKC: Available = { id: Int, bytes: ByteBuffer ->
68+
id == ID_VENDOR_SPECIFIC &&
6969
bytes.remaining() >= 4 &&
7070
bytes[0] == 0x00.toByte() &&
7171
bytes[1] == 0x0F.toByte() &&

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/model/FastRoamingParameterizedTest.kt‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ import org.robolectric.ParameterizedRobolectricTestRunner
3333
import org.robolectric.annotation.Config
3434
import java.nio.ByteBuffer.wrap
3535

36-
private const val IE_MOBILE_DOMAIN = 54
37-
private const val IE_RM_ENABLED_CAPABILITIES = 70
38-
private const val IE_EXTENDED_CAPABILITIES = 127
39-
private const val IE_VENDOR_SPECIFIC = 221
36+
private const val ID_MOBILE_DOMAIN = 54
37+
private const val ID_RM_ENABLED_CAPABILITIES = 70
38+
private const val ID_EXTENDED_CAPABILITIES = 127
39+
private const val ID_VENDOR_SPECIFIC = 221
4040

4141
@RunWith(ParameterizedRobolectricTestRunner::class)
4242
@Config(sdk = [Build.VERSION_CODES.VANILLA_ICE_CREAM])
@@ -84,92 +84,92 @@ class FastRoamingParameterizedTest(
8484
listOf(
8585
arrayOf(
8686
listOf(FastRoaming.FR_802_11K),
87-
listOf(Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x7F, 0x00, 0x00, 0x00, 0x00).toList())),
87+
listOf(Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x7F, 0x00, 0x00, 0x00, 0x00).toList())),
8888
),
8989
arrayOf(
9090
listOf(FastRoaming.FR_802_11R),
91-
listOf(Element(IE_MOBILE_DOMAIN, byteArrayOf(0x00).toList())),
91+
listOf(Element(ID_MOBILE_DOMAIN, byteArrayOf(0x00).toList())),
9292
),
9393
arrayOf(
9494
listOf(FastRoaming.FR_802_11V),
95-
listOf(Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x00, 0x00, 0x7F).toList())),
95+
listOf(Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x00, 0x00, 0x7F).toList())),
9696
),
9797
arrayOf(
9898
listOf(FastRoaming.FR_OKC),
99-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x12).toList())),
99+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x12).toList())),
100100
),
101101
arrayOf(
102102
FastRoaming.entries.toList(),
103103
listOf(
104-
Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x7F, 0x00, 0x00, 0x00, 0x00).toList()),
105-
Element(IE_MOBILE_DOMAIN, byteArrayOf(0x00).toList(), 3, 3),
106-
Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x00, 0x00, 0x7F).toList(), 2, 2),
107-
Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x12).toList(), 1, 1),
104+
Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x7F, 0x00, 0x00, 0x00, 0x00).toList()),
105+
Element(ID_MOBILE_DOMAIN, byteArrayOf(0x00).toList(), 3, 3),
106+
Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x00, 0x00, 0x7F).toList(), 2, 2),
107+
Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x12).toList(), 1, 1),
108108
),
109109
),
110110
arrayOf(listOf(), listOf()),
111111
arrayOf(listOf(), listOf(Element(0, byteArrayOf().toList()))),
112-
arrayOf(listOf(), listOf(Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf().toList()))),
113-
arrayOf(listOf(), listOf(Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00).toList()))),
114-
arrayOf(listOf(), listOf(Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F).toList()))),
115-
arrayOf(listOf(), listOf(Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F).toList()))),
112+
arrayOf(listOf(), listOf(Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf().toList()))),
113+
arrayOf(listOf(), listOf(Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00).toList()))),
114+
arrayOf(listOf(), listOf(Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F).toList()))),
115+
arrayOf(listOf(), listOf(Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F).toList()))),
116116
arrayOf(
117117
listOf(),
118-
listOf(Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F, 0x7F).toList())),
118+
listOf(Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F, 0x7F).toList())),
119119
),
120120
arrayOf(
121121
listOf(),
122-
listOf(Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F, 0x7F, 0x7F).toList())),
122+
listOf(Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F, 0x7F, 0x7F).toList())),
123123
),
124124
arrayOf(
125125
listOf(),
126126
listOf(
127-
Element(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F).toList()),
127+
Element(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x00, 0x7F, 0x7F, 0x7F, 0x7F, 0x7F).toList()),
128128
),
129129
),
130-
arrayOf(listOf(), listOf(Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x00).toList()))),
131-
arrayOf(listOf(), listOf(Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x7F).toList()))),
132-
arrayOf(listOf(), listOf(Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F).toList()))),
133-
arrayOf(listOf(), listOf(Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F, 0x00).toList()))),
130+
arrayOf(listOf(), listOf(Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x00).toList()))),
131+
arrayOf(listOf(), listOf(Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x7F).toList()))),
132+
arrayOf(listOf(), listOf(Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F).toList()))),
133+
arrayOf(listOf(), listOf(Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F, 0x00).toList()))),
134134
arrayOf(
135135
listOf(),
136-
listOf(Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F, 0x00, 0x7F).toList())),
136+
listOf(Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F, 0x00, 0x7F).toList())),
137137
),
138138
arrayOf(
139139
listOf(),
140-
listOf(Element(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F, 0x00, 0x7F, 0x7F).toList())),
140+
listOf(Element(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x7F, 0x7F, 0x00, 0x7F, 0x7F).toList())),
141141
),
142142
arrayOf(
143143
listOf(),
144-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf().toList())),
144+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf().toList())),
145145
),
146146
arrayOf(
147147
listOf(),
148-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00).toList())),
148+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00).toList())),
149149
),
150150
arrayOf(
151151
listOf(),
152-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F).toList())),
152+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F).toList())),
153153
),
154154
arrayOf(
155155
listOf(),
156-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte()).toList())),
156+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte()).toList())),
157157
),
158158
arrayOf(
159159
listOf(),
160-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x01, 0x0F, 0xAC.toByte(), 0x12).toList())),
160+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x01, 0x0F, 0xAC.toByte(), 0x12).toList())),
161161
),
162162
arrayOf(
163163
listOf(),
164-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x01, 0xAC.toByte(), 0x12).toList())),
164+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x01, 0xAC.toByte(), 0x12).toList())),
165165
),
166166
arrayOf(
167167
listOf(),
168-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAD.toByte(), 0x12).toList())),
168+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAD.toByte(), 0x12).toList())),
169169
),
170170
arrayOf(
171171
listOf(),
172-
listOf(Element(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x13).toList())),
172+
listOf(Element(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x13).toList())),
173173
),
174174
)
175175
}

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/scanner/TransformerTest.kt‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,20 +43,20 @@ import org.mockito.kotlin.whenever
4343
import org.robolectric.annotation.Config
4444
import java.nio.ByteBuffer
4545

46-
private const val IE_MOBILE_DOMAIN = 54
47-
private const val IE_RM_ENABLED_CAPABILITIES = 70
48-
private const val IE_EXTENDED_CAPABILITIES = 127
49-
private const val IE_VENDOR_SPECIFIC = 221
46+
private const val ID_MOBILE_DOMAIN = 54
47+
private const val ID_RM_ENABLED_CAPABILITIES = 70
48+
private const val ID_EXTENDED_CAPABILITIES = 127
49+
private const val ID_VENDOR_SPECIFIC = 221
5050

5151
@RunWith(AndroidJUnit4::class)
5252
@Config(sdk = [Build.VERSION_CODES.VANILLA_ICE_CREAM])
5353
class TransformerTest {
5454
private val informationElement1 =
55-
withInformationElement(IE_RM_ENABLED_CAPABILITIES, byteArrayOf(0x7F, 0x00, 0x00, 0x00, 0x00))
56-
private val informationElement2 = withInformationElement(IE_EXTENDED_CAPABILITIES, byteArrayOf(0x00, 0x00, 0x7F))
57-
private val informationElement3 = withInformationElement(IE_MOBILE_DOMAIN, byteArrayOf())
55+
withInformationElement(ID_RM_ENABLED_CAPABILITIES, byteArrayOf(0x7F, 0x00, 0x00, 0x00, 0x00))
56+
private val informationElement2 = withInformationElement(ID_EXTENDED_CAPABILITIES, byteArrayOf(0x00, 0x00, 0x7F))
57+
private val informationElement3 = withInformationElement(ID_MOBILE_DOMAIN, byteArrayOf())
5858
private val informationElement4 =
59-
withInformationElement(IE_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x12))
59+
withInformationElement(ID_VENDOR_SPECIFIC, byteArrayOf(0x00, 0x0F, 0xAC.toByte(), 0x12))
6060

6161
private val scanResult1 =
6262
withScanResult(SSID_1, BSSID_1, WiFiWidth.MHZ_160, WiFiStandard.AX, WiFiSecurityTypeTest.All)

0 commit comments

Comments
 (0)