Handle p2p service disconnection

mobile/src/main/java/be/mygod/vpnhotspot/RepeaterService.kt

@@ -11,6 +11,7 @@ import android.net.wifi.p2p.WifiP2pManager
 import android.os.Looper
 import androidx.annotation.StringRes
 import androidx.core.content.getSystemService
+import androidx.core.os.postDelayed
 import be.mygod.vpnhotspot.App.Companion.app
 import be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper
 import be.mygod.vpnhotspot.net.wifi.WifiP2pManagerHelper.deletePersistentGroup
@@ -44,7 +45,9 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
         private var groups: Collection<WifiP2pGroup> = emptyList()
 
         fun startWps(pin: String? = null) {
-            if (active) p2pManager.startWps(channel, WpsInfo().apply {
+            val channel = channel
+            if (channel == null) SmartSnackbar.make(R.string.repeater_failure_disconnected).show()
+            else if (active) p2pManager.startWps(channel, WpsInfo().apply {
                 setup = if (pin == null) WpsInfo.PBC else {
                     this.pin = pin
                     WpsInfo.KEYPAD
@@ -62,19 +65,23 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
             if (active) removeGroup()
         }
 
-        fun resetCredentials() = (groups + group).filterNotNull().forEach {
+        fun resetCredentials() {
-            p2pManager.deletePersistentGroup(channel, it.netId, object : WifiP2pManager.ActionListener {
+            val channel = channel
-                override fun onSuccess() = SmartSnackbar.make(R.string.repeater_reset_credentials_success)
+            if (channel == null) SmartSnackbar.make(R.string.repeater_failure_disconnected).show()
-                        .shortToast().show()
+            else (groups + group).filterNotNull().forEach {
-                override fun onFailure(reason: Int) = SmartSnackbar.make(
+                p2pManager.deletePersistentGroup(channel, it.netId, object : WifiP2pManager.ActionListener {
-                        formatReason(R.string.repeater_reset_credentials_failure, reason)).show()
+                    override fun onSuccess() = SmartSnackbar.make(R.string.repeater_reset_credentials_success)
-            })
+                            .shortToast().show()
+                    override fun onFailure(reason: Int) = SmartSnackbar.make(
+                            formatReason(R.string.repeater_reset_credentials_failure, reason)).show()
+                })
+            }
         }
 
         fun requestGroupUpdate() {
             group = null
             try {
-                p2pManager.requestPersistentGroupInfo(channel) {
+                p2pManager.requestPersistentGroupInfo(channel ?: return) {
                     groups = it
                     if (it.size == 1) group = it.single()
                 }
@@ -86,7 +93,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
     }
 
     private lateinit var p2pManager: WifiP2pManager
-    private lateinit var channel: WifiP2pManager.Channel
+    private var channel: WifiP2pManager.Channel? = null
     var group: WifiP2pGroup? = null
         private set(value) {
             field = value
@@ -134,17 +141,19 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
         try {
             p2pManager = getSystemService()!!
             onChannelDisconnected()
-            app.pref.registerOnSharedPreferenceChangeListener(this)
         } catch (e: RuntimeException) {
             Timber.w(e)
         }
+        app.pref.registerOnSharedPreferenceChangeListener(this)
     }
 
     override fun onBind(intent: Intent) = binder
 
     private fun setOperatingChannel(oc: Int = app.operatingChannel) = try {
+        val channel = channel
+        if (channel == null) SmartSnackbar.make(R.string.repeater_failure_disconnected).show()
         // we don't care about listening channel
-        p2pManager.setWifiP2pChannels(channel, 0, oc, object : WifiP2pManager.ActionListener {
+        else p2pManager.setWifiP2pChannels(channel, 0, oc, object : WifiP2pManager.ActionListener {
             override fun onSuccess() { }
             override fun onFailure(reason: Int) {
                 SmartSnackbar.make(formatReason(R.string.repeater_set_oc_failure, reason)).show()
@@ -159,9 +168,15 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
     }
 
     override fun onChannelDisconnected() {
-        channel = p2pManager.initialize(this, Looper.getMainLooper(), this)
+        channel = null
-        setOperatingChannel()
+        try {
-        binder.requestGroupUpdate()
+            channel = p2pManager.initialize(this, Looper.getMainLooper(), this)
+            setOperatingChannel()
+            binder.requestGroupUpdate()
+        } catch (e: RuntimeException) {
+            Timber.w(e)
+            app.handler.postDelayed(1000, this, this::onChannelDisconnected)
+        }
     }
 
     override fun onSharedPreferenceChanged(sharedPreferences: SharedPreferences?, key: String?) {
@@ -263,6 +278,7 @@ class RepeaterService : Service(), WifiP2pManager.ChannelListener, SharedPrefere
     }
 
     override fun onDestroy() {
+        app.handler.removeCallbacksAndMessages(this)
         if (status != Status.IDLE) binder.shutdown()
         clean() // force clean to prevent leakage
         app.pref.unregisterOnSharedPreferenceChangeListener(this)

mobile/src/main/res/values-zh-rCN/strings.xml

@@ -27,6 +27,7 @@
     <string name="repeater_failure_reason_p2p_unsupported">设备不支持 Wi\u2011Fi 直连</string>
     <string name="repeater_failure_reason_no_service_requests">未添加服务请求</string>
     <string name="repeater_failure_reason_unsupported_operation">不支持此操作</string>
+    <string name="repeater_failure_disconnected">服务不可用，请稍后重试</string>
 
     <string name="tethering_temp_hotspot">临时 WLAN 热点</string>
     <string name="tethering_temp_hotspot_location">使用临时热点需要打开位置服务。</string>

mobile/src/main/res/values/strings.xml

@@ -38,6 +38,7 @@
     <string name="repeater_failure_reason_p2p_unsupported">Wi\u2011Fi direct unsupported</string>
     <string name="repeater_failure_reason_no_service_requests">no service requests added</string>
     <string name="repeater_failure_reason_unsupported_operation">unsupported operation</string>
+    <string name="repeater_failure_disconnected">Service unavailable. Try again later</string>
 
     <string name="tethering_temp_hotspot">Temporary Wi\u2011Fi hotspot</string>
     <string name="tethering_temp_hotspot_location">Temporary hotspot requires location to be turned on.</string>