brianhansonxyz/vpnhotspotmod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix crash caused by value class incompatibility

Browse Source
This commit is contained in:
Mygod
2021-05-19 12:34:13 -04:00
parent 17d64e5c2b
commit 1179bc9563
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
mobile/src/main/java/be/mygod/vpnhotspot/client/ClientsFragment.kt
View File

@@ -46,12 +46,13 @@ import kotlinx.parcelize.Parcelize
import java.text.NumberFormat import java.text.NumberFormat
class ClientsFragment : Fragment() { class ClientsFragment : Fragment() {
// FIXME: value class does not work with Parcelize
@Parcelize @Parcelize
data class NicknameArg(val mac: MacAddressCompat, val nickname: CharSequence) : Parcelable data class NicknameArg(val mac: Long, val nickname: CharSequence) : Parcelable
class NicknameDialogFragment : AlertDialogFragment<NicknameArg, Empty>() { class NicknameDialogFragment : AlertDialogFragment<NicknameArg, Empty>() {
override fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener) { override fun AlertDialog.Builder.prepare(listener: DialogInterface.OnClickListener) {
setView(R.layout.dialog_nickname) setView(R.layout.dialog_nickname)
setTitle(getString(R.string.clients_nickname_title, arg.mac.toString())) setTitle(getString(R.string.clients_nickname_title, MacAddressCompat(arg.mac)))
setPositiveButton(android.R.string.ok, listener) setPositiveButton(android.R.string.ok, listener)
setNegativeButton(android.R.string.cancel, null) setNegativeButton(android.R.string.cancel, null)
setNeutralButton(emojize(getText(R.string.clients_nickname_set_to_vendor)), listener) setNeutralButton(emojize(getText(R.string.clients_nickname_set_to_vendor)), listener)
@@ -63,15 +64,16 @@ class ClientsFragment : Fragment() {
} }
override fun onClick(dialog: DialogInterface?, which: Int) { override fun onClick(dialog: DialogInterface?, which: Int) {
val mac = MacAddressCompat(arg.mac)
when (which) { when (which) {
DialogInterface.BUTTON_POSITIVE -> { DialogInterface.BUTTON_POSITIVE -> {
val newNickname = this.dialog!!.findViewById<EditText>(android.R.id.edit).text val newNickname = this.dialog!!.findViewById<EditText>(android.R.id.edit).text
MacLookup.abort(arg.mac) MacLookup.abort(mac)
GlobalScope.launch(Dispatchers.Unconfined) { GlobalScope.launch(Dispatchers.Unconfined) {
AppDatabase.instance.clientRecordDao.upsert(arg.mac) { nickname = newNickname } AppDatabase.instance.clientRecordDao.upsert(mac) { nickname = newNickname }
} }
} }
DialogInterface.BUTTON_NEUTRAL -> MacLookup.perform(arg.mac, true) DialogInterface.BUTTON_NEUTRAL -> MacLookup.perform(mac, true)
} }
} }
} }
@@ -132,7 +134,7 @@ class ClientsFragment : Fragment() {
R.id.nickname -> { R.id.nickname -> {
val client = binding.client ?: return false val client = binding.client ?: return false
NicknameDialogFragment().apply { NicknameDialogFragment().apply {
arg(NicknameArg(client.mac, client.nickname)) arg(NicknameArg(client.mac.addr, client.nickname))
}.showAllowingStateLoss(parentFragmentManager) }.showAllowingStateLoss(parentFragmentManager)
true true
} }