Refine code style

2021-11-26 22:56:38 -05:00
parent bd65be29ea
commit de3226e27a
11 changed files with 46 additions and 45 deletions
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/TetheringManager.kt
@@ -189,7 +189,7 @@ object TetheringManager {
        Class.forName("android.net.ConnectivityManager\$OnStartTetheringCallback")
    }
    @get:RequiresApi(24)
-    private val startTetheringLegacy by lazy {
+    private val startTetheringLegacy by lazy @TargetApi(24) {
        ConnectivityManager::class.java.getDeclaredMethod("startTethering",
                Int::class.java, Boolean::class.java, classOnStartTetheringCallback, Handler::class.java)
    }
@@ -206,34 +206,36 @@ object TetheringManager {
        Class.forName("android.net.TetheringManager\$TetheringRequest\$Builder")
    }
    @get:RequiresApi(30)
-    private val newTetheringRequestBuilder by lazy { classTetheringRequestBuilder.getConstructor(Int::class.java) }
+    private val newTetheringRequestBuilder by lazy @TargetApi(30) {
+        classTetheringRequestBuilder.getConstructor(Int::class.java)
+    }
 //    @get:RequiresApi(30)
 //    private val setStaticIpv4Addresses by lazy {
 //        classTetheringRequestBuilder.getDeclaredMethod("setStaticIpv4Addresses",
 //                LinkAddress::class.java, LinkAddress::class.java)
 //    }
    @get:RequiresApi(30)
-    private val setExemptFromEntitlementCheck by lazy {
+    private val setExemptFromEntitlementCheck by lazy @TargetApi(30) {
        classTetheringRequestBuilder.getDeclaredMethod("setExemptFromEntitlementCheck", Boolean::class.java)
    }
    @get:RequiresApi(30)
-    private val setShouldShowEntitlementUi by lazy {
+    private val setShouldShowEntitlementUi by lazy @TargetApi(30) {
        classTetheringRequestBuilder.getDeclaredMethod("setShouldShowEntitlementUi", Boolean::class.java)
    }
    @get:RequiresApi(30)
-    private val build by lazy { classTetheringRequestBuilder.getDeclaredMethod("build") }
+    private val build by lazy @TargetApi(30) { classTetheringRequestBuilder.getDeclaredMethod("build") }

    @get:RequiresApi(30)
    private val interfaceStartTetheringCallback by lazy {
        Class.forName("android.net.TetheringManager\$StartTetheringCallback")
    }
    @get:RequiresApi(30)
-    private val startTethering by lazy {
+    private val startTethering by lazy @TargetApi(30) {
        clazz.getDeclaredMethod("startTethering", Class.forName("android.net.TetheringManager\$TetheringRequest"),
                Executor::class.java, interfaceStartTetheringCallback)
    }
    @get:RequiresApi(30)
-    private val stopTethering by lazy { clazz.getDeclaredMethod("stopTethering", Int::class.java) }
+    private val stopTethering by lazy @TargetApi(30) { clazz.getDeclaredMethod("stopTethering", Int::class.java) }

    @Deprecated("Legacy API")
    @RequiresApi(24)
@@ -498,11 +500,11 @@ object TetheringManager {
        Class.forName("android.net.TetheringManager\$TetheringEventCallback")
    }
    @get:RequiresApi(30)
-    private val registerTetheringEventCallback by lazy {
+    private val registerTetheringEventCallback by lazy @TargetApi(30) {
        clazz.getDeclaredMethod("registerTetheringEventCallback", Executor::class.java, interfaceTetheringEventCallback)
    }
    @get:RequiresApi(30)
-    private val unregisterTetheringEventCallback by lazy {
+    private val unregisterTetheringEventCallback by lazy @TargetApi(30) {
        clazz.getDeclaredMethod("unregisterTetheringEventCallback", interfaceTetheringEventCallback)
    }

@@ -621,7 +623,7 @@ object TetheringManager {
            "TETHER_ERROR_UNSUPPORTED", "TETHER_ERROR_UNAVAIL_IFACE", "TETHER_ERROR_MASTER_ERROR",
            "TETHER_ERROR_TETHER_IFACE_ERROR", "TETHER_ERROR_UNTETHER_IFACE_ERROR", "TETHER_ERROR_ENABLE_NAT_ERROR",
            "TETHER_ERROR_DISABLE_NAT_ERROR", "TETHER_ERROR_IFACE_CFG_ERROR", "TETHER_ERROR_PROVISION_FAILED",
-            "TETHER_ERROR_DHCPSERVER_ERROR", "TETHER_ERROR_ENTITLEMENT_UNKNOWN") { clazz }
+            "TETHER_ERROR_DHCPSERVER_ERROR", "TETHER_ERROR_ENTITLEMENT_UNKNOWN") @TargetApi(30) { clazz }
    @RequiresApi(30)
    const val TETHER_ERROR_NO_CHANGE_TETHERING_PERMISSION = 14

--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/IpMonitor.kt
@@ -114,8 +114,8 @@ abstract class IpMonitor {
                try {
                    RootManager.use { server ->
                        // while we only need to use this server once, we need to also keep the server alive
-                        handleChannel(server.create(ProcessListener(errorMatcher, Routing.IP, "monitor", monitoredObject),
-                            this))
+                        handleChannel(server.create(ProcessListener(errorMatcher,
+                            Routing.IP, "monitor", monitoredObject), this))
                    }
                } catch (_: CancellationException) {
                } catch (e: Exception) {
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/TetherTimeoutMonitor.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/monitor/TetherTimeoutMonitor.kt
@@ -45,8 +45,9 @@ class TetherTimeoutMonitor(private val timeout: Long = 0,
                } else {
                    val info = WifiApManager.resolvedActivity.activityInfo
                    val resources = app.packageManager.getResourcesForApplication(info.applicationInfo)
-                    resources.getInteger(resources.findIdentifier("config_wifiFrameworkSoftApShutDownTimeoutMilliseconds",
-                        "integer", WifiApManager.RESOURCES_PACKAGE, info.packageName))
+                    resources.getInteger(resources.findIdentifier(
+                        "config_wifiFrameworkSoftApShutDownTimeoutMilliseconds", "integer",
+                        WifiApManager.RESOURCES_PACKAGE, info.packageName))
                }
            } catch (e: RuntimeException) {
                Timber.w(e)
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/SoftApConfigurationCompat.kt
@@ -94,8 +94,7 @@ data class SoftApConfigurationCompat(
        /**
         * Based on:
         * https://elixir.bootlin.com/linux/v5.12.8/source/net/wireless/util.c#L75
-         * TODO: update for Android 12
-         * https://cs.android.com/android/platform/superproject/+/master:frameworks/base/wifi/java/android/net/wifi/ScanResult.java;l=624;drc=f7ccda05642b55700d67a288462bada488fc7f5e
+         * https://cs.android.com/android/platform/superproject/+/master:packages/modules/Wifi/framework/java/android/net/wifi/ScanResult.java;l=789;drc=71d758698c45984d3f8de981bf98e56902480f16
         */
        fun channelToFrequency(band: Int, chan: Int) = when (band) {
            BAND_2GHZ -> when (chan) {
@@ -211,23 +210,23 @@ data class SoftApConfigurationCompat(
        @get:RequiresApi(30)
        private val newBuilder by lazy @TargetApi(30) { classBuilder.getConstructor(SoftApConfiguration::class.java) }
        @get:RequiresApi(30)
-        private val build by lazy { classBuilder.getDeclaredMethod("build") }
+        private val build by lazy @TargetApi(30) { classBuilder.getDeclaredMethod("build") }
        @get:RequiresApi(30)
-        private val setAllowedClientList by lazy {
+        private val setAllowedClientList by lazy @TargetApi(30) {
            classBuilder.getDeclaredMethod("setAllowedClientList", java.util.List::class.java)
        }
        @get:RequiresApi(30)
-        private val setAutoShutdownEnabled by lazy {
+        private val setAutoShutdownEnabled by lazy @TargetApi(30) {
            classBuilder.getDeclaredMethod("setAutoShutdownEnabled", Boolean::class.java)
        }
        @get:RequiresApi(30)
-        private val setBand by lazy { classBuilder.getDeclaredMethod("setBand", Int::class.java) }
+        private val setBand by lazy @TargetApi(30) { classBuilder.getDeclaredMethod("setBand", Int::class.java) }
        @get:RequiresApi(30)
-        private val setBlockedClientList by lazy {
+        private val setBlockedClientList by lazy @TargetApi(30) {
            classBuilder.getDeclaredMethod("setBlockedClientList", java.util.List::class.java)
        }
        @get:RequiresApi(31)
-        private val setBridgedModeOpportunisticShutdownEnabled by lazy {
+        private val setBridgedModeOpportunisticShutdownEnabled by lazy @TargetApi(31) {
            classBuilder.getDeclaredMethod("setBridgedModeOpportunisticShutdownEnabled", Boolean::class.java)
        }
        @get:RequiresApi(30)
@@ -235,41 +234,43 @@ data class SoftApConfigurationCompat(
            classBuilder.getDeclaredMethod("setBssid", MacAddress::class.java)
        }
        @get:RequiresApi(30)
-        private val setChannel by lazy {
+        private val setChannel by lazy @TargetApi(30) {
            classBuilder.getDeclaredMethod("setChannel", Int::class.java, Int::class.java)
        }
        @get:RequiresApi(31)
-        private val setChannels by lazy {
+        private val setChannels by lazy @TargetApi(31) {
            classBuilder.getDeclaredMethod("setChannels", SparseIntArray::class.java)
        }
        @get:RequiresApi(30)
-        private val setClientControlByUserEnabled by lazy {
+        private val setClientControlByUserEnabled by lazy @TargetApi(30) {
            classBuilder.getDeclaredMethod("setClientControlByUserEnabled", Boolean::class.java)
        }
        @get:RequiresApi(30)
-        private val setHiddenSsid by lazy { classBuilder.getDeclaredMethod("setHiddenSsid", Boolean::class.java) }
+        private val setHiddenSsid by lazy @TargetApi(30) {
+            classBuilder.getDeclaredMethod("setHiddenSsid", Boolean::class.java)
+        }
        @get:RequiresApi(31)
-        private val setIeee80211axEnabled by lazy {
+        private val setIeee80211axEnabled by lazy @TargetApi(31) {
            classBuilder.getDeclaredMethod("setIeee80211axEnabled", Boolean::class.java)
        }
        @get:RequiresApi(31)
-        private val setMacRandomizationSetting by lazy {
+        private val setMacRandomizationSetting by lazy @TargetApi(31) {
            classBuilder.getDeclaredMethod("setMacRandomizationSetting", Int::class.java)
        }
        @get:RequiresApi(30)
-        private val setMaxNumberOfClients by lazy {
+        private val setMaxNumberOfClients by lazy @TargetApi(31) {
            classBuilder.getDeclaredMethod("setMaxNumberOfClients", Int::class.java)
        }
        @get:RequiresApi(30)
-        private val setPassphrase by lazy {
+        private val setPassphrase by lazy @TargetApi(30) {
            classBuilder.getDeclaredMethod("setPassphrase", String::class.java, Int::class.java)
        }
        @get:RequiresApi(30)
-        private val setShutdownTimeoutMillis by lazy {
+        private val setShutdownTimeoutMillis by lazy @TargetApi(30) {
            classBuilder.getDeclaredMethod("setShutdownTimeoutMillis", Long::class.java)
        }
        @get:RequiresApi(30)
-        private val setSsid by lazy { classBuilder.getDeclaredMethod("setSsid", String::class.java) }
+        private val setSsid by lazy @TargetApi(30) { classBuilder.getDeclaredMethod("setSsid", String::class.java) }
        @get:RequiresApi(31)
        private val setUserConfiguration by lazy @TargetApi(31) { UnblockCentral.setUserConfiguration(classBuilder) }

@@ -350,7 +351,7 @@ data class SoftApConfigurationCompat(
            if (channel == 0) setBand(builder, band) else setChannel(builder, channel, band)
        } else setChannels(builder, channels)
        @get:RequiresApi(30)
-        private val staticBuilder by lazy { classBuilder.newInstance() }
+        private val staticBuilder by lazy @TargetApi(30) { classBuilder.newInstance() }
        @RequiresApi(30)
        fun testPlatformValidity(channels: SparseIntArray) = setChannelsCompat(staticBuilder, channels)
        @RequiresApi(30)
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialogFragment.kt
@@ -64,7 +64,6 @@ class WifiApDialogFragment : AlertDialogFragment<WifiApDialogFragment.Arg, WifiA
                    channels2G + (15..165).map { ChannelOption(SoftApConfigurationCompat.BAND_5GHZ, it) }
        }
        private val p2pSafeOptions by lazy { genAutoOptions(SoftApConfigurationCompat.BAND_LEGACY) + channels5G }
-        @get:RequiresApi(30)
        private val softApOptions by lazy {
            when (Build.VERSION.SDK_INT) {
                in 30..Int.MAX_VALUE -> {