Don't allow empty shortcut labels

pull/3221/head
Alex Baker 11 months ago
parent efbdfd6fda
commit 163cc29471

@ -154,10 +154,10 @@ abstract class BaseListSettingsActivity : AppCompatActivity(), ColorPalettePicke
} }
protected fun createShortcut(color: Color) { protected fun createShortcut(color: Color) {
filter?.let { filter?.let { f ->
val filterId = defaultFilterProvider.getFilterPreferenceValue(it) val filterId = defaultFilterProvider.getFilterPreferenceValue(f)
val shortcutInfo = ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID()) val shortcutInfo = ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID())
.setShortLabel(baseViewModel.title) .setShortLabel(baseViewModel.title.takeIf { it.isNotBlank() } ?: getString(R.string.app_name))
.setIcon( .setIcon(
baseViewModel.icon baseViewModel.icon
?.let { icon -> ?.let { icon ->

@ -125,7 +125,9 @@ class ShortcutConfigActivity : ThemedInjectingAppCompatActivity(), ColorPaletteP
ShortcutManagerCompat.requestPinShortcut( ShortcutManagerCompat.requestPinShortcut(
this, this,
ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID()) ShortcutInfoCompat.Builder(this, UUIDHelper.newUUID())
.setShortLabel(getShortcutName()) .setShortLabel(
getShortcutName().takeIf { it.isNotBlank() } ?: getString(R.string.app_name)
)
.setIntent(TaskIntents.getTaskListByIdIntent(this, filterId)) .setIntent(TaskIntents.getTaskListByIdIntent(this, filterId))
.setIcon(IconCompat.createWithResource(this, ThemeColor.ICONS[themeIndex])) .setIcon(IconCompat.createWithResource(this, ThemeColor.ICONS[themeIndex]))
.build(), .build(),

Loading…
Cancel
Save