From be3f6ea3014789f9d170574beb0ab7a46e3f9041 Mon Sep 17 00:00:00 2001
From: Sylvain Berfini <sylvain.berfini@belledonne-communications.com>
Date: Thu, 21 Dec 2023 14:52:43 +0100
Subject: [PATCH] Fixed group chat room shortcut generation

---
 .../java/org/linphone/utils/ShortcutUtils.kt    | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/main/java/org/linphone/utils/ShortcutUtils.kt b/app/src/main/java/org/linphone/utils/ShortcutUtils.kt
index 88e822a6b..9a5c0a9e1 100644
--- a/app/src/main/java/org/linphone/utils/ShortcutUtils.kt
+++ b/app/src/main/java/org/linphone/utils/ShortcutUtils.kt
@@ -76,11 +76,6 @@ class ShortcutUtils {
                     continue
                 }
 
-                if (isShortcutToChatRoomAlreadyCreated(context, chatRoom)) {
-                    count += 1
-                    continue
-                }
-
                 if (count >= 5) {
                     Log.i("$TAG We already created [$count] shortcuts, stopping here")
                     break
@@ -148,9 +143,13 @@ class ShortcutUtils {
                     subject = chatRoom.subject.orEmpty()
                     val picture = ImageUtils.generateBitmapForChatRoom(chatRoom)
                     if (picture.isNotEmpty()) {
-                        IconCompat.createWithAdaptiveBitmap(
-                            BitmapFactory.decodeFile(picture)
-                        )
+                        // BitmapFactory.decodeFile() doesn't handle file:/ URIs
+                        val file = if (picture.startsWith("file:/")) {
+                            picture.substring("file:/".length)
+                        } else {
+                            picture
+                        }
+                        IconCompat.createWithAdaptiveBitmap(BitmapFactory.decodeFile(file))
                     } else {
                         AvatarGenerator(context).setInitials(subject).buildIcon()
                     }
@@ -182,7 +181,7 @@ class ShortcutUtils {
                     .setLongLived(Version.sdkAboveOrEqual(Version.API30_ANDROID_11))
                     .setLocusId(LocusIdCompat(id))
                     .build()
-            } catch (e: Exception) {
+            } catch (e: NumberFormatException) {
                 Log.e("$TAG createChatRoomShortcut for id [$id] exception: $e")
             }