mirrors/linphone-android
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-android.git synced 2026-01-17 11:28:06 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Prevent crash due to CountryPickerFragment not having a constructor without params

Browse source
This commit is contained in:
Sylvain Berfini 2023-01-05 10:22:44 +01:00
parent 584880e4df
commit dbe0655f0f
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/linphone/activities/assistant/fragments/AccountLoginFragment.kt
View file

@ -67,7 +67,9 @@ class AccountLoginFragment : AbstractPhoneFragment<AssistantAccountLoginFragment
}
binding.setSelectCountryClickListener {
CountryPickerFragment(viewModel).show(childFragmentManager, "CountryPicker")
val countryPickerFragment = CountryPickerFragment()
countryPickerFragment.listener = viewModel
countryPickerFragment.show(childFragmentManager, "CountryPicker")
}
binding.setForgotPasswordClickListener {

6
app/src/main/java/org/linphone/activities/assistant/fragments/CountryPickerFragment.kt
View file

@ -29,11 +29,13 @@ import org.linphone.activities.assistant.adapters.CountryPickerAdapter
import org.linphone.core.DialPlan
import org.linphone.databinding.AssistantCountryPickerFragmentBinding
class CountryPickerFragment(private val listener: CountryPickedListener) : DialogFragment() {
class CountryPickerFragment() : DialogFragment() {
private var _binding: AssistantCountryPickerFragmentBinding? = null
private val binding get() = _binding!!
private lateinit var adapter: CountryPickerAdapter
var listener: CountryPickedListener? = null
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setStyle(STYLE_NO_TITLE, R.style.assistant_country_dialog_style)
@ -57,7 +59,7 @@ class CountryPickerFragment(private val listener: CountryPickedListener) : Dialo
binding.countryList.setOnItemClickListener { _, _, position, _ ->
if (position >= 0 && position < adapter.count) {
val dialPlan = adapter.getItem(position)
listener.onCountryClicked(dialPlan)
listener?.onCountryClicked(dialPlan)
}
dismiss()
}

4
app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountCreationFragment.kt
View file

@ -57,7 +57,9 @@ class PhoneAccountCreationFragment :
}
binding.setSelectCountryClickListener {
CountryPickerFragment(viewModel).show(childFragmentManager, "CountryPicker")
val countryPickerFragment = CountryPickerFragment()
countryPickerFragment.listener = viewModel
countryPickerFragment.show(childFragmentManager, "CountryPicker")
}
viewModel.goToSmsValidationEvent.observe(

4
app/src/main/java/org/linphone/activities/assistant/fragments/PhoneAccountLinkingFragment.kt
View file

@ -68,7 +68,9 @@ class PhoneAccountLinkingFragment : AbstractPhoneFragment<AssistantPhoneAccountL
}
binding.setSelectCountryClickListener {
CountryPickerFragment(viewModel).show(childFragmentManager, "CountryPicker")
val countryPickerFragment = CountryPickerFragment()
countryPickerFragment.listener = viewModel
countryPickerFragment.show(childFragmentManager, "CountryPicker")
}
viewModel.goToSmsValidationEvent.observe(