Fix crash on new shortcuts

tchapgouv · Sep 11, 2023 · bd2f7fc · bd2f7fc
1 parent e8126d2
commit bd2f7fc
Showing 1 changed file with 13 additions and 12 deletions.
diff --git a/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt b/vector/src/main/java/im/vector/app/features/home/ShortcutsHandler.kt
@@ -139,19 +139,20 @@ class ShortcutsHandler @Inject constructor(
     }
 
     private fun createShortcuts(rooms: List<RoomSummary>) {
-        if (hasPinCode.get()) {
-            // No shortcut in this case (privacy)
-            ShortcutManagerCompat.removeAllDynamicShortcuts(context)
-        } else {
-            val shortcuts = rooms
-                    .take(maxShortcutCountPerActivity)
-                    .mapIndexed { index, room ->
-                        shortcutCreator.create(room, index)
-                    }
+        // Tchap: remove all shortcuts before add others to avoid exceeding max shortcuts count per activity.
+        ShortcutManagerCompat.removeAllDynamicShortcuts(context)
 
-            shortcuts.forEach { shortcut ->
-                ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
-            }
+        // No shortcut in this case (privacy)
+        if (hasPinCode.get()) return
+
+        val shortcuts = rooms
+                .take(maxShortcutCountPerActivity)
+                .mapIndexed { index, room ->
+                    shortcutCreator.create(room, index)
+                }
+
+        shortcuts.forEach { shortcut ->
+            ShortcutManagerCompat.pushDynamicShortcut(context, shortcut)
         }
     }