Log p2p_supplicant if parsing failed
This commit is contained in:
@@ -4,6 +4,7 @@ import android.net.wifi.p2p.WifiP2pGroup
|
|||||||
import android.os.Build
|
import android.os.Build
|
||||||
import be.mygod.vpnhotspot.App.Companion.app
|
import be.mygod.vpnhotspot.App.Companion.app
|
||||||
import be.mygod.vpnhotspot.util.RootSession
|
import be.mygod.vpnhotspot.util.RootSession
|
||||||
|
import timber.log.Timber
|
||||||
import java.io.File
|
import java.io.File
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -30,7 +31,7 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
|
|||||||
override fun toString() = joinToString("\n")
|
override fun toString() = joinToString("\n")
|
||||||
}
|
}
|
||||||
|
|
||||||
private class Parser(lines: List<String>) {
|
private class Parser(val lines: List<String>) {
|
||||||
private val iterator = lines.iterator()
|
private val iterator = lines.iterator()
|
||||||
lateinit var line: String
|
lateinit var line: String
|
||||||
lateinit var trimmed: String
|
lateinit var trimmed: String
|
||||||
@@ -45,6 +46,7 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
|
|||||||
val result = ArrayList<Any>()
|
val result = ArrayList<Any>()
|
||||||
var target: NetworkBlock? = null
|
var target: NetworkBlock? = null
|
||||||
val parser = Parser(it.execOutUnjoined("cat $confPath"))
|
val parser = Parser(it.execOutUnjoined("cat $confPath"))
|
||||||
|
try {
|
||||||
while (parser.next()) {
|
while (parser.next()) {
|
||||||
if (parser.trimmed.startsWith("network={")) {
|
if (parser.trimmed.startsWith("network={")) {
|
||||||
val block = NetworkBlock()
|
val block = NetworkBlock()
|
||||||
@@ -75,6 +77,11 @@ class P2pSupplicantConfiguration(private val group: WifiP2pGroup, ownerAddress:
|
|||||||
} else result.add(parser.line)
|
} else result.add(parser.line)
|
||||||
}
|
}
|
||||||
Pair(result, target!!)
|
Pair(result, target!!)
|
||||||
|
} catch (e: RuntimeException) {
|
||||||
|
Timber.w("Failed to parse p2p_supplicant.conf, ownerAddress: $ownerAddress, P2P group: $group")
|
||||||
|
Timber.w(parser.lines.joinToString("\n"))
|
||||||
|
throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val ssid = group.networkName
|
val ssid = group.networkName
|
||||||
|
|||||||
Reference in New Issue
Block a user