From 2d3e8556fd8a7e258ab55bbfdbbe9360ab0b3639 Mon Sep 17 00:00:00 2001
From: Mygod <contact-github@mygod.be>
Date: Sat, 21 Apr 2018 20:28:27 -0700
Subject: [PATCH] Refine code style

---
 .../src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt   | 6 +++---
 .../mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt | 3 ++-
 .../net/wifi/{WifiApDialog.kt => WifiP2pDialog.kt}          | 5 +++--
 mobile/src/main/res/values-zh-rCN/strings.xml               | 3 ---
 4 files changed, 8 insertions(+), 9 deletions(-)
 rename mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/{WifiApDialog.kt => WifiP2pDialog.kt} (94%)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
index b886f49f..61eca57a 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/RepeaterFragment.kt
@@ -30,7 +30,7 @@ import be.mygod.vpnhotspot.net.IpNeighbourMonitor
 import be.mygod.vpnhotspot.net.TetheringManager
 import be.mygod.vpnhotspot.net.TetherType
 import be.mygod.vpnhotspot.net.wifi.P2pSupplicantConfiguration
-import be.mygod.vpnhotspot.net.wifi.WifiApDialog
+import be.mygod.vpnhotspot.net.wifi.WifiP2pDialog
 import java.net.NetworkInterface
 import java.net.SocketException
 import java.util.*
@@ -248,8 +248,8 @@ class RepeaterFragment : Fragment(), ServiceConnection, Toolbar.OnMenuItemClickL
                 return
             }
             if (wifi.preSharedKey != null && wifi.preSharedKey.length >= 8) {
-                var dialog: WifiApDialog? = null
-                dialog = WifiApDialog(context, DialogInterface.OnClickListener { _, which ->
+                var dialog: WifiP2pDialog? = null
+                dialog = WifiP2pDialog(context, DialogInterface.OnClickListener { _, which ->
                     when (which) {
                         DialogInterface.BUTTON_POSITIVE -> when (conf.update(dialog!!.config!!)) {
                             true -> binder.requestGroupUpdate()
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
index 4b8e2245..7dd0c2f9 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/P2pSupplicantConfiguration.kt
@@ -53,7 +53,8 @@ class P2pSupplicantConfiguration {
                 Log.w(TAG, "Invalid conf ($ssidFound, $pskFound): $content")
                 return false
             }
-            return noisySu("cat ${tempFile.absolutePath} > /data/misc/wifi/p2p_supplicant.conf", "killall wpa_supplicant")
+            return noisySu("cat ${tempFile.absolutePath} > /data/misc/wifi/p2p_supplicant.conf",
+                    "killall wpa_supplicant")
         } finally {
             if (!tempFile.delete()) tempFile.deleteOnExit()
         }
diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialog.kt b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialog.kt
similarity index 94%
rename from mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialog.kt
rename to mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialog.kt
index 00778a3e..1312270f 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiApDialog.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/net/wifi/WifiP2pDialog.kt
@@ -19,8 +19,9 @@ import java.nio.charset.Charset
 /**
  * https://android.googlesource.com/platform/packages/apps/Settings/+/39b4674/src/com/android/settings/wifi/WifiApDialog.java
  */
-class WifiApDialog(mContext: Context, private val mListener: DialogInterface.OnClickListener,
-                   private val mWifiConfig: WifiConfiguration?) : AlertDialog(mContext), View.OnClickListener, TextWatcher {
+class WifiP2pDialog(mContext: Context, private val mListener: DialogInterface.OnClickListener,
+                    private val mWifiConfig: WifiConfiguration?) :
+        AlertDialog(mContext), View.OnClickListener, TextWatcher {
     companion object {
         private const val BUTTON_SUBMIT = DialogInterface.BUTTON_POSITIVE
     }
diff --git a/mobile/src/main/res/values-zh-rCN/strings.xml b/mobile/src/main/res/values-zh-rCN/strings.xml
index 6bb73d79..bceabd82 100644
--- a/mobile/src/main/res/values-zh-rCN/strings.xml
+++ b/mobile/src/main/res/values-zh-rCN/strings.xml
@@ -14,9 +14,6 @@
     <string name="repeater_configure">设置 WLAN 中继</string>
     <string name="repeater_configure_failure">未能找到有效的档案。请尝试先打开中继。</string>
     <string name="repeater_reset_credentials">重置</string>
-    <string name="repeater_reset_credentials_dialog_message">Android
-        系统将在下次打开中继时生成新的中继名称和密码。该操作不可撤销。</string>
-    <string name="repeater_reset_credentials_dialog_reset">重置</string>
     <string name="repeater_reset_credentials_success">凭据已重置。</string>
     <string name="repeater_reset_credentials_failure">重置凭据失败（原因：%s）</string>