Strip markdown from repeat snackbar

pull/2754/head
Alex Baker 2 years ago
parent 68542fce38
commit 940fdc28dd

@ -109,6 +109,7 @@ import org.tasks.extensions.Fragment.safeStartActivityForResult
import org.tasks.extensions.hideKeyboard import org.tasks.extensions.hideKeyboard
import org.tasks.extensions.setOnQueryTextListener import org.tasks.extensions.setOnQueryTextListener
import org.tasks.filters.PlaceFilter import org.tasks.filters.PlaceFilter
import org.tasks.markdown.MarkdownProvider
import org.tasks.preferences.Device import org.tasks.preferences.Device
import org.tasks.preferences.Preferences import org.tasks.preferences.Preferences
import org.tasks.sync.SyncAdapters import org.tasks.sync.SyncAdapters
@ -159,6 +160,7 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
@Inject lateinit var taskListEventBus: TaskListEventBus @Inject lateinit var taskListEventBus: TaskListEventBus
@Inject lateinit var taskEditEventBus: TaskEditEventBus @Inject lateinit var taskEditEventBus: TaskEditEventBus
@Inject lateinit var database: Database @Inject lateinit var database: Database
@Inject lateinit var markdown: MarkdownProvider
private val listViewModel: TaskListViewModel by viewModels() private val listViewModel: TaskListViewModel by viewModels()
private val mainViewModel: MainActivityViewModel by activityViewModels() private val mainViewModel: MainActivityViewModel by activityViewModels()
@ -969,9 +971,10 @@ class TaskListFragment : Fragment(), OnRefreshListener, Toolbar.OnMenuItemClickL
} }
if (isRecurringCompletion) { if (isRecurringCompletion) {
val task = tasks.first() val task = tasks.first()
val title = markdown.markdown(force = true).toMarkdown(task.title)
val text = getString( val text = getString(
R.string.repeat_snackbar, R.string.repeat_snackbar,
task.title, title,
DateUtilities.getRelativeDateTime( DateUtilities.getRelativeDateTime(
context, task.dueDate, locale, FormatStyle.LONG, true context, task.dueDate, locale, FormatStyle.LONG, true
) )

@ -307,7 +307,7 @@ class NotificationManager @Inject constructor(
} }
// read properties // read properties
val markdown = markdownProvider.markdown() val markdown = markdownProvider.markdown(force = true)
val taskTitle = markdown.toMarkdown(task.title) val taskTitle = markdown.toMarkdown(task.title)
val taskDescription = markdown.toMarkdown(task.notes) val taskDescription = markdown.toMarkdown(task.notes)

Loading…
Cancel
Save