Retain value of account's Check Origin when Register is toggled
This commit is contained in:
@ -1454,20 +1454,11 @@ private fun checkOnClick(ctx: Context, viewModel: AccountViewModel, ua: UserAgen
|
|||||||
acc.configuredRegInt = regInt
|
acc.configuredRegInt = regInt
|
||||||
}
|
}
|
||||||
|
|
||||||
if (acc.regint == 0)
|
val newCheckOrigin = viewModel.checkOrigin.value
|
||||||
Api.account_set_check_origin(ua.account.accp, false)
|
if (newCheckOrigin != acc.checkOrigin) {
|
||||||
else
|
Api.account_set_check_origin(ua.account.accp, newCheckOrigin)
|
||||||
Api.account_set_check_origin(ua.account.accp, viewModel.checkOrigin.value)
|
acc.checkOrigin = Api.account_check_origin(ua.account.accp)
|
||||||
acc.checkOrigin = Api.account_check_origin(ua.account.accp)
|
Log.d(TAG, "New checkOrigin is ${acc.checkOrigin}")
|
||||||
|
|
||||||
val newMediaEnc = viewModel.mediaEnc.value
|
|
||||||
if (newMediaEnc != acc.mediaEnc) {
|
|
||||||
if (Api.account_set_mediaenc(acc.accp, newMediaEnc) == 0) {
|
|
||||||
acc.mediaEnc = Api.account_mediaenc(acc.accp)
|
|
||||||
Log.d(TAG, "New mediaenc is ${acc.mediaEnc}")
|
|
||||||
}
|
|
||||||
else
|
|
||||||
Log.e(TAG, "Setting of mediaenc $newMediaEnc failed")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
val newMediaNat = viewModel.mediaNat.value
|
val newMediaNat = viewModel.mediaNat.value
|
||||||
|
|||||||
@ -13,7 +13,7 @@ class AccountViewModel: ViewModel() {
|
|||||||
val outbound2 = MutableStateFlow("")
|
val outbound2 = MutableStateFlow("")
|
||||||
val register = MutableStateFlow(false)
|
val register = MutableStateFlow(false)
|
||||||
val regInt = MutableStateFlow("")
|
val regInt = MutableStateFlow("")
|
||||||
val checkOrigin = MutableStateFlow(false)
|
val checkOrigin = MutableStateFlow(true)
|
||||||
val mediaEnc = MutableStateFlow("")
|
val mediaEnc = MutableStateFlow("")
|
||||||
val mediaNat = MutableStateFlow("")
|
val mediaNat = MutableStateFlow("")
|
||||||
val stunServer = MutableStateFlow("")
|
val stunServer = MutableStateFlow("")
|
||||||
|
|||||||
Reference in New Issue
Block a user