From e7bb3a34020b0d3bee12a6bb38e528f238d3b3f7 Mon Sep 17 00:00:00 2001 From: Inhishonor Date: Wed, 25 Mar 2026 18:26:07 -0700 Subject: [PATCH] refactor(utils): Simplify shortcut generation logic --- .../QKSMS/common/util/ShortcutManagerImpl.kt | 27 ++++++++----------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt index cbcdd7c9..c9f34e07 100644 --- a/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt +++ b/presentation/src/main/java/com/moez/QKSMS/common/util/ShortcutManagerImpl.kt @@ -69,14 +69,11 @@ class ShortcutManagerImpl @Inject constructor( override fun getOrCreateShortcut(threadId: Long): ShortcutInfoCompat? { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N_MR1) { var sc = getShortcuts().find { it.id == threadId.toString() } - if (sc != null) - sc = updateShortcut(sc) - if (sc == null) { - val conv = conversationRepo.getConversation(threadId) - if (conv == null) - return null - else - sc = createShortcutForConversation(conv) + sc = if (sc != null) { + updateShortcut(sc) + } else { + val conv = conversationRepo.getConversation(threadId) ?: return null + createShortcutForConversation(conv) } return sc } else { @@ -141,14 +138,12 @@ class ShortcutManagerImpl @Inject constructor( } private fun updateShortcut(shortcut: ShortcutInfoCompat): ShortcutInfoCompat { - val conversation = conversationRepo.getConversation(shortcut.id.toLong()) - if (conversation == null) - return shortcut - else { - val sc = createShortcutForConversation(conversation) - ShortcutManagerCompat.pushDynamicShortcut(context, sc) - return sc - } + val conversation = conversationRepo.getConversation( + shortcut.id.toLong() + ) ?: return shortcut + val sc = createShortcutForConversation(conversation) + ShortcutManagerCompat.pushDynamicShortcut(context, sc) + return sc } private fun getShortcuts() : List {