Fix support for unrecognized psk line

This commit is contained in:
Mygod
2019-03-09 00:58:08 -05:00
parent 57b3a7638e
commit d8a6ba43ae

View File

@@ -64,14 +64,14 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
block.ssidLine = block.size
} else if (parser.trimmed.startsWith("mode=3")) block.groupOwner = true else {
val match = networkParser.find(parser.trimmed)
if (match != null) if (match.groups[4] != null) {
check(block.pskLine == null && block.psk == null)
if (match.groups[5] != null) {
block.psk = match.groupValues[5].apply { check(length in 8..63) }
}
block.pskLine = block.size
} else if (match.groups[2] != null && match.groupValues[2].equals(bssid, true)) {
block.bssidMatches = true
if (match != null) match.groupValues[2].also { matchedBssid ->
if (matchedBssid.isEmpty()) {
check(block.pskLine == null && block.psk == null)
if (match.groups[5] != null) {
block.psk = match.groupValues[5].apply { check(length in 8..63) }
}
block.pskLine = block.size
} else if (matchedBssid.equals(bssid, true)) block.bssidMatches = true
}
}
block.add(parser.line)