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

Propagate Bluetooth error message out to UI

Browse Source
This commit is contained in:
Mygod
2020-05-29 18:23:39 -04:00
parent 8a04abd1cf
commit 9686645c03
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
mobile/src/main/java/be/mygod/vpnhotspot/manage/TetherManager.kt
View File

@@ -109,9 +109,11 @@ sealed class TetherManager(protected val parent: TetheringFragment) : Manager(),
return e.readableMessage
})
}
protected open fun makeErrorMessage(errored: List<String>): CharSequence = errored
.filter { TetherType.ofInterface(it) == tetherType }
.joinToString("\n") { "$it: ${getErrorMessage(it)}" }
fun updateErrorMessage(errored: List<String>) {
data.text = errored.filter { TetherType.ofInterface(it) == tetherType }
.joinToString("\n") { "$it: ${getErrorMessage(it)}" }
data.text = makeErrorMessage(errored)
data.notifyChange()
}
@@ -149,6 +151,9 @@ sealed class TetherManager(protected val parent: TetheringFragment) : Manager(),
override val isStarted get() = tethering.active == true
override fun onException() = ManageBar.start(parent.context ?: app)
override fun makeErrorMessage(errored: List<String>) = listOfNotNull(
if (tethering.active == null) tethering.activeFailureCause?.readableMessage else null,
super.makeErrorMessage(errored).let { if (it.isEmpty()) null else it }).joinToString("\n")
override fun start() = BluetoothTethering.start(this)
override fun stop() {