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

Caller already has an active LocalOnlyHotspot request is now unexpected

Browse Source
This commit is contained in:
Mygod
2019-01-01 12:27:49 +08:00
parent 68fface4b9
commit 7c72b9a235
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mobile/src/main/java/be/mygod/vpnhotspot/LocalOnlyHotspotService.kt
View File

@@ -12,6 +12,7 @@ import be.mygod.vpnhotspot.net.wifi.WifiDoubleLock
import be.mygod.vpnhotspot.util.StickyEvent1 import be.mygod.vpnhotspot.util.StickyEvent1
import be.mygod.vpnhotspot.util.broadcastReceiver import be.mygod.vpnhotspot.util.broadcastReceiver
import be.mygod.vpnhotspot.widget.SmartSnackbar import be.mygod.vpnhotspot.widget.SmartSnackbar
import timber.log.Timber
@RequiresApi(26) @RequiresApi(26)
class LocalOnlyHotspotService : IpNeighbourMonitoringService() { class LocalOnlyHotspotService : IpNeighbourMonitoringService() {
@@ -63,6 +64,7 @@ class LocalOnlyHotspotService : IpNeighbourMonitoringService() {
override fun onBind(intent: Intent?) = binder override fun onBind(intent: Intent?) = binder
override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int { override fun onStartCommand(intent: Intent?, flags: Int, startId: Int): Int {
if (binder.iface != null) return START_STICKY
binder.iface = "" binder.iface = ""
// show invisible foreground notification on television to avoid being killed // show invisible foreground notification on television to avoid being killed
if (app.uiMode.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION) updateNotification() if (app.uiMode.currentModeType == Configuration.UI_MODE_TYPE_TELEVISION) updateNotification()
@@ -106,9 +108,11 @@ class LocalOnlyHotspotService : IpNeighbourMonitoringService() {
startFailure() startFailure()
} }
}, app.handler) }, app.handler)
// assuming IllegalStateException will be thrown only if } catch (e: IllegalStateException) {
// "Caller already has an active LocalOnlyHotspot request" Timber.w(e)
} catch (_: IllegalStateException) { } catch (e: SecurityException) { SmartSnackbar.make(e).show()
startFailure()
} catch (e: SecurityException) {
SmartSnackbar.make(e).show() SmartSnackbar.make(e).show()
startFailure() startFailure()
} }

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

@@ -257,7 +257,7 @@ class Routing(val downstream: String, ownerAddress: InterfaceAddress? = null) :
fun revert() { fun revert() {
stop() stop()
TrafficRecorder.update() // record stats before exiting to prevent stats losing TrafficRecorder.update() // record stats before exiting to prevent stats losing
clients.forEach { (_, subroute) -> subroute.close() } clients.values.forEach { it.close() }
fallbackUpstream.subrouting?.transaction?.revert() fallbackUpstream.subrouting?.transaction?.revert()
upstream.subrouting?.transaction?.revert() upstream.subrouting?.transaction?.revert()
transaction.revert() transaction.revert()