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

Forgot to change the label of sign out button in the confirmation dialog + hide delete account message for third party accounts

Browse source
This commit is contained in:
Sylvain Berfini 2024-09-17 17:07:33 +02:00
parent 5eece24d68
commit b2b55305d2
5 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/org/linphone/ui/main/settings/fragment/AccountProfileFragment.kt
View file

@ -164,7 +164,8 @@ class AccountProfileFragment : GenericMainFragment() {
val model = ConfirmationDialogModel()
val dialog = DialogUtils.getConfirmAccountRemovalDialog(
requireActivity(),
model
model,
viewModel.isOnDefaultDomain.value == true
)
model.dismissEvent.observe(viewLifecycleOwner) {

6
app/src/main/java/org/linphone/ui/main/settings/viewmodel/AccountProfileViewModel.kt
View file

@ -70,7 +70,7 @@ class AccountProfileViewModel @UiThread constructor() : GenericViewModel() {
val expandDevices = MutableLiveData<Boolean>()
val devicesAvailable = MutableLiveData<Boolean>()
val isOnDefaultDomain = MutableLiveData<Boolean>()
val devicesFetchInProgress = MutableLiveData<Boolean>()
@ -156,6 +156,7 @@ class AccountProfileViewModel @UiThread constructor() : GenericViewModel() {
expandDevices.value = false
showDeviceId.value = false
devicesFetchInProgress.value = true
isOnDefaultDomain.value = false
coreContext.postOnCoreThread {
hideAccountSettings.postValue(corePreferences.hideAccountSettings)
@ -195,12 +196,13 @@ class AccountProfileViewModel @UiThread constructor() : GenericViewModel() {
sipAddress.postValue(account.params.identityAddress?.asStringUriOnly())
displayName.postValue(account.params.identityAddress?.displayName)
showDeviceId.postValue(false)
val identityAddress = account.params.identityAddress
if (identityAddress != null) {
val domain = identityAddress.domain
val defaultDomain = corePreferences.defaultDomain
devicesAvailable.postValue(domain == defaultDomain)
isOnDefaultDomain.postValue(domain == defaultDomain)
if (domain == defaultDomain) {
Log.i(
"$TAG Request list of known devices for account [${identityAddress.asStringUriOnly()}]"

5
app/src/main/java/org/linphone/utils/DialogUtils.kt
View file

@ -25,6 +25,7 @@ import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Drawable
import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.Window
import android.view.WindowManager
import androidx.annotation.UiThread
@ -122,7 +123,8 @@ class DialogUtils {
@UiThread
fun getConfirmAccountRemovalDialog(
context: Context,
viewModel: ConfirmationDialogModel
viewModel: ConfirmationDialogModel,
showDeleteAccountLink: Boolean
): Dialog {
val binding: DialogRemoveAccountBinding = DataBindingUtil.inflate(
LayoutInflater.from(context),
@ -131,6 +133,7 @@ class DialogUtils {
false
)
binding.viewModel = viewModel
binding.message.visibility = if (showDeleteAccountLink) View.VISIBLE else View.GONE
return getDialog(context, binding)
}

4
app/src/main/res/layout/account_profile_fragment.xml
View file

@ -428,7 +428,7 @@
android:layout_marginEnd="26dp"
android:layout_marginTop="32dp"
android:text="@string/manage_account_devices_title"
android:visibility="@{viewModel.devicesAvailable ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{viewModel.isOnDefaultDomain ? View.VISIBLE : View.GONE, default=gone}"
android:drawableEnd="@{viewModel.expandDevices ? @drawable/caret_up : @drawable/caret_down, default=@drawable/caret_up}"
android:drawableTint="@color/gray_main2_600"
app:layout_constraintStart_toStartOf="parent"
@ -449,7 +449,7 @@
android:paddingEnd="16dp"
android:paddingBottom="20dp"
android:background="@drawable/shape_squircle_white_background"
android:visibility="@{viewModel.devicesAvailable &amp;&amp; viewModel.expandDevices ? View.VISIBLE : View.GONE, default=gone}"
android:visibility="@{viewModel.isOnDefaultDomain &amp;&amp; viewModel.expandDevices ? View.VISIBLE : View.GONE, default=gone}"
app:entries="@{viewModel.devices}"
app:layout="@{@layout/account_profile_device_list_cell}"
app:layout_constraintHeight_min="80dp"

2
app/src/main/res/layout/dialog_remove_account.xml
View file

@ -85,7 +85,7 @@
android:layout_marginTop="16dp"
android:layout_marginStart="15dp"
android:layout_marginEnd="15dp"
android:text="@string/dialog_delete"
android:text="@string/manage_account_delete"
app:layout_constraintStart_toStartOf="@id/dialog_background"
app:layout_constraintEnd_toEndOf="@id/dialog_background"
app:layout_constraintTop_toBottomOf="@id/cancel"