remove also LongLivedShortcuts

element-hq · Oct 5, 2021 · 89e82b9 · 89e82b9
1 parent 5bfa050
commit 89e82b9
Showing 1 changed file with 5 additions and 1 deletion.
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
@@ -75,7 +75,11 @@ class ShortcutsHandler @Inject constructor(
             return
         }
 
-        ShortcutManagerCompat.removeAllDynamicShortcuts(context)
+        // according to https://developer.android.com/reference/androidx/core/content/pm/ShortcutManagerCompat#removeLongLivedShortcuts(android.content.Context,%20java.util.List%3Cjava.lang.String%3E)
+        // removeLongLivedShortcuts for API 29 and lower should behave like removeDynamicShortcuts(Context, List)
+        // getDynamicShortcuts: returns all dynamic shortcuts from the app.
+        val shortcuts = ShortcutManagerCompat.getDynamicShortcuts(context).map { it.id }
+        ShortcutManagerCompat.removeLongLivedShortcuts(context, shortcuts)
 
         // We can only disabled pinned shortcuts with the API, but at least it will prevent the crash
         if (ShortcutManagerCompat.isRequestPinShortcutSupported(context)) {