From 163cc29471ffb61105d152e6bc2b58012a8d448c Mon Sep 17 00:00:00 2001
From: Alex Baker <alex@tasks.org>
Date: Sat, 4 Jan 2025 10:39:50 -0600
Subject: [PATCH] Don't allow empty shortcut labels

---
 .../java/org/tasks/activities/BaseListSettingsActivity.kt   | 6 +++---
 .../main/java/org/tasks/widget/ShortcutConfigActivity.kt    | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt
index f656af674..b5e3903bb 100644
--- a/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt
+++ b/app/src/main/java/org/tasks/activities/BaseListSettingsActivity.kt
@@ -154,10 +154,10 @@ abstract class BaseListSettingsActivity : AppCompatActivity(), ColorPalettePicke
     }
 
     protected fun createShortcut(color: Color) {
-        filter?.let {
-            val filterId = defaultFilterProvider.getFilterPreferenceValue(it)
+        filter?.let { f ->
+            val filterId = defaultFilterProvider.getFilterPreferenceValue(f)
             val shortcutInfo = ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID())
-                .setShortLabel(baseViewModel.title)
+                .setShortLabel(baseViewModel.title.takeIf { it.isNotBlank() } ?: getString(R.string.app_name))
                 .setIcon(
                     baseViewModel.icon
                         ?.let { icon ->
diff --git a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt
index 2053ece9c..b6ce7fcb9 100644
--- a/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt
+++ b/app/src/main/java/org/tasks/widget/ShortcutConfigActivity.kt
@@ -125,7 +125,9 @@ class ShortcutConfigActivity : ThemedInjectingAppCompatActivity(), ColorPaletteP
         ShortcutManagerCompat.requestPinShortcut(
             this,
             ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID())
-                .setShortLabel(getShortcutName())
+                .setShortLabel(
+                    getShortcutName().takeIf { it.isNotBlank() } ?: getString(R.string.app_name)
+                )
                 .setIntent(TaskIntents.getTaskListByIdIntent(this, filterId))
                 .setIcon(IconCompat.createWithResource(this, ThemeColor.ICONS[themeIndex]))
                 .build(),