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

Copy more stuff on paste Wi-Fi configuration

Browse Source
This commit is contained in:
Mygod
2020-06-24 07:25:11 +08:00
parent d2af382911
commit 14fada61c6
2 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
View File

@@ -33,7 +33,7 @@ data class SoftApConfigurationCompat(
// TODO: WifiClient? nullable? // TODO: WifiClient? nullable?
var allowedClientList: List<Parcelable>?, var allowedClientList: List<Parcelable>?,
var blockedClientList: List<Parcelable>?, var blockedClientList: List<Parcelable>?,
val underlying: Parcelable? = null) : Parcelable { var underlying: Parcelable? = null) : Parcelable {
companion object { companion object {
/** /**
* TODO * TODO

34
mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
View File

@@ -80,8 +80,9 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
private lateinit var dialogView: DialogWifiApBinding private lateinit var dialogView: DialogWifiApBinding
private lateinit var bandOptions: MutableList<BandOption> private lateinit var bandOptions: MutableList<BandOption>
private lateinit var base: SoftApConfigurationCompat
private var started = false private var started = false
override val ret get() = Arg(arg.configuration.copy( override val ret get() = Arg(base.copy(
ssid = dialogView.ssid.text.toString(), ssid = dialogView.ssid.text.toString(),
passphrase = if (dialogView.password.length() != 0) dialogView.password.text.toString() else null, passphrase = if (dialogView.password.length() != 0) dialogView.password.text.toString() else null,
bssidAddr = if (dialogView.bssid.length() != 0) { bssidAddr = if (dialogView.bssid.length() != 0) {
@@ -141,20 +142,21 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
} else dialogView.bandWrapper.isGone = true } else dialogView.bandWrapper.isGone = true
if (!arg.readOnly) dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment) if (!arg.readOnly) dialogView.bssid.addTextChangedListener(this@WifiApDialogFragment)
if (arg.p2pMode) dialogView.hiddenSsid.isGone = true if (arg.p2pMode) dialogView.hiddenSsid.isGone = true
populateFromConfiguration(arg.configuration) base = arg.configuration
populateFromConfiguration()
} }
private fun populateFromConfiguration(configuration: SoftApConfigurationCompat) { private fun populateFromConfiguration() {
dialogView.ssid.setText(configuration.ssid) dialogView.ssid.setText(base.ssid)
if (!arg.p2pMode) dialogView.security.setSelection(configuration.securityType) if (!arg.p2pMode) dialogView.security.setSelection(base.securityType)
dialogView.password.setText(configuration.passphrase) dialogView.password.setText(base.passphrase)
if (Build.VERSION.SDK_INT >= 23 || arg.p2pMode) { if (Build.VERSION.SDK_INT >= 23 || arg.p2pMode) {
dialogView.band.setSelection(if (configuration.channel in 1..165) { dialogView.band.setSelection(if (base.channel in 1..165) {
bandOptions.indexOfFirst { it.channel == configuration.channel } bandOptions.indexOfFirst { it.channel == base.channel }
} else bandOptions.indexOfFirst { it.band == configuration.band }) } else bandOptions.indexOfFirst { it.band == base.band })
} }
dialogView.bssid.setText(configuration.bssid?.toString()) dialogView.bssid.setText(base.bssid?.toString())
dialogView.hiddenSsid.isChecked = configuration.isHiddenSsid dialogView.hiddenSsid.isChecked = base.isHiddenSsid
// TODO support more fields from SACC // TODO support more fields from SACC
} }
@@ -209,8 +211,14 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
} }
android.R.id.paste -> try { android.R.id.paste -> try {
app.clipboard.primaryClip?.getItemAt(0)?.text?.apply { app.clipboard.primaryClip?.getItemAt(0)?.text?.apply {
Base64.decode(toString(), BASE64_FLAGS).toParcelable<SoftApConfigurationCompat>() Base64.decode(toString(), BASE64_FLAGS).toParcelable<SoftApConfigurationCompat>()?.let { config ->
?.let { populateFromConfiguration(it) } val newUnderlying = config.underlying
if (newUnderlying != null) {
arg.configuration.underlying?.let { check(it.javaClass == newUnderlying.javaClass) }
} else config.underlying = arg.configuration.underlying
base = config
populateFromConfiguration()
}
} }
true true
} catch (e: IllegalArgumentException) { } catch (e: IllegalArgumentException) {