File tree Expand file tree Collapse file tree 6 files changed +19578
-74
lines changed
wifianalyzer/vendor/model
test/kotlin/com/vrem/util Expand file tree Collapse file tree 6 files changed +19578
-74
lines changed Original file line number Diff line number Diff line change 11# Build Properties
2- # Mon Dec 29 09:07:23 EST 2025
3- version_build =39
2+ # Mon Dec 29 11:24:27 EST 2025
3+ version_build =40
44version_major =3
55version_minor =2
66version_patch =1
Original file line number Diff line number Diff line change @@ -19,7 +19,6 @@ package com.vrem.util
1919
2020import android.content.res.Resources
2121import androidx.annotation.RawRes
22- import java.util.zip.ZipInputStream
2322
2423fun readFile (
2524 resources : Resources ,
@@ -32,16 +31,3 @@ fun readFile(
3231 .use { it.readText() }
3332 .replace(" \r " , String .EMPTY )
3433 }.getOrDefault(String .EMPTY )
35-
36- fun readZipFile (
37- resources : Resources ,
38- @RawRes id : Int ,
39- ): List <String > =
40- runCatching {
41- resources.openRawResource(id).use { inputStream ->
42- ZipInputStream (inputStream).use { zipInputStream ->
43- zipInputStream.nextEntry
44- zipInputStream.bufferedReader().readLines()
45- }
46- }
47- }.getOrDefault(emptyList())
Original file line number Diff line number Diff line change @@ -20,7 +20,7 @@ package com.vrem.wifianalyzer.vendor.model
2020import android.content.res.Resources
2121import com.vrem.annotation.OpenClass
2222import com.vrem.util.EMPTY
23- import com.vrem.util.readZipFile
23+ import com.vrem.util.readFile
2424import com.vrem.wifianalyzer.R
2525import java.util.Locale
2626import java.util.TreeMap
@@ -59,7 +59,9 @@ class VendorService(
5959 private fun load (resources : Resources ): VendorData {
6060 val macs: MutableMap <String , String > = TreeMap ()
6161 val vendors: MutableMap <String , List <String >> = TreeMap ()
62- readZipFile(resources, R .raw.data)
62+ readFile(resources, R .raw.data)
63+ .split(" \n " )
64+ .filter { it.isNotBlank() }
6365 .map { it.split(" |" ).toTypedArray() }
6466 .forEach {
6567 val name = it[0 ]
You can’t perform that action at this time.
0 commit comments