From f83f81120b59e39f4cf8665b615e51963353e3eb Mon Sep 17 00:00:00 2001 From: Mygod Date: Fri, 22 Mar 2019 12:06:55 +0800 Subject: [PATCH] Fix NPE --- .../main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt index 30d5bc68..209eab65 100644 --- a/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt +++ b/mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt @@ -67,11 +67,10 @@ class ClientsFragment : Fragment(), MainScope by MainScope.Supervisor() { override fun onClick(dialog: DialogInterface?, which: Int) { when (which) { DialogInterface.BUTTON_POSITIVE -> { + val newNickname = this@NicknameDialogFragment.dialog!!.findViewById(android.R.id.edit).text MacLookup.abort(arg.mac) GlobalScope.launch(Dispatchers.Unconfined) { - AppDatabase.instance.clientRecordDao.upsert(arg.mac) { - nickname = this@NicknameDialogFragment.dialog!!.findViewById(android.R.id.edit).text - } + AppDatabase.instance.clientRecordDao.upsert(arg.mac) { nickname = newNickname } } } DialogInterface.BUTTON_NEUTRAL -> MacLookup.perform(arg.mac, true)