brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle private company for which there is no address nor country

Browse Source
This commit is contained in:
Mygod
2019-02-14 12:34:59 +08:00
parent 9a40d8807d
commit 490a9a2a25
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt
View File

@@ -49,11 +49,10 @@ object MacLookup {
val obj = JSONObject(response).getJSONObject("result") val obj = JSONObject(response).getJSONObject("result")
obj.optString("error", null)?.also { throw UnexpectedError(mac, it) } obj.optString("error", null)?.also { throw UnexpectedError(mac, it) }
val company = obj.getString("company") val company = obj.getString("company")
val match = obj.optString("country")?.let { countryCodeRegex.matchEntire(it) } val match = extractCountry(mac, response, obj)
?: obj.optString("address")?.let { countryCodeRegex.find(it) }
val result = if (match != null) { val result = if (match != null) {
String(match.groupValues[1].flatMap { listOf('\uD83C', it + 0xDDA5) }.toCharArray()) + ' ' + company String(match.groupValues[1].flatMap { listOf('\uD83C', it + 0xDDA5) }.toCharArray()) + ' ' + company
} else company.also { Timber.w(UnexpectedError(mac, response)) } } else company
AppDatabase.instance.clientRecordDao.upsert(mac) { AppDatabase.instance.clientRecordDao.upsert(mac) {
nickname = result nickname = result
macLookupPending = false macLookupPending = false
@@ -70,4 +69,13 @@ object MacLookup {
} }
} }
} }
private fun extractCountry(mac: Long, response: String, obj: JSONObject): MatchResult? {
obj.optString("country")?.let { countryCodeRegex.matchEntire(it) }?.also { return it }
val address = obj.optString("address")
if (address.isNullOrBlank()) return null
countryCodeRegex.find(address)?.also { return it }
Timber.w(UnexpectedError(mac, response))
return null
}
} }