From 731a654ed4aec223a15f5417fb10b6b56007d66a Mon Sep 17 00:00:00 2001
From: Mygod <contact-git@mygod.be>
Date: Sat, 23 May 2020 09:01:01 +0800
Subject: [PATCH] Reset group using best effort

---
 .../main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
index efc2709a..7217b2c8 100644
--- a/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
+++ b/mobile/src/main/java/be/mygod/vpnhotspot/manage/RepeaterManager.kt
@@ -211,9 +211,10 @@ class RepeaterManager(private val parent: TetheringFragment) : Manager(), Servic
                 else -> throw IllegalArgumentException("Unknown apBand")
             }
         } else holder.config?.let { master ->
+            val binder = binder
             if (binder?.group?.networkName != config.SSID || master.psk != config.preSharedKey) try {
                 withContext(Dispatchers.Default) { master.update(config.SSID, config.preSharedKey) }
-                binder!!.group = null
+                (this.binder ?: binder)?.group = null
             } catch (e: Exception) {
                 Timber.w(e)
                 SmartSnackbar.make(e).show()