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

Treat both possible ownerAddresses equally

Browse Source 
Fix #81.
This commit is contained in:
Mygod
2019-03-09 01:12:44 -05:00
parent d8a6ba43ae
commit b9292b8be4
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
View File

@@ -53,7 +53,7 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
RootSession.checkOutput(command, shell, false, false) RootSession.checkOutput(command, shell, false, false)
val parser = Parser(shell.out) val parser = Parser(shell.out)
try { try {
val bssid = group.owner.deviceAddress ?: ownerAddress val bssids = listOfNotNull(group.owner.deviceAddress, ownerAddress).distinct()
while (parser.next()) { while (parser.next()) {
if (parser.trimmed.startsWith("network={")) { if (parser.trimmed.startsWith("network={")) {
val block = NetworkBlock() val block = NetworkBlock()
@@ -71,7 +71,7 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
block.psk = match.groupValues[5].apply { check(length in 8..63) } block.psk = match.groupValues[5].apply { check(length in 8..63) }
} }
block.pskLine = block.size block.pskLine = block.size
} else if (matchedBssid.equals(bssid, true)) block.bssidMatches = true } else if (bssids.any { matchedBssid.equals(it, true) }) block.bssidMatches = true
} }
} }
block.add(parser.line) block.add(parser.line)
@@ -84,7 +84,7 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
} }
} else result.add(parser.line) } else result.add(parser.line)
} }
if (target == null && !RepeaterService.persistentSupported) { if (target == null && !RepeaterService.persistentSupported) bssids.forEach { bssid ->
result.add("") result.add("")
result.add(NetworkBlock().apply { result.add(NetworkBlock().apply {
// generate a basic network block, it is likely that vendor is going to add more stuff here // generate a basic network block, it is likely that vendor is going to add more stuff here
@@ -101,7 +101,7 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
add("\tmode=3") add("\tmode=3")
add("\tdisabled=2") add("\tdisabled=2")
add("}") add("}")
target = this if (target == null) target = this
}) })
} }
Triple(result, target!!, shell.err.isNotEmpty()) Triple(result, target!!, shell.err.isNotEmpty())