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

Only setOperatingChannel when necessary

Browse Source
This commit is contained in:
Mygod
2020-07-02 07:19:11 +08:00
parent ba68728ac0
commit 59337cfcf0
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
View File

@@ -244,19 +244,19 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
override fun onBind(intent: Intent) = binder override fun onBind(intent: Intent) = binder
private fun setOperatingChannel(oc: Int = operatingChannel) { private suspend fun setOperatingChannel(oc: Int = operatingChannel) {
val channel = channel val channel = channel
if (channel != null) launch(start = CoroutineStart.UNDISPATCHED) { if (channel != null) {
val reason = try { val reason = try {
// we don't care about listening channel // we don't care about listening channel
p2pManager.setWifiP2pChannels(channel, 0, oc) ?: return@launch p2pManager.setWifiP2pChannels(channel, 0, oc) ?: return
} catch (e: InvocationTargetException) { } catch (e: InvocationTargetException) {
if (oc != 0) { if (oc != 0) {
val message = getString(R.string.repeater_set_oc_failure, e.message) val message = getString(R.string.repeater_set_oc_failure, e.message)
SmartSnackbar.make(message).show() SmartSnackbar.make(message).show()
Timber.w(RuntimeException("Failed to set operating channel $oc", e)) Timber.w(RuntimeException("Failed to set operating channel $oc", e))
} else Timber.w(e) } else Timber.w(e)
return@launch return
} }
if (reason == WifiP2pManager.ERROR && Build.VERSION.SDK_INT >= 30) { if (reason == WifiP2pManager.ERROR && Build.VERSION.SDK_INT >= 30) {
val rootReason = try { val rootReason = try {
@@ -268,7 +268,7 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
Timber.w(e) Timber.w(e)
SmartSnackbar.make(e).show() SmartSnackbar.make(e).show()
null null
} ?: return@launch } ?: return
SmartSnackbar.make(formatReason(R.string.repeater_set_oc_failure, rootReason.value)).show() SmartSnackbar.make(formatReason(R.string.repeater_set_oc_failure, rootReason.value)).show()
} else SmartSnackbar.make(formatReason(R.string.repeater_set_oc_failure, reason)).show() } else SmartSnackbar.make(formatReason(R.string.repeater_set_oc_failure, reason)).show()
} else SmartSnackbar.make(R.string.repeater_failure_disconnected).show() } else SmartSnackbar.make(R.string.repeater_failure_disconnected).show()
@@ -279,7 +279,6 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
deinitPending.set(true) deinitPending.set(true)
if (status != Status.DESTROYED) try { if (status != Status.DESTROYED) try {
channel = p2pManager.initialize(this, Looper.getMainLooper(), this) channel = p2pManager.initialize(this, Looper.getMainLooper(), this)
if (!safeMode) setOperatingChannel()
} catch (e: RuntimeException) { } catch (e: RuntimeException) {
Timber.w(e) Timber.w(e)
launch(Dispatchers.Main) { launch(Dispatchers.Main) {
@@ -291,11 +290,8 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) { override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
if (!safeMode) when (key) { if (!safeMode) when (key) {
KEY_OPERATING_CHANNEL -> setOperatingChannel() KEY_OPERATING_CHANNEL -> launch { setOperatingChannel() }
KEY_SAFE_MODE -> { KEY_SAFE_MODE -> deinitPending.set(true)
deinitPending.set(true)
setOperatingChannel()
}
} }
} }
@@ -348,7 +344,10 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
override fun onSuccess() { } // wait for WIFI_P2P_CONNECTION_CHANGED_ACTION to fire to go to step 3 override fun onSuccess() { } // wait for WIFI_P2P_CONNECTION_CHANGED_ACTION to fire to go to step 3
} }
val channel = channel ?: return@launch listener.onFailure(WifiP2pManager.BUSY) val channel = channel ?: return@launch listener.onFailure(WifiP2pManager.BUSY)
if (!safeMode) binder.fetchPersistentGroup() if (!safeMode) {
binder.fetchPersistentGroup()
setOperatingChannel()
}
val networkName = networkName val networkName = networkName
val passphrase = passphrase val passphrase = passphrase
try { try {