From f75ac30804aa4f24b5961a8666efda3c7c83eaa9 Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 28 May 2021 21:20:51 -0400 Subject: [PATCH] Fix lint again --- .../main/java/be/mygod/vpnhotspot/RepeaterService.kt | 4 +++- .../be/mygod/vpnhotspot/manage/TetheringFragment.kt | 12 ++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt index 80287a5a..d3184f49 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt @@ -11,6 +11,7 @@ import android.net.wifi.p2p.* import android.os.Build import android.os.Looper import android.provider.Settings +import androidx.annotation.RequiresApi import androidx.annotation.StringRes import androidx.core.content.edit import be.mygod.vpnhotspot.App.Companion.app @@ -50,7 +51,8 @@ class RepeaterService : Service(), CoroutineScope, WifiP2pManager.ChannelListene var persistentSupported = false - private val hasP2pValidateName by lazy @TargetApi(29) { + @get:RequiresApi(29) + private val hasP2pValidateName by lazy { val array = Build.VERSION.SECURITY_PATCH.split('-', limit = 3) val y = array.getOrNull(0)?.toIntOrNull() val m = array.getOrNull(1)?.toIntOrNull() diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt index 4637a66c..25be6bb0 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/TetheringFragment.kt @@ -45,22 +45,18 @@ class TetheringFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClick inner class ManagerAdapter : ListAdapter(Manager), TetheringManager.TetheringEventCallback { internal val repeaterManager by lazy { RepeaterManager(this@TetheringFragment) } - @delegate:TargetApi(26) @get:RequiresApi(26) - internal val localOnlyHotspotManager by lazy { LocalOnlyHotspotManager(this@TetheringFragment) } - @delegate:TargetApi(24) + internal val localOnlyHotspotManager by lazy @TargetApi(26) { LocalOnlyHotspotManager(this@TetheringFragment) } @get:RequiresApi(24) - internal val bluetoothManager by lazy { TetherManager.Bluetooth(this@TetheringFragment) } - @delegate:TargetApi(24) + internal val bluetoothManager by lazy @TargetApi(24) { TetherManager.Bluetooth(this@TetheringFragment) } @get:RequiresApi(24) - private val tetherManagers by lazy { + private val tetherManagers by lazy @TargetApi(24) { listOf(TetherManager.Wifi(this@TetheringFragment), TetherManager.Usb(this@TetheringFragment), bluetoothManager) } - @delegate:TargetApi(30) @get:RequiresApi(30) - private val tetherManagers30 by lazy { + private val tetherManagers30 by lazy @TargetApi(30) { listOf(TetherManager.Ethernet(this@TetheringFragment), TetherManager.Ncm(this@TetheringFragment), TetherManager.WiGig(this@TetheringFragment))