diff --git a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
index ff8233b93..5828ca719 100644
--- a/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
+++ b/app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
@@ -16,8 +16,10 @@ import kotlinx.coroutines.launch
import org.linphone.R
import org.linphone.core.tools.Log
import org.linphone.databinding.AccountProfileFragmentBinding
+import org.linphone.ui.main.calls.model.ConfirmationDialogModel
import org.linphone.ui.main.fragment.GenericFragment
import org.linphone.ui.main.settings.viewmodel.AccountProfileViewModel
+import org.linphone.utils.DialogUtils
import org.linphone.utils.Event
import org.linphone.utils.FileUtils
@@ -92,8 +94,29 @@ class AccountProfileFragment : GenericFragment() {
viewModel.accountRemovedEvent.observe(viewLifecycleOwner) {
it.consume {
- Log.i("$TAG Account has been removed, leaving profile")
- findNavController().popBackStack()
+ val model = ConfirmationDialogModel()
+ val dialog = DialogUtils.getConfirmAccountRemovalDialog(
+ requireActivity(),
+ model,
+ viewModel.displayName.value.orEmpty()
+ )
+
+ model.dismissEvent.observe(viewLifecycleOwner) {
+ it.consume {
+ dialog.dismiss()
+ }
+ }
+
+ model.confirmRemovalEvent.observe(viewLifecycleOwner) {
+ it.consume {
+ Log.i("$TAG Account has been removed, leaving profile")
+ findNavController().popBackStack()
+
+ dialog.dismiss()
+ }
+ }
+
+ dialog.show()
}
}
diff --git a/app/src/main/java/org/linphone/utils/DialogUtils.kt b/app/src/main/java/org/linphone/utils/DialogUtils.kt
index 06955a9e6..2fa96dd03 100644
--- a/app/src/main/java/org/linphone/utils/DialogUtils.kt
+++ b/app/src/main/java/org/linphone/utils/DialogUtils.kt
@@ -40,6 +40,7 @@ import org.linphone.databinding.DialogConfirmZrtpSasBinding
import org.linphone.databinding.DialogContactConfirmTrustCallBinding
import org.linphone.databinding.DialogContactTrustProcessBinding
import org.linphone.databinding.DialogPickNumberOrAddressBinding
+import org.linphone.databinding.DialogRemoveAccountBinding
import org.linphone.databinding.DialogRemoveAllCallLogsBinding
import org.linphone.ui.assistant.model.AcceptConditionsAndPolicyDialogModel
import org.linphone.ui.assistant.model.ConfirmPhoneNumberDialogModel
@@ -105,6 +106,27 @@ class DialogUtils {
return dialog
}
+ @UiThread
+ fun getConfirmAccountRemovalDialog(
+ context: Context,
+ viewModel: ConfirmationDialogModel,
+ displayName: String
+ ): Dialog {
+ val binding: DialogRemoveAccountBinding = DataBindingUtil.inflate(
+ LayoutInflater.from(context),
+ R.layout.dialog_remove_account,
+ null,
+ false
+ )
+ binding.viewModel = viewModel
+ binding.title.text = context.getString(
+ R.string.dialog_remove_account_title,
+ displayName
+ )
+
+ return getDialog(context, binding)
+ }
+
@UiThread
fun getNumberOrAddressPickerDialog(
context: Context,
@@ -157,7 +179,7 @@ class DialogUtils {
@UiThread
fun getRemoveAllCallLogsConfirmationDialog(
context: Context,
- model: ConfirmationDialogModel
+ viewModel: ConfirmationDialogModel
): Dialog {
val binding: DialogRemoveAllCallLogsBinding = DataBindingUtil.inflate(
LayoutInflater.from(context),
@@ -165,7 +187,7 @@ class DialogUtils {
null,
false
)
- binding.viewModel = model
+ binding.viewModel = viewModel
return getDialog(context, binding)
}
@@ -173,7 +195,7 @@ class DialogUtils {
@UiThread
fun getCancelContactChangesConfirmationDialog(
context: Context,
- model: ConfirmationDialogModel
+ viewModel: ConfirmationDialogModel
): Dialog {
val binding: DialogCancelContactChangesBinding = DataBindingUtil.inflate(
LayoutInflater.from(context),
@@ -181,7 +203,7 @@ class DialogUtils {
null,
false
)
- binding.viewModel = model
+ binding.viewModel = viewModel
return getDialog(context, binding)
}
diff --git a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
index 8cd66f892..19a510e25 100644
--- a/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
+++ b/app/src/main/res/layout/account_profile_secure_mode_fragment.xml
@@ -19,255 +19,266 @@
type="View.OnClickListener" />
-
-
+
-
+
-
+
-
+ android:layout_marginTop="16dp">
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_remove_account.xml b/app/src/main/res/layout/dialog_remove_account.xml
new file mode 100644
index 000000000..368d51793
--- /dev/null
+++ b/app/src/main/res/layout/dialog_remove_account.xml
@@ -0,0 +1,126 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index d2113c50b..8f13c1695 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -25,279 +25,286 @@
type="org.linphone.ui.main.help.viewmodel.HelpViewModel" />
-
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1b13e3b35..63e487a81 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -73,6 +73,8 @@
All calls will be deleted of the history
Blah
Blah
+ Delete %s?
+ You can reconnect at any time by clicking “Add an account”. However, all data on this phone will be deleted.
QR code validated!
Invalid QR code!