From 8bfbe8ce53a4821d6a7074bdd58f1135928b3332 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Sun, 14 Apr 2019 13:36:59 +0800
Subject: [PATCH] Refine code style

---
 mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt     | 2 +-
 mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt    | 2 +-
 .../main/java/be/mygod/vpnhotspot/net/wifi/WifiDoubleLock.kt    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
index 5a083229..1ae1e42d 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt
@@ -71,7 +71,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
                 val result = app.pref.getString(KEY_OPERATING_CHANNEL, null)?.toIntOrNull() ?: 0
                 return if (result in 1..165) result else 0
             }
-            set(value) = app.pref.edit { putString(RepeaterService.KEY_OPERATING_CHANNEL, value.toString()) }
+            set(value) = app.pref.edit { putString(KEY_OPERATING_CHANNEL, value.toString()) }
     }
 
     enum class Status {
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt
index 4a89e2b0..cbcbcf0c 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/MacLookup.kt
@@ -73,7 +73,7 @@ object MacLookup {
     private fun extractCountry(mac: Long, response: String, obj: JSONObject): MatchResult? {
         countryCodeRegex.matchEntire(obj.optString("country"))?.also { return it }
         val address = obj.optString("address")
-        if (address.isNullOrBlank()) return null
+        if (address.isBlank()) return null
         countryCodeRegex.find(address)?.also { return it }
         Timber.w(UnexpectedError(mac, response))
         return null
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiDoubleLock.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiDoubleLock.kt
index 7032d710..64078939 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiDoubleLock.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiDoubleLock.kt
@@ -69,7 +69,7 @@ class WifiDoubleLock(lockType: Int) : AutoCloseable {
         LowLatency(WifiManager.WIFI_MODE_FULL_LOW_LATENCY, true),
     }
 
-    class ActivityListener(val activity: ComponentActivity) :
+    class ActivityListener(private val activity: ComponentActivity) :
             LifecycleObserver, SharedPreferences.OnSharedPreferenceChangeListener {
         private var keepScreenOn: Boolean = false
             set(value) {