TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2024-11-23 18:15:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

PR feedback

Browse Source
This commit is contained in:
ThomasSession 2024-08-20 14:44:28 +10:00
parent 4383158634
commit 5edc471c57
1 changed files with 17 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/src/main/java/org/thoughtcrime/securesms/util/IP2Country.kt
View File

@ -19,7 +19,7 @@ class IP2Country private constructor(private val context: Context) {
private val pathsBuiltEventReceiver: BroadcastReceiver private val pathsBuiltEventReceiver: BroadcastReceiver
val countryNamesCache = mutableMapOf<String, String>() val countryNamesCache = mutableMapOf<String, String>()
private fun Ipv4Int(ip: String): Long { private fun Ipv4Int(ip: String): Int {
var result = 0L var result = 0L
var currentValue = 0L var currentValue = 0L
var octetIndex = 0 var octetIndex = 0
@ -38,39 +38,31 @@ class IP2Country private constructor(private val context: Context) {
// Handle the last octet // Handle the last octet
result = result or (currentValue shl (8 * (3 - octetIndex))) result = result or (currentValue shl (8 * (3 - octetIndex)))
return result return result.toInt()
} }
private val ipv4ToCountry: TreeMap<Long, Int?> by lazy { private val ipv4ToCountry: TreeMap<Int, Int?> by lazy {
val file = loadFile("geolite2_country_blocks_ipv4.csv") val file = loadFile("geolite2_country_blocks_ipv4.csv")
val csv = CSVReader(FileReader(file.absoluteFile)).apply { CSVReader(FileReader(file.absoluteFile)).use { csv ->
skip(1) csv.skip(1)
csv.asSequence().associateTo(TreeMap()) { cols ->
Ipv4Int(cols[0]).toInt() to cols[1].toIntOrNull()
} }
val ipCountries = csv.asSequence().associateTo(TreeMap()) { cols ->
Ipv4Int(cols[0]) to cols[1].toIntOrNull()
} }
csv.close()
ipCountries
} }
private val countryToNames: Map<Int, String> by lazy { private val countryToNames: Map<Int, String> by lazy {
val file = loadFile("geolite2_country_locations_english.csv") val file = loadFile("geolite2_country_locations_english.csv")
val csv = CSVReader(FileReader(file.absoluteFile)).apply { CSVReader(FileReader(file.absoluteFile)).use { csv ->
skip(1) csv.skip(1)
}
val names = csv.asSequence() csv.asSequence()
.filter { cols -> !cols[0].isNullOrEmpty() && !cols[1].isNullOrEmpty() } .filter { cols -> !cols[0].isNullOrEmpty() && !cols[1].isNullOrEmpty() }
.associate { cols -> .associate { cols ->
cols[0].toInt() to cols[5] cols[0].toInt() to cols[5]
} }
}
csv.close()
names
} }
// region Initialization // region Initialization