Skip to content

Commit b03837e

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
remove timestamp
1 parent c80b8db commit b03837e

File tree

12 files changed

+57
-79
lines changed

12 files changed

+57
-79
lines changed

‎app/build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dependencies {
4444
testImplementation 'junit:junit:4.13.2'
4545
testImplementation 'org.mockito:mockito-core:5.11.0'
4646
testImplementation 'org.mockito.kotlin:mockito-kotlin:5.2.1'
47-
testImplementation 'org.robolectric:robolectric:4.11.1'
47+
testImplementation 'org.robolectric:robolectric:4.12.1'
4848
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
4949
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
5050
testImplementation 'org.slf4j:slf4j-simple:2.0.12'

‎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-
#Sat Mar 23 10:01:16 EDT 2024
3-
version_build=15
2+
#Sun Apr 07 12:03:31 EDT 2024
3+
version_build=16
44
version_major=3
55
version_minor=1
66
version_patch=2

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ class Export(private val exportIntent: ExportIntent = ExportIntent()) {
4141
"Center Frequency|" +
4242
"Width (Range)|" +
4343
"Distance|" +
44-
"Timestamp|" +
4544
"802.11mc|" +
4645
"Security|" +
4746
"Standard|" +
@@ -81,7 +80,6 @@ class Export(private val exportIntent: ExportIntent = ExportIntent()) {
8180
"${wiFiSignal.centerFrequency}$FREQUENCY_UNITS|" +
8281
"${wiFiSignal.wiFiWidth.frequencyWidth}$FREQUENCY_UNITS (${wiFiSignal.frequencyStart} - ${wiFiSignal.frequencyEnd})|" +
8382
"${wiFiSignal.distance}|" +
84-
"${wiFiSignal.extra.timestamp}|" +
8583
"${wiFiSignal.extra.is80211mc}|" +
8684
wiFiSecurity.capabilities + "|" +
8785
wiFiSignal.extra.wiFiStandardDisplay(context) + "|" +

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

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,12 @@ import android.widget.TextView
2424
import androidx.annotation.LayoutRes
2525
import androidx.core.content.ContextCompat
2626
import com.vrem.annotation.OpenClass
27-
import com.vrem.util.EMPTY
2827
import com.vrem.wifianalyzer.MainContext
2928
import com.vrem.wifianalyzer.R
3029
import com.vrem.wifianalyzer.wifi.model.WiFiAdditional
3130
import com.vrem.wifianalyzer.wifi.model.WiFiDetail
3231
import com.vrem.wifianalyzer.wifi.model.WiFiSecurity
3332
import com.vrem.wifianalyzer.wifi.model.WiFiSignal
34-
import java.text.SimpleDateFormat
35-
import java.util.Date
36-
import java.util.Locale
37-
import java.util.TimeZone
3833

3934
@OpenClass
4035
class AccessPointDetail {
@@ -67,7 +62,6 @@ class AccessPointDetail {
6762
setView80211mc(view, wiFiDetail.wiFiSignal)
6863
setViewWiFiStandard(view, wiFiDetail.wiFiSignal)
6964
setViewFastRoaming(view, wiFiDetail.wiFiSignal)
70-
setTimestamp(view, wiFiDetail.wiFiSignal)
7165
enableTextSelection(view)
7266
return view
7367
}
@@ -178,22 +172,4 @@ class AccessPointDetail {
178172
it.visibility = if (wiFiSignal.extra.is80211mc) View.VISIBLE else View.GONE
179173
}
180174

181-
private fun setTimestamp(view: View, wiFiSignal: WiFiSignal) =
182-
view.findViewById<TextView>(R.id.timestamp)?.let {
183-
val milliseconds: Long = wiFiSignal.extra.timestamp / 1000
184-
if (0L == milliseconds) {
185-
it.text = String.EMPTY
186-
it.visibility = View.GONE
187-
} else {
188-
val simpleDateFormat = SimpleDateFormat(TIME_STAMP_FORMAT, Locale.US)
189-
simpleDateFormat.timeZone = TimeZone.getTimeZone("GMT")
190-
it.text = simpleDateFormat.format(Date(milliseconds))
191-
it.visibility = View.VISIBLE
192-
}
193-
}
194-
195-
companion object {
196-
private const val TIME_STAMP_FORMAT = "H:mm:ss.SSS"
197-
}
198-
199175
}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import com.vrem.wifianalyzer.wifi.band.WiFiChannel
2424
data class WiFiSignalExtra(
2525
val is80211mc: Boolean = false,
2626
val wiFiStandard: WiFiStandard = WiFiStandard.UNKNOWN,
27-
val timestamp: Long = 0,
2827
val fastRoaming: List<FastRoaming> = listOf()
2928
) {
3029
fun wiFiStandardDisplay(context: Context): String =

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ enum class WiFiStandard(val wiFiStandardId: WiFiStandardId, @StringRes val textR
3434
AC(5, R.string.wifi_standard_ac, R.drawable.ic_wifi_5),
3535
AX(6, R.string.wifi_standard_ax, R.drawable.ic_wifi_6),
3636
AD(7, R.string.wifi_standard_ad, R.drawable.ic_wifi_unknown),
37-
BE(8, R.string.wifi_standard_be, R.drawable.ic_wifi_unknown);
37+
BE(8, R.string.wifi_standard_be, R.drawable.ic_wifi_6);
3838

3939
companion object {
4040
fun findOne(scanResult: ScanResult): WiFiStandard =

‎app/src/main/kotlin/com/vrem/wifianalyzer/wifi/scanner/Transformer.kt‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,19 @@ import android.net.wifi.WifiInfo
2121
import com.vrem.annotation.OpenClass
2222
import com.vrem.util.nullToEmpty
2323
import com.vrem.util.ssid
24-
import com.vrem.wifianalyzer.wifi.model.*
24+
import com.vrem.wifianalyzer.wifi.model.FastRoaming
25+
import com.vrem.wifianalyzer.wifi.model.WiFiConnection
26+
import com.vrem.wifianalyzer.wifi.model.WiFiData
27+
import com.vrem.wifianalyzer.wifi.model.WiFiDetail
28+
import com.vrem.wifianalyzer.wifi.model.WiFiIdentifier
29+
import com.vrem.wifianalyzer.wifi.model.WiFiSecurity
30+
import com.vrem.wifianalyzer.wifi.model.WiFiSecurityType
31+
import com.vrem.wifianalyzer.wifi.model.WiFiSignal
32+
import com.vrem.wifianalyzer.wifi.model.WiFiSignalExtra
33+
import com.vrem.wifianalyzer.wifi.model.WiFiStandard
34+
import com.vrem.wifianalyzer.wifi.model.WiFiWidth
35+
import com.vrem.wifianalyzer.wifi.model.convertIpV4Address
36+
import com.vrem.wifianalyzer.wifi.model.convertSSID
2537

2638
@Suppress("DEPRECATION")
2739
fun WifiInfo.ipV4Address(): Int = ipAddress
@@ -54,7 +66,7 @@ internal class Transformer(private val cache: Cache) {
5466
val wiFiStandard = WiFiStandard.findOne(scanResult)
5567
val fastRoaming = FastRoaming.find(scanResult)
5668
val securityTypes = WiFiSecurityType.find(scanResult)
57-
val extra = WiFiSignalExtra(mc80211, wiFiStandard, scanResult.timestamp, fastRoaming)
69+
val extra = WiFiSignalExtra(mc80211, wiFiStandard, fastRoaming)
5870
val wiFiSignal = WiFiSignal(scanResult.frequency, centerFrequency, wiFiWidth, cacheResult.average, extra)
5971
val wiFiIdentifier = WiFiIdentifier(scanResult.ssid(), String.nullToEmpty(scanResult.BSSID))
6072
val wiFiSecurity = WiFiSecurity(String.nullToEmpty(scanResult.capabilities), securityTypes)

‎app/src/main/res/layout/access_point_view_popup.xml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -81,12 +81,6 @@
8181
android:textStyle="italic"
8282
tools:text="[WPA][WPA2][WPS][WPA3]" />
8383

84-
<TextView
85-
android:id="@+id/timestamp"
86-
android:layout_width="wrap_content"
87-
android:layout_height="wrap_content"
88-
tools:text="13:35:45.123" />
89-
9084
<TextView
9185
android:id="@+id/vendorLong"
9286
android:layout_width="wrap_content"

‎app/src/test/kotlin/com/vrem/wifianalyzer/export/ExportTest.kt‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,23 @@ import android.content.Context
2121
import android.content.Intent
2222
import com.vrem.wifianalyzer.MainActivity
2323
import com.vrem.wifianalyzer.R
24-
import com.vrem.wifianalyzer.wifi.model.*
24+
import com.vrem.wifianalyzer.wifi.model.FastRoaming
25+
import com.vrem.wifianalyzer.wifi.model.WiFiDetail
26+
import com.vrem.wifianalyzer.wifi.model.WiFiIdentifier
27+
import com.vrem.wifianalyzer.wifi.model.WiFiSecurity
28+
import com.vrem.wifianalyzer.wifi.model.WiFiSignal
29+
import com.vrem.wifianalyzer.wifi.model.WiFiSignalExtra
30+
import com.vrem.wifianalyzer.wifi.model.WiFiStandard
31+
import com.vrem.wifianalyzer.wifi.model.WiFiWidth
2532
import org.assertj.core.api.Assertions.assertThat
2633
import org.junit.After
2734
import org.junit.Test
28-
import org.mockito.kotlin.*
35+
import org.mockito.kotlin.doReturn
36+
import org.mockito.kotlin.mock
37+
import org.mockito.kotlin.times
38+
import org.mockito.kotlin.verify
39+
import org.mockito.kotlin.verifyNoMoreInteractions
40+
import org.mockito.kotlin.whenever
2941
import java.text.SimpleDateFormat
3042
import java.util.Date
3143
import java.util.Locale
@@ -115,18 +127,18 @@ class ExportTest {
115127
private fun title(timestamp: String): String = "$name-$timestamp"
116128

117129
private fun data(timestamp: String): String =
118-
"Time Stamp|SSID|BSSID|Strength|Primary Channel|Primary Frequency|Center Channel|Center Frequency|Width (Range)|Distance|Timestamp|802.11mc|Security|Standard|FastRoaming\n" +
119-
timestamp + "|SSID10|BSSID10|-10dBm|3|2422MHz|5|2432MHz|40MHz (2412 - 2452)|~0.0m|123456789|true|capabilities10|802.11AC|802.11R\n" +
120-
timestamp + "|SSID20|BSSID20|-20dBm|5|2432MHz|7|2442MHz|40MHz (2422 - 2462)|~0.1m|123456789|true|capabilities20|802.11AC|802.11R\n" +
121-
timestamp + "|SSID30|BSSID30|-30dBm|7|2442MHz|9|2452MHz|40MHz (2432 - 2472)|~0.3m|123456789|true|capabilities30|802.11AC|802.11R\n"
130+
"Time Stamp|SSID|BSSID|Strength|Primary Channel|Primary Frequency|Center Channel|Center Frequency|Width (Range)|Distance|802.11mc|Security|Standard|FastRoaming\n" +
131+
timestamp + "|SSID10|BSSID10|-10dBm|3|2422MHz|5|2432MHz|40MHz (2412 - 2452)|~0.0m|true|capabilities10|802.11AC|802.11R\n" +
132+
timestamp + "|SSID20|BSSID20|-20dBm|5|2432MHz|7|2442MHz|40MHz (2422 - 2462)|~0.1m|true|capabilities20|802.11AC|802.11R\n" +
133+
timestamp + "|SSID30|BSSID30|-30dBm|7|2442MHz|9|2452MHz|40MHz (2432 - 2472)|~0.3m|true|capabilities30|802.11AC|802.11R\n"
122134

123135
private fun timestamp(date: Date): String = SimpleDateFormat("yyyy/MM/dd-HH:mm:ss", Locale.US).format(date)
124136

125137
private fun withWiFiDetails(): List<WiFiDetail> =
126138
listOf(withWiFiDetail(10), withWiFiDetail(20), withWiFiDetail(30))
127139

128140
private fun withWiFiDetail(offset: Int): WiFiDetail {
129-
val wiFiSignalExtra = WiFiSignalExtra(true, WiFiStandard.AC, 123456789, listOf(FastRoaming.FR_802_11R))
141+
val wiFiSignalExtra = WiFiSignalExtra(true, WiFiStandard.AC, listOf(FastRoaming.FR_802_11R))
130142
val wiFiSignal = WiFiSignal(2412 + offset, 2422 + offset, WiFiWidth.MHZ_40, -offset, wiFiSignalExtra)
131143
val wiFiIdentifier = WiFiIdentifier("SSID$offset", "BSSID$offset")
132144
val wiFiSecurity = WiFiSecurity("capabilities$offset")

‎app/src/test/kotlin/com/vrem/wifianalyzer/wifi/accesspoint/AccessPointDetailTest.kt‎

Lines changed: 13 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,17 @@ import com.vrem.util.EMPTY
2727
import com.vrem.wifianalyzer.MainContextHelper.INSTANCE
2828
import com.vrem.wifianalyzer.R
2929
import com.vrem.wifianalyzer.RobolectricUtil
30-
import com.vrem.wifianalyzer.wifi.model.*
30+
import com.vrem.wifianalyzer.wifi.model.FastRoaming
31+
import com.vrem.wifianalyzer.wifi.model.WiFiAdditional
32+
import com.vrem.wifianalyzer.wifi.model.WiFiConnection
33+
import com.vrem.wifianalyzer.wifi.model.WiFiDetail
34+
import com.vrem.wifianalyzer.wifi.model.WiFiIdentifier
35+
import com.vrem.wifianalyzer.wifi.model.WiFiSecurity
36+
import com.vrem.wifianalyzer.wifi.model.WiFiSecurityTypeTest
37+
import com.vrem.wifianalyzer.wifi.model.WiFiSignal
38+
import com.vrem.wifianalyzer.wifi.model.WiFiSignalExtra
39+
import com.vrem.wifianalyzer.wifi.model.WiFiStandard
40+
import com.vrem.wifianalyzer.wifi.model.WiFiWidth
3141
import org.assertj.core.api.Assertions.assertThat
3242
import org.junit.After
3343
import org.junit.Before
@@ -326,29 +336,6 @@ class AccessPointDetailTest {
326336
assertThat(actual.findViewById<View>(R.id.flag80211mc).visibility).isEqualTo(View.VISIBLE)
327337
}
328338

329-
@Test
330-
fun makeViewDetailedWithTimestampNotVisible() {
331-
// setup
332-
val wiFiDetail = withWiFiDetail(timestamp = 999)
333-
// execute
334-
val actual = fixture.makeViewDetailed(wiFiDetail)
335-
// validate
336-
assertThat(actual.findViewById<View>(R.id.timestamp).visibility).isEqualTo(View.GONE)
337-
validateTextViewValue(actual, String.EMPTY, R.id.timestamp)
338-
}
339-
340-
@Test
341-
fun makeViewDetailedWithTimestampVisible() {
342-
// setup
343-
val wiFiDetail = withWiFiDetail()
344-
val expectedTimestamp = "0:00:01.000"
345-
// execute
346-
val actual = fixture.makeViewDetailed(wiFiDetail)
347-
// validate
348-
assertThat(actual.findViewById<View>(R.id.timestamp).visibility).isEqualTo(View.VISIBLE)
349-
validateTextViewValue(actual, expectedTimestamp, R.id.timestamp)
350-
}
351-
352339
@Test
353340
fun makeViewDetailedWithFastRoaming() {
354341
// setup
@@ -364,15 +351,14 @@ class AccessPointDetailTest {
364351
private fun withWiFiDetail(
365352
ssid: String = "SSID",
366353
wiFiAdditional: WiFiAdditional = WiFiAdditional.EMPTY,
367-
is80211mc: Boolean = false,
368-
timestamp: Long = 1000000
354+
is80211mc: Boolean = false
369355
): WiFiDetail =
370356
WiFiDetail(
371357
WiFiIdentifier(ssid, "BSSID"),
372358
WiFiSecurity("[WPS-capabilities][WPA2-XYZ][XYZ-FT]", WiFiSecurityTypeTest.All),
373359
WiFiSignal(
374360
1, 1, WiFiWidth.MHZ_40, 2,
375-
WiFiSignalExtra(is80211mc, WiFiStandard.AC, timestamp, FastRoaming.entries.toList())
361+
WiFiSignalExtra(is80211mc, WiFiStandard.AC, FastRoaming.entries.toList())
376362
),
377363
wiFiAdditional
378364
)

0 commit comments

Comments
 (0)