From 51179c083c128400a3e5db72169e37fa113ca16b Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Mon, 25 Sep 2023 11:02:40 +0200
Subject: [PATCH] Not needed

---
 .../java/org/linphone/contacts/ContactsManager.kt     | 11 +++--------
 .../linphone/notifications/NotificationsManager.kt    |  7 ++++---
 2 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/app/src/main/java/org/linphone/contacts/ContactsManager.kt b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
index f44f8ef99..c9d232be5 100644
--- a/app/src/main/java/org/linphone/contacts/ContactsManager.kt
+++ b/app/src/main/java/org/linphone/contacts/ContactsManager.kt
@@ -25,6 +25,7 @@ import android.content.Context
 import android.content.pm.PackageManager
 import android.database.Cursor
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.net.Uri
 import android.provider.ContactsContract
 import androidx.annotation.UiThread
@@ -300,10 +301,7 @@ class ContactsManager @UiThread constructor(context: Context) {
 
         val photo = account?.params?.pictureUri.orEmpty()
         val bm: Bitmap? = if (photo.isNotEmpty()) {
-            ImageUtils.getRoundBitmapFromUri(
-                coreContext.context,
-                Uri.parse(photo ?: "")
-            )
+            BitmapFactory.decodeFile(photo)
         } else {
             null
         }
@@ -332,10 +330,7 @@ fun Friend.getPerson(): Person {
     val personBuilder = Person.Builder().setName(name)
 
     val bm: Bitmap? = if (!photo.isNullOrEmpty()) {
-        ImageUtils.getRoundBitmapFromUri(
-            coreContext.context,
-            Uri.parse(photo ?: "")
-        )
+        BitmapFactory.decodeFile(photo)
     } else {
         null
     }
diff --git a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
index 155a8c9ae..9927cb8c4 100644
--- a/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
+++ b/app/src/main/java/org/linphone/notifications/NotificationsManager.kt
@@ -30,6 +30,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.ServiceInfo
 import android.graphics.Bitmap
+import android.graphics.BitmapFactory
 import android.net.Uri
 import androidx.annotation.AnyThread
 import androidx.annotation.MainThread
@@ -490,7 +491,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
             coreContext.contactsManager.findContactByAddress(address)
         val contactPicture = contact?.photo
         val roundPicture = if (!contactPicture.isNullOrEmpty()) {
-            ImageUtils.getRoundBitmapFromUri(context, Uri.parse(contactPicture))
+            BitmapFactory.decodeFile(contactPicture)
         } else {
             null
         }
@@ -592,7 +593,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
             coreContext.contactsManager.findContactByAddress(message.fromAddress)
         val contactPicture = contact?.photo
         val roundPicture = if (!contactPicture.isNullOrEmpty()) {
-            ImageUtils.getRoundBitmapFromUri(context, Uri.parse(contactPicture))
+            BitmapFactory.decodeFile(contactPicture)
         } else {
             null
         }
@@ -650,7 +651,7 @@ class NotificationsManager @MainThread constructor(private val context: Context)
             coreContext.contactsManager.findContactByAddress(call.remoteAddress)
         val contactPicture = contact?.photo
         val roundPicture = if (!contactPicture.isNullOrEmpty()) {
-            ImageUtils.getRoundBitmapFromUri(context, Uri.parse(contactPicture))
+            BitmapFactory.decodeFile(contactPicture)
         } else {
             null
         }