diff --git a/app/src/main/java/org/linphone/contact/BigContactAvatarView.kt b/app/src/main/java/org/linphone/contact/BigContactAvatarView.kt
index a6304cb1b..d4510f9a9 100644
--- a/app/src/main/java/org/linphone/contact/BigContactAvatarView.kt
+++ b/app/src/main/java/org/linphone/contact/BigContactAvatarView.kt
@@ -25,6 +25,7 @@ import android.view.LayoutInflater
import android.view.View
import android.widget.LinearLayout
import androidx.databinding.DataBindingUtil
+import org.linphone.LinphoneApplication
import org.linphone.R
import org.linphone.databinding.ContactAvatarBigBinding
import org.linphone.utils.AppUtils
@@ -67,5 +68,6 @@ class BigContactAvatarView : LinearLayout {
binding.initials = initials
binding.generatedAvatarVisibility = initials.isNotEmpty() && initials != "+"
binding.imagePath = contact?.getContactPictureUri()
+ binding.borderVisibility = LinphoneApplication.corePreferences.showBorderOnBigContactAvatar
}
}
diff --git a/app/src/main/java/org/linphone/contact/ContactAvatarView.kt b/app/src/main/java/org/linphone/contact/ContactAvatarView.kt
index 86537d66e..cf3cdbe1c 100644
--- a/app/src/main/java/org/linphone/contact/ContactAvatarView.kt
+++ b/app/src/main/java/org/linphone/contact/ContactAvatarView.kt
@@ -24,6 +24,7 @@ import android.util.AttributeSet
import android.view.LayoutInflater
import android.widget.LinearLayout
import androidx.databinding.DataBindingUtil
+import org.linphone.LinphoneApplication.Companion.corePreferences
import org.linphone.R
import org.linphone.core.ChatRoomSecurityLevel
import org.linphone.databinding.ContactAvatarBinding
@@ -63,6 +64,7 @@ class ContactAvatarView : LinearLayout {
binding.groupChatAvatarVisibility = viewModel.showGroupChatAvatar
binding.imagePath = contact?.getContactThumbnailPictureUri()
+ binding.borderVisibility = corePreferences.showBorderOnContactAvatar
binding.securityIcon = when (viewModel.securityLevel) {
ChatRoomSecurityLevel.Safe -> R.drawable.security_2_indicator
diff --git a/app/src/main/java/org/linphone/core/CorePreferences.kt b/app/src/main/java/org/linphone/core/CorePreferences.kt
index 8a9481b42..25e6a7aa3 100644
--- a/app/src/main/java/org/linphone/core/CorePreferences.kt
+++ b/app/src/main/java/org/linphone/core/CorePreferences.kt
@@ -240,6 +240,12 @@ class CorePreferences constructor(private val context: Context) {
val contactOrganizationVisible: Boolean
get() = config.getBool("app", "display_contact_organization", true)
+ val showBorderOnContactAvatar: Boolean
+ get() = config.getBool("app", "show_border_on_contact_avatar", false)
+
+ val showBorderOnBigContactAvatar: Boolean
+ get() = config.getBool("app", "show_border_on_big_contact_avatar", true)
+
val checkIfUpdateAvailableUrl: String?
get() = config.getString("misc", "version_check_url_root", null)
diff --git a/app/src/main/res/layout/contact_avatar.xml b/app/src/main/res/layout/contact_avatar.xml
index 4c17a5d7e..9c0ad7653 100644
--- a/app/src/main/res/layout/contact_avatar.xml
+++ b/app/src/main/res/layout/contact_avatar.xml
@@ -28,6 +28,9 @@
+
+
+
+
+
+