From 1029728f222405215e2e6c1bf53dc89e3fcebab3 Mon Sep 17 00:00:00 2001 From: Mygod Date: Tue, 18 Aug 2020 05:25:32 +0800 Subject: [PATCH] Refine code style --- build.gradle.kts | 5 +---- mobile/build.gradle.kts | 1 - mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt | 4 +--- mobile/src/main/java/be/mygod/librootkotlinx/Utils.kt | 6 +++--- mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt | 2 +- .../src/main/java/be/mygod/vpnhotspot/TetheringService.kt | 2 +- mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt | 3 ++- mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt | 2 +- .../src/main/java/be/mygod/vpnhotspot/root/MiscCommands.kt | 3 +-- .../main/java/be/mygod/vpnhotspot/root/WifiApCommands.kt | 5 ++--- mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt | 1 + 11 files changed, 14 insertions(+), 20 deletions(-) diff --git a/build.gradle.kts b/build.gradle.kts index 3c86daa0..edde3401 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -3,16 +3,13 @@ plugins { } buildscript { - val kotlinVersion = "1.4.0" - extra.set("kotlinVersion", kotlinVersion) - repositories { google() jcenter() } dependencies { - classpath(kotlin("gradle-plugin", kotlinVersion)) + classpath(kotlin("gradle-plugin", "1.4.0")) classpath("com.android.tools.build:gradle:4.1.0-rc01") classpath("com.google.firebase:firebase-crashlytics-gradle:2.2.0") classpath("com.google.android.gms:oss-licenses-plugin:0.10.2") diff --git a/mobile/build.gradle.kts b/mobile/build.gradle.kts index 2f055639..81ebb57a 100644 --- a/mobile/build.gradle.kts +++ b/mobile/build.gradle.kts @@ -72,7 +72,6 @@ dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:1.0.10") kapt("androidx.room:room-compiler:$roomVersion") - implementation(kotlin("stdlib-jdk8", rootProject.extra.get("kotlinVersion").toString())) implementation("androidx.appcompat:appcompat:1.3.0-alpha01") // https://issuetracker.google.com/issues/151603528 implementation("androidx.browser:browser:1.2.0") implementation("androidx.core:core-ktx:1.3.1") diff --git a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt index debe59c1..4b8e81dc 100644 --- a/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt +++ b/mobile/src/main/java/be/mygod/librootkotlinx/RootServer.kt @@ -372,9 +372,7 @@ class RootServer { write(bytes) } catch (_: NotSerializableException) { writeByte(EX_GENERIC) - writeUTF(StringWriter().also { - e.printStackTrace(PrintWriter(it)) - }.toString()) + writeUTF(e.stackTraceToString()) } flush() } diff --git a/mobile/src/main/java/be/mygod/librootkotlinx/Utils.kt b/mobile/src/main/java/be/mygod/librootkotlinx/Utils.kt index 4249bf51..ebad8eaf 100644 --- a/mobile/src/main/java/be/mygod/librootkotlinx/Utils.kt +++ b/mobile/src/main/java/be/mygod/librootkotlinx/Utils.kt @@ -12,7 +12,7 @@ import kotlinx.android.parcel.Parcelize class NoShellException(cause: Throwable) : Exception("Root missing", cause) -val currentInstructionSet by lazy { +internal val currentInstructionSet by lazy { val classVMRuntime = Class.forName("dalvik.system.VMRuntime") val runtime = classVMRuntime.getDeclaredMethod("getRuntime").invoke(null) classVMRuntime.getDeclaredMethod("getCurrentInstructionSet").invoke(runtime) as String @@ -20,12 +20,12 @@ val currentInstructionSet by lazy { private val classSystemProperties by lazy { Class.forName("android.os.SystemProperties") } @get:RequiresApi(26) -val isVndkLite by lazy { +internal val isVndkLite by lazy { classSystemProperties.getDeclaredMethod("getBoolean", String::class.java, Boolean::class.java).invoke(null, "ro.vndk.lite", false) as Boolean } @get:RequiresApi(26) -val vndkVersion by lazy { +internal val vndkVersion by lazy { classSystemProperties.getDeclaredMethod("get", String::class.java, String::class.java).invoke(null, "ro.vndk.version", "") as String } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt index 5c7df357..ea4dc5f5 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt @@ -410,7 +410,7 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene p.writeString(passphrase) extras.forEach(p::writeInt) p.setDataPosition(0) - p.readParcelable(javaClass.classLoader) + p.readParcelable(javaClass.classLoader) } }, listener) } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt index b13934e6..8f1ba20b 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/TetheringService.kt @@ -29,7 +29,7 @@ class TetheringService : IpNeighbourMonitoringService(), TetheringManager.Tether fun monitored(iface: String) = downstreams[iface]?.monitor } - private inner class Downstream(caller: Any, downstream: String, var monitor: Boolean = false) : + private class Downstream(caller: Any, downstream: String, var monitor: Boolean = false) : RoutingManager(caller, downstream) { override fun Routing.configure() { forward() diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt index 6a6b5b73..da64b776 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/IpNeighbour.kt @@ -97,7 +97,7 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: MacAddr devs.map { IpNeighbour(ip, it, lladdr, state) } } catch (e: Exception) { Timber.w(IllegalArgumentException("Unable to parse line: $line", e)) - emptyList() + emptyList() } } @@ -138,4 +138,5 @@ data class IpNeighbour(val ip: InetAddress, val dev: String, val lladdr: MacAddr data class IpDev(val ip: InetAddress, val dev: String) { override fun toString() = "$ip%$dev" } +@Suppress("FunctionName") fun IpDev(neighbour: IpNeighbour) = IpDev(neighbour.ip, neighbour.dev) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt index 1b5365ff..eeb94c38 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetherType.kt @@ -48,7 +48,7 @@ enum class TetherType(@DrawableRes val icon: Int) { second.getStringArray(it).filterNotNull().map { it.toPattern() } } catch (_: Resources.NotFoundException) { Timber.w(Exception("$name not found")) - emptyList() + emptyList() } } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/root/MiscCommands.kt b/mobile/src/main/java/be/mygod/vpnhotspot/root/MiscCommands.kt index 0dad4af4..ba100435 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/root/MiscCommands.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/root/MiscCommands.kt @@ -18,7 +18,6 @@ import kotlinx.coroutines.channels.produce import java.io.File import java.io.FileOutputStream import java.io.InterruptedIOException -import java.util.concurrent.Executor fun ProcessBuilder.fixPath(redirect: Boolean = false) = apply { environment().compute("PATH") { _, value -> @@ -141,7 +140,7 @@ data class StartTethering(private val type: Int, future.complete(error!!) } } - TetheringManager.startTethering(type, true, showProvisioningUi, Executor { + TetheringManager.startTethering(type, true, showProvisioningUi, { GlobalScope.launch(Dispatchers.Unconfined) { it.run() } }, TetheringManager.proxy(callback)) return future.await()?.let { ParcelableInt(it) } diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/root/WifiApCommands.kt b/mobile/src/main/java/be/mygod/vpnhotspot/root/WifiApCommands.kt index f1bf27f6..1dfc91d7 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/root/WifiApCommands.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/root/WifiApCommands.kt @@ -15,7 +15,6 @@ import kotlinx.coroutines.channels.ReceiveChannel import kotlinx.coroutines.channels.consumeEach import kotlinx.coroutines.channels.produce import timber.log.Timber -import java.util.concurrent.Executor object WifiApCommands { @RequiresApi(28) @@ -90,7 +89,7 @@ object WifiApCommands { @RequiresApi(30) override fun onBlockedClientConnecting(client: MacAddress, blockedReason: Int) = push(SoftApCallbackParcel.OnBlockedClientConnecting(client, blockedReason)) - }, Executor { + }) { scope.launch { try { it.run() @@ -98,7 +97,7 @@ object WifiApCommands { finish.completeExceptionally(e) } } - }) + } try { finish.await() } finally { diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt index 7ef937ed..8fd8f8d4 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/util/Utils.kt @@ -163,6 +163,7 @@ fun InvocationHandler.callSuper(interfaceClass: Class<*>, proxy: Any, method: Me } } +@Suppress("FunctionName") fun if_nametoindex(ifname: String) = if (Build.VERSION.SDK_INT >= 26) { Os.if_nametoindex(ifname) } else try {