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

Refine code style

Browse Source
This commit is contained in:
Mygod
2020-07-03 02:36:28 +08:00
parent b86653156b
commit fbb1483969
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -11,7 +11,6 @@ import android.net.wifi.p2p.*
import android.os.Build import android.os.Build
import android.os.Looper import android.os.Looper
import android.provider.Settings import android.provider.Settings
import androidx.annotation.RequiresApi
import androidx.annotation.StringRes import androidx.annotation.StringRes
import androidx.core.content.edit import androidx.core.content.edit
import be.mygod.librootkotlinx.useParcel import be.mygod.librootkotlinx.useParcel
@@ -162,7 +161,8 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene
RootManager.use { server -> RootManager.use { server ->
if (deinitPending.getAndSet(false)) server.execute(RepeaterCommands.Deinit()) if (deinitPending.getAndSet(false)) server.execute(RepeaterCommands.Deinit())
@Suppress("UNCHECKED_CAST") @Suppress("UNCHECKED_CAST")
val groups = server.execute(RepeaterCommands.RequestPersistentGroupInfo()).value as List<WifiP2pGroup> val groups = server.execute(RepeaterCommands.RequestPersistentGroupInfo())
.value as List<WifiP2pGroup>
for (group in groups.filterUselessGroups()) { for (group in groups.filterUselessGroups()) {
server.execute(RepeaterCommands.DeletePersistentGroup(group.networkId))?.value.print(group) server.execute(RepeaterCommands.DeletePersistentGroup(group.networkId))?.value.print(group)
} }

6
mobile/src/main/java/be/mygod/vpnhotspot/RoutingManager.kt
View File

@@ -9,7 +9,6 @@ import be.mygod.vpnhotspot.net.wifi.WifiDoubleLock
import be.mygod.vpnhotspot.widget.SmartSnackbar import be.mygod.vpnhotspot.widget.SmartSnackbar
import kotlinx.coroutines.runBlocking import kotlinx.coroutines.runBlocking
import timber.log.Timber import timber.log.Timber
import java.net.NetworkInterface
abstract class RoutingManager(private val caller: Any, val downstream: String, private val forceWifi: Boolean = false) { abstract class RoutingManager(private val caller: Any, val downstream: String, private val forceWifi: Boolean = false) {
companion object { companion object {
@@ -17,8 +16,9 @@ abstract class RoutingManager(private val caller: Any, val downstream: String, p
var masqueradeMode: Routing.MasqueradeMode var masqueradeMode: Routing.MasqueradeMode
@TargetApi(28) get() = app.pref.run { @TargetApi(28) get() = app.pref.run {
getString(KEY_MASQUERADE_MODE, null)?.let { return@run Routing.MasqueradeMode.valueOf(it) } getString(KEY_MASQUERADE_MODE, null)?.let { return@run Routing.MasqueradeMode.valueOf(it) }
if (getBoolean("service.masquerade", true)) // legacy settings if (getBoolean("service.masquerade", true)) { // legacy settings
Routing.MasqueradeMode.Simple else Routing.MasqueradeMode.None Routing.MasqueradeMode.Simple
} else Routing.MasqueradeMode.None
}.let { }.let {
// older app version enabled netd for everyone. should check again here // older app version enabled netd for everyone. should check again here
if (Build.VERSION.SDK_INT >= 28 || it != Routing.MasqueradeMode.Netd) it if (Build.VERSION.SDK_INT >= 28 || it != Routing.MasqueradeMode.Netd) it

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

@@ -7,9 +7,7 @@ import android.net.wifi.SoftApConfiguration
import android.net.wifi.WifiManager import android.net.wifi.WifiManager
import android.os.Build import android.os.Build
import androidx.annotation.RequiresApi import androidx.annotation.RequiresApi
import be.mygod.vpnhotspot.App
import be.mygod.vpnhotspot.App.Companion.app import be.mygod.vpnhotspot.App.Companion.app
import be.mygod.vpnhotspot.net.TetheringManager
import be.mygod.vpnhotspot.net.wifi.SoftApConfigurationCompat.Companion.toCompat import be.mygod.vpnhotspot.net.wifi.SoftApConfigurationCompat.Companion.toCompat
import be.mygod.vpnhotspot.util.Services import be.mygod.vpnhotspot.util.Services