Skip to content

Commit 9709c5d

Browse files
VREMSoftwareDevelopmentVREMSoftwareDevelopment
committed
code cleanup
1 parent 2021fb4 commit 9709c5d

File tree

18 files changed

+491
-457
lines changed

18 files changed

+491
-457
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ dependencies {
4444
testImplementation 'com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0'
4545
testImplementation 'io.mockk:mockk:1.13.3'
4646
testImplementation 'junit:junit:4.13.2'
47-
testImplementation 'org.mockito:mockito-core:4.9.0'
48-
testImplementation 'org.robolectric:robolectric:4.9'
47+
testImplementation 'org.mockito:mockito-core:4.10.0'
48+
testImplementation 'org.robolectric:robolectric:4.9.1'
4949
testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
5050
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
5151
// Android Test Dependencies

‎app/build.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#Build Properties
2-
#Sat Dec 10 14:14:00 EST 2022
2+
#Wed Dec 28 11:35:55 EST 2022
33
version_minor=0
44
version_store=61
55
version_patch=9
6-
version_build=5
6+
version_build=6
77
version_major=3

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ fun ScanResult.ssid(): String =
7171
ssidAndroidT()
7272
} else {
7373
ssidLegacy()
74-
}
74+
}.removeSurrounding("\"")
7575

7676
@TargetApi(Build.VERSION_CODES.TIRAMISU)
7777
private fun ScanResult.ssidAndroidT(): String =

‎app/src/main/kotlin/com/vrem/wifianalyzer/settings/Settings.kt‎

Lines changed: 14 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -39,23 +39,13 @@ class Settings(private val repository: Repository) {
3939
fun initializeDefaultValues(): Unit = repository.initializeDefaultValues()
4040

4141
fun registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener: OnSharedPreferenceChangeListener): Unit =
42-
repository.registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener)
43-
44-
fun scanSpeed(): Int {
45-
val defaultValue = repository.stringAsInteger(R.string.scan_speed_default, SCAN_SPEED_DEFAULT)
46-
val scanSpeed = repository.stringAsInteger(R.string.scan_speed_key, defaultValue)
47-
return if (versionP()) {
48-
if (wiFiThrottleDisabled()) scanSpeed.coerceAtLeast(SCAN_SPEED_DEFAULT) else scanSpeed
49-
} else scanSpeed
50-
}
42+
repository.registerOnSharedPreferenceChangeListener(onSharedPreferenceChangeListener)
5143

52-
fun wiFiThrottleDisabled(): Boolean {
53-
if (versionP()) {
54-
val defaultValue = repository.resourceBoolean(R.bool.wifi_throttle_disabled_default)
55-
return repository.boolean(R.string.wifi_throttle_disabled_key, defaultValue)
56-
}
57-
return false
58-
}
44+
fun scanSpeed(): Int =
45+
repository.stringAsInteger(
46+
R.string.scan_speed_key,
47+
repository.stringAsInteger(R.string.scan_speed_default, SCAN_SPEED_DEFAULT)
48+
)
5949

6050
fun cacheOff(): Boolean =
6151
repository.boolean(R.string.cache_off_key, repository.resourceBoolean(R.bool.cache_off_default))
@@ -91,11 +81,14 @@ class Settings(private val repository: Repository) {
9181
fun wiFiBand(): WiFiBand = find(WiFiBand.values(), R.string.wifi_band_key, WiFiBand.GHZ2)
9282

9383
fun wiFiOffOnExit(): Boolean =
94-
if (minVersionQ()) {
95-
false
96-
} else {
97-
repository.boolean(R.string.wifi_off_on_exit_key, repository.resourceBoolean(R.bool.wifi_off_on_exit_default))
98-
}
84+
if (minVersionQ()) {
85+
false
86+
} else {
87+
repository.boolean(
88+
R.string.wifi_off_on_exit_key,
89+
repository.resourceBoolean(R.bool.wifi_off_on_exit_default)
90+
)
91+
}
9992

10093
fun keepScreenOn(): Boolean = repository.boolean(R.string.keep_screen_on_key, repository.resourceBoolean(R.bool.keep_screen_on_default))
10194

@@ -140,8 +133,6 @@ class Settings(private val repository: Repository) {
140133

141134
fun minVersionQ(): Boolean = buildMinVersionQ()
142135

143-
fun versionP(): Boolean = buildVersionP()
144-
145136
companion object {
146137
private const val SCAN_SPEED_DEFAULT = 5
147138
private const val GRAPH_Y_MULTIPLIER = -10

‎app/src/main/kotlin/com/vrem/wifianalyzer/settings/SettingsFragment.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ import android.os.Bundle
2121
import androidx.preference.Preference
2222
import androidx.preference.PreferenceFragmentCompat
2323
import com.vrem.util.buildMinVersionQ
24-
import com.vrem.util.buildVersionP
2524
import com.vrem.wifianalyzer.R
2625

2726
open class SettingsFragment : PreferenceFragmentCompat() {
2827
override fun onCreatePreferences(bundle: Bundle?, rootKey: String?) {
2928
addPreferencesFromResource(R.xml.settings)
30-
findPreference<Preference>(getString(R.string.wifi_throttle_disabled_key))!!.isVisible = buildVersionP()
3129
findPreference<Preference>(getString(R.string.wifi_off_on_exit_key))!!.isVisible = !buildMinVersionQ()
3230
}
3331

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@ data class WiFiConnection(val wiFiIdentifier: WiFiIdentifier = WiFiIdentifier.EM
3131
override fun equals(other: Any?): Boolean {
3232
if (this === other) return true
3333
if (javaClass != other?.javaClass) return false
34-
3534
other as WiFiConnection
36-
3735
return wiFiIdentifier == other.wiFiIdentifier
3836
}
3937

@@ -43,7 +41,6 @@ data class WiFiConnection(val wiFiIdentifier: WiFiIdentifier = WiFiIdentifier.EM
4341

4442
companion object {
4543
const val LINK_SPEED_INVALID = -1
46-
4744
val EMPTY = WiFiConnection()
4845
}
4946
}

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

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -25,32 +25,32 @@ import com.vrem.wifianalyzer.wifi.predicate.Predicate
2525
class WiFiData(val wiFiDetails: List<WiFiDetail>, val wiFiConnection: WiFiConnection) {
2626

2727
fun connection(): WiFiDetail =
28-
wiFiDetails
29-
.find { connected(it) }
30-
?.let { copy(it) }
31-
?: WiFiDetail.EMPTY
28+
wiFiDetails
29+
.find { connected(it) }
30+
?.let { copy(it) }
31+
?: WiFiDetail.EMPTY
3232

3333
fun wiFiDetails(predicate: Predicate, sortBy: SortBy): List<WiFiDetail> =
34-
wiFiDetails(predicate, sortBy, GroupBy.NONE)
34+
wiFiDetails(predicate, sortBy, GroupBy.NONE)
3535

3636
fun wiFiDetails(predicate: Predicate, sortBy: SortBy, groupBy: GroupBy): List<WiFiDetail> {
3737
val connection: WiFiDetail = connection()
3838
return wiFiDetails
39-
.filter { predicate(it) }
40-
.map { transform(it, connection) }
41-
.sortAndGroup(sortBy, groupBy)
42-
.sortedWith(sortBy.sort)
39+
.filter { predicate(it) }
40+
.map { transform(it, connection) }
41+
.sortAndGroup(sortBy, groupBy)
42+
.sortedWith(sortBy.sort)
4343
}
4444

4545
private fun List<WiFiDetail>.sortAndGroup(sortBy: SortBy, groupBy: GroupBy): List<WiFiDetail> =
46-
if (groupBy.none) {
47-
this
48-
} else {
49-
this.groupBy { groupBy.group(it) }
50-
.values
51-
.map(map(sortBy, groupBy))
52-
.sortedWith(sortBy.sort)
53-
}
46+
if (groupBy.none) {
47+
this
48+
} else {
49+
this.groupBy { groupBy.group(it) }
50+
.values
51+
.map(map(sortBy, groupBy))
52+
.sortedWith(sortBy.sort)
53+
}
5454

5555
private fun map(sortBy: SortBy, groupBy: GroupBy): (List<WiFiDetail>) -> WiFiDetail = {
5656
val sortedWith: List<WiFiDetail> = it.sortedWith(groupBy.sort)
@@ -64,14 +64,15 @@ class WiFiData(val wiFiDetails: List<WiFiDetail>, val wiFiConnection: WiFiConnec
6464
}
6565

6666
private fun transform(wiFiDetail: WiFiDetail, connection: WiFiDetail): WiFiDetail =
67-
when (wiFiDetail) {
68-
connection -> connection
69-
else -> {
70-
val vendorName: String = MainContext.INSTANCE.vendorService.findVendorName(wiFiDetail.wiFiIdentifier.bssid)
71-
val wiFiAdditional = WiFiAdditional(vendorName, WiFiConnection.EMPTY)
72-
WiFiDetail(wiFiDetail, wiFiAdditional)
73-
}
67+
when (wiFiDetail) {
68+
connection -> connection
69+
else -> {
70+
val vendorName: String =
71+
MainContext.INSTANCE.vendorService.findVendorName(wiFiDetail.wiFiIdentifier.bssid)
72+
val wiFiAdditional = WiFiAdditional(vendorName, WiFiConnection.EMPTY)
73+
WiFiDetail(wiFiDetail, wiFiAdditional)
7474
}
75+
}
7576

7677
private fun connected(it: WiFiDetail): Boolean =
7778
wiFiConnection.wiFiIdentifier.equals(it.wiFiIdentifier, true)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ data class WiFiIdentifier(val ssidRaw: SSID = String.EMPTY, val bssid: BSSID = S
3333
get() = "$ssid ($bssid)"
3434

3535
fun equals(other: WiFiIdentifier, ignoreCase: Boolean = false): Boolean =
36-
ssid.equals(other.ssidRaw, ignoreCase) && bssid.equals(other.bssid, ignoreCase)
36+
ssid.equals(other.ssidRaw, ignoreCase) && bssid.equals(other.bssid, ignoreCase)
3737

3838
override fun compareTo(other: WiFiIdentifier): Int =
39-
compareBy<WiFiIdentifier> { it.ssidRaw }.thenBy { it.bssid }.compare(this, other)
39+
compareBy<WiFiIdentifier> { it.ssidRaw }.thenBy { it.bssid }.compare(this, other)
4040

4141
companion object {
4242
val EMPTY = WiFiIdentifier()

0 commit comments

Comments
 (0)